From c333f062ddcba9b35330647bf6cbd0a07f2d786e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 11 May 2017 14:55:55 +0200 Subject: New upstream version 1.8.0 --- ChangeLog | 22190 +------------------ Makefile.am | 366 +- Makefile.examples | 37 +- Makefile.in | 1347 +- NEWS | 56 +- clients/cli/agent.c | 4 + clients/cli/common.c | 131 +- clients/cli/common.h | 2 +- clients/cli/connections.c | 673 +- clients/cli/devices.c | 184 +- clients/cli/general.c | 116 +- clients/cli/nmcli-completion | 1297 +- clients/cli/nmcli.c | 144 +- clients/cli/nmcli.h | 4 +- clients/cli/settings-docs.c | 33 +- clients/cli/settings.c | 1099 +- clients/cli/settings.h | 1 + clients/cli/utils.c | 355 +- clients/cli/utils.h | 5 +- clients/common/nm-secret-agent-simple.h | 4 +- clients/common/nm-vpn-helpers.h | 2 +- clients/tui/nm-editor-bindings.h | 2 +- clients/tui/nm-editor-utils.c | 40 +- clients/tui/nm-editor-utils.h | 2 +- clients/tui/nmt-device-entry.h | 2 +- clients/tui/nmt-edit-connection-list.c | 27 + clients/tui/nmt-edit-connection-list.h | 4 +- clients/tui/nmt-editor-page.c | 17 + clients/tui/nmt-editor-page.h | 5 +- clients/tui/nmt-editor.c | 12 + clients/tui/nmt-editor.h | 2 +- clients/tui/nmt-page-bond.c | 10 + clients/tui/nmt-page-bridge.c | 18 + clients/tui/nmt-page-team.c | 10 + clients/tui/nmt-route-editor.h | 2 +- clients/tui/nmtui.h | 2 +- config.h.in | 17 +- configure | 2307 +- configure.ac | 235 +- data/server.conf.in | 2 +- docs/api/Makefile.am | 6 +- docs/api/Makefile.in | 29 +- ...-org.freedesktop.NetworkManager.AccessPoint.xml | 2 +- ...org.freedesktop.NetworkManager.AgentManager.xml | 2 +- ...reedesktop.NetworkManager.Connection.Active.xml | 25 +- ...-org.freedesktop.NetworkManager.DHCP4Config.xml | 2 +- ...-org.freedesktop.NetworkManager.DHCP6Config.xml | 2 +- ...-org.freedesktop.NetworkManager.Device.Adsl.xml | 2 +- ...freedesktop.NetworkManager.Device.Bluetooth.xml | 2 +- ...-org.freedesktop.NetworkManager.Device.Bond.xml | 2 +- ...rg.freedesktop.NetworkManager.Device.Bridge.xml | 2 +- ...org.freedesktop.NetworkManager.Device.Dummy.xml | 37 + ...g.freedesktop.NetworkManager.Device.Generic.xml | 2 +- ....freedesktop.NetworkManager.Device.IPTunnel.xml | 2 +- ...reedesktop.NetworkManager.Device.Infiniband.xml | 2 +- ...rg.freedesktop.NetworkManager.Device.Macsec.xml | 2 +- ...g.freedesktop.NetworkManager.Device.Macvlan.xml | 2 +- ...org.freedesktop.NetworkManager.Device.Modem.xml | 2 +- ....freedesktop.NetworkManager.Device.OlpcMesh.xml | 2 +- ...reedesktop.NetworkManager.Device.Statistics.xml | 2 +- ...-org.freedesktop.NetworkManager.Device.Team.xml | 2 +- ...s-org.freedesktop.NetworkManager.Device.Tun.xml | 2 +- ...-org.freedesktop.NetworkManager.Device.Veth.xml | 2 +- ...-org.freedesktop.NetworkManager.Device.Vlan.xml | 2 +- ...org.freedesktop.NetworkManager.Device.Vxlan.xml | 2 +- ...org.freedesktop.NetworkManager.Device.WiMax.xml | 2 +- ...org.freedesktop.NetworkManager.Device.Wired.xml | 2 +- ....freedesktop.NetworkManager.Device.Wireless.xml | 2 +- .../dbus-org.freedesktop.NetworkManager.Device.xml | 2 +- ...s-org.freedesktop.NetworkManager.DnsManager.xml | 2 +- ...us-org.freedesktop.NetworkManager.IP4Config.xml | 2 +- ...us-org.freedesktop.NetworkManager.IP6Config.xml | 2 +- .../dbus-org.freedesktop.NetworkManager.PPP.xml | 2 +- ...-org.freedesktop.NetworkManager.SecretAgent.xml | 2 +- ...edesktop.NetworkManager.Settings.Connection.xml | 2 +- ...bus-org.freedesktop.NetworkManager.Settings.xml | 2 +- ...g.freedesktop.NetworkManager.VPN.Connection.xml | 4 +- ...s-org.freedesktop.NetworkManager.VPN.Plugin.xml | 2 +- docs/api/dbus-org.freedesktop.NetworkManager.xml | 21 +- docs/api/html/NetworkManager.conf.html | 119 +- docs/api/html/NetworkManager.devhelp2 | 714 +- docs/api/html/NetworkManager.html | 26 +- docs/api/html/ch01.html | 133 + docs/api/html/dbus-secret-agent.html | 32 + docs/api/html/dbus-types.html | 15 +- docs/api/html/dbus-vpn-types.html | 32 + ...org.freedesktop.NetworkManager.AccessPoint.html | 18 +- ...rg.freedesktop.NetworkManager.AgentManager.html | 14 +- ...eedesktop.NetworkManager.Connection.Active.html | 48 +- ...org.freedesktop.NetworkManager.DHCP4Config.html | 18 +- ...org.freedesktop.NetworkManager.DHCP6Config.html | 18 +- ...org.freedesktop.NetworkManager.Device.Adsl.html | 14 +- ...reedesktop.NetworkManager.Device.Bluetooth.html | 14 +- ...org.freedesktop.NetworkManager.Device.Bond.html | 10 +- ...g.freedesktop.NetworkManager.Device.Bridge.html | 10 +- ...rg.freedesktop.NetworkManager.Device.Dummy.html | 70 + ....freedesktop.NetworkManager.Device.Generic.html | 10 +- ...freedesktop.NetworkManager.Device.IPTunnel.html | 10 +- ...eedesktop.NetworkManager.Device.Infiniband.html | 10 +- ...g.freedesktop.NetworkManager.Device.Macsec.html | 10 +- ....freedesktop.NetworkManager.Device.Macvlan.html | 10 +- ...rg.freedesktop.NetworkManager.Device.Modem.html | 10 +- ...freedesktop.NetworkManager.Device.OlpcMesh.html | 10 +- ...eedesktop.NetworkManager.Device.Statistics.html | 18 +- ...org.freedesktop.NetworkManager.Device.Team.html | 10 +- ...-org.freedesktop.NetworkManager.Device.Tun.html | 10 +- ...org.freedesktop.NetworkManager.Device.Veth.html | 10 +- ...org.freedesktop.NetworkManager.Device.Vlan.html | 10 +- ...rg.freedesktop.NetworkManager.Device.Vxlan.html | 10 +- ...rg.freedesktop.NetworkManager.Device.WiMax.html | 14 +- ...rg.freedesktop.NetworkManager.Device.Wired.html | 14 +- ...freedesktop.NetworkManager.Device.Wireless.html | 10 +- ...dbus-org.freedesktop.NetworkManager.Device.html | 18 +- ...-org.freedesktop.NetworkManager.DnsManager.html | 16 +- ...s-org.freedesktop.NetworkManager.IP4Config.html | 18 +- ...s-org.freedesktop.NetworkManager.IP6Config.html | 18 +- .../gdbus-org.freedesktop.NetworkManager.PPP.html | 14 +- ...org.freedesktop.NetworkManager.SecretAgent.html | 14 +- ...desktop.NetworkManager.Settings.Connection.html | 18 +- ...us-org.freedesktop.NetworkManager.Settings.html | 18 +- ....freedesktop.NetworkManager.VPN.Connection.html | 20 +- ...-org.freedesktop.NetworkManager.VPN.Plugin.html | 18 +- .../html/gdbus-org.freedesktop.NetworkManager.html | 41 +- docs/api/html/index.html | 266 +- docs/api/html/ix01.html | 1326 +- docs/api/html/manpages.html | 33 +- docs/api/html/nm-dbus-types.html | 345 +- docs/api/html/nm-online.html | 10 +- docs/api/html/nm-settings-ifcfg-rh.html | 94 +- docs/api/html/nm-settings-keyfile.html | 18 +- docs/api/html/nm-settings.html | 725 +- docs/api/html/nm-vpn-dbus-types.html | 44 +- docs/api/html/nmcli-examples.html | 60 +- docs/api/html/nmcli.html | 76 +- docs/api/html/nmtui.html | 10 +- docs/api/html/ref-dbus-access-points.html | 32 + docs/api/html/ref-dbus-active-connections.html | 37 + docs/api/html/ref-dbus-agent-manager.html | 32 + docs/api/html/ref-dbus-devices.html | 100 + docs/api/html/ref-dbus-dhcp4-configs.html | 32 + docs/api/html/ref-dbus-dhcp6-configs.html | 32 + docs/api/html/ref-dbus-dns-manager.html | 32 + docs/api/html/ref-dbus-ip4-configs.html | 32 + docs/api/html/ref-dbus-ip6-configs.html | 32 + docs/api/html/ref-dbus-manager.html | 32 + docs/api/html/ref-dbus-settings-manager.html | 32 + docs/api/html/ref-dbus-settings.html | 32 + docs/api/html/ref-settings.html | 2775 +-- docs/api/html/secret-agents.html | 38 + docs/api/html/secrets-flags.html | 14 +- docs/api/html/settings-802-11-olpc-mesh.html | 89 + .../html/settings-802-11-wireless-security.html | 173 + docs/api/html/settings-802-11-wireless.html | 179 + docs/api/html/settings-802-1x.html | 335 + docs/api/html/settings-802-3-ethernet.html | 161 + docs/api/html/settings-adsl.html | 113 + docs/api/html/settings-bluetooth.html | 83 + docs/api/html/settings-bond.html | 83 + docs/api/html/settings-bridge-port.html | 89 + docs/api/html/settings-bridge.html | 125 + docs/api/html/settings-cdma.html | 101 + docs/api/html/settings-connection.html | 185 + docs/api/html/settings-dcb.html | 161 + docs/api/html/settings-dummy.html | 69 + docs/api/html/settings-generic.html | 69 + docs/api/html/settings-gsm.html | 149 + docs/api/html/settings-infiniband.html | 101 + docs/api/html/settings-ip-tunnel.html | 143 + docs/api/html/settings-ipv4.html | 197 + docs/api/html/settings-ipv6.html | 203 + docs/api/html/settings-macsec.html | 119 + docs/api/html/settings-macvlan.html | 95 + docs/api/html/settings-ppp.html | 179 + docs/api/html/settings-pppoe.html | 95 + docs/api/html/settings-proxy.html | 95 + docs/api/html/settings-serial.html | 101 + docs/api/html/settings-team-port.html | 77 + docs/api/html/settings-team.html | 83 + docs/api/html/settings-tun.html | 107 + docs/api/html/settings-user.html | 77 + docs/api/html/settings-vlan.html | 107 + docs/api/html/settings-vpn.html | 107 + docs/api/html/settings-vxlan.html | 167 + docs/api/html/settings-wimax.html | 83 + docs/api/html/spec.html | 160 +- docs/api/html/vpn-plugins.html | 42 + docs/api/network-manager-docs.xml | 240 +- docs/api/settings-spec.xml | 889 +- docs/api/settings-spec.xsl | 63 +- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.in | 13 +- docs/libnm-glib/html/NMAccessPoint.html | 112 +- docs/libnm-glib/html/NMActiveConnection.html | 112 +- docs/libnm-glib/html/NMClient.html | 308 +- docs/libnm-glib/html/NMDHCP4Config.html | 22 +- docs/libnm-glib/html/NMDHCP6Config.html | 22 +- docs/libnm-glib/html/NMDevice.html | 244 +- docs/libnm-glib/html/NMDeviceAdsl.html | 24 +- docs/libnm-glib/html/NMDeviceBond.html | 36 +- docs/libnm-glib/html/NMDeviceBridge.html | 36 +- docs/libnm-glib/html/NMDeviceBt.html | 34 +- docs/libnm-glib/html/NMDeviceEthernet.html | 40 +- docs/libnm-glib/html/NMDeviceGeneric.html | 24 +- docs/libnm-glib/html/NMDeviceInfiniband.html | 28 +- docs/libnm-glib/html/NMDeviceModem.html | 22 +- docs/libnm-glib/html/NMDeviceOlpcMesh.html | 28 +- docs/libnm-glib/html/NMDeviceTeam.html | 36 +- docs/libnm-glib/html/NMDeviceVlan.html | 36 +- docs/libnm-glib/html/NMDeviceWifi.html | 80 +- docs/libnm-glib/html/NMDeviceWimax.html | 84 +- docs/libnm-glib/html/NMIP4Config.html | 70 +- docs/libnm-glib/html/NMIP6Config.html | 64 +- docs/libnm-glib/html/NMObject.html | 28 +- docs/libnm-glib/html/NMRemoteConnection.html | 92 +- docs/libnm-glib/html/NMRemoteSettings.html | 194 +- docs/libnm-glib/html/NMSecretAgent.html | 120 +- docs/libnm-glib/html/NMVPNConnection.html | 32 +- docs/libnm-glib/html/NMWimaxNsp.html | 50 +- docs/libnm-glib/html/index.html | 4 +- docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 28 +- .../html/libnm-glib-NMVpnPluginUiWidget.html | 58 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 24 +- docs/libnm-glib/html/object-tree.html | 4 +- docs/libnm-glib/libnm-glib-docs.xml | 7 +- docs/libnm-glib/libnm-glib.types | 52 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.in | 13 +- docs/libnm-util/html/NMConnection.html | 264 +- docs/libnm-util/html/NMSetting.html | 132 +- docs/libnm-util/html/NMSetting8021x.html | 282 +- docs/libnm-util/html/NMSettingAdsl.html | 44 +- docs/libnm-util/html/NMSettingBluetooth.html | 16 +- docs/libnm-util/html/NMSettingBond.html | 56 +- docs/libnm-util/html/NMSettingBridge.html | 64 +- docs/libnm-util/html/NMSettingBridgePort.html | 32 +- docs/libnm-util/html/NMSettingCdma.html | 24 +- docs/libnm-util/html/NMSettingConnection.html | 154 +- docs/libnm-util/html/NMSettingDcb.html | 130 +- docs/libnm-util/html/NMSettingGeneric.html | 8 +- docs/libnm-util/html/NMSettingGsm.html | 62 +- docs/libnm-util/html/NMSettingIP4Config.html | 242 +- docs/libnm-util/html/NMSettingIP6Config.html | 190 +- docs/libnm-util/html/NMSettingInfiniband.html | 34 +- docs/libnm-util/html/NMSettingOlpcMesh.html | 24 +- docs/libnm-util/html/NMSettingPPP.html | 186 +- docs/libnm-util/html/NMSettingPPPOE.html | 24 +- docs/libnm-util/html/NMSettingSerial.html | 44 +- docs/libnm-util/html/NMSettingTeam.html | 16 +- docs/libnm-util/html/NMSettingTeamPort.html | 12 +- docs/libnm-util/html/NMSettingVPN.html | 56 +- docs/libnm-util/html/NMSettingVlan.html | 90 +- docs/libnm-util/html/NMSettingWimax.html | 16 +- docs/libnm-util/html/NMSettingWired.html | 120 +- docs/libnm-util/html/NMSettingWireless.html | 138 +- .../libnm-util/html/NMSettingWirelessSecurity.html | 134 +- docs/libnm-util/html/api-index-full.html | 20 +- docs/libnm-util/html/index.html | 4 +- .../libnm-util/html/libnm-util-NetworkManager.html | 2 +- docs/libnm-util/html/libnm-util-nm-utils.html | 416 +- docs/libnm-util/html/object-tree.html | 6 +- docs/libnm-util/libnm-util-docs.sgml | 5 + docs/libnm-util/version.xml | 2 +- docs/libnm/Makefile.in | 13 +- docs/libnm/html/NMAccessPoint.html | 76 +- docs/libnm/html/NMActiveConnection.html | 133 +- docs/libnm/html/NMClient.html | 592 +- docs/libnm/html/NMConnection.html | 254 +- docs/libnm/html/NMDevice.html | 393 +- docs/libnm/html/NMDeviceAdsl.html | 14 +- docs/libnm/html/NMDeviceBond.html | 28 +- docs/libnm/html/NMDeviceBridge.html | 28 +- docs/libnm/html/NMDeviceBt.html | 16 +- docs/libnm/html/NMDeviceDummy.html | 81 + docs/libnm/html/NMDeviceEthernet.html | 38 +- docs/libnm/html/NMDeviceGeneric.html | 14 +- docs/libnm/html/NMDeviceIPTunnel.html | 68 +- docs/libnm/html/NMDeviceInfiniband.html | 18 +- docs/libnm/html/NMDeviceMacsec.html | 944 + docs/libnm/html/NMDeviceMacvlan.html | 34 +- docs/libnm/html/NMDeviceModem.html | 4 +- docs/libnm/html/NMDeviceOlpcMesh.html | 18 +- docs/libnm/html/NMDeviceTeam.html | 32 +- docs/libnm/html/NMDeviceTun.html | 56 +- docs/libnm/html/NMDeviceVlan.html | 26 +- docs/libnm/html/NMDeviceVxlan.html | 130 +- docs/libnm/html/NMDeviceWifi.html | 116 +- docs/libnm/html/NMDeviceWimax.html | 76 +- docs/libnm/html/NMDhcpConfig.html | 20 +- docs/libnm/html/NMIPConfig.html | 58 +- docs/libnm/html/NMObject.html | 26 +- docs/libnm/html/NMRemoteConnection.html | 194 +- docs/libnm/html/NMSecretAgentOld.html | 138 +- docs/libnm/html/NMSetting.html | 116 +- docs/libnm/html/NMSetting8021x.html | 992 +- docs/libnm/html/NMSettingAdsl.html | 35 +- docs/libnm/html/NMSettingBluetooth.html | 11 +- docs/libnm/html/NMSettingBond.html | 57 +- docs/libnm/html/NMSettingBridge.html | 63 +- docs/libnm/html/NMSettingBridgePort.html | 27 +- docs/libnm/html/NMSettingCdma.html | 74 +- docs/libnm/html/NMSettingConnection.html | 187 +- docs/libnm/html/NMSettingDcb.html | 135 +- docs/libnm/html/NMSettingDummy.html | 116 + docs/libnm/html/NMSettingGeneric.html | 9 +- docs/libnm/html/NMSettingGsm.html | 108 +- docs/libnm/html/NMSettingIP4Config.html | 13 +- docs/libnm/html/NMSettingIP6Config.html | 13 +- docs/libnm/html/NMSettingIPConfig.html | 571 +- docs/libnm/html/NMSettingIPTunnel.html | 79 +- docs/libnm/html/NMSettingInfiniband.html | 33 +- docs/libnm/html/NMSettingMacsec.html | 710 + docs/libnm/html/NMSettingMacvlan.html | 33 +- docs/libnm/html/NMSettingOlpcMesh.html | 23 +- docs/libnm/html/NMSettingPpp.html | 181 +- docs/libnm/html/NMSettingPppoe.html | 15 +- docs/libnm/html/NMSettingSerial.html | 37 +- docs/libnm/html/NMSettingTeam.html | 7 +- docs/libnm/html/NMSettingTeamPort.html | 7 +- docs/libnm/html/NMSettingTun.html | 51 +- docs/libnm/html/NMSettingVlan.html | 89 +- docs/libnm/html/NMSettingVpn.html | 67 +- docs/libnm/html/NMSettingVxlan.html | 119 +- docs/libnm/html/NMSettingWimax.html | 11 +- docs/libnm/html/NMSettingWired.html | 145 +- docs/libnm/html/NMSettingWireless.html | 147 +- docs/libnm/html/NMSettingWirelessSecurity.html | 127 +- docs/libnm/html/NMSimpleConnection.html | 10 +- docs/libnm/html/NMVpnConnection.html | 18 +- docs/libnm/html/NMVpnEditorPlugin.html | 76 +- docs/libnm/html/NMWimaxNsp.html | 36 +- docs/libnm/html/api-index-full.html | 470 +- docs/libnm/html/ch02.html | 4 +- docs/libnm/html/ch03.html | 6 + docs/libnm/html/ch04.html | 6 + docs/libnm/html/index.html | 20 +- docs/libnm/html/libnm-nm-dbus-interface.html | 237 +- docs/libnm/html/libnm-nm-errors.html | 38 +- docs/libnm/html/libnm-nm-utils.html | 649 +- docs/libnm/html/libnm-nm-version.html | 30 + docs/libnm/html/libnm-nm-vpn-dbus-interface.html | 24 +- docs/libnm/html/libnm.devhelp2 | 186 +- docs/libnm/html/object-tree.html | 23 +- docs/libnm/html/ref-overview.html | 46 +- docs/libnm/html/usage.html | 166 + docs/libnm/libnm-docs.xml | 153 +- docs/libnm/libnm-sections.txt | 114 +- docs/libnm/libnm.types | 5 + docs/libnm/version.xml | 2 +- examples/C/glib/add-connection-gdbus.c | 5 + examples/C/glib/get-active-connections-gdbus.c | 5 + examples/C/glib/list-connections-gdbus.c | 3 +- examples/C/qt/add-connection-wired.cpp | 3 +- examples/C/qt/change-ipv4-addresses.cpp | 4 +- examples/C/qt/list-connections.cpp | 3 +- examples/nm-conf.d/31-mac-addr-change.conf | 11 + examples/python/gi/setting-user-data.py | 246 + .../org.freedesktop.NetworkManager.AccessPoint.xml | 5 + ...org.freedesktop.NetworkManager.AgentManager.xml | 5 + .../org.freedesktop.NetworkManager.Checkpoint.xml | 1 + ...reedesktop.NetworkManager.Connection.Active.xml | 15 + .../org.freedesktop.NetworkManager.DHCP4Config.xml | 1 + .../org.freedesktop.NetworkManager.DHCP6Config.xml | 1 + .../org.freedesktop.NetworkManager.Device.Adsl.xml | 5 + ...freedesktop.NetworkManager.Device.Bluetooth.xml | 5 + .../org.freedesktop.NetworkManager.Device.Bond.xml | 5 + ...rg.freedesktop.NetworkManager.Device.Bridge.xml | 5 + ...org.freedesktop.NetworkManager.Device.Dummy.xml | 20 + ...g.freedesktop.NetworkManager.Device.Generic.xml | 5 + ....freedesktop.NetworkManager.Device.IPTunnel.xml | 5 + ...reedesktop.NetworkManager.Device.Infiniband.xml | 5 + ...rg.freedesktop.NetworkManager.Device.Macsec.xml | 5 + ...g.freedesktop.NetworkManager.Device.Macvlan.xml | 5 + ...org.freedesktop.NetworkManager.Device.Modem.xml | 5 + ....freedesktop.NetworkManager.Device.OlpcMesh.xml | 5 + ...reedesktop.NetworkManager.Device.Statistics.xml | 5 + .../org.freedesktop.NetworkManager.Device.Team.xml | 5 + .../org.freedesktop.NetworkManager.Device.Tun.xml | 5 + .../org.freedesktop.NetworkManager.Device.Veth.xml | 5 + .../org.freedesktop.NetworkManager.Device.Vlan.xml | 5 + ...org.freedesktop.NetworkManager.Device.Vxlan.xml | 5 + ...org.freedesktop.NetworkManager.Device.WiMax.xml | 5 + ...org.freedesktop.NetworkManager.Device.Wired.xml | 5 + ....freedesktop.NetworkManager.Device.Wireless.xml | 5 + .../org.freedesktop.NetworkManager.Device.xml | 5 + .../org.freedesktop.NetworkManager.DnsManager.xml | 1 + .../org.freedesktop.NetworkManager.IP4Config.xml | 5 + .../org.freedesktop.NetworkManager.IP6Config.xml | 5 + .../org.freedesktop.NetworkManager.PPP.xml | 5 + .../org.freedesktop.NetworkManager.SecretAgent.xml | 1 + ...edesktop.NetworkManager.Settings.Connection.xml | 1 + .../org.freedesktop.NetworkManager.Settings.xml | 1 + ...g.freedesktop.NetworkManager.VPN.Connection.xml | 3 +- .../org.freedesktop.NetworkManager.VPN.Plugin.xml | 1 + .../org.freedesktop.NetworkManager.WiMax.Nsp.xml | 5 + introspection/org.freedesktop.NetworkManager.xml | 28 +- libnm-core/crypto_nss.c | 2 +- libnm-core/nm-connection.c | 110 +- libnm-core/nm-connection.h | 8 +- libnm-core/nm-core-internal.h | 27 +- libnm-core/nm-core-types.h | 8 +- libnm-core/nm-dbus-interface.h | 121 +- libnm-core/nm-dbus-types.xml | 129 +- libnm-core/nm-errors.c | 16 +- libnm-core/nm-keyfile-internal.h | 14 +- libnm-core/nm-keyfile-reader.c | 101 +- libnm-core/nm-keyfile-utils.c | 202 + libnm-core/nm-keyfile-utils.h | 6 + libnm-core/nm-keyfile-writer.c | 117 +- libnm-core/nm-property-compare.c | 1 - libnm-core/nm-setting-8021x.c | 594 +- libnm-core/nm-setting-8021x.h | 61 +- libnm-core/nm-setting-adsl.h | 4 +- libnm-core/nm-setting-bluetooth.h | 2 + libnm-core/nm-setting-bond.c | 4 +- libnm-core/nm-setting-bond.h | 4 +- libnm-core/nm-setting-bridge-port.h | 4 +- libnm-core/nm-setting-bridge.h | 4 +- libnm-core/nm-setting-cdma.c | 42 + libnm-core/nm-setting-cdma.h | 8 +- libnm-core/nm-setting-connection.c | 43 +- libnm-core/nm-setting-connection.h | 3 +- libnm-core/nm-setting-dcb.h | 4 +- libnm-core/nm-setting-dummy.c | 76 + libnm-core/nm-setting-dummy.h | 65 + libnm-core/nm-setting-generic.h | 4 +- libnm-core/nm-setting-gsm.c | 41 + libnm-core/nm-setting-gsm.h | 7 +- libnm-core/nm-setting-infiniband.h | 4 +- libnm-core/nm-setting-ip-config.c | 151 + libnm-core/nm-setting-ip-config.h | 22 + libnm-core/nm-setting-ip-tunnel.h | 4 +- libnm-core/nm-setting-ip4-config.c | 2 +- libnm-core/nm-setting-ip4-config.h | 2 + libnm-core/nm-setting-ip6-config.h | 2 + libnm-core/nm-setting-macsec.c | 2 +- libnm-core/nm-setting-macsec.h | 2 + libnm-core/nm-setting-macvlan.h | 2 + libnm-core/nm-setting-olpc-mesh.h | 4 +- libnm-core/nm-setting-ppp.h | 4 +- libnm-core/nm-setting-pppoe.h | 4 +- libnm-core/nm-setting-private.h | 16 - libnm-core/nm-setting-proxy.h | 7 +- libnm-core/nm-setting-serial.h | 4 +- libnm-core/nm-setting-team-port.h | 4 +- libnm-core/nm-setting-team.h | 4 +- libnm-core/nm-setting-tun.c | 2 +- libnm-core/nm-setting-tun.h | 2 + libnm-core/nm-setting-user.c | 612 + libnm-core/nm-setting-user.h | 68 + libnm-core/nm-setting-vlan.c | 18 +- libnm-core/nm-setting-vlan.h | 2 + libnm-core/nm-setting-vpn.h | 4 +- libnm-core/nm-setting-vxlan.h | 2 + libnm-core/nm-setting-wimax.h | 4 +- libnm-core/nm-setting-wired.c | 4 +- libnm-core/nm-setting-wired.h | 4 +- libnm-core/nm-setting-wireless-security.c | 8 +- libnm-core/nm-setting-wireless-security.h | 4 +- libnm-core/nm-setting-wireless.h | 6 +- libnm-core/nm-setting.c | 24 +- libnm-core/nm-setting.h | 2 +- libnm-core/nm-simple-connection.h | 2 +- libnm-core/nm-utils-private.h | 8 + libnm-core/nm-utils.c | 502 +- libnm-core/nm-utils.h | 15 + libnm-core/nm-version.h | 16 +- libnm-core/nm-vpn-dbus-interface.h | 34 +- libnm-core/nm-vpn-dbus-types.xml | 24 +- libnm-core/nm-vpn-plugin-info.c | 12 +- libnm-core/tests/test-general-enums.h | 4 + libnm-core/tests/test-general.c | 172 +- libnm-core/tests/test-keyfile.c | 133 + libnm-glib/nm-access-point.c | 49 +- libnm-glib/nm-access-point.h | 4 +- libnm-glib/nm-active-connection.h | 4 +- libnm-glib/nm-client.h | 2 +- libnm-glib/nm-device.c | 95 +- libnm-glib/nm-dhcp4-config.c | 3 + libnm-glib/nm-dhcp6-config.c | 3 + libnm-glib/nm-ip4-config.c | 3 + libnm-glib/nm-ip6-config.c | 3 + libnm-glib/nm-object.c | 23 +- libnm-glib/nm-object.h | 2 +- libnm-glib/nm-remote-connection.c | 2 +- libnm-glib/nm-remote-connection.h | 2 +- libnm-glib/nm-remote-settings.c | 2 +- libnm-glib/nm-remote-settings.h | 4 +- libnm-glib/nm-secret-agent.c | 2 +- libnm-glib/nm-secret-agent.h | 2 +- libnm-glib/nm-types.h | 2 +- libnm-glib/nm-vpn-plugin-ui-interface.h | 2 +- libnm-glib/nm-vpn-plugin-utils.h | 2 +- libnm-glib/nm-vpn-plugin.c | 2 +- libnm-glib/nm-vpn-plugin.h | 4 +- libnm-glib/nm-wimax-nsp.h | 2 +- libnm-util/NetworkManager.h | 2 +- libnm-util/crypto_nss.c | 4 +- libnm-util/nm-connection.h | 56 +- libnm-util/nm-param-spec-specialized.c | 9 +- libnm-util/nm-setting-8021x.c | 4 +- libnm-util/nm-setting-8021x.h | 2 +- libnm-util/nm-setting-adsl.h | 2 +- libnm-util/nm-setting-bond.h | 2 +- libnm-util/nm-setting-bridge-port.h | 2 +- libnm-util/nm-setting-bridge.h | 2 +- libnm-util/nm-setting-cdma.h | 2 +- libnm-util/nm-setting-connection.c | 4 +- libnm-util/nm-setting-dcb.h | 2 +- libnm-util/nm-setting-generic.h | 2 +- libnm-util/nm-setting-gsm.h | 2 +- libnm-util/nm-setting-infiniband.h | 2 +- libnm-util/nm-setting-olpc-mesh.h | 2 +- libnm-util/nm-setting-ppp.h | 2 +- libnm-util/nm-setting-pppoe.h | 2 +- libnm-util/nm-setting-serial.h | 2 +- libnm-util/nm-setting-team-port.h | 2 +- libnm-util/nm-setting-team.h | 2 +- libnm-util/nm-setting-vlan.c | 4 +- libnm-util/nm-setting-vpn.h | 2 +- libnm-util/nm-setting-wimax.h | 2 +- libnm-util/nm-setting-wired.h | 2 +- libnm-util/nm-setting-wireless-security.c | 8 +- libnm-util/nm-setting-wireless-security.h | 2 +- libnm-util/nm-setting-wireless.h | 6 +- libnm-util/nm-setting.h | 2 +- libnm-util/nm-version.h | 16 +- libnm/NetworkManager.h | 149 +- libnm/generate-setting-docs.py | 16 +- libnm/libnm.ver | 34 + libnm/nm-access-point.c | 27 +- libnm/nm-access-point.h | 2 +- libnm/nm-active-connection.c | 74 + libnm/nm-active-connection.h | 34 +- libnm/nm-client.c | 42 +- libnm/nm-client.h | 2 +- libnm/nm-device-adsl.h | 2 +- libnm/nm-device-bond.h | 2 +- libnm/nm-device-bridge.h | 2 +- libnm/nm-device-bt.h | 2 +- libnm/nm-device-dummy.c | 80 + libnm/nm-device-dummy.h | 57 + libnm/nm-device-ethernet.h | 2 +- libnm/nm-device-generic.h | 2 +- libnm/nm-device-infiniband.h | 2 +- libnm/nm-device-ip-tunnel.h | 2 +- libnm/nm-device-macsec.h | 2 +- libnm/nm-device-macvlan.h | 2 +- libnm/nm-device-modem.h | 2 +- libnm/nm-device-olpc-mesh.h | 2 +- libnm/nm-device-team.h | 2 +- libnm/nm-device-tun.h | 2 +- libnm/nm-device-vlan.h | 2 +- libnm/nm-device-vxlan.h | 2 +- libnm/nm-device-wifi.h | 2 +- libnm/nm-device-wimax.h | 2 +- libnm/nm-device.c | 126 +- libnm/nm-device.h | 2 +- libnm/nm-dhcp-config.h | 2 +- libnm/nm-dhcp4-config.h | 2 +- libnm/nm-dhcp6-config.h | 2 +- libnm/nm-dns-manager.h | 2 +- libnm/nm-ip-config.h | 2 +- libnm/nm-ip4-config.h | 2 +- libnm/nm-ip6-config.h | 2 +- libnm/nm-manager.c | 14 +- libnm/nm-manager.h | 4 +- libnm/nm-object-private.h | 3 + libnm/nm-object.c | 33 +- libnm/nm-object.h | 2 +- libnm/nm-property-docs.xml | 129 +- libnm/nm-remote-connection.c | 2 + libnm/nm-remote-connection.h | 2 +- libnm/nm-remote-settings.h | 2 +- libnm/nm-secret-agent-old.h | 2 +- libnm/nm-settings-docs-overrides.xml | 4 + libnm/nm-settings-docs.xml | 129 +- libnm/nm-settings-ifcfg-rh-docs.xml | 8 +- libnm/nm-settings-keyfile-docs.xml | 4 + libnm/nm-types.h | 5 +- libnm/nm-vpn-connection.c | 4 + libnm/nm-vpn-connection.h | 14 +- libnm/nm-vpn-editor.h | 4 +- libnm/nm-vpn-plugin-old.c | 2 +- libnm/nm-vpn-plugin-old.h | 4 +- libnm/nm-vpn-service-plugin.c | 4 +- libnm/nm-vpn-service-plugin.h | 4 +- libnm/nm-wimax-nsp.h | 2 +- m4/compiler_options.m4 | 38 + man/NetworkManager.8 | 6 +- man/NetworkManager.conf.5 | 49 +- man/NetworkManager.conf.xml | 67 +- man/common.ent.in | 1 + man/nm-online.1 | 6 +- man/nm-settings-ifcfg-rh.5 | 96 +- man/nm-settings-ifcfg-rh.xml | 16 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 4 +- man/nm-settings.5 | 1076 +- man/nm-settings.xml | 193 +- man/nm-settings.xsl | 33 +- man/nmcli-examples.7 | 52 +- man/nmcli-examples.xml | 19 + man/nmcli.1 | 34 +- man/nmcli.xml | 29 +- man/nmtui.1 | 6 +- po/POTFILES.in | 3 + po/ar.po | 3129 +-- po/as.po | 3408 +-- po/be@latin.po | 3108 +-- po/bg.po | 3201 +-- po/bn_IN.po | 3444 +-- po/bs.po | 3122 +-- po/ca.po | 3473 +-- po/cs.po | 3198 +-- po/da.po | 3199 +-- po/de.po | 3516 +-- po/dz.po | 3128 +-- po/el.po | 3440 +-- po/en_CA.po | 3145 +-- po/en_GB.po | 3198 +-- po/eo.po | 3195 +-- po/es.po | 3600 +-- po/et.po | 3115 +-- po/eu.po | 3167 +-- po/fi.po | 3165 +-- po/fr.po | 3608 +-- po/gd.po | 3216 +-- po/gl.po | 3196 +-- po/gu.po | 3382 +-- po/he.po | 3108 +-- po/hi.po | 3438 +-- po/hr.po | 3198 +-- po/hu.po | 3256 +-- po/id.po | 3198 +-- po/it.po | 3488 +-- po/ja.po | 3503 +-- po/ka.po | 3135 +-- po/kn.po | 3411 +-- po/ko.po | 3479 +-- po/ku.po | 3136 +-- po/lt.po | 3504 +-- po/lv.po | 3132 +-- po/mk.po | 3108 +-- po/ml.po | 3378 +-- po/mr.po | 3410 +-- po/nb.po | 3112 +-- po/ne.po | 3129 +-- po/nl.po | 3115 +-- po/oc.po | 3150 +-- po/or.po | 3381 +-- po/pa.po | 3512 +-- po/pl.po | 2824 +-- po/pt.po | 3128 +-- po/pt_BR.po | 3467 +-- po/ru.po | 3483 +-- po/rw.po | 3132 +-- po/sk.po | 3155 +-- po/sl.po | 3191 +-- po/sq.po | 3119 +-- po/sr.po | 3217 +-- po/sr@latin.po | 3217 +-- po/sv.po | 3486 +-- po/ta.po | 3411 +-- po/te.po | 3399 +-- po/th.po | 3135 +-- po/tr.po | 3423 +-- po/uk.po | 3514 +-- po/vi.po | 3115 +-- po/wa.po | 3127 +-- po/zh_CN.po | 3840 ++-- po/zh_HK.po | 3142 +-- po/zh_TW.po | 3380 +-- shared/nm-setting-metadata.c | 104 + shared/nm-setting-metadata.h | 56 + shared/nm-utils/nm-glib.h | 8 +- shared/nm-utils/nm-macros-internal.h | 160 +- shared/nm-utils/nm-shared-utils.c | 50 +- shared/nm-utils/nm-shared-utils.h | 4 + shared/nm-utils/nm-test-utils.h | 151 +- shared/nm-utils/nm-udev-utils.c | 292 + shared/nm-utils/nm-udev-utils.h | 48 + shared/nm-version-macros.h | 11 +- shared/nm-version-macros.h.in | 7 +- src/NetworkManagerUtils.c | 61 +- src/NetworkManagerUtils.h | 2 +- src/devices/adsl/nm-atm-manager.c | 83 +- src/devices/adsl/nm-device-adsl.c | 73 +- src/devices/bluetooth/nm-bluez-device.c | 6 +- src/devices/bluetooth/nm-bluez-manager.c | 5 +- src/devices/bluetooth/nm-bt-error.c | 10 +- src/devices/bluetooth/nm-device-bt.c | 111 +- src/devices/bluetooth/nm-device-bt.h | 2 + src/devices/nm-arping-manager.c | 7 +- src/devices/nm-device-bond.c | 156 +- src/devices/nm-device-bridge.c | 22 +- src/devices/nm-device-dummy.c | 205 + src/devices/nm-device-dummy.h | 38 + src/devices/nm-device-ethernet.c | 283 +- src/devices/nm-device-factory.c | 8 +- src/devices/nm-device-generic.c | 8 +- src/devices/nm-device-infiniband.c | 30 +- src/devices/nm-device-ip-tunnel.c | 65 +- src/devices/nm-device-logging.h | 7 +- src/devices/nm-device-macsec.c | 115 +- src/devices/nm-device-macvlan.c | 16 +- src/devices/nm-device-private.h | 5 + src/devices/nm-device-tun.c | 14 +- src/devices/nm-device-veth.c | 2 +- src/devices/nm-device-vlan.c | 27 +- src/devices/nm-device-vxlan.c | 12 +- src/devices/nm-device.c | 2177 +- src/devices/nm-device.h | 96 +- src/devices/nm-lldp-listener.c | 4 +- src/devices/team/nm-device-team.c | 74 +- src/devices/tests/test-lldp.c | 14 +- src/devices/wifi/nm-device-olpc-mesh.c | 27 +- src/devices/wifi/nm-device-wifi.c | 544 +- src/devices/wifi/nm-wifi-ap.c | 181 +- src/devices/wifi/nm-wifi-ap.h | 14 +- src/devices/wifi/nm-wifi-utils.h | 10 +- src/devices/wwan/libnm-wwan.ver | 1 + src/devices/wwan/nm-device-modem.c | 51 +- src/devices/wwan/nm-modem-broadband.c | 34 +- src/devices/wwan/nm-modem-ofono.c | 60 +- src/devices/wwan/nm-modem.c | 192 +- src/devices/wwan/nm-modem.h | 23 +- src/dhcp/nm-dhcp-client-logging.h | 4 +- src/dhcp/nm-dhcp-client.c | 27 +- src/dhcp/nm-dhcp-client.h | 14 +- src/dhcp/nm-dhcp-dhclient-utils.c | 85 +- src/dhcp/nm-dhcp-dhclient-utils.h | 6 +- src/dhcp/nm-dhcp-dhclient.c | 30 +- src/dhcp/nm-dhcp-dhcpcd.c | 32 +- src/dhcp/nm-dhcp-listener.c | 2 +- src/dhcp/nm-dhcp-manager.c | 54 +- src/dhcp/nm-dhcp-systemd.c | 29 +- src/dhcp/nm-dhcp-utils.h | 4 +- src/dhcp/tests/test-dhcp-dhclient.c | 129 +- src/dns/nm-dns-manager.c | 226 +- src/dns/nm-dns-manager.h | 5 +- src/dns/nm-dns-plugin.c | 2 +- src/dns/nm-dns-systemd-resolved.c | 3 - src/dns/nm-dns-unbound.c | 7 +- src/dnsmasq/nm-dnsmasq-manager.c | 41 +- src/main-utils.c | 3 + src/main.c | 47 +- src/ndisc/nm-ndisc-private.h | 12 +- src/nm-act-request.c | 11 +- src/nm-act-request.h | 1 + src/nm-active-connection.c | 137 +- src/nm-active-connection.h | 12 +- src/nm-audit-manager.c | 11 +- src/nm-audit-manager.h | 7 +- src/nm-auth-manager.c | 7 +- src/nm-auth-subject.c | 12 +- src/nm-auth-utils.c | 6 +- src/nm-checkpoint.c | 154 +- src/nm-config-data.c | 12 +- src/nm-config-data.h | 2 + src/nm-config.c | 90 +- src/nm-config.h | 16 +- src/nm-connectivity.c | 658 +- src/nm-connectivity.h | 19 +- src/nm-core-utils.c | 276 +- src/nm-core-utils.h | 39 +- src/nm-default-route-manager.c | 292 +- src/nm-default-route-manager.h | 13 +- src/nm-dispatcher.c | 218 +- src/nm-dispatcher.h | 73 +- src/nm-exported-object.c | 8 +- src/nm-firewall-manager.c | 314 +- src/nm-firewall-manager.h | 6 +- src/nm-iface-helper.c | 22 +- src/nm-ip4-config.c | 51 +- src/nm-ip4-config.h | 4 +- src/nm-ip6-config.c | 72 +- src/nm-ip6-config.h | 8 +- src/nm-logging.c | 24 +- src/nm-logging.h | 79 +- src/nm-manager.c | 1002 +- src/nm-manager.h | 6 +- src/nm-netns.c | 176 + src/nm-netns.h | 47 + src/nm-pacrunner-manager.c | 373 +- src/nm-pacrunner-manager.h | 21 +- src/nm-policy.c | 477 +- src/nm-policy.h | 17 + src/nm-rfkill-manager.c | 137 +- src/nm-route-manager.c | 76 +- src/nm-route-manager.h | 9 +- src/nm-session-monitor.c | 18 +- src/nm-sleep-monitor.c | 8 +- src/nm-test-utils-core.h | 41 +- src/nm-types.h | 19 +- src/org.freedesktop.NetworkManager.conf | 30 +- src/platform/nm-fake-platform.c | 130 +- src/platform/nm-linux-platform.c | 556 +- src/platform/nm-linux-platform.h | 2 +- src/platform/nm-platform-utils.c | 25 +- src/platform/nm-platform-utils.h | 6 +- src/platform/nm-platform.c | 318 +- src/platform/nm-platform.h | 81 +- src/platform/nmp-netns.c | 2 +- src/platform/nmp-object.c | 94 +- src/platform/nmp-object.h | 26 +- src/platform/tests/test-cleanup.c | 12 +- src/platform/tests/test-common.c | 50 +- src/platform/tests/test-common.h | 22 +- src/platform/tests/test-general.c | 4 +- src/platform/tests/test-link.c | 14 +- src/platform/tests/test-nmp-object.c | 42 +- src/platform/tests/test-route.c | 174 +- src/platform/wifi/wifi-utils-nl80211.c | 81 +- src/platform/wifi/wifi-utils-nl80211.h | 2 +- src/platform/wifi/wifi-utils-private.h | 3 +- src/platform/wifi/wifi-utils-wext.c | 276 +- src/platform/wifi/wifi-utils-wext.h | 2 +- src/platform/wifi/wifi-utils.c | 19 +- src/platform/wifi/wifi-utils.h | 4 +- src/ppp/nm-ppp-manager.c | 57 +- src/settings/nm-agent-manager.c | 4 +- src/settings/nm-secret-agent.c | 2 +- src/settings/nm-secret-agent.h | 2 +- src/settings/nm-settings-connection.c | 229 +- src/settings/nm-settings-connection.h | 29 +- src/settings/nm-settings-plugin.h | 2 +- src/settings/nm-settings.c | 278 +- src/settings/nm-settings.h | 26 +- src/settings/plugins/ibft/nms-ibft-reader.h | 2 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-connection.c | 37 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 4 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 1429 +- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c | 134 +- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h | 6 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 1125 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.h | 4 + src/settings/plugins/ifcfg-rh/shvar.c | 158 +- src/settings/plugins/ifcfg-rh/shvar.h | 27 +- .../ifcfg-System_test-bridge-component-a.cexpected | 8 + .../ifcfg-System_test-bridge-component-b.cexpected | 17 + ...System_test-wired-802-1X-subj-matches.cexpected | 22 + .../network-scripts/ifcfg-Test_User_1.cexpected | 34 + .../ifcfg-Test_Write_Bond_Main.cexpected | 16 + .../ifcfg-Test_Write_Bridge_Component.cexpected | 8 + .../ifcfg-Test_Write_Permissions.cexpected | 11 + .../ifcfg-Test_Write_Proxy_Basic.cexpected | 15 + .../ifcfg-Test_Write_Team_Port.cexpected | 6 + .../ifcfg-Test_Write_VLAN_reorder_hdr.cexpected | 20 + .../ifcfg-Test_Write_WiFi_Band_A.cexpected | 18 + .../ifcfg-Test_Write_WiFi_Hidden.cexpected | 18 + .../ifcfg-Test_Write_WiFi_MAC_always.cexpected | 18 + .../ifcfg-Test_Write_WiFi_MAC_default.cexpected | 17 + .../ifcfg-Test_Write_WiFi_MAC_missing.cexpected | 18 + .../ifcfg-Test_Write_WiFi_MAC_never.cexpected | 18 + .../ifcfg-Test_Write_Wifi_LEAP.cexpected | 16 + .../ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected | 15 + ...ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected | 15 + .../ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected | 15 + .../ifcfg-Vlan_test-vlan-interface.cexpected | 22 + .../ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 | 11 + .../tests/network-scripts/ifcfg-aliasem3:1 | 4 + .../tests/network-scripts/ifcfg-dcb-test.cexpected | 41 + .../ifcfg-random_wifi_connection.cexpected | 13 + .../ifcfg-random_wifi_connection_2.cexpected | 15 + .../ifcfg-team-slave-enp31s0f1-142.cexpected | 12 + .../tests/network-scripts/ifcfg-test-bond-eth-type | 7 + .../ifcfg-test-static-routes-legacy.cexpected | 12 + .../network-scripts/route-test-wired-static-routes | 1 + .../route-test-wired-static-routes-legacy | 2 +- .../network-scripts/route6-test-wired-ipv6-manual | 2 + .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 572 +- .../plugins/ifnet/nms-ifnet-connection-parser.c | 157 +- .../plugins/ifnet/nms-ifnet-connection-parser.h | 2 +- src/settings/plugins/ifnet/nms-ifnet-net-utils.h | 4 +- .../plugins/ifupdown/nms-ifupdown-parser.h | 2 +- .../plugins/ifupdown/nms-ifupdown-plugin.c | 90 +- .../plugins/keyfile/nms-keyfile-connection.c | 16 + src/settings/plugins/keyfile/nms-keyfile-plugin.c | 13 +- src/settings/plugins/keyfile/nms-keyfile-reader.c | 28 +- src/settings/plugins/keyfile/nms-keyfile-reader.h | 7 +- src/settings/plugins/keyfile/nms-keyfile-writer.c | 94 +- src/settings/plugins/keyfile/nms-keyfile-writer.h | 6 +- .../keyfile/tests/keyfiles/Test_Wired_Connection | 2 + src/settings/plugins/keyfile/tests/test-keyfile.c | 101 +- src/supplicant/nm-supplicant-config.c | 105 +- src/supplicant/nm-supplicant-config.h | 8 +- src/supplicant/nm-supplicant-interface.c | 729 +- src/supplicant/nm-supplicant-interface.h | 26 +- src/supplicant/nm-supplicant-manager.c | 7 +- src/supplicant/nm-supplicant-settings-verify.c | 5 +- src/systemd/sd-adapt/env-util.h | 3 + src/systemd/sd-adapt/nm-sd-adapt.h | 2 +- src/systemd/src/basic/fileio.c | 149 +- src/systemd/src/basic/fileio.h | 3 + src/systemd/src/basic/fs-util.c | 29 +- src/systemd/src/basic/fs-util.h | 6 + src/systemd/src/basic/hexdecoct.c | 17 +- src/systemd/src/basic/hostname-util.c | 4 +- src/systemd/src/basic/in-addr-util.c | 12 + src/systemd/src/basic/in-addr-util.h | 2 + src/systemd/src/basic/log.h | 4 +- src/systemd/src/basic/parse-util.c | 1 - src/systemd/src/basic/path-util.c | 25 +- src/systemd/src/basic/path-util.h | 2 + src/systemd/src/basic/socket-util.c | 101 +- src/systemd/src/basic/socket-util.h | 7 +- src/systemd/src/basic/string-util.c | 11 +- src/systemd/src/basic/string-util.h | 5 +- src/systemd/src/basic/time-util.c | 32 +- src/systemd/src/basic/time-util.h | 11 + src/systemd/src/basic/util.c | 143 - src/systemd/src/basic/util.h | 2 - src/systemd/src/libsystemd-network/arp-util.c | 2 +- src/systemd/src/libsystemd-network/lldp-network.c | 21 + .../src/libsystemd-network/sd-dhcp-client.c | 9 + src/systemd/src/libsystemd-network/sd-ipv4acd.c | 2 - src/systemd/src/libsystemd-network/sd-ipv4ll.c | 6 + src/systemd/src/libsystemd-network/sd-lldp.c | 1 + src/systemd/src/libsystemd/sd-event/sd-event.c | 8 +- src/systemd/src/systemd/_sd-common.h | 4 +- src/systemd/src/systemd/sd-event.h | 2 +- src/systemd/src/systemd/sd-id128.h | 3 + src/systemd/src/systemd/sd-ipv4ll.h | 1 + src/tests/config/test-config.c | 2 +- src/tests/test-general-with-expect.c | 2 +- src/tests/test-general.c | 167 +- src/tests/test-ip6-config.c | 10 +- src/tests/test-route-manager.c | 71 +- src/tests/test-systemd.c | 2 + src/vpn/nm-vpn-connection.c | 234 +- src/vpn/nm-vpn-connection.h | 4 +- tools/create-exports-NetworkManager.sh | 7 +- tools/run-nm-test.sh | 30 +- 933 files changed, 159080 insertions(+), 145863 deletions(-) create mode 100644 docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml create mode 100644 docs/api/html/ch01.html create mode 100644 docs/api/html/dbus-secret-agent.html create mode 100644 docs/api/html/dbus-vpn-types.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html create mode 100644 docs/api/html/ref-dbus-access-points.html create mode 100644 docs/api/html/ref-dbus-active-connections.html create mode 100644 docs/api/html/ref-dbus-agent-manager.html create mode 100644 docs/api/html/ref-dbus-devices.html create mode 100644 docs/api/html/ref-dbus-dhcp4-configs.html create mode 100644 docs/api/html/ref-dbus-dhcp6-configs.html create mode 100644 docs/api/html/ref-dbus-dns-manager.html create mode 100644 docs/api/html/ref-dbus-ip4-configs.html create mode 100644 docs/api/html/ref-dbus-ip6-configs.html create mode 100644 docs/api/html/ref-dbus-manager.html create mode 100644 docs/api/html/ref-dbus-settings-manager.html create mode 100644 docs/api/html/ref-dbus-settings.html create mode 100644 docs/api/html/secret-agents.html create mode 100644 docs/api/html/settings-802-11-olpc-mesh.html create mode 100644 docs/api/html/settings-802-11-wireless-security.html create mode 100644 docs/api/html/settings-802-11-wireless.html create mode 100644 docs/api/html/settings-802-1x.html create mode 100644 docs/api/html/settings-802-3-ethernet.html create mode 100644 docs/api/html/settings-adsl.html create mode 100644 docs/api/html/settings-bluetooth.html create mode 100644 docs/api/html/settings-bond.html create mode 100644 docs/api/html/settings-bridge-port.html create mode 100644 docs/api/html/settings-bridge.html create mode 100644 docs/api/html/settings-cdma.html create mode 100644 docs/api/html/settings-connection.html create mode 100644 docs/api/html/settings-dcb.html create mode 100644 docs/api/html/settings-dummy.html create mode 100644 docs/api/html/settings-generic.html create mode 100644 docs/api/html/settings-gsm.html create mode 100644 docs/api/html/settings-infiniband.html create mode 100644 docs/api/html/settings-ip-tunnel.html create mode 100644 docs/api/html/settings-ipv4.html create mode 100644 docs/api/html/settings-ipv6.html create mode 100644 docs/api/html/settings-macsec.html create mode 100644 docs/api/html/settings-macvlan.html create mode 100644 docs/api/html/settings-ppp.html create mode 100644 docs/api/html/settings-pppoe.html create mode 100644 docs/api/html/settings-proxy.html create mode 100644 docs/api/html/settings-serial.html create mode 100644 docs/api/html/settings-team-port.html create mode 100644 docs/api/html/settings-team.html create mode 100644 docs/api/html/settings-tun.html create mode 100644 docs/api/html/settings-user.html create mode 100644 docs/api/html/settings-vlan.html create mode 100644 docs/api/html/settings-vpn.html create mode 100644 docs/api/html/settings-vxlan.html create mode 100644 docs/api/html/settings-wimax.html create mode 100644 docs/api/html/vpn-plugins.html create mode 100644 docs/libnm/html/NMDeviceDummy.html create mode 100644 docs/libnm/html/NMDeviceMacsec.html create mode 100644 docs/libnm/html/NMSettingDummy.html create mode 100644 docs/libnm/html/NMSettingMacsec.html create mode 100644 docs/libnm/html/usage.html create mode 100644 examples/nm-conf.d/31-mac-addr-change.conf create mode 100755 examples/python/gi/setting-user-data.py create mode 100644 introspection/org.freedesktop.NetworkManager.Device.Dummy.xml create mode 100644 libnm-core/nm-setting-dummy.c create mode 100644 libnm-core/nm-setting-dummy.h create mode 100644 libnm-core/nm-setting-user.c create mode 100644 libnm-core/nm-setting-user.h create mode 100644 libnm/nm-device-dummy.c create mode 100644 libnm/nm-device-dummy.h create mode 100644 shared/nm-setting-metadata.c create mode 100644 shared/nm-setting-metadata.h create mode 100644 shared/nm-utils/nm-udev-utils.c create mode 100644 shared/nm-utils/nm-udev-utils.h create mode 100644 src/devices/nm-device-dummy.c create mode 100644 src/devices/nm-device-dummy.h create mode 100644 src/nm-netns.c create mode 100644 src/nm-netns.h create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1 create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected create mode 100644 src/systemd/sd-adapt/env-util.h diff --git a/ChangeLog b/ChangeLog index 70a11a28..2897fda6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,22187 +1,13 @@ -2008-12-11 Dan Williams +Changelog for NetworkManager. - * Move NetworkManager to git.freedesktop.org - - git clone git://git.freedesktop.org/git/NetworkManager/NetworkManager.git +A separate changelog is no longer maintained since 2008. +See the latest version before removing it in git [1]. -2008-12-09 Dan Williams +For the detailed project history see git [2]. - * libnm-util/libnm-util.ver - libnm-util/nm-setting-ip4-config.c - libnm-util/nm-setting-ip4-config.h - - Add 'never-default' property, which when true indicates that a - connection should never be the default connection +For notable changes between releases see the NEWS file [3]. - * src/nm-ip4-config.c - src/nm-ip4-config.h - - (nm_ip4_config_get_never_default, nm_ip4_config_set_never_default): - Add never-default helpers - * src/NetworkManagerUtils.c - - (nm_utils_merge_ip4_config): update never-default when merging the - IP4 setting to the IP4 config - - * src/NetworkManagerSystem.c - - (nm_system_apply_ip4_config): if the connection is never-default, - don't add routes without a gateway - - * src/NetworkManagerPolicy.c - - (get_best_device): don't let never-default connections be the best - - (update_routing_and_dns): handle never-default for VPN connections - - * system-settings/plugins/ifcfg-rh/reader.c - - (make_ip4_setting): handle never-default by checking GATEWAYDEV - -2008-12-08 Dan Williams - - * src/vpn-manager/nm-vpn-connection.c - - (plugin_state_changed): clear secrets before setting the connection - state to FAILED, since doing so may destroy the connection itself, - since the NMVPNService owning this NMVPNConnection will unref it - when the NMVPNConnection is failed or stopped - -2008-12-05 Dan Williams - - Patch from Michael Biebl - - * libnm-glib/Makefile.am - - Bump libnm-glib revision to indicate new API - - Give libnm-util version info - - * libnm-util/Makefile.am - - Bump libnm-util soname to indicate API/ABI break with 0.6 - -2008-11-26 Dan Williams - - * Release NetworkManager 0.7 - -2008-11-26 Dan Williams - - * libnm-glib/nm-settings.c - libnm-glib/nm-settings.h - - (nm_exported_connection_delete): rename 'delete' to 'do_delete' to - avoid using C++ reserved keywords in headers - - * libnm-glib/nm-dbus-connection.c - system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c - system-settings/plugins/ifcfg-suse/nm-suse-connection.c - system-settings/plugins/ifupdown/nm-ifupdown-connection.c - system-settings/plugins/keyfile/nm-keyfile-connection.c - system-settings/src/nm-sysconfig-connection.c - - Change 'delete' to 'do_delete' - -2008-11-25 Dan Williams - - * system-settings/plugins/ifcfg-rh - - Rename 'ifcfg-fedora' to 'ifcfg-rh'; it's not just used on Fedora - - * system-settings/src/main.c - - (load_plugins): transparently handle ifcfg-fedora as ifcfg-rh - -2008-11-25 Dan Williams - - Patch from Tambet Ingo - - Fix mishandling of netlink error floods (rh #459205, novell #443429, lp #284507) - - * src/nm-netlink-monitor.c - - Remove bits for using a non-default GMainContext, which weren't used - - (nm_netlink_monitor_error_handler): don't leak the GError, and report - the actual error code - - * src/NetworkManager.c - - (nm_error_monitoring_device_link_state): disconnect error handler when - an error flood occurs to avoid pegging the CPU - -2008-11-23 Dan Williams - - * callouts/nm-dispatcher-action.c - - (construct_envp, nm_dispatcher_action): pass connection UUID to - scripts in the environment - -2008-11-21 Dan Williams - - Patch from Tambet Ingo - - * configure.in - libnm-util/libnm-util.ver - libnm-util/nm-setting-8021x.c - libnm-util/nm-setting-8021x.h - - Add configure-time option for the system CA path - - Add 'system-ca-certs' option to 802.1x setting, which directs - NetworkManager to use system CA certificates instead of any - connection-defined CA certificates - - * src/supplicant-manager/nm-supplicant-config.c - src/supplicant-manager/nm-supplicant-settings-verify.c - - Use system CA certificates if the connection says to do so - -2008-11-21 Dan Williams - - * src/nm-dbus-manager.c - src/nm-dbus-manager.h - - (nm_dbus_manager_get_name_owner): return error - - * src/nm-manager.c - - (impl_manager_activate_connection): perform additional validation on - ActivateConnection calls of user connections - - (is_user_request_authorized): ensure that the requestor is the same - UID as the UID that owns the user settings service; users shouldn't - be able to control another user's connections - -2008-11-21 Dan Williams - - * gfilemonitor/inotify-sub.c - - (dup_dirname): actually remove trailing '/' (bgo #561807) - -2008-11-21 Tambet Ingo - - * system-settings/plugins/ifcfg-suse/parser.c (read_wpa_eap_settings): Make suse - plugin compile again. - -2008-11-20 Dan Williams - - Patch from Tambet Ingo - - * libnm-util/nm-setting.c - libnm-util/nm-setting.h - - (NMSettingValueIterFn): instead of just a gboolean for secrets, take - all the GParamSpec flags of the property - - * system-settings/plugins/keyfile/nm-keyfile-connection.c - system-settings/plugins/keyfile/reader.c - system-settings/plugins/keyfile/writer.c - - Update for NMSettingValueIterFn change - -2008-11-20 Dan Williams - - * libnm-util/nm-utils.c - libnm-util/nm-utils.h - - More documentation updates - -2008-11-20 Dan Williams - - * libnm-util/libnm-util.ver - libnm-util/nm-utils.c - libnm-util/nm-utils.h - libnm-util/nm-utils-private.h - libnm-util/nm-connection.c - - (nm_utils_register_value_transformations): make private, called - from NMConnection registration anyway - -2008-11-20 Dan Williams - - * libnm-util/Makefile.am - libnm-util/nm-utils-private.h - - New header for internal utils private functions - - * libnm-util/libnm-util.ver - libnm-util/nm-utils.c - libnm-util/nm-utils.h - - Document some functions - - (nm_utils_string_in_list, nm_utils_string_list_contains, - nm_utils_string_slist_validate): un-export, only used within - libnm-util or of limited use in general, and very easy to - re-implement by apps if needed - - * libnm-util/nm-setting-8021x.c - libnm-util/nm-setting-wired.c - libnm-util/nm-setting-wireless-security.c - libnm-util/nm-setting-wireless.c - - Update for private nm_utils_string_* functions - -2008-11-20 Dan Williams - - * libnm-util/libnm-util.ver - libnm-util/nm-setting.c - libnm-util/nm-setting.h - - Add NMSetting errors - - (nm_setting_update_secrets): return errors - - * libnm-util/nm-connection.c - libnm-util/nm-connection.h - - (nm_connection_update_secrets): return errors - - * libnm-util/nm-setting-vpn.c - src/nm-activation-request.c - src/vpn-manager/nm-vpn-connection.c - - Handle update secrets errors - -2008-11-20 Dan Williams - - * libnm-util/nm-setting.c - libnm-util/nm-setting.h - libnm-util/libnm-util.ver - - (nm_setting_new_from_hash): rename from nm_setting_from_hash() to be - consistent with nm_connection_new_from_hash() - - * src/nm-activation-request.c - libnm-util/nm-connection.c - - Handle rename - -2008-11-19 Dan Williams - - * configure.in - Makefile.am - docs/libnm-util/Makefile.am - docs/libnm-util/libnm-util.types - - Start to document libnm-util - -2008-11-19 Dan Williams - - * libnm-util/nm-connection.h - libnm-util/nm-connection.c - - Document public functions - -2008-11-19 Dan Williams - - * libnm-util/nm-setting.h - libnm-util/nm-setting.c - src/nm-device.c - src/nm-manager.c - system-settings/plugins/ifcfg-fedora/plugin.c - - Prefix compare flag defines with NM_SETTING_ - -2008-11-19 Dan Williams - - * libnm-util/nm-connection.c - libnm-util/nm-connection.h - - (nm_connection_replace_settings): take a GError - - * libnm-glib/nm-settings.c - libnm-glib/nm-dbus-connection.c - src/nm-manager.c - system-settings/plugins/ifcfg-suse/nm-suse-connection.c - system-settings/plugins/keyfile/nm-keyfile-connection.c - system-settings/plugins/keyfile/plugin.c - - Handle, or don't handle, errors from nm_connection_replace_settings() - -2008-11-19 Dan Williams - - * libnm-util/libnm-util.ver - libnm-util/nm-connection.c - - (nm_setting_register, nm_setting_unregister): unexport; they are - private and don't have a use outside libnm-util - -2008-11-17 Dan Williams - - * src/nm-hso-gsm-device.c - - (real_connection_secrets_updated): handle PIN/PUK correctly for HSO - devices - -2008-11-17 Dan Williams - - * system-settings/plugins/ifcfg-fedora/reader.c - - (read_mac_address): clean up - - (make_wireless_setting): pass NULL array to read_mac_address() like it - expects - - * system-settings/plugins/ifcfg-fedora/plugin.c - - (read_one_connection): don't segfault on NULL errors - -2008-11-14 Dan Williams - - * Tag 0.7.0-rc2 - -2008-11-14 Dan Williams - - Handle gateways on different subnets - - * src/NetworkManagerSystem.c - - (add_ip4_route_to_gateway): gateway route should be link scope and - a host route - - (replace_default_ip4_route): use a destination address too; gateway - address should be /0; don't leak the gateway route object - -2008-11-14 Dan Williams - - * libnm-glib/libnm_glib.ver - libnm-glib/nm-dbus-settings-system.c - libnm-glib/nm-dbus-settings-system.h - - Add libnm-glib bits for CanModify - -2008-11-14 Dan Williams - - * introspection/nm-settings-system.xml - system-settings/src/dbus-settings.c - system-settings/src/dbus-settings.h - - Add a "CanModify" property to indicate if any plugins support - connection modification - -2008-11-14 Dan Williams - - Relicense libnm-glib to LGPLv2+ with agreement from contributors - -2008-11-14 Dan Williams - - * vpn-manager/nm-vpn-connection.c - - (plugin_state_changed): clear VPN secrets on error to ensure they - are always requested from the settings service (rh #429287) - -2008-11-13 Dan Williams - - * libnm-util/crypto.c - - (crypto_get_private_key_data): fix bad initial arg type checking - from pkcs#12 patch - -2008-11-13 Dan Williams - - Add support for PKCS#12 private keys (bgo #558982) - - * libnm-util/crypto.c - libnm-util/crypto.h - - (parse_old_openssl_key_file): rename from parse_key_file(); adapt to - take a GByteArray instead of a filename - - (file_to_g_byte_array): handle private key files too - - (decrypt_key): take a GByteArray rather than data + len - - (crypto_get_private_key_data): refactor crypto_get_private_key() into - one function that takes a filename, and one that takes raw data; - detect pkcs#12 files as well - - (crypto_load_and_verify_certificate): detect file type - - (crypto_is_pkcs12_data, crypto_is_pkcs12_file): add pkcs#12 detection - functions - - * libnm-util/crypto_gnutls.c - - (crypto_decrypt): take GByteArray rather than data + len; fix a bug - whereby tail padding was incorrectly handled, leading to erroneous - successes when trying to decrypt the data - - (crypto_verify_cert): rework somewhat - - (crypto_verify_pkcs12): validate pkcs#12 keys - - * libnm-util/crypto_nss.c - - (crypto_init): enable various pkcs#12 ciphers - - (crypto_decrypt): take a GByteArray rather than data + len - - (crypto_verify_cert): clean up - - (crypto_verify_pkcs12): validate pkcs#12 keys - - * libnm-util/test-crypto.c - - Handle pkcs#12 keys - - * libnm-util/nm-setting-8021x.c - libnm-util/nm-setting-8021x.h - libnm-util/libnm-util.ver - - Add two new properties, 'private-key-password' and - 'phase2-private-key-password', to be used in conjunction with - pkcs#12 keys - - (nm_setting_802_1x_set_ca_cert_from_file, - nm_setting_802_1x_set_client_cert_from_file, - nm_setting_802_1x_set_phase2_ca_cert_from_file, - nm_setting_802_1x_set_phase2_client_from_file): return certificate - type - - (nm_setting_802_1x_get_private_key_password, - nm_setting_802_1x_get_phase2_private_key_password): return private - key passwords - - (nm_setting_802_1x_set_private_key_from_file, - nm_setting_802_1x_set_phase2_private_key_from_file): set the private - key from a file, and update the private key password at the same time - - (nm_setting_802_1x_get_private_key_type, - nm_setting_802_1x_get_phase2_private_key_type): return the private - key type - - * src/supplicant-manager/nm-supplicant-settings-verify.c - - Whitelist private key passwords - - * src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_add_setting_8021x): for pkcs#12 private keys, - add the private key password to the supplicant config, but do not - add the client certificate (as required by wpa_supplicant) - -2008-11-12 Tambet Ingo - - * system-settings/plugins/keyfile/nm-keyfile-connection.c (copy_one_secret) - (add_secrets): Don't add empty secrets to the secrets hash table. - -2008-11-07 Dan Williams - - * libnm-util/nm-setting-wireless.c - - (nm_setting_wireless_get_seen_bssid): fix bug from accessor conversion - that cased this function to return garbage, breaking hidden AP - detection - -2008-11-07 Dan Williams - - Fix deletion of VPN gateway route on DHCP renew (bgo #558133) - - * src/NetworkManagerSystem.c - src/NetworkManagerSystem.h - - (nm_system_device_set_ip4_route): return the route that was added - - (nm_system_add_ip4_vpn_gateway_route): make add_vpn_gateway_route() - public, clean up, and return the route that was added - - (nm_system_apply_ip4_config): remove VPN related stuff to simplify, - since nm_system_add_ip4_vpn_gateway_route() is now available; add - flags to allow only certain attributes of the NMIP4Config to be - applied - - * src/nm-device.c - - (handle_dhcp_lease_change): don't touch the DHCP4 config on failure - - (nm_device_set_ip4_config): use nm_ip4_config_diff() to only apply - what's really changed between the old and new configs; don't export - the new IP4 config on failure; always send the DNS info to the - named manager - - * src/vpn-manager/nm-vpn-connection.c - - (device_ip4_config_changed, nm_vpn_connection_new, dispose): track the - parent device's IP4Config and re-add the VPN gateway route when it - changes - - (nm_vpn_connection_ip4_config_get): add the VPN gateway route (since - nm_system_apply_ip4_config() no longer does) and cache it for later - - (connection_state_changed): move cleanup code to its own function - - (vpn_cleanup): delete any previously added VPN gateway route; and - re-apply the parent device's addresses and routes using - nm_system_apply_ip4_config(), not nm_device_set_ip4_config() - -2008-11-07 Dan Williams - - * src/nm-ip4-config.c - src/nm-ip4-config.h - - (nm_ip4_config_diff): new function; return the difference between two - IP4 configs - - (nm_ip4_config_compare): change into nm_ip4_config_diff - -2008-11-05 Dan Williams - - * nm-ip4-config.c - nm-ip4-config.h - - (nm_ip4_config_compare): compare two IP4 configs - -2008-11-05 Dan Williams - - * src/NetworkManagerPolicy.c - - (update_etc_hosts): only add newline if not the last line of the file - (Jonathan Miner) - -2008-11-05 Dan Williams - - * src/dhcp-manager/nm-dhcp-dhclient.c - - (get_leasefile_for_iface): move lease files back to where dhclient - puts them - -2008-11-05 Michael Biebl - - * initscripts/Debian/NetworkManager - - Update to what Debian is actually using - -2008-11-05 Tambet Ingo - - * libnm-util/nm-setting-8021x.c: Verify PEAP settings as well. - -2008-11-03 Dan Williams - - * system-settings/src/main.c - - (add_default_dhcp_connection): make the fallback connection read-only - - * libnm-glib/nm-settings.c - libnm-glib/nm-settings.h - - Add detailed errors - - (impl_exported_connection_update, impl_exported_connection_delete): - return an error if the connection is read-only - - * system-settings/plugins/ifupdown/nm-ifupdown-connection.c - system-settings/plugins/keyfile/nm-keyfile-connection.c - system-settings/src/main.c - - Use more detailed errors - - * system-settings/src/nm-system-config-error.c - system-settings/src/nm-system-config-error.h - system-settings/src/dbus-settings.c - - Remove NM_SYSCONFIG_SETTINGS_ERROR_INVALID_CONNECTION, replaced by - NM_SETTINGS_ERROR_INVALID_CONNECTION - -2008-11-02 Dan Williams - - * Add license headers to everything in src/ - -2008-11-02 Dan Williams - - * Tag 0.7.0-rc1 - -2008-11-02 Dan Williams - - * src/NetworkManagerAP.c - - (nm_ap_new_fake_from_connection): treat only lack of a wireless security - setting as unencrypted; fixes a bug where NM wouldn't ask for new - secrets when connecting to an encrypted network failed - -2008-10-30 Dan Williams - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-ip6-config.c - libnm-util/nm-setting-ip6-config.h - libnm-util/Makefile.am - - Make properties private and add accessor functions - - Hide IPv6 stuff from public API, it's incomplete and completely unused - - * libnm-util/nm-connection.c - libnm-util/nm-utils.c - libnm-util/nm-utils.h - - Ignore IPv6 stuff for now - -2008-10-30 Dan Williams - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-8021x.c - libnm-util/nm-setting-8021x.h - - Make properties private and add accessor functions - - * src/supplicant-manager/nm-supplicant-config.c - system-settings/plugins/ifcfg-suse/parser.c - - Use 802.1x setting accessors - -2008-10-30 Dan Williams - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-wireless-security.c - libnm-util/nm-setting-wireless-security.h - - Make properties private and add accessor functions - - * libnm-util/nm-setting-wireless.c - src/NetworkManagerAP.c - src/nm-device-wifi.c - src/supplicant-manager/nm-supplicant-config.c - system-settings/plugins/ifcfg-fedora/reader.c - system-settings/plugins/ifcfg-suse/parser.c - - Use wireless security accessors - -2008-10-30 Dan Williams - - * src/nm-device-ethernet.c - src/nm-device-wifi.c - src/nm-device.c - src/ppp-manager/nm-ppp-manager.c - - Harmonize return checking of ioctl - - * system-settings/plugins/ifcfg-fedora/reader.c - - (is_wireless_device): fall back to SIOCGIWNAME (rh #466340) - -2008-10-30 Dan Williams - - * src/ppp-manager/nm-ppp-manager.c - - (nm_ppp_manager_start): if /dev/ppp doesn't exist, load the - ppp_generic module to create it (bgo #533064) - -2008-10-30 Dan Williams - - Patch from Alexander Sack - - Fix "ppp connections don't honour ip4 connection settings" - - * src/nm-device-ethernet.c - - (real_act_stage4_get_ip4_config): merge ip4config settings - with results from ppp manager - - * src/nm-serial-device.c - - (real_act_stage4_get_ip4_config): merge ip4config settings - with results from ppp manager - -2008-10-29 Dan Williams - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-ip4-config.c - libnm-util/nm-setting-ip4-config.h - - Make properties private and add accessor functions - - * callouts/nm-dispatcher-action.c - libnm-glib/libnm-glib-test.c - libnm-util/nm-utils.c - src/NetworkManagerPolicy.c - src/NetworkManagerSystem.c - src/NetworkManagerUtils.c - src/dhcp-manager/nm-dhcp-dhclient.c - src/dhcp-manager/nm-dhcp-manager.c - src/dnsmasq-manager/nm-dnsmasq-manager.c - src/nm-device-wifi.c - src/nm-device.c - src/nm-hso-gsm-device.c - src/nm-ip4-config.c - src/nm-ip4-config.h - src/ppp-manager/nm-ppp-manager.c - src/vpn-manager/nm-vpn-connection.c - system-settings/plugins/ifcfg-fedora/reader.c - system-settings/plugins/ifcfg-suse/parser.c - system-settings/plugins/ifcfg-suse/plugin.c - system-settings/plugins/ifupdown/parser.c - test/nm-tool.c - vpn-daemons/vpnc/properties/nm-vpnc.c - - Use IP4 accessor functions - -2008-10-29 Tambet Ingo - - Half of it by Dan Williams - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-vpn.c - libnm-util/nm-setting-vpn.h - - Make properties private and add accessor functions. - - * src/vpn-manager/nm-vpn-connection.c - src/vpn-manager/nm-vpn-manager.c - system-settings/plugins/keyfile/reader.c - vpn-daemons/openvpn/properties/auth-helpers.c - vpn-daemons/openvpn/properties/import-export.c - vpn-daemons/openvpn/properties/nm-openvpn.c - vpn-daemons/openvpn/src/nm-openvpn-service.c - vpn-daemons/pptp/auth-dialog/main.c - vpn-daemons/pptp/properties/advanced-dialog.c - vpn-daemons/pptp/properties/nm-pptp.c - vpn-daemons/pptp/src/nm-pptp-service.c - vpn-daemons/vpnc/properties/nm-vpnc.c - vpn-daemons/vpnc/src/nm-vpnc-service.c - - Use VPN setting accessors. - -2008-10-28 Dan Williams - - Patch from Tambet Ingo - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-wireless.c - libnm-util/nm-setting-wireless.h - - Make properties private and add accessor functions - - * src/NetworkManagerAP.c - src/nm-device-wifi.c - src/nm-manager.c - src/supplicant-manager/nm-supplicant-config.c - system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - system-settings/plugins/ifcfg-fedora/reader.c - system-settings/plugins/ifcfg-suse/parser.c - system-settings/plugins/ifupdown/parser.c - - Use wireless setting accessors - -2008-10-27 Dan Williams - - Patch from Tambet Ingo - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-ppp.c - libnm-util/nm-setting-ppp.h - - Make properties private and add accessor functions - - * src/ppp-manager/nm-ppp-manager.c - - Use ppp setting accessors - -2008-10-27 Dan Williams - - Patch from Tambet Ingo - - * libnm-util/nm-setting.h - libnm-util/nm-setting.c - - Make properties private and add accessor functions - - * libnm-util/nm-connection.c - libnm-util/nm-setting-8021x.c - libnm-util/nm-setting-cdma.c - libnm-util/nm-setting-connection.c - libnm-util/nm-setting-gsm.c - libnm-util/nm-setting-ip4-config.c - libnm-util/nm-setting-ip6-config.c - libnm-util/nm-setting-ppp.c - libnm-util/nm-setting-pppoe.c - libnm-util/nm-setting-serial.c - libnm-util/nm-setting-template.c - libnm-util/nm-setting-vpn.c - libnm-util/nm-setting-wired.c - libnm-util/nm-setting-wireless-security.c - libnm-util/nm-setting-wireless.c - system-settings/plugins/keyfile/reader.c - system-settings/plugins/keyfile/writer.c - - Use setting accessors - -2008-10-27 Dan Williams - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-connection.c - libnm-util/nm-setting-connection.h - - Add a 'read-only' property that indicates the connection cannot be - modified - - * system-settings/plugins/ifcfg-fedora/reader.c - system-settings/plugins/ifcfg-suse/parser.c - system-settings/plugins/ifupdown/parser.c - - These plugins are read-only at the moment - - * system-settings/plugins/keyfile/reader.c - system-settings/plugins/keyfile/writer.c - - Read-only shouldn't get saved out to files or read in from them - -2008-10-27 Tambet Ingo - - * src/nm-device-ethernet.c (nm_device_ethernet_get_speed): Implement - correct speed reporting for fast devices (kernel >= 2.6.27). - -2008-10-26 Dan Williams - - Attempt to compensate for modems that don't enable full AT parsing before - the PIN has been entered. - - * src/nm-gsm-device.c - - (init_modem): accept different init strings - - (init_done): try different init strings on failure - - (check_pin_done): on PIN success, do full modem init - -2008-10-26 Dan Williams - - Patch from Tambet Ingo - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-connection.c - libnm-util/nm-setting-connection.h - - Make properties private and add accessor functions - - * src/NetworkManagerPolicy.c - src/nm-cdma-device.c - src/nm-device-ethernet.c - src/nm-device-interface.c - src/nm-device-wifi.c - src/nm-gsm-device.c - src/nm-manager.c - src/ppp-manager/nm-ppp-manager.c - src/vpn-manager/nm-vpn-connection.c - system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - system-settings/plugins/ifcfg-fedora/plugin.c - system-settings/plugins/ifcfg-fedora/reader.c - system-settings/plugins/ifcfg-suse/parser.c - system-settings/plugins/ifupdown/parser.c - system-settings/plugins/keyfile/nm-keyfile-connection.c - system-settings/plugins/keyfile/plugin.c - system-settings/plugins/keyfile/writer.c - system-settings/src/main.c - - Use those accessors - -2008-10-26 Dan Williams - - Patch from Tambet Ingo - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-gsm.c - libnm-util/nm-setting-gsm.h - - Make properties private and add accessor functions - - * src/nm-gsm-device.c - src/nm-hso-gsm-device.c - src/ppp-manager/nm-ppp-manager.c - - Use those accessors - -2008-10-26 Dan Williams - - Patch from Tambet Ingo - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-cdma.c - libnm-util/nm-setting-cdma.h - - Make properties private and add accessor functions - - * src/nm-cdma-device.c - src/ppp-manager/nm-ppp-manager.c - - Use those accessors - -2008-10-26 Dan Williams - - Patch from Tambet Ingo - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-pppoe.c - libnm-util/nm-setting-pppoe.h - - Make properties private and add accessor functions - - * src/nm-device-ethernet.c - src/ppp-manager/nm-ppp-manager.c - - Use those accessors - -2008-10-26 Dan Williams - - Patch from Tambet Ingo - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-wired.c - libnm-util/nm-setting-wired.h - - Make properties private and add accessor functions - - * src/nm-device-ethernet.c - system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - system-settings/plugins/ifcfg-suse/parser.c - system-settings/src/main.c - - Use those accessors - -2008-10-26 Dan Williams - - Patch from Tambet Ingo - - * libnm-util/libnm-util.ver - libnm-util/nm-setting-serial.c - libnm-util/nm-setting-serial.h - src/nm-serial-device.c - - Make properties private and use accessors instead - -2008-10-26 Dan Williams - - * src/supplicant-manager/nm-supplicant-interface.c - src/supplicant-manager/nm-supplicant-interface.h - src/supplicant-manager/nm-supplicant-manager.c - src/supplicant-manager/nm-supplicant-manager.h - - Add state-to-string conversion functions - - * src/nm-device-wifi.c - src/nm-device-ethernet.c - - Normalize state info logging and use strings instead of numbers - -2008-10-26 Dan Williams - - * src/NetworkManagerPolicy.c - - (update_routing_and_dns): ignore host routes when determining whether - a VPN connection should own the default route (bgo #552594) - -2008-10-24 Dan Williams - - * src/nm-gsm-device.c - - (set_apn): remove erroneous spaces in AT+CGDCONT command (Jerone Young) - -2008-10-23 Dan Williams - - * src/ppp-manager/nm-ppp-manager.c - - (create_pppd_cmd_line): pppd always parses /etc/ppp/options, so always - add really important stuff to the command line to ensure that NM - overrides /etc/ppp/options (bgo #556781) - -2008-10-22 Dan Williams - - * src/NetworkManagerSystem.c - src/nm-device.c - - Use the device's IP interface where appropriate (Per Hallsmark) - -2008-10-22 Dan Williams - - * src/nm-gsm-device.c - - (schedule_automatic_registration_again): use a short timeout here - instead of an idle handler to avoid using too much CPU polling for - something we should be waiting a bit for anyway - -2008-10-22 Dan Williams - - * include/NetworkManager.h - introspection/nm-device.xml - - Add device state change reason for carrier changes - - * src/nm-device-ethernet.c - - (set_carrier): use the carrier change reason when changing device - state in response to carrier changes - -2008-10-21 Dan Williams - - * src/NetworkManagerPolicy.c - - (update_etc_hosts): don't leak errors, and ensure that - g_file_set_contents() gets a valid error placeholder (rh #461933) - -2008-10-21 Dan Williams - - * src/nm-manager.c - - (free_get_settings_info): don't use the DBusGProxy which could be - disposed of by the time the function is called - - (internal_new_connection_cb): save connection scope - - (connection_get_settings_cb): don't replace a connection unless it's - actually different from the existing one; fixes an issue where - killing the settings service wouldn't deactivate an active connection - provided by that settings service, because it was using a connection - that had already been replaced in the system or user hash - -2008-10-21 Dan Williams - - * src/NetworkManager.c - - (main): keep the DHCP manager around since it's a singleton; fixes - a use-after-free exposed by r4196 since the DHCP manager singleton - variable isn't cleared when the DHCP manager object is finalized - -2008-10-20 Dan Williams - - * libnm-util/nm-setting-wireless-security.c - - (verify): accept 'none' as a pairwise cipher with Ad-Hoc WPA connections - -2008-10-20 Dan Williams - - * src/supplicant-manager/nm-supplicant-config.c - - (ADD_STRING_LIST_VAL): don't add empty values to the supplicant config - -2008-10-20 Dan Williams - - * src/dhcp-manager/nm-dhcp-manager.c - - (nm_dhcp_manager_get): fix mismatched refcount; creating the dhcp - manager object already refs it once - - (nm_dhcp_manager_cancel_transaction_real): clear freed variables that - also get cleaned up by nm_dhcp_device_destroy() to prevent - double-frees - -2008-10-20 Dan Williams - - * src/nm-manager.c - - (initial_get_connections): use private dbus manager, don't keep - ref-ing the singleton. Fixes mismatched refcounts of the dbus - manager object. - -2008-10-18 Dan Williams - - * libnm-glib/nm-settings.c - libnm-glib/nm-settings.h - - Rename the "get_secrets" virtual function "service_get_secrets" to - clarify when it's used; NMExportedConnetion is a base-class for both - the client and service side, which is sort of confusing, and - get_secrets only makes sense on the service side. - - * libnm-glib/nm-dbus-connection.c - - (get_secrets): remove, unused, and clients need to do extra work to - get secrets anyway since the call can block on the remote side - - * system-settings/plugins/ifupdown/nm-ifupdown-connection.c - system-settings/plugins/keyfile/nm-keyfile-connection.c - - Fix up for get_secrets -> service_get_secrets - -2008-10-16 Dan Williams - - * src/nm-device-wifi.c - - (constructor): correctly determine encryption capabilities - -2008-10-15 Dan Williams - - * src/nm-device-wifi.c - - (wireless_qual_to_percent): fix quality calculation in a fallback case - (Johannes Berg) - -2008-10-15 Dan Williams - - * src/NetworkManagerSystem.c - - (ip4_dest_in_same_subnet): tighter checks on subnet matching, - if the ip4_dest is in a smaller subnet contained within a subnet - the machine is currently on, the destination is in the same subnet - - (nm_system_device_set_ip4_route): move subnet checks to callers - - (add_vpn_gateway_route): check if the VPN gateway is in the same - subnet as the parent device, and if so, don't add the direct - host route via the parent device's gateway (bgo #481620) - - (nm_system_apply_ip4_config): check whether the route to be added - is contained within a subnet the device is already on - -2008-10-11 Dan Williams - - * include/NetworkManager.h - introspection/nm-device.xml - include/NetworkManagerVPN.h - - Add a few more state reasons for the device deactivated state - - * src/nm-device-interface.c - src/nm-device-interface.h - - (nm_device_interface_deactivate): add a 'reason' argument - - * src/nm-device.c - src/nm-device.h - - (nm_device_deactivate, nm_device_take_down): add a 'reason' argument - - (nm_device_state_changed): pass the state change reason to - nm_device_take_down() - - (nm_device_set_managed): take a 'reason' argument, and pass it along - to the state change function - - * src/nm-manager.c - src/nm-manager.h - - (remove_one_device, handle_unmanaged_devices, sync_devices, - impl_manager_sleep): pass a reason code to nm_device_set_managed() - - (nm_manager_deactivate_connection): add a 'reason' argument and pass - something reasonable along to VPN deactivation - - * src/vpn-manager/nm-vpn-manager.c - src/vpn-manager/nm-vpn-manager.h - - (nm_vpn_manager_deactivate_connection): add a 'reason' argument and - pass that along to nm_vpn_connection_disconnect() - -2008-10-11 Dan Williams - - * src/nm-device-wifi.c - - (can_scan): remove old madwifi hack for not scanning while connected - -2008-10-11 Dan Williams - - Add support for VPN subnet gateways (bgo #549196) - - * include/NetworkManager.h - - Add key for internal VPN subnet gateway - - * src/vpn-manager/nm-vpn-connection.c - - (ip_address_to_string): return a const from a static buffer so we - don't leak a lot of strings - - (print_vpn_config): print internal VPN gateway as well - - (nm_vpn_connection_ip4_config_get): grab internal VPN gateway from - VPN service too - - (nm_vpn_connection_get_ip4_internal_gateway): new function - - * src/NetworkManagerSystem.c - src/NetworkManagerSystem.h - - (nm_system_device_replace_default_ip4_route): split into two, one for - VPN connections and one for normal devices - - (replace_default_ip4_route): break out route stuff into its own function - - (nm_system_replace_default_ip4_route_vpn, - nm_system_replace_default_ip4_route): simplify by having two cases, - one for VPNs and one for normal devices - - * src/NetworkManagerPolicy.c - - (update_routing_and_dns): simplify, use split default route replacement - functions - -2008-10-10 Dan Williams - - Rework default route handling to consolidate decisions in the policy, - and to take active VPN connections into account when changing the default - route (bgo #545912) - - * src/NetworkManager.c - - (main): pass the vpn_manager to the policy so it knows about active - VPN connections; clean up the named manager which wasn't done before - - * src/NetworkManagerPolicy.c - src/NetworkManagerPolicy.h - - (nm_policy_new): get a clue about the vpn_manager - - (update_default_route): remove, fold into update_routing_and_dns() - - (update_routing_and_dns): handle active VPN connections too; an - active VPN connection becomes the default route if it does not have - server-specified or user-specified custom routes. Otherwise, the - best active device gets the default route - - (vpn_connection_activated, vpn_connection_deactivated, nm_policy_new, - nm_policy_destroy): track VPN connection activation and deactivation - and update the default route when appropriate - - * src/NetworkManagerSystem.c - src/NetworkManagerSystem.h - - (nm_system_vpn_device_unset_from_ip4_config): remove, put functionality - in the VPN connection itself - - (nm_system_vpn_device_set_from_ip4_config, - nm_system_device_set_from_ip4_config): merge together to make - nm_system_apply_ip4_config() - - (add_vpn_gateway_route): add a route to the VPN's external gateway - via the parent device - - (nm_system_apply_ip4_config): simplify - - (add_ip4_route_to_gateway): new function; add a direct route to the - gateway if needed - - (nm_system_device_replace_default_ip4_route): simplify, break gateway - route stuff out into add_ip4_route_to_gateway() for clarity - - * src/nm-device.c - - (nm_device_set_ip4_config): update for nm_system_apply_ip4_config() - - * src/vpn-manager/nm-vpn-connection.c - src/vpn-manager/nm-vpn-connection.h - - (nm_vpn_connection_get_ip4_config, nm_vpn_connection_get_ip_iface, - nm_vpn_connection_get_parent_device): add - - (nm_vpn_connection_ip4_config_get): make the requirement of a tunnel - device explicit - - (connection_state_changed): update the named manager now that - nm_system_vpn_device_unset_from_ip4_config() is gone; do something - useful on errors - - * src/vpn-manager/nm-vpn-manager.c - src/vpn-manager/nm-vpn-manager.h - - Add a 'connection-activated' signal - - (nm_vpn_manager_get_active_connections): new function; mainly for the - policy to find out about active VPN connections - -2008-10-10 Tambet Ingo - - * src/nm-logging.c (nm_logging_setup): Don't use LOG_CONS when running as - a daemon to prevent NM logging spew on console on startup and shutdown (due - to dependency loop between NM and syslog). - -2008-10-10 Alexander Sack - - Implement managed mode. We bind devices configured in /etc/network/interfaces - to their connections by updating wired/wireless setting with the - mac address of the device. - - * system-settings/plugins/ifupdown/plugin.c - - (get_net_address_for_udi): implement function to retrieve MAC - address of udi from hal in GByteArray format - - (bind_device_to_connection): bind mac address of device to - wired/wireless system connection - - (hal_device_added_cb): call bind_device_to_connection for - system connections with a matching interface.name - - (hal_device_added_cb): ensure that all code paths - properly free the "iface" string. - -2008-10-10 Alexander Sack - - Parse nm-system-settings.conf and allow admins to either use managed and unmanaged - mode of the ifupdown system config plugin. - - * system-settings/plugins/ifupdown/plugin.c - - (SCPluginIfupdown_init): parse nm-system-settings.conf keyfile and set - private unmanage_well_known state field accordingly - -2008-10-10 Alexander Sack - - Implement unmanaged mode that will prevent all devices in the - well_known_udis set from being touched by NetworkManager - - * system-settings/plugins/ifupdown/plugin.c - - (typedef struct SCPluginIfupdownPrivate): add gboolean - unmanage_well_known field used to turn on/off unmanaged - mode - - (hal_device_added_cb,hal_device_remove_cb): emit |unmanaged-devices-changed| - signal when well_known_udis get added/removed - - (SCPluginIfupdown_get_unmanaged_devices): return all well_known_udis - if we are in unmanaged mode - -2008-10-10 Alexander Sack - - Add support to track network devices that have a configuration - with a matching interface.name in /etc/network/interfaces - - * system-settings/plugins/ifupdown/plugin.c - - (typedef struct SCPluginIfupdownPrivate): add hash table - to track |well_known_udis| - - (get_iface_for_udi): helper function to get interface.name - for a udi - - (hal_device_added_cb, hal_device_removed_cb): callbacks - that add and remove devices to and from the well_known_udis - set depending on whether their |interface.name| matches - any interface definition in /etc/network/interfaces - - (SCPluginIfupdown_init): connect callbacks from above with - hal_mgr and setup well_known_udis hashtable - - (GObject__dispose): destroy well_known_udis hashtable - - (hal_device_added_cb2): implement wrapper callback with GFunc - signature. user_data is supposed to be a triple (hal_mgr, - config and devtype) - - (SCPluginIfupdown_init): bootstrap wired and wifi devices for - startup and call hal_device_added_cb2 - -2008-10-10 Alexander Sack - - Remove implementation for not used NMSystemConfigInterface callback functions - in ifupdown plugin - - * system-settings/plugins/ifupdown/plugin.c - - (SCPluginIfupdown_unmanaged_devices_changed): removed - - (SCPluginIfupdown_connection_added): removed - -2008-10-08 Dan Williams - - Add a 'hostname' dispatcher action triggered on hostname changes (bgo #552983) - - * src/NetworkManagerUtils.c - - (nm_utils_call_dispatcher): add a 'hostname' action - - * src/NetworkManagerPolicy.c - - (set_system_hostname): dispatch hostname changes - - * callouts/nm-dispatcher-action.c - - (nm_dispatcher_action): handle 'hostname' actions - -2008-10-08 Dan Williams - - * src/NetworkManagerSystem.c - - (find_route): ref the route so it doesn't get destroyed when the cache - is cleared - - (nm_system_device_set_priority): unref the route here after it's done - being used - -2008-10-08 Dan Williams - - * src/nm-serial-device.c - - Turn on serial debugging when NM_SERIAL_DEBUG is set in the environment - -2008-10-08 Tambet Ingo - - * system-settings/plugins/keyfile/nm-keyfile-connection.c (update): Update the - connection with new settings before saving it. - -2008-10-06 Dan Williams - - * src/nm-ip4-config.c - src/nm-ip4-config.h - - nm_ip4_config_is_exported -> nm_ip4_config_get_dbus_path - - * src/nm-device-interface.c - - (nm_device_interface_init): make 'ip4-config' a boxed property of type - DBUS_TYPE_G_OBJECT_PATH so that we can make it NULL when we need to - by using '/' for the object path - - * src/nm-device.c - - (src/nm-device.c): marshal missing/unexported ip4-config through - dbus as '/' since dbus-glib can't handle NULL objects nor can - dbus handle NULL object paths - -2008-10-03 Alexander Sack - - Implement system hostname support for debian/ubuntu - - * system-settings/plugins/ifupdown/plugin.c - - (GObject__get_property): extend announced capabilities; add - NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_HOSTNAME support - - (GObject__set_property,write_system_hostname): implement - NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_HOSTNAME capability. - - (GObject__set_property, GObject__get_property, SCPluginIfupdown_init, - update_system_hostname, get_hostname): - implement hostname property that watches and - parses /etc/hostname - -2008-10-03 Alexander Sack - - * system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c - system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - system-settings/plugins/ifcfg-fedora/Makefile.am - system-settings/src/nm-inotify-helper.c - system-settings/src/nm-inotify-helper.h - src/Makefile.am - - Move ifcfg-fedora inotify helpers to the system settings service so - they are available to all plugins - -2008-10-03 Alexander Sack - - Implement support for wep-tx-keyidx in ifupdown system - config plugin. - - * system-settings/plugins/ifupdown/parser.c - - (update_wireless_security_setting_from_if_block): introduce - free_type_mapping func table; rename a few local - variables to improve readability; add wpa security mapping - for wep-tx-keyidx property - - (string_to_gpointerint): new function used for the auto_type_mapping - of new wep-tx-keyidx property - - (slist_free_all): free func used for mapped slist types - -2008-10-03 Alexander Sack - - * system-settings/src/main.c: - - (add_default_dhcp_connection, device_removed_cb): ensure the UDI is - always used as the hash key; fixes a crash when removing wired - devices - -2008-10-02 Dan Williams - - * src/nm-gsm-device.c - - (enter_pin_done, enter_pin, check_pin_done, real_act_stage1_prepare): - pass the required GSM secret along via user_data rather than keeping - it around in the private data where it sometimes didn't get cleared - - (real_get_ppp_name): implement using the GSM username - -2008-10-02 Dan Williams - - * src/ppp-manager/nm-ppp-manager.c - src/ppp-manager/nm-ppp-manager.h - - (impl_ppp_manager_need_secrets): tries secrets twice before asking - the settings daemon for completely new ones - - (create_pppd_cmd_line): new parameter 'ppp_name' used to set the - local PPP peer name; allow PPP debuging by launching NM with - the environment variable NM_PPP_DEBUG defined - - (nm_ppp_manager_start): new parameter 'ppp_name' passed to - create_pppd_cmd_line() - - * src/nm-serial-device.c - src/nm-serial-device.h - - New 'get_ppp_name' function for subclasses to implement to return the - local PPP peer name - - (real_act_stage2_config): call 'get_ppp_name' function of subclasses - and pass that name to the PPP manager - - * src/nm-device-ethernet.c - - (pppoe_stage2_config): pass the PPPoE username to the PPP manager as - the local peer name - - * src/nm-cdma-device.c - - (real_get_ppp_name): implement using the CDMA username - -2008-10-02 Dan Williams - - Patch from Alexander Sack - - * system-settings/plugins/ifupdown/parser.c - - Implement more graceful ip4 config parsing for cases where - /etc/network/interfaces omits basic ip4 settings, such as gateway etc - by using default values - -2008-10-02 Dan Williams - - * src/NetworkManagerPolicy.c - - (device_state_changed): when marking a connection invalid, clear its - secrets too so that fresh secrets get requested the next time - -2008-10-01 Dan Williams - - * system-settings/src/dbus-settings.c - - (nm_sysconfig_settings_init): cache system hostname on startup as - a fallback if no plugin provides a hostname - - (get_property): fall back to cached hostname if no plugin provides - a hostname - -2008-10-01 Dan Williams - - Fix setting value comparison issue that caused some settings to look the - same when they were really different (rh #464417) - - * libnm-util/nm-param-spec-specialized.c - - (type_is_fixed_size): return fundamental size of the fixed type too - - (nm_gvalues_compare_collection): use the fundamental fixed type size - in the comparison so that the _entire_ fixed type collection gets - compared rather than just the first 'len1' bytes - -2008-09-30 Dan Williams - - * src/NetworkManagerPolicy.c - - (lookup_thread_worker): don't store the idle handler ID because the - idle handler could have already run and freed the LookupThread - structure - -2008-09-30 Tambet Ingo - - * src/nm-device.c (nm_device_get_priority): Implement. - (nm_device_set_ip4_config): Send the device priority to system ip4 - config setter. - - * src/NetworkManagerSystem.c (nm_system_device_set_from_ip4_config): - Add priority argument and if it's >= 0, set the priority of the network - route added automatically by netlink (or kernel?). - (nm_system_device_set_priority): Implement. - - * src/NetworkManagerPolicy.c (get_best_device): Use - nm_device_get_priority() instead of home-grown version. Revert the - meaning, best priority is the lowest one. - -2008-09-29 Dan Williams - - Handle ipw3945 suspend/resume by retrying the GIWRANGE request a few times - when it returns EAGAIN (rh #362421) - - * src/nm-device-wifi.c - - (wireless_get_range): try GIWRANGE a few times until the card responds - - (real_get_generic_capabilities, constructor): use wireless_get_range() - -2008-09-28 Dan Williams - - * src/nm-serial-device.c - src/nm-serial-device.h - - (nm_serial_device_close): stop PPP manager here so that PPP gets - cleaned at the right times when subclasses close the serial port too - - (nm_serial_device_send_command): use a default send delay; don't - spin forever on EAGAIN - - (get_reply_done, get_reply_got_data, nm_serial_device_get_reply): - remove, no longer used - - (find_response): return the matched response if any - - (nm_serial_device_wait_reply_blocking): wait for a reply but block - while doing so - - (wait_for_reply_done): pass the matched response to the callback - - (wait_for_reply_got_data): save the matched response; simplify timeout - handling - - (nm_serial_device_wait_for_reply): make 'responses' and 'terminators' - const since they never get modified - - (cleanup_device): split out common cleanup stuff to a new function - - (real_deactivate_quickly, finalize): use cleanup_device() - - * src/nm-gsm-device.c - - (modem_get_reply): remove, unused - - (set_apn): give the card a bit more time to respond - - (manual_registration_again, schedule_manual_registration_again, - manual_registration_response, manual_registration): handle manual - registration timeouts better by retrying registration a few times - because cards are a bit slow after CFUN=1 - - (automatic_registration_get_network, get_network_response): use - modem_wait_for_reply() because it interacts better with the serial - buffer and does more intelligent matching; need to wait for 'OK' - rather than just matching terminators - - (schedule_automatic_registration_again, - automatic_registration_response, automatic_registration): retry - registration a few times on timeout or "searching" because cards - take a bit to find a network after being powered up with CFUN=1 - - (power_up_response, power_up, init_full_done, enter_pin, - check_pin_done): power up the card with CFUN=1 before trying to - register with the network - - (init_modem_full, init_modem): use more standard 3G init strings - - * src/nm-hso-gsm-device.c - - (modem_get_reply): remove, unused - - (hso_ip4_config_response, real_act_stage3_ip_config_start): use - modem_wait_for_reply() to match actual responses instead of single - termination characters; it doesn't leave stuff in the serial buffer - that might confuse later calls - - (real_deactivate_quickly): use nm_serial_device_wait_reply_blocking() - to ensure that the call is really disconnected and not leave extra - stuff in the serial buffer - - * src/nm-cdma-device.c - - (power_up_response, power_up, init_done): try Sierra-style modem - power up before attempting to connect - -2008-09-27 Dan Williams - - * libnm-util/nm-setting-gsm.c - - (verify): verify GSM network ID - -2008-09-25 Dan Williams - - * libnm-util/nm-setting-gsm.c - libnm-util/nm-setting-gsm.h - - Fix up NM_GSM_NETWORK_* constants to accurately reflect the network - technology terms (bgo #551361) - -2008-09-25 Dan Williams - - Fix bgo #549401 (inspired by patch from Alexander Sack) - - * src/nm-device-ethernet.c - - (finish_supplicant_task): clean up scheduled tasks and free memory - - (remove_supplicant_interface_error_handler): remove the supplicant - error idle callback too - - (supplicant_interface_release): rename from supplicant_interface_clean - to match nm-device-wifi.c; clean up supplicant interface-related - state tasks when the supplicant interface is disposed of - - (schedule_state_handler): add scheduled tasks to a list so they can - be cleaned up later - - (supplicant_mgr_state_cb_handler, supplicant_iface_state_cb_handler, - supplicant_iface_connection_state_cb_handler): use - finish_supplicant_task() to clean up each completed task - - (supplicant_iface_connection_error_cb_handler, - supplicant_connection_timeout_cb): clear source id when the task is - complete - - (supplicant_iface_connection_error_cb): save scheduled task id for - later cleanup - - (nm_device_ethernet_dispose): clean up any pending supplicant state - tasks - - * src/nm-device-wifi.c - - (finish_supplicant_task): clean up scheduled tasks and free memory - - (remove_supplicant_interface_error_handler): remove the supplicant - error idle callback too - - (supplicant_interface_release): clean up supplicant interface-related - state tasks when the supplicant interface is disposed of - - (schedule_state_handler): add scheduled tasks to a list so they can - be cleaned up later - - (supplicant_mgr_state_cb_handler, supplicant_iface_state_cb_handler, - supplicant_iface_connection_state_cb_handler): use - finish_supplicant_task() to clean up each completed task - - (supplicant_iface_connection_error_cb_handler): clear source id when - the task is complete - - (supplicant_iface_connection_error_cb): save scheduled task id for - later cleanup - - (nm_device_wifi_dispose): clean up any pending supplicant state tasks - -2008-09-24 Tambet Ingo - - * system-settings/plugins/keyfile/plugin.c: Implement unmanaged_devices - method and get/set hostname property. - -2008-09-24 Tambet Ingo - - * src/supplicant-manager/nm-supplicant-interface.c - (nm_supplicant_interface_disconnect): Don't increment the reference - count when disconnecting. The problem is on shutdown, when the replies - to these commands do not arrive before NM exits, resulting on never - calling supplicant interface's dispose(), which removes the interface - from supplicant. - -2008-09-24 Tambet Ingo - - * libnm-glib/nm-vpn-plugin-ui-interface.c: Add type checking to - all the public function arguments. - -2008-09-22 Tambet Ingo - - * src/vpn-manager/nm-vpn-connection.c: Add a signal handler for the - "Failure" signal from VPN plugins, store the failure reason, and - use it when the state is changed to failure. - - * introspection/nm-vpn-plugin.xml: Fix the "Failure" signal's type - description. - - * include/NetworkManagerVPN.h (NMVPNConnectionStateReason): Add a new - reason to the end of the list to not break the API. - (NMVPNPluginFailure): Move it here (from libnm-glib/nm-vpn-plugin.h) - so it can be shared by plugins and daemon. - -2008-09-18 Dan Williams - - Patch from Alexander Sack - - * configure.in - system-settings/plugins/Makefile.am - system-settings/plugins/ifupdown/Makefile.am - system-settings/plugins/ifupdown/interface_parser.c - system-settings/plugins/ifupdown/interface_parser.h - system-settings/plugins/ifupdown/nm-ifupdown-connection.c - system-settings/plugins/ifupdown/nm-ifupdown-connection.h - system-settings/plugins/ifupdown/parser.c - system-settings/plugins/ifupdown/parser.h - system-settings/plugins/ifupdown/plugin.c - system-settings/plugins/ifupdown/plugin.h - - Implement a Debian/Ubuntu legacy network configuration plugin - (gnome.org #551941) - -2008-09-18 Dan Williams - - Implement support for honoring configured and automatic hostnames, and for - setting the configured hostname. - - * introspection/nm-ip4-config.xml - src/nm-ip4-config.c - src/nm-ip4-config.h - src/dhcp-manager/nm-dhcp-manager.c - - Remove useless hostname property; it's not really part of the IPv4 - config - - * introspection/nm-settings-system.xml - libnm-glib/nm-dbus-settings-system.c - libnm-glib/nm-dbus-settings-system.h - - Add SetHostname() call to system settings D-Bus interface - - Add Hostname property to system settings D-Bus interface - - (nm_dbus_settings_system_save_hostname, - nm_dbus_settings_system_get_hostname): implement - - * src/nm-device.c - src/nm-device.h - - (nm_device_get_dhcp4_config): implement - - * src/nm-manager.c - src/nm-manager.h - - Fetch and track system settings service hostname changes, and proxy - the changes via a GObject property of the manager - - * system-settings/src/nm-system-config-interface.c - system-settings/src/nm-system-config-interface.h - - Replace nm_system_config_interface_supports_add() with a capabilities - bitfield - - * system-settings/src/nm-system-config-error.c - system-settings/src/nm-system-config-error.h - - Add additional errors - - * system-settings/src/dbus-settings.c - system-settings/src/dbus-settings.h - - (get_property, nm_sysconfig_settings_class_init): add hostname - property; first plugin returning a hostname wins - - (impl_settings_add_connection): use plugin capabilities instead of - nm_system_config_interface_supports_add() - - (impl_settings_save_hostname): implement hostname saving - - * src/NetworkManagerPolicy.c - - (lookup_thread_run_cb, lookup_thread_worker, lookup_thread_new, - lookup_thread_die): implement an asynchronous hostname lookup thread - which given an IPv4 address tries to look up the hostname for that - address with reverse DNS - - (get_best_device): split out best device code from - update_routing_and_dns() - - (update_etc_hosts): update /etc/hosts with the machine's new hostname - to preserve the 127.0.0.1 reverse mapping that so many things require - - (set_system_hostname): set a given hostname - - (update_system_hostname): implement hostname policy; a configured - hostname (from the system settings service) is used if available, - otherwise an automatically determined hostname from DHCP, VPN, etc. - If there was no automatically determined hostname, reverse DNS of - the best device's IP address will be used, and as a last resort the - hostname 'localhost.localdomain' is set. - - (update_routing_and_dns): use get_best_device(); update the system - hostname when the network config changes - - (hostname_changed): update system hostname if the system settings - service signals a hostname change - - (nm_policy_new): list for system settings service hostname changes - - (nm_policy_destroy): ensure that an in-progress hostname lookup thread - gets told to die - - * system-settings/plugins/keyfile/plugin.c - system-settings/plugins/ifcfg-suse/plugin.c - - (get_property, sc_plugin_ifcfg_class_init): implement hostname and - capabilities properties - - * system-settings/plugins/ifcfg-fedora/shvar.c - - (svOpenFile): re-enable R/W access of ifcfg files since the plugin - writes out /etc/sysconfig/network now - - * system-settings/plugins/ifcfg-fedora/plugin.c - - (plugin_get_hostname): get hostname from /etc/sysconfig/network - - (plugin_set_hostname): save hostname to /etc/sysconfig/network - - (sc_network_changed_cb): handle changes to /etc/sysconfig/network - - (sc_plugin_ifcfg_init): monitor /etc/sysconfig/network for changes - - (get_property, set_property, sc_plugin_ifcfg_class_init): implement - hostname get/set and capabilities get - -2008-09-18 Dan Williams - - * libnm-util/nm-setting-wireless.c - - (nm_setting_wireless_ap_security_compatible): only verify pairwise and - group ciphers if the wireless-security setting explicitly specified - them, effectively making the default be "all ciphers" (idea from - Alexander Sack) - -2008-09-15 Dan Williams - - Patch from Alexander Sack - - * src/named-manager/nm-named-manager.c - - (dispatch_resolvconf): respect resolvconf exit code - -2008-09-12 Tambet Ingo - - * src/named-manager/nm-named-manager.c (dispatch_netconfig): Make it compile - again. Add some debugging. - -2008-09-11 Dan Williams - - * system-settings/plugins/keyfile/plugin.c - - (update_connection_settings): update connection manually, since - nm_exported_connection_update() does authentication - - (dir_changed): update_connection_settings() doesn't need to return - an error - -2008-09-09 Dan Williams - - * libnm-glib/nm-vpn-plugin-ui-interface.c - libnm-glib/nm-vpn-plugin-ui-interface.h - libnm-glib/libnm_glib_vpn.ver - - (nm_vpn_plugin_ui_interface_delete_connection): called when the plugin - should clean up resources related to the connection (like keyring - secrets) - - (nm_vpn_plugin_ui_widget_interface_save_secrets): called when the plugin - should save user-scope secrets (like to the keyring) - -2008-09-08 Dan Williams - - Patch from Alexander Sack - - * libnm-util/crypto_gnutls.c - libnm-util/crypto_nss.c - - (crypto_init, crypto_deinit): just use a boolean instead of a refcount - - * libnm-util/nm-utils.c - libnm-util/nm-utils.h - libnm-util/libnm-util.ver - - (nm_utils_init): initialize libnm-util - - (nm_utils_deinit): de-initialize libnm-util and clean up resources - - * libnm-util/nm-setting-8021x.c - - (nm_setting_802_1x_class_init): init libnm-util when needed - -2008-09-05 Dan Williams - - Patch from Roy Marples and others - - * configure.in - src/named-manager/nm-named-manager.c - - Add support for resolvconf; use --with-resolvconf at configure time - to enable it - -2008-09-05 Dan Williams - - * libnm-util/crypto_nss.c - libnm-util/crypto_gnutls.c - libnm-util/crypto.h - - (crypto_init): return error when init fails - -2008-09-05 Dan Williams - - * libnm-glib/nm-device-wifi.c - - (access_point_removed_proxy): clean up the active access point too - just in case the active ap changed signal didn't come through yet - - (clean_up_aps): be sure to set priv->active_ap to NULL when cleaning up - -2008-09-05 Dan Williams - - * libnm-glib/nm-client.c - - (constructor): get initial state after we know whether NM is running - or not - -2008-09-05 Dan Williams - - * libnm-glib/nm-ip4-config.c - libnm-glib/nm-dhcp4-config.c - - (finalize): clean up the DBusGProxy - -2008-09-04 Dan Williams - - * src/nm-ip4-config.c - src/nm-ip4-config.h - - (nm_ip4_config_new): don't export over D-Bus here - - (nm_ip4_config_export): new function; export the config over D-Bus - - (nm_ip4_config_is_exported): new function - - * src/nm-device.c - - (nm_device_activate_stage5_ip_config_commit): fix leak of IP4Config - objects by balancing the IP4Config constructor; the device holds - a reference to the IP4Config already - - (nm_device_set_ip4_config): export the IP4Config when needed - -2008-09-04 Dan Williams - - * src/supplicant-manager/nm-supplicant-settings-verify.c - - Allow WPA-NONE key management for Ad-Hoc WPA connections - -2008-09-04 Dan Williams - - * libnm-util/nm-setting-vpn.c - libnm-util/nm-setting-vpn.h - - Split VPN secrets from VPN data so that settings services can actually - figure out that they are secrets and store them accordingly - - * system-settings/plugins/keyfile/nm-keyfile-connection.c - system-settings/plugins/keyfile/reader.c - system-settings/plugins/keyfile/reader.h - system-settings/plugins/keyfile/writer.c - - Store VPN secrets separately from VPN data so that they can be fetched - on demand - - Implement the get_secrets() call so that (a) secrets don't leak out - to unprivileged callers, and (b) secrets can be sent to privileged - callers when needed - - * vpn-daemons/vpnc/src/nm-vpnc-service.c - - Handle split VPN secrets - -2008-08-27 Dan Williams - - * system-settings/plugins/ifcfg-fedora/reader.c - - (make_ip4_setting): use DOMAIN not SEARCH (rh #459370) - -2008-08-27 Dan Williams - - Ensure zombie children get cleaned up. To get notifications when children - die abnormally, g_spawn_async() requires G_SPAWN_DO_NOT_REAP_CHILD, but - that requires calling waitpid() yourself if you've removed the child watch - handler before the process has actually died, which NM needs to do in a few - places. So ensure that everything uses G_SPAWN_DO_NOT_REAP_CHILD and also - cleans up after the child when required. Should fix problems trying to - activate mobile broadband connections after a previous failure. - - * src/dhcp-manager/nm-dhcp-dhclient.c - src/dhcp-manager/nm-dhcp-dhcpcd.c - - Use G_SPAWN_DO_NOT_REAP_CHILD - - * src/dhcp-manager/nm-dhcp-manager.c - - (nm_dhcp_device_destroy): ensure child is cleaned up - - (nm_dhcp_client_stop, nm_dhcp_manager_cancel_transaction_real): always - block on child quitting, since the non-blocking functionality was - never actually used - - * src/dnsmasq-manager/nm-dnsmasq-manager.c - - (dm_watch_cb): child is already reaped here - - (ensure_killed, nm_dnsmasq_manager_stop): block until child is dead - - * src/nm-device.c - - (aipd_cleanup): block until child is dead - - * src/named-manager/nm-named-manager.c - - (run_netconfig): don't use G_SPAWN_DO_NOT_REAP_CHILD if we aren't - event bothering to watch the child - - * src/ppp-manager/nm-ppp-manager.c - - (ppp_watch_cb): child is already reaped here - - (ensure_killed, nm_ppp_manager_stop): block until child is dead - - * src/vpn-manager/nm-vpn-service.c - - (vpn_service_watch_cb): child is already reaped here - - (nm_vpn_service_daemon_exec): use G_SPAWN_DO_NOT_REAP_CHILD so that - status of the child is actually tracked - - (ensure_killed, finalize): block until child is dead - -2008-08-26 Dan Williams - - * system-settings/plugins/keyfile/nm-keyfile-connection.c - - (update): Update filename of the connection if the connection id - was changed - - * system-settings/plugins/keyfile/plugin.c - - (dir_changed): first pass at handling connection renames correctly - - * system-settings/plugins/keyfile/writer.c - system-settings/plugins/keyfile/writer.h - - (write_connection): replace '/' with '*' when writing out the filename - from the connection id - -2008-08-26 Dan Williams - - Add connection UUIDs, since connection names can be changed, and since - old-style connection IDs could change over the life of the connection. The - UUID should be assigned at connection creation time, be stable for a given - connection, and should be unique among all connections for a given settings - service. - - * configure.in - libnm-util/Makefile.am - - Require libuuid - - * introspection/nm-exported-connection.xml - - Remove "GetID" method - - * libnm-glib/nm-dbus-connection.c - libnm-glib/nm-settings.c - libnm-glib/nm-settings.h - - Remove id-related stuff - - * libnm-util/nm-utils.c - libnm-util/nm-utils.h - libnm-util/libnm-util.ver - - (nm_utils_uuid_generate, nm_utils_uuid_generate_from_string): Add - utility functions to generate UUIDs - - * libnm-util/nm-setting-connection.c - libnm-util/nm-setting-connection.h - - Add 'uuid' member to the connection setting - - (verify): require valid 'uuid' for a valid connection - - * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - system-settings/plugins/ifcfg-fedora/reader.c - system-settings/plugins/ifcfg-suse/nm-suse-connection.c - system-settings/plugins/ifcfg-suse/parser.c - system-settings/plugins/keyfile/nm-keyfile-connection.c - system-settings/src/main.c - - Remove id-related stuff - - Give connections UUIDs where needed - -2008-08-25 Dan Williams - - * libnm-util/crypto_gnutls.c - libnm-util/crypto_nss.c - - (crypto_init, crypto_deinit): refcount init/deinit - - (crypto_md5_hash): allow NULL salt - -2008-08-22 Michael Biebl - - * libnm-glib/Makefile.am - libnm-util/Makefile.am - libnm-glib/libnm_glib.ver - libnm-glib/libnm_glib_vpn.ver - libnm-util/libnm-util.ver - - Use linker version scripts to control the list of exported - symbols. List each exported symbol explicitely. - * libnm-util/Makefile.am - - Fix compilation of the test-crypto binary. The crypto - functions are no longer part of the libnm-util API. Add - crypto_*.c to test_crypto_SOURCES and link against the correct - crypto libraries. - -2008-08-19 Dan Williams - - * configure.in - test/Makefile.am - - Don't build test/test-common - - Remove unused stuff - - * test/nm-set-fallback - test/nmtestdevices.c - test/test-common/.cvsignore - test/test-common/Makefile.am - test/test-common/test-common.c - test/test-common/test-common.h - - delete - -2008-08-18 Dan Williams - - * libnm-util/nm-utils.c - libnm-util/nm-utils.h - - (nm_utils_garray_to_string): remove; NM was the only user and doesn't - export anything that needs to be converted with this function - - * src/dhcp-manager/nm-dhcp-manager.c - - (garray_to_string): convert a byte array to a UTF-8 string with - minimal validation; the DHCP client sends it in ASCII anyway - - (get_option, copy_option): use garray_to_string() - -2008-08-18 Dan Williams - - * include/NetworkManager.h - introspection/nm-device.xml - - Add a "missing firmware" device state reason - - * src/NetworkManagerSystem.c - src/NetworkManagerSystem.h - - (nm_system_device_set_up_down): add a no_firmware argument - - (nm_system_device_set_up_down_with_iface): if the result of setting - IFF_UP is ENOENT, that almost always means missing firmware - - * src/backends/NetworkManagerGeneric.c - src/nm-device-ethernet.c - src/nm-device-private.h - src/nm-device-wifi.c - src/nm-device.c - src/nm-device.h - src/nm-hso-gsm-device.c - src/vpn-manager/nm-vpn-connection.c - - Pass no_firmware along; check it where appropriate - -2008-08-18 Dan Williams - - Patch from Robert Buchholz - - * autogen.sh - configure.in - - Change to automake 1.9 and 'ustar' tar format defined by POSIX - 1003.1-1988, allowing for file names longer than 99 characters - -2008-08-17 Dan Williams - - * include/NetworkManager.h - introspection/nm-device.xml - src/nm-gsm-device.c - - Finer-grained GSM registration failure error codes - -2008-08-17 Dan Williams - - * callouts/Makefile.am - src/Makefile.am - - Move dispatcher directory creation to callouts/Makefile.am - - * system-settings/plugins/keyfile/Makefile.am - - Create keyfile connections directory in DESTDIR (bgo #546833) - -2008-08-15 Dan Williams - - Do connection sharing in a cleaner manner; all required iptables rules - are now stored in the activation request and pertain only to the device - which is being shared to other computers. (rh #458625) - - * src/nm-activation-request.c - src/nm-activation-request.h - - (nm_act_request_add_share_rule): new function; add a sharing rule to - the activation request which will get torn down automatically when - the activation request dies - - (nm_act_request_set_shared): push sharing rules to iptables when sharing - is started, and tear them down when sharing is stopped - - * src/nm-device.c - - (start_sharing): start up sharing by doing the required iptables magic - - (share_init): poke the right bits of the kernel and load the right - modules for NAT - - (nm_device_activate_stage5_ip_config_commit): start NAT-ing this - connection if it's a 'shared' connection - - * src/NetworkManagerPolicy.c - - Remove all sharing stuff; done in the device code itself - -2008-08-15 Dan Williams - - * src/dnsmasq-manager/nm-dnsmasq-manager.c - - (create_dm_cmd_line): send the right router address - -2008-08-15 Dan Williams - - * src/ppp-manager/nm-ppp-manager.c - - (pppd_timed_out): ensure timeouts fail the connection - -2008-08-14 Dan Williams - - * src/nm-properties-changed-signal.c - src/nm-properties-changed-signal.h - - Add a property spec flag for "don't export this property" in - property changed signals - - * src/nm-hso-gsm-device.c - src/nm-gsm-device.c - src/nm-cdma-device.c - - Don't export monitor interface or netdev interface properties - -2008-08-14 Dan Williams - - * src/NetworkManagerPolicy.c - - (update_routing_and_dns): 'hso' devices can be default even if they - don't have a gateway - -2008-08-14 Dan Williams - - * src/nm-device.c - - (nm_device_deactivate_quickly): tear down activation request after - calling device-specific deactivation - - * src/nm-hso-gsm-device.c - - (real_deactivate_quickly): terminate connection when deactivating - -2008-08-14 Dan Williams - - * src/nm-activation-request.h - - Add HSO secrets caller - - * src/nm-gsm-device.c - src/nm-gsm-device.h - - (modem_wait_for_reply): add a 'user_data' argument so callers can pass - something to the callback function - - (set_apn, set_apn_done): call class dial function, not a static one - - (nm_gsm_device_class_init): add a class 'dial' function - - * src/nm-hal-manager.c - - (get_hso_netdev): find the hso-driven hardware's net device - - (modem_device_creator): recognize hso-driven hardware and create the - right type of device object for it - - * src/Makefile.am - src/nm-hso-gsm-device.c - src/nm-hso-gsm-device.h - - Implement support for devices driven by the 'hso' driver as a subclass - of NMGsmDevice - -2008-08-14 Dan Williams - - * src/NetworkManagerSystem.c - - (nm_system_device_is_up_with_iface): ensure ifreq is cleared before using - - (nm_system_device_set_up_down_with_iface): cleanups; only return - success if the operation really was successful - -2008-08-14 Dan Williams - - * src/nm-netlink-monitor.c - src/nm-netlink-monitor.h - src/nm-device-ethernet.c - - (nm_netlink_monitor_request_status): return an error on failure - - (constructor): don't segfault on missing error - -2008-08-13 Dan Williams - - * callouts/nm-dispatcher-action.c - - Add IP4 config info to script environment - -2008-08-12 Dan Williams - - * src/nm-device.c - - (nm_device_set_ip4_config): don't touch hostnames here; distros - that want to use DHCP hostnames should use dispatcher scripts - for that - - * src/NetworkManagerSystem.h - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerMandriva.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - - Remove nm_system_set_hostname(), no longer used - - * src/backends/Makefile.am - src/backends/shvar.c - src/backends/shvar.h - - Remove shvar.*; no longer used - -2008-08-12 Dan Williams - - Revert most of the 'hostname' patch. Too much stuff still breaks when - hostname is updated at runtime. Distros or users who want hostname updates - can use dispatcher scripts to update the hostname if they need it. - -2008-08-12 Dan Williams - - * introspection/nm-settings-system.xml - system-settings/src/dbus-settings.c - system-settings/src/dbus-settings.h - - Add a 'Hostname' property (rw) which represents the configured - hostname and domain of the system, if any - - * system-settings/src/nm-system-config-error.c - system-settings/src/nm-system-config-error.h - system-settings/src/nm-system-config-interface.c - system-settings/src/nm-system-config-interface.h - - Add a 'hostname' property to the plugin interface - - Add a method to send updated hostname to plugins to save in their - backing configuration store - - * system-settings/plugins/keyfile/nm-keyfile-connection.c - system-settings/plugins/keyfile/plugin.c - system-settings/plugins/keyfile/writer.c - system-settings/plugins/keyfile/writer.h - system-settings/plugins/ifcfg-suse/plugin.c - - Add minimal hostname support - - * system-settings/plugins/ifcfg-fedora/plugin.c - - Add support for updating system hostname in /etc/sysconfig/network - -2008-08-12 Dan Williams - - * system-settings/plugins/ifcfg-fedora/shvar.c - system-settings/plugins/ifcfg-fedora/shvar.c - - Fix double-free caused by svSetValue() followed by svCloseFile() - -2008-08-12 Tambet Ingo - - * Makefile.am: Fix distcheck. - -2008-08-12 Tambet Ingo - - * libnm-glib/*.c. Document some more. - -2008-08-12 Tambet Ingo - - Start documenting libnm-glib public API using gtk-doc. - - * libnm-glib/nm-serial-device.c: - * libnm-glib/nm-object.c: - * libnm-glib/nm-gsm-device.c: - * libnm-glib/nm-device.c: - * libnm-glib/nm-device-wifi.c: - * libnm-glib/nm-device-ethernet.c: - * libnm-glib/nm-client.c: - * libnm-glib/nm-cdma-device.c: Document the public API. - - * docs/libnm-glib/libnm-glib.types: Implement. - - * docs/libnm-glib/Makefile.am: Implement. - - * autogen.sh: - * configure.in: - * Makefile.am: Add gtk-doc support. - -2008-08-12 Tambet Ingo - - * src/backends/*: Get rid of nm_system_should_modify_resolv_conf(). - - * src/named-manager/nm-named-manager.c (rewrite_resolv_conf): Calculate - the composite result of all the IP4 configurations and call a distro - specific update_resolv_conf(). - (update_resolv_conf): Implement one for directly writing to - /etc/resolv.conf and one for opensuse to call netconfig. - -2008-08-11 Dan Williams - - * src/ppp-manager/nm-ppp-manager.c - - (impl_ppp_manager_need_secrets): pass interface as required - -2008-08-11 Dan Williams - - Merge the vpn-properties setting with the vpn setting since it was pointless - to keep both of them around. Convert the vpn 'data' hash table to a hash - of string:string (instead of string:variant) so that system settings plugins - can have an easier time dealing with the arbitrary key/value pairs. - -2008-08-11 Dan Williams - - * libnm-util/nm-utils.c - - (nm_utils_register_value_transformations): add value transform for - a hash table of string:string - -2008-08-10 Dan Williams - - * libnm-glib/nm-vpn-plugin.c - - (nm_vpn_plugin_connect): stop plugin after connection failure from - an idle handler so the Connect reply gets delivered before the - stop StateChanged signal - -2008-08-10 Dan Williams - - * src/nm-ip4-config.c - - (get_property): use common ip4 address/route conversion functions - - (nm_ip4_config_replace_address, nm_ip4_config_replace_route): should - copy the new route here, not take ownership - -2008-08-08 Tambet Ingo - - * system-settings/plugins/ifcfg-suse/parser.c (make_ip4_setting): - Update the IP4 setting's method name. - -2008-08-07 Dan Williams - - * introspection/nm-ip4-config.xml - libnm-glib/libnm-glib-test.c - libnm-glib/nm-ip4-config.c - libnm-glib/nm-ip4-config.h - src/NetworkManagerSystem.h - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerMandriva.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - src/dhcp-manager/nm-dhcp-manager.c - src/nm-device.c - src/nm-ip4-config.c - src/nm-ip4-config.h - - Remove NIS logic; should be done from dispatcher scripts instead - -2008-08-07 Dan Williams - - * src/dhcp-manager/nm-dhcp-manager.c - - (nm_dhcp_manager_get_ip4_config): fix regression which caused - mis-handling of DHCP responses that returned more than one router - (found by Grant Williamson) - -2008-08-07 Dan Williams - - * callouts/nm-dispatcher-action.c - - (nm_dispatcher_action): grab device path and create the device; pass - the device's DHCP4 config to script caller - - (dispatch_scripts): dump the DHCP4 config to the environment of called - scripts - - * libnm-glib/nm-dhcp4-config.c - libnm-glib/nm-dhcp4-config.h - - (nm_dhcp4_config_get_options): expose - - (nm_dhcp4_config_get_one_option): renamed from nm_dhcp4_config_get_option - -2008-08-07 Dan Williams - - * include/NetworkManager.h - - Add the DHCP4Config D-Bus interface - - * libnm-glib/Makefile.am - libnm-glib/nm-dhcp4-config.c - libnm-glib/nm-dhcp4-config.h - - Handle DHCP4 config objects exported by NM over D-Bus - - * libnm-glib/nm-device.c - libnm-glib/nm-device.h - - Add a 'dhcp4-config' property - - * libnm-glib/libnm-glib-test.c - - Print out DHCP4 config for devices - - Fix some crashes when no connections are active - - * src/nm-device-interface.c - src/nm-device.c - src/nm-dhcp4-config.c - src/nm-dhcp4-config.h - - Treat dhcp4-config object as an object path at the D-Bus interface so - that when it doesn't exist we can proxy it as "/" which dbus-glib - doesn't let us do when the property type is G_TYPE_OBJECT - -2008-08-07 Dan Williams - - * src/NetworkManager.c - src/NetworkManagerSystem.h - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerMandriva.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - - (nm_system_init, nm_system_kill_all_dhcp_daemons): remove, unused - -2008-08-06 Dan Williams - - * libnm-glib/nm-ip4-config.c - libnm-glib/nm-ip4-config.h - - Add 'routes' property - - * libnm-util/nm-setting-vpn.c - libnm-util/nm-setting-vpn.h - - Remove 'routes' property - - * libnm-util/nm-setting-ip4-config.c - libnm-util/nm-setting-ip4-config.h - - 'ignore-dhcp-dns' renamed to 'ignore-auto-dns' - - Add 'ignore-auto-routes' property - - 'routes' exposed over D-Bus is now an array of array of uint (4) to - accomodate route metrics - - 'routes' exposed in C is now a list of NMSettingIP4Route structures - - * libnm-util/nm-utils.c - libnm-util/nm-utils.h - - Add helpers for marshalling IP4 routes - - * src/NetworkManagerUtils.c - - (nm_utils_merge_ip4_config): handle property renames and new route - structure - - * src/NetworkManagerSystem.c - - (nm_system_device_set_ip4_route, nm_system_device_set_from_ip4_config, - nm_system_vpn_device_set_from_ip4_config): respect route metrics - - * src/dhcp-manager/nm-dhcp-manager.c - - (nm_dhcp_manager_get_ip4_config): handle new route structure - - * system-settings/plugins/ifcfg-fedora/reader.c - system-settings/plugins/ifcfg-fedora/writer.c - - Handle routes separately from addresses now that routes have a different - format - - * introspection/nm-ip4-config.xml - src/nm-ip4-config.c - src/nm-ip4-config.h - - Rename internal routing functions - - 'static-routes' renamed to 'routes' - -2008-08-04 Dan Williams - - Patch from Sjoerd Simons - - * src/NetworkManager.c - src/nm-manager.c - src/nm-manager.h - - More explicitly make the NMManager a singleton - -2008-08-04 Dan Williams - - * libnm-util/nm-connection.c - libnm-util/nm-connection.h - - (nm_connection_verify): return error on missing 'connection' setting - (found by Sjoerd Simons) - -2008-08-04 Dan Williams - - Handle multiple concurrent PPP connections. - - * src/ppp-manager/nm-ppp-manager.c - src/ppp-manager/nm-ppp-manager.h - - (constructor): only PPP Manager request bus name once; each - NMPPPManager object gets a unique object path - - (nm_ppp_manager_class_init, get_property, set_property, - nm_ppp_manager_new, nm_ppp_manager_start): pass parent interface in - at construct time - - (impl_ppp_manager_need_secrets, impl_ppp_manager_set_state): don't - remove timeout until PPP manager gets an IP4 config - - (create_pppd_cmd_line): pass dbus object path as 'ipparam' so that - the plugin can call back to this specific PPP manager instance - - * src/nm-device-ethernet.c - src/nm-serial-device.c - - Pass parent device in nm_ppp_manager_new() - - * src/nm-gsm-device.c - src/nm-cdma-device.c - - (device_state_changed): don't close serial device on NEED_AUTH - state changed, that's not a failure case like the rest are - - * src/ppp-manager/nm-pppd-plugin.c - - (nm_ip_up): always use index 0 into the ipcp options, because NM always - binds one interface to any pppd process, thus the correct index - is always 0; send PHASE_DEAD on error to alert NM immediately of - problems; try harder to get a peer address in spite of pppd - - (plugin_init): use 'ipparam' as the object path back to our specific - PPP manager instance - -2008-08-04 Dan Williams - - * src/ppp-manager/nm-ppp-manager.c - - (impl_ppp_manager_need_secrets): rework to handle secrets better; - since the GSM and CDMA settings now implement need_secrets, we can - rely on them to do the right thing. Where secrets are not required, - just pass empty strings back to the pppd plugin. - - (nm_ppp_manager_update_secrets): leak fix; don't need to dup the strings - - (impl_ppp_manager_set_ip4_config): clear the secrets tries counter - on successful IP4 config receipt - -2008-08-04 Dan Williams - - * libnm-util/nm-setting-cdma.c - libnm-util/nm-setting-gsm.c - - (verify): validate username & password if they exist - - (need_secrets): if username given, require a password too - -2008-08-04 Dan Williams - - * src/dnsmasq-manager/nm-dnsmasq-manager.c - - (create_dm_cmd_line): really don't listen on lo, despite what the - manpage says about --listen-address without --interface - (bgo #546033) - -2008-08-01 Dan Williams - - * libnm-glib/nm-device.c - - (proxy_get_string): util function for querying a HAL property - - (get_ancestor_device): split out from get_product_and_vendor() - - (get_product_and_vendor): simplify; get more accurate pid & vid info - from PCI devices by querying subsys properties - - (nm_device_update_description): simplify - -2008-08-01 Dan Williams - - * libnm-util/nm-setting-ip4-config.c - libnm-util/nm-setting-ip4-config.h - - Make IPv4 methods reflect their usage; 'dhcp' -> 'auto' and - 'autoip' -> 'link-local'. VPN & PPP connections can also have IPv4 - settings, and they don't necessarily use DHCP. - - * src/NetworkManagerPolicy.c - src/nm-device.c - system-settings/plugins/ifcfg-fedora/reader.c - system-settings/plugins/ifcfg-suse/parser.c - - Fixup for method changes - -2008-07-31 Dan Williams - - * src/nm-activation-request.c - src/vpn-manager/nm-vpn-connection.c - - Correct GetSecrets D-Bus pending call usage; the GetSecrets call - itself should be attached to the activation request or the VPN - connection, not the NMConnection object, since the call is not - expected to live as long as the NMConnection itself - -2008-07-31 Dan Williams - - * src/nm-device-wifi.c - - (real_act_stage2_config): fix issue where association would continue - even though secrets were needed; 'goto out' was in wrong scope and - result of handle_auth_or_fail() should have been dumped directly to - 'ret' to ensure that the association was postponed until secrets - are available - -2008-07-31 Dan Williams - - * system-settings/plugins/ifcfg-fedora/plugin.c - system-settings/plugins/ifcfg-fedora/reader.c - - Don't ignore unmanaged devices if their ifcfg file doesn't make a - valid NM connection - -2008-07-29 Dan Williams - - * src/nm-gsm-device.c - - (automatic_registration_response, automatic_registration): recognize - denied registration and reorder responses - -2008-07-29 Dan Williams - - * src/nm-serial-device.c - - (nm_serial_device_wait_for_reply): fix timeout calculation. Since - time(2) is used for current time, which returns seconds, we shouldn't - be multiplying by 1000. - -2008-07-28 Dan Williams - - Patch from Fabrice Bellet - - * src/NetworkManagerSystem.c - - (route_in_same_subnet): mask addresses and compare them so that the - function actually does what it says it's going to do (rh #456685) - -2008-07-27 Dan Williams - - * libnm-util/nm-setting-ip6-config.c - - (set_property): add missing break that caused routes to be overwritten - with addresses - - * libnm-util/nm-setting-ip6-config.c - - (verify): validate routes and return GError everywhere on invalid setting - - (finalize): don't leak routes - - (set_property): add missing break that caused routes to be overwritten - with addresses - -2008-07-27 Dan Williams - - * libnm-util/* - - Relicense to LGPLv2+ - -2008-07-27 Dan Williams - - * system-settings/plugins/ifcfg-fedora/reader.c - - (make_ip4_setting): fix parsing automatic configs - -2008-07-27 Dan Williams - - * src/dnsmasq-manager/nm-dnsmasq-manager.c - src/nm-device.c - src/ppp-manager/nm-ppp-manager.c - - Ensure child process gets reaped. The child watch function may be - removed from the mainloop before the child gets killed, so we have - to make sure the child is reaped when it's told to die intentionally - -2008-07-27 Dan Williams - - Patch from Roy Marples - - * src/dhcp-manager/nm-dhcp-dhcpcd.c - - (nm_dhcp_client_start): fixup for latest dhcpcd 4.0 RC - -2008-07-27 Dan Williams - - * src/nm-gsm-device.c - - (init_modem_full): send "ATZ E0" after CPIN, because apparently some - Huawei devices turn echo back on after CPIN (rh #456770) - -2008-07-24 Tambet Ingo - - * src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_update_secrets): Add - format argument to g_set_error() call. - - * src/backends/interface_parser.[ch]: Remove. - - * src/backends/Makefile.am: Remove unused files interface_parser.[ch]. - -2008-07-21 Dan Williams - - * src/ppp-manager/nm-ppp-manager.c - - (create_pppd_cmd_line): send 'noipdefault' on non-PPPoE connections - to prevent pppd from picking up some random local address from an - interface that doesn't have anything to do with the one we're - interested in (rh #455348) - -2008-07-17 Dan Williams - - * libnm-util/nm-utils.c - - (string_to_utf8): general function for conversion to UTF-8 assisted - by locale - - (nm_utils_ssid_to_utf8): use string_to_utf8() - - (nm_utils_garray_to_string): ensure returned string is UTF-8 safe - -2008-07-17 Dan Williams - - * introspection/Makefile.am - introspection/nm-device.xml - introspection/nm-dhcp4-config.xml - - Add bits for the DHCP4Config property of the device, and the DHCP4Config - itself - * src/nm-device-interface.c - src/nm-device-interface.h - - Add the DHCP4Config property - - * src/nm-device.c - - Keep track of DHCP4 options via a new DHCP4Config property and notify - D-Bus clients when it changes - - * src/nm-dhcp4-config.c - src/nm-dhcp4-config.h - - Simple object to store DHCP4 options, export them over D-Bus, and - notify when they change - - * src/dhcp-manager/nm-dhcp-manager.c - src/dhcp-manager/nm-dhcp-manager.h - - (nm_dhcp_manager_set_dhcp4_config, copy_dhcp4_config_option): copy and - filter server-returned DHCP options into an NMDHCP4Config object - -2008-07-16 Dan Williams - - * introspection/nm-device.xml - - Add device state reasons - -2008-07-16 Dan Williams - - Patch from Roy Marples - - * configure.in - - Add --with-dhcp-client option - - * src/dhcp-manager/Makefile.am - - pass DHCP_CLIENT_PATH on compile line - - * src/dhcp-manager/nm-dhcp-manager.c - src/dhcp-manager/nm-dhcp-manager.h - - Genericize for both dhcpcd and dhclient - - * src/dhcp-manager/nm-dhcp-dhclient.c - - Move dhclient stuff out to it's own file from nm-dhcp-manager.c - - * src/dhcp-manager/nm-dhcp-dhcpcd.c - - Implement support for dhcpcd too - -2008-07-16 Tambet Ingo - - * system-settings/src/nm-system-config-interface.c - (nm_system_config_interface_supports_add): Implement. - (nm_system_config_interface_add_connection): Return a boolean to notify - of errors. - - * system-settings/src/nm-polkit-helpers.c: - * system-settings/src/nm-polkit-helpers.h: Move error declarations to - a separate file. - - * system-settings/src/dbus-settings.c (impl_settings_add_connection): - Return an error when none of the plugins support add or if addition - failed for some reason. - - * system-settings/src/nm-system-config-error.h: - * system-settings/src/nm-system-config-error.c: New files, mostly moved - here from nm-polkit-helpers.[ch]. - - * system-settings/src/Makefile.am: Build new files. - - * system-settings/plugins/keyfile/reader.c - (read_array_of_array_of_uint): Make it more general so that it would - work for routes as well. - - * system-settings/plugins/keyfile/writer.c - (write_array_of_array_of_uint): Ditto. - Fix the netmask/prefix writing. - - * system-settings/plugins/keyfile/plugin.c (add_connection): Return - boolean to notify errors. - - * system-settings/plugins/ifcfg-suse/nm-suse-connection.c (update): - Return more specific error. - (delete): Ditto. - -2008-07-11 Dan Williams - - Modify the NMDevice::state-changed signal to include the previous state - and reason. Enables the applet to provide more information why device - activation failed. - -2008-07-09 Dan Williams - - * callouts/Makefile.am - callouts/nm-avahi-autoipd-action.c - callouts/nm-avahi-autoipd.conf - - avahi-autoipd callout to send options back to NM - - * src/autoip.c - src/autoip.h - - remove - - * src/nm-device.c - src/nm-device-private.h - src/nm-manager.c - - Use avahi-autoipd for IPv4LL functionality rather than really crappy - old custom stuff - -2008-07-07 Dan Williams - - * system-settings/plugins/ifcfg-fedora/reader.c - - (make_ip4_setting): handle DHCP_HOSTNAME; fix up prefix support to - handle PREFIX too; clean up - -2008-07-07 Dan Williams - - Convert to using IPv4 prefixes instead of netmasks. - -2008-07-03 Dan Williams - - * libnm-util/nm-setting-ip4-config.c - libnm-util/nm-setting-ip4-config.h - - Add properties for DHCP Client Identifier and DHCP Hostname - - * src/dhcp-manager/nm-dhcp-manager.c - src/dhcp-manager/nm-dhcp-manager.h - - (nm_dhcp_manager_begin_transaction): take the connection's ip4-config - setting as an argument to pass on to the dhclient config file - creation function - - (nm_dhcp_manager_cancel_transaction_real): remove dhclient config when - DHCP is torn down - - (dhclient_run): punt config file handling to create_dhclient_config() - - (create_dhclient_config): create an interface-specific dhclient - config file since there may need to be interface-specific options - passed to dhclient - - (merge_dhclient_config): merge normal distro dhclient config file and - add options from the connection - - (nm_dhcp_device_new): generate the interface specific dhclient - config file path once - - (nm_dhcp_device_destroy): handle partially initialized objects; free - dhclient config file path - - * src/nm-device.c - - (real_act_stage3_ip_config_start): pass ip4-config, if any, to the - DHCP manager when starting DHCP - -2008-07-02 Dan Williams - - * libnm-util/nm-setting-8021x.c - - (verify): allow forcing the PEAP label to 0 - -2008-07-02 Dan Williams - - * introspection/nm-active-connection.xml - introspection/nm-vpn-connection.xml - libnm-glib/nm-active-connection.c - src/nm-activation-request.c - src/nm-active-connection.h - src/vpn-manager/nm-vpn-connection.c - - Remove "SharedServiceName" and "SharedConnection" bits from the D-Bus - and libnm-glib API since sharing didn't get implemented that way - -2008-07-02 Dan Williams - - * src/nm-device-wifi.c - - (can_scan): don't scan when a shared connection is activated since - that makes drivers mad (causing disconnects); also NM doesn't need - to hedge against disconnects by keeping up-to-date network topology - because the connection originates from the local machine, and thus - there should be no disconnects - -2008-07-01 Dan Williams - - Fix mobile broadband username/password issues. NM was never requesting - mobile broadband secrets, nor was it passing back the username and password - if it had them. - - * marshallers/nm-marshal.list - - Add some new types for activation request objects - - * src/nm-activation-request.c - src/nm-activation-request.h - - (get_secrets_cb): pass the caller type in the signal - - (nm_act_request_request_connection_secrets): take a caller type, so - that GetSecrets() reply handlers know who asked for the secrets in - the first place; use secret hints too so the settings service can - figure out exactly what NM wants (ie, PIN or the PPP password) - - * src/ppp-manager/nm-ppp-manager.c - src/ppp-manager/nm-ppp-manager.h - - (impl_ppp_manager_need_secrets): nm_connection_need_secrets() won't - detect needed secrets when the secret could be blank, like GSM/CDMA - passwords. So always ask for secrets, and send a hint as to what - secret we really want. - - (nm_ppp_manager_update_secrets): make function more generic by making - the device specific class figure out the username and password, and - accept an error argument to return back over D-Bus - - * src/nm-device-wifi.c - - (link_timeout_cb, handle_auth_or_fail): update for changes to - nm_act_request_request_connection_secrets() - - (real_connection_secrets_updated): update for 'caller' changes - - * src/nm-device.c - src/nm-device.h - - (connection_secrets_updated_cb, connection_secrets_failed_cb): update - for 'caller' changes - - * src/nm-device-ethernet.c - - (real_connection_secrets_updated): update for 'caller' changes and - move logic for getting PPPoE username and password here before - calling nm_ppp_manager_update_secrets() - - (link_timeout_cb, handle_auth_or_fail): update for changes to - nm_act_request_request_connection_secrets() - - * src/nm-cdma-device.c - - (real_connection_secrets_updated): pass username and password back - to the PPP manager when required - - * src/nm-gsm-device.c - - (enter_pin): send the required secret name to the settings service - - (real_connection_secrets_updated): pass username and password back - to the PPP manager when required - -2008-06-30 Dan Williams - - * src/nm-device-wifi.c - - Consistently use NM_DEVICE_WIFI_GET_PRIVATE instead of self->priv - -2008-06-30 Dan Williams - - Attempt to fix various issues causing rh #448889. Mainly, to qualify for - the DISCONNECTED state, the device must not be rfkilled _and_ have a valid - priv->supplicant.iface. When either condition is false, the device should - transition back to UNAVAILABLE because it cannot be used. - - * src/nm-device-wifi.c - - (constructor): cleanup; connect to supplicant manager here since the - supplicant manager is always around - - (supplicant_interface_acquire): rename from init_supplicant_interface, - ensure the supplicant manager is in the IDLE state - - (supplicant_interface_release): rename from cleanup_supplicant_interface, - cancel any pending scans too - - (real_bring_up): don't set up the supplicnat interface here, because - we need the supplicant interface at times when the device may not - be "up" - - (real_take_down): just remove the periodic source - - (schedule_scan): ensure a state that would peg the CPU doesn't happen - - (remove_supplicant_interface_connection_error_handler): cleanup; don't - do anything if there's no supplicant interface - - (cleanup_association_attempt): cleanup - - (supplicant_iface_state_cb_handler): request an immediate scan when - the interface enters the READY state; transition to UNAVAILABLE - state when the interface goes down because the device can't be used - without a supplicant interface - - (supplicant_mgr_state_cb_handler): if the supplicant goes away, clean - up and transition to UNAVAILABLE; if the supplicant becomes ready, - acquire the supplicant interface and transition to DISCONNECTED - if the radio isn't killed - - (nm_device_wifi_dispose): move most of device_cleanup() here - - (state_changed_cb): release any existing supplicant interface; if the - radio is enabled then try to acquire a new supplicant interface; - if the radio is enabled and a supplicant interface has been acquired, - we can transition to DISCONNECTED - - (nm_device_wifi_set_enabled): if bringing the hardware up failed, - don't enable the radio, because HAL probably lied to us about the - killswitch being off. If bringing the hardware up worked, then - try to grab a supplicant interface, and if that was successful, - transition to DISCONNECTED - -2008-06-30 Dan Williams - - * src/supplicant-manager/nm-supplicant-interface.c - - (request_scan_results, nm_supplicant_interface_dispose, - wpas_iface_query_scan_results): cleanup; scan_results_timeout is now - the id of the timeout, not a GSource - -2008-06-30 Tambet Ingo - - * src/backends/NetworkManagerSuSE.c (nm_system_activate_nis): Fix a - bunch of typoes introduced by "Patch from David Cantrell - and me". - -2008-06-30 Tambet Ingo - - * src/nm-serial-device.c: - * src/nm-gsm-device.c: - * src/nm-cdma-device.c: Move the pending call handling to a common location - in serial device. Handle setting device state to failed in one place as well. - -2008-06-29 Dan Williams - - * src/nm-hal-manager.c - - Rework killswitch handling to query killswitch status immediately - when the first killswitch is added, so that rfkill state is - known as early as possible - - Also treat failure of GetPower() as rfkill when the dbus method - call times out (but not when the HAL callout returns an error) - -2008-06-26 Dan Williams - - Patch from David Cantrell and me - - * include/nm-dbus-glib-types.h - - Add IP6 address types - - * libnm-util/Makefile.am - libnm-util/nm-setting-ip6-config.c - libnm-util/nm-setting-ip6-config.h - - Add IP6 settings object - - * libnm-util/nm-connection.c - - (register_default_settings): register ip6 settings object - - * libnm-util/nm-utils.c - libnm-util/nm-utils.h - - (nm_utils_ip6_addresses_from_gvalue, nm_utils_ip6_addresses_to_gvalue, - nm_utils_ip6_dns_from_gvalue, nm_utils_ip6_dns_to_gvalue): add - ip6 address conversion functions - -2008-06-26 Dan Williams - - Patch from David Cantrell - - * Use inet_ntop() and inet_pton() everwhere and check for errors - -2008-06-26 Dan Williams - - * Update FSF address in license headers (Michael Biebl ) - -2008-06-26 Dan Williams - - Patch from Adel Gadllah - - * src/nm-device-wifi.c - - (link_timeout_cb): don't ignore disconnects due to scanning - - (supplicant_iface_connection_state_cb_handler): instead, schedule - a longer timeout when scanning; avoids case where supplicant can't - find the AP and just keeps scanning forever but isn't connected - -2008-06-26 Dan Williams - - Patch from Michael Biebl - - * Clean up build system stuff - -2008-06-23 Christian Persch - - * vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c: - * vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.h: - * vpn-daemons/pptp/auth-dialog-general/anonymous-auth-module.c: - (impl_get_object): - * vpn-daemons/pptp/auth-dialog-general/chap-auth-module.c: - (impl_get_object): - * vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.c: - * vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.h: - * vpn-daemons/pptp/auth-dialog-general/mschapv2-auth-module.c: - (impl_get_object): - * vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.c: - * vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.h: - * vpn-daemons/pptp/properties/nm-ppp-properties.c: (impl_setup): - * vpn-daemons/pptp/properties/vpnui_impl.c: (impl_get_object): - * vpn-daemons/pptp/properties/vpnui_opt.c: - (vpnui_opt_connect_signals): - * vpn-daemons/pptp/properties/vpnui_opt.h: - * vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c: - * vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.h: Don't use - deprecated gtk type macros. Bug #539325. - -2008-06-20 Dan Williams - - * libnm-glib/nm-vpn-plugin-ui-interface.c - libnm-glib/nm-vpn-plugin-ui-interface.h - - 'validity-changed' -> 'changed' to work better with the connection - editor. Plugin UI widgets should emit 'changed' whenever their - UI values change in a meaningful way. - - (nm_vpn_plugin_ui_widget_interface_update_connection): the - update_connection member now returns validity of the UI widget - -2008-06-20 Tambet Ingo - - * libnm-util/nm-connection.c (nm_connection_duplicate): Implement. - -2008-06-17 Dan Williams - - * libnm-glib/nm-vpn-plugin-ui-interface.c - libnm-glib/nm-vpn-plugin-ui-interface.h - - Add "desc" property for longer descriptions of the VPN plugin - -2008-06-16 Dan Williams - - * configure.in - libnm-glib/libnm_glib_vpn.pc.in - - add a .pc file for libnm_glib_vpn - - * libnm-glib/nm-vpn-plugin-ui-interface.c - libnm-glib/nm-vpn-plugin-ui-interface.h - - Move the glib/GNOME VPN UI plugin interface into libnm-glib and - rework it substantially - -2008-06-12 Dan Williams - - Add a GError argument to nm_connection_verify() and nm_setting_verify(), - and add error enums to each NMSetting subclass. Each NMSetting subclass now - returns a descriptive GError when verification fails. - -2008-06-11 Dan Williams - - Patch from Tambet Ingo - - * libnm-util/nm-setting-gsm.c - - (verify): validate APN - - * src/nm-gsm-device.c - - (manual_registration_done): start setting APN if needed - - (set_apn, set_apn_done): set the APN - - (do_dial): use the APN when dialing - -2008-06-11 Dan Williams - - * src/NetworkManagerSystem.c - - (nm_system_device_set_ip4_route, - nm_system_device_replace_default_ip4_route): check for the right - return value from rtnl_route_add() to know when to add a gateway - route (from Tambet) - -2008-06-11 Dan Williams - - * src/NetworkManagerPolicy.c - - do_ipt_cmd -> do_cmd - - (sharing_init): use do_cmd() instead of system() - -2008-06-10 Dan Williams - - The grand 802-11-wireless rename. Get rid of the 802-11/80211/802_11 bits - and use "wifi" everwhere instead. - -2008-06-10 Dan Williams - - The grand 802-3-ethernet rename. Get rid of the 802-3/8023/802_3 bits. - -2008-06-10 Dan Williams - - Patch from Tambet Ingo - - * src/ppp-manager/nm-ppp-manager.c: Add ppp stats monitoring, signal the - changes. - - * src/nm-serial-device.c: Monitor "ppp-stats" signals from NMPPPManager. Add - a signal to emit these changes over dbus. - - * src/Makefile.am: Genereate nm-serial-device-glue. - - * libnm-glib/nm-serial-device.[ch]: Implement. - - * libnm-glib/nm-cdma-device.[ch] - libnm-glib/nm-gsm-device.[ch]: Inherit from NMSerialDevice. - - * libnm-glib/Makefile.am: Add nm-serial-device.[ch]. - - * introspection/nm-device-serial.xml: Implement. - - * introspection/all.xml: Fix a couple of typos, add nm-device-serial.xml. - - * introspection/Makefile.am: Add nm-device-serial.xml. - - * include/NetworkManager.h: Add a DBus interface for serial device. - -2008-06-10 Dan Williams - - * configure.in - - Add TARGET_* define to config.h to distinguish distros - - * src/dhcp-manager/nm-dhcp-manager.c - - (dhclient_run): use distro-specific path for dhclient config file - -2008-06-09 Dan Williams - - * src/dnsmasq-manager/nm-dnsmasq-manager.c - src/dnsmasq-manager/nm-dnsmasq-manager.h - - (create_dm_cmd_line): use the IP4 address of the ip4-config to - calculate the addresses passed to dnsmasq instead of hard-coding - them - - * src/nm-device.c - - (nm_device_new_ip4_shared_config): be somewhat dynamic when choosing - IP addresses for shared connections to guard against shared - connection address collisions - - (real_act_stage4_get_ip4_config): handle possible NULL ip4-configs on - error conditions - - (nm_device_activate_stage5_ip_config_commit): pass ip4-config to - the dnsmasq manager - -2008-06-09 Dan Williams - - * src/NetworkManagerPolicy.c - - (update_routing_and_dns): set the default connection _after_ unsetting - default on all non-default connections so that two connections can - never be default at the same time - - (device_state_changed): start and stop connection sharing when - needed - - (active_connection_default_changed): restart or stop sharing when - the default connection changes to keep shared connections always - NAT-ed through the default connection - - (check_sharing): handle activation/deactivation of shared connections - - (sharing_restart): atom-bomb approach to connection sharing until we - can use libnl; reinit all sharing when the default connection or - shared connections change - - (sharing_init, sharing_stop): evil functions that init and deinit - iptables - -2008-06-09 Dan Williams - - * src/nm-activation-request.c - src/nm-activation-request.h - - (nm_act_request_set_shared, nm_act_request_get_shared, - nm_act_request_get_device): new functions to facilitate connection - sharing - -2008-06-09 Dan Williams - - * src/nm-device.c - - (clear_act_request): unset the 'default' property of the activation - request when clearing it to ensure the property changed signal gets - delivered and handled - -2008-06-09 Dan Williams - - * libnm-glib/nm-device-802-11-wireless.c - - (access_point_removed_proxy): actually unref the AP after removing - it from the device's AP list. Fixes refcounting bug for APs that - caused them to get mixed up in the applet's menu. - -2008-06-09 Tambet Ingo - - * src/dhcp-manager/nm-dhcp-manager.c (finalize): Free private members. - (nm_dhcp_device_destroy): Destroy the device options hash table. - -2008-06-06 Dan Williams - - * system-settings/src/nm-polkit-helpers.c - - (create_polkit_context): in PolicyKit 0.6, polkit_context_init() will - unref the context if the initialization fails; also avoid spew when - the error isn't set - -2008-06-06 Dan Williams - - Patch from Tambet Ingo - - * src/NetworkManagerSystem.c - src/NetworkManagerSystem.h - - (nm_system_device_add_ip4_route_via_device_with_iface): remove - - (nm_system_device_set_from_ip4_config): remove unused route_to_iface - - (nm_system_device_set_ip4_route): clean up - - (nm_system_vpn_device_set_from_ip4_config): clean up, add VPN routes - - * src/nm-device.c - - (nm_device_set_ip4_config): remove unused route_to_iface bits - - * src/vpn-manager/nm-vpn-connection.c - - (ip_address_to_string): new function - - (print_vpn_config): use ip_address_to_string - - (merge_vpn_routes): add user-defined routes to the ip4 config - - (nm_vpn_connection_ip4_config_get): add routes the VPN server sent - - * include/NetworkManagerVPN.h - - Add 'routes' key - -2008-06-05 Dan Williams - - Patch from Markus Becker - - * test/nm-tool.c - - Show which device is the default device - -2008-06-05 Tambet Ingo - - Fix memory leaks. - - * system-settings/src/nm-system-config-hal-manager.c (get_type_for_udi): - Free data returned from dbus method call. - - * system-settings/src/nm-polkit-helpers.c (check_polkit_privileges): - dbus_g_method_get_sender() returns a duplicated string, free it - when done. - (check_polkit_privileges): Looks like policykit sometimes returns - error and non-null return value, don't leak errors in that case. - - * system-settings/src/main.c (find_plugin): Don't leak existing - plugin names. - (load_stuff): Don't leak device list and list items. - (have_connection_for_device): Don't leak connection list. - - * system-settings/plugins/keyfile/reader.c (read_one_setting_value): - Free the data received from g_keyfile_get_*. - - * system-settings/plugins/ifcfg-suse/parser.c (READ_WEP_KEY): Free - the key when the security object is updated. - - * src/supplicant-manager/nm-supplicant-interface.c (scan_results_cb): - Free data returned from dbus method call. - (iface_state_cb): Ditto. - (add_network_cb): Ditto. - (nm_supplicant_interface_add_cb): Don't make another copy of already - duplicated object path. - (nm_supplicant_interface_add_to_supplicant): Free the driver GValue - when done. - - * src/supplicant-manager/nm-supplicant-config.c - (ADD_STRING_LIST_VAL): Fix a memory leak. - - * src/nm-manager.c (free_get_settings_info): Free the allocated - memory slice. - (list_connections_cb): Free data returned from dbus method call. - (system_settings_get_unmanaged_devices_cb): Ditto. - - * src/nm-device-802-11-wireless.c (device_cleanup): Free ssid. - - * system-settings/plugins/ifcfg-suse/shvar.c (svCloseFile): - * system-settings/plugins/ifcfg-fedora/shvar.c (svCloseFile): - * src/backends/shvar.c (svCloseFile): Free the duplicated content - of the GList. - - * libnm-util/nm-setting.c (nm_setting_from_hash): Free the constructor - arguments after the object is created. - -2008-06-04 Dan Williams - - * libnm-util/Makefile.am - - Don't distribute nm-param-spec-specialized.h - -2008-06-02 Tambet Ingo - - * libnm-util/nm-setting-ip4-config.[ch]: Add static routes property. - - * src/nm-ip4-config.[ch]: Store the static routes as a list of - NMIP4Address, update the getters and setters. - - * src/dhcp-manager/nm-dhcp-manager.c (nm_dhcp_manager_get_ip4_config): - Use the updated NMIP4Config routes api. - - * src/NetworkManagerUtils.c (nm_utils_merge_ip4_config): Merge - static routes as well. - - * src/NetworkManagerSystem.c (netmask_to_prefix): Implement. - (nm_system_device_set_from_ip4_config): Use the updated NMIP4Config - routes api. - -2008-05-30 Dan Williams - - * src/named-manager/nm-named-manager.c - src/named-manager/nm-named-manager.h - - Remove stale/obsolete bits for controlling bind over DBus - -2008-05-29 Dan Williams - - * src/dnsmasq-manager/nm-dnsmasq-manager.c - src/dnsmasq-manager/nm-dnsmasq-manager.h - - (nm_dnsmasq_manager_new): move iface argument here - - (constructor): remove, not needed - - (get_pidfile_for_iface, create_dm_cmd_line, kill_existing_for_iface, - nm_dnsmasq_manager_start, nm_dnsmasq_manager_stop): use priv->pidfile - - * src/nm-device.c - - (real_act_stage4_get_ip4_config, - nm_device_activate_stage5_ip_config_commit): fix for dnsmasq manager - changes - -2008-05-29 Dan Williams - - * src/nm-device.c - - (dnsmasq_state_changed_cb): new function; fail the connection if - something happens to dnsmasq - - (nm_device_new_ip4_shared_config): new function; create a new - ip4-config for shared connections. Shared connections always use a - fixed static IP address. - - (real_act_stage4_get_ip4_config): handle shared connections; fix - autoip connections by actually using the returned ip4-config and - not leaking it - - (nm_device_activate_stage5_ip_config_commit): start dnsmasq for shared - connections - - (nm_device_deactivate_quickly, nm_device_dispose): terminate dnsmasq - if its active - -2008-05-29 Dan Williams - - * src/nm-device-802-11-wireless.c - - (real_get_best_auto_connection): auto-activate 'shared' method - connections too - -2008-05-29 Dan Williams - - * libnm-util/nm-setting-ip4-config.c - libnm-util/nm-setting-ip4-config.h - - Add a 'shared' method to indicate that this connection should be - brought up with a DHCP and proxy DNS server to facilitate - connection sharing. - - (verify): 'shared' method doesn't allow DNS or searches either - -2008-05-29 Dan Williams - - * configure.in - src/Makefile.am - src/dnsmasq-manager/Makefile.am - src/dnsmasq-manager/nm-dnsmasq-manager.c - src/dnsmasq-manager/nm-dnsmasq-manager.h - - Add a dnsmasq daemon manager to facilitate connection sharing - -2008-05-29 Dan Williams - - * src/nm-device-private.h - - Remove unused prototypes and clean up - - * src/nm-device.c - - Remove anything related to system_config_data, which is no longer used - - (nm_device_new_ip4_autoip_config): make static - -2008-05-29 Tambet Ingo - - * system-settings/plugins/ifcfg-suse/nm-suse-connection.c - (file_changed): Fix a bug where suse system settings plugin didn't - update the connections automatically when the files changed. - -2008-05-28 Dan Williams - - Revert r3697 (adhoc-create property patch); it's the wrong way to do this. - -2008-05-28 Dan Williams - - Patch from Benoit Boissinot - - * src/NetworkManagerSystem.c - - (nm_system_device_flush_ip4_routes_with_iface): implement with libnl - - (nm_system_vpn_device_set_from_ip4_config): don't flush routes here, - was causing -EINVAL errors since the libnl code actually does flush - the routes on VPN interfaces now - - * src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerMandriva.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - - (nm_system_device_flush_ip4_routes, - nm_system_device_flush_ip4_routes_with_iface): remove - -2008-05-28 Dan Williams - - * libnm-util/nm-setting-wireless.c - libnm-util/nm-setting-wireless.h - - (set_property, get_property, nm_setting_wireless_class_init): add the - 'adhoc-create' property, which when TRUE indicates that NM should - create this connection as an adhoc wifi network if it's not found - as an adhoc network during scanning. Can be used to auto-create - adhoc networks when used in combination with autoconnect. - -2008-05-28 Tambet Ingo - - Patch from Dennis Noordsij . - - * src/nm-gsm-device.c: Don't try to reset the modem before PIN is - checked, it doesn't work on some devices. - -2008-05-28 Tambet Ingo - - * src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_stop): Make sure - pppd gets killed, if SIGTERM doesn't do it's job, SIGKILL it. - - * src/dhcp-manager/nm-dhcp-manager.c (nm_dhcp_manager_get_ip4_config): - Use inet_aton() everywhere to improve error detection. - Don't fall back to 'dhcp_server_identifier' if the gateway is not - provided. - -2008-05-26 Tambet Ingo - - * system-settings/plugins/ifcfg-suse/plugin.c (get_unamanged_devices_cb): - Fix a typo. - -2008-05-26 Tambet Ingo - - * src/vpn-manager/nm-vpn-manager.c (nm_vpn_manager_get_service): Fix a - reference counting issue. - -2008-05-23 Dan Williams - - Patch from Benoit Boissinot - - * src/backends/NetworkManagerGeneric.c - - (nm_generic_enable_loopback): use libnl - -2008-05-23 Dan Williams - - Patch from Benoit Boissinot - - * src/NetworkManagerSystem.h - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerMandriva.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - - (nm_system_device_has_active_routes, nm_system_flush_loopback_routes, - nm_system_flush_arp_cache): remove, unused - - * src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - - (nm_generic_device_has_active_routes, nm_generic_flush_loopback_routes, - nm_generic_flush_arp_cache): remove, unused - -2008-05-23 Dan Williams - - * system-settings/plugins/ifcfg-fedora/reader.c - - (make_ip4_setting): honor PEERDNS setting - -2008-05-23 Dan Williams - - Patch from Benoit Boissinot - - * src/NetworkManagerSystem.c - - (nm_system_device_flush_ip4_addresses_with_iface): implement with - libnl - - * src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerMandriva.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - - (nm_system_device_flush_ip4_addresses, - nm_system_device_flush_ip4_addresses_with_iface): remove - - * src/backends/NetworkManagerGeneric.c - - (nm_generic_device_flush_ip4_addresses, - nm_generic_device_flush_ip4_addresses_with_iface): remove - -2008-05-23 Dan Williams - - * src/supplicant-manager/nm-supplicant-settings-verify.c - - Switch 'bssid' from bytes to keyword type - - (validate_type_keyword): allow NULL keyword lists - - * src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_add_setting_wireless): convert the bssid from - a byte array to string form, which is what the supplicant expects - -2008-05-23 Tambet Ingo - - Add a flag to NMSettingIP4Config to make it possible to ignore the DNS - information received from DHCP. - - * libnm-util/nm-setting-ip4-config.c: Add a new membet "ignore_dhcp_dns" - to make it possible to ignore the DNS information (both servers and - searches) returned by DHCP server. - - * src/NetworkManagerUtils.c (nm_utils_merge_ip4_config): Reset the - name servers and searches if "ignore_dhcp_dns" is set. - - * src/nm-ip4-config.c (nm_ip4_config_reset_nameservers) - (nm_ip4_config_reset_searches): Implement. - -2008-05-22 Dan Williams - - Remove anything mDNS related. This is better done from a distro-specific - dispatcher script. Plus, any distro using avahi doesn't need to restart - avahi, since avahi can handle interface changes just fine using netlink. - - * configure.in - - Remove --with-mdns-provider - - * src/NetworkManagerPolicy.c - - (global_state_changed): don't restart the mdns provider - - * src/NetworkManagerSystem.h - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerMandriva.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - - (nm_system_restart_mdns_responder): remove - - * src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - - (nm_generic_restart_mdns_responder): remove - -2008-05-22 Dan Williams - - * configure.in - - clean up crypto options; just use --with-crypto=nss or - --with-crypto=gnutls - -2008-05-22 Tambet Ingo - - * src/nm-manager.c (impl_manager_sleep): No need to schedule the sync - anymore, do it right away. - -2008-05-22 Tambet Ingo - - * src/nm-gsm-device.c (device_state_changed): Make sure we don't leave the - serial device open when we're not connecting or connected. - - * src/nm-cdma-device.c (device_state_changed): Ditto. - -2008-05-22 Tambet Ingo - - Don't remove all devices on waking up, sync with HAL. - - * src/nm-manager.c (nm_manager_udi_is_managed): Implement. - (sync_devices): Implement, based on hal_manager_hal_reappeared_cb. - (hal_manager_hal_reappeared_cb): Just call sync_devices. - -2008-05-21 Tambet Ingo - - * src/NetworkManagerSystem.c (nm_system_device_replace_default_ip4_route): - If the default gateway is unreachable, add a route to gateway and try - again. - -2008-05-20 Dan Williams - - * system-settings/plugins/ifcfg-fedora/reader.c - - (add_one_wep_key): handle ASCII WEP keys too (rh #293111) - -2008-05-19 Dan Williams - - * system-settings/plugins/ifcfg-fedora/reader.c - - (make_ip4_setting): get a fallback gateway from /etc/sysconfig/network - if the ifcfg doesn't specify one (rh #446527) - -2008-05-19 Dan Williams - - Make the system settings service exit when the bus goes away. Since it's - a bus-activated service, it's lifetime is limited to the bus that activated - it (rh #444976). - - * system-settings/src/Makefile.am - system-settings/src/nm-system-config-hal-manager-private.h - - Remove nm-system-config-hal-manager-private.h - - * system-settings/src/nm-system-config-hal-manager.c - - (nm_system_config_hal_manager_reinit_dbus, - nm_system_config_hal_manager_deinit_dbus): remove - - * system-settings/src/main.c - - (dbus_reconnect): remove - - (dbus_cleanup): don't tell the HAL manager to deinit dbus - - (destroy_cb): just quit when the bus goes away - - (start_dbus_service, dbus_init): simplify - - (main): destroy the wired devices hash table after destroying - the HAL manager so we don't have to disconnect signals from the - HAL manager - -2008-05-15 Tambet Ingo - - Move crypto functions from nm-applet to libnm-util. - - * libnm-util/nm-setting-8021x.c (nm_setting_802_1x_set_ca_cert) - (nm_setting_802_1x_set_client_cert) - (nm_setting_802_1x_set_phase2_ca_cert) - (nm_setting_802_1x_set_phase2_client_cert) - (nm_setting_802_1x_set_private_key) - (nm_setting_802_1x_set_phase2_private_key): Implement. Given a certificate - file (or private key and it's password), read the certificate data. - - * libnm-util/crypto_nss.c: - * libnm-util/crypto_gnutls.c: - * libnm-util/crypto.[ch]: Move here from nm-applet. - - * configure.in: Check for NSS and gnutls here (moved here from nm-applet). - - * system-settings/plugins/ifcfg-suse/parser.c (read_wpa_eap_settings): - Imlement WPA-EAP configuration reading from sysconfig. - -2008-05-16 Dan Williams - - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_set_enabled): request a scan after enabling - wireless - -2008-05-14 Dan Williams - - Fix Linus' bug in rh #134886 - - * src/nm-device-802-3-ethernet.c - - (constructor): request initial carrier state - - * src/nm-netlink-monitor.c - - (nm_netlink_monitor_request_status): schedule emission of carrier - signals after refilling the link cache. Because the refill is a - synchronous operation, the normal message hander won't get called - since libnl has already consumed the messages. - - (deferred_emit_carrier_state): emit carrier states from an idle handler - -2008-05-14 Dan Williams - - * src/NetworkManagerSystem.c - - (nm_system_device_is_up_with_iface): clean up - -2008-05-13 Dan Williams - - Fix refcounting issues over sleep/wake when a VPN connection was active that - caused NM to try registering an object path for a device upon wake that was - the same as an already registered object path. - - * src/nm-device.c - - (nm_device_take_down): properly handle cases where the device is - no longer active but was just active, and therefore must be - deactivated. When a device moves to unmanaged mode, this function - previously would not deactivate the device, because the state was - already unmanaged by the time this function was called. - - * src/vpn-manager/nm-vpn-connection.c - - (device_state_changed): properly handle multiple devices states in - which the device is now deactivated. Code previously didn't handle - transitions to the UNAVAILABLE (like rfkill or carrier off) and - UNMANAGED states. - -2008-05-13 Dan Williams - - * src/nm-device-private.h - src/nm-device.c - - (nm_device_hw_bring_up, nm_device_hw_take_down): export - - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_set_enabled): take devices up - and down as appropriate for the rfkill state - -2008-05-13 Dan Williams - - * marshallers/nm-marshal.list - - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin - - * system-settings/plugins/ifcfg-fedora/Makefile.am - system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c - system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE - events. Solely for use watching ifcfg files to pick up changes - to their hardlinks, since GIO doesn't support this yet (bgo #532815) - - * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the - file contents change - - (finalize): clean up inotify watches - - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile - and the connection ifcfg for changes on their hardlinks - - (files_changed_cb): proxy the changed signal back out to listeners - - * system-settings/plugins/ifcfg-fedora/plugin.c - - (dir_changed): - - (connection_ifcfg_changed): re-read the connection when the ifcfg - changes - - (read_one_connection): connect to change signals on the new connection - - (dir_changed, connection_changed_handler, - handle_connection_remove_or_new): break out connection change - handling and connection new/remove handling so it can be used from - both the GFileMonitor callback and the NMIfcfgConnection changed - signals - - * system-settings/plugins/ifcfg-fedora/reader.c - system-settings/plugins/ifcfg-fedora/reader.h - - (connection_from_file): return the keyfile path the connection would use - -2008-05-13 Tambet Ingo - - * system-settings/src/nm-polkit-helpers.c (create_polkit_context): Use a - single PolKitContext which is shared by all. PolKitContext::unref leaks - just about everything, including all open file descriptiors and results - in 99% cpu usage when data arrives to any of the fds that don't belong - to any context anymore. - -2008-05-12 Dan Williams - - * gfilemonitor/glocaldirectorymonitor.c - gfilemonitor/glocaldirectorymonitor.h - - (g_local_directory_monitor_constructor): actually subscribe to the - watch - - (_g_local_directory_monitor_new): ensure that inotify is started up - - * gfilemonitor/glocalfilemonitor.c - gfilemonitor/glocalfilemonitor.h - - (g_local_file_monitor_constructor): actually subscribe to the watch - - (_g_local_file_monitor_new): ensure that inotify is started up - -2008-05-11 Dan Williams - - * configure.in - - record PolicyKit version - - * system-settings/src/nm-polkit-helpers.c - - (check_polkit_privileges): use polkit_context_can_caller_do_action() - with PolicyKit <= 0.6 - -2008-05-11 Dan Williams - - Update Fedora system-settings plugin to support latest API and use - GFileMonitor rather than home-rolled inotify code. - - * system-settings/plugins/ifcfg-fedora/Makefile.am - system-settings/plugins/ifcfg-fedora/common.h - system-settings/plugins/ifcfg-fedora/plugin.c - - Update to latest system settings plugin API; use GIO instead of - custom inotify code; use NMIfcfgConnection objects instead of - ConnectionData structures tacked onto NMConnection objects - - * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.h - - Implement an NMExportedConnection subclass mapping ifcfg files to - connections - - * system-settings/plugins/ifcfg-fedora/reader.c - system-settings/plugins/ifcfg-fedora/reader.h - - Move ifcfg parsing bits here from parser.c - - * system-settings/plugins/ifcfg-fedora/parser.c - system-settings/plugins/ifcfg-fedora/parser.h - - Remove; most code moved to reader.c - -2008-05-11 Dan Williams - - * configure.in - Makefile.am - gfilemonitor/* - - Add a private copy of the GIO GFileMonitor code, with a custom GFile - implementation, so that the same change monitoring code can be used - on systems without glib-2.14 (like Fedora 8) - - * system-settings/plugins/keyfile/Makefile.am - system-settings/plugins/keyfile/plugin.c - system-settings/plugins/ifcfg-suse/Makefile.am - system-settings/plugins/ifcfg-suse/plugin.c - - Use private gfilemonitor code if GIO is not present - -2008-05-09 Tambet Ingo - - * system-settings/plugins/ifcfg-suse/nm-suse-connection.c: Implement - NMExportedConnection's 'update' and 'delete' and return error with - descriptive message. - -2008-05-08 Dan Williams - - Patch from Markus Becker - - * src/nm-gsm-device.c - src/nm-cdma-device.c - - (real_get_best_auto_connection): implement; allow autoconnection - to GSM & CDMA devices - -2008-05-08 Tambet Ingo - - Use PolicyKit to authorize the system settings' AddConnection method - and the system settings connections' Update and Delete methods. - - * libnm-glib/nm-settings.c (impl_exported_connection_update) - (impl_exported_connection_delete, nm_exported_connection_update) - (nm_exported_connection_delete): Return boolean and fill GError - to notify the callers of the reasons why it might have failed. - - * libnm-glib/nm-dbus-settings-system.c - (nm_dbus_settings_system_add_connection): Return the error from dbus - call so that the callers can see why it failed. - - * libnm-glib/nm-dbus-connection.c (update, delete): Update the - signatures. - - * system-settings/src/nm-polkit-helpers.[ch]: Implement. - - * system-settings/src/nm-sysconfig-connection.[ch]: Implement. New - abstract base class that checks PolicyKit permissions. - - * system-settings/src/dbus-settings.c: - (impl_settings_add_connection): Check the policy before carring out - the request. - - * system-settings/plugins/keyfile/nm-keyfile-connection.c: - Inherit from NMSysconfigConnection, check the policies before - allowing updating or removing. - - * system-settings/plugins/ifcfg-suse/nm-suse-connection.c: - Inherit from NMSysconfigConnection. - - * introspection/nm-exported-connection.xml: Annotate "Update" and - "Delete" methods with async flag so that the implementations can get - access to DBusGMethodInvocation. - - * system-settings/src/dbus-settings.c - (settings_add_connection_check_privileges): Implement. - (impl_settings_add_connection): Check the privileges before adding a new - connection. Improve error reporting. - - * introspection/nm-settings-system.xml: Make the 'AddConnection' method - async so that the implementation can access DBusGMethodInvocation. - - * configure.in: Check for PolicyKit. - - * policy/org.freedesktop.network-manager-settings.system.policy: - New file. - - * policy/Makefile.am: Install the policy file. - - * configure.in: Add 'policy' subdir. - -2008-05-08 Tambet Ingo - - Rewrite the suse system settings plugin. - - * system-settings/plugins/ifcfg-suse/plugin.c: Rewrite. - - * system-settings/plugins/ifcfg-suse/parser.c: Rewrite. - - * system-settings/plugins/ifcfg-suse/nm-suse-connection.[ch]: Implement. - - * system-settings/plugins/ifcfg-suse/Makefile.am: Add new files to build. - - * system-settings/src/dbus-settings.c: Fix connection reference counting. - - * system-settings/src/main.c (load_plugins): Improve error reporting. - - * system-settings/src/sha1.[ch] Add. - - * system-settings/src/Makefile.am: Add sha1[ch] to build. - -2008-05-07 Dan Williams - - * system-settings/plugins/keyfile/reader.c - - (read_one_setting_value): handle IP address items separately - - (read_array_of_uint): read IPv4 DNS option as a string array - - (read_array_of_array_of_uint): read IPv4 address tuples as a string - array - - * system-settings/plugins/keyfile/writer.c - - (write_setting_value): handle IP address items separately - - (write_array_of_uint): handle IPv4 DNS option as a string array, - not an array of uint, so that it's user-editable - - (write_array_of_array_of_uint): handle IPv4 address tuples as string - arrays, so they are user-editable - -2008-05-07 Dan Williams - - * system-settings/plugins/keyfile/Makefile.am - - Change location of the keyfile plugin settings to - /etc/NetworkManager/system-connections - -2008-05-05 Tambet Ingo - - * system-settings/plugins/keyfile/nm-keyfile-connection.[ch]: Implement. - - * system-settings/plugins/keyfile/plugin.c: Work with - NMKeyfileConnections. - - * system-settings/src/dbus-settings.c: Remove NMSysconfigExportedConnection. - Plugins are supposed to return NMExportedConnections now and handle the - updated(), removed(), and GetSecrets(). - Store the internal list of connections in hash table to make it easier - to find duplicates. - -2008-05-07 Tambet Ingo - - * src/backends/NetworkManagerSuSE.c (nm_system_set_hostname): Update - for multiple IP addresses. - -2008-05-07 Tambet Ingo - - Patch from André Lemos. - - * libnm-glib/nm-dbus-settings.c (fetch_connections_done): Fix a memory - corruption. - -2008-05-06 Dan Williams - - * src/dhcp-manager/nm-dhcp-manager.c - - (nm_dhcp_manager_get_ip4_config): clean up; update for changes to - NMIP4Config to support multiple IP addresses - - * src/NetworkManagerUtils.c - - (nm_utils_merge_ip4_config): update for multiple IP addresses - - * src/nm-ip4-config.c - src/nm-ip4-config.h - - Store a list of IPv4 address/netmask/gateway tuples - - (nm_ip4_config_get_gateway, nm_ip4_config_set_gateway, - nm_ip4_config_get_netmask, nm_ip4_config_set_netmask, - nm_ip4_config_get_broadcast, nm_ip4_config_set_broadcast, - nm_ip4_config_set_address): remove - - (nm_ip4_config_take_address, nm_ip4_config_add_address, - nm_ip4_config_replace_address, nm_ip4_config_get_num_addresses): - new functions; handle multiple IPv4 addresses - - * src/nm-device.c - src/ppp-manager/nm-ppp-manager.c - src/vpn-manager/nm-vpn-connection.c - src/NetworkManagerPolicy.c - test/nm-tool.c - libnm-glib/libnm-glib-test.c - - update for changes to NMIP4Config for multiple IPv4 addresses - - * src/NetworkManagerSystem.c - - (nm_system_device_set_ip4_route): don't add the route if any address - is on the same subnet as the destination - - (check_one_address): ignore the exact match, just match family and - interface index - - (add_ip4_addresses): add all IPv4 addresses in an NMIP4Config to - an interface - - (nm_system_device_set_from_ip4_config): use add_ip4_addresses() - - (nm_system_vpn_device_set_from_ip4_config): use add_ip4_addresses() - - * introspection/nm-ip4-config.xml - - Remove 'address', 'gateway', 'netmask', and 'broadcast' properties - - Add 'addresses' property which is an array of (uuu) tuples of - address/netmask/gateway - - * libnm-util/nm-setting-ip4-config.c - - (set_property): use ip-address <-> GValue converters from nm-utils.c - - * libnm-glib/nm-ip4-config.c - libnm-glib/nm-ip4-config.h - - Handle D-Bus interface changes to support multiple IP addresses - -2008-05-06 Dan Williams - - * libnm-util/nm-utils.c - libnm-util/nm-utils.h - - (nm_utils_ip4_addresses_from_gvalue, - nm_utils_ip4_addresses_to_gvalue): new functions - -2008-05-06 Tambet Ingo - - * libnm-glib/nm-dbus-settings.c (fetch_connections_done): Don't leak - the returned connection paths. - -2008-05-05 Tambet Ingo - - * libnm-glib/nm-dbus-settings.c (constructor): Fix the - "PropertiesChanged" signal signature. - - * libnm-glib/nm-dbus-connection.c (constructor): Use the common GType - defined in nm-dbus-glib-types.h. - Don't register the connection on dbus, we're a proxy class to - communicate with an already registered connection over dbus. - -2008-04-30 Tambet Ingo - - Implement new subclasses of NMSettings and NMExportedConnection to make - it easier for the applet to access and modify system settings. - - * libnm-glib/nm-dbus-connection.[ch]: - * libnm-glib/nm-dbus-settings.[ch]: - * libnm-glib/nm-dbus-settings-system.[ch]: Implement. - - * libnm-glib/Makefile.am: Add the new files to build, generate some more - bindings and glue. - - * include/NetworkManager.h: Define the system settings DBus interface. - -2008-04-30 Tambet Ingo - - Implement additional C API for exported connections to make them identical - with the DBus API. Change the (list_connections) virtual function to be - more usable from C - instead of requiring implementers to return a GPtrArray - of dbus paths, return a list of connections. - - * libnm-glib/nm-settings.c (nm_exported_connection_class_init): Fix a typo. - (nm_settings_list_connections): - (nm_exported_connection_new): - (nm_exported_connection_update): - (nm_exported_connection_delete): Implement. - - (impl_settings_list_connections): - (impl_exported_connection_update): - (impl_exported_connection_delete): Use the new public functions to make - sure the C and dbus interfaces stay in sync. - - * system-settings/src/dbus-settings.c (list_connections): Return a list of - connections. - -2008-05-02 Dan Williams - - * system-settings/plugins/ifcfg-fedora/plugin.c - - (dispose): use right unref call on the DBusGConnection - -2008-05-02 Dan Williams - - * src/nm-serial-device.c - - (find_terminator): don't compare the whole line, just the size of the - terminator, since some modems put stuff after the terminator, like - "CONNECT 9600" - -2008-05-01 Dan Williams - - Patch from Michael Biebl - - * callouts/Makefile.am - callouts/org.freedesktop.nm_dispatcher.service.in - system-settings/src/Makefile.am - system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in - - use the right install location for dbus-activated stuff - -2008-04-30 Dan Williams - - * src/nm-gsm-device.c - - (enter_pin): fix setting name passed to applets when asking for a GSM - PIN or PUK - -2008-04-30 Dan Williams - - * src/nm-manager.c - - (nm_manager_error_get_type): remove erroneous NULL enum from table - -2008-04-30 Dan Williams - - * src/nm-device-802-3-ethernet.c - src/nm-device-802-11-wireless.c - - (real_is_up): return true instead of chaining up to unimplemented - parent method - -2008-04-30 Dan Williams - - * src/NetworkManagerSystem.c - src/NetworkManagerSystem.h - - (nm_system_device_is_up, nm_system_device_is_up_with_iface): new - functions to check device flags for IFF_UP - - * src/nm-serial-device.c - - (real_is_up): remove; NMDevice now returns TRUE if the subclass doesn't - implement is_up - - * src/nm-device-802-3-ethernet.c - src/nm-device-802-11-wireless.c - - (real_hw_is_up): call nm_system_device_is_up() - - * src/nm-device.c - - (real_hw_is_up): move to nm_system_device_is_up_with_iface() - - (real_is_up): remove; nm_device_is_up() returns TRUE if subclass - does not implement - -2008-04-29 Dan Williams - - Handle HAL dropouts better; allow NM to start up even if HAL isn't up yet. - - * marshallers/nm-marshal.list - - Add marshaller - - * src/NetworkManager.c - - (main): let the NMManager handle the NMHalManager - - * src/nm-hal-manager.c - src/nm-hal-manager.h - - convert to a GObject, and emit singals when stuff changes. Let the - NMManager handle the signals, instead of the NMHalManager calling - into the NMManager. - - * src/nm-manager.c - src/nm-manager.h - - (remove_one_device): consolidate device removals here - - (dispose): use remove_one_device() - - (nm_manager_get_device_by_udi): make static - - (deferred_hal_manager_query_devices): idle handler to query the HAL - manager for devices at startup or wakeup time - - (nm_manager_new): create and monitor the HAL manager - - (hal_manager_udi_added_cb): new function; do what - nm_manager_add_device() used to do when signalled by the hal manager - - (hal_manager_udi_removed_cb): new function; do what - nm_manager_remove_device() used to do when signalled by the hal - manager - - (hal_manager_rfkill_changed_cb): handle rfkill changes from the - hal manager - - (hal_manager_hal_reappeared_cb): when HAL comes back, remove devices - in our device list that aren't known to HAL - - (impl_manager_sleep): on wakeup, re-add devices from an idle handler; - see comments on nm-hal-manager.c::nm_manager_state_changed() a few - commits ago - - (nm_manager_get_device_by_path, nm_manager_is_udi_managed, - nm_manager_activation_pending, nm_manager_wireless_enabled, - nm_manager_wireless_hardware_enabled, - nm_manager_set_wireless_hardware_enabled): remove, unused - -2008-04-28 Dan Williams - - Fix the device up/down ambiguities. Up/down state used to be a - conglomeration of hardware state (IFF_UP) and any device-specific things - (supplicant, periodic timers, etc) that the device used to indicate - readiness. Unfortunately, if the hardware was already IFF_UP for some - reason, then the device specific stuff wouldn't get run, and the device - would be stuck. - - * src/nm-device.c - src/nm-device.h - - Create hw_is_up, hw_bring_up, and hw_take_down - - Rename bring_down -> take_down - - (real_hw_is_up): check interface flags for IFF_UP - - (nm_device_hw_is_up): let subclasses figure out their own HW state - - (nm_device_is_up): make static; only used locally - - (nm_device_hw_bring_up): update the hardware and IPv4 addresses even - if the device is already up; if the device isn't up, bring it up - - (nm_device_hw_take_down): just take down hardware - - (nm_device_bring_up): bring up HW first, then device specific stuff - - (nm_device_take_down): always deactivate device when called; always - try to take hardware down too - - (nm_device_state_changed): take device down when entering unmanaged - state from a higher state - - * src/nm-device-802-11-wireless.c - - (real_hw_is_up, real_hw_bring_up, real_hw_take_down): implement; just - check IFF_UP really - - (real_take_down, supplicant_iface_state_cb_handler, - supplicant_iface_connection_state_cb_handler, - supplicant_mgr_state_cb_handler): fix some messages - - * src/nm-device-802-3-ethernet.c - - (real_hw_is_up, real_hw_bring_up, real_hw_take_down): implement; just - check IFF_UP really - -2008-04-28 Dan Williams - - * src/nm-manager.c - src/nm-manager.h - - (nm_manager_error_get_type): add new error - - (nm_manager_remove_device): don't bother taking down the device here, - the state change from unmanaging the device will do it - - (impl_manager_sleep): move nm_manager_sleep() here since nothing else - uses it; when going to sleep, just unmanage the device instead of - taking it down, because stuff will cleaned up correctly when the - device gets unmanaged - -2008-04-28 Dan Williams - - * src/nm-hal-manager.c - - (add_initial_devices): convert to a GSourceFunc prototype - - (nm_manager_state_changed): when coming out of sleep, punt the - device re-addition to an idle handler to let D-Bus events go out - first, fixing a potential dbus-glib assert if the old device was - not yet disposed (due to references held while emitting the D-Bus - signals) but the new device was found, because the mainloop didn't - run between signal emission and add_initial_devices() - -2008-04-27 Dan Williams - - Patch from Benoit Boissinot - - * initscript/paldo/NetworkManager.in - initscript/SUSE/networkmanager.in - - Remove last bits of dhcdbd - -2008-04-27 Dan Williams - - * src/nm-device-802-11-wireless.c - - (link_timeout_cb): don't ask for secrets when disconnected during - association/authentication phase, drivers are still just too crappy - -2008-04-27 Dan Williams - - * Makefile.am - configure.in - dispatcher-daemon/Makefile.am - dispatcher-daemon/NetworkManagerDispatcher.c - initscript/Arch/Makefile.am - initscript/Arch/networkmanager-dispatcher.in - initscript/Gentoo/Makefile.am - initscript/Gentoo/NetworkManagerDispatcher.in - initscript/Mandriva/Makefile.am - initscript/Mandriva/networkmanagerdispatcher.in - initscript/RedHat/Makefile.am - initscript/RedHat/NetworkManagerDispatcher.in - initscript/SUSE/Makefile.am - initscript/SUSE/networkmanager-dispatcher.in - initscript/Slackware/Makefile.am - initscript/Slackware/rc.networkmanager-dispatcher.in - initscript/paldo/Makefile.am - initscript/paldo/NetworkManagerDispatcher.in - man/Makefile.am - man/NetworkManagerDispatcher.8.in - - Remove the dispatcher daemon - -2008-04-27 Dan Williams - - * callouts/Makefile.am - callouts/nm-dispatcher-action.c - callouts/nm-dispatcher-action.h - callouts/nm-dispatcher.conf - callouts/nm-dispatcher.xml - callouts/org.freedesktop.nm_dispatcher.service - - Re-implement the dispatcher as a system-bus activated service that - NM calls on-demand, rather than an always running daemon - - * src/Makefile.am - - Add callouts dir to includes to pick up dispatcher defines - - * src/nm-device.c - - (nm_device_state_changed): call dispatcher on device activated/ - deactivated - - * src/vpn-manager/nm-vpn-connection.c - - (nm_vpn_connection_set_vpn_state): call dispatcher when VPN connections - go up and down - - * src/NetworkManagerUtils.c - src/NetworkManagerUtils.h - - (nm_utils_call_dispatcher): helper to call dispatcher - -2008-04-27 Dan Williams - - * src/NetworkManagerUtils.c - src/NetworkManagerUtils.h - - remove unneeded includes - - (nm_null_safe_strcmp, nm_ethernet_addresses_are_equal, - nm_utils_inet_ip4_address_as_string, nm_timeval_has_passed, - nm_timeval_cmp, nm_timeval_add): remove, unused - - clean up formatting - - (nm_spawn_process): de-uglify - - * src/nm-device-802-11-wireless.c - - (get_active_ap): use memcmp() not nm_ethernet_addresses_are_equal() - -2008-04-26 Saleem Abdulrasool - - * initscript/Gentoo/NetworkManager.in: - Fix for starting the daemon. - -2008-04-25 Dan Williams - - Patch from Benoit Boissinot - - * src/NetworkManagerSystem.c - - (nm_system_device_set_ip4_route): reimplement using libnl, not ioctls - -2008-04-25 Dan Williams - - Patch from Benoit Boissinot - - * src/NetworkManagerSystem.c - - (nm_system_device_replace_default_ip4_route): new function; a libnl - implementation of nm_system_device_replace_default_route() - - * src/NetworkManagerPolicy.c - - (update_default_route): use nm_system_device_replace_default_ip4_route() - - * src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerMandriva.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - - (nm_system_device_replace_default_route): remove - -2008-04-25 Dan Williams - - Patch from Benoit Boissinot - - * src/NetworkManagerSystem.c - - (validate_ip4_route): remove; use nl_addr_parse() instead - - (nm_system_device_add_ip4_route_via_device_with_iface): new function, - replace nm_system_device_add_route_via_device_with_iface() in the - backends - - * src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerMandriva.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - - Remove nm_system_device_add_route_via_device_with_iface() - -2008-04-25 Dan Williams - - * system-settings/plugins/ifcfg-fedora/parser.c - - (GET_ONE_DNS): fix parsing of DNS2 & DNS3 - -2008-04-24 Dan Williams - - * dispatcher-daemon/NetworkManagerDispatcher.c - - (nmd_execute_scripts): execute scripts in order as sorted by strcmp() - -2008-04-24 Dan Williams - - * initscript/RedHat/NetworkManager.in - initscript/RedHat/NetworkManagerDispatcher.in - - Be active at runlevel 2 - - Adjust priorities earlier - -2008-04-22 Dan Williams - - * src/NetworkManagerPolicy.c - - (update_routing_and_dns): when checking for a gateway, look at the - composite IP4 config, not the connection's ip4-config setting, which - doesn't include DHCP-returned information - -2008-04-22 Tambet Ingo - - Implement GKeyFile system settings plugin. - Implement writing system settings (currently supported only by GKeyFile plugin). - - * system-settings/src/main.c: - * system-settings/src/dbus-settings.c: Move the communication with plugins - from main.c to dbus-settings.c. Makes it possible to talk to all registered - plugins for adding/updating/removing connections. - - * system-settings/src/nm-system-config-interface.c - (nm_system_config_interface_add_connection): Implement - (nm_system_config_interface_update_connection): Implement. - (nm_system_config_interface_remove_connection): Implement. - - * system-settings/plugins/keyfile/Makefile.am: - * system-settings/plugins/keyfile/plugin.[ch]: - * system-settings/plugins/keyfile/writer.[ch]: - * system-settings/plugins/keyfile/reader.[ch]: Implement. - - * system-settings/plugins/Makefile.am: Add GKeyFile plugin. - - * configure.in: Generate GKeyFile Makefile. - - * libnm-glib/nm-settings.c (impl_exported_connection_get_id): Fix a memory - corruption, need to duplicate the returned string. - (impl_exported_connection_update): Implement. - (impl_exported_connection_delete): Implement. - - * introspection/nm-settings-system.xml: Add "AddConnection" method. - - * introspection/nm-exported-connection.xml: Add "Update" and "Delete" methods. - -2008-04-22 Dan Williams - - Patch from Charles R. Anderson (cra@wpi.edu) - - * src/NetworkManagerPolicy.c - - (update_routing_and_dns): don't select devices without a gateway - as having the default route (rh #437338) - -2008-04-21 Dan Williams - - * src/nm-activation-request.c - src/nm-activation-request.h - - (dispose): ensure to disconnect from the device's state-changed signal - when appropriate so the signal doesn't get handled by an already - disposed NMActRequest - - (device_state_changed): update is_default here too just to make sure - default is only True when the child device is activated - - (nm_act_request_set_default): new function - - * src/NetworkManagerPolicy.c - - (update_routing_and_dns): set 'default' on the active connection which - has the default route and DNS - -2008-04-21 Dan Williams - - * src/NetworkManagerPolicy.c - - (device_state_changed): update routing and DNS when a device goes - into unmanaged or unavailable states too (like rfkill or carrier loss) - -2008-04-21 Dan Williams - - * include/NetworkManager.h - - Add NMActiveConnectionState enum - - * introspection/nm-active-connection.xml - introspection/nm-vpn-connection.xml - - Add 'State' property for overall active connection state - - Add 'Default' property, when True means this active connection - has the default route - - Add PropertyChanged signals so changes actually go out over the bus - - * src/nm-active-connection.h - - Add defines for State & Default properties - - * src/nm-activation-request.c - - Add 'state' and 'default' properties, hook up to device 'state-changed' - signal to determine active connection state - - * src/vpn-manager/nm-vpn-connection.c - src/vpn-manager/nm-vpn-connection.h - src/vpn-manager/nm-vpn-manager.c - src/vpn-manager/nm-vpn-service.c - - Rename old 'state' to 'vpn-state' - - Rename nm_vpn_connection_get_state() -> nm_vpn_connection_get_vpn_state() - - Add 'state' and 'default' properties, hook up to the vpn connection's - 'vpn-state-changed' signal - - * libnm-glib/nm-active-connection.c - libnm-glib/nm-active-connection.h - - Add new 'state' and 'default' properties and accessors - - * libnm-glib/nm-vpn-connection.c - libnm-glib/nm-vpn-connection.h - - Rename old 'state' property to 'vpn-state' - - Add new 'state' and 'default' properties and accessors - -2008-04-21 Dan Williams - - * src/nm-ip4-config.c - - (nm_ip4_config_to_rtnl_addr): fill in the broadcast address if it's - not specified (rh #443474) - -2008-04-20 Dan Williams - - * src/NetworkManagerUtils.c - src/NetworkManagerUtils.h - - (nm_utils_merge_ip4_config): new function; merge settings from an - NMSettingIP4Config to an NMIP4Config object - - * src/nm-device.c - - (merge_ip4_config): move to NetworkManagerUtils.c - - * src/vpn-manager/nm-vpn-connection.c - - (nm_vpn_connection_ip4_config_get): merge in user-specified settings - too - -2008-04-18 Dan Williams - - * libnm-util/nm-setting-ppp.c - libnm-util/nm-setting-ppp.h - - Add 'no-vj-comp' option for TCP header compression - - baud, mru, mtu, lcp_echo_failure, and lcp_echo_interval are really - uint32 - -2008-04-18 Dan Williams - - * libnm-util/nm-setting-ppp.c - libnm-util/nm-setting-ppp.h - src/ppp-manager/nm-ppp-manager.c - - Add 'refuse-pap' and 'refuse-mschapv2' options - -2008-04-18 Dan Williams - - * libnm-util/nm-setting-ppp.c - libnm-util/nm-setting-ppp.h - src/ppp-manager/nm-ppp-manager.c - - Remove the 'usepeerdns' option and always request DNS servers from - the PPP server; the connection chooses to use/override/ignore the - DNS servers returned from the PPP server - -2008-04-18 Dan Williams - - * libnm-util/nm-setting-ppp.c - libnm-util/nm-setting-ppp.h - src/ppp-manager/nm-ppp-manager.c - - Remove the 'require-mppc' option, because pppd doesn't support it and - it seems to have been an erroneous addition to the PPTP plugin in - the first place (from which the ppp-manager is derived) - -2008-04-17 Dan Williams - - * libnm-util/nm-setting-pppoe.c - - (verify): require a PPP setting too - - * src/ppp-manager/nm-ppp-manager.c - - (nm_ppp_manager_start): fail if no PPP setting is present instead of - segfaulting - -2008-04-17 Dan Williams - - * src/nm-device.c - - (nm_device_state_changed): do deactivation and and promotion to - unavailable here, so that the device gets cleaned up before the - manager runs and starts emitting signals; do the - FAILED->DISCONNECTED transition from an idle handler rather than - immediately to guard against recursion - - (nm_device_deactivate_quickly, nm_device_dispose): stop the - FAILED->DISCONNECTED handler if it's scheduled - -2008-04-17 Dan Williams - - * src/nm-device-802-11-wireless.c - - (state_changed_cb): clear AP list when device transitions to - unavailable or unmanaged - - (nm_device_802_11_wireless_dispose): remove redundant set_current_ap() - since this is already done in device_cleanup() - - (supplicant_iface_scanned_ap_cb): don't leak new APs when the device - isn't available or managed - - (device_cleanup): use remove_all_aps() - - (remove_all_aps): consolidate code removing all APs - -2008-04-17 Dan Williams - - * src/nm-serial-device.c - src/nm-serial-device.h - - (wait_for_reply_got_data): break input into lines, and search each - line for responses _and_ terminator strings; also make sure that - the read loop doesn't continue after the timeout is supposed to fire - - (nm_serial_device_wait_for_reply): take an array of terminators too - - * src/nm-gsm-device.c - src/nm-cdma-device.c - - Send terminators to nm_serial_device_wait_for_reply() - -2008-04-16 Dan Williams - - Patch from 陈鑫 - - * src/ppp-manager/nm-pppd-plugin.c - - (get_credentials): return correct value for success; handle case where - pppd just does some checking but doesn't want a password - - (plugin_init): make CHAP work too - -2008-04-16 Dan Williams - - Patch from 陈鑫 - - * src/ppp-manager/nm-ppp-manager.c - - (create_pppd_cmd_line): fix argument generation when spawning pppd - -2008-04-16 Dan Williams - - Patch from 陈鑫 - - * src/nm-device-802-3-ethernet.c - - (real_deactivate_quickly): clear the IP interface name on - deactivation, otherwise the wrong interface might get used later - for routing and IP management - -2008-04-15 Dan Williams - - * libnm-glib/nm-device.c - - (get_product_and_vendor): handle serial devices correctly - - (nm_device_update_description): pass device to get_product_and_vendor() - -2008-04-15 Dan Williams - - Patch from Benoit Boissinot - - * src/NetworkManagerSystem.h - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerMandriva.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - src/nm-device.c - - (nm_generic_device_add_ip6_link_address, - nm_system_device_add_ip6_link_address): remove - -2008-04-15 Dan Williams - - Patch from Benoit Boissinot - - * src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerMandriva.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - src/NetworkManagerSystem.h - - flush_routes -> flush_ip4_routes - - flush_addresses -> flush_ip4_addresses - - * src/NetworkManagerSystem.c - src/nm-device.c - src/vpn-manager/nm-vpn-connection.c - - flush only IPv4 addresses; don't touch IPv6 routes and addresses - -2008-04-15 Dan Williams - - Remove exposure of wireless-tools mode types in the API. - - * include/NetworkManager.h - - Define NM80211Mode enum - - * introspection/generic-types.xml - - Describe NM_802_11_MODE enum - - Remove IW_MODE_* enum - - * introspection/nm-access-point.xml - libnm-glib/nm-access-point.c - libnm-glib/nm-access-point.h - - 'mode' is now of type NM80211Mode, a DBUS_TYPE_UINT - - * introspection/nm-device-802-11-wireless.xml - libnm-glib/nm-device-802-11-wireless.c - libnm-glib/nm-device-802-11-wireless.h - - 'mode' is now of type NM80211Mode, a DBUS_TYPE_UINT - - * libnm-util/nm-setting-wireless.c - src/NetworkManagerAP.c - src/NetworkManagerAP.h - src/nm-device-802-11-wireless.c - src/nm-device-802-11-wireless.h - test/nm-tool.c - - Use NM80211Mode not IW_MODE_* - -2008-04-15 Dan Williams - - Enhance nm-online based on a patch from Bill Nottingham. - - * test/nm-online.c - - Add a '-q' option - - Add help messages and option summary - - Add long-format options - - Add a '-x' option to exit if NM isn't running or isn't connecting - -2008-04-15 Tambet Ingo - - * libnm-util/nm-setting.c (nm_setting_duplicate): Implement. - - * libnm-util/nm-connection.c (nm_connection_remove_setting): Implement. - -2008-04-15 Dan Williams - - * nm-setting-ip4-config.c - - (ip4_addresses_from_gvalue): handle NULL address array - - * nm-setting-8021x.c - - (verify_tls, verify_ttls): warn on failed verification - -2008-04-10 Dan Williams - - * src/nm-gsm-device.c - - (automatic_registration): accept "+CREG: 0,0" - - (automatic_registration_response): fail on "+CREG: 0,0" - -2008-04-10 Tambet Ingo - - * libnm-util/nm-setting-wired.c (get_property): Fix a typo. - -2008-04-10 Tambet Ingo - - * system-settings/plugins/ifcfg-suse/parser.c (make_wireless_security_setting): - Make it compile again by commenting out broken code that at first didn't work and - now didn't compile either. - -2008-04-08 Dan Williams - - * libnm-glib/nm-object-cache.c - libnm-glib/nm-settings.c - src/dhcp-manager/nm-dhcp-manager.c - system-settings/plugins/ifcfg-fedora/plugin.c - system-settings/plugins/ifcfg-suse/plugin.c - system-settings/src/nm-system-config-hal-manager.c - libnm-util/nm-utils.c - - Remove usage of GStaticMutex since gcc-4.3 hates it and because we're - not threadsafe anyway - -2008-04-08 Dan Williams - - * system-settings/src/main.c - - (load_stuff, device_added_cb, device_removed_cb): device added/removed - callbacks take a device type too - -2008-04-08 Dan Williams - - The system settings service will now create a new default DHCP connection - for wired devices that have no existing applicable connection. - - * system-settings/src/nm-system-config-hal-manager.c - system-settings/src/nm-system-config-hal-manager.h - - (nm_system_config_hal_manager_get_type_for_udi): new function - - * system-settings/src/dbus-settings.c - system-settings/src/dbus-settings.h - - (nm_sysconfig_settings_get_connections): new function - - (nm_sysconfig_settings_is_device_managed): new function - - * system-settings/src/main.c - - (load_stuff): check for wired devices that need a default connection - - (get_details_for_udi): get interface and MAC address from HAL - - (add_default_dhcp_connection): add a default connection for a wired - device if needed - - (device_added_cb, device_removed_cb): do the right thing with - wired devices and their default connections on HAL device events - -2008-04-07 Dan Williams - - * libnm-glib/nm-device.c - libnm-glib/nm-device.h - - Proxy the 'managed' property - -2008-04-07 Dan Williams - - * src/nm-gsm-device.c - src/nm-cdma-device.c - - (state_changed_cb): when entering UNAVAILABLE state, schedule an idle - handler to transition to DISCONNECTED - -2008-04-07 Dan Williams - - Patch from Bill Nottingham - - * dispatcher-daemon/NetworkManagerDispatcher.c - - ignore backup/packaging crufy (rh #440143) - -2008-04-07 Dan Williams - - * include/NetworkManager.h - - Remove the DOWN and CANCELLED device states - - Add UNMANAGED and UNAVAILABLE device states - - Document the device states - - * introspection/nm-device.xml - src/nm-device-interface.c - src/nm-device-interface.h - - Add the 'managed' property - - * test/nm-tool.c - - (detail_device): print out device state - - * src/NetworkManagerSystem.h - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerMandriva.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - - (nm_system_device_get_system_config, nm_system_device_get_disabled - nm_system_device_free_system_config): remove; they were unused and - their functionality should be re-implemented in each distro's - system settings service plugin - - * src/nm-gsm-device.c - src/nm-gsm-device.h - src/nm-cdma-device.c - src/nm-cdma-device.h - - (*_new): take the 'managed' argument - - * src/nm-device.c - - (nm_device_set_address): remove, fold into nm_device_bring_up() - - (nm_device_init): start in unmanaged state, not disconnected - - (constructor): don't start device until the system settings service - has had a chance to figure out if the device is managed or not - - (nm_device_deactivate, nm_device_bring_up, nm_device_bring_down): - don't set device state here, let callers handle that as appropriate - - (nm_device_dispose): don't touch the device if it's not managed - - (set_property, get_property, nm_device_class_init): implement the - 'managed' property - - (nm_device_state_changed): bring the device up if its now managed, - and deactivate it if it used to be active - - (nm_device_get_managed, nm_device_set_managed): do the right thing - with the managed state - - * src/nm-hal-manager.c - - (wired_device_creator, wireless_device_creator, modem_device_creator): - take initial managed state and pass it along to device constructors - - (create_device_and_add_to_list): get managed state and pass to - type creators - - * src/nm-device-802-11-wireless.c - - (real_can_activate): fold in most of - nm_device_802_11_wireless_can_activate() - - (can_scan): can't scan in UNAVAILABLE or UNMANAGED - - (link_timeout_cb): instead of deactivating, change device state and - let the device state handler to it - - (real_update_hw_address): clean up - - (state_changed_cb): when entering UNAVAILABLE state, schedule an idle - handler to transition to DISCONNECTED if the device isn't rfkilled - - * src/nm-device-802-3-ethernet.c - - (set_carrier): move above callers and get rid of prototype - - (device_state_changed): when entering UNAVAILABLE state, schedule an - idle handler to transition to DISCONNECTED if the device has a - carrier - - (real_update_hw_address): clean up - - (link_timeout_cb, ppp_state_changed): change state instead of calling - deactivation directly as deactivation doesn't change state anymore - - * src/NetworkManagerPolicy.c - - (schedule_activate_check): yay, remove wireless_enabled hack since - the NMManager and wireless devices work that out themselves now - - (device_state_changed): change to a switch and update for new device - states - - (device_carrier_changed): remove; device handles this now through - state changes - - (device_added): don't care about carrier any more; the initial - activation check will happen when the device transitions to - DISCONNECTED - - * src/nm-manager.c - - (dispose): clear unmanaged devices - - (handle_unmanaged_devices): update unmanaged device list and toggle - the managed property on each device when needed - - (system_settings_properties_changed_cb): handle signals from the - system settings service - - (system_settings_get_unmanaged_devices_cb): handle callback from - getting the unmanaged device list method call - - (query_unmanaged_devices): ask the system settings service for its - list of unmanaged devices - - (nm_manager_name_owner_changed, initial_get_connections): get unmanaged - devices - - (manager_set_wireless_enabled): push rfkill state down to wireless - devices directly and let them handle the necessary state transitions - - (manager_device_state_changed): update for new device states - - (nm_manager_add_device): set initial rfkill state on wireless devices - - (nm_manager_remove_device): don't touch the device if it's unmanaged - - (nm_manager_activate_connection): return error if the device is - unmanaged - - (nm_manager_sleep): handle new device states correctly; don't change - the state of unavailable/unmanaged devices - - * libnm-glib/nm-device-802-11-wireless.c - - (state_changed_cb): update for new device states - -2008-04-07 Dan Williams - - * marshallers/nm-marshal.list - - Add VOID:STRING,UINT marshaller for system settings HAL manager - -2008-04-07 Dan Williams - - * system-settings/src/main.c - - (unmanaged_devices_changed_cb, register_plugin): proxy changes from - plugins to the dbus settings object - - (load_stuff): start the dbus service after grabbing unmanaged devices - - (dbus_reconnect, dbus_cleanup): make HAL manager aware of dbus events - - (log_handler, logging_setup, logging_shutdown): log output to syslog - - (main): switch default logging to syslog with a 'debug' option to - output to console; start up the HAL manager - -2008-04-07 Dan Williams - - * introspection/nm-settings-system.xml - introspection/Makefile.am - - Define the unmanaged devices interface for the system settings service - - * system-settings/src/nm-system-config-hal-manager.c - system-settings/src/nm-system-config-hal-manager.h - system-settings/src/nm-system-config-hal-manager-private.h - system-settings/src/Makefile.am - - Add a lightweight HAL manager object for tracking network devices for - the purpose of determining unmanaged devices and which devices need - the default DHCP connections - - * system-settings/src/nm-system-config-interface.c - system-settings/src/nm-system-config-interface.h - - (nm_system_config_interface_init): add the HAL manager as an argument - - (nm_system_config_interface_get_unmanaged_devices): implement - - Define 'unmanaged-devices-changed' signal - - * system-settings/src/dbus-settings.c - system-settings/src/dbus-settings.h - - Implement the unmanaged devices interface; some cleanups - - * system-settings/plugins/ifcfg-suse/plugin.c - - Fixup for plugin interface changes - - * system-settings/plugins/ifcfg-fedora/plugin.c - - (get_ether_device_udi): new function; find the device that has - a specified MAC address and return its UDI - - (get_udi_for_connection): new function; try to find the specific - device a connection is locked to, if any - - (device_added_cb, device_removed_cb): update unmanaged device list in - response to HAL events - - (get_unmanaged_devices): new function; return unmanaged device list - - (build_one_connection): set the connection's locked device, if any - - (write_auto_wired_connection): remove - - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - - (handle_connection_changed): alert listeners that the unmanaged device - list has changed - - (init): fixup for plugin interface changes, implement unmanaged devices - - * system-settings/plugins/ifcfg-fedora/parser.c - system-settings/plugins/ifcfg-fedora/parser.h - - (connection_data_free): clean up connection UDI - -2008-04-07 Dan Williams - - * system-settings/plugins/ifcfg-fedora/parser.c - - (make_ip4_setting): fix parsing of DNS servers - -2008-04-05 Dan Williams - - * Makefile.am - configure.in - marshallers/Makefile.am - marshallers/nm-marshal-main.c - marshallers/nm-marshal.list - - Consolidate marshallers - - * libnm-glib/nm-marshal-main.c - libnm-glib/nm-marshal.list - src/marshallers/Makefile.am - src/marshallers/nm-marshal-main.c - src/marshallers/nm-marshal.list - - Remove - - * libnm-glib/Makefile.am - src/Makefile.am - src/dhcp-manager/Makefile.am - src/ppp-manager/Makefile.am - src/supplicant-manager/Makefile.am - src/vpn-manager/Makefile.am - - Use consolidated marshallers - -2008-04-04 Dan Williams - - * src/nm-hal-manager.c - src/nm-hal-manager.h - - (hal_init): don't look for hardware here - - (nm_hal_manager_start): new function; look for hardware here instead, - which can be done at a later time than hal_init() - - * src/NetworkManager.c - - (main): start HAL manager after entering the main loop - -2008-04-03 Dan Williams - - * libnm-glib/nm-settings.c - libnm-glib/nm-settings.h - - (nm_exported_connection_get_id): new function - - (impl_exported_connection_get_id): use nm_exported_connection_get_id() - -2008-04-02 Dan Williams - - * src/nm-device-interface.c - src/nm-device-interface.h - src/nm-device.c - src/nm-device.h - - Rename check_connection_conflicts() to check_connection_compatible() - - * src/nm-device-802-11-wireless.c - - (real_check_connection_conflicts): remove - - (real_check_connection_compatible): implement; match MAC address - - * src/nm-device-802-3-ethernet.c - - (real_check_connection_conflicts): remove - - (real_check_connection_compatible): implement; match MAC address - - (real_get_best_auto_connection): correctly handle PPPoE cases - - * src/nm-manager.c - - (check_connection_allowed): remove; unused until PolicyKit integration - - (internal_activate_device): check whether the connection is compatible - with the device before trying to activate it - -2008-04-02 Dan Williams - - * system-settings/plugins/ifcfg-fedora/parser.c - - (read_mac_address): new function; read in MAC address and stuff it - into the connection - - (add_one_wep_key): remove debug spew - - (make_wireless_security_setting): validate the default TX key; don't - add the wireless-security setting if the connection doesn't need - security; don't leak the keys shvarFile on error cases - - (make_wireless_setting, make_wired_setting): populate device's MAC - address - -2008-04-02 Dan Williams - - * libnm-util/nm-setting-connection.c - libnm-util/nm-setting-connection.h - - (set_property, get_property, nm_setting_connection_class_init): remove - the 'lockdown' property; it's functionality will be replaced by - PolicyKit instead - -2008-04-01 Dan Williams - - Patch from Per Øyvind Karlsen - - * configure.in - initscript/Makefile.am - initscript/Mandriva/Makefile.am - initscript/Mandriva/networkmanager.in - initscript/Mandriva/networkmanagerdispatcher.in - src/backends/Makefile.am - src/backends/NetworkManagerMandriva.c - system-settings/plugins/Makefile.am - - Add Mandriva support - -2008-03-31 Dan Williams - - * src/vpn-manager/nm-vpn-service.c - - (nm_vpn_service_daemon_exec): add an error argument so that spawn - errors can be passed back to the caller; also no longer scheduled - as an idle handler, but called directly; and bump up VPN service - spawn timeout, 2s is really short - - (nm_vpn_service_activate): don't schedule the VPN service activation, - but call it directly so that errors are reported on return from - ActivateConnection() and don't get lost. If scheduled as an idle - handler, clients don't have the time to query NM for the new VPN - connection's properties before the VPN connection is torn down again - if the service couldn't be launched, and therefore launch errors - get lost. - -2008-03-31 Dan Williams - - * src/vpn-manager/nm-vpn-connection.c - - (device_state_changed): send correct state on device failure too - - (plugin_state_changed): failed state means unexpected disconnection, - thus if the service goes away while the VPN connection is activated - that's a failure too - -2008-03-31 Dan Williams - - * src/vpn-manager/nm-vpn-manager.c - src/vpn-manager/nm-vpn-manager.h - - Make VPNManager errors more available; add a service-start-failed error - -2008-03-31 Dan Williams - - * libnm-glib/nm-client.c - libnm-glib/nm-client.h - - (activate_cb): pass the new active connection to callback; fix - message when no callback is specified - -2008-03-30 Dan Williams - - * libnm-util/nm-setting-wireless-security.c - - (need_secrets): only require key0 if the transmit key index is also - 0 - - (verify): reject non-NULL but zero-length WEP keys; these are invalid - -2008-03-29 Dan Williams - - * libnm-util/nm-setting-8021x.c - libnm-util/nm-setting-ip4-config.c - libnm-util/nm-setting-vpn-properties.c - libnm-util/nm-setting-vpn.c - libnm-util/nm-setting-wireless-security.c - libnm-util/nm-setting-wireless.c - libnm-util/nm-utils.c - src/dhcp-manager/nm-dhcp-manager.c - src/nm-activation-request.c - src/nm-ip4-config.c - src/nm-manager.c - src/nm-properties-changed-signal.c - src/ppp-manager/nm-pppd-plugin.c - src/supplicant-manager/nm-supplicant-interface.c - src/vpn-manager/nm-vpn-connection.c - - consistently use nm-dbus-glib-types.h - -2008-03-29 Dan Williams - - * src/vpn-manager/nm-vpn-connection.c - - (nm_vpn_connection_class_init): PROP_SPECIFIC_OBJECT should be boxed, - not string - - * src/nm-activation-request.c - - (nm_act_request_class_init): PROP_SPECIFIC_OBJECT should be boxed, - not string - -2008-03-29 Dan Williams - - * libnm-glib/nm-device-802-11-wireless.c - - (access_point_added_proxy): create new APs if not found - -2008-03-29 Dan Williams - - * libnm-glib/nm-client.c - - (proxy_name_owner_changed): tell wireless devices about rfkill state - before freeing them - -2008-03-29 Dan Williams - - * system-settings/plugins/ifcfg-fedora/parser.c - - Fix parsing of WEP keys; ifcfg files use indexes [1...4] rather than - [0...3]; also handle KEY correctly in combination with DEFAULTKEY - -2008-03-29 Dan Williams - - * system-settings/plugins/ifcfg-fedora/parser.c - - (get_one_wep_key, make_wireless_security_setting): handle "KEY" too - -2008-03-27 Dan Williams - - * nm-object.c - - (nm_object_queue_notify): don't notify multiple times for the same - property - - * nm-object-private.h - - (handle_ptr_array_return): return NULL if the given array is NULL or - if it has zero elements - - * nm-ip4-config.c - - (finalize): use g_ptr_array_foreach() when freeing domains - - (nm_ip4_config_get_domains): use handle_ptr_array_return() - - * nm-active-connection.c - - (nm_active_connection_get_devices): use handle_ptr_array_return() - - * nm-device-802-11-wireless.c - nm-device-802-11-wireless.h - - (nm_device_802_11_wireless_get_access_points): return const; use - handle_ptr_array_return() - - * nm-types.c - - (nm_object_array_demarshal): always create an array, even of length - zero, to distinguish between "NM returned no items" and "haven't - asked NM yet" - - * nm-client.c - - (dispose): free active connections too - - (proxy_name_owner_changed): free active connections too when NM goes - away - - (nm_client_get_devices): return const; use handle_ptr_array_return() - - (nm_client_get_active_connections): use handle_ptr_array_return() - -2008-03-26 Dan Williams - - Rework VPN connection handling for a more consistent D-Bus API. The - VPNManager object has been removed, and active VPN connections are now the - same as any other active connection. The Manager object's ActivateConnection - and DeactivateConnection methods are used to start and stop a VPN connection, - and the VPNConnection objects are subclasses of the ActiveConnection objects. - When activating a VPN connection, pass the path of the active connection - to which the VPN connection is tied in the 'specific_object' argument. - - Consequently, the libnm-glib API has been reworked to match this arrangement, - with the VPNManager object removed, and the NMVPNConnection objects now - being subclasses of NMActiveConnection. - -2008-03-25 Dan Williams - - Patch from Björn Martensen - - * initscript/Arch/networkmanager.in - initscript/Arch/networkmanager-dispatcher.in - - Updates for Arch Linux (gnome.org #523701) - -2008-03-25 Dan Williams - - * libnm-glib/nm-ip4-config.c - libnm-glib/nm-active-connection.c - libnm-glib/nm-access-point.c - - Use nm_object_queue_notify() instead of g_object_notify() - - * libnm-glib/nm-device.c - - (demarshal_ip4_config): distinguish between successful but missing - ip4-config request, and unsuccessful and missing ip4-config request - - (nm_device_get_ip4_config): don't try to demarshal a NULL ip4-config - path - - Use nm_object_queue_notify() instead of g_object_notify() - - * libnm-glib/nm-device-802-11-wireless.c - - (demarshal_active_ap): distinguish between successfull but missing - active-ap request, and unsuccessful and missing active-ap request - - (dispose, clean_up_aps): consolidate AP list and active AP clearing - code - - (nm_device_802_11_wireless_set_wireless_enabled): add a private hook - for the NMClient to notify the device that wireless is disabled, - and therefore to clear the AP list and active AP - - Use nm_object_queue_notify() instead of g_object_notify() - - * libnm-glib/nm-client.c - - (poke_wireless_devices_with_rf_status): new function - - (update_wireless_status): notify wireless devices of the rfkill status - so they can clean up if needed - - Use nm_object_queue_notify() instead of g_object_notify() - -2008-03-25 Dan Williams - - * libnm-glib/nm-object.c - libnm-glib/nm-object-private.h - - (nm_object_queue_notify): add helper to batch & postpone GObject notify - signals to an idle handler - - (nm_object_get_property): add a timeout to the D-Bus method call - -2008-03-25 Dan Williams - - * introspection/nm-device-cdma.xml - introspection/nm-device-gsm.xml - introspection/Makefile.am - introspection/all.xml - - Add introspection for CDMA and GSM devices for PropertiesChanged signal - - * src/nm-gsm-device.h - src/nm-gsm-device.c - src/nm-cdma-device.h - src/nm-cdma-device.c - src/Makefile.am - - Implement PropertiesChanged signals - - * libnm-glib/nm-cdma-device.c - libnm-glib/nm-cdma-device.c - - Attach to PropertiesChanged signals - -2008-03-24 Dan Williams - - * libnm-glib/nm-client.c - - (client_device_added_proxy): add new devices to the internal device - list so they appear to clients - -2008-03-24 Dan Williams - - Massive fixup of libnm-glib to: - a) have all objects (with the exception of VPN) cache their properties and - update them asynchronously on PropertiesChanged signals from NM - b) return internal const data for most attributes/properties instead of - allocated values that the caller must free - c) cache wrapped objects such that a given D-Bus path will always map to the - same GObject returned by libnm-glib - d) remove a few signals and move them to GObject property notifications - e) match recent NM D-Bus API changes for activation/deactivation - f) remove some private functions from libnm-glib headers - -2008-03-20 Dan Williams - - * src/nm-manager.c - - (nm_manager_update_state, manager_device_state_changed, - nm_manager_activate_device, connection_added_default_handler, - impl_manager_activate_connection, impl_manager_deactivate_connection): - queue PropertyChanged singals when the active connections change - -2008-03-20 Dan Williams - - * introspection/nm-manager.xml - introspection/nm-manager-client.xml - - (ActivateConnection): return the object path of the active connection - on success - - (GetActiveConnections): remove - - (DeactivateConnection): new function; deactivate a currently active - connection - - Add an ActiveConnections property which returns an array of - active connection object paths - - * introspection/nm-device.xml - - (Deactivate): remove - - * introspection/all.xml - - Add ActiveConnection introspection - - * introspection/nm-active-connection.xml - - Add the ActiveConnection object - - * include/NetworkManager.h - - Add the Connection.Active D-Bus interface - - * src/nm-device-interface.c - - (impl_device_deactivate): remove - - * src/nm-activation-request.c - src/nm-activation-request.c - src/Makefile.am - - Implement the Connection.Active D-Bus interface - - * src/nm-manager.c - - (get_property, nm_manager_class_init): add ACTIVE_CONNECTIONS property - - (nm_manager_activate_device): return the active connection path - - (connection_added_default_handler, impl_manager_activate_connection): - return the active connection to the caller - - (add_one_connection_element, impl_manager_get_active_connections): - remove - - (impl_manager_deactivate_connection): new function; deactivate an - active connection - - * libnm-glib/nm-device.c - libnm-glib/nm-device.h - - Remove Deactivate() function - -2008-03-19 Dan Williams - - * introspection/nm-manager.xml - introspection/nm-manager-client.xml - - Rename the ActivateDevice method to ActivateConnection to better - reflect it's usage; it's arguments get reordered a bit too - - Convert GetActiveConnections method return from a struct to a dict - - * include/NetworkManager.h - - Define the dict keys for return value of GetActiveConnections - - * src/nm-manager.c - - impl_manager_activate_device -> impl_manager_activate_connection - - (add_one_connection_element): return a populated hash table, not - a structure - - * libnm-glib/nm-client.c - libnm-glib/nm-client.h - - nm_client_activate_device -> nm_client_activate_connection - - nm_client_free_active_connection_element -> nm_client_free_active_connections_element - - (nm_client_get_active_connections): return a GSList of GHashTables, - instead of the custom structures. Each element of the returned list - must be freed with nm_client_free_active_connections_element() - -2008-03-18 Dan Williams - - * system-settings/plugins/ifcfg-fedora/parser.c - system-settings/plugins/ifcfg-fedora/parser.h - system-settings/plugins/ifcfg-fedora/plugin.c - - Read settings from /etc/sysconfig/network-scripts/ instead of using - profiles. DNS servers and searches must now be stored in the ifcfg - files themselves - -2008-03-18 Tambet Ingo - - * src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_update_secrets): Don't - print out username and password, it's supposed to be a secret. - - * src/nm-device-802-3-ethernet.c (ppp_state_changed): Handle authentication - request and set the device state accordingly. - -2008-03-18 Tambet Ingo - - * src/nm-device-802-3-ethernet.c: Implement wired 802.1x authentication. - - * libnm-util/nm-setting-wireless-security.h: Fix a typo. - -2008-03-18 Dan Williams - - * src/vpn-manager/nm-vpn-connection.c - - (get_secrets_cb): handle new GetSecrets return format - -2008-03-18 Dan Williams - - Adapt system settings service for split 802.1x. - - * system-settings/src/nm-system-config-interface.h - - clarify return value of get_secrets() - - * system-settings/src/dbus-settings.c - - (string_to_gvalue, destroy_gvalue, add_one_secret_to_hash): remove - - (check_for_secrets): check if there actually secrets returned by a - plugin - - (exported_connection_get_secrets): just return the plugin-returned - hash of settings' secrets if it looks valid - - * system-settings/plugins/ifcfg-fedora/plugin.c - - (get_secrets): add split secrets with correct format to reply hash - - * system-settings/plugins/ifcfg-fedora/parser.c - system-settings/plugins/ifcfg-fedora/parser.h - - (copy_one_cdata_secret, connection_data_copy_secrets, - connection_data_free, connection_data_add): keep secrets for - different settings in different hashes - -2008-03-17 Tambet Ingo - - Clean up activating device deactivation. - - * src/nm-device.c (real_activation_cancel_handler): Remove. The same thing - should be done whether the device activation gets cancelled or the device - is just getting deactivated. - (nm_device_activation_cancel): Remove. - (nm_device_deactivate_quickly): Handle the case where device is activating. - - * src/nm-device-802-11-wireless.c (real_activation_cancel_handler): Remove. - It does the exact same thing as real_deactivate_quickly(). - -2008-03-17 Dan Williams - - Split the 802.1x bits out of the wireless-security setting so they are - generalized enough for wired 802.1x to use too. - - * introspection/nm-exported-connection.xml - - GetSecrets now returns 'a{sa{sv}}' (a hash of settings hashes) instead - of just a hash of the secrets for one setting - - * libnm-util/nm-setting-wireless-security.c - libnm-util/nm-setting-wireless-security.h - - Remove 802.1x-specific stuff - - Added leap-username and leap-password properties for old-school LEAP - - * src/nm-device.c - src/nm-device.h - - (connection_secrets_updated_cb): take a list of updated settings names, - not just one - - * src/supplicant-manager/nm-supplicant-config.c - src/supplicant-manager/nm-supplicant-config.h - - (nm_supplicant_config_add_setting_wireless_security): remove 802.1x - specific stuff; fix for updated LEAP bits; punt 802.1x stuff - to nm_supplicant_config_add_setting_8021x() - - (nm_supplicant_config_add_setting_8021x): add an 802-1x setting to - the supplicant config - - * src/nm-device-802-11-wireless.c - - (build_supplicant_config): pass in the 802.1x setting too, if any - - (real_connection_secrets_updated): take a list of updated settings - names, not just one - - * src/nm-device-802-3-ethernet.c - src/nm-cdma-device.c - src/nm-gsm-device.c - - (real_connection_secrets_updated_cb): take a list of updated settings - names, not just one - - * src/nm-activation-request.c - src/nm-activation-request.h - - (nm_act_request_class_init): the 'connection-secrets-updated' signal - now passes a list of updated settings names, not just one - - (update_one_setting): new function; handle one updated setting - - (get_secrets_cb): handle multiple settings returned from the - settings service; have to be careful of ordering here as there are - some dependencies between settings (ex. wireless-security and 802.1x - in some cases) - - * src/marshallers/nm-marshal.list - - new marshaller for connection-secrets-updated signal - - * libnm-util/nm-setting-8021x.c - - Add back the 'pin' and 'psk' settings, for EAP-SIM and EAP-PSK auth - methods - - (verify): a valid 'eap' property is now required - - * libnm-util/nm-connection.c - - (register_default_settings): add priorities to settings; there are - some dependencies between settings, and during the need_secrets - calls this priority needs to be respected. For example, only the - wireless-security setting knows whether or not the connection is - going to use 802.1x or now, so it must be asked for secrets before - any existing 802.1x setting is - - (nm_connection_lookup_setting_type): expose - - * libnm-util/nm-setting-wireless.c - - (verify): should verify even if all_settings is NULL; otherwise won't - catch the case where there is missing security - - * libnm-util/nm-setting-wireless-security.c - - Remove everything to do with 802.1x - - Add old-school LEAP specific properties for username and password - - (need_secrets): rework LEAP secrets checking - - (verify): rework for LEAP and 802.1x verification - -2008-03-17 Dan Williams - - * src/NetworkManagerPolicy.c - - (auto_activate_device): always remove the current activation check - from the pending activation list, otherwise when the policy gets - destroyed on NM exit it will attempt to free the already freed - activation check - -2008-03-14 Tambet Ingo - - * src/backends/NetworkManagerSlackware.c - (nm_system_device_setup_static_ip4_config): Remove, it's unused. - - * src/backends/NetworkManagerSuSE.c: Add missing includes. - -2008-03-14 Dan Williams - - * src/nm-manager.c - - (nm_device_interface_get_iface): g_object_get() will return an - allocated value, so this function must not return const - - (nm_device_interface_activate): free returned iface - -2008-03-14 Tambet Ingo - - * libnm-util/Makefile.am: Add new files to build. - - * libnm-util/nm-connection.c: Register NMSetting8021x. - - * libnm-util/nm-setting-8021x.c - * libnm-util/nm-setting-8021x.h: Implement. - -2008-03-14 Tambet Ingo - - * libnm-util/Makefile.am: Add new files to build. - - * libnm-util/nm-connection.c: Register NMSetting8021x. - - * libnm-util/nm-setting-8021x.c - * libnm-util/nm-setting-8021x.h: Implement. - -2008-03-14 Tambet Ingo - - * src/NetworkManagerPolicy.c (auto_activate_device): Don't leak device and - data. - -2008-03-14 Dan Williams - - * include/wireless-helper.h - include/Makefile.am - - One place for all the junk needed for #including wireless.h - - * test/nm-tool.c - src/NetworkManagerAP.c - src/wpa.c - src/Makefile.am - libnm-util/nm-utils.c - libnm-util/nm-setting-wireless.c - libnm-glib/nm-device-802-11-wireless.c - libnm-glib/nm-access-point.c - libnm-glib/libnm-glib-test.c - - include wireless-helper.h, not iwlib.h - - * configure.in - - Don't need libiw really, just need to check for wireless.h - - * src/kernel-types.h - - Remove; used types moved into wpa.c - - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_update_signal_strength, - real_get_generic_capabilities, nm_device_802_11_wireless_get_mode, - nm_device_802_11_wireless_set_mode, - nm_device_802_11_wireless_get_frequency, - nm_device_802_11_wireless_get_ssid, - nm_device_802_11_wireless_set_ssid, - nm_device_802_11_wireless_get_bitrate, - nm_device_802_11_wireless_get_bssid, - nm_device_802_11_wireless_disable_encryption): use ioctl() directly - instead of iwlib functions - -2008-03-14 Dan Williams - - * src/ppp-manager/nm-ppp-manager.c - - (impl_ppp_manager_need_secrets): since it's asynchronous now, it - should only take the DBusGMethodInvocation argument, not user/pass - too. With dbus-glib, async functions only take 2 C arguments since - the real dbus method arguments get passed back with - dbus_g_method_return() - -2008-03-13 Tambet Ingo - - * system-settings/plugins/ifcfg-suse/plugin.c (update_default_routes): - Adapt the changes of NMSettingIP4Config. - -2008-03-13 Dan Williams - - * src/NetworkManagerUtils.c - src/NetworkManagerUtils.h - - (nm_ether_ntop): replacement for iw_ether_ntop() - - * src/NetworkManagerAP.c - src/nm-device-802-11-wireless.c - src/nm-device-802-3-ethernet.c - - s/iw_ether_ntop/nm_ether_ntop/g - -2008-03-13 Dan Williams - - * src/NetworkManagerPolicy.c - - (update_routing_and_dns): never set the default route through an - IPv4LL addressed device - -2008-03-13 Dan Williams - - * NetworkManagerUtils.c - NetworkManagerUtils.h - - Remove NMSock stuff - - Remove the completion stuff - - * nm-device.c - nm-device.h - NetworkManager.c - NetworkManagerSystem.c - autoip.c - nm-device-802-11-wireless.c - nm-device-802-3-ethernet.c - - Remove NMSock and completion stuff - - Remove nm_ioctl_info() - -2008-03-12 Dan Williams - - * src/nm-device.c - - (merge_ip4_config): avoid duplicates - -2008-03-12 Dan Williams - - * libnm-util/nm-setting-ip4-config.c - libnm-util/nm-setting-ip4-config.h - - Remove 'manual' and 'autoip' properties - - Add 'method' property - - (verify): fix verification with 'method' - - (finalize): free 'method' - - (set_property, get_property, nm_setting_ip4_config_class_init): fix - up for 'method' - - * src/nm-device.c - - (real_act_stage3_ip_config_start): check IP4Config method - - (nm_device_new_ip4_autoip_config): add a note about not sucking in - the future - - (merge_ip4_config): IP settings are valid with DHCP too - - (real_act_stage4_get_ip4_config): handle all IP4Config methods - - (real_act_stage4_ip_config_timeout): don't do autoip on DHCP timeout - - * src/nm-device-802-11-wireless.c - - (real_act_stage3_ip_config_start): remove; autoip only on demand - - (real_act_stage4_get_ip4_config): just chain up to parent; autoip - only on demand - - * system-settings/plugins/ifcfg-fedora/parser.c - system-settings/plugins/ifcfg-suse/parser.c - - (make_ip4_setting): fix up for 'method' - -2008-03-12 Dan Williams - - * system-settings/plugins/ifcfg-fedora/parser.c - system-settings/plugins/ifcfg-fedora/parser.h - - (get_ifcfg_name): ignore more file suffixes - - (is_wireless_device): fix check for ifcfgs that have no TYPE - -2008-03-12 Dan Williams - - * configure.in - - Bring in the bits of gnome-common we actually use (all 15 lines) - -2008-03-12 Dan Williams - - * system-settings/plugins/ifcfg-fedora/plugin.c - - (write_auto_wired_connection): new function; write out an auto - wired connection file since the applet isn't doing it any more - - (reload_all_connections): write out the auto wired connection file - if there aren't any wired connections already - - (init): don't leak a GError - -2008-03-12 Dan Williams - - * src/nm-device-interface.c - - (nm_device_interface_activate): print the ID of the connection - that's about to be activated - -2008-03-12 Dan Williams - - Harmonize the 802.11 bitrate API - - * introspection/nm-access-point.xml - - 'Rate' -> 'MaxBitrate'; clarify units - - * introspection/nm-device-802-11-wireless.xml - - Clarify units of 'Bitrate' - - * src/NetworkManagerAP.c - src/NetworkManagerAP.h - - (set_property, get_property, nm_ap_class_init): rename 'rate' - property to 'max-bitrate' - - (foreach_property_cb): convert rate to Kb/s - - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_get_bitrate): return rate in Kb/s - - * libnm-glib/nm-access-point.c - libnm-glib/nm-access-point.h - - 'rate' -> 'max-bitrate' - - * test/nm-tool.c - libnm-glib/libnm-glib-test.c - - Fix up for these changes - -2008-03-12 Dan Williams - - * src/nm-device.c - - (nm_device_set_ip4_config): don't send property notifications when - the ip4 config is set to NULL; it causes a PropertyChanged signal - which dbus-glib can't parse because the value is NULL, which isn't - a legal object path. Setting the IP4 config to NULL is only - valid when deactivating a device anyway, so the device state change - will alert listeners that the ip4 config is invalid. - -2008-03-12 Dan Williams - - * src/nm-properties-changed-signal.c - - (add_to_string): better handling of NULL objects - -2008-03-12 Dan Williams - - Move the 'carrier' property from NMDevice to NMDevice8023Ethernet; - convert the libnm-glib NMDevice8023Ethernet to cached properties - - * introspection/nm-device-802-3-ethernet.xml - - New 'Carrier' property - - New 'PropertiesChanged' signal - - * introspection/nm-device.xml - - Remove 'Carrier' property - - Remove 'CarrierChanged' signal - - * src/nm-device-interface.c - src/nm-device-interface.h - - (nm_device_interface_init): remove 'carrier' property and - 'carrier-changed' signal - - * src/nm-device.c - src/nm-device.h - - (nm_device_get_carrier, nm_device_set_carrier): remove - - (nm_device_activate_stage5_ip_config_commit): don't bother updating - the link here; wired device will handle that - - (handle_dhcp_lease_change): don't bother updating link here - - (get_property, nm_device_class_init): remove carrier property - - * src/nm-device-802-11-wireless.c - - (real_update_link, nm_device_802_11_wireless_class_init): remove - real_update_link(); wireless devices don't use carrier at all - - (link_timeout_cb, supplicant_iface_state_cb_handler, - supplicant_iface_connection_state_cb_handler, - supplicant_mgr_state_cb_handler): remove anything to do with carrier - - * src/nm-device-802-3-ethernet.c - src/nm-device-802-3-ethernet.h - - (nm_device_802_3_ethernet_carrier_on, - nm_device_802_3_ethernet_carrier_off, constructor): use set_carrier() - instead of nm_device_set_carrier() - - (device_state_changed): update link from sysfs on activation; - replaces real_update_link() - - (real_update_link): remove, replaced by device_state_changed() - - (nm_device_802_3_ethernet_get_carrier, set_carrier): new functions - - (nm_device_802_3_ethernet_get_speed): move up with other getters/setters - - (real_get_generic_capabilities, real_can_interrupt_activation): use - new get_carrier function - - (get_property): add 'carrier' property - - (nm_device_802_3_ethernet_class_init): add 'carrier' property and - hook into property-changed signal helper - - * src/NetworkManagerPolicy.c - - (device_carrier_changed): will only ever be called with a wired device - - (device_added): only hook up to carrier-changed for wired devices - - * libnm-glib/nm-device.c - libnm-glib/nm-device.h - - (constructor, nm_device_class_init): remove carrier-changed signal - - (device_carrier_changed_proxy): remove; unused - - (nm_device_get_carrier): remove; carrier a property of wired devices - - * libnm-glib/nm-device-802-3-ethernet.c - libnm-glib/nm-device-802-3-ethernet.h - - Convert to cached properties like AP and Wireless objects - - (nm_device_802_3_ethernet_get_hw_address): now returns a 'const char *' - instead of a 'char *', return value should not be freed - - (nm_device_802_3_ethernet_get_carrier): return current carrier status - - (constructor): hook into properties-changed helper - - (set_property, get_property): new functions - - (nm_device_802_3_ethernet_class_init): export GObject properties - - * test/nm-tool.c - - (detail_device): strdup the wired hardware address too since it's - cached now - - * libnm-glib/libnm-glib-test.c - - (dump_wired): strdup the wired hardware address too since it's - cached now - -2008-03-12 Dan Williams - - * libnm-util/nm-setting-ip4-config.c - libnm-util/nm-setting-ip4-config.h - - (set_property, get_property, nm_setting_ip4_config_class_init): add - the 'autoip' property from the spec - -2008-03-11 Dan Williams - - * src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - - (nm_generic_device_get_use_dhcp): remove - -2008-03-11 Dan Williams - - * src/nm-device.c - - (nm_device_deactivate): don't need to munge DNS here; that gets done - already in nm_device_set_ip4_config() - - (handle_dhcp_lease_change): fail the device if setting the IP4Config - due to a DHCP rebind fails - - (nm_device_set_ip4_config): send property notifications when the - ip4 config changes - - (get_property): only report IP4Config property during valid states - - * src/NetworkManagerPolicy.c - - (update_routing_and_dns): ignore devices that don't have an ip4 - config; add parameter 'force_update' to allow callers to specify - that changes should be made even if the default device doesn't change - - (device_ip4_config_changed): update DNS and routing when the device's - IP4Config changes, like for DHCP updates - - (device_added): listen for ip4-config property changes - -2008-03-11 Dan Williams - - Fix address handling as a result of DHCP rebind/renew/reboot. - - * src/NetworkManagerSystem.c - - (check_one_address): delete an address if it doesn't match a given - one for the same interface - - (nm_system_device_set_from_ip4_config): don't flush the default route, - be smarter about flushing addresses (only flush ones that don't - match the one we're about to apply) - - * src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerSuSE.c - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerGentoo.c - - (nm_system_delete_default_route): remove - - * src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - - (nm_generic_enable_loopback): fix the loopback device label - - (nm_generic_delete_default_route): remove; no longer used - -2008-03-11 Dan Williams - - * src/nm-device-interface.h - - Delimit property name words with '-', otherwise g_object_notify() - doesn't work the way we expect - -2008-03-11 Tambet Ingo - - * src/nm-hal-manager.c (create_device_and_add_to_list): Don't ignore USB devices. - -2008-03-11 Dan Williams - - * src/NetworkManagerPolicy.c - - (update_routing_and_dns): don't change anything if the default device - hasn't changed; print something out when switching the default route - and DNS - -2008-03-10 Tambet Ingo - - Implement PPPoE. - - * src/ppp-manager/nm-ppp-manager.c (create_pppd_cmd_line): Use PPPoE service - setting. Use "nic-$eth". - - * src/NetworkManagerPolicy.c (auto_activate_device): Move the check of whether - the device is activating here to fix a race condition. - - * src/ppp-manager/nm-pppd-plugin.c (get_credentials): Implement. - - * src/ppp-manager/nm-ppp-manager.c (impl_ppp_manager_need_secrets): Implement. - (ppp_watch_cb): Emit a signal to notify pppd is not running anymore. - (nm_ppp_manager_start): Take activation request instead of connection, we might - need it for asking secrets. - (nm_ppp_manager_update_secrets): Implement. - - * src/nm-serial-device.c (real_act_stage2_config): Send activation request to - ppp manager start. It might be needed for asking secrets. - - * src/nm-device-802-3-ethernet.c (real_connection_secrets_updated): Implement. - (ppp_state_changed): Handle pppd daemon disappearing. - (pppoe_stage2_config): Send activation request to ppp manager start. - - * libnm-util/nm-setting-pppoe.c (nm_setting_pppoe_class_init): Fix a typo. - - * introspection/nm-ppp-manager.xml: Make NeedSecrets method async, return only - username and password. - -2008-03-10 Dan Williams - - * src/nm-device.c - - (handle_dhcp_lease_change): apply an IP4 config to a device in - response to a DHCP lease change - - (dhcp_state_changed): handle DHCP lease changes while activated - - (nm_device_set_ip4_config): remove a previously set named config - when setting an ip4 config - -2008-03-10 Dan Williams - - * src/nm-serial-device.c - - (nm_serial_device_send_command): report errno on error - - (get_reply_got_data): limit the size of the overall buffer - - (wait_for_reply_info_destroy): destroy result string - - (wait_for_reply_got_data): append received data to an overall buffer - until timeout, filled buffer, or error instead of keeping a per-call - buffer. Some devices send data slowly enough that this function - gets called multiple times for the same command stream. - - (nm_serial_device_wait_for_reply): initialize overall buffer for - wait_for_reply_got_data() here - -2008-03-10 Dan Williams - - * src/nm-cdma-device.c - - (do_dial, init_modem): handle errors from - nm_serial_device_send_command_string() - - * src/nm-gsm-device.c - - (do_dial, manual_registration, automatic_registration_get_network, - automatic_registration, enter_pin, check_pin, init_modem): handle - errors from nm_serial_device_send_command_string() - -2008-03-10 Dan Williams - - Patch based on ideas suggested by Bas Zoetekouw - - * src/named-manager/nm-named-manager.c - - (compute_searches): prefer searches before domains - - (compute_domain): new function - - (rewrite_resolv_conf): write out the 'domain' and 'searches' options - - (merge_one_ip4_config): if there are no searches in the source config, - merge domains of the source config into the target config - - (compute_nameservers): make formatting of resolv.conf a bit nicer - -2008-03-10 Dan Williams - - * src/nm-serial-device.c - - (get_reply_got_data): clean up indentation, shrink serial buffer - - (wait_for_reply_got_data): try to handle slower serial devices where - the reply is broken up into multiple reads by concatenating replies - together until either an error is received or the search string is - found - -2008-03-10 Dan Williams - - * src/nm-device.c - - (nm_device_bring_down): deactivate the device if it's activating too, - not just if it's already activated. This makes sure that everything - from an association attempt is cleaned up (like DHCP for example) - -2008-03-10 Dan Williams - - * src/nm-serial-device.c - - (config_fd): report error from TCSETA - - (nm_serial_device_open): fail when config_fd() fails - -2008-03-10 Dan Williams - - * src/nm-ip4-config.c - - (nm_ip4_config_init): allocate searches list - - (finalize): free searches list - -2008-03-09 Dan Williams - - Patch from Bas Zoetekouw - - * src/dhcp-manager/nm-dhcp-manager.c - - (nm_dhcp_manager_get_ip4_config): handle domain-search option too - -2008-03-09 Dan Williams - - Patch from Bas Zoetekouw - - * src/nm-ip4-config.c - src/nm-ip4-config.h - - (nm_ip4_config_add_search, nm_ip4_config_get_search, - nm_ip4_config_get_num_searches): add 'searches' as distinct from - domains. 'searches' is the correct way to store multiple search - domains, whereas 'domains' is really just supposed to store one - domain. Some sites abuse the DHCP 'domain-name' option to push - search domains to the client. - - (nm_ip4_config_add_domain): group with related functions (my patch) - -2008-03-09 Dan Williams - - * src/dhcp-manager/nm-dhcp-manager.c - - (dhclient_run): send interface-specific config files to dhclient - -2008-03-07 Dan Williams - - * system-settings/plugins/ifcfg-fedora/parser.c - - (is_wireless_device): new function; test a device for wireless - extensions - - (parser_parse_file): if the ifcfg file doesn't have a TYPE tag, - test the device for wireless extensions to determine the type - -2008-03-07 Dan Williams - - Change manager's StateChange signal to StateChanged for consistency. - - * introspection/nm-manager.xml - - Add 'StateChanged' signal - - Move 'StateChange' down to the deprecated section - - * src/nm-hal-manager.c - - (nm_hal_manager_new): connect to 'state-changed' instead - - * src/NetworkManagerPolicy.c - - (nm_policy_new): connect to 'state-changed' instead - - * src/nm-manager.c - src/nm-manager.h - - (nm_manager_update_state): emit both 'state-changed' and 'state-change' - - (nm_manager_class_init): add 'state-changed' and not the deprecation - of 'state-change' - - * libnm-glib/nm-client.c - libnm-glib/nm-client.h - - (constructor, nm_client_class_init, client_state_changed_proxy): - track and proxy 'state-changed' instead of 'state-change' - -2008-03-07 Dan Williams - - First pass of multiple active device support. Expect bugs. - - * src/nm-ip4-config.c - src/nm-ip4-config.h - - (nm_ip4_config_get_secondary, nm_ip4_config_set_secondary): remove; - there are better ways to do this in the named manager - - * src/nm-device.c - src/nm-device.h - - (nm_device_can_activate): return whether the device can activate a - connection right now; taking into account things like carrier state - and rfkill state - - (nm_device_get_best_auto_connection): renamed from - nm_device_get_best_connection - - (real_act_stage4_get_ip4_config): MTU stuff is now handled in the - device subclasses themselves, so that each device can override the - MTU from it's NMSetting subclass if needed - - (nm_device_set_ip4_config): set MTU when setting up routes and stuff - in NetworkManagerSystem.c, not here - - * src/named-manager/nm-named-manager.c - src/named-manager/nm-named-manager.h - - (nm_named_manager_name_owner_changed, - nm_named_manager_dbus_connection_changed): fix for changes to - rewrite_resolv_conf() - - (compute_nameservers): don't need the NMNamedManager at all, remove - from parameter list - - (merge_one_ip4_config): new function; merge ip4 configs together - - (rewrite_resolv_conf): write out resolv.conf from all the stored - ip4 configs; the VPN config takes precedence, then the best - device config, then the rest of the configs - - (get_domain_for_config): take the NMNamedManager as an argument - to check whether the config is the VPN config - - (add_ip4_config_to_named): fixups for removal of the 'secondary' - attribute from ip4 configs - - (add_all_ip4_configs_to_named): add all the configs in priority order - - (remove_ip4_config_from_named): fix for changes to - get_domain_for_config() - - (nm_named_manager_add_ip4_config): assign the config to the right slot - based on its type; callers must pass in the type now - - (get_last_default_domain): remove, unused - - (nm_named_manager_remove_ip4_config): handle config slots correctly - - * src/nm-device-802-11-wireless.c - - (real_can_activate): new function - - (real_get_best_auto_connection): renamed from real_get_best_connection - - (real_act_stage4_get_ip4_config): handle MTU override - - * src/nm-device-802-3-ethernet.c - - (real_can_activate): new function - - (real_get_best_auto_connection): renamed from real_get_best_connection - - (real_act_stage4_get_ip4_config): new function; handle MTU override - - * src/vpn-manager/nm-vpn-connection.c - - (nm_vpn_connection_ip4_config_get): don't need to set the 'secondary' - attribute on the ip4 config - - * src/NetworkManagerPolicy.c - - (nm_policy_auto_get_best_device): remove - - (nm_policy_device_change_check): remove - - (update_default_route): new function; set the default route via - the specified device - - (get_device_priority): new function; return the priority number of - a device type WRT which one should have the default route. Order is - (highest to lowest) wired, wireless, GSM, CDMA. - - (update_routing_and_dns): new function; determine which device should - have the default route, then update the routing table and DNS - - (maybe_auto_activate_device): new function; if a device is now - available for activation, find out what connection it would like to - activate and do it - - (schedule_activate_check): new function; if a device can be activated - now, schedule the activation. Each device may have only one - pending activation at a given time. - - (device_state_changed): if activation was canceled, try again, - possibly with another connection; if the device was activated, - update routing and DNS; if the device was deactivated, try again - with another connection - - (device_carrier_changed): if there is no carrier, deactivate the - device; otherwise schedule an activation check for the device - - (wireless_networks_changed): schedule an activation check for the - device - - (device_added): keep track of the signal handler IDs so they can - be removed when the device goes away - - (device_removed): remove any signal handlers that might be attached - to the device; update routing and DNS - - (schedule_activate_all): new function - - (connections_added, connection_added, connection_updated): when - connections change, schedule all devices for an activation check - - (connection_removed): when a device is deactivated because its - connection was removed, schedule another activation check for it - - (nm_policy_destroy): destroy pending activations and disconnect - all device signal handlers - - * src/nm-manager.c - - (nm_manager_activate_device): if the device was already actived, - deactivate it - - (deactivate_old_device): remove - - (connection_added_default_handler, impl_manager_activate_device): - don't deactivate other devices when activating this one - - * src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerSuSE.c - src/backends/NetworkManagerDebian.c - - (nm_system_get_mtu): remove; MTU should be provided through the - distro's system settings service plugin instead - - (nm_system_device_add_default_route_via_device): remove - - (nm_system_device_add_default_route_via_device_with_iface): remove - - (nm_system_device_replace_default_route): new function; call - generic implementation - - * src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - - (nm_generic_device_add_default_route_via_device, - nm_generic_device_add_default_route_via_device_with_iface): remove - - (nm_generic_device_replace_default_route): replace the default route - with the given route via some gateway - - * src/NetworkManagerSystem.c - src/NetworkManagerSystem.h - - (nm_system_device_set_from_ip4_config): let the policy handle updates - to routing and DNS; but set the MTU here - - (nm_system_vpn_device_set_from_ip4_config): set the route with the - ip_iface of the active device; use the standard MTU setting function - - (nm_system_set_mtu): remove - - (nm_system_device_set_mtu): consolidate MTU setting code in one place - -2008-03-07 Tambet Ingo - - Rework the interaction between ppp manager and pppd plugin. Register a well - known DBUS service in manager and let the plugin call it's methods instead - of listening plugin's signals. - - * src/ppp-manager/nm-pppd-plugin.c: Call ppp-manager dbus methods instead - of emitting signals. - - * src/ppp-manager/nm-ppp-manager.c: Implement dbus service here. - - * src/ppp-manager/Makefile.am: Build nm-ppp-manager-glue.h. - - * src/nm-serial-device.c (real_act_stage2_config): Pass NMConnection to - nm_ppp_manager_start(). - - * introspection/nm-ppp-manager.xml: New file. - - * src/nm-device-802-3-ethernet.c (nm_device_802_3_ethernet_get_speed): Handle - the case correctly where driver is trying to send -1 for the speed, which gets - casted to u16 and thus is always > 0. - -2008-03-07 Dan Williams - - * src/nm-hal-manager.c - - (nm_get_device_driver_name): use net.originating_device first, fall - back to physical device. HAL has deprecated physical_device. - - * libnm-glib/nm-device.c - - (get_product_and_vendor): use net.originating_device first, fall - back to physical device. HAL has deprecated physical_device. - - (nm_device_update_description): s/physical_device_udi/orig_dev_udi - -2008-03-07 Dan Williams - - * src/nm-netlink.c - - (nm_netlink_get_default_handle): mistakenly removed too much code in - last commit; fix that - - (get_link_cache): print error string - -2008-03-07 Dan Williams - - * src/nm-netlink.c - - (nm_netlink_get_default_handle): NMNetlinkMonitor now uses libnl, - don't need this hack any more (Benoit Boissinot) - -2008-03-06 Dan Williams - - * autogen.sh - - Die gnome-common, die - -2008-03-04 Dan Williams - - Patch from Michael Biebl - - * NetworkManager.pc.in - - doesn't actually depend on dbus-1 - - * libnm-util/nm-utils.h - - remove unused #include - - * libnm-glib/libnm_glib.pc.in - - depends on glib and dbus-glib - -2008-03-02 Dan Williams - - * src/NetworkManagerPolicy.c - - s/device_state_changed_idle_id/update_state_id/ - -2008-03-02 Dan Williams - - * src/nm-device.c - src/nm-device.h - src/nm-device-802-11-wireless.c - src/nm-device-802-3-ethernet.c - src/NetworkManagerPolicy.c - - s/link_active/carrier - - nm_device_set_active_link() -> nm_device_set_carrier() - - nm_device_has_active_link() -> nm_device_get_carrier() - -2008-03-02 Dan Williams - - * system-settings/plugins/ifcfg-fedora/parser.c - - (make_wireless_setting): fail connection creation on missing SSID - -2008-02-29 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): ensure that a previously active - device with a system connection has a link before denying a switch - to a user connection - -2008-02-29 Dan Williams - - * src/nm-device-802-11-wireless.c - - (link_timeout_cb): try again if scanning; deactivate the device when - activated if the link dies - - (supplicant_iface_connection_state_cb_handler): bump link timeout to - 15 seconds - -2008-02-29 Dan Williams - - * src/nm-device-802-11-wireless.c - src/nm-device-802-11-wireless.h - - (nm_device_802_11_wireless_reset_scan_interval): remove, unused - elsewhere; fold into the sole user in nm-device-802-11-wireless.c - - (device_cleanup): reset the scan interval lower when the device - deactivates - - (can_scan): base decision mostly off device state, not supplicant - interface state since the supplicant interface state isn't a - great indicator of whether the device is active or not - - (request_wireless_scan): clean up; schedule the next scan here - - (schedule_scan): only back the scan interval off if a new scan - actually gets scheduled; and make scan intervals tighter when the - device is disconnected - - (supplicant_iface_state_cb_handler): fold in the bits of - nm_device_802_11_wireless_reset_scan_interval() by resetting scan - interval to minimum - - (activation_success_handler): reset scan interval to something - reasonable - -2008-02-28 Saleem Abdulrasool - - reviewed by: Steev - - * configure.in: - * src/backends/NetworkManagerGentoo.c: - (nm_system_restart_mdns_responder): - Howl is no longer a supported mDNS provider - -2008-02-28 Tambet Ingo - - Get rid of a bunch of unused distro specific functions. - -2008-02-28 Tambet Ingo - - Implement suse plugin for system settings daemon. - - * system-settings/plugins/ifcfg-suse/*: Implement. - - * system-settings/plugins/Makefile.am: Add ifcfg-suse to subdirs when targeting - suse. - - * configure.in: Check (without failing) for gio. - Create ifcfg-suse plugin's Makefile. - -2008-02-20 Dan Williams - - * libnm-util/nm-connection.c - libnm-util/nm-connection.h - - (nm_connection_compare): accept compare flags and pass them to the - setting compare function - - * libnm-util/nm-setting.c - libnm-util/nm-setting.h - - (nm_setting_compare): accept compare flags; ignore properties that are - marked fuzzy - - * libnm-util/nm-setting-connection.c - libnm-util/nm-setting-wireless.c - libnm-util/nm-setting-ppp.c - libnm-util/nm-setting-wired.c - - Mark some setting properties as ignorable when doing a fuzzy compare - - * src/nm-device.c - - (device_activation_precheck): use exact compare - -2008-02-20 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): get scope off the connection, not - using the manager helper - - * src/nm-manager.c - src/nm-manager.h - - (get_scope_for_proxy): rename from get_type_for_proxy() - - (connection_get_settings_cb): set scope and path on connection, not - using GObject data items - - (get_connection_for_proxy): don't need to return path, since that - can be gotten from the connection - - (get_connection_for_proxy): get path off the connection, not from - parameters - - (connection_removed_cb, connection_updated_cb): don't need to get - path from get_connection_for_proxy(); get scope off the connection - instead of using GObject data items - - (connection_added_default_handler, add_one_connection_element): use - nm_connection_get_path() not nm_manager_get_connection_dbus_path() - - (nm_manager_get_connection_dbus_path): remove - - (nm_manager_get_connection_scope): remove - -2008-02-20 Dan Williams - - * Global rename of NMConnectionSettings -> NMExportedConnection to cut down - on confusing names - - * Add 'path' and 'scope' properties to NMConnection since both NM and the - applet were having to hack this in anyway. Remove the 'path' stuff from - NMExportedConnection - - * Internally rename NMConnectionType -> NMConnectionScope - - * Provide default implementations of the 'get_id' and 'get_settings' methods - of NMExportedConnection - -2008-02-15 Dan Williams - - * src/nm-device-802-11-wireless.c - - (device_cleanup): release the AP list here too so that the AP list - doesn't survive across suspend/resume and up/down. There is some - room for optimization, for example blow the list away when the card - brought back up, but only if the device has only been down for a - minute or more. - -2008-02-15 Dan Williams - - * src/nm-hal-manager.c - - (modem_device_creator): recognize new HAL modem capabilities - -2008-02-12 Dan Williams - - * system-settings/plugins/ifcfg-fedora/plugin.c - - (watch_path): handle IN_DELETE_SELF too - - (handle_connection_changed): notify when removing a connection - - (stuff_changed): don't warn on unknown inotify watches; handle the - case of a file moving out of the profile directory - -2008-02-12 Dan Williams - - * system-settings/plugins/ifcfg-fedora/parser.c - - (make_ip4_setting): bring IPv4 setting handling more up to spec - -2008-02-12 Dan Williams - - * libnm-util/nm-utils.c - - (nm_utils_convert_uint_array_to_string): don't die on NULL array, it's - just any empty array - -2008-02-12 Dan Williams - - * system-settings/src/nm-system-config-interface.c - system-settings/src/nm-system-config-interface.h - - (load_connections): get_connections() should now return an allocated - GSList that the system settings service will free - - * system-settings/plugins/ifcfg-fedora/plugin.c - system-settings/plugins/ifcfg-fedora/parser.h - system-settings/plugins/ifcfg-fedora/parser.c - - Fix up inotify issues; handle keys-* files, handle new files appearing - in the profile directory, handle resolv.conf file changes - -2008-02-10 Dan Williams - - * src/nm-device-802-3-ethernet.c - - (real_bring_up): save the supplicant interface state signal id - - (real_bring_down): disconnect from the supplicant interface state - signal - -2008-02-07 Dan Williams - - * initscript/RedHat/NetworkManager.in - initscript/RedHat/NetworkManagerDispatcher.in - - Add new-style LSB init headers - -2008-02-07 Dan Williams - - * system-settings/src/dbus-settings.c - system-settings/src/dbus-settings.h - - (add_one_secret_to_hash): copy secrets out of the plugin-returned hash - table of secrets - - (connection_settings_get_secrets): consolidate error returns into - one place; use the new get_secrets() plugin interface function to - get secrets from the plugin itself rather than using GObject data - magic - - * system-settings/src/main.c - - (connection_added_cb, connection_removed_cb, free_plugin_connections, - load_connections): keep a private list of the plugin-returned - connections, don't use the plugin's GSList - - * system-settings/plugins/ifcfg-fedora/plugin.c - - (watch_path): watch the path, not the filename (duh) - - (reload_all_connections): use the direct hash/equal functions; the - ones for int aren't appropriate here - - (get_secrets, system_config_interface_init): implement the - get_secrets() function - - (build_one_connection, find_connection_by_path): ifcfg file path is - now in the connection's ConnectionData instead of being a GObject - data property - - (handle_profile_item_changed): ifcfg file path is now in the - connection's ConnectionData instead of being a GObject data property; - be sure to copy secrets over from the new connection to the existing - connection when updating the connection's settings - - (init): sc_plugin_inotify_init() returns success/fail, not the inotify - file descriptor - - * system-settings/plugins/ifcfg-fedora/parser.c - system-settings/plugins/ifcfg-fedora/parser.h - - (connection_data_get, copy_one_cdata_secret, clear_one_cdata_secret, - connection_data_copy_secrets, connection_data_free, - connection_data_add): new functions; connection data manipulation - - (make_wireless_security_setting): stuff secrets into the - connection data, not as GObject data items; make sure to close - the keys ifcfg file - - (wireless_connection_from_ifcfg, wired_connection_from_ifcfg): add - connection data to the connection - -2008-02-07 Dan Williams - - * system-settings/src/nm-system-config-interface.c - system-settings/src/nm-system-config-interface.h - - Add a get_secrets() interface function to retrieve secrets for a - specific setting of a specific connection. Document the interface - a bit more too. - -2008-02-07 Dan Williams - - * src/nm-device-802-11-wireless.c - - (handle_auth_or_fail): new function; consolidate device activation - failure check after a certain number of failures getting secrets - - (supplicant_connection_timeout_cb, real_act_stage2_config, - real_act_stage4_ip_config_timeout): use handle_auth_or_fail() to fail - the connection if secrets were requested more than a few times - - (real_act_stage3_ip_config_start): don't clear the wireless secrets - tries here; otherwise they are cleared before the IP configure - timeout, which happens with open system WEP when key is wrong - - (activation_success_handler): clear wireless secrets tries here too - -2008-02-07 Dan Williams - - * src/NetworkManagerPolicy.c - - (connection_updated): clear invalid tag when connection gets updated - to allow that connection to be tried again - - (nm_policy_new): save signal ids so they can be disconnected when - the policy is destroyed - - (nm_policy_destroy): stop any in-progress state change idle handler, - and disconnect all signals from the manager object so that none - of the policy functions gets called after the policy is destroyed - -2008-02-06 Dan Williams - - * src/nm-manager.c - - (finalize): remove devices a bit earlier; clean up system settings - poke - - (nm_manager_name_owner_changed): clean up system settings poke when - the service appears, and try to restart it if it fails - - (poke_system_settings_daemon_cb): try to get the system settings - service started through D-Bus service activation - - (initial_get_connections): start the system settings daemon if it's - not already running - -2008-02-05 Dan Williams - - * src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_add_setting_wireless): send scan_ssid=1 for - broadcast networks too - -2008-02-04 Dan Williams - - * system-settings/plugins/ifcfg-fedora/parser.c - - (make_wireless_security_setting): fix spelling; unencrypted networks - need key_mgmt set too - - (parser_parse_file): validate ifcfg file name and don't try to parse - .bak files; ensure that an error is set whenever NULL gets returned - -2008-02-04 Dan Williams - - * system-settings/src/Makefile.am - - Install D-Bus service activation file for the system settings - service - - * system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service - - D-Bus service activation file for system settings service - -2008-02-04 Dan Williams - - * system-settings/src/main.c - - (parse_config_file): parse a config file - - (main): accept --config option and read plugins from config file - -2008-02-04 Dan Williams - - * system-settings/plugins/ifcfg-fedora/plugin.c - - Change reported name to 'ifcfg-fedora' - - Use IFCFG_PLUGIN_NAME - - * system-settings/plugins/ifcfg-fedora/plugin.c - - Remove PLUGIN_NAME, use IFCFG_PLUGIN_NAME instead - -2008-02-04 Dan Williams - - * system-settings/plugins/ifcfg-fedora/parser.c - - (get_ifcfg_name): new function; factor out ifcfg name finding code - - (make_connection_setting): use get_ifcfg_name() - - (make_wireless_security_setting): handle shadow key files - - (get_one_wep_key): treat empty string as NULL - -2008-02-04 Dan Williams - - * src/supplicant-manager/nm-supplicant-manager.c - - (poke_supplicant_cb): reschedule the poke as a timeout, don't let - glib automatically reschedule - - (nm_supplicant_manager_init): immediately try to start the supplicant - - (nm_supplicant_manager_name_owner_changed): immediately try to restart - the supplicant - -2008-02-01 Dan Williams - - * src/NetworkManagerPolicy.c - - (device_state_changed): schedule a change check when a device gets - deactivated so something happens if you disconnect GSM/CDMA - -2008-01-31 Dan Williams - - * src/nm-device-802-11-wireless.h - src/nm-device-802-11-wireless.c - - (ap_list_get_ap_by_ssid, is_associated, - nm_device_802_11_wireless_ap_list_get_ap_by_ssid, - nm_device_802_11_wireless_ap_list_get_ap_by_obj_path): remove - - (nm_device_802_11_wireless_get_activation_ap): collapse - nm_device_802_11_wireless_ap_list_get_ap_by_obj_path() into this - function - -2008-01-30 Dan Williams - - * system-settings/plugins/ifcfg - * system-settings/plugins/ifcfg-fedora - - Move the ifcfg plugin to ifcfg-fedora - -2008-01-24 Dan Williams - - * libnm-glib/nm-device-802-11-wireless.c - - (get_access_point): move the "/" check here; check for invalid path - too - - (nm_device_802_11_wireless_set_active_ap): leave the "/" check up - to get_access_point() - - (access_point_added_proxy, access_point_removed_proxy): don't try - to send signals for non-existent access points - -2008-01-24 Dan Williams - - * libnm-glib/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_set_active_ap): path of "/" means no AP - -2008-01-23 Dan Williams - - * libnm-glib/libnm_glib.c - - (libnm_glib_init): make thread joinable - - (libnm_glib_ctx_free): join thread on exit to clean up memory - -2008-01-23 Dan Williams - - * test/libnm_glib_test.c - - (signal_handler, setup_signals): trap SIGINT and SIGTERM - - (main): set up signal handlers; call libnm_glib_shutdown - -2008-01-21 Dan Williams - - * include/NetworkManager.h - - Add CDMA mobile broadband card device type - - * src/nm-hal-manager.c - - (modem_device_creator): handle both CDMA and GSM modems; the device - must now be tagged with 'cdma' or 'gsm' capability - - * src/nm-cdma-device.c - src/nm-cdma-device.h - src/Makefile.am - - Add the CDMA mobile broadband card device class - - * libnm-util/nm-connection.c - - (register_default_settings): add NMSettingCdma - - * libnm-util/nm-setting-cdma.c - libnm-util/nm-setting-cdma.h - libnm-util/Makefile.am - - Add the CDMA mobile broadband card setting class - - * libnm-glib/nm-cdma-device.c - libnm-glib/nm-cdma-device.h - libnm-glib/Makefile.am - - Add the CDMA mobile broadband card GLib proxy class - - * libnm-glib/nm-client.c - - (get_device): handle CDMA devices too - -2008-01-21 Dan Williams - - * src/ppp-manager/nm-ppp-manager.c - - (ip4_config_get): set peer address too - - * src/ppp-manager/nm-pppd-plugin.c - - (nm_ip_up): try harder to get the peer's address - - * src/NetworkManagerSystem.c - - (nm_system_device_set_from_ip4_config): if the IP4Config has a peer - address, use that too. Otherwise, some PPP connections won't work. - -2008-01-19 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): system connections override user - connections; don't activate a user connection if there's a currently - active system connection, and new, better system connections always - interrupt user connections - -2008-01-19 Dan Williams - - * src/nm-manager.h - - (nm_manager_get_connection_type): new function - -2008-01-19 Dan Williams - - * src/nm-device-802-11-wireless.c - - (real_get_best_connection): collapse find_best_connection() into this - function - -2008-01-19 Dan Williams - - * src/nm-device-802-3-ethernet.c - - (real_get_best_connection): collapse find_best_connection() into this - function - -2008-01-18 Dan Williams - - * src/nm-device-802-3-ethernet.c - - (find_best_connection): check MAC address too - - (real_get_best_connection): let autoconnect=True connections activate - for devices that don't have carrier detection - - * src/nm-device-802-11-wireless.c - - (find_best_connection): check MAC address too - -2008-01-18 Dan Williams - - * system-settings/plugins/ifcfg/parser.c - - (make_connection_setting): interpret ON_BOOT=y as 'autoconnect=True' - -2008-01-17 Dan Williams - - * src/nm-device-802-3-ethernet.c - - (nm_device_802_3_ethernet_carrier_on, - nm_device_802_3_ethernet_carrier_off): ignore any spurious netlink - carrier events that might come in for devices that don't support - carrier detect - -2008-01-17 Dan Williams - - * src/nm-device-interface.c - - (nm_device_interface_check_connection_conflicts): need to actually - get the interface, not cast to the object - - * src/nm-device.c - - (nm_device_check_connection_conflicts): need to get the device class, - not cast the device to the device class - -2008-01-17 Dan Williams - - * src/nm-device-802-11-wireless.c - - (real_check_connection_conflicts): ignore connections that aren't - wireless connections - -2008-01-17 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): clear change check idle here - - (device_change_check_done): remove - - (schedule_change_check): simplify - -2008-01-17 Dan Williams - - * src/nm-manager.c - - (check_connection_allowed): take an NMDeviceInterface instead of - an NMDevice object as an argument - - (nm_manager_activate_device): pass an NMDeviceInterface to - check_connection_allowed() - -2008-01-13 Dan Williams - - * libnm-glib/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_get_access_points): fix memory leak - -2008-01-12 Dan Williams - - * src/nm-device-802-11-wireless.c - - (activation_success_handler): if a match was found in the scan list - and that match is a hidden AP, update that AP's SSID - -2008-01-11 Dan Williams - - * src/NetworkManagerAP.c - - (nm_ap_new_fake_from_connection): mark fake APs as fake - - * src/nm-device-802-11-wireless.c - - (get_active_ap): do two passes over the scan list if the caller - requests that hidden APs get matched too; during the second pass - when matching hidden APs, ignore the SSID since hidden APs in the - scan list don't have an SSID yet - - (periodic_update): move some checks to - nm_device_802_11_periodic_update() because not all callers need them - - (nm_device_802_11_periodic_update): move some checks here from - perodic_update() - - (merge_scanned_ap): if the current AP is fake, then don't do strict - matching on incoming scan results, because the fake AP's flags - might be slightly different (yet still compatible) with the incoming - scan result's flags and they might actually be the same AP; update - the rate on merged APs too - - (activation_success_handler): update the frequency of the fake AP - on successful connection; match hidden APs too since if the - current AP is fake, there might already be a scan result in the - scan list for the desired AP, just without it's SSID filled in yet - -2008-01-10 Dan Williams - - * src/NetworkManagerAP.c - - (foreach_property_cb): catch more hidden SSID formats - -2008-01-10 Dan Williams - - Fix gnome.org #464215. Requires the kernel patch titled - "Introduce WEXT scan capabilities" but will handle the patch not being - present, you'll just continue to have problems with hidden SSIDs when - using mac80211-based drivers. - - * src/supplicant-manager/nm-supplicant-config.h - src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_add_setting_wireless): new parameter to indicate - whether the driver supports SSID scans or not. If it does, and if - the AP is hidden, use ap_scan=1 instead of ap_scan=2 - - * src/nm-device-802-11-wireless.c - - (constructor): check whether or not the driver supports SSID scans - - (build_supplicant_config): pass driver SSID scan capability when - building the wireless bits of the supplicant config - -2008-01-09 Dan Williams - - * src/nm-device.c - src/nm-device.h - - (device_activation_precheck, check_connection_complete): remove this - virtual function; incomplete connections should be invalid by - definition, complete-ness should be checked in the setting's - verify function - - * src/nm-serial-device.c - src/nm-gsm-device.c - - (real_check_connection_complete): remove - - * libnm-util/nm-setting-serial.c - - (verify): new function; ensure there is a PPP setting too - - * libnm-util/nm-setting-gsm.c - - (verify): ensure there is a serial setting too - -2008-01-06 Dan Williams - - * src/dhcp-manager/nm-dhcp-manager.c - - (nm_dhcp_manager_get_ip4_config): handle DHCP-provided MTU - (gnome.org #332953) - -2008-01-04 Dan Williams - - * src/named-manager/nm-named-manager.c - - (rewrite_resolv_conf, add_ip4_config_to_named): use primary IP4Config's - nameservers if the secondary config doesn't have any - (gnome.org #346833) - -2008-01-02 Tambet Ingo - - * libnm-util/nm-setting-serial.c (nm_setting_serial_class_init): Mark the properties - with G_PARAM_CONSTRUCT so that they get the default values. - - * src/nm-gsm-device.c: Add preliminary support for monitoring device. It only monitors - the monitoring device and prints out the output for now. Or more precicely, doesn't - do absolutely anything right now since the montoring device argument is never set. - - * src/nm-serial-device.c (serial_debug): Implement. It's very verbose and thus - requires it's own knob to turn it on. - (config_fd): Add NMSettingSerial to the arguments list. - (nm_serial_device_open): Ditto. - (get_reply_got_data): Ignore the terminators at the beginning of the output. - (nm_serial_device_get_io_channel): Implement. - - * src/nm-manager.c: Add NMDBusManager to the private data of the NMManager. Asking - a new reference every time (and forgetting to release it sometimes) is a pain and - it's not like NMManager could work without dbus. - (nm_manager_add_device): Register the added device on dbus here. - - * src/nm-hal-manager.c (modem_device_creator): Pass NULL for now for the monitoring - device. - - * src/nm-device.c (constructor): Don't export the device here, instead export - it when it's added to the NMManager's device list. - -2007-12-31 Dan Williams - - * src/nm-device-interface.c - src/nm-device-interface.h - - (nm_device_interface_check_connection_conflicts): new function - - * src/nm-device.c - src/nm-device.h - - (nm_device_check_connection_conflicts): new function - - (device_activation_precheck): don't require subclasses to implement - check_connection_complete() - - check_connection() -> check_connection_complete() - - * src/nm-device-802-11-wireless.c - - (real_check_connection): remove; unused - - (real_check_connection_conflicts): implement, handle lockdown for - system connections - - * src/nm-device-802-3-ethernet.c - - (real_check_connection): remove; unused - - * src/nm-manager.c - - (check_connection_allowed): new function - - (nm_manager_activate_device): ensure the connection being requested - is allowed to be activated - - * src/nm-serial-device.c - src/nm-gsm-device.c - - real_check_connection() -> real_check_connection_complete() - -2007-12-27 Dan Williams - - * src/nm-device-interface.c - src/nm-device-interface.h - - (nm_device_interface_error_quark, nm_device_interface_error_get_type): - normalize and expand errors - - (nm_device_interface_init): register errors so they can be marshalled - through dbus-glib - - (nm_device_interface_activate): ensure that failure of activation - returns an error - - * src/nm-device.c - src/nm-device.h - - (device_activation_precheck): implementations of check_connection() - now take a GError and must fill it in if the check fails. Return - more descriptive error if the requested connection is already - activating - - (nm_device_activate): actually try to return descriptive errors on - failures - - * src/nm-device-802-11-wireless.c - src/nm-device-802-3-ethernet.c - src/nm-serial-device.c - src/nm-gsm-device.c - - (real_check_connection): return more descriptive errors on failure - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): print activation errors in the logs - - * src/nm-manager.c - - (nm_manager_error_quark, nm_manager_error_get_type, - nm_manager_class_init): new errors - - (nm_manager_activate_device): handle errors - - (nm_manager_error_new): removed - - (wait_for_connection_expired, connection_added_default_handler, - impl_manager_activate_device): better error handling - -2007-12-27 Dan Williams - - Fixes gnome.org #466954 - - * src/supplicant-manager/nm-supplicant-settings-verify.c - - Allow 'frequency' network property - - * src/supplicant-manager/nm-supplicant-config.c - src/supplicant-manager/nm-supplicant-config.h - - (nm_supplicant_config_add_setting_wireless): add 'adhoc_freq' argument - for callers to specify the frequency an Ad-Hoc network should operate - on. Some drivers require this to successfully create an Ad-Hoc - network. - - * src/nm-device-802-11-wireless.c - - (iw_freq_to_uint32): new function; convert a struct iw_freq into a - guint32 value in MHz - - (constructor, nm_device_802_11_wireless_get_frequency): use - iw_freq_to_uint32() - - (find_supported_frequency): new function; find a free supported - frequency for a user-created Ad-Hoc network - - (build_supplicant_config): if no frequency was specified for a user- - created Ad-Hoc network, find a free one to use - - (real_act_stage1_prepare): mark Ad-Hoc connections that don't have - a specific object as user-created - -2007-12-27 Dan Williams - - * libnm-util/nm-utils.c - libnm-util/nm-utils.h - - (nm_utils_security_valid): add 'adhoc' argument and handle security - for adhoc networks - -2007-12-24 Dan Williams - - * libnm-util/nm-setting-wireless.c - - (verify): add 802.11a channels 7, 8, 9, 11, 12, 16, 34, 165, 183, 184, - 185, 187, 188, 192, and 196 - -2007-12-24 Dan Williams - - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_get_frequency): handle drivers that return - a channel # instead of a frequency - -2007-12-24 Dan Williams - - * src/NetworkManagerAP.c - src/NetworkManagerAP.h - - (nm_ap_new_fake_from_connection): pass band to channel_to_freq() - - (freq_to_channel): handle split band tables - - (channel_to_freq): handle split band tables, take a band argument - -2007-12-24 Dan Williams - - * libnm-util/nm-setting-connection.h - libnm-util/nm-setting-connection.c - - Add 'lockdown' member - -2007-12-22 Dan Williams - - * libnm-util/nm-setting-wireless.c - - (nm_setting_wireless_class_init): add missing 'rate' property - specification - -2007-12-18 Dan Williams - - Base the NMNetlinkMonitor class on libnl instead of hand-rolled netlink. - - * src/nm-netlink-monitor.c - src/nm-netlink-monitor.h - - Remove handrolled netlink, use libnl instead - - * src/nm-device-802-3-ethernet.c - - (constructor, nm_device_802_3_ethernet_carrier_off, - nm_device_802_3_ethernet_carrier_on): use new names - -2007-12-17 Dan Williams - - * configure.in - - Bump requirement for libnl to 1.0-pre8 (which works with newer kernels - and fixes memory leaks) - - * src/nm-netlink.c - - (nm_netlink_get_default_handle): handle new versions of libnl that - automatically handle the netlink PID - -2007-12-17 Dan Williams - - Patch from Michael Biebl - - * configure.in - src/ppp-manager/Makefile.am - - fix up install dir of pppd plugin - - clean up configure.in a bit - -2007-12-12 Dan Williams - - * system-settings/src/nm-system-settings.conf - - Allow non-root clients (like the applet) to read settings - -2007-12-10 Tambet Ingo - - * Replace all occurences of 'UMTS' with 'GSM'. - -2007-12-07 Dan Williams - - * src/nm-serial-device.c - - (real_is_up): serial devices are always "up" - -2007-12-07 Dan Williams - - * src/nm-netlink.c - src/NetworkManagerSystem.c - - (new_nl_handle): ensure that the same netlink pid is never chosen - twice (gnome.org #491047) - - Make more robust against allocation-related failures should they occur - -2007-12-07 Dan Williams - - Noticed by Christian Persch - - Always chain up to parent object in dispose and finalize handlers. - (gnome.org #433112) - -2007-12-07 Dan Williams - - * src/nm-device-802-11-wireless.c - - Wrap #include of linux/mii.h to fix redefined structures due to - incorrect kernel headers (gnome.org #350061) - -2007-12-06 Tambet Ingo - - * src/nm-umts-device.c (real_act_stage1_prepare): Flash the modem (drop DTR) - before doing anything else. - (init_modem): Move modem initialization here. - - * src/nm-serial-device.c (ppp_state_changed): React on pppd state changes. - (nm_serial_device_flash): Implement. - - * src/ppp-manager/nm-ppp-manager.c (name_owner_changed): Fix the typoes: the state - changes signal is "StateChanged" and not "Status". - (ppp_exit_code, ppp_status_changed): Remove the debug output, it's working fine now. - -2007-12-06 Dan Williams - - * src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_add_setting_wireless_security): reorganize a bit - to only send some options when they make sense; also send phase2 - option to the supplicant (possible fix for rh #399631) - -2007-12-06 Tambet Ingo - - * src/NetworkManagerSystem.c (nm_system_device_set_from_ip4_config): Change the - arguments: This whole file shouldn't really know anything about NMDevices, it - should deal only with device interfaces. Devices might have different ifaces for - different stuff and this place shouldn't know anything about it. - - * src/NetworkManagerPolicy.c: Get rid of leftover global variable global_policy. - (global_state_changed): Implement. In the current NM it's not really important, - but will be required in the case of multiple active devices. (Or even better, - if stuff like that gets moved out from NM). - - * src/vpn-manager/nm-vpn-connection.c (connection_state_changed): Don't call - nm_system_device_set_from_ip4_config() directly, use nm_device_set_ip4_config() - instead. - - * src/nm-device.c: Add a ip_face protected member. It's used for 'multi-interface' - devices like serial devices (ttyS0 and ppp0 for example). - (nm_device_get_ip_iface): Implement. Default to the device iface if ip_iface is not - set. - (nm_device_set_ip_iface): Implement. - (nm_device_activate_stage5_ip_config_commit): Move all the extra actions that happen - after setting ip4_config from here ... - (nm_device_set_ip4_config): ... to here. The reason behind it is that no other code - than this function should call nm_system_device_set_from_ip4_config() because no - other code has enough information on which arguments to use. So instead, other code - could just set the new ip4 config using this function and everyone is happy. - - * src/nm-umts-device.c: Store the pending ids so that we can remove pending actions - if we happen to get deactivated while something is pending. - (automatic_registration): Handle the response that indicates pending network - registration and wait until the pending registration is done. - (real_deactivate_quickly): If there's a pending operation, cancel it. - - * src/nm-serial-device.c (ppp_ip4_config): Set the ip_iface when the iface is up ... - (real_deactivate_quickly): ... and remove it when it's down. - (nm_serial_device_get_reply): Return the timeout id so that the callers can remove - it if needed. - (nm_serial_device_wait_for_reply): Ditto. - -2007-12-05 Tambet Ingo - - * src/nm-umts-device.c (dial_done): Fix the typoes in warnings. - (get_network_done): Remove newline, nm_info() does it already. - (real_act_stage1_prepare): Turn the modem echo off. - - * src/NetworkManagerSystem.c (nm_system_device_set_from_ip4_config): In case of serial - device, set the route to the device interface. This is a hack. - - * src/nm-serial-device.c (nm_serial_device_send_command_string): Only append carriage - return, no need for a new-line. - (ppp_ip4_config): Store the ip4 config to be set in the next stage. - Change the device iface here (ugh). - (real_act_stage4_get_ip4_config): Implement. - (real_deactivate_quickly): Free the pending ip4 config if it's still pending. - Restore the device iface. - - * src/NetworkManagerPolicy.c (nm_policy_device_change_check): Do nothing if the active - device is not wired or wireless (eg, automatically upped) device. - - * src/ppp-manager/nm-ppp-manager.c (ip4_config_get): Don't make the config secondary, - it isn't. - (nm_ppp_manager_start): Don't let pppd to set the default route, we want to do it. - - * src/nm-hal-manager.c (get_creator): Make sure the device has required capability - before calling it's is_device_fn(). - -2007-12-05 Dan Williams - - * libnm-util/nm-utils.c - - (nm_utils_register_value_transformations, - nm_utils_convert_gvalue_hash_to_string): better debug output of - GHashTables of GValues too - -2007-12-04 Dan Williams - - * initscript/RedHat/NetworkManager.in - - No longer start named; it's D-Bus interface is going away - -2007-12-04 Dan Williams - - Patch from Michael Biebl - - * system-settings/plugins/ifcfg/Makefile.am - system-settings/src/main.c - system-settings/src/Makefile.am - - Put system settings plugins in NM plugins dir - - * src/ppp-manager/Makefile.am - src/ppp-manager/nm-ppp-manager.c - - Move pppd plugin to NM plugins dir - -2007-12-04 Dan Williams - - * libnm-util/nm-setting-vpn-properties.h - - Clarify usage of the 'data' member of the setting - - * libnm-util/nm-setting-vpn-properties.c - - (nm_setting_vpn_properties_init): initialize the 'data' hash table - - (set_property): just remove all the settings; don't recreate the has - - (update_one_secret): don't need to create the hash table here since - it should always be present - -2007-12-03 Tambet Ingo - - Implement PIN and PUK requesting. - - * src/nm-umts-device.c (enter_pin_done): Request the secret again if it failed. - (enter_pin): Handle PIN and PUK requests. - (real_act_stage1_prepare): Clear the secret type. - (real_connection_secrets_updated): Implement this class method to get - notified when new secrets arrive. - (nm_umts_device_class_init): Add private data back to the umts device class - to store the required secret type. - -2007-12-01 Dan Williams - - * system-settings/plugins/ifcfg/parser.c - - (parser_parse_file): don't try to verify NULL connections - -2007-12-01 Dan Williams - - * system-settings/src/main.c - - (load_connections, add_connection_to_settings): actually export - plugin-provided connections over D-Bus so NM can get them - -2007-12-01 Dan Williams - - * system-settings/plugins/ifcfg/parser.c - system-settings/plugins/ifcfg/parser.h - system-settings/plugins/ifcfg/plugin.c - - Hook up more inotify bits (untested) - -2007-11-29 Dan Williams - - * system-settings/src/nm-system-config-interface.h - system-settings/src/nm-system-config-interface.c - - (nm_system_config_interface_init, - nm_system_config_interface_get_connections): add - - * system-settings/src/main.c - - (load_plugins, load_connections, main): use a GSList for plugins - to ensure priority ordering - - * system-settings/plugins/ifcfg/parser.c - - (ifcfg_error_quark): move to plugin.c, and rename - - * system-settings/plugins/ifcfg/plugin.h - system-settings/plugins/ifcfg/plugin.c - - (ifcfg_plugin_error_quark): move here from parser.c - - rework connection loading and initialization - - Add preliminary inotify support for network profile config file - -2007-11-28 Tambet Ingo - - Merge the beginnings of the new GSM card support. - - * src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_stop): Remove the - ppp watch source before killing pppd - If this happens from g_object_unref() - then the ppp manager is already destroyed by the time the watch callback runs. - - * src/nm-hal-manager.c: Add a device_type_name string to the device - creators, so that we can print a nice human readable string when a - device is added. - - * src/nm-umts-device.c (automatic_registration_get_network): Query - for the activated network, not much is done with the result thought. - - * src/nm-serial-device.c (nm_serial_device_get_reply): Implement. - (ppp_ip4_config): Change the device state to activated here for now. - (real_check_connection): Make sure the connection includes ppp setting. - - * libnm-glib/nm-client.c (get_device): Handle umts devices. - - * libnm-glib/Makefile.am: Add the new files to build. - - * libnm-glib/nm-umts-device.c: - * libnm-glib/nm-umts-device.h: Implement. - -2007-11-26 Tambet Ingo - - * src/nm-umts-device.c (automatic_registration_get_network): For now, dial - immediately, nm_serial_device_get_reply() isn't implemented correctly yet. - - * src/nm-serial-device.c (wait_for_reply_info_destroy): Don't try to remove - the timeout source - this function is only called when the timeout source has - been removed. - (nm_serial_device_wait_for_reply): Allocate the duplicate responses array - to be big enough to contain the terminating zero element as well. - The timeout argument is meant to be in seconds now. - (real_deactivate_quickly): Implement. - - * src/NetworkManager.conf: Allow root to own - "org.freedesktop.NetworkManager.PPP", deny it for everybody else. - - * libnm-util/nm-setting-umts.c: Network type and band properties are ints, - (not unsigned ints). - - * libnm-util/nm-setting-serial.c (nm_setting_serial_class_init): Fix a - small issue with parity bounds - capital letters have lower ascii codes - than lower case letters. - - * libnm-util/nm-connection.c (register_default_settings): Register serial - and umts settings. - -2007-11-22 Tambet Ingo - - Remove the "index" property from devices as not all device types have this. - - * include/NetworkManager.h (NM_DBUS_PATH_DEVICE): Remove. - - * src/nm-hal-manager.c (nm_get_device_index_from_hal): Remove. - (wired_device_creator): Get the device interface from hal to create the device. - (wireless_device_creator): Ditto. - - * src/nm-device.c (nm_device_init): Remove the index member. - (constructor): Remove the checks for index property, make interface property - a require constructor property. - Use the HAL udi for DBus path for devices. - (nm_device_get_index): Remove. - (set_property): Remove index handling. - (get_property): Ditto. - (nm_device_get_dbus_path): Remove. - - * src/nm-device-interface.c (nm_device_interface_init): Remove the index - property. - - * src/nm-device-802-3-ethernet.c (nm_device_802_3_ethernet_link_activated): - Access the device index through it's interface. - (nm_device_802_3_ethernet_link_deactivated): Ditto. - (nm_device_802_3_ethernet_new): Remove the useless argument test_dev. Remove - index argument. Add interface argument. - - * src/nm-device-802-11-wireless.c (nm_device_802_11_wireless_new): Remove - the useless test_dev argument. Remove index argument. Add interface arugment. - - * src/NetworkManagerSystem.c (nm_system_device_set_from_ip4_config): Get the - device index through interface. - (nm_system_set_mtu): Ditto. - - * introspection/nm-device.xml: Remove the "Index" property. - -2007-11-21 Tambet Ingo - - * src/nm-serial-device.c: - * src/nm-serial-device.c: - * src/nm-umts-device.c: - * src/nm-umts-device.h: Implement. - - * src/nm-hal-manager.c (nm_get_device_driver_name): libhal_free_string the string - allocated by libhal. - (modem_device_creator): Implement. - (register_built_in_creators): Register the modem creator. - - * src/nm-device-802-11-wireless.c (nm_device_802_11_wireless_new): - Remove the unused test_dev argument. - - * src/nm-device-802-3-ethernet.c (nm_device_802_3_ethernet_new): Ditto. - - * src/Makefile.am: Add new files to build. - Link in ppp-manager. - - * libnm-util/nm-setting-umts.c: - * libnm-util/nm-setting-umts.h: - * libnm-util/nm-setting-serial.c: - * libnm-util/nm-setting-serial.h: Implement. - - * libnm-util/Makefile.am: Add new files to build. - -2007-11-28 Dan Williams - - Patch from Zdeněk Jurka - - Support DHCP-provided static routes. - - * src/nm-ip4-config.h - src/nm-ip4-config.c - - Add get/set functions for static routes - - * src/dhcp-manager/nm-dhcp-manager.c - - (nm_dhcp_manager_get_ip4_config): extract static routes from the - DHCP response - - * src/NetworkManagerSystem.c - - (nm_system_device_set_from_ip4_config): set any static routes on the - interface when applying the IP4Config - -2007-11-28 Dan Williams - - * src/nm-device-802-11-wireless.c - - (real_act_stage1_prepare): mark APs created for hidden networks - as non-broadcasting - -2007-11-27 Dan Williams - - * system-settings/src/nm-system-config-interface.h - - Note how to store secrets on NMSetting objects - - * system-settings/src/dbus-settings.c - - (connection_settings_get_secrets): implement - -2007-11-27 Dan Williams - - * system-settings/plugins/ifcfg/Makefile.am - system-settings/plugins/ifcfg/parser.c - system-settings/plugins/ifcfg/parser.h - system-settings/plugins/ifcfg/plugin.c - - Parse wireless connections too - - * system-settings/src/dbus-settings.c - system-settings/src/dbus-settings.h - system-settings/src/main.c - - Handle connection update/removal if the plugin supports it - -2007-11-27 Dan Williams - - * src/nm-dbus-manager.h - src/nm-hal-manager.c - - Include the correct headers now that NetworkManagerDbusUtils.h doesn't - do it for them - - * src/Makefile.am - src/NetworkManagerDbusUtils.c - src/NetworkManagerDbusUtils.h - - Remove these two source files; they are unused - -2007-11-27 Dan Williams - - * src/vpn-manager/nm-vpn-manager.c - - (impl_vpn_manager_connect): fix system settings check (found by - James M. Leddy) - -2007-11-26 Dan Williams - - * Fix warnings so everything compiles with --enable-more-warnings - -2007-11-25 Dan Williams - - * system-settings/* - - Rework structure and code to use GModule-loaded plugins and a plugin - interface that plugins export to the system settings service - -2007-11-21 Dan Williams - - * system-settings/* - - Add Soren's system settings service. Needs work for distros other - than Fedora; the backends from NM should mostly migrate to here - and be converted to GObjects - -2007-11-21 Dan Williams - - * libnm-util/nm-setting-vpn-properties.c - - (set_property): must deep-copy the given settings hash, otherwise - double-free errors occur when the setting is disposed of - -2007-11-21 Dan Williams - - * src/vpn-manager/nm-vpn-act-request.h - src/vpn-manager/nm-vpn-act-request.c - - Remove; unused - -2007-11-20 Dan Williams - - * libnm-util/nm-utils.c - - (nm_utils_convert_strv_to_string, nm_utils_convert_uint_array_to_string, - nm_utils_convert_ip4_addr_struct_array_to_string, - nm_utils_register_value_transformations): print out the readable - values of more types of properties of NMSettings subclasses - -2007-11-20 Dan Williams - - * libnm-util/nm-setting-ip4-config.c - - (ip4_addresses_from_gvalue, ip4_addresses_to_gvalue, - nm_setting_ip4_config_class_init): apparently dbus-glib can't - marshal GValueArrays inside collections, so switch to types that it - can actually marshal/demarshal - -2007-11-16 Dan Williams - - * libnm-util/nm-setting-wireless-security.c - - (verify_tls, verify_ttls, verify_identity, verify_nai): do some - minimal verification of EAP methods too - - (verify): verify phase1 eap methods too - -2007-11-15 Dan Williams - - * libnm-glib/nm-device.h - libnm-glib/nm-device.c - - (nm_device_get_product, nm_device_get_vendor): should be returning - const char * - -2007-11-15 Dan Williams - - * libnm-glib/nm-device.c - - (get_product_and_vendor): don't try to free things that should be - freed - -2007-11-15 Dan Williams - - * src/NetworkManagerUtils.c - - (nm_ethernet_address_is_valid): unbreak previous fix - -2007-11-15 Dan Williams - - * src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_add_setting_wireless_security): handle PEAP - options - -2007-11-15 Dan Williams - - * src/NetworkManagerUtils.c - - (nm_ethernet_address_is_valid): fix style, clarify - - (nm_ethernet_addresses_are_equal): don't try to memcmp NULLs - - * src/nm-device-802-11-wireless.c - - (get_active_ap): handle failure from nm_device_802_11_wireless_get_bssid() - - (nm_device_802_11_wireless_get_ssid, - nm_device_802_11_wireless_get_bssid, - nm_device_802_11_wireless_get_bitrate): zero the wreq structure - before calling the ioctl; fixes valgrind-reported jump depends on - uninitialized value errors - -2007-11-15 Dan Williams - - * libnm-util/nm-setting.c - - (nm_setting_to_hash, one_property_cb): revert previous commit, it's - unecessary to serialize 'name' - - * src/nm-activation-request.c - - (get_secrets_cb): fix cases where a full NMSetting is returned from - the GetSecrets call - -2007-11-15 Dan Williams - - * libnm-util/nm-setting-connection.h - libnm-util/nm-setting-connection.c - - Rename the 'name' property to 'id', because it conflicted with the - NMSetting superclass' 'name' property. - - * libnm-util/nm-setting.c - - (nm_setting_to_hash): serialize the 'name' property - - (one_property_cb): ignore 'name' on deserialization of a connection - - * src/nm-device-802-11-wireless.c - src/vpn-manager/nm-vpn-connection.c - src/NetworkManagerPolicy.c - - Fix up for NMSettingConnection 'name'->'id' changes - -2007-11-13 Dan Williams - - * libnm-glib/nm-device-802-11-wireless.h - libnm-glib/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_get_hw_address): return should be const - - * test/nm-tool.c - libnm-glib/libnm-glib-test.c - - Fixes for above change - -2007-11-12 Dan Williams - - * src/supplicant-manager/nm-supplicant-settings-verify.c - - Allow fragment_size option - - * src/supplicant-manager/nm-supplicant-settings-verify.c - - (nm_supplicant_config_add_setting_wireless_security): use a lower - EAP fragment size than the default to help some TLS connections - -2007-11-12 Dan Williams - - Make certs actually work. The private key is now a secret, and should be - decrypted when requested by NM. The private key and phase2 private key - passwords are no longer interesting to NM because they should be used by - the settings service to decrypt the private key itself before passing it - to NM, and hence have been removed as fields. - - * libnm-util/nm-setting-wireless-security.h - libnm-util/nm-setting-wireless-security.c - - Remove private-key-passwd and phase2-private-key-passwd from - properties - - (need_secrets_password, need_secrets_eappsk, need_secrets_sim, - need_secrets): use property #defines instead strings to keep things - consistent - - (need_secrets_tls): if a client certificate is present but no - private key, request the private key - - (set_property, get_property, nm_setting_wireless_security_class_init): - remove private key password stuff, mark private keys as secret - - * src/supplicant-manager/nm-supplicant-settings-verify.c - - Remove private_key_passwd and private_key2_passwd from opt_table - -2007-11-09 Dan Williams - - Fix vpn-properties setting update_secrets call for new NMSetting stuff. - Since the vpn-properties are managed and known by the VPN daemons themselves, - libnm-util doesn't know what's secret and what's in the setting's 'data' - member. - - * libnm-util/nm-setting.h - libnm-util/nm-setting.c - - Add the ability for subclasses to override update_one_secret - - * libnm-util/nm-setting-vpn-properties.c - - Override update_one_secret and just copy the values into the - internal table - -2007-11-09 Dan Williams - - * libnm-glib/nm-settings.h - libnm-glib/nm-settings.c - - (nm_settings_new_error): remove - - (nm_settings_error_quark): add; instead of nm_settings_new_error, - clients should use g_set_error() with NM_SETTINGS_ERROR - -2007-11-09 Dan Williams - - * src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_add_setting_wireless_security): private key - passwords are never sent to wpa_supplicant, because the supplicant - should never be reading random files from the disk. Clients like - the applet are required to decrypt the private keys and send NM - the decrypted blobs. - -2007-11-08 Dan Williams - - * libnm-util/nm-setting-wireless-security.h - libnm-util/nm-setting-wireless-security.c - - Add 'private-key-decrypted' and 'phase2-private-key-decrypted' - members to 802-11-wireless-security structure. This should be used - to indicate that the values in private-key and phase2-private-key - are already decrypted by the user agent, and that no - private-key-passwd or phase2-private-key-passwd should be expected. - It is not meant to be a stored configuration value, but meant to - be set when the conneciton is sent to NM over dbus. - -2007-11-08 Dan Williams - - * libnm-util/nm-connection.h - libnm-util/nm-connection.c - - (nm_connection_need_secrets): add argument to return hints - - * src/nm-device-802-11-wireless.c - - (link_timeout_cb, supplicant_connection_timeout_cb, - real_act_stage2_config, real_act_stage4_ip_config_timeout): handle - nm_connection_need_secrets() change - -2007-11-07 Tambet Ingo - - Rework NMSetting structures: Move each setting to it's own file. - Convert to GObject. Remove home grown setting types and use GTypes. - Use GObject property introspection for hash conversion, enumerating - properties, etc. - - * libnm-util/nm-setting-connection.[ch] - * libnm-util/nm-setting-ip4-config.[ch] - * libnm-util/nm-setting-ppp.[ch] - * libnm-util/nm-setting-vpn.[ch] - * libnm-util/nm-setting-vpn-properties.[ch] - * libnm-util/nm-setting-wired.[ch] - * libnm-util/nm-setting-wireless.[ch] - * libnm-util/nm-setting-wireless-security.[ch] - - New files, each containing a setting. - - * libnm-util/nm-setting-template.[ch]: A template for creating new - settings. To use it, just replace 'template' with the new setting - name, and you're half-way done. - - * libnm-util/nm-setting.c: Convert to GObject and use GObject - introspection instead of internal types and tables. - - * libnm-util/nm-connection.c: Adapt the new NMSetting work. - - * libnm-util/nm-param-spec-specialized.[ch]: Implement. Handles - GValue types defined by dbus-glib for composed types like collections, - structures and maps. - - * src/*: The API of NMSetting and NMConnection changed a bit: Getting - a setting from connection takes the setting type now. Also, since - the settings are in multiple files, include relevant settings. - -2007-10-31 Saleem Abdulrasool - - * configure.in: - * src/backends/NetworkManagerGentoo.c: - (nm_system_restart_mdns_responder): Implement restarts for other mdns - providers in Gentoo. - -2007-10-31 Dan Williams - - * libnm-util/nm-connection.c - - (gvalue_to_string): handle UINT32 arrays - -2007-10-31 Dan Williams - - * libnm-glib/nm-device.h - libnm-glib/nm-device.c - - (nm_device_get_description): remove - - (nm_device_get_product, nm_device_get_vendor): add - - (nm_device_update_description): new function (private); walk HAL - devices to get product and vendor IDs for a specific device - -2007-10-31 Dan Williams - - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_get_mode): ignore ENODEV errors - -2007-10-29 Dan Williams - - * src/nm-hal-manager.c - - (device_added, device_new_capability): ignore device additions while - asleep. Fixes crash caused when NM goes to sleep, a network device - kernel module is unloaded and reloaded and recognized by NM again. - -2007-10-26 Dan Williams - - Patch from Helmut Schaa (and more bits from me) - - * src/NetworkManagerAP.c - src/NetworkManagerAP.h - libnm-glib/nm-access-point.c - libnm-glib/nm-access-point.h - - Make 'rate' property a guint32 to better match with WEXT and - wpa_supplicant and to allow representation of higher bitrates - - * src/nm-device-802-11-wireless.c - introspection/nm-device-802-11-wireless.xml - libnm-glib/nm-device-802-11-wireless.c - libnm-glib/nm-device-802-11-wireless.h - - Make 'bitrate' property a guint32 to match AP 'rate' property type - - * src/nm-device-802-3-ethernet.c - src/nm-device-802-3-ethernet.h - introspection/nm-device-802-3-ethernet.xml - libnm-glib/nm-device-802-3-ethernet.c - libnm-glib/nm-device-802-3-ethernet.h - - Make 'speed' property a guint32 to match other speed/rate types - - Make nm_device_802_3_ethernet_get_speed() static - - * test/nm-tool.c - - Update for the changes above - -2007-10-26 Dan Williams - - * src/named-manager/nm-named-manager.c - - (rewrite_resolv_conf): clean up error handling to avoid double-free by - not calling fclose() twice on some error conditions - -2007-10-26 Dan Williams - - * src/nm-activation-request.c - - (dispose): clean up indentation; get the right DBusGProxy object to - cancel the GetSecrets pending call on. Need to use the Secrets - proxy, not the regular connection proxy. Otherwise the GetSecrets - pending call doesn't get canceled, and pressing Cancel in the - applet's password dialog could cause get_secrets_cb() to be called - after the activation request has already been destroyed - -2007-10-24 Dan Williams - - * src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_add_blob): pass blob data and length for - verification - - (get_hash_cb): use GByteArrays rather than GArrays; easier to follow - -2007-10-24 Dan Williams - - * src/supplicant-manager/nm-supplicant-settings-verify.c - - (opt_table): max length for certificates should be 65536 - -2007-10-24 Dan Williams - - * src/supplicant-manager/nm-supplicant-interface.c - - (blob_free): correctly free blob data after use - - (call_set_blobs): use the right D-Bus interfaace for setBlobs - -2007-10-24 Dan Williams - - * libnm-util/nm-setting.c - - (setting_wireless_security_need_secrets): Fix lookup table logic for - EAP method need secrets - -2007-10-24 Dan Williams - - * src/backends/NetworkManagerRedHat.c - - (nm_system_update_dns): be a lot smarter about telling nscd to restart - -2007-10-23 Dan Williams - - * libnm-util/nm-setting.c - libnm-util/nm-setting.c - - (nm_setting_compare): implement - - (default_setting_compare_fn, do_one_compare, compare_gvalue_hash, - compare_one_hash_gvalue): compare the contents of a setting - - * libnm-util/nm-connection.c - - (nm_connection_compare): implement - -2007-10-23 Dan Williams - - * src/nm-activation-request.c - - (get_secrets_cb): handle getting a setting back that is more than - just secrets (ie, user changed auth or EAP method or something) - -2007-10-23 Dan Williams - - * libnm-util/nm-setting.c - libnm-util/nm-setting.h - - (nm_setting_verify): new function; verify one setting - - (nm_settings_verify_all): rename from nm_settings_verify() - - (setting_connection_verify, setting_wireless_verify): allow NULL - all_settings - - * libnm-util/nm-connection.c - - (nm_connection_replace_settings, nm_connection_verify, - nm_connection_new_from_hash): handle nm_settings_verify() rename - -2007-10-23 Dan Williams - - * src/nm-device-802-11-wireless.c - - (real_act_stage2_config): use pre-increment on 'tries' to get the - desired behavior - -2007-10-23 Dan Williams - - * src/supplicant-manager/nm-supplicant-settings-verify.c - - eap_allowed, phase2_allowed: harmonize with allowed values from - nm-settings.c - -2007-10-23 Dan Williams - - * src/nm-device-802-11-wireless.c - - (real_act_stage2_config): after the first association failure, - if the connection still needs secrets ask the user for them - explicitly. After the fourth association failure due to bad - secrets, fail the connection entirely. Handles the GetSecrets - loop that NM gets into when the provided secrets don't match up - with the connection details. - -2007-10-23 Dan Williams - - * src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_add_setting_wireless_security): only add - WPA-specific options when WPA is in use - -2007-10-23 Dan Williams - - * src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_add_setting_wireless_security): 'password' - secret doesn't need to be unhexified - -2007-10-23 Dan Williams - - * libnm-util/nm-setting.c - - (setting_wireless_security_need_secrets): ensure auth_alg is !NULL - before trying to do something with it - -2007-10-23 Dan Williams - - * src/nm-device-802-11-wireless.c - - (merge_scanned_ap): handle NULL ssids returned from nm_ap_get_ssid() - -2007-10-23 Dan Williams - - * src/nm-device-802-11-wireless.c - - (merge_scanned_ap): use libnm-util empty SSID check to catch more - non-SSID-broadcasting APs - -2007-10-23 Dan Williams - - * src/NetworkManagerAP.c - - (match_cipher, security_compatible): remove - - (nm_ap_check_compatible): use nm_utils_ap_security_compatible() from - libnm-util instead - -2007-10-23 Dan Williams - - * libnm-util/nm-utils.c - libnm-util/nm-utils.h - - (nm_utils_ap_security_compatible): common function for checking - whether a specific AP is compatible with an NMConnection - -2007-10-23 Dan Williams - - * libnm-util/nm-setting.c - - (setting_wireless_security_need_secrets, need_secrets_phase2, - need_secrets_tls, need_secrets_sim, need_secrets_eappsk, - need_secrets_password, setting_wireless_security_verify): fix - need_secrets for IEEE 802.1x and WPA-EAP by implementing need - secrets logic for each supported EAP method - -2007-10-23 Dan Williams - - * src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_add_setting_wireless_security): fix wpa_supplicant - config option name, should be "private_key2_passwd" - -2007-10-22 Tambet Ingo - - Implement support for static IP addresses, additional/overridden DNS and - DNS domain search lists. - - * libnm-util/nm-setting.c (uint_array_to_gvalue): Implement. - (ip4_addresses_to_gvalue): Implement. - (convert_array_to_byte_array): Implement. - (nm_setting_populate_from_hash_default): Handle NM_S_TYPE_UINT_ARRAY and - NM_S_TYPE_IP4_ADDRESSES. - (nm_setting_hash): Ditto. - (default_setting_clear_secrets): Add a default case for the switch: IP address - shouldn't be secret, ever. - (setting_ip4_config_verify): Update, requires addresses in case of manual - configurations. - (setting_ip4_config_destroy): Free stuff. - - * src/nm-device.c (merge_ip4_config): Implement. - (real_act_stage4_get_ip4_config): Merge IP4 configuration from NMConnection. - -2007-10-22 Dan Williams - - * libnm-util/nm-setting.c - - (setting_wireless_security_verify): allow WEP-40 and WEP-104 as - pairwise cipher options for Dynamic WEP - -2007-10-21 Dan Williams - - * src/NetworkManagerAP.c - src/NetworkManagerAP.h - - Rename 'articifical' -> 'fake' since that's what they are until - noticed in scans - - (nm_ap_new_fake_from_connection): new function to create a 'fake' AP - from the attributes in an NMConnection object - - (security_compatible): better handle Dynamic WEP and LEAP; handle - WPA Enterprise - - (nm_ap_match_in_list): find a matching AP in a scan list - - * src/nm-device-802-11-wireless.c - - (get_active_ap): add an 'ignore_ap' argument to ignore a specific - AP when searching the scan list; match on frequency and mode too - - (nm_device_802_11_wireless_get_frequency): implement - - (merge_scanned_ap): replace duplicate matching logic with - nm_ap_match_in_list() - - (real_act_stage1_prepare): handle a NULL specific object; ie where - the user is trying to connect to a hidden network that is not yet - known from the scan list - - (activation_success_handler): now that the card knows the AP's BSSID, - there may already be a scanned AP in the scan list that is what - we really wanted to connect to, but didn't know at the time. Use - that instead of the 'fake' AP created at activation start and get - rid of the 'fake' AP - - (cull_scan_list): don't remove fake APs - -2007-10-21 Dan Williams - - * src/nm-activation-request.h - src/nm-activation-request.c - - (nm_act_request_set_specific_object): new function; allow setting the - specific object if one isn't set yet - -2007-10-20 Dan Williams - - * src/supplicant-manager/nm-supplicant-config.h - src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_init, nm_supplicant_config_finalize): add a hash - table to store blobs - - (nm_supplicant_config_add_blob): new function; add blob to internal - blob hash table - - (nm_supplicant_config_get_blobs): new function; get stored blobs - - (nm_supplicant_config_add_setting_wireless_security): handle - options that use certificates (ie, blobs) - - * src/nm-device-802-11-wireless.c - - (build_supplicant_config): pass a UID (just use the connection path) - to the supplicant config as now required - - * src/supplicant-manager/nm-supplicant-interface.c - - (add_network_cb, call_set_blobs, set_blobs_cb, call_set_network): if - there are any blobs to send to wpa_supplicant, send those first - before sending the network configuration - -2007-10-19 Dan Williams - - Split the GetSecrets() call off to a separate D-Bus interface so that it - can be more easily locked down with D-Bus policy. Only 'root' (ie, NM) - should be able to call GetSecrets(). - - * include/NetworkManager.h - - Define the connection secrets D-Bus interface - - * src/vpn-manager/nm-vpn-connection.c - - (clear_need_auth): get the right proxy object for the connection - secrets interface - - (get_connection_secrets): use the connection secrets proxy; send - empty hints in get secrets request - - * src/nm-activation-request.c - - (nm_act_request_request_connection_secrets): use the connection - secrets proxy; send empty hints in get secrets request - - * src/nm-manager.c - src/nm-manager.h - - (connection_get_settings_cb): set the connection secrets proxy on - the connection object too - - (internal_new_connection_cb): create the connection secrets proxy - - * introspection/nm-settings-connection.xml - - Define Connection.Secrets interface and move GetSecrets there - - Add a 'hints' argument to GetSecrets - - * libnm-glib/nm-settings.c - libnm-glib/nm-settings.h - - (impl_connection_settings_get_secrets): add 'hints' argument - -2007-10-19 Dan Williams - - * src/nm-device.c - - (constructor): add message about what path a device is exported as - to help in debugging rh #339011 - -2007-10-17 Dan Williams - - * libnm-util/nm-utils.h - libnm-util/nm-utils.c - - (nm_utils_security_valid): common function to help find the intersection - of capabilities of devices and (optionally) access points - -2007-10-17 Dan Williams - - * src/nm-device-802-11-wireless.c - - (get_wireless_capabilities): add missing braces so that WPA capabilities - don't get erroneously cleared - -2007-10-17 Dan Williams - - * src/nm-manager.h - src/nm-manager.c - src/nm-hal-manager.c - - (device_removed, finalize, nm_manager_remove_device, - nm_manager_sleep): add a 'deactivate' argument to - nm_manager_remove_device() to fully deactivate devices when necessary - (ie, always except when waking up) - -2007-10-16 Dan Williams - - * libnm-util/nm-setting.c - - (setting_wireless_security_verify): fix phase2_auth methods; 'sim' - also isn't valid phase2 autheap method - -2007-10-16 Dan Williams - - * libnm-glib/nm-client.c - - (update_wireless_status): consolidate updates of wireless status - - (constructor): use update_wireless_status() - - (manager_running): set wireless status off when NM goes away; requery - the wireless status when NM comes back - -2007-10-16 Dan Williams - - * libnm-glib/nm-client.c - - (nm_client_activate_device): actually use the fixed-up specific - object path - -2007-10-16 Dan Williams - - * src/nm-hal-manager.c - - (killswitch_getpower_reply, nm_hal_manager_destroy): only print out - killswitch error messages once - -2007-10-16 Dan Williams - - * src/nm-manager.c - - (manager_set_wireless_enabled): don't allow wireless to be enabled - if it's disabled in hardware; don't touch network devices while - NM is asleep - -2007-10-16 Dan Williams - - * libnm-util/nm-client.c - - (nm_client_activate_device): convert NULL specific_object to "/", - which is used in place of NULL - - * src/nm-manager.c - - (impl_manager_activate_device): convert "/" specific_object back into - NULL - -2007-10-16 Tambet Ingo - - Implement a generic NMSetting creator from setting name. - While at it, get rid of all nm_setting_foo_new_from_hash() functions and - add a virtual function 'populate_fn'. - - * libnm-util/nm-connection.c (nm_connection_create_setting): Implement. - (register_default_creators): Register setting creators instead of functions - that create and then populate. - (parse_one_setting): Use the common setting creator and then setting specific - poplulation function. - - * libnm-util/nm-setting.c: Get rid of nm_setting_foo_new_from_hash() functions, - they all looked exactly the same. - Add a 'populate_fn' virtual function to NMSetting. - Use default virtual functions in case they are not overriden. - (nm_setting_populate_from_hash): Implement. - - * src/nm-device.c (real_act_stage3_ip_config_start): Don't hard code the setting - name, use a defined string. - (real_act_stage4_get_ip4_config): Ditto. - -2007-10-16 Tambet Ingo - - * src/nm-hal-manager.c (killswitch_getpower_reply): The type returned from - HAL is int, not uint. - -2007-10-15 Tambet Ingo - - Implement killswitch polling through HAL. - - * src/nm-manager.c: Add wireless hardware status property. Add - 'properties-changed' signal for changes in wireless and wireless hardware - state changes. - - * src/nm-hal-manager.c: Poll hal for killswitch statuses in every 6 seconds - and update NMManager's wireless hardware state when it has changed. - (nm_hal_manager_new): Don't try to add initial devices here - (hal_init) - already does that. - - * libnm-glib/nm-client.c: Add wireless hardware status property. Cache the - values of wireless state and wireless hardware state. Listen for the - 'properties-changed' signals, update the cached values and emit notify. - - * include/NetworkManager.h: Fix a typo in a comment. - -2007-10-14 Dan Williams - - * libnm-util/nm-setting.c - - (setting_wireless_security_need_secrets): handle LEAP secrets - -2007-10-13 Dan Williams - - * libnm-util/nm-setting.h - libnm-util/nm-setting.c - src/supplicant-manager/nm-supplicant-config.c - - Make the 'proto' field of the 802-11-wireless-security field a - string list - -2007-10-12 Tambet Ingo - - Rework the "properties-changed" signal listening implementation. - Add a generic implementation to NMObject class that listens for - the signal and calls property setters of the target NMObject. - - * libnm-glib/nm-object.c (nm_object_handle_properties_changed): Implement. - - * libnm-glib/nm-device-802-11-wireless.c: Move the GObject consturction - code to the end of file so that all the static functions are available - without extra declarations. - Remove the "properties-changed" signal handling and use the framework from - NMObject. - Implement property setters for properties that change with - "properties-changed" signal. - - * libnm-glib/nm-access-point.c: Ditto. - -2007-10-12 Tambet Ingo - - Rework the "properties-changed" signal implementation. - In classes that need to use it, just emit "GObject::notify" and the new - framework takes care of the rest to make the signal available on dbus. - The framework queues the notifications and tries to send as many together - in one signal as possible. - - * src/nm-properties-changed-signal.c: - * src/nm-properties-changed-signal.h: Implement. - - * src/Makefile.am: Add new files to build. - - * src/NetworkManagerAP.c: Use the general framework for properties-changed - signal. - - * src/nm-device-802-11-wireless.c: Ditto. - -2007-10-10 Dan Williams - - * src/nm-manager.c - - (wait_for_connection_expired): ensure info is valid - - (connection_added_default_handler): Should only remove pending - connection info when the manager has the connection that it's - waiting for. Fixes segfault in wait_for_connection_info(). - -2007-10-10 Dan Williams - - * libnm-util/nm-setting.c - libnm-util/nm-setting.h - - Add a default 'user_name' field to the VPN setting, which VPN plugins - can use if they choose. Should be filled in by the settings service - on-the-fly with the currently logged in user's username - -2007-10-10 Dan Williams - - * src/nm-device-802-11-wireless.c - - (merge_scanned_ap): make sure non-SSID-broadcasting APs are marked - as such, because even if the manager fills in the SSID, NM still - has to indicate to wpa_supplicant that the AP isn't broadcasting - its SSID - -2007-10-10 Tambet Ingo - - Move ppp-manager over to dbus-glib. The big deal is that it was the last piece of - code that used NM's own version of dbus signal handling and custom dictionary - marshalling/unmarshalling. With this change, all that obsolete code can disappear - and we get to maintain over 2000 lines less code. - - * libnm-util/dbus-dict-helpers.c: - * libnm-util/dbus-dict-helpers.h: Remove. - - * src/ppp-manager/nm-pppd-plugin.c: Convert it to use dbus-glib. - - * src/ppp-manager/nm-pppd-plugin.xml: Implement. - - * src/ppp-manager/nm-ppp-manager.c: Use dbus-glib instead of home-brewed dbus signal - handlers. - - * src/nm-dbus-manager.c: Remove all the manual dbus signal handling. - - * configure.in: Remove test/libnm-util/Makefile creation. - - * test/Makefile.am: Remove libnm-util from SUBDIRS. - - * test/libnm-util/: Remove the whole directory. - -2007-10-10 Tambet Ingo - - * src/NetworkManagerPolicy.c (nm_policy_new): Initialize the - device_state_changed_idle_id variable or it would contain some random value and the - schedule_change_check calls would not do anything. - -2007-10-09 Dan Williams - - * src/nm-device-802-11-wireless.c - - (supplicant_iface_scanned_ap_cb): set the non-broadcast flag elsewhere - - (merge_scanned_ap): only have the manager fill the SSID if the AP - isn't broadcasting its SSID; set the non-broadcast flag here; fix - merging of non-SSID-broadcasting APs - -2007-10-09 Tambet Ingo - - * libnm-util/nm-utils.c (nm_utils_is_empty_ssid): Convert the ssid type to - "guint8 *" since it's usually used with GByteArray->data. - (nm_utils_ssid_to_utf8): Add it back, the applet needs it. - -2007-10-09 Tambet Ingo - - * src/NetworkManagerUtils.c - (nm_utils_is_empty_ssid): - (nm_utils_escape_ssid): - (nm_utils_same_ssid): Remove. These functions are copied and pasted in a - lot of places, so they belong to libnm-utils instead. - - Now with 100% less compiler warnings: - - * libnm-util/nm-utils.c (nm_dbus_escape_object_path): Remove, unused. - (nm_dbus_unescape_object_path): Ditto. - (nm_utils_ssid_to_utf8): Ditto. - (nm_utils_is_empty_ssid): Move here from src/NetworkManagerUtils.c - (nm_utils_escape_ssid): Ditto. - (nm_utils_same_ssid): Ditto. - - * src/nm-manager.c: Include 'netinet/ether.h' for ether_aton_r. - (add_one_connection_element): Remove an unused variable. - (impl_manager_get_active_connections): Ditto. - - * src/NetworkManagerPolicy.c (get_device_connection): Remove an unused - variable. - - * src/nm-dbus-manager.c (nm_dbus_manager_start_service): Remove a leftover - from the previous commit. - - * src/nm-device-802-11-wireless.c (set_current_ap): Remove unused variable. - (real_act_stage1_prepare): Ditto. - (activation_success_handler): Ditto. - (get_property): Ditto. - - * src/nm-device-802-3-ethernet.c (real_get_best_connection): Remove unused - variable. - - * src/ppp-manager/nm-pppd-plugin.c (nm_ip_up): Remove the check for 'ifname', - it's always set. - - * src/supplicant-manager/nm-supplicant-config.c - (nm_supplicant_config_add_setting_wireless): Cast the GByteArray's 'guint8 *' - to expected "char *". - (nm_supplicant_config_add_setting_wireless): Ditto. - (nm_supplicant_config_remove_option): Remove, not used. - - * libnm-glib/libnm-glib-test.c (dump_access_point): Frequency is a guint32, - not double. - (test_wireless_enabled): Ifdef out unused function. - (device_deactivate): Ditto. - (device_state_changed): Ditto. - (nm_utils_is_empty_ssid): Remove, it's now in libnm-utils. - (nm_utils_escape_ssid): Ditto. - - * test/nm-tool.c (nm_utils_escape_ssid): Remove, it's now in libnm-utils. - (nm_utils_is_empty_ssid): Ditto. - - * libnm-glib/nm-client.c (nm_client_free_active_connection_element): Remove - unused variable. - - * libnm-util/nm-setting.c (setting_wireless_destroy): Remove unused variable. - (setting_vpn_properties_update_secrets): Ditto. - (int_to_gvalue): Ifdef out for now, not used. - (byte_to_gvalue): Ditto. - - * libnm-util/dbus-dict-helpers.c (_nmu_dbus_add_dict_entry_string_array): - Unused, remove. - -2007-10-08 Tambet Ingo - - * src/NetworkManager.c (main): When dbus manager doesn't want to start, complain - about dbus manager, not named manager. - Make sure hal_manager and dbus_mgr are created before trying to unreference. - - * src/nm-dbus-manager.c: There was an issue with priv->proxy: We have a signal - handler for it's 'destroy' signal - we use it to catch disconnects from dbus. - However, the same signal is emitted when we destroy it and there's - nm_dbus_manager_cleanup -> destroy_cb -> nm_dbus_manager_cleanup cycle. - - (nm_dbus_manager_cleanup): Let go of the DBusGProxy before - releasing the DBusGConnection, since proxy needs a conneciton. - (destroy_cb): Set the private proxy to NULL before cleaning up the manager. - -2007-10-08 Dan Williams - - * src/NetworkManager.c - - (main): error on unknown command-line options - -2007-10-08 Dan Williams - - Reimplement the invalid connection list. Don't try to re-activate a - connection that just failed or was canceled. - - * src/nm-device.c - - (connection_secrets_failed_cb): fail device activation, don't just - deactivate the device. Listeners have to know about the failure. - - * src/NetworkManagerPolicy.c - - (nm_policy_auto_get_best_device): exclude invalid connections from - the connection list given to a device's get_best_connection() - method - - (device_state_changed): tag failed connections as invalid; clear the - tag from successful connections - -2007-10-08 Dan Williams - - Fix problems with interrupted activation. Previously, choosing an AP - from the menu, then choosing another one before the first connection was - successful wouldn't deactivate the device before starting the new connection - on that same device. - - * src/NetworkManagerPolicy.c - - (deactivate_old_device, device_state_changed, state_changed, - nm_policy_new): wrong place to deactivate old devices - - * src/nm-manager.c - - (pending_connection_info_destroy, finalize, - wait_for_connection_expired): decouple destruction of the pending - connection info from the manager device - - (connection_added_default_handler): deactivate any active or - activating device before starting a new activation - - (impl_manager_activate_device): deactivate any active or activating - device before starting a new activation; be sure not to leak - pending connection info if a new activation request arrives but - there's already a pending one in-process - -2007-10-08 Dan Williams - - * src/NetworkManagerAP.h - src/NetworkManagerAP.c - - (nm_ap_has_manufacturer_default_ssid): remove, unused. User clients - should handle default SSIDs and whether or not to autoconnect - to them - -2007-10-08 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): print out connection name where - possible - -2007-10-08 Dan Williams - - * src/nm-device-802-11-wireless.c - src/nm-device-802-11-wireless.h - - (nm_device_802_11_wireless_class_init, merge_scanned_ap): new - 'hidden-ap-found' signal (for internal use only) that allows the - NMManager to fill in the AP's SSID if a connection has that AP's - BSSID in its seen-bssids list - - * src/nm-manager.c - - (manager_hidden_ap_found, nm_manager_add_device): attach to a - wireless device's hidden-ap-found signal and fill in the APs SSID - if possible - -2007-10-07 Dan Williams - - * src/nm-manager.c - src/nm-manager.h - - Add a 'connections-added' signal to batch together updates of large - numbers of connections, like when reading from a settings service - the first time. Otherwise, the policy would just activate the first - suitable connection it saw rather than waiting for the full list - to arrive. - - (nm_manager_class_init): register new signal - - (get_type_for_proxy, connection_get_settings_cb, - get_connection_for_proxy): centralize places where a proxy's setting - service is determined - - (free_get_settings_info): if the call being freed is the last call - in a pending call group, fire off the connections-added signal - - (internal_new_connection_cb): add call to a pending call group if - requested - - (list_connections_cb): always create a call group here, because this - call results in a batch of new connections - - (initial_get_connections): start getting system connections first - - (nm_manager_connections_destroy, emit_removed): actually emit the - removed signal when destroying connections - - * src/NetworkManagerPolicy.c - - (nm_policy_new, connections_added): handle connections-added signal - from the manager - -2007-10-06 Dan Williams - - * src/nm-device-802-11-wireless.c - - (constructor): fix leaked socket - -2007-10-06 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_auto_get_best_device): fix connection list reffing. Each - connection in the list returned by nm_manager_get_connections() is - reffed, but they weren't getting unreffed before returning - -2007-10-06 Dan Williams - - * src/nm-manager.c - - (connections_to_slist): sort connections first on autoconnect, then - on timestamp - -2007-10-06 Dan Williams - - * libnm-util/nm-connection.c - - (gvalue_to_string): handle UINT64 - -2007-10-06 Dan Williams - - * src/NetworkManagerPolicy.c - - (connection_updated, nm_policy_new): recheck state when a connection - gets updated - -2007-10-06 Dan Williams - - * src/nm-manager.c - src/nm-manager.h - - (nm_manager_get_connection_dbus_path): make static - - (nm_manager_update_connections): remove; unused - - Add a connection-updated signal - - (new_connection_cb, connection_updated_cb, nm_manager_class_init): - handle connection object updates - -2007-10-06 Dan Williams - - * src/NetworkManagerPolicy.c - - (connection_removed): deactivate removed connections - -2007-10-06 Dan Williams - - * libnm-util/nm-connection.c - libnm-util/nm-connection.h - - (nm_connection_replace_settings): new function - -2007-10-06 Dan Williams - - * libnm-glib/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_get_active_access_point): don't segfault - on error when getting the active access point over D-Bus from NM - -2007-10-05 Dan Williams - - * libnm-util/nm-setting.c - - (setting_wireless_verify, setting_wireless_destroy): add seen_bssids - to the NMSettingWireless table; it's now a string array not an array - of byte arrays - -2007-10-05 Dan Williams - - * libnm-glib/nm-device-802-11-wireless.c - - Cache properties and update cached properties on D-Bus signals from NM - -2007-10-05 Dan Williams - - * src/nm-device-802-11-wireless.c - - (set_current_ap): consolidate current_ap handling code into one place - to ensure that PropertiesChanged signals are emitted in all cases - - (periodic_update, real_deactivate_quickly, real_act_stage1_prepare, - nm_device_802_11_wireless_dispose): use set_current_ap() - -2007-10-05 Dan Williams - - * libnm-glib/nm-access-point.c - libnm-glib/nm-access-point.h - - (nm_access_point_get_hw_address): return 'const char *', not 'char *' - because the value is cached internally now. Callers should not - free the internal value. - - Make signal name defines private - - * test/nm-tool.c - libnm-glib/libnm-glib-test.c - - Don't free value returned from nm_access_point_get_hw_address() - -2007-10-04 Dan Williams - - * introspection/nm-device-802-11-wireless.xml - src/nm-device-802-11-wireless.h - src/nm-device-802-11-wireless.c - - Add a PropertiesChanged signal for wireless device - - Store currently associated access point - - (periodic_update): generalize; update rate here too and emit the - correct PropertiesChanged signal when stuff changes - - (real_deactivate_quickly, nm_device_802_11_wireless_dispose, - real_activation_cancel_handler): clear current_ap when device is - deactivated - - (link_to_specific_ap, get_ap_blacklisted, - nm_device_802_11_wireless_get_best_ap): remove obsolete and unused - code - - (nm_device_802_11_wireless_get_bitrate): make static; unused anywhere - outside this file - - (real_set_hw_address): emit property changed signal if the card's - MAC address changes - - (real_act_stage1_prepare): set the initial current_ap to the AP - the card is supposed to be connecting to - - (activation_success_handler): send out property updates on successful - activation - - (get_property): pull bitrate from cached value; use OBJECT_PATH type - for ACTIVE_ACCESS_POINT property because sometimes there won't be - one and dbus-glib doesn't like marshalling NULL G_TYPE_OBJECTs - - (nm_device_802_11_wireless_class_init): ACTIVE_ACCESS_POINT property - is now boxed; add PropertiesChanged signal - -2007-10-04 Dan Williams - - * libnm-util/nm-connection.c - libnm-util/nm-connection.h - - (nm_connection_verify): new function - -2007-10-04 Dan Williams - - * libnm-util/nm-setting.c - - (nm_settings_verify): use #defines when possible rather than strings - - (setting_connection_verify): ensure that 'name' and 'type' are valid - - (setting_vpn_verify): tighter validity check on 'service_type' - -2007-10-04 Dan Williams - - * libnm-glib/nm-settings.c - - (nm_connection_settings_class_init): provide correct type for argument - to the Updated signal so that dbus-glib knows how to marshal it - -2007-10-03 Dan Williams - - * src/nm-device-802-3-ethernet.c - - (real_get_best_connection): don't create automatic connections - internally; clients should provide a setting that applies to - the device with 'autoconnect: True'. Problem was that these - internally auto-created connections don't have a proxy or service - name because they weren't created by a settings daemon, and therefore - clients have no idea what to do with them. - -2007-10-03 Dan Williams - - * src/nm-device-802-11-wireless.c - src/nm-device-802-11-wireless.h - introspection/nm-device-802-11-wireless.xml - - GetActiveNetworks -> GetAccessPoints - - ActiveNetwork -> ActiveAccessPoint - - NetworkAdded -> AccessPointAdded - - NetowrkRemoved -> AccessPointRemoved - - * libnm-glib/nm-device-802-11-wireless.c - libnm-glib/nm-device-802-11-wireless.h - - network-added signal -> access-point-added - - network-removed signal -> access-point-removed - - nm_device_802_11_wireless_get_active_network() -> - nm_device_802_11_wireless_get_active_access_point() - - nm_device_802_11_wireless_get_network_by_path() -> - nm_device_802_11_wireless_get_access_point_by_path() - - nm_device_802_11_wireless_get_networks() -> - nm_device_802_11_wireless_get_access_points() - - * libnm-glib/libnm-glib-test.c - test/nm-tool.c - src/NetworkManagerPolicy.c - - Fixups for Network -> AccessPoint - -2007-10-03 Dan Williams - - Add a GetActiveConnections() method on the Manager object. - - * src/nm-manager.c - src/nm-manager.h - introspection/nm-manager.xml - - (connection_get_settings_cb): keep connection type around too - - (impl_manager_get_active_connections, add_one_connection_element): - implement; returns all active connections and what devices they - apply to - - * libnm-glib/nm-client.c - libnm-glib/nm-client.h - introspection/nm-manager-client.xml - - (nm_client_get_devices): GPtrArray elements are allocated and owned - by the caller; free here to avoid memory leak - - (nm_client_get_active_connections): implement; return the list of - active connections - - (nm_client_free_active_connection_element): implement; free an element - of the GSList returned by nm_client_get_active_connections() - -2007-10-03 Dan Williams - - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_update_bssid): remove - - (get_active_ap): new function; find the AP in the scan list which - matches the current BSSID and SSID of the wireless device - - (nm_device_802_11_periodic_update): get current AP using - get_active_ap() and print AP roam messages - -2007-10-01 Dan Williams - - * libnm-util/nm-setting.h - - Add a 'timestamp' option to NMSettingConnection - - Add a UINT64 type - - * libnm-util/nm-setting.c - - (uint64_to_gvalue): new function - - (nm_setting_populate_from_hash, nm_setting_hash, - default_setting_clear_secrets): handle UINT64 type - - con_table: add 'timestamp' member - -2007-10-01 Dan Williams - - * src/nm-manager.c - - (impl_manager_activate_device): ensure the D-Bus method sends a return - value when the connection can be activated immediately - -2007-10-01 Dan Williams - - * libnm-glib/nm-device.c - - (nm_device_class_init): actually tell glib about the carrier-changed - signal - -2007-10-01 Dan Williams - - * configure.in - src/marshallers/Makefile.am - src/marshallers/nm-marshal.list - src/marshallers/nm-marshal-main.c - - Consolidate glib marshallers into one place - - * src/dhcp-manager/Makefile.am - src/dhcp-manager/nm-dhcp-manager.c - src/supplicant-manager/Makefile.am - src/supplicant-manager/nm-supplicant-manager.c - src/supplicant-manager/nm-supplicant-interface.c - src/ppp-manager/Makefile.am - src/ppp-manager/nm-ppp-manager.c - src/vpn-manager/Makefile.am - src/vpn-manager/nm-vpn-connection.c - src/Makefile.am - - Use consolidated marshallers - - * src/dhcp-manager/nm-dhcp-marshal.list - src/dhcp-manager/nm-dhcp-marshal-main.c - src/supplicant-manager/nm-supplicant-marshal-main.c - src/supplicant-manager/nm-supplicant-marshal.list - src/nm-marshal-main.c - src/nm-marshal.list - src/ppp-manager/nm-ppp-marshal-main.c - src/ppp-manager/nm-ppp-marshal.list - src/vpn-manager/nm-vpn-marshal-main.c - src/vpn-manager/nm-vpn-marshal.list - - Remove - -2007-10-01 Dan Williams - - * include/NetworkManagerVPN.h - - define VPN connection state change reason codes - - * src/vpn-manager/Makefile.am - src/vpn-manager/nm-vpn-marshal.list - src/vpn-manager/nm-vpn-marshal-main.c - - Add marshallers for StateChanged signal - - * introspection/nm-vpn-connection.xml - - New Banner property - - StateChanged signal now includes a 'reason' argument - - * src/vpn-manager/nm-vpn-connection.c - src/vpn-manager/nm-vpn-connection.h - - Add a "Banner" property that contains the returned VPN server login - banner (if any); valid only in the ACTIVATED state - - (nm_vpn_connection_set_state, nm_vpn_connection_disconnect): now takes - a 'reason' argument and emits that reason along with the - state-changed signal - - Fix up calls to nm_vpn_connection_set_state() to include a reason - - (nm_vpn_connection_ip4_config_get): save banner for later - - (nm_vpn_connection_get_banner, get_property, - nm_vpn_connection_class_init): implement Banner property - - * src/vpn-manager/nm-vpn-service.c - - (nm_vpn_service_connections_stop): take a reason argument; copy the - connection list because elements may get added/removed from it - while iterating over the list - - (connection_state_changed): signal now includes the 'reason' argument - - * libnm-glib/nm-vpn-connection.c - libnm-glib/nm-vpn-connection.h - - (nm_vpn_connection_get_banner): new function - - (state_changed_proxy): handle reason argument - -2007-09-28 Tambet Ingo - - * src/nm-manager.c: - * src/nm-manager.h: - Implement device activation through NMManager. - Implement "pending device activation" here - If the connection isn't found, - we try to wait for up to 5 seconds for the connection to be provided. - Add NMConnectionType argument to "connection-added" and "connection-removed" - signals. - (nm_manager_get): Remove. Finally. - - * src/nm-activation-request.c: - * src/nm-activation-request.h: - Remove all the deferred activation code. - - * src/nm-device.c: Remove all the deferred activation code. Once the device - activation is started, it's started. Update the activation virtual function - signature. - - * src/nm-device-interface.c: - * src/nm-device-interface.h: - Device activation now takes only NMActRequest argument. - Don't expose device activation directly on dbus, it's supposed to go through - NMManager now. - - * src/NetworkManagerPolicy.c (nm_policy_device_change_check): Make the code - a bit more compact. - Use the new device activation methods through NMManager. - - * introspection/nm-manager-client.xml: - * introspection/nm-manager.xml: - * libnm-glib/nm-client.c: - * libnm-glib/nm-client.h: - Add device activation method. - - * libnm-glib/nm-device.c: - * libnm-glib/nm-device.h: - * introspection/nm-device.xml: - Remove device activation method. It's done through NMManager now. - - * src/vpn-manager/nm-vpn-manager.c (impl_vpn_manager_connect): Use the shiny - new (nm_manager_get_device_by_path) function, get rid of our own )find_device). - -2007-09-28 Dan Williams - - * libnm-glib/nm-vpn-connection.c - - (nm_vpn_connection_get_state): try to update state if the current - state is UNKNOWN - -2007-09-27 Dan Williams - - Patch from Bill Nottingham - - * src/supplicant-manager/nm-supplicant-config.c - - (ADD_STRING_VAL): use correct length for binary blobs when sending - data to the supplicant - -2007-09-27 Dan Williams - - * src/NetworkManagerSystem.c - - (nm_system_vpn_device_set_from_ip4_config): clean up indentation; - and all address manipulation here should be happening on the - _VPN_ device, not the active device - -2007-09-26 Dan Williams - - * src/nm-manager.c - src/nm-manager.h - src/nm-activation-request.c - src/nm-activation-request.h - - Move the GetSecrets stuff out of the NMManager instance because it - doesn't really need to be there and complicates things - - * src/nm-device.c - - (connection_secrets_failed_cb, device_activation_go): connect to the - connection-secrets-failed signal and deactivate the device if - the GetSecrets call fails - - * src/nm-device-802-11-wireless.c - - (link_timeout_cb, supplicant_connection_timeout_cb, - real_act_stage2_config, real_act_stage4_ip_config_timeout): request - secrets and give correct hints about whether new secrets should be - asked for by the client or not - -2007-09-26 Dan Williams - - * src/vpn-manager/nm-vpn-connection.c - - (nm_vpn_connection_set_state, clear_need_auth, finalize, - connection_secrets_updated_cb, get_secrets_cb): don't need to attach - to the secrets-updated signal of the NMConnection since updating - the secrets is done within the scope of the NMVPNConnection object - already - - (get_connection_secrets): fix an uninialized variable usage error - -2007-09-26 Dan Williams - - * libnm-util/nm-setting.c - - (setting_vpn_properties_update_secrets): implement so VPN secrets - actually get updated when the user enters them - -2007-09-26 Dan Williams - - * libnm-glib/nm-vpn-plugin.c - - (impl_vpn_plugin_need_secrets): fix logic when no secrets are needed - -2007-09-26 Dan Williams - - * include/NetworkManagerVPN.h - - Add a NEED_AUTH state - - * src/vpn-manager/nm-vpn-connection.c - - Implement the NEED_AUTH state. First ask the VPN service plugin if - the connection needs secrets, and if so, then ask the settings - service to fill in the secrets. Then start the connection. - -2007-09-26 Dan Williams - - * src/vpn-manager/nm-vpn-manager.c - - (new_vpn_error, impl_vpn_manager_connect): set errors - -2007-09-26 Dan Williams - - * introspection/nm-vpn-plugin.xml - libnm-glib/nm-vpn-plugin.c - libnm-glib/nm-vpn-plugin.h - - (impl_vpn_plugin_need_secrets): implement a call that should return - the name of the NMSetting in an NMConnection that may require - secrets specific to that VPN plugin - -2007-09-26 Dan Williams - - * src/nm-manager.c - src/nm-manager.h - - (nm_manager_get_connection_secrets): make static, unused outside - the file - - Provide NM_MANAGER_CONNECTION_PROXY_TAG for other users - -2007-09-26 Tambet Ingo - - * libnm-glib/nm-vpn-plugin.c (nm_vpn_plugin_connect): Update the plugin activation - method. - (impl_vpn_plugin_connect): Convert properties hash to NMConnection, activate, and - unreference the connection. - - * introspection/nm-vpn-plugin.xml: Modify the 'Connect' method arguments: instead of - passing properties hash and routes string list, pass NMConnection (in hashed form). - - * src/vpn-manager/nm-vpn-connection.c (nm_vpn_connection_get_routes): Return routes - as GSList, no need to copy stuff around anymore. - (nm_vpn_connection_activate): Update the plugin activation method. - - * src/NetworkManagerSystem.c (nm_system_vpn_device_set_from_ip4_config): Convert - routes argument to GSList. - -2007-09-26 Tambet Ingo - - * src/nm-manager.c (manager_device_state_changed): Listen to device' NEED_AUTH - state and try to get the secrets. - - * src/NetworkManagerPolicy.c (nm_policy_auto_get_best_device): Get the list of - connections from NMManager and let the device to choose the best from the list. - Since the connection list is sorted by system ones first and user ones later, - the devices still prefer system connections like they did before. - (deactivate_old_device): Implement. When a device starts activation, we have a - policy (for now at least) to deactivate any other device that might be either - active or still activating. - - * src/vpn-manager/nm-vpn-manager.c: Add NMManager back to the private structure. - It's set on construction, there will be no other way to access it. - - * src/nm-device-802-11-wireless.c: Don't touch NMManager, NMManager can listen to - device events and drive the device, not the other way around. - - * src/nm-device-802-3-ethernet.c: Ditto. - - * src/nm-device.c (nm_device_get_best_connection): The connections list is now - sent along, pass it on to virtual functions. - - * src/nm-device-interface.c (nm_device_interface_get_iface): Implement. It's static - for now, but should really be public instead of nm_device_get_iface() since iface - is a property of the DeviceInterface, not Device. - (impl_device_activate): Don't touch NMManager! - -2007-09-26 Jürg Billeter - - * initscript/paldo/NetworkManager.in: - * initscript/paldo/NetworkManagerDispatcher.in: - * src/backends/NetworkManagerPaldo.c: (nm_system_enable_loopback), - (nm_system_flush_loopback_routes): update paldo backend - -2007-09-26 Tambet Ingo - - * src/nm-device-802-3-ethernet.c (real_get_best_connection): Don't leak NMManager. - The problem with leaking NMManager is that on shutdown, it doesn't get destroyed, - which means none of the devices get brought down properly, which in turn leaves - DHCP client running. - - * src/nm-device-802-11-wireless.c (real_get_best_connection): Ditto. - (supplicant_connection_timeout_cb): Ditto. - -2007-09-25 Dan Williams - - * src/nm-device.c - - (device_activation_go): small hack to work around race when - activating deferred connections; should solve this in a better way - -2007-09-25 Dan Williams - - * introspection/nm-device.xml - libnm-glib/nm-device.c - libnm-glib/nm-device.h - - Add 'Carrier' property to exported NMDevice objects - - * src/nm-device-interface.h - src/nm-device-interface.c - src/nm-device.c - - Add a 'carrier' property to internal NMDevice objects - -2007-09-25 Dan Williams - - * src/nm-device-802-11-wireless.c - - (ap_auth_enforced): also return the encryption status of the AP so - that callers can differentiate easily between unencrypted APs - and encrypted ones, in addition to whether the AP has an - authenticator - - (link_timeout_cb, supplicant_connection_timeout_cb, - real_act_stage4_ip_config_timeout): handle unencrypted APs better, - previously would request secrets from unencrypted APs at times - -2007-09-25 Dan Williams - - * src/nm-manager.c - - (nm_manager_update_state): new function; updates state and emits - appropriate signals ensuring a state-change signal for the same state - never gets emitted twice in a row. - - (manager_device_state_changed): handle more device state to get a - better picture of the overall NM state - -2007-09-25 Dan Williams - - * libnm-glib/nm-settings.c - libnm-glib/nm-settings.h - - (new_error -> nm_settings_new_error): make public so that subclasses - can use the same error domain. Also pass a valid error code to - g_error_new_literal() so that libdbus doesn't assert when converting - the GError into a DBusError - - (impl_settings_list_connections, impl_connection_settings_get_id, - impl_connection_settings_get_settings, - impl_connection_settings_get_secrets): use new error creator - function - -2007-09-25 Dan Williams - - * src/NetworkManager.c - - (nm_signal_handler, main): don't ignore SIGTERM/SIGINT during startup - -2007-09-25 Dan Williams - - * src/supplicant-manager/nm-supplicant-manager.c - - (poke_supplicant_cb, nm_supplicant_manager_init, - nm_supplicant_manager_dispose, nm_supplicant_manager_name_owner_changed, - nm_supplicant_manager_startup): when the supplicant isn't running, - try to start it periodically via system bus activation. Fixes - a problem where if wpa_supplicant goes away, NM gets stuck waiting - for the supplicant to come back - -2007-09-25 Dan Williams - - Ensure that old activation requests are forgotten about; previously - hitting Cancel in the password dialog would deactivate whatever device - that password was requested for, even if that wasn't the currently - activating connection. - - * src/nm-manager.c - src/nm-manager.h - - (nm_manager_get_connection_secrets): track the pending call - object so it can be canceled later if needed - - (nm_manager_cancel_get_connection_secrets): cancel a pending - GetSecrets call for a particular connection - - * src/nm-activation-request.c - - (dispose): cancel any outstanding GetSecrets calls on the - connection - -2007-09-25 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): handle devices that have a - deferred activation. These devices are not really active _yet_, - but need to be treated as such here. Don't interrupt them - automatically. - - * src/nm-device-interface.c - - (impl_device_activate): handle devices that have a deferred activation - like activating or active devices. When multiple active devices - get committed, the device shouldn't be deactivated until the - connection details are available to avoid DoS and such. Currently, - any active, activating, or deferred activation device is deactivated - here before starting the new activation request. - -2007-09-25 Dan Williams - - Properly re-query secrets from the settings daemon when stuff fails. - - * src/nm-device-802-11-wireless.c - - (ap_auth_enforced): handle static WEP correctly here by differentiating - between Shared Key and Open System auth modes - - (link_timeout_cb, supplicant_connection_timeout_cb, - real_act_stage4_ip_config_timeout): clear existing secrets and - request new ones when something fails due to a suspected wrong key - - (real_act_stage2_config): fix for new request_new argument to - nm_manager_get_connection_secrets() - - * src/nm-manager.c - src/nm-manager.h - - (nm_manager_get_connection_secrets): return error status; pass - new request_new argument on to the settings daemon - - * introspection/nm-settings-connection.xml - - New 'request_new' argument to the GetSecrets call that hints to the - settings daemon to ask the user for completely new secrets - - * libnm-glib/nm-settings.c - libnm-glib/nm-settings.h - - (impl_connection_settings_get_secrets): handle new 'request_new' - argument - -2007-09-25 Dan Williams - - * libnm-util/nm-connection.c - libnm-util/nm-connection.h - - (nm_connection_clear_secrets): new function; clear secrets out of - each NMSetting in an NMConnection - - * libnm-util/nm-setting.h - libnm-util/nm-setting.c - - (nm_setting_clear_secrets, default_setting_clear_secrets): clear - secrets out of an NMSetting - - (nm_setting_connection_new, nm_setting_ip4_config_new, - nm_setting_wired_new, nm_setting_wireless_new, - nm_setting_wireless_security_new, nm_setting_ppp_new, - nm_setting_vpn_new, nm_setting_vpn_properties_new): set clear_secrets - to default handler default_setting_clear_secrets() - -2007-09-25 Dan Williams - - * src/nm-activation-request.c - src/nm-activation-request.h - - (nm_act_request_is_deferred): new function - -2007-09-24 Dan Williams - - * src/nm-device-802-11-wireless.c - - (activation_success_handler): update signal strength immediately - after activation - -2007-09-24 Dan Williams - - * libnm-util/nm-setting.c - - (verify_wep_key): 40-bit WEP keys are 10 bytes long, not 13 - -2007-09-24 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_auto_get_best_device): don't interrupt activation of a - device by deactivating it because it doesn't have a "best connection". - Since autoconnect=False connections aren't automatically chosen, - NM would interrupt activation of such a connection because it - would never be "best" due to autoconnect=False. - -2007-09-24 Dan Williams - - * src/nm-manager.c - - (nm_manager_get_connection_secrets): Add a long timeout so the user - actually has some time to enter a key before the GetSecrets call - times out - -2007-09-24 Dan Williams - - * introspection/nm-manager.xml - src/nm-manager.c - - (impl_manager_legacy_state): fix 'state' method call return value - -2007-09-24 Matthias Clasen - - * test/Makefile.am: Install nm-tool - -2007-09-24 Dan Williams - - Patch from Ross Burton - - * test/nm-tool.c - callouts/nm-dhcp-client-action.c - src/nm-netlink.c - src/vpn-manager/nm-vpn-connection.c - libnm-glib/libnm-glib-test.c - - warning fixes - -2007-09-24 Dan Williams - - * libnm-util/nm-utils.h - libnm-util/nm-utils.c - - (nm_dbus_send_with_callback_replied, nm_dbus_send_with_callback): - remove, unused - -2007-09-23 Dan Williams - - * vpn-daemons/vpnc/properties/nm-vpnc.c - - Update for new VPN properties API bits; instead of passing around - a lot of random things, everything goes into the NMConnection - object. - -2007-09-23 Dan Williams - - * libnm-util/nm-setting.c - - Correctly dispose of settings objects if creating them from a hash - table fails - -2007-09-23 Dan Williams - - * libnm-util/nm-setting.c - - (property_value_destroy, nm_setting_vpn_properties_new): initialize - the hash table in a standard manner. Clients of libnm-util should - only call g_hash_table_remove_all(), never destroy the hash table - and recreate it. - -2007-09-22 Dan Williams - - * src/nm-device-802-11-wireless.c - - (real_bring_up): update signal strength every 6 seconds, not 2. No - real reason to do it so often, and reduces wakeups for clients. - -2007-09-21 Dan Williams - - * src/nm-device-802-11-wireless.c - - (build_supplicant_config): wpa_supplicant requires the option - key_mgmt=NONE for unencrypted networks - - (real_act_stage2_config): clarify log message on activation - -2007-09-21 Dan Williams - - * test/nm-supplicant-test.c - test/Makefile.am - - Remove supplicant test binary; no longer applicable - -2007-09-21 Dan Williams - - * src/supplicant-manager/nm-supplicant-manager.c - - (nm_supplicant_manager_init): poke the supplicant at startup to - activate it on the system bus - -2007-09-20 Dan Williams - - * initscript/RedHat/NetworkManager.in - - dhcdbd is no longer used, so don't try to start it from the initscripts - -2007-09-20 Dan Williams - - * src/nm-device.c - - (nm_device_is_activating): work around a race between auto-activation - and the user activating the same device that is being auto-activated - -2007-09-20 Dan Williams - - * src/nm-device-interface.c - - (impl_device_activate): until multiple active device support lands, - ensure only one device can be active at a time - -2007-09-20 Dan Williams - - * src/supplicant-manager/nm-supplicant-config.c - src/supplicant-manager/nm-supplicant-config.h - - (nm_supplicant_config_add_option): hide secrets from system logs - -2007-09-20 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): re-enable the wireless device change - checking code; insted of checking for SSIDs, check for the same - connection instead - -2007-09-20 Dan Williams - - * src/nm-device-802-11-wireless.c - - (supplicant_iface_connection_state_cb_handler): don't use the card's - composite link state when determining when to start the disconnection - timer; that link state is already based on the supplicant interface's - status which is exactly what's already being examined, plus the link - state is a conglomeration of various things that we don't want here - -2007-09-20 Dan Williams - - * libnm-glib/nm-access-point.c - - (handle_property_changed): strength is a UCHAR - -2007-09-20 Dan Williams - - * src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_add_setting_wireless_security): uppercase - string list keywords too since that's what wpa_supplicant wants - -2007-09-20 Dan Williams - - * libnm-util/nm-setting.c - - (convert_strv_to_slist): dupe the values in the list because since - the list is a boxed value, it'll get destroyed when it's container - (like a hash table or whatever) gets destroyed - -2007-09-20 Tambet Ingo - - * libnm-util/nm-setting.h: Change the type of NMSettingVPN->routes to - GSList. - - * libnm-util/nm-setting.c (setting_vpn_destroy): Free routes too. - - * src/nm-manager.c (connection_get_settings_cb): No need to use weakref, - just use (g_object_set_data_full). - - * src/vpn-manager/nm-vpn-connection.c (nm_vpn_connection_get_routes): Now - that NMSettingVPN->routes is a GSList, convert it to char **. - (nm_vpn_connection_ip4_config_get): Free routes when done. - (nm_vpn_connection_activate): Ditto. - - * src/nm-device-802-11-wireless.c (real_connection_secrets_updated) - (real_act_stage2_config): Use defined setting names. - -2007-09-20 Dan Williams - - * src/nm-device-802-11-wireless.c - src/nm-manager.c - src/nm-manager.h - - Pass an NMDeviceInterface into nm_manager_get_connection_secrets() - so that the device can be deactivated if secrets are wrong - -2007-09-20 Dan Williams - - * introspection/nm-settings-connection.xml - libnm-glib/nm-settings.c - libnm-glib/nm-settings.h - - Make GetSecrets asynchronous on the server side - -2007-09-20 Dan Williams - - * src/nm-manager.h - src/nm-device.c - - (nm_device_activate): actually check if a given connection - exists before assuming it doesn't - -2007-09-20 Tambet Ingo - - * libnm-util/nm-connection.c (register_default_creators): Use defined - setting names. Register NMSettingVPN and NMSettingVPNProperties. - - * libnm-util/nm-setting.c: Define property name strings, use them. - Implement NMSettingVPN and NMSettingVPNProperties settings. - Implement NM_S_TYPE_GVALUE_HASH. - (nm_setting_populate_from_hash): Handle NM_S_TYPE_GVALUE_HASH. - (setting_connection_verify): Rename 'devtype' property to 'type'. - - * introspection/nm-vpn-manager.xml: Use NMConnection for VPN service - properties. - - * src/vpn-manager/nm-vpn-service.c: Ditto. - - * src/vpn-manager/nm-vpn-connection.c: Ditto. - - * src/vpn-manager/nm-vpn-manager.c (nm_vpn_manager_connect): Ditto. - (nm_vpn_manager_new): Remove NMManager argument, it's easy enough to get. - - * src/nm-device-802-11-wireless.c (find_best_connection): Use defined setting - names. NMSettingConnection->devtype got renamed to 'type'. - - * src/nm-device-802-3-ethernet.c (find_best_connection): - (real_get_best_connection): Ditto. - - * src/NetworkManager.c (main): Update the vpn manager creation arguments. - - * libnm-glib/nm-vpn-manager.[ch]: Update. - -2007-09-19 Dan Williams - - * src/NetworkManagerAP.c - src/NetworkManagerAP.h - introspection/nm-access-point.xml - - Change strength-changed signal into a properties-changed signal - for all properties, not just strength. Export that signal over dbus - so listeners don't have to poll NM for changes. - - (nm_ap_export_to_dbus, nm_ap_new): not every NMAccessPoint should - get exported over D-Bus, so break up the logic and let other bits - decided when to export the AP - - (nm_ap_new_from_ap): remove, unused - - * src/nm-device-802-11-wireless.c - - (merge_scanned_ap): only export APs that are actually on the device - list, not every AP created internally - - * libnm-glib/nm-access-point.c - libnm-glib/nm-access-point.h - - Cache properties internally and only hit DBus when needed. Get - property updates from NM signals - -2007-09-16 Dan Williams - - * libnm-util/nm-connection.c - libnm-util/nm-connection.h - - (nm_connection_for_each_setting_value): new function; iterate over - each setting's value and call a user-provided function with details - about that value - - * libnm-util/nm-setting.c - libnm-util/nm-setting.h - - (nm_setting_enumerate_values): new function; enumerate the values - of a specific NMSetting subclass for a user-provided function with - details about that value - - Change wep_tx_keyidx to a uint32 - - Create settings value tables for each setting defining their type, - key name, offset into the NMSetting subclass' structure, and whether - they are required and/or a secret - - (nm_setting_populate_from_hash): generic function to populate an - NMSetting from a GHash table, make all settings use it - - (nm_setting_hash): generic function to derive a GHashTable from - an NMSetting object, make all settings use it - -2007-09-14 Dan Williams - - Remove unused stuff in libnm-util - - * configure.in - libnm-util/Makefile.am - libnm-util/cipher-private.h - libnm-util/cipher-wep-ascii.c - libnm-util/cipher-wep-ascii.h - libnm-util/cipher-wep-hex.c - libnm-util/cipher-wep-hex.h - libnm-util/cipher-wep-passphrase.c - libnm-util/cipher-wep-passphrase.h - libnm-util/cipher-wpa-psk-hex.c - libnm-util/cipher-wpa-psk-hex.h - libnm-util/cipher-wpa-psk-passphrase.c - libnm-util/cipher-wpa-psk-passphrase.h - libnm-util/cipher.c - libnm-util/cipher.h - libnm-util/dbus-helpers.c - libnm-util/dbus-helpers.h - libnm-util/gnome-keyring-md5.c - libnm-util/gnome-keyring-md5.h - libnm-util/sha1.c - libnm-util/sha1.h - src/nm-device-802-11-wireless.c - test/libnm-util/Makefile.am - test/libnm-util/test-ciphers.c - test/libnm-util/test-dbus-helpers.c - test/libnm-util/test-inputs.h - - Removed - -2007-09-14 Dan Williams - - * libnm-util/dbus-method-dispatcher.c - libnm-util/dbus-method-dispatcher.h - - Remove, unused - -2007-09-14 Dan Williams - - Implement deferred activation support in the device class. - - * src/nm-device-interface.c - src/nm-device-interface.h - - (nm_device_interface_activate): take more arguments to support - deferred activation; callers must pass one of (connection) OR - (service_name, connection_path) - - (impl_device_activate): connection validation is punted to the device - to be able to handle deferred activation. Yes, this means errors - don't get returned from the Activate() dbus call, and yes, that - should be fixed somehow later. - - * src/nm-device.c - src/nm-device.h - - (clear_act_request): clear additional deferred activation stuff too - - (deferred_activation_timeout_cb): new function; clean up when - deferred activation times out. - - (deferred_activation_start_cb): new function; when the connection - finally becomes available, start device activation - - (nm_device_activate): attach to the right signals of the activation - request if we need to defer activation until the connection is valid - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): update for additional arguments - required for nm_device_interface_activate(). Pass NULL for these - though because this function already knows exactly which - NMConnection to use - -2007-09-14 Dan Williams - - Implement deferred activation handling in the NMActRequest class. When a - client wants to activate a device but must create the NMConnection details - on the fly, there likely hasn't been enough time yet for NM to receive the - new connection signal and grab all the connection details. So the - activation is deferred (and bounded by a timer) for a while, and if the - connection appears within the window, it is activated. - - * src/nm-activation-request.c - src/nm-activation-request.h - - (nm_act_request_class_init): two new signals to support deferred - activation, to allow the listener to handle both timeout and success - - (nm_act_request_new_deferred): new function, starts the deferred - activation timeout handler and listens to the NMManager for - new-connection signals to notice when the connection comes in - -2007-09-14 Dan Williams - - * src/nm-manager.h - src/nm-manager.c - - (nm_manager_get_connection_service_name, - nm_manager_get_connection_dbus_path): get details about a connection - known internally by the NMManager - - (nm_manager_class_init): fix connection add/remove signal marshalers - because NMConnection is now a GObject subclass - - Use constant for the gobject data tag used on NMConnection objects for - storing the associated DBusGProxy - -2007-09-14 Dan Williams - - * utils/Makefile.am - utils/nm-utils.c - utils/nm-utils.h - src/supplicant-manager/Makefile.am - src/dhcp-manager/Makefile.am - src/backends/Makefile.am - src/named-manager/Makefile.am - src/ppp-manager/Makefile.am - src/vpn-manager/Makefile.am - test/libnm-util/Makefile.am - test/test-common/Makefile.am - - Remove utils/; it was unused - -2007-09-13 Dan Williams - - * libnm-glib/nm-vpn-manager.h - libnm-glib/nm-vpn-manager.c - - (nm_vpn_manager_connect): take routes as a GSList, not a char ** - -2007-09-13 Dan Williams - - * src/nm-device-802-3-ethernet.c - - (real_bring_down, nm_device_802_3_ethernet_dispose): disconnect from - netlink monitor carrier signals on dispose, not bring down. The - carrier signals should be handled over the entire lifetime of the - device anyway, not created/destroyed on up or down. - -2007-09-13 Dan Williams - - * libnm-glib/nm-device.c - libnm-glib/nm-device.h - - (nm_device_activate): take a connection object path rather than an - NMConnection because NMConnection isn't exported over D-Bus and - therefore it dbus-glib can't automatically get an object path from it - -2007-09-13 Dan Williams - - * libnm-util/nm-setting.c - - (nm_setting_wired_new): set autonegotiate to TRUE by default - -2007-09-13 Tambet Ingo - - * autogen.sh: NetworkManagerMain.h is gone, check for NetworkManager.c. - -2007-09-12 Tambet Ingo - - * src/vpn-manager/nm-vpn-connection.[ch]: - * src/vpn-manager/nm-vpn-manager.[ch]: - * src/vpn-manager/nm-vpn-service.[ch]: Rewrite the vpn handling code. Using - dbus-glib, GObjects, signals etc. - - * libnm-glib/nm-vpn-manager.[ch]: - * libnm-glib/nm-vpn-connection.[ch]: Now that the NM implementation changed - so much, rewrite these too. - - * libnm-glib/Makefile.am: Add new files to build, build new binding files for - the new introspection files. - - * libnm-glib/nm-client.[ch]: Remove all VPN related stuff from here. - - * libnm-glib/nm-dbus-utils.[ch]: Renamed from nm-utils.[ch] that was shadowing - the header with the same name from libnm-utils. - - * libnm-glib/nm-vpn-plugin.[ch]: Implement. - - * libnm-util/Makefile.am: Add nm-utils.[ch] to build. - - * introspection/nm-vpn-plugin.xml: Implement. - - * introspection/nm-vpn-connection.xml: Implement. - - * introspection/nm-vpn-manager.xml: Implement. - - * src/NetworkManagerSystem.c (nm_system_vpn_device_set_from_ip4_config): Remove - the named manager argument, it can just as easily get it as the caller. - (nm_system_vpn_device_unset_from_ip4_config): Ditto. - - * src/vpn-manager/nm-dbus-vpn.[ch]: Remove. - - * src/nm-dbus-manager.h: Fix up the name_owner signal signature. - - * src/dhcp-manager/nm-dhcp-manager.c (garray_to_string): Remove, use one from - libnm-utils. - - * libnm-util/nm-connection.c: Ditto. - - * src/NetworkManagerMain.h: Remove, it's finally empty. - - * configure.in: Remove utils/ from build. - - * include/NetworkManagerVPN.h: Add some more defines to reduce the amount - of hard-coded strings. - - * utils/: Move it over to libnm-util. - - * test/Makefile.am: Link against libnm-util now that util/ is gone. - - * dispatcher-daemon/Makefile.am: Ditto. - - * src/Makefile.am: Ditto. - -2007-09-12 Dan Williams - - Wireless connections can be made with config data from the applet now. - - Yay. - - * src/supplicant-manager/nm-supplicant-config.h - src/supplicant-manager/nm-supplicant-config.c - - (nm_supplicant_config_new): kill unused init parameter 'iface' - - (nm_supplicant_config_add_setting_wireless, - nm_supplicant_config_add_setting_wireless_security): new functions; - add key/value pairs from the settings objects to the supplicant - config - - * src/nm-device-802-11-wireless.c - - (cull_scan_list): fix check to not prune currently associated AP - - (build_supplicant_config, real_act_stage2_config): call the functions - of the NMSupplicantConfig that parse settings objects rather than - doing it manually here - -2007-09-12 Dan Williams - - * src/supplicant-manager/nm-supplicant-interface.c - src/supplicant-manager/nm-supplicant-marshal.list - - (nm_supplicant_interface_class_init): fix stupid mistake, the - "connection-error" signal arguments should be STRING not CHAR - -2007-09-12 Dan Williams - - * src/NetworkManagerUtils.c - src/NetworkManagerUtils.h - - (nm_utils_hexstr2bin): new function - -2007-09-11 Dan Williams - - * src/nm-manager.c - - (connection_get_settings_cb): emit connection-added signal - - (connection_removed_cb): uncomment bits for system settings service, - send connection-removed when appropriate - - (nm_manager_get_connection_secrets, get_secrets_cb): don't clobber - the stack by trying to g_object_set_data() on something that's - not a GObject; handle case where settings service returns - empty settings hash table - -2007-09-11 Dan Williams - - * src/NetworkManagerPolicy.c - - (connection_added, connection_removed): trigger device change checks - on connection changes - -2007-09-11 Dan Williams - - * src/nm-activation-request.c - - (connection_secrets_updated_cb): fix c&p error in signal emission - -2007-09-11 Dan Williams - - * src/nm-device-802-11-wireless.c - - (real_connection_secrets_updated): fix erroneous check - -2007-09-11 Dan Williams - - * introspection/nm-device.xml - libnm-glib/nm-device.c - libnm-glib/nm-device.c - - Fix Activate call argument borkage; Activate takes 3 arguments - -2007-09-11 Dan Williams - - * libnm-glib/nm-access-point.c - libnm-glib/nm-access-point.c - - (nm_access_point_get_frequency): now returns guint32 to match - property change on 2007-09-10 - -2007-09-11 Dan Williams - - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_new): s/index/idx, stupid system header - somewhere defines 'index' and I missed this one when I fixed the - shadow declaration errors earlier - -2007-09-11 Dan Williams - - * libnm-util/nm-connection.c - - (nm_connection_update_secrets, need_secrets_check): move - 802-11-wireless-security need_secrets checks to the setting object - itself, where it belongs - - * libnm-util/nm-setting.c - libnm-util/nm-setting.h - - (nm_setting_need_secrets): new function - - (setting_wireless_security_verify, - nm_setting_wireless_security_new_from_hash): make 'key-mgmt' required - - (setting_wireless_security_need_secrets): mostly copy code over - from nm-connection.c - -2007-09-11 Dan Williams - - * libnm-util/nm-setting.c - libnm-util/nm-setting.h - - (nm_setting_update_secrets): new function; add a virtual function that - subclasses can implement to update their secrets - - (setting_wireless_security_update_secrets): implement that function - for the 802-11-wireless-security subclass - - * libnm-util/nm-connection.c - libnm-util/nm-connection.h - - (nm_connection_update_secrets): update secrets for a Setting and - emit a signal on success - - * src/nm-manager.c - src/nm-manager.h - src/nm-marshal.list - - (connection_get_settings_cb): enable system settings bits - - (nm_manager_get_connection_secrets, get_secrets_cb): add function - to request secrets from the settings dbus service and to - push those secrets to the NMConnection itself - - * src/nm-activation-request.c - src/nm-activation-request.h - - Attach to the 'secrets-updated' signal of the NMConnection that's - currently being activated, and proxy that signal to other listeners. - Goes through the activation request because the activation request - is the thing that manages the lifetime of the NMConnection that's - being activated. - - * src/nm-device-802-11-wireless.c - - (real_connection_secrets_updated): implement the connection secrets - updated notification and restart activation when secrets are - received - - (real_act_stage2_config): request secrets from the settings dbus - service if secrets are needed - - * src/nm-device.c - src/nm-device.h - - (clear_act_request, nm_device_activation_cancel, - nm_device_deactivate_quickly, nm_device_dispose): consolidate places - where the activation request is cleared - - (nm_device_activate, connection_secrets_updated_cb): attach to the - updated secrets signal of activation request and add a function - that subclasses can override to handle it easily - -2007-09-11 Tambet Ingo - - * src/backends/NetworkManagerSuSE.c: Fix a build issue caused by the - removal of NetworkManagerAPList. - -2007-09-10 Dan Williams - - * src/NetworkManagerAP.c - src/NetworkManagerAP.h - introspection/nm-access-point.xml - - Change 'freq' property to a guint32 instead of a double since we - weren't using the floating point bits anyway - -2007-09-10 Dan Williams - - * NetworkManagerAP.c - NetworkManagerAP.h - NetworkManagerPolicy.c - NetworkManagerSystem.c - NetworkManagerUtils.c - NetworkManagerUtils.h - nm-device-802-11-wireless.c - nm-device-802-3-ethernet.c - nm-hal-manager.c - nm-manager.c - vpn-manager/nm-dbus-vpn.c - - Warning fixes; casts and removal of unused variables - -2007-09-10 Dan Williams - - * include/NetworkManager.h - - Kill NMNetworkType; AP types don't matter any more - - * src/NetworkManagerAPList.c - src/NetworkManagerAPList.h - src/Makefile.am - - Kill; NMAccessPointList has outlived it's usefulness - - * src/NetworkManagerAP.c - src/NetworkManagerAP.h - - (match_cipher, security_compatible, nm_ap_check_compatible): new - functions; check if an NMConnection object is compatible with the - settings of this AP - - (freq_to_channel, channel_to_freq): utility functions for - channel <-> frequency conversion - - * src/nm-device.c - src/nm-device.h - - (nm_device_get_best_connection): pass the specific object around - (which might be the object path of a specific AP to connect to). - The get_best_connection() call should populate this on return - if needed (wireless does). - - * src/nm-device-802-3-ethernet.c - - (real_get_best_connection): handle specific_object argument - - * src/NetworkManager.c - src/NetworkManagerMain.h - - Remove unused includes - - * src/nm-device-802-11-wireless.c - src/nm-device-802-11-wireless.h - - Convert the ap_list into a GSList from an NMAccessPointList - - No need for caching the 'activation_ap' since this is now determined - from the specific_object of the activation request, which is - populated from the get_best_connection() call or from a user request - - (nm_device_802_11_wireless_update_bssid): fix warning - - (get_wireless_capabilities): fix error message format arguments - - (nm_device_802_11_wireless_copy_allowed_to_dev_list): remove, unused - - (find_best_connection, real_get_best_connection): implement - - (ap_list_get_ap_by_ssid, nm_device_802_11_wireless_ap_list_print): - move here from NetworkManagerAPList - - (ap_need_secrets): remove; moved to nm-connection.c where it belongs - - (real_act_stage1_prepare): just ensure an AP exists, connection is - already verified earlier - - (real_act_stage2_config): use nm_connection_need_secrets() - - * src/NetworkManagerPolicy.c - - (nm_policy_auto_get_best_device): handle specific objects - - (create_connection): remove; automatic connection creation functionality - is handled by the Connection objects - - (nm_policy_device_change_check): handle specific_object - - * libnm-util/nm-connection.c - - (wireless_sec_need_secrets, nm_connection_need_secrets): implement - -2007-09-10 Dan Williams - - * src/nm-manager.c - - (query_connections): fix uninitialized variable problem that caused - segfault - - (nm_manager_add_device): take devices down on startup so that we can - be assured that nm_device_is_up() won't short-circuit the init - process. Hack until the is_up check gets split into two pieces - that aren't behaviorally confusing. - -2007-09-09 Dan Williams - - * introspection/nm-device.xml - - The 'Activate' method now takes 3 arguments, a service name for the - settings service (user or system), the object path of the connection - to activate, and the specific object to activate, if any - - * src/nm-device-interface.c - - (nm_device_interface_error_quark, nm_device_interface_error_get_type): - Add error bits - - (impl_device_activate): adapt to new Activate arguments; validate - the service name and get the Connection object from the NMManager - before starting to activate the device with the specified connection - - * src/nm-device-802-3-ethernet.c - - (real_get_best_connection): find the best connection, or create a - default one if no existing connections can be used - - * src/NetworkManagerPolicy.c - - (nm_policy_auto_get_best_device): Get the device's best connection - and only pick the device if it has one - - (nm_policy_device_change_check): disable wireless bits for now until - wireless get_best_connection() can be implemented (replacing "best_ap"); - don't create a default connection here as the device subclass will do - that if needed - - * src/nm-manager.h - src/nm-manager.c - - (nm_manager_get): make NMManager a singleton and expose the getter - internally - - Rework internal NMManager connection handling to use the same - routines for both the system and user settings services. Most calls - take a new NMConnectionType argument specifying either system or user - connections - - (nm_manager_get_connection_by_object_path): new function; get a - connection keyed on its object path - - * src/NetworkManager.c - - (main): use nm_manager_get() - -2007-09-09 Dan Williams - - * src/nm-device.h - src/nm-device.c - - (nm_device_get_best_connection): new function; get best connection - for the device at that time - -2007-09-09 Dan Williams - - * src/nm-device-interface.h - - Add NMDeviceInterfaceError with an UnknownConnection error - -2007-09-09 Dan Williams - - Stupid mistake on my part; object path and interface for settings service - and connection objects can be the same, only the service name must be - different for the system and user settings services. - - * include/NetworkManager.h - src/nm-manager.c - introspection/nm-settings-connection.xml - introspection/nm-settings.xml - libnm-glib/nm-settings.c - - (nm_connection_settings_init, query_user_connections, - new_connection_cb): Unify NetworkManagerSettings and Connection - interface name and object path - -2007-09-06 Dan Williams - - * libnm-glib/nm-object.c - - (nm_object_get_string_property, nm_object_get_object_path_property, - nm_object_get_int_property, nm_object_get_uint_property, - nm_object_get_boolean_property, nm_object_get_byte_property, - nm_object_get_double_property, nm_object_get_byte_array_property): - clear GValues after copying their contents, fixes memory leaks - after every property access because dbus-glib copies the values - from the DBusMessage into the GValue already. - -2007-09-06 Dan Williams - - * introspection/nm-access-point.xml - - Fix WpaFlags and RsnFlags property names to be what dbus-glib expects - them to be. There's some magic property name parsing going on in - dbus-glib that breaks up property names based on studly-caps and - puts - between words. - - * libnm-glib/nm-access-point.c - - (nm_access_point_get_wpa_flags, nm_access_point_get_rsn_flags): - Fix property names - -2007-09-06 Dan Williams - - * src/nm-manager.c - - (nm_manager_user_connections_destroy): clear the user connections hash - table, don't destroy it - - (finalize): only destroy the hash table on NMManager finalization - -2007-09-02 Dan Williams - - * include/NetworkManager.h - libnm-glib/nm-settings.c - - defines for the user settings daemon D-Bus bits - - * src/NetworkManager.c - - Remove stuff that referred to the old NetworkManagerInfo service - - * src/vpn-manager/nm-dbus-vpn.h - - Move old NMI defines to the only place they are used still - - * libnm-util/nm-connection.c - libnm-util/nm-connection.h - src/nm-activation-request.c - - Make NMConnection a GObject subclass so we can do spiffy stuff with it - - * src/nm-manager.c - src/nm-manager.h - - Get connections and their settings from the user settings daemon - at the appropriate times - -2007-09-02 Dan Williams - - * libnm-util/nm-setting.c - - (nm_settings_verify): correct setting name is 'connection', not 'info' - - (setting_wireless_hash): set the right value on the item - -2007-09-02 Dan Williams - - * test/Makefile.am - test/nminfotest.c - - Remove, no longer useful - -2007-08-30 Dan Williams - - * src/Makefile.am - src/NetworkManagerDbus.c - src/NetworkManagerDbus.h - src/vpn-manager/nm-dbus-vpn.c - - Remove, no longer necessary. Move last bits to the only place its - used, in nm-dbus-vpn.c - - * src/NetworkManagerAPList.c - src/nm-device.c - src/NetworkManager.c - src/nm-device-802-11-wireless.c - src/vpn-manager/nm-vpn-manager.c - src/vpn-manager/nm-vpn-service.c - src/NetworkManagerPolicy.c - src/nm-manager.c - - Remove usage of NetworkManagerDbus.h, and kill the obfuscation - that was message_is_error() - -2007-08-30 Dan Williams - - * libnm-util/sha1.c - - Include config.h to get defines for endiannes (gnome.org #420216) - -2007-08-30 Dan Williams - - Patch from Philip Withnall - - * src/ppp-manager/Makefile.am - - use -fPIC (gnome.org #471825) - -2007-08-29 Dan Williams - - * include/NetworkManager.h - - Keep NMConnection object path in sync - - * libnm-glib/nm-settings.c - libnm-glib/nm-settings.h - - Break D-Bus object registration out of the init function, because - every object that's exported over D-Bus needs to use the _same_ - DBusConnection. Otherwise, each object would get a different object - path tree and wouldn't be callable. - -2007-08-29 Dan Williams - - * libnm-util/nm-setting.h - libnm-util/nm-setting.c - libnm-util/nm-connection.c - src/NetworkManagerPolicy.c - - 'info' settings object should be 'connection' says the spec - at NetworkManagerConfigurationSpecification - -2007-08-29 Dan Williams - - * libnm-glib/nm-settings.c - libnm-glib/nm-settings.h - - make the dbus path a property of the object, and autogenerate it. - It can't be composed of the 'id' field because that's not available - yet during the GObject creation in nm_connection_settings_init() - -2007-08-29 Dan Williams - - * introspection/nm-settings-connection.xml - introspection/nm-settings.xml - - Service name -> NetworkManagerUserSettings because two services - can't share part of the same path. I'm not really sure how we'll use - the same code with the system-settings daemon... - -2007-08-28 Dan Williams - - * src/nm-device-interface.c - src/nm-device-interface.h - - Kill one more bit of NMData - -2007-08-28 Dan Williams - - * src/NetworkManagerSystem.h - src/nm-device.c - src/nm-device.h - src/nm-hal-manager.c - src/NetworkManager.c - src/nm-device-802-11-wireless.c - src/nm-hal-manager.h - src/nm-device-802-3-ethernet.c - src/vpn-manager/nm-vpn-service.h - src/vpn-manager/nm-vpn-manager.c - src/vpn-manager/nm-vpn-manager.h - src/vpn-manager/nm-vpn-service.c - src/nm-device-802-11-wireless.h - src/NetworkManagerMain.h - src/nm-device-802-3-ethernet.h - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerFrugalware.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerSuSE.c - src/backends/NetworkManagerGeneric.h - src/backends/NetworkManagerDebian.c - - Kill NMData - -2007-08-28 Dan Williams - - * src/NetworkManagerMain.h - src/nm-device-802-11-wireless.c - src/NetworkManager.c - - Remove invalid AP list from NMData; need to rework this somewhat, but - for now we should set the 'invalid' property on individual APs, and when - we need to invalidate a whole ESS, set the 'invalid' on every member of - that ESS - -2007-08-28 Dan Williams - - * src/NetworkManagerAP.c - src/NetworkManagerAP.h - - Remove 'fallback' tag, to be replaced by NMConnection/NMSettings - 'autoconnect' property instead - - * src/NetworkManager.c - src/NetworkManagerMain.h - src/NetworkManagerPolicy.c - src/NetworkManagerPolicy.h - - Remove the 'allowed_ap_list', which should be replaced by - NMConnection/NMSettings instead, since _those_ are the allowed - things that NM can connect to - - * src/nm-device-802-11-wireless.c - - Remove both allowed_ap_list usage and 'fallback' checking - -2007-08-28 Dan Williams - - * src/nm-device.c - src/named-manager/nm-named-manager.c - src/named-manager/nm-named-manager.h - src/NetworkManager.c - src/vpn-manager/nm-vpn-manager.c - src/NetworkManagerMain.h - src/NetworkManagerSystem.c - - Remove the named-manager object from NMData structure in preparation - for NMData's timely death. Make the NMNamedManager the singleton that - it really is - -2007-08-28 Dan Williams - - Remove NMAPSecurity objects, they are replaced with flags on the APs for - each AP's capabilities, and by NMConnection/NMSettings objects for user - defined connections. - - * include/NetworkManager.h - - Redefine 802.11 security properties. There are now device capabilities - and AP flags and AP security flags. It was way to unclear before. - - * src/Makefile.am - src/nm-ap-security-leap.h - src/nm-ap-security-leap.c - src/nm-ap-security-wpa-eap.c - src/nm-ap-security-wpa-eap.h - src/nm-ap-security-private.h - src/nm-ap-security-wpa-psk.c - src/nm-ap-security-wpa-psk.h - src/nm-ap-security-wep.c - src/nm-ap-security-wep.h - src/nm-ap-security.c - src/nm-ap-security.h - - Removed, to be replaced with NMConnection/NMSettings objects - - * src/nm-dbus-nmi.c - src/nm-dbus-nmi.h - - Removed, to be replaced by code that talks to the new info daemon - interface and gets NMConnection/NMSettings objects - - * src/backends/NetworkManagerSuSE.c - - Remove usage of NMAPSecurity; should be replaced by a system-level - info-daemon that does the same thing but talks the new info-daemon - D-Bus interface - - * src/NetworkManagerAP.h - src/NetworkManagerAP.c - src/NetworkManagerAPList.c - libnm-glib/libnm-glib-test.c - - Remove usage of NMAPSecurity objects and adjust to new flags for - WPA/RSN - - * libnm-glib/nm-access-point.c - libnm-glib/nm-access-point.h - introspection/nm-access-point.xml - test/nm-tool.c - - Adjust to new flags for AP security - - * utils/nm-utils.c - utils/nm-utils.h - src/vpn-manager/nm-dbus-vpn.c - - Remove D-Bus pending call stuff from nm-utils and put it in the VPN - stuff which is the only place it's used - - * src/nm-device-interface.c - src/nm-device-interface.h - introspection/nm-device.xml - src/nm-activation-request.c - src/nm-activation-request.h - src/nm-device.c - - Add a new 'specific_object' argument that hints to NM what actual - AP or other device-specific thing the connection should apply to. - NMConnection objects can apply to more than one actual device/AP. - - * libnm-util/nm-connection.c - * libnm-util/nm-connection.h - - Add 'have_secrets" call stubs - - * libnm-util/cipher.h - - Move NM_AUTH_TYPE_* defines here for now - - * src/nm-device-802-11-wireless.c - - Remove usage of NMAPSecurity, to be replaced with NMConnection/ - NMSettings objects - - * src/NetworkManagerDbus.c - * src/NetworkManagerPolicy.c - - Remove usage of update_allowed_networks, should be pushing data in - a different manner - -2007-08-27 Tambet Ingo - - * src/nm-manager.c (impl_manager_get_devices): Duplicate the device path, - dbus-glib frees it when the call is done. - -2007-08-26 Dan Williams - - * introspection/nm-device.xml - - Add 'Index' property on NMDevice objects (forgot to do this earlier) - -2007-08-26 Dan Williams - - * src/nm-device-802-3-ethernet.c - - (constructor): move connection of interface-connected/disconnected - signals here from real_bring_up(). Should be listening to netlink - for carrier events no matter what the initial state of the device - is. - -2007-08-26 Dan Williams - - * src/nm-netlink-monitor.c - - (nm_netlink_monitor_class_init): fix marshalling types for - interface-connected/interface-disconnected - - (nm_netlink_monitor_event_handler): clean up carrier on/off - check - -2007-08-26 Dan Williams - - Convert to using interface indexes as the primary method of identifying - devices inside NetworkManager. Indexes are (?) stable, but devices can - be renamed at any time. Device object paths now refer to the device - index rather than the name, and you can map those two manually if you like - by looking in the /sys/class/net//ifindex file. Also moves most - netlink-related code to nm-netlink.c, and cleans up nm-netlink-monitor.c - to use interface indexes rather than names. - -2007-08-26 Dan Williams - - * src/nm-netlink-monitor.h - - Remove one last bit of wireless-event signal - -2007-08-26 Dan Williams - - * src/nm-netlink-monitor.c - - (nm_netlink_monitor_class_init, nm_netlink_monitor_event_handler): - don't need the 'wireless-event' signal anymore since that's all - handled by wpa_supplicant - -2007-08-25 Dan Williams - - It's 2007. Remove support for drivers that don't support wireless scanning. - - * test/nm-tool.c - include/NetworkManager.h - src/NetworkManagerUtils.c - src/NetworkManagerPolicy.c - src/nm-device-802-11-wireless.c - - Remove special handling for non-scanning devices and mark them - as unsupported/unhandled - -2007-08-20 Dan Williams - - * src/nm-device-802-11-wireless.c - src/nm-device-802-3-ethernet.c - - (real_is_up): move device-specific tests before generic IFF_UP test, - because when the card is pulled or the module removed, the device - is already !IFF_UP and then device-specific cleanup (removing - the supplicant interface, periodic checks, etc) never gets done - -2007-08-20 Dan Williams - - * src/nm-manager.c - - (nm_manager_remove_device): bring device down before disconnecting - signal handlers, so that the 'state' signal will get broadcast when - the device enters the DOWN state - - (manager_device_state_changed): add NM_DEVICE_STATE_DOWN to the list - of states that cause the NMManager to recheck its state - -2007-08-20 Dan Williams - - * src/supplicant-manager/nm-supplicant-interface.c - - (interface_disconnect_done): don't try to dispose of the net proxy - when it may already have been disposed of - -2007-08-20 Dan Williams - - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_get_ssid): don't traceback and die when - the SSID isn't available; this can happen when the card is pulled - or the module unloaded, during the post-removal deactivation - paths, when the ioctl returns ENODEV - -2007-08-20 Dan Williams - - * src/nm-device-802-11-wireless.c - - (merge_scanned_ap): only merge the AP with another if the SSID, BSSID, - frequency, and mode match. Applets are now responsible for grouping - access points - -2007-08-20 Dan Williams - - * src/NetworkManagerAP.c - * src/NetworkManagerAP.h - - (nm_ap_print_self): new function - - * src/NetworkManagerAPList.c - - (nm_ap_list_print_members): call nm_ap_print_self() rather than trying - to do it all here - -2007-08-17 Dan Williams - - * src/nm-device-802-3-ethernet.c - - (real_bring_down): don't try to dispose of stuff that might not - exist - -2007-08-17 Dan Williams - - * src/NetworkManagerAP.c - - (nm_ap_set_user_addresses): uppercase any BSSID passed in from the - applet. This ensures that the case between the seen-bssids and - the bssids reported by the driver match. - -2007-08-17 Dan Williams - - * src/nm-device-802-11-wireless.c - - (device_cleanup): disconnect the interface in wpa_supplicant before - we dispose of the interface proxy in NM - -2007-08-16 Dan Williams - - * libnm-glib/nm-client.c - - (nm_client_init): create VPN connections hash table with key free - function - - (proxy_vpn_connection_added): VPN connections hash table key should - be a duplicated value, not the same memory address as the VPN - connection name. This is because the VPN connection name could - potentially be freed and set to something else during the lifetime - of the NMVPNConnection object. - -2007-08-16 Tambet Ingo - - * src/ppp-manager/nm-ppp-manager.c (pppd_child_setup): Implement. - (nm_ppp_manager_start): Use g_spawn_async() since we're not doing anything - with the file descriptors. Send a child setup function to change the pppd - progress group. - -2007-08-15 Dan Williams - - * src/supplicant-manager/nm-supplicant-interface.c - - (try_remove_iface): new function, ask wpa_supplicant to remove - an interface - - (nm_supplicant_interface_dispose): call try_remove_iface() when - disposing of the NMSupplicantInterface. Otherwise weird stuff - happens on hotplug if wpa_supplicant doesn't tear down and readd - the interface internally - -2007-08-15 Dan Williams - - * src/nm-device-802-11-wireless.c - - (real_bring_down): move most of this function into device_cleanup() - so that it can be called from elsewhere - - (nm_device_802_11_wireless_dispose): clean up device periodic timers - and stuff on dispose. These would normally get cleaned up when - the device is marked down and deactivated, but when the device is - hot-unplugged, it's already down and real_down() never gets run - -2007-08-15 Dan Williams - - * src/nm-dbus-nmi.c - - (nm_dbus_get_user_key_for_network_cb): fix incorrect refcounting that - caused a reference leak on device for which NM requested a key - -2007-08-15 Dan Williams - - * libnm-glib/nm-client.c - - (nm_client_get_best_vpn_state): fix leakage of the vpn connection list - -2007-08-15 Tambet Ingo - - * src/ppp-manager: Implement ppp-manager. It's sort of dead code for now since - nothing is using it at the moment, but it'll be all useful and stuff later on. - - * libnm-util/nm-setting.h: Define NMSettingPPP. - - * libnm-util/nm-setting.c: Implement NMSettingPPP. - - * libnm-util/nm-connection.c (register_default_creators): Register ppp setting. - - * src/Makefile.am: Add ppp-manager to SUBDIRS. - - * configure.in: Require ppp headers. Build Makefile for ppp-manager. - - * introspection/Makefile.am: Add nm-manager-client.xml to EXTRA_DIST. - -2007-08-14 Tambet Ingo - - * libnm-glib/Makefile.am: Use nm-manager-client.xml to produce nm-client-bindings. - - * introspection/nm-manager-client.xml: Add a horrible horrbile hack to work around - an issue with dbus-glib bindings generator. The issue is, the generated C caller - functions for dbus methods "Sleep(bool)" and "sleep()" both have the same function - name and different arguments and it won't compile anymore. To fix this, we now have - two copies of nm-manager.xml file. nm-manager.xml contains the actual interface, - that is new API + compatibility API and used by the daemon. The other, - nm-manager-client.xml is only the new API without compatibility bits and is used - by libnm-glib to make it compile. - - * introspection/nm-manager.xml: Define compatibility methods (sleep, wake, state). - - * src/nm-manager.c (impl_manager_legacy_sleep) - (impl_manager_legacy_wake, impl_manager_legacy_state): Implement the compatibility - interface functions for 0.6 branch. - -2007-08-14 Dan Williams - - * src/NetworkManagerAP.c - - (nm_ap_new_from_properties): fix mistaken check of return value - from memcmp (should expect 0) - -2007-08-14 Dan Williams - - (force-commit to fix wrong comment and partial commit of r2685; this - commit actually applies to r2685) - - * src/NetworkManagerUtils.c - - (nm_utils_same_ssid): add "ignore_trailing_null" parameter which - ignores trailing nulls in the SSID to work around mismatches in - expectations between WEXT and what the info-daemon passes back. The - info-daemon would pass back the correct length, but due to the - ESSID length issues with WEXT 22 and greater and wpa_supplicant, - the device would always have an SSID + 1 depending on what versions - of wpa_supplicant, the kernel, and NM you have. This was most often - visible by just quitting the applet and relaunching, which caused - NM to reassociated to the same network over again when reloading - the save networks. - - * src/NetworkManagerPolicy.c - src/NetworkManagerUtils.h - src/nm-device-802-11-wireless.c - - Update for new parameter to nm_utils_same_ssid() - -2007-08-14 Dan Williams - - * src/NetworkManagerAP.c - - (nm_ap_new_from_properties): ignore BSSs with invalid BSSIDs. Today - I encountered a BSS that wasn't just hiding it's ESSID, it was - setting the BSSID to all 0s. That confused the heck out of NM, - plus it's useless and probably out-of-spec. - -2007-08-14 Dan Williams - - * callouts/Makefile.am - src/dhcp-manager/nm-dhcp-manager.c - src/dhcp-manager/nm-dhcp-manager.h - src/dhcp-manager/Makefile.am - - Change install location of nm-dhcp-client.action to ${prefix}/libexec - -2007-08-14 Dan Williams - - * src/dhcp-manager/nm-dhcp-manager.c - - (dhclient_run): don't pass -x to dhclient until we figure out if - it's really needed, get rid of unused xtra_args parameter - -2007-08-14 Dan Williams - - * include/NetworkManagerVPN.h - src/vpn-manager/nm-dbus-vpn.c - src/vpn-manager/nm-dbus-vpn.h - src/vpn-manager/nm-vpn-act-request.c - src/vpn-manager/nm-vpn-act-request.h - src/vpn-manager/nm-vpn-service.c - src/vpn-manager/nm-vpn-service.h - libnm-glib/nm-vpn-connection.c - libnm-glib/nm-vpn-connection.h - libnm-glib/nm-client.h - - Rename NM_VPN_STATE_* -> NM_VPN_SERVICE_STATE_* and NMVPNState -> - NMVPNServiceState to clarify what they apply to - - Rename NM_VPN_ACT_STAGE_* -> NM_VPN_CONNECTION_STATE_* and - NMVPNActStage -> NMVPNConnectionState for the same reason - - * libnm-glib/nm-client.c - - Constant + type renames from above - - Properly handle NameOwnerChanged/manager_running signals - for NM service; only emit when state really changes - - Use hash tables correctly so that the key (which was previously owned - by the D-Bus message) now has the same lifetime as the value, since - the key is now taken from the NMVPNConnection itself. This - really fixes the double-VPN names in the applet - -2007-08-13 Dan Williams - - Patch from Michael Biebl - - * po/POTFILES.in - po/POTFILES.skip - - Update for vpn-properties move - -2007-08-13 Dan Williams - - * libnm-glib/nm-client.c - - Convert internal VPN connection tracking from a list to a hash table - to easily avoid duplicates - - (nm_client_get_vpn_connections): now returns an allocated GSList that - must be freed by the caller, like nm_client_get_devices() - - (nm_client_remove_vpn_connection): don't let the removal signal - leak through for NMVPNConnection objects that aren't actually - tracked. - - (manager_running): throw away VPN connection list when NM goes away, - like with the device list - -2007-08-13 Dan Williams - - * src/dhcp-manager/nm-dhcp-manager.c - - Stop any dhclient instance that might be already running for a - particular interface before starting an NM spawned dhclient. Fixes - dhclient processes left over if NM crashes, stuff like that. - -2007-08-13 Dan Williams - - * src/NetworkManagerAP.c - - (finalize): don't try to g_array_free (NULL, ...), which happened - when the AP wasn't broadcasting it's SSID - -2007-08-13 Rodrigo Moya - - * include/NetworkManager.h: added DBus path for connection settings. - - * libnm-glib/nm-settings.[ch] (nm_settings_signal_new_connection, - nm_connection_settings_signal_updated, - nm_connection_settings_signal_removed): new functions to wrap the - objects' signals. - (nm_connection_settings_init): register GObject with DBus. - (nm_connection_settings_get_dbus_object_path): new function. - - * libnm-glib/Makefile.am: added libnmutil to link flags. - -2007-08-13 Tambet Ingo - - * configure.in: Remove checks for dhcdbd as it's killed! killed! killed! - - * gnome/*: Remove. The nm-vpn-properties directory is now part of nm-applet, - libnm_glib directory got merged with libnm-glib/. - - * libnm-glib/libnm-glib.pc.in: Rename to libnm_glib.pc.in. - - * libnm-glib/Makefile.am: Add legacy libnm_glib.[ch] to the build. - Rename the library from libnm-glib to libnm_glib to maintain the library API - compatibility with 0.6 branch. - - * Makefile.am: Remove gnome/ SUBDIR. - - * gnome/libnm_glib/libnm_glib.[ch]: Move to libnm-glib/. - - * src/Makefile.am: Remove the WPA_SUPPLICANT_BIN define. - - * dispatcher-daemon/Makefile.am: Link the binary with libnm_glib. - - * configure.in: Remove GNOME checks, NetworkManager does not need any of these - anymore. - Remove checks for wpa_supplicant binary, it's used over dbus. - Remove gnome/ directory files form AC_OUTPUT, that directory is getting moved. - - * test/Makefile.am: Remove define WPA_SUPPLICANT_BIN. - Link the binaries with libnm_glib.la. - -2007-08-12 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): fix policy to deactivate old device - before activating new one, at least until the multiple active - device support lands - -2007-08-12 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_new): hook up to connection-added / connection-removed - signals instead of connections-changed - -2007-08-12 Dan Williams - - Kill dhcdbd until it's dead, dead, dead. Based on a patch from - Robert Frank - - * src/dhcp-manager/nm-dhcp-manager.c - src/dhcp-manager/nm-dhcp-manager.c - src/nm-device.c - - Spawn and communicate with dhclient directly, through means of a - custom dhclient callout script. Process callout D-Bus signals - with dbus-glib instead of hand-rolled dbus. DHCP timeouts are now - sent via gobject signals rather than being driven by the dhcp manager - directly. - -2007-08-12 Dan Williams - - * callouts/nm-dhcp-client-action.c - - (build_message): ignore non-DHCP-related environment variables - -2007-08-12 Dan Williams - - * Makefile.am - configure.in - callouts/Makefile.am - callouts/nm-dhcp-client-action.c - callouts/nm-dhcp-client.conf - - Add dhclient-executed callout that takes the place of dhclient-script - and dhcdbd, pushing DHCP options out to the system bus as a signal that - NM then listens for - -2007-08-09 Tambet Ingo - - [Based on patch by Helmut Schaa ] - - * libnm-glib/nm-client.h: - * libnm-glib/nm-object.h: - * libnm-glib/nm-vpn-connection.h: - * libnm-glib/nm-settings.h: - * libnm-glib/nm-device.h: - * libnm-glib/nm-ip4-config.h: - * libnm-glib/nm-access-point.h: - * libnm-glib/nm-device-802-3-ethernet.h: - * libnm-util/nm-setting.h: - * libnm-util/nm-connection.h: Add G_BEGIN_DECLS / G_END_DECLS to support C++. - - * libnm-glib/nm-object.c (nm_object_get_byte_property): Implement. - - * libnm-glib/nm-access-point.c: Strength has type char. - - * gnome/vpn-properties/Makefile.am: Remove GNOME_DISABLE_DEPRECTATED for now - to fix build. GnomeDruid is deprecated in recent libgnomeui. - - * introspection/nm-access-point.xml: Strength property is char, not int. - - * src/NetworkManagerAP.c (set_property): Set strength from char. - (get_property): Handle hidden APs (with empty SSID). - Get strength value from char. - (nm_ap_class_init): Strength property has char type. - -2007-08-03 Rodrigo Moya - - * introspection/Makefile.am: - * introspection/nm-settings.xml: - * introspection/nm-settings-connection.xml: added Settings interfaces. - - * libnm-glib/nm-settings.[ch]: - * libnm-glib/Makefile.am: added abstract class for Settings interfaces - containing the DBus implementation. - -2007-07-26 Dan Williams - - Patch from Bernhard Miklautz - - * src/NetworkManagerSystem.c - - (nm_system_device_set_ip4_route): don't add the route if it's on the - same subnet (#437396) - -2007-07-26 Dan Williams - - Patch from Kelemen Gábor - - * gnome/vpn-properties/nm-vpn-properties.c - - Fix translatable strings (#445865) - -2007-07-26 Dan Williams - - Patch from Andreas Hanke - - * configure.in - - Remove useless junk (#412530) - -2007-07-10 Christopher Aillon - - Patch from Robert Buchholz : - - * configure.in: - * Makefile.am: - * introspection/Makefile.am: - Make make distcheck work again. - -2007-06-27 Dan Williams - - * Make SSIDs GByteArrays everywhere - * Rename "essid" -> "ssid" everywhere that's appropriate - * Refcount activation_ap member of the 802.11 wireless device class - -2007-06-27 Tambet Ingo - - * libnm-glib/nm-object.[ch]: Add these to the SVN, oops. - -2007-06-22 Tambet Ingo - - * src/nm-device-802-11-wireless.c (merge_scanned_ap): Don't advertise constantly - that we got a new AP when we just update existing AP properties. - -2007-06-21 Tambet Ingo - - * libnm-glib/Makefile.am: Add NMObject to build, remove nm-utils.[ch]. - - * nm-utils.[ch]: Remove. - - * libnm-glib/nm-object.c: Implement a base class for all libnm-glib dbus-aware - objects for easy property access and dbus connection handling. - - * libnm-glib/nm-client.c: Derive from NMObject. - - * libnm-glib/nm-device.c: Ditto. - - * libnm-glib/nm-device-802-3-ethernet.c: Changes for being based on NMObject. - - * libnm-glib/nm-device-802-11-wireless.c: Ditto. - - * libnm-glib/nm-ip4-config.c: Ditto. - - * libnm-glib/nm-access-point.c: Ditto. - - * libnm-util/nm-connection.c (nm_connection_compare): Add a stub for connection - comparision. Currently used by the device activation code to determine if the new - activation is the same as the old one. - - * src/nm-dbus-nmi.c (nm_dbus_get_user_key_for_network): Don't use the obsolete and - wrong way of getting the dbus path for AP. Fixes the issue where the applet isn't - able to ask password for the AP. - - * src/nm-device.c (nm_device_activate): Change the logic here - instead of giving - up if the device is already connected, tear down it's connection (if it isn't the - same as new one) and start the activation. - - * src/nm-manager.c: Add the beginnings of NMConnection storage and signals. - - * src/NetworkManagerAP.c (nm_ap_init): Set the default values to AP memebers, fixes - the issue where all APs are always listed as encrypted. - - * src/NetworkManagerDbus.c (nm_dbus_get_object_path_for_network): Remove. APs have - their own registered paths. - - * test/nm-tool.c (detail_device): Don't try to get active network from wireless - device if it's not connected - dbus-glib will happily crash trying to marshal NULL. - -2007-06-13 Tambet Ingo - - * src/NetworkManagerAP.c (foreach_property_cb): Set WEP capabilities too! - (0 & 0 == 0, doh) - - * src/nm-device.c (nm_device_state_changed): Emit the signal before handling it - because the handling code will cause the next state change and signal listeners - get the signals in wrong order. - - * src/NetworkManagerPolicy.c (nm_policy_device_change_check): Get the "old_dev" - correctly in case of pending activation. - - * src/nm-device-802-11-wireless.c (nm_device_802_11_wireless_set_activation_ap): - Convert the essid byte array to string correctly, including the terminating NULL. - - * src/NetworkManagerPolicy.c (create_connection): Create wireless ssid and - mode with correct types. - - * src/nm-dbus-nmi.c (nm_dbus_get_user_key_for_network): Fix a typo, pass the - constructed info to dbus call instead of the activation request. - -2007-06-11 Christopher Aillon - - Patch from Christian Persch - - * libnm-glib/Makefile.am: - * dispatcher-daemon/Makefile.am: - Use the correct variables, the correct paths, and correct ordering. (446315) - -2007-06-11 Tambet Ingo - - * src/nm-device.c: Make the activation stage virtual functions take NMDevice - argument. The activation request is easy to retrieve. - - * src/nm-activation-request.c: Convert to GObject. Do not include half of NM headers - just to be a convenient location for devices to store random stuff. - -2007-06-11 Christopher Aillon - - Patch from Alex Smith - - * src/backends/NetworkManagerFrugalware.c: - Update the FrugalWare backend to fix a few segfaults. (#392642) - -2007-06-08 Tambet Ingo - - * libnm-util/nm-setting.c: Implement NMSettingWirelessSecurity. - - * libnm-util/nm-connection.c (register_default_creators): Register wireless security - setting. - (gvalue_to_string): Recognize G_TYPE_UCHAR and GSList. - -2007-06-06 Tambet Ingo - - * libnm-util/nm-setting.c: Get rid of dump virtual functions, that can happen - automagically. - Implement NMSettingIP4Config. - Finish NMSettingWired by adding all known members. - (setting_wired_verify): Implement. - Finish NMSettingWireless by adding all known members. - (setting_wireless_verify): Implement. - - * libnm-util/nm-connection.c: Register "ipv4" setting. - (nm_connection_dump): Implement. Instead of requiring every NMSetting to implement - dump function, we can introspect the GHashTable which is used for sending connections - over dbus. - - * src/nm-device-802-11-wireless.c (nm_device_802_11_wireless_set_activation_ap): - Take GByteArray for essid, it's really not a string. - - * src/nm-device.c (real_act_stage3_ip_config_start): Get information from NMSettings. - Start DHCP request if setting is not passed or if it states that DHCP should be used. - (real_act_stage4_get_ip4_config): If settings are provided, use them, even if it - means overriding the values we got from DHCP. - (real_activation_cancel_handler): Cancel DHCP transaction only if it has started, doh. - (nm_device_deactivate_quickly): Ditto. - - * src/nm-device-interface.c (impl_device_activate): Dump the connection structure - for debugging. - -2007-05-07 Tambet Ingo - - * libnm-glib/Makefile.am: Link with libnm-util to gain access to - NMConnection. - - * libnm-glib/nm-device-802-11-wireless.c: - (nm_device_802_3_ethernet_activate): Remove. - - * libnm-glib/nm-device-802-3-ethernet.c - (nm_device_802_3_ethernet_activate): Remove. - - * libnm-glib/nm-device.c (nm_device_activate): Implement. - - * src/nm-device-802-3-ethernet.c: Implement the new activation using - NMConnection. - - * src/nm-device-802-11-wireless.c: Store an activation AP once the - activation has started. - Implement the new activation using NMConnection. - - * src/nm-activation-request.c: Store a generic connection object instead - of a wireless-specific AP. - - * src/NetworkManagerPolicy.c (create_connection): Implement. Depending - on device type, create a device specific connection object suitable for - device activation. - - * src/nm-device.c (nm_device_activate): Re-implement. Call the device - specific check to validate the connection and on success start the - activation. - - * src/nm-device-interface.h: Add a activate virtual function to the - interface definition. - - * src/nm-device-interface.c (nm_device_interface_activate): Implement. - (impl_device_activate): Implement. - - * introspection/nm-device.xml: Add a generic device activation interface - that accepts an abstract NMConnection structure that has device-specific - information in it. - - * introspection/nm-device-802-3-ethernet.xml: Remove the wired-specific - activation interface. - - * introspection/nm-device-802-11-wireless.xml: Remove the wireless-specific - activation interface. - - * libnm-util/nm-connection.c: - * libnm-util/nm-connection.h: - * libnm-util/nm-setting.c: - * libnm-util/nm-setting.h: Add. - - * libnm-util/Makefile.am: Build the added files. - - * src/nm-dbus-manager.c - (proxy_name_owner_changed, nm_dbus_manager_class_init): Remove the - DbusConnection argument from 'name-owner-changed' signal. The manager - is already passed as a first argument to the signal and the connection - is easy enough to get from it. - - * src/vpn-manager/nm-vpn-service.c (nm_vpn_service_name_owner_changed): - Update the signature of the function. - - * src/vpn-manager/nm-vpn-manager.c (nm_name_owner_changed_handler): - Ditto. - - * src/NetworkManager.c: Ditto. - - * src/named-manager/nm-named-manager.c - (nm_named_manager_name_owner_changed): Ditto. - - * src/supplicant-manager/nm-supplicant-manager.c - (nm_supplicant_manager_name_owner_changed): Ditto. - - * src/nm-hal-manager.c (name_owner_changed): Ditto. - - * src/dhcp-manager/nm-dhcp-manager.c - (nm_dhcp_manager_name_owner_changed): Ditto. - - * src/nm-hal-manager.c: Add a list of device detectors and creators - to make it easier to add new devices. Each device type has it's own - entry in the table so adding new device types is only a matter of - implementing a couple of functions, one for device detection and the - other for device creation. - -2007-04-25 Dan Williams - - * initscript/RedHat/NetworkManager.in: remove trailing backslash - (gnome.org #432401) - -2007-03-30 Dan Williams - - * src/NetworkManagerSystem.c - - (nm_system_device_set_ip4_route): clean up and fix argument - to nm_dev_sock_open() - -2007-03-28 Tambet Ingo - - * src/supplicant-manager/nm-supplicant-config.c (get_hash_cb): Marshal the - data to correct types instead of always using string. - - * src/NetworkManagerAP.c (get_property): AP is encrypted if capabilities does - _not_ have NM_802_11_CAP_PROTO_NONE. - (foreach_property_cb): Set AP capabilities if it's not set or if the protocol - is not set. - -2007-03-27 Tambet Ingo - - * libnm-glib/Makefile.am: Fix the build issue. - -2007-03-26 Tambet Ingo - - * libnm-glib/nm-vpn-connection.h: - * libnm-glib/nm-vpn-connection.c: Implement. - - * libnm-glib/nm-client.c: Add VPN support. - - * src/vpn-manager/nm-dbus-vpn.c (dbus_message_handler): Implement DBUS message - handler for VPN. - - * src/vpn-manager/nm-vpn-manager.c (nm_vpn_manager_new): Register VPN interface - on DBUS again. - -2007-03-26 Dan Williams - - * src/NetworkManagerAPList.c - * src/nm-device-802-11-wireless.c - * src/NetworkManagerAP.c: - - Store last seen as glong instead of GTimeVal. - - Fix the upper bound of capabilities, it's a bitfield. - -2007-03-16 Tambet Ingo - - * libnm-glib/nm-device.c (nm_device_get_description): Implement. - - * libnm-glib/nm-client.c (nm_client_manager_is_running): Implement. Also add a - "manager-running" signal that notifies the appearance/disappearance of NM. - (nm_client_sleep): Implement. - - * libnm-glib/nm-device.c: - * libnm-glib/nm-device-802-11-wireless.c: - * libnm-glib/nm-device-802-3-ethernet.c: - - Don't inherit from DBusGProxy, add a proxy to private - data. The reason is, classes inherited from NMDevice wouldn't get any dbus signals - for anything but their own dbus interface. DBusGProxy objects support only one - interfaces and to work around this, NMDevice has spearate proxy for each dbus - interface. The nice side effect of this change is that we do not create a new - DBusGProxy object for each property access. - -2007-03-15 Tambet Ingo - - * src/nm-device-802-11-wireless.c (constructor): Initialize the iw_ext structures - with zeroes before passing them to functions - the functions never do that and - reading the values back may produce wrong values. - (real_bring_up): Store the signal handler id ... - (real_bring_down): ... So that it can be removed here. - Disconnect the supplicant interface here as well. - (nm_device_802_11_wireless_ap_list_get_ap_by_obj_path): Use the dbus object path - from the access point instead of old $device/Networks/$essid. - - * src/nm-manager.c (nm_manager_get_state): Return NM_STATE_CONNECTED when the - device state is connected (instead of just having link/carrier). - - * src/nm-activation-request.c: Don't store NMData in activation request, it's - already easily accessible through the device. - - * src/NetworkManagerAP.c (nm_ap_init): Construct the dbus object path here and - store it within the object. - (nm_ap_get_dbus_path): Export it to public as well. - - * src/dhcp-manager/nm-dhcp-manager.c (nm_dhcp_manager_get): Keep the ownership - of the singleton. - -2007-03-12 Dan Williams - - Get rid of 2 second poll of sysfs 'carrier' file for wired devices. Useless - for non-carrier-detect capable devices, and useless for carrier-detect - devices since we get notifications from netlink about carrier status anyway. - - * src/nm-device-802-3-ethernet.c - - remove 'link_source_id' member from private data - - (probe_link): remove and collapse into real_update_link() - - (nm_device_802_3_periodic_update): remove - - (real_is_up): check for sup_iface rather than link_source_id - - (real_bring_up): return gboolean for success/fail; require that - sup_iface be valid for device bringup to succeed - - (real_bring_down): zero out link signal ids - - * src/nm-device.c - - (nm_device_activate_stage2_device_config): fail activation if device - bringup fails - - (real_act_stage4_get_ip4_config): fail activation if device bringup - fails - - (nm_device_bring_up): return success/fail - - * src/nm-device.h - - bring_up now returns success/fail - - * src/nm-device-802-11-wireless.c - - (real_bring_up): return success from bringup - -2007-03-07 Dan Williams - - Patch from Simon Geard (Gnome.org #394956) - * src/nm-ap-security-wpa-psk.c - - (real_write_supplicant_config): work with PSKs that may contain - zeros in the binary format rather than treating it as a string - -2007-03-02 Tambet Ingo - - * libnm-glib/nm-device-802-11-wireless.c - (nm_device_802_11_wireless_get_capabilities): Implement. - - * libnm-glib/nm-device.c (nm_device_get_capabilities): Implement. - - * src/nm-device-802-11-wireless.c: Add "WirelessCapabilities" property. - - * src/named-manager/nm-named-manager.c (remove_one_zone_from_named): Unref the - reply only if it's not NULL. Not sure why this started happening right now. - - * src/nm-manager.c (device_stop_and_free): Remove. No need to have different - code paths for when devices get removed on shutdown or when a device is just - removed. - (finalize): Don't use a g_slist_foreach() when removing devices, the list data - gets freed so any signal from a device (disconnected for instance) would invoke - NMState update which would crash. - (nm_manager_remove_device): Bring the device down when it gets removed. - - * src/NetworkManagerPolicy.c (nm_policy_auto_get_best_device): Remove - the unused dev_type. - - * src/nm-hal-manager.c (create_device_and_add_to_list): Don't keep the - reference to the added device, NMManager will own it (if it wants). - - * test/nm-tool.c: Rewrite using libnm-glib. - - * libnm-glib/nm-device-802-11-wireless.c: Cache networks (bssids) list. - We get signalled when it changes. - - * libnm-glib/nm-client.c: Cache NMState and device list, we get signalled - when it changes. - - * libnm-glib/nm-device.c: Cache the device state property. - - * libnm-glib/nm-access-point.c: Cache the strength property. - - * src/nm-device-802-11-wireless.c: Fix wireless device scanning scheduler. - The new algorithm is to start from SCAN_INTERVAL_MIN (currently defined as 0) - and add a SCAN_INTERVAL_STEP (currently 20 seconds) with each successful scan - until SCAN_INTERVAL_MAX (currently 120 seconds) is reached. Do not scan while - the device is down, activating, or activated (in case of A/B/G cards). - Remove some old dead ifdef'ed out code that used to configure wireless devices, - it's all done through supplicant now. - - * src/supplicant-manager/nm-supplicant-interface.c: Fix the reference - counting issues with pending calls which caused leaks and crashes when - interface was removed (now that the interface actually gets removed). - - * src/nm-call-store.c: Make a copy of data before running a foreach - with user callback on it - The most common usage pattern is to cancel - (and thus remove) all pending calls with foreach which would modify - the hash table we're iterating over. - - * src/nm-manager.c: When a device is added, make sure it is "up". When - it's removed or disabled due to disabling wireless or networking, bring - it down. - - * include/NetworkManager.h: Add new device state NM_DEVICE_STATE_DOWN. - - * src/nm-device-802-11-wireless.c: - * src/nm-device-802-3-ethernet.c: - * src/nm-device.c: - - Remove "init" virtual function, all gobjects have a place for that - already (constructor). - - Replace "start" virtual function with "bring_up", devices can be - brought up and down more than just on startup now. - - Add "is_up" virtual function. - - Implement one way to bring a device down instead of previous 4 different - ways, each of witch did something different. - - * src/NetworkManagerUtils.c (nm_dev_sock_open): This doesn't need an NMDevice, - all it needs is the device interface. - - Get rid of NMData.dev_list (3 members to go). - Get rif of NMData in a lot of places. - - * gnome/libnm_glib/libnm_glib.c: Make it compile again. - -2007-02-23 Dan Williams - - Patch from Andy Whitcroft (Gnome.org #410426) - - * src/NetworkManagerAP.c - - (add_capabilities_from_cipher): fix addition of WEP capabilities by - OR-ing rather than AND-ing - -2007-02-20 Tambet Ingo - - * libnm-glib/nm-device-802-11-wireless.c: Add "network-added" and - "network-removed" signals. - - * libnm-glib/libnm-glib.pc.in: Require NetworkManager >= 0.7.0. - - * libnm-glib/nm-access-point.c: Add "strength-changed" signal, emit it - when receiving the signal from dbus. - - * src/nm-device-802-11-wireless.c (get_property): Fix PROP_ACTIVE_NETWORK - property. - - * src/NetworkManagerPolicy.c (state_changed): Fix a typo to make the - deactivation of the previously activated device working again. - - * src/nm-activation-request.c: Remove NMActStage property and it's getter - and setter. - - * src/nm-device.c (nm_device_is_activated): Remove. - state == NM_DEVICE_STATE_ACTIVATED is just as easy to use. - - * include/NetworkManager.h: Remove NM_DBUS_NO_DEVICES_ERROR, - NM_DBUS_NO_DIALUP_ERROR, NM_DBUS_NO_NETWORKS_ERROR, - NM_DBUS_NO_ACTIVE_DEVICE_ERROR, NM_DBUS_NO_ACTIVE_NET_ERROR errors and - NM_DBUS_SIGNAL_STATE_CHANGE signal. - Remove NMNetworkStatus and NMActStage enums. - -2007-02-19 Tambet Ingo - - * src/vpn-manager/nm-vpn-manager.c: Handle the DBUS state changes itself. - Handle device state changes and disconnect VPN if it's device deactivates. - - * src/nm-dbus-nm.c: - * src/nm-dbus-nm.h: - * src/nm-dbus-device.c: - * src/nm-dbus-device.c: - * src/nm-dbus-net.c: - * src/nm-dbus-net.h: Remove. All of it is implemented byt the new dbus API. - - * src/NetworkManagerMain.h: Get rid of all but 3 properties of NMData. - - * src/nm-device.c (nm_device_get_by_udi): - (nm_device_get_by_iface): Remove. This doesn't belong here and is already - implemented in the correct location (NMManager). - Rip out all the test_device stuff. - - * src/NetworkManagerPolicy.c: Remove the leftover activation success and - failure handlers, it's all done by NMDevice already. - - * src/NetworkManager.c: Move the signal handling here from nm-logging.c - Remove the iochannel hack to route the unix signals to the main thread since - we're not threaded anymore. - - * src/NetworkManagerAP.c: Implement HWAddress property. - - * src/NetworkManagerDbus.c: Remove the dbus signal sending code, it happens - automatically with dbus-glib. - - * src/nm-netlink-monitor.c: - * src/nm-netlink-monitor.h: - - Move it low in the class hierarchy, don't reference any NM types. - - Remove private data from the header. - - Use type safe checks in public API methods. - - Make it a singleton so we don't have to pass the single reference around. - -2007-02-16 Tambet Ingo - - * introspection/nm-ip4-config.xml: Implement. - - * libnm-glib/libnm-glib-test.c: Use new DBUS API in tests. - - * libnm-glib/nm-ip4-config.c: - * libnm-glib/nm-ip4-config.c: Implement. - - * src/nm-ap-security[-*]: Remove circular dependencies between APs and AP - securities. APs reference security. - - * src/nm-device-802-11-wireless.c: Implement missing properties that need to - be exported over DBUS. - - * src/nm-device-802-3-ethernet.c: Ditto. - - * src/NetworkManagerAP.c: - * src/NetworkManagerAP.h: - - Convert to GObject, export over DBUS. - - * src/nm-ip4-config.h: - * src/nm-ip4-config.h: - - Convert to GObject, export over DBUS. - -2007-02-12 Dan Williams - - Patch from Helmut Schaa - - * vpn-daemons/pptp/configure.in - vpn-daemons/pptp/Makefile.am - vpn-daemons/openvpn/configure.in - vpn-daemons/openvpn/Makefile.am - vpn-daemons/vpnc/configure.in - vpn-daemons/vpnc/Makefile.am - - Add --without-gnome switch which disables building gnome bits - -2007-02-12 Tambet Ingo - - * libnm-glib/nm-device.c (nm_device_get_use_dhcp): Remove. - - * libnm-glib/nm-access-point.c (nm_access_point_is_broadcast): Remove. - - * introspection/nm-device-802-3-ethernet.xml: Rename 'Address' property to - 'HwAddress'. - - * introspection/nm-device.xml: Remove 'UseDhcp' property. - - * introspection/nm-access-point.xml: Remove 'Broadcast' property. - - Totally break NetworkManager. Please use 0.6 branch until futher notice. - - * src/: - - Remove old low-level dbus interface implementations and replace them - with dbus-glib one. - - * configure.in: - - Require dbus-glib >= 0.72. - - Plug in new sources to build. - - * libnm-glib/: - - Implement GObject wrappers on top of DBUS glib auto-generated bindings - to make it more convenient to use from GObject based programs. - - * introspection/: - - Implement DBUS XML introspection files, used by both NM and libnm-glib. - -2007-02-09 Tambet Ingo - - * src/nm-device-802-11-wireless.c: - - Add "network-added" and "network-removed" signals. - - Use gobject boilerplate macros to define the GObject. - - Implement wireless device activation. - - Remove activation_failure_handler and activation_success_handler - and instead listen on state-changed signals and run the same code - from there. - - * src/nm-device.c: - - Implment NMDeviceInterface::deactivate. - - Remove activation_failure_handler and activation_success_handler - virtual methods. Each device which is interested in these events - can just listen on it's state changed signals. - - * src/NetworkManagerPolicy.c: - - Move a bit more NMData usage to NMManager. - - Remove activation scheduling bits. - - Add listeners for wireless device's "network-added" and - "network-removed" signals. - - Listen device changed signals and deactivate currently activated - device when another device start activating (for now). - - Remove (nm_policy_schedule_device_change_check): There's never a need - for calling this, the policy code knows exactly when this should happen, - by listening on events from NMManager and NMDevices. - - * src/nm-device-802-3-ethernet.c (nm_device_802_3_ethernet_activate): - Implement. - - * src/nm-dbus-nm.c (nm_dbus_nm_set_active_device): Call the activation - method on the specific device instead of going to through policy code - and determining the device type by passed in AP's existance. - - * src/nm-device-interface.c (nm_device_interface_deactivate): Implement the - abstract NMDevice deactivation. - -2007-02-08 Tambet Ingo - - * src/NetworkManager.c: - - Set up all the shiny new managers. - - * src/NetworkManagerPolicy.c: - - Add the beginnings of new NMPolicy code. Instead of requireing all - classes to call into policy code, make the policy code kind of like - a supervisor that monitors what's going on and drives the whole NM. - - * src/nm-hal-manager.c: - * src/nm-hal-manager.h: - - Collect all libhal code scattered around NM to this one class. - - Listen libhal and NMManager events and add/remove devices to - NMManager. - - * src/nm-manager.c: - * src/nm-manager.h: - - Implment a replacement for NMData. NMData is now officially - deprecated. - -2007-02-05 Tambet Ingo - - * src/nm-device-802-11-wireless.c (supplicant_iface_scan_result_cb): - * src/supplicant-manager/nm-supplicant-interface.h - * src/supplicant-manager/nm-supplicant-interface.c - (nm_supplicant_interface_class_init): Change the "scan-result" signal's - argument to boolean from enum. - - Make NMDevice abstract class, remove almost all references to it's - subclasses (the last place gets removed with new policy manager). Add - NMDeviceInterface (which NMDevice implements) so that when we have - NMDevice exported over DBUS, there's a common NMDevice interface which - all instances have, plus there's a device specific interface for each - specific type. - Remove functions (nm_device_is_802_3_ethernet) and - (nm_device_is_802_11_wireless). There are already standard GObject macros - for type safe checks. - Use the updated supplican manager API. - - * src/nm-device-interface.h: - * src/nm-device-interface.c: - * src/nm-call-store.h: - * src/nm-call-store.c: Implement. - - * src/supplicant-manager/nm-supplicant-interface.c: - * src/supplicant-manager/nm-supplicant-interface.h: - * src/supplicant-manager/nm-supplicant-manager.c: - * src/supplicant-manager/nm-supplicant-manager.h: - - Remove all private data type references from public header files. - - Remove all references to other NM classes, this class is just a - proxy between wpa_supplicant and NM so it doesn't have to know - any internals. - - Convert to dbus-glib bindings. - - Type safe checks for public methods' arguments. - - Store pending DBUS call ids to NMCallStore. - - * src/supplicant-manager/nm-supplicant-config.c: - - Store config values in a GHashTable instead of GSList. - - * src/NetworkManagerMain.h: Remove all references to DHCP manager. - - * src/NetworkManager.c: Don't initialize the DHCP manager, it's a - singleton now. - - * src/nm-device.c: Use the new DHCP manager API. - - * src/nm-activation-request.c: - * src/nm-activation-request.h: - - Remove all dhcp related properties and methods. - - * src/dhcp-manager/nm-dhcp-marshal-main.c: Add. - - * src/dhcp-manager/nm-dhcp-marshal.list: Add. - - * src/dhcp-manager/nm-dhcp-manager.c: - * src/dhcp-manager/nm-dhcp-manager.h: - - Convert it to GObject since we need to signal state changes. - - Remove all references to other NM classes, this class is one - of the lowest classes in our hierarchy. - - One less class to use NMActRequest. - - Make it singleton, one less user of NMData. - - Remove a couple of sleep() calls. - - Convert a bunch of low-level dbus API calls to dbus-glib calls. - One less class to use the NM's custom tailored signal handlig. - - * Makefile.am: Generate marshallers, add them to build. - -2007-02-02 Dan Williams - - * configure.in - gnome/Makefile.am - nm-applet.desktop - Makefile.am - - Remove last bits referencing gnome applet - -2007-02-02 Dan Williams - - * src/vpn-manager/nm-vpn-service.c - - (nm_vpn_service_stage4_ip4_config_get): use uint32 arrays for DNS - and NBNS server addresses - -2007-02-02 Tambet Ingo - - * src/nm-dbus-manager.c: - * src/nm-dbus-manager.h: - - Convert all internal DBUS code to use dbus-glib bindings. - - Remove GObject properties, we don't need them here. - - Don't explicitly set things to NULL after freeing, glib is - happy to do it if asked nicely (G_DEBUG=gc-friendly). - - Make public API argument checks type safe. - - Remove unnecessary (and wrong) cast to GObject for the first - argument to g_signal_* calls - The first argument is a gpointer. - - Export DBusGConnection to other cool classes that (are going to) - use dbus-glib. - -2007-01-26 Dan Williams - - * libnm-util/dbus-dict-helpers.c - libnm-util/dbus-dict-helpers.h - - Coordinate style with wpa_supplicant version to minimize diff - - Add uint32 array support - - (nmu_dbus_dict_append_uint32_array): new function - - (nmu_dbus_dict_begin_string_array, nmu_dbus_dict_string_array_add_element, - nmu_dbus_dict_end_string_array): bring over from wpa_supplicant - version; allow adding string array elements individually - - * test/libnm-util/test-dbus-dict-helpers.c - - Test uint32 arrays - -2007-01-27 Jürg Billeter - - * src/backends/NetworkManagerPaldo.c - - (nm_system_update_dns): clear nscd hosts cache - -2007-01-04 Dan Williams - - Threading removal related cleanups: - - - Use the glib default main context. Remove the device main context - member from NMDevice, and the main_context member from NMData. Change - all the idle and timeout scheduler functions to use plain - g_idle_add() and g_timeout_add(). - - - As a side-effect of the first change, nm_dbus_manager_get() no longer - takes an argument; fix that up too. - - - Remove all locking, which is useless since we no longer use threads. For - example, nm_get_device_by_iface_locked() has been removed. The global - device list lock, the AP List lock, and all static locks in - NetworkManagerPolicy.c have been removed. The locking utility functions - in NetworkManagerUtils.c have also been removed. - - - Other cleanups in spacing and code style - -2007-01-01 Dan Williams - - Found by Bill Moss: - - * src/supplicant-manager/nm-supplicant-interface.c - - (nm_supplicant_interface_disconnect): fix cleanup logic when - the supplicant interface wasn't already disconnected. Always - call removeNetwork and disconnect unless the supplicant interface - is in the DISCONNECTED or INACTIVE state. - -2006-12-28 Dan Williams - - Use a single thread for everything. With the move to wpa_supplicant - and communication over D-Bus, there's no reason for multiple threads. - Almost all of the blocking code has been removed, with one exception in - the DHCP manager and a few in the VPN manager. This commit removes the - per-device worker thread and fixes activation cancellation in the absence - of threads. Further removal of thread-related code would be removing - any locking code (like the device list lock) and simplification of logic - around areas of code or data structures that are currently locked. - - * autoip.c - dhcp-manager/nm-dhcp-manager.c - nm-device-802-11-wireless.c - nm-device-802-3-ethernet.c - nm-device.c - nm-device.h - - Remove usage of multiple threads - -2006-12-19 Dan Williams - - Big wpa_supplicant + dbus update; need latest wpa_supplicant from CVS - plus a few other patches from wpa_supplicant bugzilla. - - * src/Makefile.am - src/NetworkManagerPolicy.c - src/NetworkManagerUtils.c - src/NetworkManagerUtils.h - src/nm-ap-security-leap.c - src/nm-ap-security-wep.c - src/nm-ap-security-wpa-eap.c - src/nm-ap-security-wpa-psk.c - src/nm-ap-security.c - src/nm-ap-security.h - src/nm-device-802-11-wireless.c - src/nm-device-802-11-wireless.h - src/supplicant-manager/nm-supplicant-config.c - src/supplicant-manager/nm-supplicant-config.h - src/supplicant-manager/nm-supplicant-interface.c - src/supplicant-manager/nm-supplicant-interface.h - src/supplicant-manager/nm-supplicant-marshal.list - src/supplicant-manager/nm-supplicant-settings-verify.c - src/supplicant-manager/nm-supplicant-settings-verify.h - - Move all connection management and association handling to - wpa_supplicant over dbus, rather than spawning a private copy - -2006-12-19 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check, nm_policy_schedule_device_change_check): - better locking of the device change check handler ID. Incorrect - locking was causing lost device change requests - -2006-12-18 Dan Williams - - * libnm-util/dbus-dict-helpers.c - - (_nmu_dbus_dict_entry_get_array, _nmu_dbus_dict_entry_get_string_array, - _nmu_dbus_dict_entry_get_byte_array): replace usage of - dbus_message_iter_get_array_len() (Gnome.org #382898) - -2006-12-18 Dan Williams - - * gnome/libnm_glib/libnm_glib.c - - Change dbus_connection_close() -> dbus_connection_unref() - -2006-12-11 Dan Williams - - * src/supplicant-manager/nm-supplicant-interface.c - - (iface_state_cb, wpas_iface_get_state): new functions; query initial - wpa_supplicant interface state - - (nm_supplicant_interface_add_cb): query initial wpa_supplicant interface - state before transitioning to READY state - -2006-12-04 Dan Williams - - * src/nm-device-802-11-wireless.c - - (supplicant_iface_scanned_ap_cb): fix parsing of hidden APs due to - odd length of ESSID returned from ieee80211 stack-based drivers - -2006-12-04 Dan Williams - - * src/nm-device-802-11-wireless.c - - (supplicant_iface_scanned_ap_cb): remove erroneous & from WPA & RSN - IE handling blocks that cause mis-parsing of the IE - -2006-12-04 Dan Williams - - * src/nm-device-802-11-wireless.c - - (init_supplicant_interface): new function; pull supplicant interface - setup code out into standalone function since it must be called from - two different places - - (real_init): sup_mgr is now in private object data; get and track - the supplicant manager object over the NMDevice subclass' lifetime - and register a signal handler for its state signals; only try to - initialize the supplicant interface if the supplicant manager is in - the IDLE state (and therefore is ready for requests) - - (request_wireless_scan): reschedule the scan request if (a) there is - no supplicant interface yet (meaning wpa_supplicant isn't running - or isn't ready yet), or (b) if the supplicant interface isn't ready - for requests yet - - (supplicant_iface_connection_state_cb): new function; stub for - handling supplicant interface connection state signals - - (supplicant_mgr_state_cb): do the right thing when wpa_supplicant - comes and goes - - (nm_device_802_11_wireless_dispose): clean up spacing; release the - supplicant manager object that's being tracked starting with this - commit - -2006-12-04 Dan Williams - - * src/supplicant-manager/nm-supplicant-interface.c - - (nm_supplicant_interface_set_property): track signal handler ID - - (nm_supplicant_interface_dispose): remove signal handler on dispose - -2006-12-04 Dan Williams - - * src/supplicant-manager/nm-supplicant-interface.[ch] - - (nm_supplicant_interface_get_state): new function - -2006-12-04 Dan Williams - - * src/supplicant-manager/nm-supplicant-interface.c - - (bssid_properties_cb): don't treat DBus errors as valid - scanned AP messages - -2006-12-04 Dan Williams - - * src/supplicant-manager/nm-supplicant-interface.[ch] - - (nm_supplicant_interface_get_connection_state): new function - - define new supplicant connection states - - send a signal when the supplicant connection state changes - -2006-12-03 Dan Williams - - * src/supplicant-manager/Makefile.am - src/supplicant-manager/nm-supplicant-connection.h - src/supplicant-manager/nm-supplicant-connection.c - src/supplicant-manager/nm-supplicant-config.h - src/supplicant-manager/nm-supplicant-config.c - src/supplicant-manager/nm-supplicant-types.h - src/supplicant-manager/nm-supplicant-interface.h - src/supplicant-manager/nm-supplicant-interface.c - - Rename NMSupplicantConnection -> NMSupplicantConfig - -2006-12-03 Dan Williams - - Patch from Gabor Kelemen (Gnome.org #381890) - - * po/POTFILES.in - po/POTFILES.skip - - Move VPN-related translatables to .skip - - * vpn-daemons/pptp/po/POTFILES.in - - Update with new translatables - -2006-12-02 Dan Williams - - Patch from Christian Persch - - * gnome/applet/Makefile.am - gnome/applet/applet-dbus-devices.c - gnome/applet/applet-notifications.c - gnome/applet/applet.c - gnome/applet/applet.h - gnome/applet/main.c - - Be a GtkStatusIcon on GTK+ >= 2.10 - -2006-12-02 Dan Williams - - * gnome/applet/applet.c - - (nma_update_info): fix two unecessary allocations - -2006-12-02 Dan Williams - - Patch from Michael Biebl - * configure.in - man/NetworkManager.1.in - man/NetworkManagerDispatcher.1.in - man/NetworkManager.8.in - man/NetworkManagerDispatcher.8.in - - Add .SH NAME stanzas - - Move NM & NM Dispatcher manpages to section 8 (admin) - -2006-12-02 Dan Williams - - Patch from Christian Persch - - * configure.in - - Check for GTK+ 2.10 in preparation for GtkStatusIcon patch - -2006-11-29 Tambet Ingo - - Patch by Timo Hoenig : - * src/nm-dbus-manager.c (nm_dbus_manager_start_service): Make it work with - DBUS-1.0. - - * src/supplicant-manager/Makefile.am: Add nm-supplicant-marshal here, since - we can't use the one from the main source directory. - -2006-11-27 Dan Williams - - Patch from Christian Persch - - * gnome/applet/applet-dbus-devices.c - - (hal_info_product_cb): fix memleak; free duped string. - Gnome.org #379908 - -2006-11-27 Dan Williams - - Patch from Christian Persch - - * gnome/applet/menu-items.c - - (network_menu_item_update): use gtk_progress_bar_set_fraction() - as gtk_progress_set_percentage is deprecated. Should - work as far back as GTK+ 2.4. Gnome.org #379780 - -2006-11-26 Dan Williams - - Scan using wpa_supplicant over DBus. - - * src/nm-device-802-11-wireless.c - - remove wireless extensions netlink event handler bits - (wireless_event_helper, nm_device_802_11_wireless_event) - - remove wireless extensions scan event handler bits - (process_scan_results, add_new_ap_to_device_list, hexstr2bin, - hex2byte, hex2num, request_and_convert_scan_results, - free_process_scan_cb_data, scan_results_timeout, - schedule_scan_results_timeout, cancel_scan_results_timeout) - - Rename nm_device_802_11_wireless_scan() -> request_wireless_scan() - and request scans from the supplicant interface rather than directly - - Move functionality of convert_scan_results() to cull_scan_list() and - supplicant_iface_scanned_ap_cb() - - (supplicant_iface_scan_result_cb): new function; schedule a new scan - at the scan interval when the current scan has finished - - (supplicant_iface_state_cb): start scanning when the supplicant - interface enters the READY state, and stop scanning when it - enters the DOWN state - - (cull_scan_list): weed out old access points from the scan list - - (supplicant_iface_scanned_ap_cb): convert a supplicant scanned access - point into an NMAccessPoint and merge it into the device's scan list - - * src/supplicant-manager/nm-supplicant-interface.c - src/supplicant-manager/nm-supplicant-interface.h - - Add a new signal "scan-result" which is issued when the supplicant - notifies NM that a scan has completed - - Add a new signal "scanned-ap" that notifies listeners of a new access - point found in the scan. Called once for each access point that - the supplicant interface object receives from the supplicant as a - result of the "scanResults" method call - - (wpas_iface_query_scan_results): don't wait 4s before querying - for the initial scan results - - (scan_request_cb): new function; send listeners the result - (success, error) of a wireless scan request - - (nm_supplicant_interface_request_scan): new function; ask the - supplicant to perform an immediate wireless scan - -2006-11-25 Dan Williams - - * src/supplicant-manager/Makefile.am - - Since we're including NetworkManagerMain.h in nm-supplicant-interface.c, - add HAL cflags/includes and named-manager includes directory - - * src/supplicant-manager/nm-supplicant-interface.h - - New state STARTING to handle transition from INIT to READY where - the addInterface pending call is still outstanding - - * src/supplicant-manager/nm-supplicant-interface.c - - track pending calls differently since we may have more than one - going on at any given time - - request scan results from wpa_supplicant; but don't do it more often - than every 4 seconds. Drivers that do background scanning - (like the 'ipw' drivers) send a continuous stream of scan completion - notifications, so we don't want to hammer the supplicant or dbus - with requests for all scan results every time we get a completion - notification. - -2006-11-25 Dan Williams - - * src/supplicant-manager/nm-supplicant-types.h - - new file; move all supplicant manager object typedefs here for - #include sanity - - * src/supplicant-manager/nm-supplicant-interface.c - src/supplicant-manager/nm-supplicant-interface.h - - new file; an object that interfaces an NMDevice object to the - supplicant and handles signals from the supplicant. This object - does all necessary DBus communication with wpa_supplicant. - - * src/supplicant-manager/nm-supplicant-manager.c - src/supplicant-manager/nm-supplicant-manager.h - - Actually do something. Track the state of the wpa_supplicant service - and deal with its comings & goings. Handle life events of - supplicant interfaces too. - - Move NMSupplicantManager typedef to nm-supplicant-types.h - - * src/supplicant-manager/nm-supplicant-connection.h - - Move NMSupplicantConnection typedef to nm-supplicant-types.h - - * src/supplicant-manager/Makefile.am - - Add new files to build, and add libnm-util to includes - - * src/nm-marshal.list - - New marshaler type: VOID:UINT,UINT - - * src/nm-device-802-3-ethernet.c - - (real_init): grab a supplicant interface - - (nm_device_802_3_ethernet_dispose): release the supplicant interface - - (supplicant_iface_state_cb): new function, stub for handling - supplicant interface state changes - - * src/nm-device-802-11-wireless.c - - (real_init): grab a supplicant interface - - (nm_device_802_11_wireless_dispose): release the supplicant interface - - (supplicant_iface_state_cb): new function, stub for handling - supplicant interface state changes - - * src/NetworkManager.c - - (main): create and keep the supplicant manager around for the lifetime - of NetworkManager - - * src/Makefile.am - - Link to the supplicant manager sub-library and use the supplicant - manager includes - -2006-11-25 Dan Williams - - Rework DBus manager signal handling to be more flexible. Previously, - only one signal handler could be registered for a particular interface. - The DBus manager now reference counts DBus bus matches and allows multiple - clients to register signal handlers for the same interface and sender. - - * src/NetworkManager.c - - (main): track NMI signal handler ID and remove it when we quit - - * src/NetworkManagerMain.h - - Keep track of NMI signal handler ID - - * src/nm-dbus-manager.c - src/nm-dbus-manager.h - - rework signal handling; each signal handler references one signal - match, but a signal match may be referenced by one or more - signal handlers. Matches are refcounted and are destroyed when the - last signal handler that references the match is removed. This is - necessary because two signal handlers may end up requiring the same - dbus bus match, so the match must live until the last signal handler - is destroyed (for example, with the wpa_supplicant network interface - dbus interface). - - * src/dhcp-manager/nm-dhcp-manager.c - - (nm_dhcp_manager_new): track DHCP signal handler id - - (nm_dhcp_manager_dispose): remove DHCP signal handler - - * src/vpn-manager/nm-vpn-service.c - - (nm_vpn_service_add_watch): track VPN service signal handler id - - (nm_vpn_service_remove_watch): remove VPN service signal handler - -2006-11-25 Dan Williams - - Suggested by Helmut Schaa - - * src/vpn-daemons/nm-vpn-service.c - - (supplicant_child_setup): new function - - (supplicant_exec): make child process use a new process group id - - * src/nm-device-802-11-wireless.c - - (nm_vpn_service_child_setup): new function - - (nm_vpn_service_stage1_daemon_exec): make child process use a new - process group id - -2006-11-19 Dan Williams - - Patch from Dan Berrange Gnome.org #377262 - * gnome/vpn-properties/nm-vpn-properties.c - - clean up after renamed VPN connection - -2006-11-19 Dan Williams - - Patch from Dan Berrange Gnome.org #377205 - * gnome/applet/applet-dbus-vpn.c - - (nma_dbus_vpn_properties_cb): sort VPN connections - - * gnome/vpn-properties/nm-vpn-properties.c - - (init_app): sort VPN connections - -2006-11-09 Dan Williams - - * src/NetworkManagerAPList.c - - (nm_ap_list_copy_one_essid_by_address): fix bug due to previous - code cleanup in revision 1.56; the split of the !nm_ap_get_essid() - from the nm_ap_list_get_ap_by_address() call was incorrect and - broke hidden SSID matching. Found by Bill Moss. - -2006-10-25 Dan Williams - - * src/nm-dbus-nm.c - - (nm_dbus_nm_set_active_device): return an empty success message on - success, rather than falling through to the error case. - -2006-10-25 Dan Williams - - * src/NetworkManagerUtils.c - - (nm_utils_supplicant_request_with_check): suppress messages for the - "SCAN" command - -2006-10-24 Dan Williams - - Reduce the number of times the Gnome applet wakes up, especially when - it's doing absolutely nothing and is hidden. Initial patch by - Chris Aillon. - - * gnome/applet/applet-dbus.c - - (nma_dbus_filter): when NM isn't around, or when it goes away, - kill the redraw timeout. When NM starts up, start the redraw - timeout. Also, if we get kicked off the bus for some reason, - start the reconnection timeout if one's not already running. - - (nma_dbus_init): better handling of error conditions, don't leak - a half-initialized dbus connection - - (nma_dbus_connection_watcher): consolidate places we reinitialize - the applet's data, just call nm_dbus_init_helper() - - (nma_start_dbus_connection_watch): new function, starts a periodic - timeout that calls nma_dbus_connection_watcher() - - (nma_dbus_init_helper): if we get a successful connection, kill the - reconnection timeout, and don't start the reconnection timeout - unconditionally anymore - - * gnome/applet/applet-dbus.h - - Expose nma_start_dbus_connection_watch() - - * gnome/applet/applet.c - - (nma_update_state): no longer static, called from applet-dbus.c for - immediate UI updates on certain events - - (nma_set_running): new function; take over setting applet->running, - when not running (ie, NM is not active), don't activate the redraw - timeout because we're not showing the applet anyway. When we are - running (ie, NM is active), and only when we're running, start the - redraw timeout. - - (nma_destroy): kill the redraw timeout by setting 'not running', and - kill any reconnection timeout - - (nma_get_instance): move one-off dbus initialization code here since - nm_dbus_init_helper() gets called more than once, possibly by the - reconnection timeout function too. And, when we start up, if we - can't get a connection to the bus, start the reconnection timeout. - But don't start the redraw timeout yet, only do that when we get - NM's state and find out if it's running or not. - - * gnome/applet/applet.h - - Add the reconnection GSource ID - - Add prototypes for nma_set_running() and the no-longer-static - nma_update_state() - -2006-10-24 Dan Williams - - * src/vpn-daemons/nm-dbus-vpnc.c - - (nm_dbus_vpn_update_one_connection_cb): unregister pending call in - pending call tracker - - (nm_dbus_vpn_connections_update_cb): unregister pending call in - pending call tracker; register one-vpn-connection update pending - call in pending call tracker - - (nm_dbus_vpn_update_one_vpn_connection): register one-vpn-connection - update pending call in pending call tracker - - (nm_dbus_vpn_connections_update_from_nmi): register vpn-connections - update pending call in pending call tracker; don't block waiting - for call to return - -2006-10-19 Robert Love - - * src/backends/NetworkManagerSuSE.c: Don't ever restart nscd; just - refresh the cache. - -2006-10-14 Dan Williams - - * src/dhcp-manager/nm-dhcp-manager.c - - (get_ip4_string, get_ip4_uint32s): have the caller pass - the dbus connection and the device object path rather than - constructing it inside both functions. Saves a bit of memory - and clarifies a failure path. - - (nm_dhcp_manager_get_ip4_config): grab the dbus connection - and allocate device path here rather than each of the two - functions above. - -2006-10-13 Dan Williams - - * src/NetworkManager.c - - (nm_name_owner_changed_handler): handle NMI coming and going, - this somehow droppout in the refactor - -2006-10-13 Dan Williams - - * Huge DBus refactor: - - Create a "DBus Manager" object which manages the connection and - sends signals on NameOwnerChanged and connection/disconnection events, - handles reconnection to the bus if NM gets kicked off, and abstracts - signal handling - - Remove DBusConnection members from places where they are no - longer needed due to the refactor, like the dbus-connection - property of the named manager, and from NMData - - Reformats a bunch of the code to gnome style - (8-space tabs, braces on same line as statement, 80-col width). - Consider it open season to reformat any bits to gnome style. - style that aren't already. - -2006-10-13 Dan Williams - - * src/supplicant-manager/Makefile.am - - Add new files - - * src/supplicant-manager/nm-supplicant-manager.[ch]: - - Make it a minimal GObject - - * src/supplicant-manager/nm-supplicant-settings-verify.[ch]: - - Verify settings destined for wpa_supplicant - - * src/supplicant-manager/nm-supplicant-connection.[ch]: - - Minimal GObject to track wpa_supplicant controlled device - connections - -2006-10-13 Wouter Bolsterlee - - * gnome/applet/applet.c: (nma_update_info), - (nma_act_stage_to_pixbuf), (nma_update_state): - Mark missing strings for translation. Fixes bug #343306. - -2006-10-01 Dan Williams - - * src/vpn-manager/nm-vpn-manager.c - - (nm_vpn_manager_load_services): split and clean up - for readability and correctness. Restrict VPN service - files to ending in ".name", as was meant from the - beginning (but not coded in). Better error reporting. - -2006-10-01 Dan Williams - - * utils/nm-utils.h - - Clean up formatting of debug/info/warning log messages - -2006-09-27 Robert Love - - Patch by Tambet Ingo : - * gnome/vpn-properties/nm-vpn-properties.c: Make Renaming a VPN entry - actually work. - -2006-09-07 Dan Williams - - * test/Makefile.am - test/libnm-util/Makefile.am - test/nm-supplicant-test.c - - Add test program emulating the way NM drives wpa_supplicant - to help debug supplicant issues - -2006-08-24 Dan Williams - - * configure.in - src/Makefile.am - src/supplicant-manager/Makefile.am - src/supplicant-manager/nm-supplicant-manager.c - src/supplicant-manager/nm-supplicant-manager.h - - Add skeleton bits of the wpa_supplicant manager - -2006-08-24 Dan Williams - - Patch from Ed Catmur: - * src/NetworkManagerUtils.c - - (nm_utils_ip4_netmask_to_prefix): don't infinitely loop - if netmask is 0 (Gnome #352634) - -2006-08-17 Robert Love - - * src/backends/NetworkManagerSuSE.c: Do not restart ypbind; our ypbind - package is now DBUS-enabled and listens for the NM signals. - -2006-08-14 Dan Williams - - * Patch from Christian Persch - * configure.in - po/LINGUAS - vpn-daemons/openvpn/po/LINGUAS - vpn-daemons/openvpn/configure.in - vpn-daemons/pptp/po/LINGUAS - vpn-daemons/pptp/configure.in - vpn-daemons/vpnc/po/LINGUAS - vpn-daemons/vpnc/configure.in - - Convert to LINGUAS method so translators don't have to modify - configure.in, just stuff in po/. Gnome #343132, requires intltool - 0.35 or higher - -2006-08-14 Dan Williams - - Patch from Alex Smith - * configure.in - src/backends/Makefile.am - src/backends/NetworkManagerFrugalware.c - - Add support for Frugalware - -2006-08-13 Dan Williams - - Patch from Valentine Sinitsyn - * src/nm-device-802-11-wireless.c - - (supplicant_exec): spawn wpa_supplicant without debug spew - Gnome #346875 - -2006-08-13 Dan Williams - - Patch from Valentine Sinitsyn - * src/nm-ap-security.c - src/nm-ap-security.h - - Add authentication_required bits for subclasses to specify whether - or not real authentication is required for connections, i.e. whether - the AP rejects us when an encryption key is wrong or not. - - * src/nm-ap-security-wep.c - src/nm-ap-security-wpa-eap.c - src/nm-ap-security-wpa-psk.c - src/nm-ap-security-leap.c - - Implement authentication_required appropriately for each method - - * src/nm-device-802-11-wireless.c - - Be smarter about when to request a key; for example, using a wrong key - in WEP shared key mode previously just timed out and did not request - a new key - -2006-08-13 Dan Williams - - * gnome/libnm_glib/libnm_glib.c - - dbus_connection_disconnect() -> dbus_connection_close() for - dbus >= 0.90 - -2006-08-07 Dan Williams - - Patch from Antony J Mee - * src/NetworkManagerSystem.c - - Respect specified MTU. Gnome #344967 - -2006-08-07 Dan Williams - - * src/vpn-manager/nm-vpn-service.c - - Simplify print_vpn_config() arguments - - Patch from Antony J Mee - * src/vpn-manager/Makefile.am - src/vpn-manager/nm-vpn-service.c - - Add new API for passing VPN config options as a dict. Gnome #344967 - -2006-08-06 Dan Williams - - * gnome/applet/applet-dbus-devices.c - gnome/applet/applet-dbus-vpn.c - gnome/applet/applet-dbus.c - gnome/applet/applet-dbus.h - src/nm-dbus-nmi.c - utils/nm-utils.c - utils/nm-utils.h - - Make pending call tracking code generic, - so we can use it in NM as well as the applet - -2006-08-06 Dan Williams - - * src/nm-activation-request.c - - Refcount pending call objects - -2006-08-06 Dan Williams - - Patch from Christan Chiesa - * configure.in - - Tell sha1.c to use bigendian mode on PPC - -2006-08-04 Robert Love - - Glib Memory Slices! - * configure.in: Require glib 2.10 or later. - * src/NetworkManager.c, src/NetworkManagerAP.c, src/nm-ip4-config.c, - src/NetworkManagerAPList.c, src/NetworkManagerDbus.c, - src/NetworkManagerDbusUtils.c, src/nm-dbus-nmi.c, src/wpa.c, - src/nm-device-802-11-wireless.c: Convert applicable g_malloc and - g_new calls to g_slice_new. Likewise for g_free to g_slice_free. - Memory Slices are the greatest thing since bread slices. - * src/NetworkManagerAP.c: Also, fix memory leak. - -2006-08-01 Robert Love - - * gnome/applet/main.c: Shutdown all VPN connections on logout. - -2006-07-31 Robert Love - - * src/backends/interface_parser.c: Declarations must begin the block. - -2006-07-24 Dan Williams - - Patch from Timothée Lecomte - * src/backends/Makefile.am - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerGeneric.c - src/backends/NetworkManagerGeneric.h - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - - Genericize common backend functions - -2006-07-18 Robert Love - - * configure.in: Add "--with-notify" option to allow disabling of - libnotify support. - -2006-07-13 Dan Williams - - Patch from Thiago Bauermann - * gnome/applet/applet.glade - gnome/applet/Makefile.am - gnome/applet/nm-gconf-wso.c - gnome/applet/nm-gconf-wso-leap.c - gnome/applet/nm-gconf-wso-leap.h - gnome/applet/wireless-security-manager.c - gnome/applet/wso-leap.c - gnome/applet/wso-leap.h - include/NetworkManager.h - libnm-util/dbus-helpers.c - libnm-util/dbus-helpers.h - src/Makefile.am - src/NetworkManagerAP.c - src/nm-ap-security.c - src/nm-ap-security-leap.c - src/nm-ap-security-leap.h - - Add LEAP authentication support - -2006-07-13 Dan Williams - - Patch from Timothée Lecomte - * configure.in - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - src/backends/NetworkManagerSuSE.c - - Convert hardcoding of 'ip' path to configure-time - detected one - -2006-07-12 Leonid Kanter - - * configure.in: added ru to ALL_LINGUAS - -2006-07-10 Dan Williams - - Patch from Valentine Sinitsyn - * src/nm-device.c - - (real_act_stage3_ip_config_start): don't infinite loop when - dhcdbd isn't running (Gnome #346845) - -2006-07-09 Dan Williams - - * gnome/applet/applet.c - - (nma_destroy): don't pass NULL to notify_notification_close - (RH #197917) - -2006-07-09 Dan Williams - - * gnome/applet/applet.c - - (nma_about_cb): remove empty documenters tab (Gnome #341324) - -2006-07-04 Tor Krill - - Patch from Valentine Sinitsyn - * src/backends/NetworkManagerArch.c: (nm_system_update_dns), - (nm_system_restart_mdns_responder), (ArchReadConfig), - (nm_system_device_get_system_config): - - Explicitly check for DHCP configuration - - Check if daemons are running before starting them - -2006-06-25 Dan Williams - - * libnm-util/dbus-dict-helpers.[ch] - test/libnm-util/test-dbus-dict-helpers.c - - Add string array support - -2006-06-24 Dan Williams - - * src/dhcp-manager/nm-dhcp-manager.c - - (nm_dhcp_manager_process_signal): clean up spacing - -2006-06-21 Dan Williams - - * src/nm-dbus-device.c - - (nm_dbus_device_get_driver): don't try to stuff a NULL - through dbus - -2006-06-21 Raivis Dejus - - * configure.in: Added 'lv' to ALL_LINGUAS - -2006-06-19 Dan Williams - - * src/NetworkManagerAP.c - - Clarify usage of user_created - - * src/nm-ap-security-wep.c - src/nm-ap-security-wpa-eap.c - src/nm-ap-security-wpa-psk.c - src/nm-ap-security.c - src/nm-ap-security.h - - s/user_created/adhoc, because we really do mean adhoc - - Patch from Bernard Blackham - * src/nm-device-802-11-wireless.c - - (supplicant_send_network_config): instead of user_created, - use adhoc, and do AP_SCAN 2 for adhoc networks - -2006-06-18 Robert Love - - * gnome/applet/nm-gconf-wso-wpa-eap.c: Don't set the Gconf keys unless - we have a value to set. Gconf generates a warning if `val' is NULL. - * src/nm-ap-security-wpa-eap.c: Don't set the key for an Enterprise AP - unless we actually received a valid private key file passphrase or - password. Otherwise, we don't know to later ask the applet to pull - the key from the keyring. - -2006-06-17 Dan Williams - - * libnm-util/dbus-dict-helpers.[ch] - test/libnm-util/test-dbus-dict-helpers.c - - Fixes for zero-length byte arrays - - Replace return values of 0 with FALSE for clarity - - Test zero-length byte arrays - -2006-06-17 Dan Williams - - * libnm-util/dbus-dict-helpers.[ch] - test/libnm-util/test-dbus-dict-helpers.c - - Add helpers for byte arrays - - Rework bits of the testcase - -2006-06-16 Dan Williams - - * libnm-util/Makefile.am - * libnm-util/dbus-dict-helpers.[ch] - - Add some helpers to take the pain out of using dict types in - dbus. - - * test/libnm-util/Makefile.am - * test/libnm-util/test-dbus-dict-helpers.c - - Test cases for the dict helper functions - -2006-06-15 Robert Love - - * gnome/applet/nm-gconf-wso-wpa-eap.c: Don't set the key unless there - is a non-empty key to set. Elsewhere, pass an empty string via DBUS - if there is no key to pass. - * libnm-util/dbus-helpers.c: Given the above, we can trust always - receiving a non-NULL key. - -2006-06-14 Robert Love - - * src/nm-ap-security-wpa-eap.c: In real_copy_constructor(), actually - copy the strings. - - -2006-06-14 Dan Williams - - Patch from Lorenzo Colitti gnome.org #344825 - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_set_essid): only wait for orinoco cards - or ones where the driver is unknown - - (supplicant_exec): don't wait for supplicant startup here - - (supplicant_interface_init): finer grained polling for supplicant - startup - -2006-06-13 Robert Love - - * gnome/applet/applet-dbus-info.c: Don't set the fallback bit to FALSE - if it is currently set to TRUE. Otherwise, we will reset the value - when we connect normally. - * src/nm-device-802-11-wireless.c: For the roaming code, make sure that - the old BSSID is valid, too. The recently added ESSID check may not be - sufficient (we can remove it?). What we really want to catch is the - case of going from all-zeros to the BSSID of some other network, which - happens on failure. - -2006-06-09 Dan Williams - - * src/NetworkManagerSystem.[ch] - - (nm_system_device_set_up_down_with_iface): remove 'dev' argument, - it was unused and pointless - - (nm_system_vpn_device_set_from_iface, nm_system_device_set_up_down): - fix for set_up_down_with_iface change - - * src/vpn-manager/nm-vpn-connection.c - - (nm_vpn_connection_deactivate): fix for set_up_down_with_iface change - - * src/backends/NetworkManagerPaldo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSuSE.c - src/backends/NetworkManagerArch.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerGentoo.c - - (nm_system_enable_loopback): use set_up_down_with_iface where - appropriate - - (nm_system_flush_loopback_routes): use flush_routes_with_iface - where appropriate - -2006-06-09 Dan Williams - - Patch from Peter Jones: - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_update_bssid): make sure that the - SSID hasn't changed from what we expect before automatically - updating the saved BSSID from a new AP - -2006-06-08 Robert Love - - Add 'fallback' support. NetworkManager will attempt to brute-force - connect to networks marked as fallback if there are no better wireless - connections available. This is useful as a method of last resort, to - work around driver problems, and for use with hidden networks. - * gnome/applet/applet-dbus-devices.c, - gnome/applet/applet-dbus-devices.h: Add fallback parameter. - * gnome/applet/applet-dbus-info.c: Retrieve fallback bit from Gconf and - pass it on via DBUS. - * gnome/applet/applet.c: No fallback by default. - * gnome/applet/applet.glade, gnome/applet/other-network-dialog.c: - Update other-network-dialog to add UI checkbox toggling fallback. - * src/NetworkManagerAP.c, src/NetworkManagerAP.h: Remove "trusted" - propery from AP object. Add "fallback" property to AP object. - * src/nm-dbus-nm.c: Grab the fallback parameter via DBUS. - * src/nm-dbus-nmi.c: Grab the fallback parameter via DBUS. - * src/nm-device-802-11-wireless.c: Break out blacklist logic into - separate function. Add get_best_fallback_ap() for returning an AP - on which to attempt fallback. - * src/backends/NetworkManagerSuSE.c: Set stored network as fallback. - * test/nm-set-fallback: New file. Sets a given network as fallback. - -2006-06-07 Robert Love - - * gnome/applet/gconf-helpers.c: Bug fix: nm_gconf_helper_get_bool() - checked that the return type was GCONF_VALUE_STRING, not the correct - GCONF_VALUE_BOOL, and thus it never worked. - * src/NetworkManagerAPList.c: Before concluding that two networks are - identical based on their BSSID, make sure that the BSSID in question - is actually valid. Specifically, an empty or all zero BSSID does not - cut it. - * gnome/applet/applet-dbus-info.c, gnome/applet/other-network-dialog.c, - src/nm-dbus-nmi.c, src/nm-device-802-11-wireless.c: White space and - similar invariant clean up. - -2006-06-02 Robert Love - - * gnome/applet/applet.c: Update copyright years. Add Novell. - -2006-05-28 Dan Williams - - * gnome/applet/applet.glade - gnome/vpn-properties/nm-vpn-properties.glade - - Set window icons on dialogs (Gnome.org #333420) - -2006-05-28 Christian Persch - - * gnome/vpn-properties/nm-vpn-properties.glade: - * vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade: - * vpn-daemons/pptp/properties/nm-pptp-dialog.glade: - * vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade: - - Make the VPN properties pages prettier and more HIG - compliant. Gnome Bug #336913. - -2006-05-28 Dan Williams - - Patch from Christian Persch - * gnome/vpn-properties/nm-vpn-properties.c - * gnome/vpn-properties/nm-vpn-properties.glade - - HIG-ification love (Gnome.org #336846) - -2006-05-28 Dan Williams - - Patch from Christian Persch - * configure.in - gnome/vpn-properties/nm-vpn-properties.c - - (main): Fix option parsing. Gnome.org #336847 - -2006-05-28 Dan Williams - - * gnome/vpn-properties/nm-vpn-properties.c - - (find_vpn_ui_by_service_name): protect against NULL service names - - (update_edit_del_sensitivity): protect against NULL service names - Gnome.org #341306 - -2006-05-28 Dan Williams - - Patch from Chris Fuller : - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_dispose): add a is_initialized member and - don't dispose of wireless-specific stuff unless it is actually - initialized. Gnome.org #341263 - -2006-05-28 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): don't switch devices if the "best" - AP is essentially the same as the current activation request, but - the current activation request isn't done activating yet. Fixes - multiple requests for keyring password on startup for Gnome applet. - Gnome.org #341297 - -2006-05-26 Nicolas Trangez - - * src/NetworkManager.c: use GOptions instead of getopt - * configure.in: bump glib required version to >= 2.6 for GOption - support - -2006-05-25 Robert Love - - * src/nm-device.h: Introduce nm_ioctl_info(), which defines to - nm_info() if IOCTL_DEBUG is set and a no-op if not. We can use this - instead of dumping ifdef's throughout the code. - * src/NetworkManagerSystem.c, src/nm-device-802-11-wireless.c, - src/nm-device-802-3-ethernet.c, src/nm-device.c: Remove ifdef's and - use nm_ioctl_info() in lieu. - -2006-05-25 Robert Love - - Patch Valentine Sinitsyn to fix GNOME bug #342400: - * libnm-util/Makefile.am: Only build gnome-keyring-md5.{c,h} if we are - not using gcrypt. Otherwise, we get a linker error. - -2006-05-25 Robert Love - - Patch Valentine Sinitsyn to fix GNOME bug #342398: - * configure.in, gnome/Makefile.am, Makefile.am: Add "--without-gnome" - configure flag to disable building of the GNOME-based applet. - -2006-05-25 Robert Love - - * gnome/applet/nm-device.c, gnome/applet/nm-device.h: Rename function - parameter from link, because it shadows a global variable with some - older versions of glibc. Yes, glibc is now fixed and, yes, glibc - should never have exported to the entire system a common four letter - word. But we here at NetworkManager are team players. Fixes - GNOME bug #336532. - -2006-05-25 Arangel Angov - - * configure.in: Added mk.po, Macedonian translation. - -2006-05-24 Robert Love - - * examples/python/systray/eggtrayicon.c, gnome/applet/eggtrayicon.c, - gnome/applet/passphrase-dialog.c, gnome/applet/vpn-password-dialog.c, - src/NetworkManager.c: Include and not . - -2006-05-24 Robert Love - - * gnome/applet/Makefile.am, gnome/vpn-properties/Makefile.am, - libnm-util/Makefile.am, src/Makefile.am, - vpn-daemons/openvpn/auth-dialog/Makefile.am, - vpn-daemons/openvpn/properties/Makefile.am, - vpn-daemons/pptp/auth-dialog/Makefile.am, - vpn-daemons/pptp/properties/Makefile.am, - vpn-daemons/vpnc/auth-dialog/Makefile.am, - vpn-daemons/vpnc/properties/Makefile.am: Do not override what the - user passed for --datadir, if anything, when setting the GNOME locale - directory. It should be a function of the specified datadir and not - the prefix. - -2006-05-24 Robert Love - - * gnome/applet/main.c, gnome/vpn-properties/nm-vpn-properties.c, - src/NetworkManager.c: Take care to call bindtextdomain with the - location of msgid files. - * src/Makefile.am: Set GNOMELOCALEDIR to the location of GNOME mo - files. - -2006-05-22 Robert Love - - * src/nm-device-802-11-wireless.c: Don't chain up to the parent's - stage4_timeout on failure unless the wireless network is Ad-Hoc. - 99% of the time there is a real problem with wireless, and a - seemingly successful connection via Zeroconf just confuses the user. - And that 1% of the time the network is probably Ad-Hoc, anyhow. - -2006-05-22 Robert Love - - * src/backends/NetworkManagerSuSE.c: Reload, do not restart, ypbind and - autofs on interface up if NIS is configured. On interface down, do - nothing. - -2006-05-22 Robert Love - - * gnome/applet/applet.c: Zero out the icon pointers before we set them, - to avoid calling g_object_unref() on stale pointers on error in - nma_icons_free(). This happens because we short-circuit loaded the - icons on the first failure but then free all icons. Normally we have - no issue because the icons were zero'ed out malloc, but we have stale - pointer data after nma_icon_theme_changed(). - * gnome/applet/main.c: Return error code if nma_new() failed. - -2060-05-21 Dan Williams - - * initscript/NetworkManager.in - - Ensure both dhcdbd and named are started before NM - -2006-05-21 Dan Williams - - * configure.in - - Bump version to 0.7 to signify we are in 0.7 development - -2006-05-21 Dan Williams - - Patch from Adam Schreiber - * gnome/vpn-properties/nm-vpn-properties.c - - (main): correct Gnome program name (gnome.org #342498) - -2006-05-21 Dan Williams - - Fix gnome.org #330832 based on patch from Crispin Flowerday - - * src/NetworkManagerDbus.[ch] - - nm_dbus_get_device_from_object_path -> nm_dbus_get_device_from_escaped_object_path: - clarify that function's argument should be an escaped dbus object - path, and look for path segment end before returning a match - * src/nm-dbus-nm.c: - - Fix up users of nm_dbus_get_device_from_escaped_object_path() - -2006-05-17 Robert Love - - Functionality to differentiate Ad-Hoc networks from infrastructure - networks in the applet, by displaying a special icon: - * gnome/applet/applet-dbus-devices.c: Set the mode for new networks. - * gnome/applet/applet.c: Pass 'applet' to network_menu_item_update(). - * gnome/applet/menu-items.c: Set a special icon in the scan list for - ad-hoc networks. TODO: Add a third icon representing "encrypted and - Ad-Hoc". Right now, we display the same icon for all Ad-Hoc wireless - networks, encrypted or not. - * gnome/applet/wireless-network.c, gnome/applet/wireless-network.h: New - accessor functions to get and set the mode of a given network, - wireless_network_get_mode() and wireless_network_set_mode(). - -2006-05-17 Robert Love - - Functionality to automatically add BSSIDs to the allowed-MAC list as - one roams from access point to access point on a given network: - * src/NetworkManagerUtils.c: Add nm_ethernet_addresses_are_equal(), - helper function to compare two ether_addr structures and return TRUE - if they contain the same MAC address. - * src/NetworkManagerUtils.h: Add nm_ethernet_addresses_are_equal() - prototype. - * src/nm-device-802-11-wireless.c: New function to update the BSSID - stored with the current AP. If the BSSID has indeed changed, we - send it out to the applet, allowing the allowed-MAC list to grow - automatically in response to roaming. - -2006-05-16 Robert Love - - * src/backends/NetworkManagerSuSE.c: Don't touch ypbind or autofs - unless dhcp:DHCLIENT_MODIFY_NIS_CONF is set to "yes". - -2006-05-13 Dan Williams - - * src/nm-device-802-3-ethernet.c - - (real_get_generic_capabilities): Don't ignore devices that can't do - carrier detect (Debian bug #366373) - -2006-05-11 Dan Williams - - Patch from Michael Biebl - * src/backends/NetworkManagerDebian.c - - Debian backend fixups - -2006-05-10 Robert Love - - * src/backends/NetworkManagerSuSE.c: Fix double free (Novell #173442). - -2006-05-09 Robert Love - - * gnome/applet/nm-gconf-wso-wpa-eap.c: Fix FIXME: Save the WPA EAP - private certificate passphrase, if any, in the GNOME Keyring. - * libnm-utils/dbus-helpers.c: Update. - -2006-05-05 Dan Williams - - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_set_wep_enc_key): convert to - nm_device_802_11_wireless_disable_encryption() since that's all - we use it for anymore; we don't ever set WEP keys ourselves. - - (real_deactivate_quickly): reset SSID and encryption keys - - (real_deactivate): move SSID and encryption key reset to - real_deactivate_quickly(), which gets run before us anyway - -2006-05-05 Robert Love - - * src/NetworkManager.c: Set the umask to 0022 when daemonizing, in case - root has a wacky default of its own (or, more common, a user has a - bad umask and uses su/sudo to restart NetworkManager). Anything - other than 0022 does not do what we want with, for example, - resolv.conf. This problem is amplified by our judicious use of - fopen(), which uses mode 0666 -- implying that the only way to get - the permissions we want is with a umask of 0022. - -2006-05-05 Dan Williams - - * gnome/libnm_glib/libnm_glib.c - - Don't suck CPU when dbus isn't around by scheduling idle handlers - to reconnect; instead wait a bit more with each reconnect attempt - up to a max of one minute. - -2006-05-04 Ryan Lortie - - * gnome/applet/passphrase-dialog.c (update_button_cb): Get the SSID of - the WirelessNetwork structure using the proper function instead of - just casting it directly to (const char *) (gnome.org #336991) - -2006-05-03 Robert Love - - * src/backends/NetworkManagerSuSE.c: Respect the variable - dhcp:DHCLIENT_MODIFY_RESOLV_CONF, not - config:MODIFY_RESOLV_CONF_DYNAMICALLY, when deciding whether or not - to dynamically update /etc/resolv.conf. - -2006-05-02 Peter Jones - - * vpn-daemons/vpnc/src/nm-vpnc-service.c: Allow rekeying. - -2006-05-02 Robert Love - - Patch by Timo Hoenig; - * tests/nm-online.c: Print pretty status indicator as timeout winds - down. Also fix possible race between DBUS startup and failure - return. - -2006-05-01 Robert Love - - * gnome/applet/applet-compat.c: Warn if the returned escaped ESSID is - empty, too. - -2006-04-27 Jeremy Katz - - * src/nm-device.c (discover_device_type): Actually use the hal - device type instead of ioctl poking - -2006-04-26 Robert Love - - * tests/nm-online.c: New file. Simple utility that returns exit status - noting whether the connection is offline or online. If offline on - start, it waits 30 seconds (or a command-line given value) for an - online signal. If it times out, it again returns offline. This is - useful for scripts that want to wait for network connections. - -2006-04-25 Robert Love - - * src/nm-ap-security-wep.c: Bug fix: We stopped setting the - key mode (the authentication algorithm), e.g. open or shared, when we - moved to using wpa_supplicant. wpa_supplicant defaults to open, so - only shared was broken. If the user specified a shared key, set it - explicitly, otherwise let wpa_supplicant go with the default. - -2006-04-24 Dan Williams - - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_set_essid): fix setting of "any" essid - -2006-04-24 Dan Williams - - Commit the async scanning patch - - * src/nm-device-802-11-wireless.c - - get rid of scan_mutex - - (wireless_event_helper): act on wireless scan events - - (real_start): schedule a pending scan - - (link_to_specific_ap): fake the link to the AP during a scan - - (nm_device_802_11_wireless_update_signal_strength): ignore signal - strength during scans - - (nm_device_get_frequency, nm_device_set_frequency, nm_device_get_bitrate, - nm_device_set_bitrate): unused with new scanning code, disable - - (nm_device_wireless_schedule_scan): removed - - (nm_device_wireless_process_scan_results): renamed to convert_scan_results() - - (request_and_convert_scan_results): new function; retrieve scan - results from the driver and schedule the processing function - - (scan_results_timeout): timeout triggered when card doesn't send - a scan results wireless event during a certain interval - - (schedule_scan_results_timeout): new function; schedule the scan - results timeout - - (cancel_scan_results_timeout): new function; cancel the scan - results timeout - - (nm_device_802_11_wireless_scan): if wpa_supplicant is running, ask it - to do the scanning. Otherwise, just request a scan but don't - grab results here; instead schedule a timeout for scan results and - let netlink notify us of scan completion events - - (nm_device_wireless_schedule_scan): new function; schedule a wireless scan - - (cancel_pending_scan): new function; cancel a pending wireless scan - - (supplicant_status_cb): ignore disconnect events while scanning - - (supplicant_exec): wait a bit longer for the supplicant to start up - - (nm_device_802_11_wireless_dispose): cancel pending scans and results - timeouts - - (get_scan_results): removed; folded into request_and_convert_scan_results() - -2006-04-24 Dan Williams - - * gnome/applet/applet-dbus.c - - Disable the pending call debug stuff, seems under control now - -2006-04-20 Robert Love - - Fix bug where hidden ESSID's would not show up in the applet, even - if NMI provided a BSSID -> ESSID mapping from Gconf. This occurred - because nm_policy_device_list_update_from_allowed_list() would merge - the data, putting a name to the hidden networks, but never notify NMI - of the changes. Simple fix is to invoke the function - nm_dbus_signal_wireless_network_change() if we make a mapping. - * src/NetworkManagerAPList.c: Call the function - nm_dbus_signal_wireless_network_change() if we made a successful - BSSID to ESSID mapping, notifying the applet of the "new" network. - * src/NetworkManagerAPList.h: Update the prototypes for both - nm_ap_list_copy_essids_by_address() and - nm_ap_list_copy_one_essid_by_address(). - -2006-04-20 Robert Love - - * gnome/applet/applet-dbus-info.c: Don't bail out if the timestamp is - not set. Just return zero. - -2006-04-20 Robert Love - - * gnome/vpn-properties/nm-vpn-properties.c: Satisfy TODO: Ensure that - only one copy of nm-vpn-properties is running at a time via the 'ol - X selection trick. This prevents the user from opening two "VPN - Connections" windows from within the applet, which leads to mass - hysteria. - * clipboard.c: New file, implementing simple X selection logic. - * clipboard.h: New file. - * gnome/vpn-properties/Makefile.am: Add clipboard.{c,h} - -2006-04-18 Nicolas Trangez - - * backends/NetworkManagerGentoo.c: Small cleanups and enhancements - * configure.in - initscript/Gentoo/Makefile.am - initscript/Gentoo/NetworkManagerDispatcher.in - - New script - * initscript/Gentoo/NetworkManager.in: small dependency fixup from - Gentopia - -2006-04-16 Dan Williams - - Patch from Paul Blazejowski - * configure.in - initscript/Slackware/Makefile.am - initscript/Slackware/rc.networkmanager-dispatcher.in - initscript/Slackware/rc.networkmanager.in - - Update slackware initscripts - -2006-04-10 Robert Love - - * gnome/vpn-properties/nm-vpn-properties.c: Intercept and short-circuit - the "delete_event" signal on the druid's parent window and handle it - our way, lest using the WM to close the druid results in a series of - bloody and ultimately lethal errors. - -2006-04-10 Robert Love - - * gnome/vpn-properties/nm-vpn-properties.c: Validate VPN settings on - 'Back' too or else the 'Forward' option is initially disabled despite - valid input. - -2006-04-06 Robert Love - - Fix bad but simple bug where an active modem connection did not update - NM's connection state, breaking any app that did online/offline: - * src/NetworkManagerMain.h: Add 'modem_active' member to NMData, - represented whether a dial up connection is active, or not. - * src/nm-dbus-nm.c: Set and unset 'modem_active' in response - to modem activation and deactivation. - * src/NetworkManagerDbus.c: When asked our state, do not return - disconnected if the modem is active. - -2006-04-04 Robert Love - - * gnome/applet/applet.c: Remove the 'Remove' option that I added to the - applet. It just confuses the crap out of people and does not make a - lot of sense, as the daemon still runs. - -2006-04-02 Tor Krill - - * initscript/Arch/networkmanager.in: Added checks for HAL and dhcdbd - in start of service. - * src/backends/NetworkManagerArch.c: (nm_system_get_mtu): Added to - get Archlinux backend up to date. - -2006-03-29 Robert Love - - Patch by Vinay R and Robert Love , - to add support for per-route MSS and improve support for per-interface - MTU: - * src/NetworkManagerSystem.c: Modify nm_system_device_set_ip4_route to - optionally take an MSS parameter and set it for the given route. - Remove nm_system_device_set_ip4_route_with_iface. Pass in the - NMIP4Config's stored MSS, if any. - * src/nm-ip4-config.c: Add 'mtu' and 'mss' to NMIP4Config, representing - the interface's MTU and the route's MSS, respectively. Add functions - nm_ip4_config_get_mtu, nm_ip4_config_set_mtu, nm_ip4_config_get_mss, - and nm_ip4_config_set_mss for retrieving and setting the MTU and the - MSS. - * src/nm-ip4-config.h: Add prototypes for nm_ip4_config_get_mtu, - nm_ip4_config_set_mtu, nm_ip4_config_get_mss, and - nm_ip4_config_set_mss. - * src/vpn-manager/nm-vpn-service.c: Modify to receive the MSS from the - VPN daemon. - * src/backends/NetworkManager{Arch,Debian,Gentoo,RedHat,Slackware,SUSE}.c: - Change the retval of nm_system_get_mtu to guint32. - * src/dhcp-manager/nm-dhcp-manager.c: Set the MTU on the new DHCP-given - NMIP4Config to the MTU provided by the system, if any. TODO: If DHCP - servers can specify MTU's, we should set it here if the MTU was not - provided. - -2006-03-27 Jürg Billeter - - * configure.in: - * initscript/Makefile.am: - * initscript/paldo/Makefile.am: - * initscript/paldo/NetworkManager.in: - * initscript/paldo/NetworkManagerDispatcher.in: - * src/backends/Makefile.am: - * src/backends/NetworkManagerPaldo.c: - - Add paldo support - -2006-03-27 Dan Williams - - Patch from Christian Persch - * gnome/applet/applet.glade - - HIG fixes; mostly for spacing and borders (gnome.org #336220) - -2006-03-27 Dan Williams - - Patch from Diffe - * src/backends/NetworkManagerSlackware.c - - Don't restart howl, since it's been replaced by Avahi - in most distributions - -2006-03-27 Dan Williams - - Patch from Tor Krill - * configure.in - initscript/Makefile.am - src/backends/Makefile.am - src/backends/NetworkManagerArch.c - initscript/Arch/Makefile.am - initscript/Arch/networkmanager-dispatcher.in - initscript/Arch/networkmanager.in - - Add Arch Linux support, fixes gnome.org #335147 - -2006-03-27 Dan Williams - - Patch from Diffe - * initscript/Slackware/rc.networkmanager - - update, fixed gnome.org #333368 - -2006-03-27 Robert Love - - * gnome/applet/other-network-dialog.c: Do not allow the user to try to - create WPA-EAP Ad-Hoc networks because such an action makes no sense. - -2006-03-27 Robert Love - - Patch by Jürg Billeter : - * src/nm-logging.c: Add printf modifier to fix warning on 64-bit - systems. - * src/nm-netlink-monitor.c: Include instead of - as we prefer glibc over kernel headers, if possible. - -2006-03-27 Robert Love - - Patch by Jon Escombe : - * gnome/applet/nm-gconf-wso.c: Add missing NM_AUTH_TYPE_WPA_EAP case. - * gnome/applet/nm-gconf-wso-wpa-eap.c: If retrieving the gconf values - fail, don't bail out. We don't expect all of the various WPA-EAP - values to be present. - * src/nm-ap-security.c: We need to match all capabilities for each - encryption type, not any one of them. - -2006-03-27 Robert Love - - * src/backends/NetworkManagerSuSE.c: Revert 2006-03-17 commit and again - restart, not reload, ypbind. Unfortunately there is no superior - solution. - -2006-03-24 Christopher Aillon - - * gnome/applet/applet-notifications.c: - When displaying a notification, make sure to get rid of the - previous notification so as to not have competing bubbles, - and stop leaking the old one. - - * gnome/applet/applet.c: - * gnome/applet/applet.h: - Add a new 'notification' member to the applet, and zero it out - and free it appropriately. - -2006-03-23 Robert Love - - Patch by j : - * gnome/applet/applet.glade: Don't set the invisible_char property, - which simply overrides the GTK default. By and by, this behavior - ought to be fixed in Glade. - -2006-03-22 Robert Love - - * src/dhcp-manager/nm-dhcp-manager.c: Bump timeout to 45 seconds. - -2006-03-22 Robert Love - - Bug fix by Timo Hoenig : - * gnome/applet/applet-dbus.c: Let the applet reconnect to DBUS on - disconnect. Otherwise, we have the daemon surviving DBUS restarts - and the applet going AWOL. - -2006-03-22 Robert Love - - * src/dhcp-manager/nm-dhcp-manager.c: Create NM_DHCP_TIMEOUT - preprocessor define and use it instead of open-coded the DHCP - timeout, which is currently 25 seconds, everywhere. - -2006-03-22 Robert Love - - Implement "Dynamic WEP", which is basically WPA authentication and WEP - key exchange via WPA, ostensibly providing good security without - requiring hardware that supports full WPA. Also, add UI elements to - allow the user to select the pairwise & group cipher for WPA Enterprise - networks, too: - * gnome/applet/applet.glade: Update glade file. - * gnome/applet/nm-gconf-wso-wpa-eap.c: Serialize and deserialize the - key type, too, to and from gconf. - * gnome/applet/wireless-security-option.c: Add "wpa_eap" parameter to - wso_wpa_create_key_type_model(), noting whether we are handling PSK - or EAP configuration, and in the latter case add in "Dynamic WEP" if - the capabilities match. - * gnome/applet/wso-private.h: Update wso_wpa_create_key_type_model()'s - prototype. - * gnome/applet/wso-wpa-eap.c: Manage UI elements for the key type and - serialize from UI to DBUS. - * gnome/applet/wso-wpa-psk.c: Cannot fail and always returns at least - one element. - * libnm-util/dbus-helpers.c: Update nmu_security_serialize_wpa_eap(), - nmu_security_serialize_wpa_eap_with_cipher(), and - nmu_security_deserialize_wpa_eap() to take a "key_type" parameter and - serialize/deserialize the key type via DBUS as the new third DBUS - parameter. - * libnm-util/dbus-helpers.h: Update prototypes. - * src/nm-ap-security-wpa-eap.c: Deserialize the key type from DBUS, - too. If the key type is WEP104, do Dynamic WEP, which means - "IEEE8021X" for "key_mgmt". Also add support for user-specified - pairwise and group ciphers (fixes a FIXME). - -2006-03-21 Robert Love - - * src/NetworkManagerSystem.c, src/NetworkManagerSystem.h: Add - nm_system_get_mtu(), which returns a user-provided or system-mandated - MTU value for a given device, if any, or zero if no such value - exists. Add nm_system_set_mtu() to set the MTU for a given device - if we have a provided value. - * src/nm-device.c: Set the MTU of devices. - * src/backends/NetworkManagerSuSE.c: Read MTU, if any, from sysconfig. - * src/backends/NetworkManagerDebian.c, - src/backends/NetworkManagerGentoo.c, - src/backends/NetworkManagerRedHat.c, - src/backends/NetworkManagerSlackware.c: Implement stub functions. - -2006-03-21 Robert Love - - * src/backends/NetworkManagerSuSE.c: Strip hypens from hex key in - configuration file. - -2006-03-17 Robert Love - - * src/backends/NetworkManagerSuSE.c: Do "rcypbind reload" to send the - signal SIGHUP to ypbind, not "rcypbind restart" to physically restart - it, in case it is not running in the first place. We just want its - configuration reloaded. Also, do not "rcypbind stop" on device down. - -2006-03-15 Robert Love - - * gnome/applet/applet.glade, gnome/applet/wso-wep-ascii.c, - gnome/applet/wso-wep-hex.c, gnome/applet/wso-wep-passphrase.c: The - label "WEP 40/128-bit" is inconsistent because the physical key size - is 40 or 104-bits, to which a 24-bit initialisation vector is - appended, forming a 64 or 128-bit traffic key. Thus, the label ought - to read "40/104" or "64/128". I do not care much which, but most - users think of "silver" and "gold" encryption as 64 and 128-bits, so - let's stick with that. Thus, s/"40/128"/"64/128"/g. Also, since our - WEP passphrase support only handles 128-bit keys, and any future - 64-bit passphrase support will require a new option (no way to auto- - detect the target key size), explicitly label our passphrase support - "WEP 128-bit Passphrase". - -2006-03-15 Robert Love - - * src/dhcp-manager/nm-dhcp-manager.c: Do not start dhcdbd, but rely on - the system init scripts (or some other mechanism) starting it (or a - compatible DBUS service) before NetworkManager runs. This means that - distributions might need to update their init scripts. This fixes - possible races and is quite a bit cleaner. - * initscript/SUSE/networkmanager.in: Update to start dhcdbd before - starting the NetworkManager daemon. - - -2006-03-14 Robert Love - - * src/backends/NetworkManagerSuSE.c: Check that we have a valid AP - before adding anything. - -2006-03-13 Robert Love - - * gnome/vpn-properties/nm-vpn-properties.c: Hide the next page's - widgets, too, if they exist, in case the user hit the back button. - Fixes a bug where the details page contains the widgets of multiple - VPN modules (Novell bug #157048). - -2006-03-13 Robert Love - - Patch by Timo Hoenig : - * dispatcher-daemon/NetworkManagerDispatcher.c: Let the dispatcher - daemon survive DBUS restarts, too. - -2006-03-10 Robert Love - - * gnome/applet/applet.glade: Add toggles to show/obfuscate the - passphrase or key. - * gnome/applet/wso-wep-ascii.c, gnome/applet/wso-wep-hex.c, - gnome/applet/wso-wep-passphrase.c, gnome/applet/wso-wpa-eap.c, - gnome/applet/wso-wpa-psk.c: Show and obfuscate passphrases and keys - in response to "toggled" signal on new toggle. - -2006-03-10 Robert Love - - * src/nm-ap-security-wpa-eap.c: Pass fake empty strings for - serialization if strings are NULL, lest DBUS get angry. - -2006-03-10 Robert Love - - * src/nm-ap-security-wpa-eap.c: Don't log the password. - -2006-03-09 Robert Love - - * src/backends/NetworkManagerSuSE.c: Read in WEP and WPA static - configurations. - -2006-03-09 Dan Williams - - Track pending call requests in the applet, and report how many are - outstanding, and how long each completed one takes. - - * gnome/applet/applet-dbus-devices.c - gnome/applet/applet-dbus-vpn.c - - Track pending calls - - * gnome/applet/applet-dbus.[ch] - - Remove some unused enums - - (nma_dbus_send_with_callback, nma_dbus_send_with_callback_replied): - new functions to track dbus pending calls and spit out some - statistics about them - -2006-03-09 Robert Love - - * src/NetworkManagerAP.c, src/NetworkManagerAP.h: Have the function - nm_ap_set_timestamp() take the second and micro-second parameters as - direct arguments, which avoids both a dynamic memory allocation and a - structure-to-structure copy! Add a new interface, the aptly named - nm_ap_set_timestamp_via_timestamp(), to set the timestamp from an - existing GTimeVal, as nm_ap_set_timestamp() once did, for use with - the return from nm_ap_get_timestamp(). New users should use the new - nm_ap_set_timestamp(), not nm_ap_set_timestamp_via_timestamp(), for - the extreme benefit to performance. - * src/NetworkManagerAPList.c, src/nm-dbus-nmi.c, - src/backends/NetworkManagerSuSE.c: Use the new functions as needed. - -2006-03-08 Robert Love - - * gnome/applet/applet.glade: Hide the password entry text with - asterisks. - -2006-03-08 Robert Love - - * src/NetworkManagerSystem.h, src/nm-device.c, NetworkManagerDebian.c, - NetworkManagerRedHat.c, NetworkManagerGentoo.c, - NetworkManagerSlackware.c: Pass nm_system_device_get_system_config() - a second argument, NMData. - * src/nm-ap-security.h, src/nm-ap-security.c: Export nm_ap_security_new. - * src/backends/NetworkManagerSuSE.c: Add wireless networks from ifcfg-* - config files as trusted. - -2006-03-06 Robert Love - - * gnome/applet/Makefile.am: Define AUTOSTARTDIR. - * gnome/applet/applet.c: Add 'Remove' option to the right click menu, - to exit the applet. As a sweet side-effect, idea courtesy of Chris - Rivera, detect if the applet was auto-started. If so, ask the user - if he or she would like to stop automatically running the applet on - login. If so, disable autostart. - -2006-03-06 Robert Love - - * NetworkManager.pc.in: Provide an -I to the NetworkManager include - directory in CFLAGS so developers can actually use NetworkManager.h. - -2006-03-06 Robert Love - - * src/dhcp-manager/nm-dhcp-manager.c: Use preprocessor defines and not - open-coded integer constants. Add state_to_string() to map a given - state to a textual description, and provide that when notifying of - state change. - * src/dhcp-manager/nm-dhcp-manager.h: Provide defines for the dhcdbd - states, copied and cleaned up from dhcdbd.d. Ideally, we would use - this header directly, but it is currently not installed on most - systems. - -2006-03-05 Dan Williams - - Process netlink messages in device subclasses rather than in - NetworkManager.c. Also add support for recognizing Wireless Events. - - * configure.in - - Find GLIB_GENMARSHAL - - * src/Makefile.am - - Since we're marshalling custom types for wireless event signals, - we get to create our own marshallers using GLIB_GENMARSHAL - - * src/NetworkManager.c - - (nm_monitor_wired_link_state): renamed to nm_monitor_setup - - (nm_monitor_setup): renamed from nm_monitor_wired_link_state, and - cut down somewhat. We no longer process signals here. - - (nm_data_new): create the netlink monitor here, and remove a - useless call to nm_policy_schedule_device_change_check() - - (nm_data_free): get rid of the netlink monitor here - - (nm_device_link_activated, nm_device_link_deactivated): removed - - (main): don't create the netlink monitor here, let nm_data_new - do that. Call nm_policy_schedule_device_change_check() right - before we jump to the mainloop to figure out which device - to use first - - * src/NetworkManagerSystem.[ch] - - (nm_system_get_rtnl_index_from_iface, nm_system_get_iface_from_rtnl_index): - convert back and forth from interface names to interface - indexes - - * src/nm-device-802-11-wireless.c - - (real_init): connect to wireless-event signals from the netlink - monitor object - - (nm_device_802_11_wireless_event): new function, schedule handler - for wireless event signals from the netlink monitor object. We - want the handler to run in the device's context - - (wireless_event_helper): handle wireless-event signals from netlink - - (nm_device_802_11_wireless_dispose): disconnect wireless-event - signal handler - - * src/nm-device-802-11-wireless.h - - remove unused prototype for nm_device_802_11_wireless_new - - * src/nm-device-802-3-ethernet.c - - (real_init): new function; set up signal handlers for link events - - (nm_device_802_3_ethernet_link_activated): new function, schedule - handler for netlink link activated events on device's main loop - - (link_activated_helper): when we get a link activated event, set - the device's link to be active - - (nm_device_802_3_ethernet_link_deactivated): new function; schedule - handler for netlink link deactivated events on device's main loop - - (link_deactivated_helper): when we get a link deactivated event, set - the device's link to be inactive - - (nm_device_802_3_ethernet_dispose): disconnect signal handler on - dispose - - * src/nm-device-802-3-ethernet.h - - remove unused prototype for nm_device_802_3_ethernet_new - - * src/nm-device.[ch] - - (nm_get_device_by_iface_locked): variant of nm_get_device_by_iface - but locks the device list - - (nm_device_set_active_link): a little bit of cleanup and de-indenting - - * src/nm-netlink-monitor.[ch] - - (nm_netlink_monitor_class_install_signals): New signal - "wireless-event" - - (nm_netlink_monitor_new): keep reference to NMData so we can get - at the device list - - (nm_netlink_monitor_event_handler): expand for wireless events too - - * src/nm-marshal-main.c - - Include generated nm-marshal.c and nm-marshal.h - - * src/nm-marshal.list - - List of custom marshal functions - -2006-03-05 Dan Williams - - * gnome/applet/applet-notifications.h - - Protect prototype of nma_send_event_notification() because it - includes libnotify-specific types - - Include libnotify/libnotify.h too, since we technically need it - - * gnome/applet/applet.c - - (nma_show_vpn_failure_dialog): fix usage of g_return_if_fail - - (nma_show_vpn_login_banner_dialog): add some error checking - -2006-03-04 Dan Williams - - Clean up activation cancellation. Should be a lot faster now. Observed - an issue with wireless devices between stage 2 and 3 of activation, where - activation would be cancelled, but the device thread wouldn't notice until - the supplicant association timed out. Reorganize activation such that - a cancellation handler gets immediately scheduled in the device's thread, - and devices have a chance to perform any custom cleanup too. - - * src/nm-device.[ch] - - (activation_cancel_handler): new device-type-specific function - for cleaning up device-type-specific stuff on cancellation - - (cancel_activation): removed - - (nm_device_activation_cancel): subsume functionality of - real_cancel_activation, but instead of doing anything, punt - operation to a handler that's run in device-thread context - - (nm_device_schedule_activation_handle_cancel): fix spelling of - a warning message - - (activation_handle_cancel_helper): cancellation handler run in - device-thread context, calls device-type-specific cancelation, - then tears down the activation request - - (real_activation_cancel_handler): generic cancellation handler, - deals with cancelling any in-process DHCP request - - (nm_device_activate_stage1_device_prepare, - nm_device_activate_stage2_device_config, - nm_device_activate_stage3_ip_config_start, - nm_device_activate_stage4_ip_config_get, - nm_device_activate_stage4_ip_config_timeout, - nm_device_activate_stage5_ip_commit): don't call - nm_device_schedule_activation_handle_cancel() any more, since - cancellation will have been already scheduled for us by - nm_device_activation_cancel(). Just exit the function and - assume that the cancel handler will be called next. - - * src/nm-device-802-3-ethernet.c - - (real_act_stage2_config): remove; didn't do anything anyway - - * src/nm-device-802-11-wireless.c - - (supplicant_status_cb): ensure we don't do anything if the activation - got cancelled - - (real_activation_cancel_handler): implement; cancel user key request - on activation cancellation - -2006-03-04 Dan Williams - - * src/nm-device-802-11-wireless.c - - (supplicant_send_network_config): assume that drivers that don't - support WPA pretty much suck, and can't handle NM scanning - along with wpa_supplicant. - -2006-03-03 Robert Love - - * configure.in: Bump version to 0.6.0. - * NEWS: Update. - -2006-03-03 Robert Love - - * configure.in: Require DBUS 0.60 or later. - -2006-03-03 Dan Williams - - Fix a crash if an "Other wireless network" was chosen, failed, then - chosen again from the applet's menu. If the other network wasn't - noticed in a scan, it wouldn't have any capabilities, but would still - be listed because the user forced the network. To fix this, we set - sensible capabilities on the forced network, which will get overwritten - with the correct ones if the network shows up later in a scan. - - * src/nm-ap-security.h - - Add a new "get_default_capabilities_func" member to the - NMAPSecurity class - - * src/nm-ap-security.c - - (nm_ap_security_get_default_capabilities): new function - - * src/nm-ap-security.c - src/nm-ap-security-wep.c - src/nm-ap-security-wpa-psk.c - src/nm-ap-security-wpa-eap.c - - Implement get_default_capabilities_func() for all, which - uses the information contained in a specific NMAPSecurity - object to determine default AP capabilites necessary - to support that object - - As a secondary measure, we now prune artificial access points that fail - to be activated right away. The thing failed, and we have no scan data for - it, so it's pretty much useless since security information is only saved - in the applets when a connection is successful. - - * src/NetworkManagerAPList.c - - (nm_ap_list_merge_scanned_ap): mark any ap noticed in a scan - not artificial. If we see it, it's no longer a figment of the - user's imagination :) - - * src/NetworkManagerPolicy.c - - (nm_policy_activation_failed): send along the failed AP if we - have it - - * src/nm-device-802-11-wireless.c - - (real_activation_failure_handler): remove artificial APs from - the device list, because activation failed - -2006-03-02 Robert Love - - Add support for retrieving both the per-device speed and the - per-network maximum supported rate. Then change the getProperties - DBUS API for both networks and devices to report this informaiton. - Finally, display the information via both nm-applet and nm-tool: - * gnome/applet/applet-dbus-devices.c: Grab the speed from getProperties - and set it. - * gnome/applet/applet.c: Display the device's speed in the 'Connection - Information' dialog. - * gnome/applet/applet.glade: Update the UI to show per-device speed. - * gnome/applet/nm-device.c, gnome/applet/nm-device.h: Add interfaces - network_device_get_speed() and network_device_set_speed() for - retrieving and setting, respectively, a network device's current - speed. - * src/nm-dbus-device.c: Send the device's speed on getProperties. - * src/nm-device-802-11-wireless.c: Return the rate in Mb/s, not Kb/s, - in the function nm_device_802_11_wireless_get_bitrate() -- it does - not matter (yet) what the units are, because we only feed it its own - output. Implement SIOCGIRATE and set the per-network maximum - supported rate during scanning. - * src/nm-device-802-11-wireless.h: Export the function - nm_device_802_11_wireless_get_bitrate(). - * src/nm-device-802-3-ethernet.c, src/nm-device-802-3-ethernet.h: Add - function nm_device_802_3_ethernet_get_speed() for returning an - 802.3's current speed, in Mb/s. - * test/nm-tool.c: Display the per-device current speed, if available, - and the per-network maximum rate. - -2006-03-02 Dan Williams - - * src/nm-device-802-11-wireless.c - - (nm_device_802_11_wireless_set_scan_interval): don't scan-spam the - card when it gets initialized. Since devices don't get added to - the scan list until they are initialized, this function wasn't - setting the intitial scan interval correctly, and was leaving - it at 0. This caused cards to get many scan requests in a short - amount of time when they were initialized - -2006-03-02 Robert Love - - * gnome/applet/applet.c: Do not set the pixbuf if we don't have an - active device. But do not do what we used to do and override the - state, which caused the dreaded icon race of '05. - -2006-03-02 Robert Love - - Commit Dan's update of my previous commit: - * src/nm-device-802-11-wireless.c: Always set the mode, because the - set_mode() function itself does the check. But do only set the - frequency if in Ad-Hoc mode. - -2006-03-02 Robert Love - - Patch by Brian Magnuson : - * src/nm-device-802-11-wireless.c: During scanning, only set the - wireless mode to infrastructure if it is not currently in - infrastructure mode. For some driver, setting the mode is a costly - operation, apparently. - -2006-03-01 Rodrigo Moya - - * Makefile.am: use the correct dir for autostart mechanism. - -2006-02-28 Dan Williams - - Patch from Brian Magnuson - * gnome/applet/applet.c - - (nma_show_vpn_failure_dialog): fix errors left over from - libnotify support changes - -2006-02-28 Dan Williams - - * src/vpn-manager/nm-vpn-act-request.[ch] - - (nm_vpn_act_request_is_activated): don't use a switch/case for - just one value - - (nm_vpn_act_request_is_failed): new function; return whether or - not the vpn activation request has failed - - * src/vpn-manager/nm-vpn-manager.c - - (nm_vpn_manager_deactivate_vpn_connection): tell the vpn service - daemon to kill the connection when the activation request fails. - Fixes issue where NM would get confused if the VPN activation - request timed out, and would not allow further VPN connections - on that service. - -2006-02-28 Dan Williams - - * gnome/applet/applet.c - - (nma_menu_add_vpn_menu): until the NM VPN manager can deal with - overlapping connection requests, disable all VPN menu items - but the active VPN connection - -2006-02-28 Dan Williams - - * src/vpn-manager/nm-vpn-connection.c - - (nm_vpn_connection_set_parent_device): fix C&P error which - called g_object_unref() on the connection's parent device - when it should have been ref-ed instead. Fixes crash with - repeated vpn connect requests - -2006-02-28 Christopher Aillon - - * gnome/applet/applet.glade: - Mark a few strings non-translatable, since they shouldn't be. - -2006-02-28 Dan Williams - - * src/vpn-manager/nm-vpn-service.c - - (nm_vpn_service_start_connection): if the vpn service daemon is - already running, don't blindly ask it to connect, but wait until - it's in the STOPPED state first. Fixes an assertion when user - starts a second vpn connection without stopping the first. - - (nm_vpn_service_stage2_daemon_wait): ensure the vpn service's - dbus service exists before continuing with the connection - process, and reduce latency while waiting for it to become - available - - (nm_vpn_service_schedule_stage2_daemon_wait): reduce latency - waiting for the vpn service daemon to become available - - General log message cleanups; show progress via "Stage x of 4" - rather than not telling anyone how many stages there are - -2006-02-28 Robert Love - - * src/NetworkManagerSystem.h: Add nm_system_should_modify_resolv_conf. - * src/backends/NetworkManagerSuSE.c: Implement the interface - nm_system_should_modify_resolv_conf() for SUSE. - * src/backends/NetworkManagerDebian.c, - src/backends/NetworkManagerGentoo.c, - src/backends/NetworkManagerRedHat.c, - src/backends/NetworkManagerSlackware.c: Add stub. - * src/named-manager/Makefile.am: Grab includes from src. - * src/named-manager/nm-named-manager.c: Allow backends to disable the - automatic updating of resolv.conf. This is useful for testing, - broken static configurations, and administrator lock-down. - -2006-02-28 Dan Williams - - * src/nm-device-802-11-wireless.c - - Move all the wpa_supplicant-related management stuff into its - own struct, just for oranization's sake - - (supplicant_exec): when exec-ing wpa_supplicant, connect its stdout - to a GIOChannel/GSource - - (supplicant_log_stdout): new function; grab output from the - wpa_supplicant stdout pipe and write it to our logs. - -2006-02-27 Christopher Aillon - - * src/nm-device-802-11-wireless.c: - Err, fix thinko in my previous commit. - -2006-02-28 Robert Love - - * gnome/applet/wso-wpa-eap.c: Fix misc. FIXME statements. - -2006-02-28 Robert Love - - * libnm-util/dbus-helpers.c, src/nm-ap-security-wpa-eap.c, - src/nm-ap-security-wpa-psk.c, gnome/applet/nm-gconf-wso-wpa-eap.c, - gnome/applet/nm-gconf-wso-wpa-eap.c: Fix FIXMEs: Callers of the DBUS - deserializers are responsible for freeing the returned DBUS strings. - -2006-02-27 Christopher Aillon - - * src/nm-device-802-11-wireless.c: - The scan list is being pruned prematurely. We should prune after - the device has gone MIA for three scans, not one. Split out the - interval to realtime seconds function to better serve this. - -2006-02-27 Robert Love - - * dispatcher-daemon/NetworkManagerDispatcher.c, src/NetworkManager.c: - Open the pid file O_TRUNC, so if it already exists we truncate it to - zero length. Also, be more verbose about warnings generated during - writing out the pid file. Finally, always write out the pid file if - in daemon mode. Use "--pid-file" to override the default. - -2006-02-27 Robert Love - - Patch by R. Vinay : - * gnome/vpn-properties/nm-vpn-properties.c: Remove the gconf key - 'last_attempt_success' when removing a VPN connection, too. (Fixes - Novell bug #153628). - -2006-02-27 Robert Love - - * gnome/applet/applet.glade: Set "activates_default" on passphrase - entry so user can hit after entering passphrase (Novell bug - #153738). - -2006-02-27 Dan Williams - - * gnome/applet/* - - Mass search/replace of: - nmwa -> nma - NMWirelessApplet -> NMApplet - NM_*_WIRELESS_APPLET -> NM_*_APPLET - (it ain't just for wireless anymore, ma!) - - Fix duplicate function name printing when using nm_warning - - wireless-applet.glade -> applet.glade - -2006-02-27 Dan Williams - - * dispatcher-daemon/NetworkManagerDispatcher.c - - Accept --pid-file with a path to a pidfile, write it out on - startup, and delete it on shutdown - - * src/NetworkManager.c - - Accept --pid-file with a path to a pidfile, write it out on - startup, and delete it on shutdown - - Move nm_print_usage() lower - - * initscripts/RedHat/NetworkManager.in - - Use new --pid-file option - - Fix service stopping to wait a bit for NM to quit - - * initscripts/RedHat/NetworkManagerDispatcher.in - - Use new --pid-file option - -2006-02-26 Dan Williams - - * src/Makefile.am - - make and install nm-crash-logger - - * src/nm-logging.[ch] - - New files; consolidate logging and crash handling - - * src/nm-crash-logger.c - src/gdb-cmd - - Standalong crashlogger for NM, grab a backtrace - using GDB - - * src/NetworkManager.[ch] - - Remove signal handling and put it into nm-logging.c - -2006-02-26 Dan Williams - - * configure.in - gnome/applet/Makefile.am - - Conditionalize all the notify stuff - - Merge most of Chris Aillon's notification patch: - - * gnome/applet/applet-notifications.[ch] - - New files; show a notification - - * gnome/applet/applet-dbus-devices.[ch] - - (nmwa_dbus_device_activated, nmwa_dbus_device_activated_cb, - nmwa_dbus_device_deactivated, nmwa_dbus_device_deactivated_cb): - new functions, do the right thing when a device change occurs - - * gnome/applet/applet-dbus.c - - (nmwa_dbus_filter): Split out DeviceNowActive and DeviceNoLongerActive - signals, so we can handle them specially - - * gnome/applet/applet.[ch] - - nmwa_schedule_vpn_login_banner -> nmwa_show_vpn_login_banner - - nmwa_schedule_vpn_failure_alert -> nmwa_show_vpn_failure_alert - - (nmwa_notify_state): remove - - (nmwa_update_state); remove call to nmwa_notify_state, since the - notification work is now done when the appropriate dbus signals - are received. - - (nmwa_show_vpn_login_banner, nmwa_show_vpn_failure_alert): don't - defer execution of the notification/dialog stuff. That was an - artifact of the previous multi-threaded nature of the applet - and is now pointless. - - (nmwa_notify_vpn_failure, nmwa_notify_vpn_login_banner): remove, - no longer needed. Function folded into applet-notifications.c - - * src/NetworkManagerPolicy.c - - (nm_policy_activation_finish): send the AP along with the device - status change signal, if the connection is wireless. Should - fix the race where applet would show a connection to "unknown" - -2006-02-25 Robert Love - - Add WPA Enterprise support: - * gnome/applet/Makefile.am: Build the files nm-gconf-wso-wpa-eap.c and - nm-gconf-wso-wpa-eap.h. - * gnome/applet/nm-gconf-wso-wpa-eap.c, - gnome/applet/nm-gconf-wso-wpa-eap.h: Add WPA Enterprise Gconf - serialization and deserialization. - * gnome/applet/nm-gconf-wso-wpa-psk.c, gnome/applet/nm-gconf-wso.c, - gnome/applet/wireless-security-option.c, gnome/applet/wso-wpa-psk.c, - gnome/applet/wso-wpa-psk.h: Clean up, support new defines. - * gnome/applet/wireless-applet.glade: Add UI for configurating security - settings related to WPA Enterprise. - * gnome/applet/wireless-security-manager.c: Invoke wso_wpa_eap_new() to - instantiate WPA Enterprise wireless-security-option. - * gnome/applet/wso-wpa-eap.c, gnome/applet/wso-wpa-eap.h: New files. - Implement WPA Enterprise wireless-security-option object. - * include/NetworkManager.h: Add new NM_AUTH_TYPE_* and NM_EAP_METHOD_* - defines. Cleanup. - * libnm-util/cipher-wpa-psk-hex.c, - libnm-util/cipher-wpa-psk-passphrase.c: Cleanup. - * libnm-util/dbus-helpers.c, libnm-util/dbus-helpers.h: Add - nmu_security_serialize_wpa_eap() to serialize input to DBUS method, - nmu_security_serialize_wpa_eap_with_cipher() to serialize input - including the cipher to DBUS method, and - nmu_security_deserialize_wpa_eap() to deserialize from DBUS return - to output. - * src/Makefile.am: Build the files nm-ap-security-wpa-eap.c and - nm-ap-security-wpa-eap.h - * src/NetworkManagerAP.c: Add NM_AUTH_TYPE_WPA_EAP to - NM_802_11_CAP_KEY_MGMT_802_1X cipher to capability mapping. - * src/nm-ap-security-wpa-eap.c, src/nm-ap-security-wpa-eap.h: New - files. Implement NMAPSecurityWPA_EAP object. - * src/nm-ap-security-wpa-psk.c: Cleanup. - * src/nm-ap-security.c: Support NM_AUTH_TYPE_EAP cipher and instantiate - an NMAPSecurityWPA_EAP object via the method - nm_ap_security_wpa_eap_new_deserialize(). - * src/nm-dbus-nm.c: Cleanup. - * test/nm-tool.c: Display "Enterprise" for wireless networks providing - WPA Enterprise support. - -2006-02-24 Robert Love - - Patch from Timo Hoenig : - * src/NetworkManagerDbus.c: Survive DBUS restarts like a champ. - -2006-02-24 Robert Love - - Patch from Dan Winship : - * gnome/applet/eggtrayicon.c: Update EggTrayIcon code. Set the gdk - area to transparent. - -2006-02-21 Dan Williams - - * gnome/applet/applet.[ch] - gnome/applet/applet-dbus.c - - Implement notification support for VPN messages too - -2006-02-21 Dan Williams - - * gnome/applet/applet-dbus-info.c - - Clean up warning messages to not double-print the function - -2006-02-21 Dan Williams - - * gnome/applet/applet-compat.c - - (convert_one_entry): accept entries without a key_type and - convert them to unencrypted networks - -2006-02-21 Dan Williams - - * gnome/libnm_glib/libnm_glib.c - - Use __func__ everywhere we can - - Code cleanups - - Use dbus pending calls rather than blocking - - Reduce busywaits for our thread to start and stop - (gnome.org #330562) - - (libnm_glib_dbus_init): Use dbus_bus_get_private() so we don't - stomp on others using the default shared dbus connection. - Fixes #rh177546# and gnome.org #326572 - -2006-02-21 Dan Williams - - Patch from Rodney Dawes - * configure.in - gnome/applet/Makefile.am - gnome/applet/applet.c - - Add libnotify support if '--enable-notify=yes' is passed - at configure time - -2006-02-16 Kang Jeong-Hee - - * configure.in (ALL_LINGUAS): ko added. (Korean) - -2006-02-15 Robert Love - - * src/nm-device-802-11-wireless.c: Use LOCALSTATEDIR preprocessor - define, not an open-coded "/var", for WPA_SUPPLICANT_GLOBAL_SOCKET - and WPA_SUPPLICANT_CONTROL_SOCKET. - -2006-02-15 Robert Love - - * src/nm-device-802-11-wireless.c, src/nm-device.c: When printing debug - information about what connection stage we are at, provide the total - number of stages, e.g. "Stage 2 of 5", so users know how far along - they are if they experience problems. - -2006-02-15 Robert Love - - * gnome/vpn-properties/Makefile.am: Define SYSCONFDIR preprocessor - define to $sysconfdir. - * gnome/vpn-properties/nm-vpn-properties.c: Make sure we hide the VPN - editing dialog, vpn_edit_widget, which fixes a bug where editing one - type of VPN and then editing another results in a mangled dialog - box containing the widgets from both VPNs (fixes Novell #150854). - Also, some misc. cleanup and use SYSCONFDIR not open coded directory. - -2006-02-14 Robert Love - - * src/NetworkManager.c: Call closelog() on daemon shutdown to close - syslog's file descriptor. - -2006-02-14 Robert Love - - Fix bug around since the change to "deal with APs changing settings on - us," checked in on the fifth of February in the year of the dog, - wherein connecting to non-broadcast encrypted networks always fails - because nm_ap_get_encrypted() always returns FALSE, even when the user - provided a key, because the newly-created fake AP does not have any - capabilities set, which is a sypmtom of security settings not matching - capabilities (Novell bug #150784): - * src/NetworkManagerAP.c, src/NetworkManagerAP.h: Add new interface, - nm_ap_add_capabilities_from_security(), which sets the given AP's - capabilities off the given security settings. Also improve our - handling of capabilities w.r.t. NM_802_11_CAP_PROTO_NONE and - NM_AUTH_CIPHER_AUTO. - * src/nm-device-802-11-wireless.c: Call the function - nm_ap_add_capabilities_from_security() to ensure that capabilities - match newly updated security settings. - -2006-02-14 Robert Love - - * src/nm-device-802-11-wireless.c: Clean up nm_warning calls: Print the - error as a string, not an integer, if possible; do not print the - function name twice; always give the interface, if possible; misc. - cleanup. - -2006-02-12 Dan Williams - - Patch from Tom Parker - * src/NetworkManagerSystem.h - - Remove prototype for nm_system_device_setup_static_ip4_config(), - no longer used - - * src/backends/NetworkManagerDebian.c - - Remove some dead code (nm_system_device_setup_static_ip4_config) and - unused variables - -2006-02-12 Dan Williams - - * vpn-daemons/openvpn/intltool-extract.in - vpn-daemons/openvpn/intltool-merge.in - vpn-daemons/openvpn/intltool-update.in - vpn-daemons/pptp/intltool-extract.in - vpn-daemons/pptp/intltool-merge.in - vpn-daemons/pptp/intltool-update.in - - Remove from CVS, they should get created by intltoolize, - shouldn't they? - -2006-02-12 Dan Williams - - * vpn-daemons/pptp/src/pppd/patchlevel.h - * vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c - - Rename VERSION -> PPPD_VERSION to avoid conflict with the - Makefile-defined VERSION - -2006-02-09 Dan Williams - - Patch from: Vinay A R - * src/vpn-manager/nm-vpn-act-request.[ch] - - Added 'routes' and 'routes_count' to struct NMVPNActRequest since - IPSec VPNs require them for std gateway. - - (nm_vpn_act_request_new): takes arguments for 'user_routes' - and 'user_routes_count' - - (nm_vpn_act_request_get_user_routes): new function; gets user - defined routes from NMVPNActRequest object, returns the string - array of routes. - - * src/vpn-manager/nm-vpn-manager.[ch] - - (nm_vpn_manager_activate_vpn_connection): take additional arguments - for 'user_routes' and 'user_routes_count' - - * src/vpn-manager/nm-dbus-vpn.c - - (nm_dbus_vpn_activate_connection): gets 'user_routes' from - nm_dbus_vpn_get_routes() to pass to nm_vpn_manager_activate_vpn_connection() - - * src/vpn-manager/nm-vpn-service.c - - (nm_vpn_service_stage3_connect): pass user routes over dbus to - the vpn daemon - - Modifications by Dan: - * src/vpn-manager/nm-vpn-service.c - - (nm_vpn_service_stage3_connect): ensure that we don't pass NULL string - arrays into dbus - - * vpn-daemons/vpnc/src/nm-vpnc-service.c - * vpn-daemons/pptp/src/nm-pptp-service.c - * vpn-daemons/openvpn/src/nm-openvpn-service.c - - Grab user routes from dbus message - - Free all string arrays we got from dbus - -2006-02-07 Robert Love - - Patch by Stefan Seyfried : - * libnm-util/cipher.c: Fix off-by-one error in cipher_bin2hexstr. - -2006-02-06 Robert Love - - * src/nm-device-802-11-wireless.c: Fix leak in supplicant_status_cb(). - -2006-02-06 Robert Love - - * src/NetworkManagerUtils.c: kill_newline(): 'l' is unsigned so the - test ">=" is never false. If no newline is found, we loop forever. - We can just check for ">" because the following if() will see the - zero-th argument if the while() gets that far. - -2006-02-05 Dan Williams - - Refine handling of non-broadcast networks. - - * src/NetworkManagerAPList.c - - (nm_ap_list_merge_scanned_ap): unconditionally copy the 'broadcast' - property from scanned AP to the AP from the device list - - * src/nm-device-802-11-wireless.c - - (supplicant_send_network_config): use ap_scan=1 for all networks - except non-SSID-broadcasting and Ad-Hoc networks. Use - ap_scan=2 for those. Also, don't set scan_ssid for Ad-Hoc - networks since those don't have APs. - - (add_new_ap_to_device_list): if there's no valid SSID, mark the - AP as non-SSID-broadcasting - - (process_scan_results): don't handle non-SSID-broadcasting here - -2006-02-05 Dan Williams - - * src/nm-device-802-11-wireless.c - - (get_supplicant_timeout): new function; return - NM_SUPPLICANT_TIMEOUT * 2 for cards that support more than - 14 channels. These are likely a/b/g cards, like Atheros, and - slow as hell to scan. - - (supplicant_timeout_cb, supplicant_monitor_start): use - get_supplicant_timeout() - -2006-02-05 Dan Williams - - * src/dhcp-manager/nm-dhcp-manager.c - - Loose a commit race with Robert; make sure size check - uses size of DHCP_SERVICE_LEN, not hardcoded 15 - -2006-02-05 Robert Love - - Patch by Christoph Brill : - * src/dhcp-manager/nm-dhcp-manager.c: Replace two open coded defines - with DHCP_SERVICE_NAME. - -2006-02-05 Dan Williams - - Remove anything having to do with device_setup_func from the - AP security objects, since it's no longer used. - - * src/nm-ap-security.h - - Kill device_setup_func and nm_ap_security_device_setup() - - * src/nm-ap-security-wep.c - src/nm-ap-security-wpa-psk.c - - (real_device_setup): remove - - * src/nm-ap-security.c - - (real_device_setup): remove - - (nm_ap_security_device_setup): remove - - * src/nm-device-802-11-wireless.[ch] - - (nm_device_802_11_wireless_set_wep_enc_key): make static - - (set_wireless_config, wireless_configure_adhoc): remove; unused - and done by wpa_supplicant now anyway - -2006-02-05 Dan Williams - - * src/nm-device-802-11-wireless.c - - (ap_need_key, real_act_stage2_config): deal with APs changing - settings on us. Previously NM would loop asking for the - key but getting the same one back. Now, if the NMI-supplied - cipher doesn't overlap with the scanned AP capabilities, - we request a completely new key from the user. - -2006-02-05 Dan Williams - - * src/NetworkManagerUtils.c - - (nm_utils_supplicant_request_with_check, nm_utils_supplicant_request): - Handle newline killing better - -2006-02-05 Dan Williams - - * gnome/applet/nm-gconf-wso.c - - (real_serialize_dbus): return TRUE, not 0. Fixes serialization - of unencrypted access point security info. - -2006-02-03 Robert Love - - * src/NetworkManagerUtils.c: Even for debugging, we should not log the - user's encryption key, so we print the err_msg_cmd not the command, - if available. So long as SUPPLICANT_DEBUG is default, this makes - sense. - -2006-02-03 Christopher Aillon - - * initscript/RedHat/NetworkManagerDispatcher.in: - * initscript/RedHat/NetworkManager.in: modify the pidfile location - Patch from Dan Walsh - -2006-02-03 Robert Love - - * dispatcher-daemon/NetworkManagerDispatcher.c, - dispatcher-daemon/Makefile.am: Don't hardcode the location of /etc - but use the sysconfdir. - -2006-02-03 Robert Love - - * src/nm-device-802-11-wireless.c, src/nm-device-802-11-wireless.h: - Make nm_device_802_11_wireless_get_essid() return 'const char *' not - 'char *'. - * src/nm-ip4-config.c, src/nm-ip4-config.h: Make the functions - nm_ip4_config_get_hostname() and - nm_ip4_config_get_nis_domain() return 'const char *' not 'char *'. - * src/backends/NetworkManagerSuSE.c: Fix up for above. Also, do not - leak g_strdup() result. - -2006-02-03 Robert Love - - * src/NetworkManagerAP.c: In nm_ap_new(), default new networks to - broadcast == TRUE. Also, copy broadcast and artificial properties - from source network to destination in nm_ap_copy(). - * src/nm-device-802-11-wireless.c: Don't set broadcast flag to TRUE, - since we now default new networks to non-hidden. - -2006-02-03 Dan Williams - - * gnome/applet/main.c - - (main): change the NEVER->ALWAYS so we start at the - beginning of the session, if being session-managed - -2006-02-03 Dan Williams - - * gnome/applet/main.c - - (main): in a variation on Robert's patch, change - RESTART_IMMEDIATELY -> RESTART_NEVER. Should do what - he wants. - -2006-02-02 Robert Love - - * src/Makefile.am: If we aren't going to create the run directory at, - uh, run-time, create it during install. Then users just doing - 'make install' are cool, too. While we are here, create the - dispatcher.d directory, too. - * src/nm-device-802-11-wireless.c: Let the Makefile define and pass in - the exact run directory. - * Makefile.am: Install nm-applet.desktop. - -2006-02-02 Robert Love - - * src/NetworkManagerAP.c: Add 'broadcast' property to the NMAccessPoint - structure, which denotes whether or not the AP is hidden. This is a - superset of 'artificial' -- we need 'broadcast' because a hidden AP - can show up in the scan list. Add nm_ap_get_broadcast() and - nm_ap_set_broadcast() accessor interfaces. - * src/NetworkManagerAP.h: Add prototypes for nm_ap_get_broadcast() and - nm_ap_set_broadcast(). - * src/nm-dbus-net.c: Add new argument, boolean broadcast, to the - "getProperties" method, which denotes whether or not the given - network is hidden. - * src/nm-device-802-11-wireless.c: Set broadcast to FALSE when creating - an artificial network. Set broadcast to TRUE when scanning returns - an ESSID and FALSE when not. - * gnome/applet/applet-dbus-devices.c: Retrieve 'broadcast' argument - from "getProperties" method on a network. Possible TODO is to - somehow display this. - * test/nm-tool.c: Display "Hidden" if the AP does not broadcast. - -2006-02-02 Dan Williams - - * src/nm-device-802-11-wireless.c - - (supplicant_interface_init): don't try to create - /var/run/NetworkManager, since that should be done by - the distro package. Causes problems for stuff like SELinux - -2006-02-02 Robert Love - - Patch by Sureshkumar T : - * src/vpn-manager/nm-vpn-connection.c, src/NetworkManagerSystem.c: - Check for and handle empty string for iface. - -2006-02-01 Robert Love - - * configure.in, man/nm-tool.1.in, man/Makefile.am: Add nm-tool(1) - manpage. - -2006-01-31 Dan Williams - - * nm-applet.desktop - - Add --sm-disable to Exec arguments, presuming that when - using autostart, we don't want session management - -2006-01-31 Robert Love - - * src/NetworkManagerAP.c: Add two new manufacturer default network - names: linksys-a and linksys-g. These are found (at least) on the - Linksys WAP55AG, which does both 802.11a and 802.11b, each with their - own ESSID. - -2006-01-31 Robert Love - - * src/NetworkManagerAP.c: Optimize the function - nm_ap_has_manufacturer_default_essid(). I did not like its resulting - machine code. This is the first in a series of code tweaks aiming to - generate better machine code and make NetworkManager all the better. - Just kidding. Who has time to go through the assembly generated for - every function? I certainly don't. I have a wife, a kid, a job, - a mortgage, a mistress. But this function was so bad, I was called - to arms. Like the book. - -2006-01-31 Robert Love - - * src/nm-device-802-11-wireless.c: Set "scan_ssid 1" if the requested - AP is not broadcasting, to scan with probe request frames. Required - for non-broadcast networks. - -2006-01-31 Robert Love - - * src/nm-device-802-11-wireless.c: Make the wpa_supplicant a - preprocessor define (still 20s). Fix message text in nm_info() - s/too too/took too/. - -2006-01-30 Dan Williams - - * src/nm-device-802-11-wireless.c - - (supplicant_monitor_start): increase connect/auth timeout to - 20 seconds from 10 seconds - -2006-01-30 Dan Williams - - * src/Makefile.am - - Define LOCALSTATEDIR - - * src/nm-device-802-11-wireless.c - - (supplicant_exec): tell wpa_ctrl_open() to stick the local control - socket where we want it to - - * src/wpa_ctrl.[ch] - - (wpa_ctrl_open): accept location to put local control socket - -2006-01-30 Robert Love - - * src/dhcp-manager/nm-dhcp-manager.c: Pass TRUE for ignore_error in - get_ip4_string() for "domain_name". - -2006-01-30 Robert Love - - * gnome/applet/nm-gconf-wso-wpa-psk.c, gnome/applet/nm-gconf-wso.c, - gnome/applet/wireless-security-option.c, include/NetworkManager.h, - libnm-util/cipher-wpa-psk-hex.c, src/nm-ap-security-wpa-psk.c, - libnm-util/cipher-wpa-psk-passphrase.c, src/nm-ap-security.c: Add - support for "Automatic" pairwise and group cipher configuration by - letting wpa_supplicant handle the details. Add UI elements, new - cipher type NM_AUTH_CIPHER_AUTO, and backend support. Works like a - charm. Note this does more than add a nice feature, it fixes a bug. - Apparently, some people have AP's where the pairwise cipher does not - match the group cipher. Insane, but true. - -2006-01-30 Dan Williams - - * gnome/applet/applet-dbus-devices.c - - (nmwa_dbus_device_get_driver_cb, nmwa_dbus_device_get_driver): new - functions, grab device driver name from NetworkManager - - (nmwa_dbus_device_properties_cb): call functions to get driver - - * gnome/applet/applet.c - - (nmwa_update_info): show driver name in Connection Information - dialog - - * gnome/applet/nm-device.[ch] - - (network_device_get_driver, network_device_set_driver): add - accessors for driver name - - * gnome/applet/wireless-applet.glade - - Add line for driver name to Connection Information dialog - - * src/nm-dbus-device.c - - (nm_dbus_device_get_driver): new function to return driver name - - (nm_dbus_device_methods): hook up driver name function to dbus - - * test/nm-tool.c - - (get_driver_name): new function - - (detail_device): grab and show driver name - -2006-01-30 Robert Love - - * gnome/applet/applet.c: Apparently gtk_message_dialog_new_with_markup - does not parse the markup if it is not part of the format. - -2006-01-30 Robert Love - - * gnome/applet/passphrase-dialog.c: If wsm_set_capabilities() returns - FALSE, we have no security options for this dialog, so we throw up - an error dialog instead of a broken passphrase dialog. Fixes - Novell #138404. - * gnome/applet/wireless-security-manager.c, - gnome/applet/wireless-security-manager.h: If wsm_set_capabilities() - does not add any security options, not even NONE, print a warning - and return FALSE. This let's functions constructing a dialog bail - out if the device's capabilities and the network's requirements have - zero overlap. - -2006-01-27 Robert Love - - * configure.in: Require wpa_supplicant. Detect location of binary and - use it. Override with "--with-wpa_supplicant=foo". - * src/Makefile.am, src/nm-device-802-11-wireless.c: Do not hardcode the - path to wpa_supplicant but use the auto-detected or user-provided - value from configure. - -2006-01-27 Robert Love - - * src/backends/NetworkManagerSuSE.c: If DHCLIENT_SET_HOSTNAME is set - but the DHCP server did not return a hostname, try to look up our - name via DNS and set the system hostname to that. - -2006-01-27 Dan Williams - - * src/backends/NetworkManagerRedHat.c - - Add NM_CONTROLLED system network script support for RH/Fedora - -2006-01-27 Dan Williams - - * src/backends/NetworkManagerGentoo.c - - (nm_system_device_get_disabled): add missing function. - Gnome BZ #328780 - -2006-01-27 Clytie Siddall - - * configure.in: Added vi in ALL_LINGUAS line. - -2006-01-26 Robert Love - - * src/Makefile.am, src/kernel-types.h: Now that two different source - files are feeling the crack-addled leakage of kernel types such as - u32 and s8 -- superior to __u64 and __u8, to be sure, but not valid - types in user-space -- define a header and include it as needed. - * src/nm-device-802-3-ethernet.c: Include kernel-types.h - * src/nm-device-802-3-ethernet.h: Remove defines. - * src/wpa.c: Remove defines and include kernel-types.h. - -2006-01-26 Robert Love - - * TODO: Update. WPA support is in the bag and HAL restarts (should) - work. - -2006-01-26 Robert Love - - * configure.in: Change '-Wno-unused' to '-Wno-unused-parameter' - * gnome/applet/applet-compat.c, gnome/applet/applet-dbus-devices.c, - gnome/applet/applet-dbus-info.c, gnome/applet/applet-dbus.c, - gnome/applet/applet.c, gnome/applet/applet.h, src/nm-dbus-device.c, - gnome/applet/nm-gconf-wso-wep.c, gnome/applet/nm-gconf-wso-wpa-psk.c, - gnome/applet/nm-gconf-wso.c, gnome/applet/nm-gconf-wso.h, - gnome/applet/other-network-dialog.c, src/nm-device.c, test/nm-tool.c, - gnome/applet/passphrase-dialog.c, src/nm-device-802-11-wireless.c, - gnome/applet/wireless-security-manager.c, src/nm-ip4-config.c, - gnome/applet/wireless-security-option.c, src/nm-ap-security.c, - gnome/applet/wso-wep-ascii.c, gnome/applet/wso-wep-hex.c, - gnome/applet/wso-wep-passphrase.c, gnome/applet/wso-wpa-psk.c, - libnm-util/dbus-helpers.c, src/NetworkManagerAP.c, src/nm-dbus-nmi.c, - src/NetworkManagerSystem.c, src/nm-ap-security-wep.c, - src/nm-device-802-11-wireless.h, test/libnm-util/test-ciphers.c, - src/named-manager/nm-named-manager.c, test/test-common/test-common.c: - Kill unused variables, labels, and static functions. Don't pass - string literals as the format string for printf-like functions. - -2006-01-25 Dan Williams - - * gnome/applet/wireless-applet.glade - - Remove WPA2 Checkbox - - * gnome/applet/wireless-security-manager.c - - (wsm_set_capabilities): split up sections for wpa and wpa2. - This means the Wireless Security menu now has two WPA options, - one for "WPA Personal" and one for "WPA2 Personal" - - * gnome/applet/wso-wpa-psk.[ch] - - (wso_wpa_psk_new): remove stuff for WPA2 checkbox, and use - 'wpa2' argument to determine WPA version to use - - (append_dbus_params_func): pass stored WPA version to cipher - rather than using the (removed) checkbox - -2006-01-24 Robert Love - - * src/dhcp-manager/nm-dhcp-manager.c: Null-out the original byte array - before we g_strdup(), not the ultimate string. - -2006-01-23 Dan Williams - - * src/NetworkManagerAP.[ch] - - (nm_ap_new_from_ap): copy original essid too - - (nm_ap_unref): free original essid - - (nm_ap_get_orig_essid): new function - - (nm_ap_set_essid): Convert essid to UTF-8 for display and dbus, - but keep original essid around too - - * src/nm-device-802-11-wireless.c - - (supplicant_send_network_config): send wpa_supplicant the - _original_ essid, and not as a string, but in hex. Should - allow us to connect to more APs that use wierd character - encodings for their essids - - * utils/nm-utils.[ch] - - (nm_utils_essid_to_utf8): make a best-effort to convert the essid - to UTF-8. If it's not already valid UTF-8, we check LANG and - use the current locale as a hint for what encoding the essid - might be in. Obviously not 100% accurate, but the idea here is - that if a user's locale is ex. ja_JP, they are more likely than - not to be in Japan, where access points will likely be in some - Japanese encoding. - -2006-01-23 Dan Williams - - * libnm-util/cipher-private.h - libnm-util/cipher.c - libnm-util/cipher.h - - (cipher_bin2hexstr, cipher_hexstr2bin): make public - -2006-01-23 Robert Love - - Patch by Timo Hoenig : - * dhcp-manager/nm-dhcp-manager.c, nm-device.c, nm-ip4-config.c, - nm-ip4-config.h, NetworkManagerSystem.h: Save the hostname reported - by DHCP and pass it to the backends, allowing distribution-specific - behavior with respect to the DHCP-supplied hostname (if nothing else, - some distributions might not want to set the hostname). - * backends/NetworkManagerSuSE.c: Set the hostname if the variable - DHCLIENT_SET_HOSTNAME is set to "yes" in /etc/sysconfig/network/dhcp. - Also update our NIS behavior. - * backends/NetworkManagerDebian.c, backends/NetworkManagerGentoo.c, - backends/NetworkManagerRedHat.c, backends/NetworkManagerSlackware.c: - Add stub functions. - -2006-01-23 Robert Love - - * Makefile.am, nm-applet.desktop: Add autostart .desktop file, now that - gnome-session does autostart. TODO: We need to install this to - $prefix/share/autostart/. - -2006-01-22 Dan Williams - - * src/NetworkManagerAP.[ch] - src/nm-dbus-nmi.c - src/nm-device-802-11-wireless.c - - Make nm_ap_get_essid return "const char *" - -2006-01-22 Dan Williams - - * src/NetworkManagerAP.[ch] - - (nm_ap_get_matched, nm_ap_set_matched): remove - - * src/NetworkManagerAPList.[ch] - - (nm_ap_list_diff): removed - - (nm_ap_list_merge_scanned_ap): move AP dbus signal logic here, - deal with access points changing essids on us - - * src/nm-device-802-11-wireless.c - - (add_new_ap_to_device_list): move AP dbus signal logic to - src/NetworkManagerAPList.c - - (real_can_interrupt_activation): new function; allow interruption - of device activation if we are waiting for a network key - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): allow interruption of currently - activating devices if the device allows it. Previous behavior - would refuse to activate a just-plugged wired device if a - wireless device was waiting for a key. - - * src/nm-device.[ch] - - (nm_device_can_interrupt_activation): new function; ask devices - whether their activation can be interrupted - -2006-01-20 Robert Love - - * Makefile.am, configure.in: Add new man subdirectory. - * man, man/NetworkManager.1.in, man/NetworkManagerDispatcher.1.in, - man/Makefile.am: Add man pages for NetworkManager and its - crime-solving bumbling buddy, NetworkManagerDispatcher. - * man/.cvsignore: Add. - * initscript/Debian/NetworkManager, - initscript/Gentoo/NetworkManager.in, - initscript/RedHat/NetworkManager.in, - initscript/RedHat/NetworkManagerDispatcher.in, - initscript/SUSE/networkmanager-dispatcher.in, - initscript/SUSE/networkmanager.in: Update for /usr/sbin not /usr/bin. - -2006-01-20 Robert Love - - * src/NetworkManagerDbus.c: Fail if NM's DBUS service is already taken, - instead of queuing. This prevents the running of multiple NM - daemons concurrently, which does not work whatsoever and results in - neither daemon working correctly. Also, we don't handle queuing and - name-owner-changes, anyhow. - -2006-01-20 Robert Love - - * src/Makefile.am: Install the NetworkManager daemon to sbin, not bin. - * dispatcher/Makefile.am: Install the NetworkManagerDispatcher daemon - to sbin, not bin. - -2006-01-19 Robert Love - - * configure.in: Require hal 0.5.0 or later. - -2006-01-18 Robert Love - - * src/NetworkManager.c, src/NetworkManagerSystem.h, src/nm-device.c: - Allow backends to flag a device (in whatever distro-dependent way - they so desire) as disabled. NM will ignore any such device. - * src/backends/NetworkManagerDebian.c, - src/backends/NetworkManagerRedHat.c, - src/backends/NetworkManagerSlackware.c: Add stub function - nm_system_device_get_disabled() that always returns FALSE (enabled). - * src/backends/NetworkManagerSuSE.c: Add system_disabled field to the - SUSE-specific configuration structure. Fill it in from the - NM_CONTROLLED variable in the system networking scripts. If this var - exists and is "no", we ignore the device. - -2006-01-17 Robert Love - - * configure.in: Remove 'no' language. Replaced by 'nb', which is - identical for NM. For a full discussion, see the thread at - http://mail.gnome.org/archives/gnome-i18n/2004-August/msg00006.html. - -2006-01-17 Dan Williams - - * src/nm-device.c - - (nm_device_class_init): connect a default act_stage4_ip_config_timeout - function. Fixes crash when wired DHCP fails. - -2006-01-16 Robert Love - - * src/Makefile.am: Don't install NMLoadModules - * src/NMLoadModules, test/NMLoadModules: Move the NMLoadModules script - from src/ to test/ as no one uses it anymore. Note that I would be - fine with removing it altogether. - -2006-01-16 Robert Love - - * gnome/applet/eggtrayicon.c, src/nm-device.c, src/nm-ap-security.c, - gnome/applet/nm-gconf-wso-wep.c, gnome/applet/nm-gconf-wso-wpa-psk.c, - gnome/applet/nm-gconf-wso.c, src/nm-device-802-3-ethernet.c, - gnome/vpn-properties/nm-vpn-properties.c, src/nm-ap-security-wep.c, - src/nm-ap-security-wpa-psk.c, src/nm-device-802-11-wireless.c, - src/nm-netlink-monitor.c: Don't miss any initializers on structure - declarations, ever. - * gnome/applet/applet.c: Remove useless check (NMState is unsigned and - NM_STATE_DISCONNECTED is zero). - -2006-01-16 Robert Love - - * src/nm-device-802-11-wireless.c: argv[3], not argv[4]. Fix - uninitialized parameter and buffer overflow. Novell #143496. - -2006-01-16 Dan Williams - - Apply the PtP Address bits of a patch from Tim Niemueller - - * src/nm-ip4-config.[ch] - - Add ip4_ptp_address member to object - - (nm_ip4_config_copy): copy ptp address too - - (nm_ip4_config_get_ptp_address, nm_ip4_config_set_ptp_address): - new functions - - (nm_ip4_config_to_rtnl_addr): use ptp address when asked to, - rather than local tunnel ip address - - * src/vpn-manager/nm-vpn-service.c - - (print_vpn_config): update for PtP address - - (nm_vpn_service_stage4_ip_config_get): switch parsing to - DBusMessageIters in preparation for getting routes from the VPN - service daemons too - - * vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c - - (send_config_info): update for PtP address, clean up code - - (main): update for PtP address, clean up code, fix typo - - * vpn-daemons/openvpn/src/nm-openvpn-service.c - - (nm_openvpn_dbus_process_helper_ip4_config): update for PtP address - - * vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c - - (pptp_ip_up): update for PtP address - - * vpn-daemons/pptp/src/nm-pptp-service.c - - (nm_pptp_dbus_process_helper_ip4_config): update for PtP address - - * vpn-daemons/vpnc/src/nm-vpnc-service.c - - (print_vpn_config): update for PtP address - - (nm_vpnc_dbus_process_helper_ip4_config): update for PtP address - -2006-01-16 Dan Williams - - * gnome/applet/applet.c - - (nmwa_add_networks_helper): don't indicate an active network - if NM is disconnected or asleep - -2006-01-16 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): switch devices if we lose the link - on an ethernet device. - -2006-01-16 Dan Williams - - * gnome/applet/wso-wpa-psk-hex.[ch] - - Renamed -> wso-wpa-psk.[ch] - - * gnome/applet/wso-wpa-psk.[ch] - - New files - - * gnome/applet/wso-wpa-psk-passphrase.[ch] - - Removed, rolled into wso-wpa-psk.[ch] - - * gnome/applet/Makefile.am - - Updated for above changes - - * gnome/applet/wireless-applet.glade - - Consolidate WPA-PSK options into one notebook - widget, and make dialogs invisible by default - to fix screen oddities - - * gnome/applet/wireless-security-manager.c - - (wsm_set_capabilities): create the new wpa-psk widget rather - than both the old hex & passphrase ones - -2006-01-16 Dan Williams - - * gnome/applet/other-network-dialog.c - - (nmwa_ond_init): Change text to refer to "name" rather than "ESSID" - -2006-01-16 Dan Williams - - * gnome/applet/applet.c - - (nmwa_show_vpn_login_banner_dialog, nmwa_show_vpn_failure_dialog, - nmwa_driver_notify, show_warning_dialog): fix up focus-stealing - prevention to realize window before trying to get server - time - - * gnome/applet/other-network-dialog.c - - (nmwa_other_network_dialog_run): fix up focus-stealing - prevention to realize window before trying to get server - time - - * gnome/applet/passphrase-dialog.c - - (nmi_passphrase_dialog_new): fix up focus-stealing - prevention to realize window before trying to get server - time - -2006-01-16 Robert Love - - Patch from Timo Hoenig - - * gnome/applet/wireless-security-option.c - - (wso_wpa_create_key_type_model): clarify AES-CCMP algorithm name - -2006-01-16 Dan Williams - - * libnm-util/cipher-wpa-psk-passphrase.c - - (cipher_wpa_psk_passphrase_new): correct passphrase length, should - be 8 - 63 characters inclusive - -2006-01-16 Dan Williams - - * src/nm-dbus-nm.c - - (nm_dbus_nm_sleep): bring device down after quick deactivation - -2006-01-13 Robert Love - - Patch by T Sureshkumar : - * src/NetworkManagerSystem.c: Don't assert iface != NULL, allowing VPN - modules that do not use an interface. - -2006-01-13 Dan Williams - - * src/nm-device.c - src/nm-device.h - - Allow subclasses to implement deactivate_quickly() - - (nm_device_deactivate_quickly): call subclass - deactivate_quickly() methods - - (nm_device_set_active_link): small cleanups, and don't - deactivate the device right away because we risk a deadlock - when called from device thread, waiting for the device - thread to cancel activation - - * src/nm-device-802-11-wireless.c - - (real_deactivate_quickly): new function - - (nm_device_802_11_wireless_class_init): hook in real_deactivate_quickly - - (real_deactivate): move supplicant cleanup to real_deactivate_quickly - so that we kill the supplicant when we sleep too - - (supplicant_interface_init): work around naive naming attempts of - wpa_ctrl when naming sockets - -2006-01-13 Dan Williams - - * src/nm-device-802-11-wireless.c - - (supplicant_cleanup): delete old device control sockets too - - (supplicant_get_device_socket_path): new function to consolidate - locations that need a path to a device's control socket - -2006-01-12 Robert Love - - * src/backends/NetworkManagerSuSE.c: Put the ppp device in the - description so that the description is unique for each - pair (device,provider). Fixes Novell #142773. - -2006-01-12 Dan Williams - - * src/nm-device-802-11-wireless.c - - (supplicant_exec): ensure GError is correctly initialized - Reported by Diego González (gnome.org #326708) - -2006-01-11 Robert Love - - * src/nm-device-802-3-ethernet.c: In case local copies of glibc do not - define if_mii(), open code the same results, and do so without any - type punning. - -2006-01-11 Robert Love - - * gnome/applet/wireless-security-manager.c: Fix crash by not asserting - that wso_foo_new() returned non-NULL. Instead, only append the new - wso to wsm->options if the wso is non-NULL. The crux is that we - assume that the relevant key types are implied by WEP and WPA as - appropriate. To be sure, they should be, but we should not expect - drivers to not be oozing piles of wolf fecal matter. - -2006-01-11 Robert Love - - * configure.in: Add the gcc flags '-Wshadow' and '-Wfloat-equal'. - * gnome/applet/applet.c, gnome/vpn-properties/nm-vpn-properties.c, - src/NetworkManagerAPList.c, src/NetworkManagerDbus.c, - src/NetworkManagerPolicy.c, src/NetworkManagerSystem.c, - src/nm-dbus-device.c, src/nm-device-802-3-ethernet.c, - src/nm-ip4-config.c, src/vpn-manager/nm-vpn-manager.c, - test/nmtestdevices.c: Fix shadowed variable usage as appropriate. - * src/nm-device-802-11-wireless.c: Fix floating point comparison by - comparing values within DBL_EPSILON. Also fix shadowed variable - usage. - -2006-01-11 Dan Williams - - Add options for WPA2 and WPA1+CCMP (AES). - - * gnome/applet/wireless-applet.glade - - Add UI bits for WPA+CCMP - - * gnome/applet/other-network-dialog.c - - (nmwa_ond_init): pass capabilities into the WirelessSecurityManager, - and don't allow creation of WPA2 Ad-Hoc networks since - wpa_supplicant doesn't support them - - * gnome/applet/wireless-security-manager.c - - (wsm_set_capabilities): Add WPA2 options, and pass capability - on to the specific wireless security option being created - - * gnome/applet/wireless-security-option.[ch] - - (wso_wpa_create_key_type_model): new utility function to create - the model required for WPA Key Type combo box - - * gnome/applet/wso-private.h - gnome/applet/wireless-security-option.h - - Move private function prototypes into wso-private.h - - * gnome/applet/wso-wpa-psk-hex.[ch] - gnome/applet/wso-wpa-psk-passphrase.[ch] - - (append_dbus_params_func): get WPA version from checkbox and pass - it to the dbus serialization helper - - (key_type_combo_changed_cb): Set the cipher's WE Cipher when the - key type combo changes - - (wso_wpa_psk_hex_new): set up the key type combo with the correct - model and options - - * libnm-util/cipher-wpa-psk-hex.c - libnm-util/cipher-wpa-psk-passphrase.c - - (cipher_wpa_psk_hex_set_we_cipher, cipher_wpa_psk_passphrase_set_we_cipher): - new function; allow the cipher to be changed after object creation - - * src/nm-ap-security-wpa-psk.c - - (set_description): Do WPA2 descriptions too - - * src/nm-ap-security.c - - (nm_ap_security_new_from_ap): allow CCMP with WPA1 too - -2006-01-11 Robert Love - - * src/nm-device-802-3-ethernet.c: Use the if_mii() inline function that - is defined in to return the mii_ioctl_data structure - from the ifreq structure in lieu of an open coded solution. Removes - a life-threatening type-punning. - * configure.in: Remove '-Wno-strict-aliasing' as we no longer pun any - types, ever, whatsoever, baby. - -2006-01-11 Robert Love - - * gnome/applet/applet-dbus-devices.c, gnome/applet/applet-dbus.c, - gnome/applet/applet.c, gnome/applet/applet.h: Consolidating - assignments to applet->nm_state into a new nmwa_set_state() function - for both cleanliness and to help debugging. - -2006-01-10 Robert Love - - * src/autoip.c: Fix FIXME. In performing the link-local zeroconf IP - assignment dance, we want to sleep between PROBE_MIN and PROBE_MAX - seconds, exclusive. That is, we want to sleep x seconds such that - 1 < x < 2. - -2006-01-10 Robert Love - - * gnome/applet/applet-dbus-info.c: Remove FIXME, we do not have to free - the attr fields according to the example in the email available at - mail.gnome.org/archives/desktop-devel-list/2004-May/msg00230.html. - Conversely, we do have to free 'name', so we do so, fixing a leak. - -2006-01-10 Robert Love - - * src/nm-device-802-11-wireless.c, src/nm-device-802-3-ethernet.c: Make - sure that we close the socket! - -2006-01-10 Robert Love - - * src/nm-device-802-11-wireless.c, src/nm-device-802-11-wireless.h, - src/nm-device-802-3-ethernet.c, src/nm-device-802-3-ethernet.h, - src/nm-device.c: Fix a FIXME! Reimplement the function - nm_device_update_hw_address() in device subclass variants, - nm_device_802_3_ethernet_set_address() and - nm_device_802_11_wireless_set_address(), hook them up, and use them. - This fixes the existing bug where MAC addresses are all zeros. - -2006-01-10 Robert Love - - * gnome/applet/applet-dbus-devices.c, gnome/applet/applet-dbus.h, - gnome/applet/applet.c, gnome/applet/applet.h: Add 'Enable Networking' - option to give users ability to globally disconnect and put NM to - sleep. This is useful as a 'lockdown mode' for flying, security, and - clean disconnect. - -2006-01-09 Robert Love - - * src/nm-device-802-3-ethernet.h: The kernel headers and - leak the kernel-only types u16, u32, et al. - User-space does not supply these types, so we have to define them - ourselves. The relevant kernel maintainer refused to accept a patch - switching these headers to the proper C99 types. - -2006-01-09 Dan Williams - - Apply Robert's 'tray icon redo' patch with fixes - * gnome/applet/applet.c - gnome/applet/applet.h - - Instead of using a menu bar + menu item, simulate menu - behavior using a popup menu. Highlight the area around - the icon more like a menu too, by playing with the - applet's size requisition - -2006-01-09 Timo Hoenig - * libnm-util/dbus-helpers.c - libnm-util/dbus-helpers.h - - (nmu_create_dbus_error_message): rename parameter 'namespace' - to 'exception_namespace' (:namespace is a keyword in - C++) - -2006-01-09 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): don't autoswitch away from - Ad-Hoc networks, since there's really no concept of - "link" - - * src/nm-dbus-nm.c - - (nm_dbus_nm_create_wireless_network): mark created networks - as Ad-Hoc networks - - * src/nm-device-802-11-wireless.c - - (real_activation_success_handler): add user-created Ad-Hoc - networks to the device's scan list - -2006-01-08 Dan Williams - - We now require a patch for wpa_supplicant to support Ad-Hoc - networks: - http://people.redhat.com/dcbw/wpa_supplicant-ctrl-iface-ap-scan.patch - - * src/nm-device-802-11-wireless.c - - (supplicant_send_network_config): turn off wpa_supplicant's - scanning. Fixes Ad-Hoc networks. - -2006-01-08 Dan Williams - - * src/nm-ap-security.c - src/nm-ap-security.h - - Add a user_created argument to the write_supplicant_config - functions - - * src/nm-ap-security-wep.c - src/nm-ap-security-wpa-psk.c - src/nm-device-802-11-wireless.c - - Make Ad-Hoc mode somewhat work, at least write the - correct options to wpa_supplicant - -2006-01-08 Dan Williams - - * src/nm-device-802-11-wireless.c - - Remove unused code from the old device activation path - -2006-01-08 Dan Williams - - * libnm-util/dbus-helpers.c - - (nmu_security_serialize_wpa_psk): pass a blank key through - dbus when key == NULL - -2006-01-08 Dan Williams - - * gnome/applet/nm-gconf-wso-wpa-psk.c - - (nm_gconf_wso_wpa_psk_new_deserialize_dbus): feed - correct arguments to nmu_security_deserialize_wpa_psk() - - * src/nm-ap-security-wpa-psk.c - - (nm_ap_security_wpa_psk_new_deserialize): feed correct - arguments to nmu_security_deserialize_wpa_psk() - -2006-01-08 Dan Williams - - * gnome/applet/wso-wpa-psk-hex.c - gnome/applet/wso-wpa-psk-passphrase.c - - Hook up the append_dbus_params_func() function - -2006-01-08 Dan Williams - - * src/nm-device-802-11-wireless.c - - (get_wireless_capabilities): correctly detect driver WPA - capabilities - -2006-01-08 Dan Williams - - * gnome/applet/Makefile.am - gnome/applet/wso-wpa-psk-hex.c - gnome/applet/wso-wpa-psk-hex.h - - New files, implement WPA-PSK Hex key input - - * gnome/applet/wireless-applet.glade - - Change existing wpa-psk stuff to wpa-psk-hex - - Add new widgets for wpa-psk-passphrase - - * gnome/applet/wireless-security-manager.c - - (wsm_set_capabilities): enable WPA options - - * gnome/applet/wso-wpa-psk-passphrase.c - - (wso_wpa_psk_passphrase_new): use correct glade widgets - for WPA-PSK passphrase - -2006-01-08 Dan Williams - - * include/NetworkManager.h - - Add NMI_DBUS_USER_KEY_CANCELED_ERROR as a constant for - applet/info-daemons - - * gnome/applet/passphrase-dialog.c - - Use the constant. Fixes a bug where the arguments to - dbus_message_new_error() were incorrect - - * src/nm-dbus-nmi.c - - Use the constant - -2006-01-07 Dan Williams - - * src/nm-device-802-11-wireless.c - - Add a link timeout so we allow the supplicant time to - reassociate if it can, before we deactivate the card - - Fix up link status and link updating so things work better - -2006-01-07 Dan Williams - - * src/nm-device-802-11-wireless.c - - Switch over to using wpa_supplicant - - Add a timeout of 10s for association of the supplicant - - Start the monitor callback of the supplicant - -2006-01-07 Dan Williams - - * src/NetworkManagerUtils.c - - (nm_utils_supplicant_request, - nm_utils_supplicant_request_with_check): - pass correct buffer length to wpa_ctrl_request() - -2006-01-07 Dan Williams - - * src/nm-device-private.h - src/nm-device.c - - (nm_device_activate_schedule_stage3_ip_config_start): make - this function available to subclasses - -2006-01-06 Robert Love - - * src/NetworkManagerPolicy.c: Always prefer wired to wireless, as the - user plugging in a network cable signals their preference for to - switch, unless the user explicitly selected a wireless network and - therefore signaled their preference for said wireless network over - wired. In other words, do exactly what makes sense. - -2006-01-06 Robert Love - - * src/NetworkManagerDevice.c, src/NetworkManagerDevice.h, - src/NetworkManagerDevicePrivate.h, src/NetworkManagerWireless.c, - src/NetworkManagerWireless.h: Remove, no longer used and they keep - showing up in my greps. - -2006-01-06 Robert Love - - * gnome/applet/applet-dbus-devices.c, - gnome/applet/other-network-dialog.c, gnome/applet/wso-none.c, - libnm-util/dbus-helpers.c, libnm-util/dbus-helpers.h, - src/nm-dbus-nm.c: Fix several issues. 'Connect to Other' and 'Create - New Network' both failed in the non-encrypted case because we were - not appending the security options to the DBUS message. And - 'Connect to Other' was also failing in the encrypted case because - we were not incrementing to the next DBUS parameter. All fixed. - Thanks to dcdw for some debugging help. - -2006-01-06 Robert Love - - * gnome/applet/applet-dbus-devices.c, gnome/applet/applet.c, - gnome/applet/applet-dbus-devices.h, src/nm-dbus-nm.c: Remove global - hangup code and add per-device hangup. Tie last commit into the - GNOME applet. TODO: Save, understand, and respond to the state of - each dialup device. - -2006-01-06 Robert Love - - Patch by Timo Hoenig : - * src/NetworkManagerSystem.h, src/nm-dbus-nm.c: Add interfaces to - hangup specific dialup devices. - * src/backends/NetworkManagerDebian.c, - src/backends/NetworkManagerGentoo.c, - src/backends/NetworkManagerRedHat.c, - src/backends/NetworkManagerSlackware.c: Add stub backend. - * src/backends/NetworkManagerRedHat.c, - src/backends/NetworkManagerSuSE.c: Add specific backend interface to - hangup specific dialup devices. - -2006-01-04 Robert Love - - * gnome/applet/applet-dbus-devices.c, - gnome/applet/applet-dbus-devices.h, gnome/applet/applet.c, - src/nm-dbus-nm.c: Expose a menu item for hanging up active dialup - connections. - -2006-01-04 Dan Williams - - First dump of wpa_supplicant-related code. It's not hooked up to - anything yet though. Thanks to Kay Sievers for - wpa_supplicant_wrapper.c, which formed the basis for this work, - and to Jouni Malinen for writing wpa_ctrl.c and wpa_ctrl.h. - - * src/Makefile.am - src/wpa_ctrl.[ch] - - Add wpa_ctrl stuff from wpa_supplicant so we can talk to it - - * src/NetworkManagerUtils.[ch] - - (nm_utils_supplicant_request, nm_utils_supplicant_request_with_check): - Add convenience functions for talking to wpa_supplicant - - * src/nm-ap-security.[ch] - src/nm-ap-security-wep.c - src/nm-ap-security-wpa-psk.[ch] - - Update and implement real_write_supplicant_config functions - in all security types - - (nm_ap_security_wpa_psk_new_from_ap): implement in - nm-ap-security-wpa-psk.c - - * src/nm-device-802-11-wireless.c - - (supplicant_cleanup, supplicant_watch_cb, supplicant_monitor_status_cb, - wpa_supplicant_start, wpa_supplicant_interface_init, - wpa_supplicant_send_network_config): add functions to talk to - wpa_supplicant and write network config to it - -2006-01-04 Robert Love - - * src/NetworkManagerDialup.h: add 'type' field and NM_DIALUP_TYPE - values so that distribution-backends can differentiate between the - various types (modem, ISDN, et cetera) of dialup device that they - support. - * src/backends/NetworkManagerSuSE.c: perform isdnctrl on interface, as - needed. - -2006-01-03 Dan Williams - - * src/NetworkManagerPolicy.c - src/nm-device.[ch] - src/nm-device-802-11-wireless.c - - Move wireless-specific activation failure and success code - into wireless device class - -2006-01-03 Robert Love - - Patch by Preggna S: - * src/NetworkManagerSystem.c, src/vpn-manager/nm-vpn-connection.c: - IPsec does not require that a VPN client be bound to an interface, - due to the use of the in-kernel IPSec bits. So make the tunnel - device optional. - -2006-01-03 Dan Williams - - * src/NetworkManagerAP.c - - (nm_ap_add_capabilities_from_ie): presume no WEP unless - the WPA IE specifies that WEP is supported - - * src/nm-device-802-11-wireless.c - - (process_scan_results): don't mark an AP as supporting WEP - if there's already other encryption capability info - -2006-01-03 Dan Williams - - * src/dhcp-manager/nm-dhcp-manager.c - - Recognize activation cancellation when waiting for DHCP - configuration from dhcdbd - - Ignore non-dhcdbd messages - - * src/nm-device.c - - (real_act_stage3_ip_config_start): return to correct behavior - of letting the dhcp-manager notify us of failure or - success rather than incorrectly doing that ourselves - - (nm_device_activate_stage4_ip_config_get): deal with - activation cancellation a bit earlier - -2006-01-03 Dan Williams - - * src/nm-device-802-11-wireless.c - src/nm-device.[ch] - - Add hooks to subclasses for stage3_ip_config_start and - stage4_ip_config_timeout - - * src/nm-device-802-3-ethernet.c - - (real_get_generic_capabilities): make devices NM-supported - by default - -2006-01-03 Robert Love - - * src/backends/NetworkManagerSuSE.c: update to newer API (no more - nm_device_get_hw_address); use inet_aton in lieu of inet_addr as the - latter cannot differentiate between error and the address -1; misc. - clean up. - -2006-01-03 Dan Williams - - * src/NetworkManager.c - - Move link-checking/probing into the device subclasses - themselves - - * src/nm-device.[ch] - src/nm-device-802-11-wireless.c - src/nm-device-802-3-ethernet.c - - Do periodic link checking in device subclasses rather - than being triggered from NetworkManager.c - - discover_wireless_capabilities -> get_wireless_capabilities - - discover_generic_capabilities -> get_generic_capabilities - - Device subclass activation routines now return a value of type - NMActStageReturn to indicate what step to perform next - - Devices now override stage4_get_ip4_config if they choose - -2006-01-01 Dan Williams - - * src/nm-device-802-11-wireless.c - - (real_init): don't chain up to parent init because we don't - need to do that anymore - - * src/nm-device.c - - (discover_device_type): fix arguments to ioctl() to correctly - pass interface name - - (nm_device_new): consolidate generic device initialization into - nm_device_new() - - (real_init): remove, consolidated to nm_device_new() - - (nm_device_deactivate, real_deactivate): consolidate - -2006-01-01 Dan Williams - - * src/nm-activation-request.c - - Change dhcp_state member of the NMActRequest structure - from guint8 to guint32 - - * src/dhcp-manager/nm-dhcp-manager.[ch] - - (nm_dhcp_manager_get_state_for_device): return guint32 rather - than guint8 to match the dbus argument. Turns out we were - overwriting memory since we were passing in only a guint8 - -2005-12-31 Dan Williams - - * refactor NMDevice into a GObject-based framework with separate - objects for wired and wireless. The following files are no - longer used but should stick around for a bit so we don't - loose code through the cracks: - NetworkManagerDevice.c - NetworkManagerDevice.h - NetworkManagerWireless.c - NetworkManagerWireless.h - - The intent here is to allow each device type to manage its own - connection & activation life-cycle, ie to allow wireless devices - to interface with wpa_supplicant, etc. There's a fair bit of - encapsulation breakage right now that should gradually get pulled - back into each device, along with things like periodic property - updates and link probing. - -2005-12-29 Dan Williams - - * include/NetworkManager.h - - Add NM_802_11_CAP_PROTO_NONE since we need to recognize - between networks that don't have any encryption at all - -2005-12-29 Dan Williams - - * test/test-common.c - test/test-common.h - test/Makefile.am - - Move to a test-common subdirectory - - * test/libnm-util/test-ciphers.c - - Move test data to test-inputs.h - - Test WPA ciphers too - - * test/libnm-util/test-dbus-helpers.c - - Test serialization/deserialization of ciphers - -2005-12-29 Dan Williams - - * gnome/applet/applet-dbus-devices.c - - Replace 'enc' parameter with 'capabilities' for wireless networks - in dbus calls to NM - - Set capabilities on WirelessNetwork objects - - Receive and save type-specific device capabilities too - - * gnome/applet/applet-dbus-info.c - gnome/applet/applet-dbus.c - - Passphrase dialog no longer a singleton; new instance gets created - on each request. Updates to deal with that. - - * gnome/applet/applet.c - - (nmwa_has_encrypted_networks_helper): use AP capabilities rather - than single 'encrypted' flag - - (nmwa_menu_add_vpn_menu): if NM isn't connected, disable any VPN - menu items - - Passphrase dialog updates per above - - * gnome/applet/menu-items.c - - (network_menu_item_update): use AP capabilities to determine - encryption - - * gnome/applet/nm-device.[ch] - - Add accessors for type-specific device capabilities - - * gnome/applet/other-network-dialog.c - - Rework to respect device capabilities. i.e., if the device doesn't - support WPA, remove that option from the security dropdown - - * gnome/applet/passphrase-dialog.c - - Massive rework so that a new instance is created each time - it's used, to support wireless network capabilities - - * gnome/applet/wireless-network.[ch] - - Add accessors and members for wireless network capabilities - - * gnome/applet/wireless-security-manager.[ch] - - (wsm_set_capabilities): called after creation to set which - security options get shown to the user - -2005-12-29 Dan Williams - - * libnm-util/cipher-wpa-psk-passphrase.c - - (cipher_wpa_psk_passphrase_hash_func): return key as hex string - like other ciphers - -2005-12-23 Dan Williams - - * gnome/applet/applet-dbus-info.c - - (nmi_dbus_get_key_for_network): if there's no entry in - GConf for a network, assume we want a new key - - (nmi_save_network_info): serialize wireless security info - into GConf so its saved - - * src/nm-dbus-nm.c - - Fix warning as we may not be passed security info when - connecting to a wireless network - -2005-12-23 Dan Williams - - * gnome/applet/applet-compat.c - - Fix bugs in GConf entry conversion - - * gnome/applet/applet-dbus-info.c - - (nmi_dbus_get_network_properties): handle case of the BSSID - list being zero-length - - * libnm-util/cipher-* - libnm-util/dbus-helpers.c - - All ciphers must now return hashed keys as UTF-8 valid - hexadecimal strings, ie "8f3dae4023". They are pushed - through dbus as strings too. - - Consolidate various functions that do bin->hex and hex->bin - conversion into cipher.c - - * src/nm-ap-security-wep.c - src/nm-ap-security-wpa-psk.c - - Handle NULL keys since we may not know keys right away - - * src/nm-dbus-nmi.c - - (nm_dbus_get_network_data_cb): actually advance to the start - of the wireless security info before we try to deserialize it - - * libnm-util/test-ciphers.c - - Update cipher tests for the change to UTF-8 hexadecimal strings - -2005-12-22 Dan Williams - - * gnome/applet/applet-compat.[ch] - - Convert old-format GConf and keyring entries - when the applet starts up. - - * gnome/applet/applet.c - - (nmwa_get_instance): Call the conversion function - on startup before dbus is initialized - -2005-12-22 Dan Williams - - * gnome/applet/applet-dbus-info.c - - Remove nmi_dbus_create_error_message() in favor of - nmu_create_dbus_error_message() - - (nmi_dbus_get_network_properties): Error message cleanups - - (nmi_dbus_get_network_properties): BSSIDs are now in the 'bssids' - gconf key rather than 'addresses', since they really are BSSIDs - - (nmi_dbus_get_network_properties): Dispose of the security - object when we're done with it - -2005-12-21 Dan Williams - - * Consolidate the info-daemon's "updateNetworkInfo" and - "addNetworkAddress" calls into just "updateNetworkInfo" - -2005-12-21 Dan Williams - - * Make connection after key retrieval work again - -2005-12-21 Dan Williams - - * gnome/applet/nm-gconf-wso* - - Make the serialize functions return gboolean - rather than int - - * gnome/applet/nm-gconf-wso.c - - (nm_gconf_wso_dispose, nm_gconf_wso_finalize): fix up - parent class handling so we don't segfault - - * src/NetworkManagerAP.[ch] - - (nm_ap_get_capabilities): new function, return capabilities - now that something can use them - - (nm_ap_set_encrypted): assume that an access point supports - both WEP104 and WEP40 if its set encrypted. FIXME: can - we even tell whether it just supports WEP40? - - * src/NetworkManagerDevice.c - - (ap_need_key): resurrect and update for the New World Order - - (nm_device_wireless_get_activation_ap): if we're not given - security info to use, create some based on access point - capabilities - - * src/nm-ap-security-wep.c - - (nm_ap_security_wep_new_from_ap): create a new object - based on a certain access point's capabilities - - * src/nm-ap-security.c - - (nm_ap_security_new_from_ap): delegate creation of a new - object based on access point capabilities to a subclass - - (nm_ap_security_copy_properties): don't segfault if we - don't have a key yet - - * src/nm-dbus-nm.c - - (nm_dbus_nm_set_active_device): provide more informative - output when errors occur. Also construct security info - for a given access point if we weren't given any - -2005-12-21 Žygimantas Beručka - - * configure.in: Added Lithuanian to ALL_LINGUAS. - -2005-12-21 Dan Williams - - * test/libnm-util - - Add some testcases for WEP ciphers - -2005-12-17 Dan Williams - - * Fix bugs - -2005-12-17 Dan Williams - - * include/NetworkManager.h - - Finally kill NMEncKeyType - - * gnome/applet/applet-dbus-info.c - - (nmi_save_network_info): convert to NMGConfWSO - - * gnome/applet/nm-gconf-wso-*.c - - Implement gconf serialization functions - - * src/NetworkManagerPolicy.c - - (nm_policy_activation_finish): fix up meaning of - automatic/user_requested - -2005-12-17 Dan Williams - - * gnome/applet/* - - More applet cleanups - - Use the dbus-method-dispatcher - - * libnm-util/dbus-method-dispatcher.[ch] - - Generalize the implementation from NM in - NetworkManagerUtils.c - -2005-12-16 Dan Williams - - * gnome/applet/* - - Fix up the passphrase dialog to use all the - WirelessSecurityOption stuff (untested) - -2005-12-16 Dan Williams - - * Move nm_gconf_get_*_helper() functions to separate files, - gconf-helpers.c & gconf-helpers.h - - * New NMGConfWSO objects for managing the gconf side of things. - Eventually these should be merged with the - WirelessSecurityOption objects and a common base (that can - serialize/deserialize from dbus & gconf) should be - refactored out, but for now they are separate. - -2005-12-16 Robert Love - - * src/backends/NetworkManagerSuSE.c: Do not invoke ypbind or autofs - binaries unless they exist (nm_spawn_process() emits a warning if - asked to spawn a non-existant process). - -2005-12-16 Dan Williams - - * gnome/applet/applet-dbus-info.c - - Clean up lots of gconf-related code - -2005-12-16 Robert Love - - * Makefile.am: Build fix: Reorder 'SUBDIRS' so our deps are right. - -2005-12-16 Dan Williams - - * nm_device_set_enc_key -> nm_device_set_wep_enc_key - - * Fix up NM -> NMI get-user-key dbus calls in NM (applet - bits still to be done) - -2005-12-16 Dan Williams - - * Finally move info-daemon related stuff out of - NetworkManagerDbus.c to nm-dbus-nmi.c - -2005-12-16 Dan Williams - - * Kill auth_method for access points, since that's now done - by NMAPSecurity objects - - * Add a copy-constructor of sorts to NMAPSecurity - (how do you do this properly in glib???) - -2005-12-15 Dan Williams - - * Exorcise encryption key hashing on APs - * Use libnm-util's serialization/deserialization in both the - applet and NM - * Random other stuff - -2005-12-15 Robert Love - - * gnome/applet/menu-items.c: A new icon, "network-wireless-encrypted" - is being added to the icon naming spec, so let's use that (Tango CVS - has the icon). Because it is new, however, we fall back to the - current "gnome-lockscreen" if the new icon is not around, thus - behavior is the same. - * gnome/applet/applet.c: Remove setup_stock(). We do not need the - factory junk. - -2005-12-15 Robert Love - - * src/gnome/applet.c: Don't show the 'Help' menu item until we have, - well, help to give. Couple other misc. bits. - -2005-12-15 Dan Williams - - * libnm-util/dbus-helpers.[ch] - - Make this the one-stop-shop for serializing/deserializing - AP & connection security settings over dbus. Both NM - and applets should use this to ensure consistent dbus - API going forwared. - -2005-12-15 Robert Love - - Patch by Timo Hoenig : - * src/NetworkManagerDbus.c - - (nm_dbus_signal_filter) return DBUS_HANDLER_RESULT_HANDLED - if HAL jumps off the system bus. Otherwise libdbus - (dbus_connection_dispatch) will try to run the filter - function of our libhal context which is already freed. - -2005-12-15 Alexander Shopov - - * configure.in: Added "bg" (Bulgarian) to ALL_LINGUAS - -2005-12-14 Dan Williams - - * include/NetworkManager.h - src/NetworkManagerWireless.c - - Rearrange 802.11 wireless-specific capabilities again - - * src/Makefile.am - - Forgot to add wpa.c/wpa.h to the makefiles - - * src/NetworkManagerAP.[ch] - - Implement access point capabilities and parse the - WPA/RSN IEs into the capability bitfield - - Switch the "encrypted" attribute to utilize the bitfield - and capabilities rather than being independent - - * src/NetworkManagerDevice.c - - (nm_device_wireless_get_activation_ap): break it horribly - until we can push NMAPSecurity objects into access point - objects and through the activation chain - - Stuff WPA & RSN IEs into AP capabilities - - * src/nm-dbus-nm.c - - Take a shot at actually making setActiveDevice work - - * src/wpa.[ch] - - Make the API a bit saner - -2005-12-14 Dan Williams - - * include/NetworkManager.h - - Add 802.11-specific capability for 802.1x key - management - - * src/wpa.[ch] - - Pull in WPA IE and RSN IE parsing code from - wpa_supplicant so we can determine access point - capabilities - - Move WPA-related constants here from NetworkManagerAP.h - and NetworkManagerDevice.c - - * src/NetworkManagerDevice.c - src/NetworkManagerAP.[ch] - - Use WPA-related constants from wpa.h - -2005-12-14 Dan Williams - - * include/NetworkManager.h - - Update and split 802.11 wireless-specific capabilities from - generic device capabilities - - * src/NetworkManagerDevice.c - src/NetworkManagerDevicePrivate.h - - (nm_device_wireless_discover_capabilities): Move 802.11 - wireless-specific capability checks to - NetworkManagerWireless.c - - Rename NMDeviceWirelessOptions -> NMDevice80211WirelessOptions - - Rename NMDeviceWiredOptions -> NMDevice80211EthernetOptions - - * src/NetworkManagerWireless.[ch] - - (nm_802_11_wireless_discover_capabilities): Check extended - 802.11 wireless-specific capabilities of the driver - -2005-12-14 Robert Love - - Patch from Stefan Scheler : - * src/NetworkManagerDevice.c: call backend code to activate and - deactivate NIS. - * src/NetworkManagerSystem.h: add new NIS interfaces. - * src/backends/NetworkManagerDebian.c, - src/backends/NetworkManagerGentoo.c, - src/backends/NetworkManagerRedHat.c, - src/backends/NetworkManagerSlackware.c: add stub functions for NIS - support. - * src/backends/NetworkManagerSuSE.c: add NIS support, baby. - -2005-12-14 Dan Williams - - * src/nm-ap-security*.[ch] - - Add AP security abstractions to NetworkManager - - * src/nm-dbus-device.c - - Begin to parse new format dbus messages from the applet - and construct an AP security object from the message - - * libnm-util/dbus-helpers.c - - Use message iters so we can append the key as a fixed - array of bytes, which actually works rather than - using dbus_message_append_args() as we were before - -2005-12-14 Dan Williams - - * src/NetworkManagerDbus.c - gnome/applet/applet-dbus.c - - Fix up dbus service replacement options. The applet - should allow replacement, NM itself should not. - -2005-12-13 Robert Love - - * src/named-manager/nm-named-manager.c: Revert earlier commit. - Instead, fail silently if config is NULL by not asserting and not - returning FALSE. Also, make sure we always fclose() the file. - -2005-12-13 Robert Love - - Patch by Stefan Scheler : - * src/nm-ip4-config.h, src/nm-ip4-config.c, - src/dhcp-manager/nm-dhcp-manager.c: Add support for setting up NIS - via DHCP. Still need the backends to commit the NIS domain name and - and servers to yp.conf as needed. - -2005-12-13 Robert Love - - * src/vpn-manager/nm-dbus-vpn.c: Do not call the lengthy-named function - nm_vpn_manager_remove_connection() unless vpn is non-NULL. - -2005-12-13 Robert Love - - * src/named-manager/nm-named-manager.c: Don't unref the config until - after we call rewrite_resolv_conf(), because get_last_default_domain() - needs to access the config. Fixes "rewrite_resolv_conf: assertion - `config != NULL' failed" assertion failures and "Could not commit DNS - changes" warnings. - -2005-12-12 Dan Williams - - * libnm-util/dbus-helpers.[ch] - libnm-util/Makefile.am - - new helper calls to consolidate locations where - NM's setDevice method is called - - * gnome/applet/applet-dbus-devices.c - gnome/applet/wireless-security-option.c - gnome/applet/wso-* - - Implement dbus message param append function for - all wireless security options - -2005-12-12 Robert Love - - * libnm-util/cipher-wep-passphrase.c, - libnm-util/cipher-wpa-psk-passphrase.c, src/NetworkManagerAP.c, - src/NetworkManagerAP.h, src/NetworkManagerDevice.c, - src/NetworkManagerWireless.c, src/NetworkManagerWireless.h: Treat - all WEP/WPA keys as "char *" and not explicitly signed or unsigned. - When handling keys, we don't care what the sign is. The compiler - guarantees us that we get our 8-bits, which is all we care about. - * configure.in: Remove "-Wno-pointer-sign" flag. We are sign-aware! - -2005-12-12 Dan Williams - - * gnome/applet/applet-dbus-devices.[ch] - gnome/applet/applet.c - gnome/applet/other-network-dialog.c - gnome/applet/wireless-security-manager.[ch] - gnome/applet/wireless-security-option.[ch] - gnome/applet/wso-* - - Push the wireless security options further into the applet - -2005-12-12 Robert Love - - * src/dhcp-manager/nm-dhcp-manager.c: Do not fail if DHCP does not - return any name servers. That is perfectly valid. (Novell #134369). - -2005-12-11 Dan Williams - - * gnome/applet/wso-* - gnome/applet/wireless-security-option.* - gnome/applet/Makefile.am - - split each security option out so we can eventually - have each one build up their own dbus message - arguments to send to NM - -2005-12-11 Dan Williams - - * Make validation of the key work correctly - -2005-12-11 Dan Williams - - * Hook more bits of the Other Network Dialog up to the - wireless security manager stuff, and restructure - bits of the dialog so there's less code. - -2005-12-10 Dan Williams - - * gnome/applet/Makefile.am - - Add libnm-util to includes - - Add libnm-util to link list - - Add wireless-security-common.* to compile list - - * gnome/applet/other-network-dialog.c - - Convert to using the WirelessSecurityManager code and - widgets - - * gnome/applet/passphrase-dialog.c - - Comment out references to stuff in the glade file that - cause runtime errors until it can be fixed up - to use the WirelessSecurityManager code - - * gnome/applet/wireless-applet.glade - - Rename some widgets - - Add widgets for the WirelessSecurityManager code - - Remove passphrase-related stuff since that's now - handled by the WirelessSecurityManager code - -2005-12-10 Dan Williams - - * gnome/applet/applet-dbus-devices.c - - Print out error message details for dbus pending call callbacks - - Move nmwa_dbus_update_devices() up - - * gnome/applet/applet-dbus-vpn.c - - Print out error message details for dbus pending call callbacks - -2005-12-10 Dan Williams - - * libnm-util/* - - More fixups - - Remove cipher-manager.* because we don't need it - - Forgot to add gnome-keyring-md5 files to compile list - -2005-12-09 Dan Williams - - * libnm-util/* - configure.in - Makefile.am - - Add a utility library for clients of NetworkManager. It's - only targetted at applets for the moment, and contains - a generalized 802.11 cipher framework for different - types of keys (WEP & WPA Hex, ASCII, Passphrase) - -2005-12-09 Robert Love - - * src/NetworkManagerDevice.c: handle error better in - nm_device_set_mode(). - -2005-12-08 Robert Love - - * include/NetworkManager.h: add WPA capabilities constants - * src/NetworkManagerDevice.c: detect if wireless devices support WPA - or WPA2 and add the capabilities bits as appropriate. - -2005-12-08 Robert Love - - * initscript/SUSE/networkmanager-dispatcher.in: new initscript for - NetworkManagerDispatcher. - * configure.in, initscript/SUSE/.cvsignore, - initscript/SUSE/Makefile.am: support new networkmanager-dispatcher - initscript. - -2005-12-08 Robert Love - - * initscript/SUSE/networkmanager.in: Do not start 'networking' service. - -2005-12-08 Robert Love - - * src/NetworkManagerDevice.c: We want to fall back on and default to - IW_MODE_AUTO, not -1, which is more in line with our previous - behavior. Otherwise, we try to set the wireless mode to -1 in - nm_device_set_mode(). - -2005-12-07 Robert Love - - * gnome/applet/applet-dbus-info.c, include/NetworkManager.h, - src/NetworkManagerAP.c, src/NetworkManagerAP.h, - src/NetworkManagerAPList.c, src/NetworkManagerDbus.c, - src/NetworkManagerDevice.c, src/NetworkManagerDevice.h, - src/nm-dbus-nm.c: Convert NM_DEVICE_AUTH_METHOD_* to use the - wireless-tools constants directly. UNKNOWN is now -1 and NONE is - zero. - -2005-12-07 Robert Love - - * src/backends/NetworkManagerSuSE.c: In static configurations, if the - supplied IP is invalid, fall back to DHCP. - -2005-12-07 Dan Williams - - * Convert NETWORK_MODE_* constants to IW_MODE_* - * Make all the get_mode/set_mode functions take and return 'int' - * Convert D-BUS calls that pass mode to DBUS_TYPE_INT32 rather than UINT32 - -2005-12-07 Robert Love - - * src/NetworkManagerDevice.c: strncpy() buffer check. - * src/NetworkManagerUtils.c: be anal about syslog() formatting. - -2005-12-06 Dan Williams - - * gnome/applet/applet-dbus.c - - (set_vpn_last_attempt_status): remove, now in applet-dbus-vpn.c - - * gnome/applet/applet-dbus-vpn.c - - (nmwa_dbus_vpn_set_last_attempt_status): new, from applet-dbus.c - - (nmwa_dbus_vpn_update_vpn_connection_stage): set last_attempt_success - to TRUE here if stage was ACTIVATED - -2005-12-06 Dan Williams - - * Change nm_device_is_* functions to better names: - nm_device_is_wireless() -> nm_device_is_802_11_wireless() - nm_device_is_wired() -> nm_device_is_802_3_ethernet() - -2005-12-06 Dan Williams - - * Change naming of NMDeviceType to something more sensible: - NM_DEVICE_TYPE_DONT_KNOW -> NM_DEVICE_TYPE_UNKNOWN - NM_DEVICE_TYPE_WIRED_ETHERNET -> NM_DEVICE_TYPE_802_3_ETHERNET - NM_DEVICE_TYPE_WIRELESS_ETHERNET -> NM_DEVICE_TYPE_802_11_WIRELESS - -2005-12-06 Dan Williams - - * Move NetworkManager.h -> include/NetworkManager.h - * Split out VPN stuff into include/NetworkManagerVPN.h - * Fix up makefiles to include new location - * Fix up sources to include NetworkManagerVPN.h - -2005-12-06 Dan Williams - - Various changes in the applet to move VPN connection "state" -> "stage", - which it actually is. I'd like to change the signal as well when we - break compat in the near future. - -2005-12-06 Dan Williams - - Slackware patches from Paul Blazejowski - * initscript/Slackware/rc.networkmanager - - Cosmetic fix - - * src/backends/NetworkManagerSlackware.c - - Kill dhcpcd when starting so that dhclient can bind to DHCP on - interfaces - -2005-12-05 Robert Love - - * src/NetworkManager.c: don't call nm_data_free() when there is nothing - to free, particularly here as it just barfs. - -2005-12-05 Dan Williams - - * gnome/applet/applet-dbus.c - - Work with dbus 0.6 too - -2005-12-03 Dan Williams - - * src/NetworkManagerUtils.[ch] - src/nm-ip4-config.c - - move ip4_netmask_to_prefix() to NetworkManagerUtils.c - - consolidate code into nm_utils_ip4_addr_to_nl_addr() - -2005-12-01 Robert Love - - * gnome/applet/main.c, gnome/vpn-properties/nm-vpn-properties.c: We - need a NULL for the '...' parameter, too, to fill the so-called - sentinel. - -2005-12-01 Robert Love - - * src/NetworkManagerSystem.c: If iface_to_rtnl_link() returns NULL, the - interface is already gone, so don't call rtnl_link_change() to down - it (which will segfault, anyhow). - -2005-11-22 Robert Love - - * src/backends/NetworkManagerSuSE.c: Don't fall back to DHCP if the - gateway is not set, just print a little note. Configurations without - gateways are valid. - -2005-11-22 Robert Love - - * README: update - -2005-11-20 Ilkka Tuohela - - * configure.in: Added Finnish translation to ALL_LINGUAS - -2005-11-14 Robert Love - - * vpn-daemons/openvpn: initial checkin of OpenVPN VPN Module, by Tim - Niemueller . - -2005-11-08 Dan Williams - - Patch from Bill Moss - * src/NetworkManagerDevice.c - - (nm_device_activate_stage5_ip_config_commit): fix ordering - of nm_policy_schedule_activation_finish() to prevent a - race condition that causes the link to be dropped - -2005-11-08 Dan Williams - - Patch from Bill Moss - * src/NetworkManagerAPList.c - src/NetworkManagerDevice.c - src/NetworkManagerDbus.c - - Replace occurances of ether_ntoa_r() with iw_ether_ntop() so - we get more readable ether/mac addresses - -2005-11-02 Christopher Aillon - - * gnome/applet/main.c: Don't set the restart command. This fixes - the issue where the restart command was getting copies of all its - arguments for each time the applet was restarted. - -2005-11-02 Robert Love - - * gnome/applet/applet.c: Only send the DBUS setWirelessEnabled method - if the widget state differs from our saved state. This ensures we - do not enter an endless loop of death and destruction. Also, this - guarantees us that we enforce the widget state. - -2005-11-02 Robert Love - - * gnome/applet/applet.c: add nmwa_enable_wireless_set_active(). - * gnome/applet/applet-dbus-devices.c: invoke the new function - nmwa_enable_wireless_set_active() to ensure that the state of the - 'Enable Wireless' checkbox matches the daemon's state. This is a - concern because the daemon remembers the state. - -2005-11-02 Robert Love - - * gnome/applet/applet.c: Make menu item "Enable Wireless" not "Wireless - Enabled", as checkboxes should be actions/commands not positive - statements, otherwise they are confusing in the unselected case. See - examples in GNOME HIG, Chapter 6. - -2005-11-02 Robert Love - - * gnome/applet/applet.c: When wireless is disabled, act it. Do not - show a list of wireless networks or the wireless devices or the - "Create Wireless ..." menus. Aside from this cosmetics, this fixes - a bad bug: If wireless is disabled and the user picks a wireless - network, NM will switch to the network, only to immediately switch - back, as wireless is disabled. This also reassures people that NM - is not scanning (it is not -- I verified). Fixes Novell bug #130041. - -2005-11-02 Christopher Aillon - - * gnome/applet/applet.c: - * gnome/applet/applet.h: - Partial backout of Dan's timeout animation patch. - Timeout IDs cannot legally be 0, so revert the code in place to handle - a timeout ID of 0 to denote the timeout isn't running. - -2005-11-02 Christopher Aillon - - * src/NetworkManagerPolicy.c: - (nm_policy_device_change_check) Clarify wireless switch nm_info text - -2005-10-28 Robert Love - - * vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade: Change label to - "Import Saved Configuration..." to make it clear that importing is - not the next step, but an option. As an aside, a nice TODO would be - to move Importing out of the vpn-specific dialog and into the main - property editor, as Importing goes with Adding, but that will require - some rearchitecting of the VPN stuff I suspect. - -2005-10-27 Dan Williams - - Start using libnl. You need 1.0-pre3 or higher. Eventually - we should replace most of the distro-specific backend code - with libnl stuff. - - Get it here: http://people.suug.ch/~tgr/libnl/ - - * configure.in - src/Makefile.am - - Add checks for libnl pkgconfig file - - Use LIBNL_LIBS & LIBNL_CFLAGS - - * src/NetworkManagerSystem.c - src/nm-ip4-config.[ch] - - Use libnl rather than ioctl() for most things - - Remove unused functions - -2005-10-27 Robert Love - - * src/backends/NetworkManagerSuSE.c: fix warning message text - -2005-10-27 Christopher Aillon - - * gnome/applet/applet.c: Use the copyright symbol instead of (C) - -2005-10-27 Christopher Aillon - - * gnome/applet/applet.c: The applet's about dialog can advertise our - project page - -2005-10-26 Christopher Aillon - - * gnome/applet.c: Also use translator credits if we don't have - the new GtkAboutDialog (older versions of GTK+) - -2005-10-26 Robert Love - - * dispatcher-daemon/NetworkManagerDispatcher.c: print actual error string on daemon() - failure; correct usage text for "--no-daemon" - -2005-10-25 Dan Williams - - * src/NetworkManagerDevice.c - - (get_scan_results): cleanups, deal cleanly with ENODATA signifying - no scan results - - (free_process_scan_cb_data): unref the device when freeing results - - (nm_device_wireless_process_scan_results): free scan results a bit later - so we don't unref the device underneath ourselves - -2005-10-25 Dan Williams - - * Back out 2005-10-24 commit from Tor Krill. Patch - causes nameservers never to be removed from named. - -2005-10-24 Dan Williams - - Clean up wireless scanning and wireless link probing. - - * src/NetworkManagerDevice.c - - (nm_device_probe_wireless_link_state): instead of calling nm_get_best_ap(), - just see if there's an activation request on the device, and check the - current link against the activation request access point's ESSID. - - (link_to_specific_ap): increase the # of failed links we tolerate from 3 to 6 - - (nm_device_wireless_process_scan_results): actually free our scan data, and - don't call process_scan_results() on zero-length data - - (nm_device_set_wireless_scan_interval): increase the init scan interval to - 15 seconds (from 10) - -2005-10-24 Dan Williams - - Cleanup some applet stuff: - - - Animation timeouts. If NM died while the applet was animating, - the applet would not hide itself. This is now fixed. - - - Remove some dead code - - - Remove nmi_passphrase_dialog_schedule_cancel() and convert uses - to nmi_passphrase_dialog_cancel() since we no longer use threads. - - - Track animation timeout using a gboolean rather than the timeout's - ID, since timeout IDs can legally be 0. - -2005-10-24 Dan Williams - - * src/backends/interface_parser.c - - Add void to function declarations that need it - to match patch from Engin AYDOGAN - - * src/backends/interface_parser.h - - Remove unused prototype for ifparser_interfaces() - - Patch from Engin AYDOGAN - * src/backends/interface_parser.h: - - Compile fixes for gcc 4.0.2 (add void) - -2005-10-24 Dan Williams - - Patch from Tor Krill - * src/named-manager/nm-named-manager.c - - Write more than just the first nameserver to /etc/resolv.conf - - Write out valid /etc/resolv.conf on exit - -2005-10-21 Christopher Aillon - - * gnome/applet/applet-dbus-vpn.c: - Get rid of spurious newlines in debug console output - -2005-10-21 Christopher Aillon - - * src/backends/NetworkManagerGentoo.c: - Fix path to killall. Patch from Dave Shanker - -2005-10-20 Robert Love - - * src/NetworkManagerDevice.c: Use fabs() and DBL_EPSILON to avoid a - direct comparison of floating point values, which is never correct. - Also some misc. cleanup. - -2005-10-19 Robert Love - - * vpn-daemons/vpnc/nm-vpnc.desktop.in: add fields - -2005-10-19 Robert Love - - * gnome/vpn-properties/nm-vpn-properties.c: Correctly set the - sensitivity of the buttons. Specificaly, do the right thing if - there are no entries. - -2005-10-19 Christopher Aillon - - * configure.in: Update check for adequate wireless-tools - with an AC_TRY_COMPILE for the new symbols we use. - -2005-10-19 Dan Williams - - * src/NetworkManagerDevice.c - - (process_scan_results): don't drop the last (or only) - access point we see - -2005-10-19 Christopher Aillon - - * src/backends/NetworkManagerSlackware.c: - Patch from Nico - - Update the Slackware backend. - -2005-10-18 Christopher Aillon - - * gnome/applet/other-network-dialog.c: Use g_get_host_name () - if we've got GLib 2.8.0 - -2005-10-18 Robert Love - - * src/NetworkManagerDevice.c: invoke the long-in-the-tooth named - function nm_schedule_state_change_signal_broadcast() when we - deactivate a device, too. - -2005-10-18 Robert Love - - * gnome/applet/applet.c: nmwa_context_menu_update(): 'iface' could - be used uninitialized. - -2005-10-18 Christopher Aillon - - * test/libnm_glib_test.c: Test unregistering, too. - -2005-10-17 Christopher Aillon - - * configure.in: Bump to 0.5.0 - -2005-10-17 Dan Williams - - * NetworkManager.h - - Remove WPA-related constants so they aren't part of the - upcoming release. - -2005-10-17 Christopher Aillon - - * gnome/applet/applet.c: - * gnome/applet/applet.h: - Desensitize the 'Connection Information' menu item when there is - no active connection. - -2005-10-17 Christopher Aillon - - * gnome/libnm_glib/libnm_glib.c: - Make libnm_glib_unregister_callback () actually unregister the callback - -2005-10-17 Robert Love - - * src/NetworkManagerDevice.c: Actually wait 20s, as we intend, not - two seconds -- tries is updated every 1/10 of a second, not every - second.. - -2005-10-17 Christopher Aillon - - * gnome/applet/applet-dbus-info.c: - Let D-BUS know that we haven't handled a message when we haven't. - -2005-10-17 Robert Love - - * src/nm-ip4-config.c: use GPOINTER_TO_UINT and not a straight cast - in order to remain 64-bit clean. - -2005-10-17 Christopher Aillon - - * gnome/applet/applet-dbus-info.c: - Find network encryption keys asynchronously - -2005-10-17 Robert Love - - * src/backends/NetworkManagerDebian.c, - src/backends/NetworkManagerRedHat, - src/backends/NetworkManagerSuSE.c: allow '#' as a valid resolv.conf - comment delimiter. - -2005-10-17 Robert Love - - * src/backends/NetworkManagerSuSE.c: use SYSCONFDIR not open-coded - "/etc" - -2005-10-17 Christopher Aillon - - * src/NetworkManagerDevice.c: (process_scan_results) - Fix logic that checks to see whether we have an ESSID. - -2005-10-15 Dan Williams - - Move scanning code into NetworkManager rather than use iwlib's - iw_scan() function, so that we can figure out AP capabilities. - - * NetworkManager.h - - Add AP capability bits - - * src/NetworkManagerAP.[ch] - - Add capability field to NMAccessPoint structure - - Add WPA & RSN Information Element fields and accessor - functions to NMAccessPoint - - * src/NetworkManagerDevice.c - - Remove usage of iw_scan - - Add scanning code to NetworkManager rather than use - iw_scan() from iwlib - - * src/NetworkManagerUtils.[ch] - - (nm_dispose_scan_results): remove, unused - -2005-10-14 Christopher Aillon - - * gnome/libnm_glib/libnm_glib.c: - * gnome/libnm_glib/libnm_glib.h: - Use guint instead of gint for callback IDs. - -2005-10-12 Christopher Aillon - - * gnome/applet/applet.c: - Fix icon animation smoothness issues. nmwa_redraw_timeout gets called - every 1000ms. It will unconditionally call nmwa_update_state which - kills the existing animation timeout and registers a new one with a - callback to draw a new frame every 100ms. There are 11 connecting - icon frames, so the last 2 frames kept getting dropped. Only reset - the animation timeout if we aren't animating. - -2005-10-11 Dan Williams - - * gnome/applet/applet-dbus-devices.c - - (nmwa_dbus_update_device_info_from_hal), (hal_net_physdev_cb): - We want to grab the product & vendor from net.physical_dev - rather than info.parent. - -2005-10-11 Dan Williams - - * src/NetworkManagerDevice.c - - Use the driver's WE version for scanning rather than - the WE version NM was compiled with. Fixes random - crashes in iw_scan () in iwlib. - -2005-10-10 Dan Williams - - * Remove nm_system_load_device_modules() from backend files - and from NetworkManager.c - -2005-10-10 Dan Williams - - * src/NetworkManagerPolicy.c - - Fix some bugs introduced by the capabilities patch - -2005-10-10 Dan Williams - - * gnome/applet/applet-dbus-info.c - - (nmi_dbus_get_network_key): hide the menu when putting up - the keyring dialog. (not sure if the code is right...) - -2005-10-09 Dan Williams - - Patch from Bill Moss - * src/NetworkManagerDevice.c - - (nm_device_set_user_key_for_network): don't try to set auth - mode on the AP from the allowed list if it's NULL - -2005-10-09 Dan Williams - - * Replace the "driver support level" stuff with capabilities. The - capability field is a bitfield that is more flexible than the - old driver support level thing. It's mostly so we can easily - figure out what supports WPA and what doesn't, but should be - quite useful later. - -2005-10-09 Dan Williams - - * test/nmtest.c - - Removed - - * test/nm-tool.c - test/Makefile.am - - Added new "nm-tool" tool that gives quite a bit more - information - -2005-10-07 Robert Love - - * gnome/applet/applet-dbus-info.c, gnome/applet/applet.c, - gnome/applet/applet.h, gnome/vpn-properties/nm-vpn-properties.c, - src/dhcp-manager/nm-dhcp-manager.c, test/libnm_glib_test.c, - test/nmtest.c test/nmtestdevices.c: mark functions 'static' as - appropriate - -2005-10-07 Robert Love - - * configure.in: Change our compile flags for the betterment of mankind. - Add "-Wstrict-prototypes" because we comply anyhow and missing a - prototype is very bad on 64-bit platforms as types default to int but - sizeof(int) != sizeof(long) and add "-Wmissing-prototypes" & - "-Wmissing-declarations" to warn if we define an exported function - but fail to put it in a header. - -2005-10-07 Robert Love - - * src/NetworkManagerWireless.c: remove stale, unused function, who goes - by the name nm_update_device_wireless_timeouts() and once tried, - without success, to steal my pet turtle. - -2005-10-07 Robert Love - - * Cleanup prototypes: put some functions in header files and mark - others as 'static' -- feel free to invert - * src/vpn-manager/nm-dbus-vpn.c: remove prototype of - nm_vpn_manager_vpn_connection_list_copy() - * src/vpn-manager/nm-vpn-act-request.c: remove prototype of - nm_vpn_service_get_dbus_connection() - * src/vpn-manager/nm-vpn-manager.h: add prototypes for - nm_vpn_manager_vpn_connection_list_copy() - * src/vpn-manager/nm-vpn-service.c: make - nm_vpn_service_act_request_failed() and - nm_vpn_service_stage2_daemon_wait() static - * src/vpn-manager/nm-vpn-service.h: add prototype for - nm_vpn_service_get_dbus_connection() - -2005-10-06 Christopher Aillon - - * gnome/applet/applet.c: - * gnome/applet/applet.h: - * gnome/applet/icons/Makefile.am: - Convey information about the current connection stage in the - icons themselves instead of creating a separate progress bar. - -2005-10-04 Robert Love - - * src/nm-dbus-device.c: Use iw_ether_ntop(), not ether_ntoa_r(), to - convert an ether_addr structure's MAC into a string, because the - latter will drop leading zero's and uses lower-case, e.g. 7:3b:4 - versus 07:3B:04, while the former will not. - -2005-10-04 Robert Love - - * gnome/applet/applet-dbus-devices.c, gnome/applet/applet.c, - gnome/applet/nm-device.c, gnome/applet/nm-device.h, - gnome/applet/wireless-applet.glade, src/nm-dbus-device.c: Display - default route in the 'Connection Information' dialog, send primary - and secondary name servers in in "getProperties" DBUS method, add - network_device_{get,set}_{primary,secondary}_dns(), The primary and - secondary domain name servers are crucial pieces of information - that a user might need in debugging a network problem. - -2005-10-04 Robert Love - - * gnome/applet/applet-dbus-devices.c, gnome/applet/applet.c, - gnome/applet/nm-device.c, gnome/applet/nm-device.h, - gnome/applet/wireless-applet.glade, src/nm-dbus-device.c: Display - default route in the 'Connection Information' dialog, send default - route in "getProperties" DBUS method, add network_device_set_route(), - and network_device_get_route(). The Gateway is a crucial piece of - connection-related information that a user might need in debugging a - network problem. - -2005-10-03 Robert Love - - * src/backends/NetworkManagerSuSE.c: Fix Glib error, GError must be - NULL. - -2005-10-02 Dan Williams - - * Shorten time taken to sleep by fastpathing bits of device deactivation - necessary for sleep. - - * Fix issue where deactivating a device might deactivate the active - VPN connection, even if the VPN was not using the device. - -2005-10-02 Dan Williams - - * gnome/applet/applet.c - - Adjust signal strength -> icon mapping values slightly - (so that 51% signal doesn't show a 75% icon) by adding - 5% to the values. ex: > 5% now shows 25% icon, > 30% - shows 50% icon, etc. - -2005-09-29 Robert Love - - * src/NetworkManager.c: removed unused variable. - -2005-09-28 Dan Williams - - Support for named + DBus, using Red Hat DBus patches for named. You - can find those patches here, with "dbus" in the patch's filename: - - http://cvs.fedora.redhat.com/viewcvs/devel/bind/ - - Don't forget the named dbus service file either. - - Instead of writing a config file and spawing a named process, NM will - use an already-running dbus-enabled named if it finds one. NM will - update named's forwarder configuration on the fly using dbus. - - If there is no dbus-enabled named running, NM will automatically fall - back to writing the most-recent DNS server information to /etc/resolv.conf - and calling nm_system_update_dns() to kick the system's resolver. - - Accordingly, all named-related configure-time options have been removed. - -2005-09-26 Robert Love - - * src/backends/NetworkManagerSuSE.c, (nm_system_get_dialup_config): Add - ISDN support! - * src/backends/NetworkManagerSuSE.c, (verify_and_return_provider): Fix - bug in error path if "ASKPASSWORD" is "no". - -2005-09-26 Robert Love - - * src/named-manager/nm-named-manager.c: only '#' is officially a valid - comment in /etc/resolv.conf -- ';' is not. - -2005-09-19 Dan Williams - - * src/backends/NetworkManagerRedHat.c: - * src/backends/NetworkManagerDebian.c: - * src/backends/NetworkManagerSlackware.c: - * src/backends/NetworkManagerGentoo.c: - * src/backends/NetworkManagerSUSE.c: - Fix invocations of "/sbin/ip address" to use short form instead - -2005-09-19 Christopher Aillon - - * src/nm-dbus-device.c: Don't assert when getting - addresses of a not yet connected interface. - - * gnome/applet/applet.c: Free icons if loading fails. - Use translator-credits so translators can make themselves known. - -2005-09-15 Christopher Aillon - - * src/NetworkManagerAP.c: - * src/NetworkManagerAP.h: - * src/NetworkManagerDevice.c: - Set a blacklist for certain common manufacturer default ESSIDs: - APs with these ESSIDs are extremely likely to be completely - different networks: connecting to one should not make NM - auto-connect to every other AP with the same default ESSID. - -2005-09-12 Christopher Aillon - - * gnome/applet/wireless-applet.glade: - The passphrase entry should also activate the default - - * src/gnome-keyring-md5.c: Updated code from gnome-keyring - - * gnome/applet/applet-dbus-devices.c: - * gnome/applet/applet.c: - * gnome/applet/nm-device.c: - * gnome/applet/nm-device.h: - * src/NetworkManagerUtils.c: - * src/NetworkManagerUtils.h: - * src/nm-dbus-device.c: - I've got a fever, and the only cure for it is less ioctl. - Make NM push IP data rather than make the applet open a socket - to the device. - -2005-09-10 Christopher Aillon - - * gnome/applet/applet.c: - * gnome/applet/applet-dbus-devices.c: - * gnome/applet/applet-dbus-info.c: - * gnome/applet/passphrase-dialog.c: - * gnome/libnm_glib/libnm_glib.c: - * gnome/vpn-properties/nm-vpn-properties.c: - * src/autoip.c: - * src/backends/NetworkManagerRedHat.c: - * src/named-manager/nm-named-manager.c: - * src/NetworkManagerAPList.c: - * src/NetworkManager.c: - * src/NetworkManagerDbus.c: - * src/NetworkManagerDevice.c: - * src/NetworkManagerPolicy.c: - * src/NetworkManagerSystem.c: - * src/nm-dbus-device.c: - * src/nm-dbus-nm.c: - * src/vpn-manager/nm-vpn-manager.c: - * src/vpn-manager/nm-vpn-service.c: - * test/libnm_glib_test.c: - * test/nminfotest.c: - * test/nmtestdevices.c: - Fix a bunch of 'unused variable' compiler warnings - - * NetworkManager.h: - * gnome/applet/applet-dbus-info.c: - * gnome/applet/applet-dbus-info.h: - * gnome/applet/applet.c: - * gnome/applet/applet.h: - * src/NetworkManager.c: - * src/NetworkManagerDbus.c: - * src/NetworkManagerDbus.h: - * src/NetworkManagerDevice.c: - * src/NetworkManagerDevice.h: - * src/NetworkManagerMain.h: - * src/NetworkManagerWireless.c: - * src/NetworkManagerWireless.h: - * src/nm-dbus-nm.c: - Make NetworkManager be smart about how frequently to scan - based on its current state. Remove the UI for choosing when - to scan. Scanning still may disabled completely by the user - via the "Wireless Enabled" menu item. - -2005-09-09 Christopher Aillon - - * gnome/applet/applet.c: - Also overlay the vpn connecting icons onto the wired icon, - when appropriate. - - * gnome/vpn-properties/nm-vpn-properties.glade: - Clean up a few strings to use better grammar and proper casing. - -2005-09-08 Christopher Aillon - - * gnome/applet/vpn-connection.c: - * gnome/applet/vpn-connection.h: - Add nmwa_vpn_connection_is_activating () - - * gnome/applet/applet.c: - * gnome/applet/applet.h: - * gnome/applet/icons/nm-vpn-connecting*.png: - Add new VPN connecting icons from Diana Fong , letting - the user know something's happening between clicking the VPN item and it - actually being connected. - -2005-09-07 Christopher Aillon - - * gnome/applet/applet-dbus-info.c: need to free attributes in the - failure case as well. - -2005-09-07 Rodrigo Moya - - * gnome/panel/eggtrayicon.[ch]: - * examples/python/systray/eggtrayicon.[ch]: updated code from libegg. - -2005-09-07 Dan Williams - - Patch from Bill Moss - * src/applet-dbus.c - - (nmwa_dbus_filter): strip whitespace from beginning - and end of VPN login banner - -2005-09-07 Dan Williams - - * The great VPN Manager rewrite of 2005 - -2005-09-07 Christopher Aillon - - * gnome/applet/menu-items.c: - * gnome/applet/nm-device.c: - * gnome/applet/wireless-network.c: - * gnome/libnm_glib/libnm_glib.c: - * src/NetworkManagerDbusUtils.c: - * vpn-daemons/vpnc/src/nm-vpnc-service.c: - g_malloc0 doesn't return NULL - -2005-09-06 Dan Williams - - Patch from Tomislav Vujec - * src/NetworkManagerDevice.c - - (nm_get_device_by_udi): don't return a device when we - actually didn't find what we were looking for - -2005-09-06 Christopher Aillon - - * gnome/applet/applet-dbus-devices.c: - * gnome/applet/applet-dbus-devices.h: - * gnome/applet/applet-dbus.c: - * src/NetworkManagerDbus.c: - * src/NetworkManagerDbus.h: - * src/NetworkManagerDevice.c: - * src/nm-dbus-device.c: - Make NM push updates about active device strength when it changes, - rather than having the applet poll every 2s. - -2005-09-05 Christopher Aillon - - * gnome/applet/applet-dbus-devices.c: Remove duplicate call to - network_device_set_strength - -2005-09-04 Dan Williams - - Patch from Bill Nottingham - * src/NetworkManagerDevice.c - - (nm_device_activation_cancel): reset the quit_activation flag - -2005-09-04 Dan Williams - - * src/nm-activation-request.c - - (nm_act_request_unref): actually free the structure, - which we didn't seem to be doing before - -2005-09-04 Dan Williams - - Patch from John Palmieri - * gnome/applet/applet-dbus-devices.c - - Fix up unreffing of DBusMessage objects - -2005-09-04 Dan Williams - - Patch from John Palmieri - * gnome/applet/nm-device.c - - (nm_device_unref): clear network_device's memory _before_ freeing it - -2005-09-02 Christopher Aillon - - * gnome/applet/applet.c: Use a check menu item for Wireless Enabled - -2005-09-02 Bill Nottingham - - * src/backends/NetworkManagerRedHat.c: use nm_warning, not nm_error - -2005-09-01 Dan Williams - - * src/NetworkManager.c - - (nm_remove_device_from_list): rename to nm_remove_device - - (nm_hal_device_removed): call nm_remove_device() - - * src/NetworkManagerDevice.c - - Change the NMWirelessScanCB member 'reschedule' which - wasn't used to 'force' to indicate that we need to - force a scan when adding a device - - * src/nm-dbus-nm.c - - (nm_dbus_nm_sleep): Deactivate all devices and remove them - from the device list - - (nm_dbus_nm_wake): Re-add all devices to the device list - -2005-09-01 Robert Love - - * gnome/applet/applet.c: nmwa_update_info: iface is used uninitialized - and the check "!iface" in the error case is probably never true. - -2005-09-01 Dan Williams - - Patch from Bill Nottingham - * src/backends/NetworkManagerRedHat.c - - Add initial dialup support to Red Hat/Fedora backend - -2005-09-01 Dan Williams - - * gnome/applet/applet-dbus-devices.c - - Sort both wireless networks and devices again, which got - broken when removing threading - -2005-09-01 Christopher Aillon - - * gnome/applet/applet.c: - Only show the "Stop/Start All Wireless Devices" menuitem - if we actually have wireless devices. - - * gnome/applet/applet-dbus-info.c: - * gnome/applet/applet.c: - * gnome/applet/other-network-dialog.c: - * gnome/applet/vpn-password-dialog.c: - Drop the gtk_dialog_run () calls in favor of connecting to - "response" signals, needed now that the applet is not threaded. - -2005-08-31 Dan Williams - - Patch from Bill Moss - * src/NetworkManagerDevice.c - - (nm_device_wireless_scan): fix scan timeout values - -2005-08-30 Dan Williams - - * gnome/applet/wireless-applet.glade - - HIG-ify the Other Wireless Networks dialog a bit more - - Fix some potential segfaults in the info dialog - -2005-08-30 Dan Williams - - * gnome/applet/applet-dbus-devices.c - - Remove nmwa_dbus_get_hal_device_string_property(); unused - -2005-08-30 Dan Williams - - * gnome/applet/applet-dbus.[ch] - - Remove all the nmwa_dbus_call_method_xxxx functions since - they weren't being used anyway - -2005-08-30 Bastien Nocera - - * test/nmtestdevices.c: (print_usage), (main): - Check the number of arguments, and fix a typo - -2005-08-29 Dan Williams - - Patch from Dumitru Ciobarcianu - * gnome/applet/applet.c - - Define GTK_STOCK_INFO for GTK 2.6 and lower - -2005-08-29 Dan Williams - - * gnome/applet/* - - Don't use threads any more. Anything that blocks - (like gtk_dialog_run()) will have to get fixed up which - should happen quickly. We really only had threads to make - the animation smooth, and when everything got converted over - to DBus Pending Calls, the need for threads kind of went away - -2005-08-29 Christopher Aillon - - * gnome/applet/applet.c: Draw VPN connections as radio items - since we don't yet support multiple VPNs. - * gnome/applet/other-network-dialog.c: Use stock icon for Connect - * gnome/vpn-properties/nm-vpn-properties.c: Use stock icon for Delete - -2005-08-29 Dan Williams - - Patch from j@bootlab.org - - Make --without-named work - - Make --with-dhcdbd work correctly - -2005-08-27 Josep Puigdemont i Casamajó - - * configure.in: Added "ca" to ALL_LINGUAS. - -2005-08-26 Christopher Aillon - - * Fix up VPN state handling between the applet and NetworkManager, - so that the applet doesn't show a VPN as connected when one - really is not - - The applet no longer has a pointer to the active VPN's - name, but tracks each VPNs state individually - - NM no longer has a "getActiveVPNConnection" method - - NM no longer broadcasts the "VPNConnectionChange" signal - - NM now broadcasts a "VPNConnectionStateChange" signal - whenever the state of a VPN changes - -2005-08-26 Dan Williams - - * gnome/applet/applet-dbus-devices.c - gnome/applet/applet-dbus-vpn.c - - Remove calls to dbus_pending_call_ref() because we already - "own" the pending call - - Remove calls to dbus_pending_call_get_completed() because - when we are in the callback, the pending call is completed - by definition - -2005-08-22 Dan Williams - - Patch by Bill Moss - * src/dhcp-manager/nm-dhcp-manager.c - - (nm_dhcp_manager_cancel_transaction): Give dhcdbd/dhclient - some time to send out a RELEASE if they like - -2005-08-22 Dan Williams - - Noticed by Bill Moss - * src/NetworkManagerDbus.c - - (nm_dbus_get_user_key_for_network_cb): deactivate the device - instead of just cancelling its activation - - * src/NetworkManagerDevice.c - - (nm_device_deactivate): some small cleanups - - (nm_device_set_user_key_for_network): deactivate the device - instead of just cancelling its activation - -2005-08-22 Dan Williams - - Noticed by Bill Moss - * src/NetworkManagerDevice.c - - (nm_device_wireless_scan): fix scan timeout, we were - waiting way too long for scans to complete - -2005-08-22 Dan Williams - - Patch from j@bootlab.org: - * src/backends/NetworkManagerDebian.c - - Make the Debian backend work for static IP again - -2005-08-20 Christopher Aillon - - * gnome/applet/other-network-dialog.c: - The "Create New Network" and "Connect to Other Network" - dialogs share alot of code, but shouldn't share a window - title. Give them different ones. - - * gnome/applet/wireless-applet.glade: - * vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c: - Some more minor UI tweaks. - -2005-08-19 Christopher Aillon - - * gnome/applet/other-network-dialog.c: - * gnome/applet/wireless-applet.glade: - Also need mnemonic widgets, and underline enabled. - -2005-08-19 Dan Williams - - * vpn-daemons/vpnc/nm-vpnc-service.c - - (vpnc_watch_cb): remove no-longer-relevant comment - - (write_config_option): new function, helper to write - config options to vpnc's stdin - - (nm_vpnc_config_write): use the new helper, make the - code shorter - -2005-08-19 Christopher Aillon - - * gnome/applet/passphrase-dialog.c: - * gnome/applet/wireless-applet.glade: - Make the passphrase dialog response based, and treat - responses other than OK (such as Esc, [X]) as a cancel. - -2005-08-18 Christopher Aillon - - * initscript/Gentoo/NetworkManager: - * initscript/RedHat/NetworkManager: - * initscript/RedHat/NetworkManagerDispatcher: - * initscript/SUSE/networkmanager: - CVS remove these in place of .in replacements - - * configure.in: - * initscript/Gentoo/NetworkManager.in: - * initscript/RedHat/NetworkManager.in: - * initscript/RedHat/NetworkManagerDispatcher.in: - * initscript/SUSE/networkmanager.in: - These scripts now are generated so they work still when - NM is built using a bindir other than /usr/bin - -2005-08-18 Dan Williams - - * gnome/applet/main.c - - Revert previous change for --no-session since - --sm-disable does the same thing - -2005-08-18 Dan Williams - - * gnome/applet/applet-dbus-info.c - - (nmi_dbus_create_error_message): new function - - (nmi_dbus_get_key_for_network): correctly use dbus error creation - functions. Also don't check for both device _and_ network before - asking for a user's key, because we may not have gotten all our - networks back from NM quite yet (due to the dbus pending calls - coming in later). Fixes a hang in NM/nm-applet. - - * src/NetworkManagerDbus.c - - (nm_dbus_get_user_key_for_network_cb): handle error conditions in a - slightly more sane manner, even though we are still broken for - certain other error conditions. - - (nm_dbus_get_user_key_for_network): need to pass the network's essid - to the info-daemon too - - * src/NetworkManagerDevice.c - - Fix some debug messages to be info messages instead - -2005-08-18 Dan Williams - - * gnome/applet/main.c - - Add new "--no-session" parameter that disables applet - session management, ie for testing - -2005-08-18 Christopher Aillon - - * gnome/applet/other-network-dialog.c: - * gnome/applet/wireless-applet.glade: More mnemonics - -2005-08-17 Robert Love - - * initscript/SUSE/networkmanager: update - -2005-08-17 Dan Williams - - * Tag NM_0_4_1_RELEASE - -2005-08-17 Christopher Aillon - - * gnome/applet/applet.c: More translatable string cleanup - - -2005-08-17 Dan Williams - - * gnome/applet/applet-dbus-info.c - - (nmi_dbus_get_key_for_network): Grab new "new_key" parameter - from the dbus message, which tells us to unconditionally - ask the user for a new key. Otherwise, we pull the key from - the keyring and return it. If we fail to get the key from the - keyring, we ask the user for a new key. - - (nmi_dbus_get_network_key): new function to grab the key for - an essid from the keyring. - - (nmi_dbus_get_network_properties): don't access the keyring here. - Also, don't return any key in the dbus message. - - * src/NetworkManagerDbus.[ch] - - (nm_dbus_get_user_key_for_network): Add "new_key" parameter to - indicate that we unconditionally want a new key. This function - is now also used to get keys from the info-daemon which are - pre-stored, not just for asking the user for a new key. The - "new_key" parameter indicates whether or not we wish to ask the - user for a new key. - - (nm_dbus_get_network_data_cb): we no longer get a key from the - info-daemon in the return message, so use NULL instead. The - key will be filled in at connect time by calling - nm_dbus_get_user_key_for_network() - - * src/NetworkManagerDevice.c - - (nm_device_wireless_configure): update for "new_key" param to - nm_dbus_get_user_key_for_network(). We initially set new_key - to FALSE to see if we have a stored key in the info-daemon, but - if the connection is unsuccessful at this stage we request a - new one - -2005-08-17 Dan Williams - - * gnome/applet/icons/nm-no-connection.png - gnome/applet/icons/nm-device-wired.png - - Use Diana's new RJ45 connector icons - -2005-08-17 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_device_change_check): clarify switching rules if - both new and old devices are valid; mainly, don't switch - away from user-requested wireless connection back to a wired - one - -2005-08-17 Dan Williams - - * gnome/applet/Makefile.am - - Relocate the applet to /usr/bin since it is no longer - executed by anything, but directly by the user - -2005-08-17 Dan Williams - - Patch from Bill Moss - - * gnome/applet/applet-dbus-info.[ch] - - (nmi_save_network_info): save timestamp for network if it - was a change requested by the user - - (nmi_dbus_update_network_info): get user_requested from dbus - message and pass to nmi_save_network_info() - - * gnome/applet/applet.c - - (nmwa_update_network_timestamp): remove - - (nmwa_menu_item_activate): don't set timestamp on networks - here, only after a successful connect in nmi_save_network_info() - - * src/NetworkManagerDbus.[ch] - - (nm_dbus_update_network_info): pass user_requested into the - dbus message - - * src/NetworkManagerPolicy.c - - (nm_policy_activation_finish): pass user_requested to - nm_dbus_update_network_info() - -2005-08-16 Robert Love - - * gnome/applet/applet.c: Better "Dial Up" menu item. - -2005-08-16 Robert Love - - * gnome/applet/applet.c: use GTK_STOCK_INFO not PROPERTIES for the - "Connection Information" menu item. - -2005-08-16 Dan Williams - - Patch from j@bootlab.org - * vpn-daemons/vpnc/Makefile.am: Fix for autoreconf - - * configure.in: allow specifying the path to dhcdbd - -2005-08-16 Robert Love - - Patch from j@bootlab.org - * src/backends/NetworkManagerDebian.c, src/backends/interface_parser.c, - src/backends/interface_parser.h: Debian dialup support. - -2005-08-16 Christopher Aillon - - * vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade: - * gnome/applet/applet.c: Add some mnemonics for VPNC - - * vpn-daemons/.cvsignore: fix this up a little bit - -2005-08-16 Robert Love - - * src/backends/NetworkManagerSuSE.c: improve the SUSE-backend dial up - support. - -2005-08-16 Christopher Aillon - - * gnome/applet/applet.c: Split markup out of translatable strings - and clean up logic a little bit. (fixes #309012) - -2005-08-15 Christopher Aillon - - * gnome/vpn-properties/nm-vpn-properties.c: - * gnome/vpn-properties/nm-vpn-ui-interface.h: - * vpn-daemons/vpnc/properties/nm-vpnc.c: - Makeshift fix to remove newlines from translatable strings. - Note that we now return an allocated string, so callers of - get_confirmation_details () must now call g_free () on the - result. (fixes #309033). - -2005-08-12 Robert Love - - * gnome/applet/applet-dbus.c: remove newlines from translatable - strings--not needed here anyway. (fix b.g.o #309011) - * src/nm-netlink.monitor.c: don't translate "%s" (fix b.g.o #172391) - -2005-08-11 Robert Love - - * gnome/applet/applet.c: mark string as translatable. - -2005-08-11 Robert Love - - * initscript/SUSE/networkmanager: update. - -2005-08-11 Dan Williams - - * src/nm-dhcp-manager.c - - (nm_dhcp_manager_get_ip4_config): if for some reason we don't get - an gateway returned from DHCP, try to use the address of the DHCP - server as the gateway instead. Found by Ralf Ertzinger. - -2005-08-10 Robert Love - - * gnome/applet/applet.c: Make applet->dbus_thread joinable so we can - wait for it on exit; call exit() in nmwa_destroy() to jump ship. - -2005-08-10 Dan Williams - - Patch from Bill Moss - * Consolidate writes of access point information updates to the info daemon - so that we only do it when the connection to the access point was - successful. Also consolidates updates to GConf in the Gnome applet. - - * src/nm-netlink-monitor.c - - Silence compile warning when calling g_object_new() - -2005-08-08 Dan Williams - - Patch from Steev : - * src/backends/NetworkManagerGentoo.c - - Stub new dialup backend functions - -2005-08-08 Dan Williams - - Patch from Colin Slater: - * src/backends/NetworkManagerGentoo.c - - (nm_system_update_dns): Fix exit status check for restarting - nscd - -2005-08-05 Robert Love - - * NetworkManager.h, - gnome/applet/applet-dbus-devices.c, - gnome/applet/applet-dbus-devices.h, - gnome/applet/applet-dbus.c, - gnome/applet/applet.c, - gnome/applet/applet.h, - src/NetworkManager.c, - src/NetworkManagerMain.h, - src/NetworkManagerSystem.h, - src/backends/NetworkManagerRedHat.c, - src/backends/NetworkManagerSuSE.c, - src/nm-dbus-nm.c: basic dialup support using distro infrastructure - -2005-08-05 Robert Love - - * gnome/applet/other-network-dialog.c: default the adhoc network to the - machine's hostname to make adhoc creation idiot-proof. - -2005-08-04 Robert Love - - * gnome/applet/other-network-dialog.c: fix leak. "label" needs to be - freed. - -2005-08-04 Dan Williams - - * gnome/applet/applet-dbus-info.c - gnome/applet/applet-dbus-info.h - - (nmi_dbus_update_network_auth_method->nmi_save_network_info): generalize - to store key, key type, and auth method rather than just auth method - - (nmi_dbus_update_network_info): new function - - (nmi_dbus_info_message_handler): updateNetworkAuthMethod -> updateNetworkInfo - - * gnome/applet/passphrase-dialog.c - - (nmi_passphrase_dialog_ok_clicked): call nmi_save_network_info() instead - of saving the info ourselves - - * gnome/libnm_glib/libnm_glib.c - - Remove the stupid version check for dbus - - * src/NetworkManagerAP.c - src/NetworkManagerAP.h - - (nm_ap_get_enc_key_source): return 'const char *' rather than 'char *' - - * src/NetworkManagerDbus.c - src/NetworkManagerDbus.h - - (nm_dbus_update_network_auth_method -> nm_dbus_update_network_info): Update - more than just the auth method - - * src/NetworkManagerDevice.c - - Update network info at the appropriate times - -2005-07-29 Ray Strode - - * src/NetworkManager.c (nm_info_handler): don't use input as format - string (Spotted by Ian Jackson). - -2005-07-27 Dan Williams - - * src/nm-dbus-nm.c - src/nm-dbus-net.c - - Random cleanups of spacing - - * gnome/applet/applet.h - gnome/applet/other-network-dialog.c - gnome/applet/passphrase-dialog.c - - Conslidate usage of NMWAEncryptionKeyTypes enum - - Patch from Bill Moss: - - Make Other Wireless Networks work again with encryption keys - -2005-07-26 Dan Williams - - Patch from Steev : - * src/backends/NetworkManagerGentoo.c - src/backends/Makefile.am - - Fix up Gentoo backend - -2005-07-26 Robert Love - - * src/backends/NetworkManagerSuSE.c: misc. cleanup - -2005-07-25 Robert Love - - * gnome/applet/applet.c: make the "Wired" menu item a radio button, - in the same group as the wireless networks, since they are all - mutually exclusive. - -2005-07-24 Ray Strode - - * src/nm-netlink-monitor.c (nm_netlink_monitor_new): - remove unneeded NULL arg from g_object_new(). Any - warnings caused by not having the extra NULL are just a - result of a bug in glib 2.7.0 - 2.7.2. - -2005-07-22 Robert Love - - * gnome/libnm_glib/libnm_glib.c: support D-BUS version 0.35, too - -2005-07-22 Robert Love - - * src/nm-netlink-monitor.c: g_object_new() needs at least three - parameters (gcc 4.0.2 warning fix). - -2005-07-18 Robert Love - - Suggested by Aaron Bockover (abockover@novell.com) - * gnome/applet/other-network-dialog.c: ASCII is an acronym, thus - s/Ascii/ASCII - * gnome/applet/passphrase-dialog.c: ditto - * gnome/applet/wireless-applet.glade: ditto - -2005-07-13 Dan Williams - - Patch from Ray Strode - * vpn-daemons/vpnc/nm-vpnc-service.c - - Don't let vpnc daemonize, fixes some races with PID file reading - -2005-07-13 Dan Williams - - Patch from Ray Strode - * Random cleanups for strict CFLAGS - -2005-07-07 Dan Williams - - Patch from Derek Atkins - * src/nm-dbus-net.c: - - (nm_dbus_get_ap_from_object_path): differentiate similar ESSIDs - -2005-07-07 Dan Williams - - Patch from Jos Dehaes - * src/backends/NetworkManagerGentoo.c - - Gentoo backend Static IP nameserver fixes - - General Gentoo backend goodness - -2005-07-07 Dan Williams - - Patch from Bastien Nocera: - * gnome/applet/applet.c - - Fix up error reporting when icons or glade files are missing - -2005-07-07 Robert Love - - * gnome/applet/applet.c: do not draw the VPN menu's seperator if there - are not any VPN connections above it. - -2005-07-07 Robert Love - - * gnome/applet/applet.c: whoops, left some "dog" debugging code in. - -2005-07-05 Robert Love - - * src/NetworkManagerSystem.c: bail out if asked to set a gateway of - zero. - -2005-07-05 Robert Love - - * src/NetworkManagerDevice.c: use link-local (autoip) on DHCP failure - on wired or unencrypted wireless. - -2005-07-01 Robert Love - - * src/NetworkManagerSystem.c: Print the error via strerror(). - -2005-06-30 Robert Love - - * gnome/vpn-properties/nm-vpn-properties.c: display an error dialog and - then exit if the glade file is not found. currently the application - just hangs. - -2005-06-30 Robert Love - - * src/nm-dbus-nm.c: Patch by Bill Moss to - explicitly up all interfaces on wake from sleep. - -2005-06-30 Robert Love - - * gnome/applet/applet.c: Add right-click menu item "Connection Info" - with information about the currently active connection. - * gnome/applet/applet.h: (ditto) - * gnome/applet/wireless-applet.glade: (ditto), new file - -2005-06-30 Robert Love - - * src/NetworkManagerDevice.c: g_malloc0 cannot fail. - * src/nm-dbus-nm.c: print when we sleep and wake up. - * gnome/applet/menu-items.c: whitespace, misc. cleanup. - * configure.in: look in "/usr/sbin" for dhcdbd, too. (it shouldn't be - in /sbin unless D-BUS is, folks). - * README: update to reflect nm-applet replacing NetworkManagerInfo. - -2005-06-27 Robert Love - - * src/nm-dbus-nm.c: fix "setWirelessEnabled" call for the enabling - case. - -2005-06-27 Robert Love - - * gnome/applet/applet.c: make the 'Wireless Network Discovery' menu - items radios. - -2005-06-26 Robert Love - - * src/NetworkManagerDevice.c: be specific about which device in - nm_info() message. - -2005-06-23 Adam Weinberger - - * src/nm-netlink-monitor.c: correct spelling error. - -2005-06-23 Robert Love - - * gnome/applet/applet-dbus-info.c: gnome keyring support! - * gnome/applet/passphrase-dialog.c: more of that keyring! - -2005-06-23 Robert Love - - * configure.in: remove extraneous GNOMEKEYRING directives. - * gnome/applet/Makefile.am: s/GNOMEKEYRING/GNOME_KEYRING/. - * gnome/applet/applet.c: nmwa_icons_init: make style local. - * gnome/applet/passphrase-dialog.c: whitespace. - -2005-06-23 Robert Love - - * src/NetworkManagerDevice.c: division in assignment was flipped. - -2005-06-23 David Zeuthen - - * gnome/applet/vpn-password-dialog.c (child_stdout_data_cb): Send a - signal to the child to indicate that we got what we wanted when we - see two new-lines right after each other. - (nmwa_vpn_request_password): Pass a structure with several members - instead of just the passwords - -2005-06-23 Dan Williams - - * src/NetworkManager.c - src/NetworkManagerMain.h - - (nm_get_hal_ctx): new function, move Hal initialization code here - - (nm_hal_init): new function, init libhal context then add devices - - (nm_hal_deinit): new function, clean up libhal context - - (nm_data_free): Move Hal cleanup here - - (main): check whether Hal is running, and if so, get a list of - network devices from it - - * src/NetworkManagerDbus.c - - (nm_dbus_signal_filter): trap NameOwnerChanged signals for Hal, - and when it appears, get a list of network devices from it. If - Hal goes away, clean up the libhal context - -2005-06-22 Robert Love - - * dispatcher-daemon/NetworkManagerDispatcher.c: fix FIXME: check - permissions of scripts before executing. - -2005-06-21 Robert Love - - * initscript/SUSE/networkmanager: update. - * src/backends/NetworkManagerSuSE.c: cleanup. - -2005-06-21 Robert Love - - * gnome/applet/applet.c: use menu mnemonics. - * gnome/applet/menu-items.c: (ditto) - -2005-06-21 Robert Love - - * applet/applet-dbus-devices.c: mark non-static functions static. - * applet/applet-dbus-vpn.c: (ditto) - * applet/applet.c: (ditto) - * applet/nm-device.h: (ditto) - * applet/other-network-dialog.c: (ditto) - * applet/passphrase-dialog.c: (ditto) - * NetworkManager.c: (ditto) - * NetworkManagerDbus.c: (ditto) - * NetworkManagerDevice.c: (ditto) - * NetworkManagerPolicy.c: (ditto) - * NetworkManagerUtils.c: (ditto) - * NetworkManagerWireless.c: (ditto) - * NetworkManagerWireless.h: (ditto) - * nm-netlink-monitor.c: (ditto) - * applet/applet-dbus-info.c: (ditto), add FIXME's. - * vpn-manager/nm-dbus-vpn.c: (ditto), remove shadowed variable. - * autoip.c: include autoip.h. - * autoip.h: new file. define get_autoip(). - * nm-netlink-monitor.h: define nm_netlink_close_connection(). - * NetworkManagerDbus.h: remove duplicate definitions. - -2005-06-20 Robert Love - - * Makefile.am: Add missing intltool-foo.in generated files to - EXTRA_DIST so that 'distcheck' works. Also add DISTCLEANFILES - with the start of stuff to cleanup on 'distclea'. - * configure.in: add AC_PROG_INTLTOOL macro so that we do the intltool - stuff right and 'distcheck' works. - * po/POTFILES.in: Remove examples/python/systray/eggtrayicon.c. If - we keep it, we need to add all of examples/* to EXTRA_DIST and do - Makefile.am for each. And systray/Makefile needs to be redone. - -2005-06-19 Dan Williams - - * src/NetworkManagerDevice.c - - (nm_device_wireless_process_scan_results): scan every 20s when - disconnected and scanning is ALWAYS_SCAN or WHEN_UNASSOCIATED - -2005-06-19 Dan Williams - - * WEXT_DEBUG->IOCTL_DEBUG, extend checking to all ioctl() calls - -2005-06-18 Ray Strode - - * src/nm-netlink-monitor.c - (nm_netlink_monitor_event_handler): check for the presence - of either error condition not both. - - (nm_netlink_monitor_error_handler): emit error signal if - error occurs. - - (nm_netlink_monitor_event_handler), - (nm_netlink_monitor_error_handler), - (nm_netlink_monitor_disconnect_handler): if an - assertion fails disconnect the event handler to prevent - infinite loops. - - * src/nm-netlink-monitor.h: add new error condition - NM_NETLINK_MONITOR_ERROR_WAITING_FOR_SOCKET_DATA - -2005-06-18 Ray Strode - - * src/nm-netlink-monitor.c - (nm_netlink_monitor_event_handler): remove bogus < 0 - check on unsigned value and return early if the kernel - didn't send any bytes. - -2005-06-17 Robert Love - - * initscript/SUSE/networkmanager: Change the Provides and default - run levels - -2005-06-16 Dan Williams - - Patch from Robert Love: - * gnome/applet/applet.c - - Beautify some applet menu item names - -2005-06-17 David Zeuthen - - * gnome/vpn-properties/nm-vpn-ui-interface.h: Require users of this - API to define NM_VPN_API_SUBJECT_TO_CHANGE to acknowledge API churn. - Also add new methods can_export, import_file and export. - - * gnome/vpn-properties/nm-vpn-properties.glade: Add an Export button - to the main UI - - * gnome/vpn-properties/nm-vpn-properties.c: - Define NM_VPN_API_SUBJECT_TO_CHANGE so we can actually include - nm-vpn-ui-interface.h. - (update_edit_del_sensitivity): Also update "Export" sensitivity - (add_vpn_connection): Also add new SVC_NAME column - (import_settings): New function - (retrieve_data_from_selected_connection): New function - (edit_cb): Use retrieve_data_from_selected_connection to simplify - this function - (export_cb): New function - (init_app): Also setup the "export" widget - (main): Support the --import-service and --import-file commandline - arguments - - * gnome/libnm_glib/libnm_glib.c (libnm_glib_dbus_filter): Also support - D-BUS 0.34 - -2005-06-16 Dan Williams - - Patch from Robert Love: - * gnome/applet/menu-items.c - - (network_menu_item_new): pass -1 as wireless network - menu items height size request rather than ascent / 2 - -2005-06-16 Dan Williams - - * Clean up wording in Wireless Scan Methods menu items and constants - -2005-06-16 Robert Love - - * po/POTFILES.in - - remove gtkcell* files - -2005-06-15 Dan Williams - - Patch from Robert Love: make the applet stetic - - * gnome/applet/Makefile.am - - Don't compile the gtkcellview and gtkcellrendererprogress files - - * gnome/applet/gtkcellview.h - gnome/applet/gtkcellview.c - gnome/applet/gtkcellrendererprogress.h - gnome/applet/gtkcellrendererprogress.c - - Removed - - * gnome/applet/menu-items.c - - Progress bars are 5:1 size ratio - - Use GTK progress bars rather than internal ones - -2005-06-15 Dan Williams - - Patch from Robert Love: - * initscript/SUSE/networkmanager - - Fix typo - -2005-06-15 Dan Williams - - * src/backends/NetworkManagerSuSE.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerDebian.c - - (set_ip4_config_from_resolv_conf): Fix typo I made, '==' -> '=' - -2005-06-15 Dan Williams - - * src/backends/NetworkManagerDebian.c - - Add nm_system_device_get_use_dhcp() to debian backend - - Patch from Kay Sievers: - * src/backends/NetworkManagerSuSE.c - - Update debian backend for static IP nameservers - - * src/NetworkManagerDevice.c - - Actually set the device to use static IP or DHCP rather - than always DHCP - -2005-06-15 Dan Williams - - Patch from Thom May: - * src/backends/NetworkManagerDebian.c - - Update debian backend for static IP nameservers - -2005-06-15 Dan Williams - - Patches from Robert Love: - * gnome/applet/wireless-applet.glade - - Tighten up wording - - * src/NetworkManagerDevice.c - - Remove misplaced ';' - - * configure.in - initscript/Makefile.am - initscript/SUSE/Makefile.am - initscript/SUSE/networkmanager - - Add SUSE initscript - -2005-06-12 David Zeuthen - - * gnome/vpn-properties/nm-vpn-ui-interface.h: New file - - * gnome/vpn-properties/nm-vpn-properties.glade: New file - - * gnome/vpn-properties/nm-vpn-properties.c: New file - - * gnome/vpn-properties/Makefile.am: New file - - * src/vpn-manager/nm-vpn-manager.h: Rework prototypes to take an - array of passwords - - * src/vpn-manager/nm-vpn-manager.c - (nm_vpn_manager_activate_vpn_connection): Take an array of passwords - instead of just a single one - - * src/vpn-manager/nm-dbus-vpn.c: - (nm_dbus_vpn_get_vpn_connection_properties): Also append service_name - here - (nm_dbus_vpn_activate_connection): Rework to take an array of passwords - - * gnome/applet/vpn-password-dialog.h (nmwa_vpn_request_password): - Change the interface here to give a list of passwords. Also, don't - require username, but do require service - - * gnome/applet/vpn-password-dialog.c: Look up the VPN .name files for - the binary for the auth-dialog and use that instead of putting up a - dialog asking for a single password - - * gnome/applet/vpn-connection.[ch]: Don't remember the user_name, - however do remember the service - - * gnome/applet/main.c (main): Setup i18n - - * gnome/applet/applet.c (nmwa_update_state): Add a line "VPN - connection to '%s'" to the tooltip if we are connected using VPN - (nmwa_menu_vpn_item_activate): Check last_attempt_success gconf - key to determine whether we the auth-dialog needs to - reprompt. Also cope with the fact that the auth-dialog now returns - an array of passwords. - (nmwa_menu_configure_vpn_item_activate): New handler for - "Configure VPN..." menu item - (nmwa_menu_add_vpn_menu): Add the "Configure VPN..." menu item - (is_vpn_available): New function to determine if we got any - NM-compatible VPN software installed - (nmwa_menu_add_devices): Use is_vpn_available to add VPN menu - items only if we have NM-compatible VPN software installed - (nmwa_gconf_vpn_connections_notify_callback): Slightly rework the - logic for detecting when VPN connections are removed - - * gnome/applet/applet-dbus.h: Removed the prototypes for - nmwa_dbus_vpn_activate_connection, nmwa_dbus_vpn_deactivate_connection - since these are defined elsewhere - - * gnome/applet/applet-dbus.c (set_vpn_last_attempt_status): New - function used to keep track of whether the last attempt succeded - (nmwa_dbus_filter): Update last_attempt according to whether the - VPN connection could be established or not - - * gnome/applet/applet-dbus-vpn.h (nmwa_dbus_vpn_deactivate_connection): - Change prototype to take an array of passwords, not just a single - password - - * gnome/applet/applet-dbus-vpn.c (nmwa_dbus_vpn_properties_cb): Only - update service, not user - (nmwa_dbus_vpn_remove_one_vpn_connection): Check that applet-> - dbus_active_vpn_name is not NULL before using it - (nmwa_dbus_vpn_activate_connection): Send the passwords as a - string array instead of assuming a single password - - * gnome/applet/applet-dbus-info.c: - (nmi_dbus_get_vpn_connection_properties): Use the logged in user for - user name; don't read from gconf - - * gnome/applet/Makefile.am: Also export SYSCONFDIR and - VPN_NAME_FILES_DIR - - * gnome/Makefile.am (SUBDIRS): Add vpn-properties - - * configure.in: Add checks for gmodule-2.0. - Generate gnome/vpn-properties/Makefile. Don't generate any Makefile's - in vpn-daemons nor vpn-daemons/vpnc. We have separate autotooled - projects under vpn-daemons now. See vpn-daemons/vpnc/Changelog - for details - - * vpn-daemons/Makefile.am: Removed - - * vpn-daemons/README: New file to describe extensions points for VPN - software - -2005-06-10 Dan Williams - - * src/backends/NetworkManagerRedHat.c - - (get_current_profile_name): new function, grab current network profile name from - /etc/sysconfig/network - - (set_ip4_config_from_resolv_conf): new function, parse a resolv.conf and - update an IP4 Config structure's settings from it - - (nm_system_device_get_system_config): if we're using static IP on this device, - get DNS info from current network profile - -2005-06-09 Dan Williams - - Patch from Robert Love: - * src/NetworkManagerDevice.c - src/NetworkManagerUtils.c - - 64-bit build fixes - -2005-06-09 Dan Williams - - Patch from Kay Sievers and Robert Love: - * configure.in - src/backends/Makefile.am - src/backends/NetworkManagerSuSE.c - - Add SuSE support - -2005-06-09 Dan Williams - - * NetworkManager.h - - Add NMWirelessScanMethod enum for scan methods - - * gnome/applet/applet-dbus-devices.c - - (nmwa_dbus_update_scanning_enabled_cb): remove - - (nmwa_dbus_update_scanning_enabled): remove - - (nmwa_dbus_update_devices): don't call nmwa_dbus_update_scanning_enabled() anymore - since it got removed - - (nmwa_dbus_enable_scanning): remove - - * gnome/applet/applet-dbus-info.c - - (nmi_dbus_signal_update_scan_method): new function, signal NetworkManager to - update the wireless scanning method from NMI - - (nmi_dbus_get_wireless_scan_method): new function, return wireless scanning - method value to NetworkManager - - (nmi_dbus_info_message_handler): respond to the "getWirelessScanMethod" method call - - * gnome/applet/applet-dbus-info.h - - Add prototype for nmi_dbus_signal_update_scan_method - - * gnome/applet/applet.c - - (scanning_menu_update): new function, update one GtkCheckMenuItem from the - Wireless Scanning menu based on current wireless scan method - - (nmwa_menu_scanning_item_activate): new function, callback for GTK "activate" - signal for Wireless Scanning menu items, tell NetworkManager the new method - and update our menu items to make sure the right one is checked - - (nmwa_set_scanning_enabled_cb): remove - - (nmwa_context_menu_update): remove references to pause_scanning_item - - (nmwa_context_menu_create): remove pause_scanning_item, and add new Wireless - Scanning menu item - - (nmwa_gconf_get_wireless_scan_method): new method, pull wireless scanning method - from GConf - - nmwa_gconf_networks_notify_callback -> nmwa_gconf_info_notify_callback: generalize - so we get notified of preference values too - - (nmwa_get_instance): monitor GCONF_PATH_WIRELESS rather than GCONF_PATH_WIRELESS_NETWORKS - - * gnome/applet/applet.h - - GCONF_PATH_WIRELESS added, one level below GCONF_PATH_WIRELESS_NETWORKS - - Add wireless scan method member to applet data - - Remove pause_scanning_item, add Wireless Scanning submenu - - * src/NetworkManager.c - - (nm_data_new): default to NM_SCAN_METHOD_ON - - (main): grab scanning method from NMI if we can - - * src/NetworkManagerDbus.c - - (nm_dbus_update_wireless_scan_method_cb): new function, callback from - nm_dbus_update_wireless_scan_method() - - (nm_dbus_update_wireless_scan_method): new function to grab scanning method - from NMI - - (nm_dbus_nmi_is_running): redundant function, removed - - (nm_dbus_signal_filter): trap "WirelessScanMethodUpdate" signal, grab scanning method - when NMI comes back - - * src/NetworkManagerDevice.c - - (nm_device_is_activated): return TRUE if the device is activated - - (nm_device_wireless_scan): don't scan if the scan method is OFF, or if its AUTO - and we are activated - - * src/nm-dbus-nm.c - - (nm_dbus_nm_set_scanning_enabled): removed - - nm_dbus_nm_get_scanning_enabled -> nm_dbus_nm_get_wireless_scan_method - - (nm_dbus_nm_methods_setup): remove [get | set] ScanningEnabled and add "getWirelessScanMethod" - -2005-06-09 Dan Williams - - * NetworkManager.h - src/vpn-manager/nm-vpn-service.c - - NM_VPN_STATE_ERROR -> NM_VPN_STATE_UNKNOWN (more consistent with other enums) - -2005-05-27 Dan Williams - - * vpn-daemons/vpnc/nm-vpnc-service.c - - (vpnc_watch_cb): wait a bit before trying to read vpnc's pidfile. - Should fix the bug where the VPN connection terminates the first time. - -2005-05-20 Dan Williams - - * NetworkManager.h - - Differentiate VPN config signals between bad VPN config options - and bad IP config - - * gnome/applet/applet-dbus-info.h - - Add prototypes for wireless network and vpn connection update functions - - * gnome/applet/applet-dbus.c - - (nmwa_dbus_filter): trap new VPN config error signals from NetworkManager - - * gnome/applet/applet.c - - (nmwa_schedule_vpn_failure_dialog): new dialog text for new VPN config - error signals - - (nmwa_gconf_networks_notify_cb): re-enable wireless network change notify - propogation to NetworkManager - - (nmwa_gconf_vpn_connections_notify_cb): re-enable vpn connection change - notify propogation to NetworkManager - - * src/NetworkManagerDbus.c - - (nm_dbus_update_one_allowed_network): make sure to specify which AP list we - are updating so a network can be removed from it if necessary - - * src/vpn-manager/nm-vpn-manager.c - - (nm_vpn_manager_process_signal): trap new vpn config error signals - - * vpn-daemons/vpnc/nm-vpnc-service.c - - (nm_vpnc_dbus_signal_failure): generalize function for all VPN error signals - - (nm_vpnc_dbus_signal_launch_failed): remove - - (nm_vpnc_dbus_signal_connect_failed): remove - - (nm_vpnc_helper_timer_cb): update for new generalized error signal function - - (nm_vpnc_schedule_helper_timer): increase timeout to 10s - - (vpnc_watch_cb): don't whine about exit code if vpnc exited cleanly, update - for new generalized error signal function, remove config file stuff - - (nm_vpnc_start_vpnc_binary): grab a stdin pipe to vpnc after spawning it so - we can write configuration options to it - - (nm_vpnc_config_file_generate): removed - - (nm_vpnc_config_write): write configuration options to the vpnc stdin pipe - - (nm_vpnc_config_options_validate): validate the config options we receive - from NetworkManager to block potential exploits - - (nm_vpnc_dbus_handle_start_vpn): call option validation function before - starting vpnc - - (nm_vpnc_dbus_process_helper_config_error): actually propogate config error - to NetworkManager - -2005-05-16 Dan Williams - - * vpn-daemons/vpnc/nm-vpnc-service-vpnc-helper.c - - (main): Work correctly with vpnc 0.3.3 by exiting if the "reason" code - is not "connect" - -2005-05-16 Dan Williams - - Patch from Tomislav Vujec - * gnome/applet/applet-dbus-info.c - - (nmi_dbus_get_vpn_connection_routes): new function, pull routes out of - GConf and pass them to NetworkManager. New key is 'routes' under - the VPN connection, and should be a string list - - * src/NetworkManagerSystem.c - - (nm_system_vpn_device_set_from_ip4_config): if user-defined routes exist, - set them on the device when we set the rest of the VPN config. Ensure - they are in the correct format since they are passed directly to the - command line. - - * src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerDebian.c - - (nm_system_device_add_route_via_device_with_iface): new function - - * src/vpn-manager/nm-dbus-vpn.c - - (nm_dbus_vpn_get_routes): grab VPN routes from NetworkManagerInfo - - * src/vpn-manager/nm-vpn-manager.c - - (nm_vpn_manager_handle_ip4_config_signal): grab routes from NMI and pass - them into the IP4 config functions - -2005-05-15 Dan Williams - - From Filip Miletic: - * po/sr.po - po/sr@Latn.po - configure.in - - Serbian translation added - -2005-05-15 Dan Williams - - * dispatcher-daemon/NetworkManagerDispatcher.c - - (main): sync arguments with NetworkManager and the applet, now use - "--no-daemon" rather than "daemon=no" - - (nmd_print_usage): Fix script path in usage message - -2005-05-15 Dan Williams - - * src/NetworkManagerDevice.[ch] - src/NetworkManagerPolicy.c - src/NetworkManager.c - src/nm-dbus-nm.c - - Remove the "just_added" parameter from nm_device_deactivate(). We no - longer send the DeviceNoLongerActive signal unconditionally, but only - when the device is actually active. - - * dispatcher-daemon/NetworkManagerDispatcher.c - - (nmd_execute_scripts): convert to GLib directory functions from opendir(), - and simplify the logic - - (nmd_get_device_name): copy value from dbus reply so we don't segfault when - we free it later on - - * initscript/RedHat/Makefile.am - initscript/RedHat/NetworkManagerDispatcher - - Add initscript for NetworkManagerDispatcher - - - Patch from Bill Moss: - * dispatcher-daemon/NetworkManagerDispatcher.c - - Remove IP4AddressChange signal code including nmd_get_device_ip4_address() - - * src/NetworkManagerDbus.c - - (nm_dbus_signal_device_ip4_address_change): remove. If the device goes up, - and DeviceNowActive gets signaled, then the device has a new IP address - anyway. There's no need for a separate signal. - - * src/NetworkManagerDevice.c - - (nm_device_update_ip4_address): Don't send IP4AddressChange signal - - * src/NetworkManagerPolicy.c - - (nm_policy_activation_finish): Send DeviceNowActive signal when the device - activates successfully. This kind of went missing when I reworked the - activation code. - -2005-05-15 Dan Williams - - * configure.in - - Check for dhcdbd and error if its not found - - * src/dhcp-manager/Makefile.am - src/dhcp-manager/nm-dhcp-manager.c - - Use path to dhcdbd that configure found - -2005-05-14 Dan Williams - - * gnome/applet/nm-device.c - - (network_device_sort_wireless_networks, sort_networks_function): New functions to - sort wireless networks alphabetically - - * gnome/applet/applet-dbus-devices.c - - (mwa_dbus_devices_lock_and_copy): Sort network device's wireless network lists - before copying them over to the GUI - -2005-05-14 Dan Williams - - * src/NetworkManager.c - - (device_stop_and_free): Deactivate VPN connections before deactivating devices, - fixes a deadlock on shutdown with a VPN connection active. This function locks - the device list, as does nm_get_active_device() which is called from - nm_vpn_manager_deactivate_vpn_connection(). - -2005-05-14 Dan Williams - - * NetworkManager.h - - Add signals for VPN Launch and Connect failures - - * gnome/applet/applet-dbus.c - - (nmwa_dbus_filter): Trap new VPN launch & connect failure signals - - * gnome/applet/applet.c - - (nmwa_show_vpn_failure_dialog): generalize old nmwa_show_vpn_login_failure_dialog() - function to handle all VPN failure messages - - (nmwa_schedule_vpn_failure_dialog): generalize old nmwa_schedule_vpn_login_failure_dialog() - function to hanlde all VPN failure messages - - (show_warning_dialog): work around focus-stealing prevention - - * gnome/applet/other-network-dialog.c - gnome/applet/passphrase-dialog.c - - (update_button_cb): Make sure the OK button is enabled when it should be, fixes - problem where it never enabled for ASCII Key and Hex Key types - - * gnome/applet/wireless-applet.glade - - Add window title to Other Wireless Network Dialog - - * src/vpn-manager/nm-dbus-vpn.c - - (nm_dbus_vpn_signal_vpn_failed): generalize old nm_dbus_vpn_signal_vpn_login_failed() - function to handle all VPN failure messages - - * src/vpn-manager/nm-vpn-manager.c - - (nm_vpn_manager_process_signal): trap and proxy VPN launch & connect failure signals too - - * vpn-daemons/vpnc/nm-vpnc-service.c - - (nm_vpnc_dbus_signal_launch_failed): new function - - (nm_vpnc_dbus_signal_connect_failed): new function - - (nm_vpnc_helper_timer_cb): signal connect failure on timeout - - (vpnc_watch_cb): signal connection failure when vpnc exits with connection failure - - (nm_vpnc_start_vpnc_binary): search a number of locations for vpnc - - (nm_vpnc_dbus_handle_start): send launch failure signal when we fail to launch vpnc - -2005-05-11 Dan Williams - - * vpn-daemons/vpnc/nm-vpnc-service.c - - (nm_vpnc_start_vpnc_binary): NULL-ify GError before using it - - (nm_vpnc_config_file_generate): Attempt to ensure that the path for the config - file exists before trying to write it out. - -2005-05-10 Dan Williams - - * gnome/applet/applet-dbus-device.c - - (nmwa_dbus_set_device): remove check for valid key and key type, which - prevented just entering ESSID and leaving key and key type up to - NetworkManager (which should have them already cached) - -2005-05-08 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_activation_finish): Don't set NM_ACT_STAGE_ACTIVATED here, instead... - - (nm_policy_schedule_activation_finish): Set NM_ACT_STAGE_ACTIVATED here to - fix a situation where NM is told to terminate and the device stops activation, - but the main thread isn't aware of that because it would never have run - nm_policy_activation_finish() to set the ACTIVATED flag, because the main loop - had already quit. - - * src/NetworkManagerDevice.c - - (nm_device_probe_wired_link_state): cosmetic fixes - - (nm_device_activate_stage5_ip_config_commit): Don't check link state if - we've failed to activate or been canceled. - - (nm_ac_test): nm_debug -> nm_info for "waiting for device to cancel" message - -2005-05-08 Dan Williams - - * src/NetworkManagerWireless.c - - (nm_wireless_qual_to_percent): Fix #if -> #ifdef, print out the "updated" - value of WEXT quality structures, and add a debug message when we cannot - determine any quality % at all - -2005-05-08 Dan Williams - - * src/dhcp-manager/nm-dhcp-manager.c - - (nm_dhcp_manager_begin_transaction): Tell dhclient to release leases when - it goes down. - -2005-05-06 Dan Williams - - * gnome/applet/applet-dbus-device.c - gnome/applet/applet-dbus-info.c - gnome/applet/applet-dbus.c - gnome/applet/applet.c - gnome/applet/applet.h - - (nmwa_get_device_for_nm_device) -> (nmwa_get_device_for_nm_path) - - * gnome/applet/applet-dbus.c - - (nmwa_dbus_filter): trap DeviceCarrierOn/DeviceCarrierOff signals - so we notice when wired device's carriers come back on. Should - fix issue with wired devices being grayed out even if the cable - is in, for devices that support carrier detection. - - * gnome/applet/applet.c - - (nmwa_driver_notify): bash focus-stealing prevention in the face - - (nmwa_act_stage_to_pixbuf): Clarify wireless ACT_STAGE_DEVICE_CONFIG - tooltip message - - (nmwa_menu_item_activate, nmwa_menu_add_device_item, nmwa_menu_item_data_free): - Fix situation where applet wouldn't respond to menu selections - - * src/NetworkManager.c - src/NetworkManagerDevice.c - src/NetworkManagerDbus.c - src/NetworkManagerDbus.h - - (nm_dbus_signal_device_status_change) -> (nm_dbus_schedule_device_status_change_signal) - - * src/NetworkManagerDbus.c - - (nm_dbus_send_network_not_found, nm_dbus_schedule_network_not_found_signal): - Remove, no longer used or relevant - - (nm_dbus_signal_device_status_change): Better signal enum->string matching - - (nm_dbus_schedule_device_status_change_signal): add - - * src/NetworkManagerDevice.c - - (nm_device_worker_thread_stop): don't try to join a NULL worker thread - - (nm_device_set_link_active): Fix up switching for non-carrier-detect devices, - ie don't deactivate them unless explicitly told to by the user. Also send - CARRIER_OFF / CARRIER_ON signals when link changes - - (nm_device_set_essid, nm_device_set_enc_key, nm_device_is_up, nm_device_set_mode): - Don't print error message when device is no longer around - - (nm_device_deactivate): kill any current DHCP process attached to this device, - not just during activation - - * src/NetworkManagerPolicy.c - - (nm_policy_auto_get_best_device): Ignore semi-supported devices completely from - auto-device-selection. - - (nm_policy_device_change_check): Don't interrupt semi-supported devices - - * src/NetworkManagerSystem.c - - (nm_system_device_set_up_down_with_iface): Quiet first warning message when device - is no longer present (Bill Moss) - - * src/backends/shvar.c - - (svOpenFile): Open read-only to make SELinux happy - - * src/backends/NetworkManagerRedHat.c - - (nm_system_device_get_system_config): Use SYSCONFDIR rather than hardcoding - the path to the ifcfg-* files - -2005-05-05 Dan Williams - - * Expose activation stages to NetworkManager clients, like the applet - * Add Diana's progress icons to the applet, cued off NM activation stage - * Use more descriptive tooltips, cued off NM activation stage - -2005-05-05 Ray Strode - - * src/nm-netlink-monitor.c: - - Use clear_event_source instead of g_nullify_pointer() again. - -2005-05-05 Dan Williams - - * gnome/applet/main.c - - Fix session management so the applet is actually managed now - - * gnome/applet/passphrase-dialog.c - - (nmi_passphrase_dialog_show): bash focus-stealing prevention in the face - -2005-05-05 Dan Williams - - Patch from Bill Moss: - * gnome/libnm_glib/libnm_glib.c - - Fix for dbus-0.33 - -2005-05-05 Dan Williams - - Suggestion from Bill Moss: - * src/NetworkManagerSystem.c - - (nm_system_device_set_up_down_with_iface): ignore ENODEV - - - * src/NetworkManager.c - - (nm_data_free): move destruction of the various managers after - release of device list, because deactivating and freeing a device - requires at least the named manager - - (nm_poll_and_update_wireless_link_state): - (nm_device_link_activated): - (nm_device_link_deactivated): - don't grab the device list lock when actually updating device - link status or strength, since nm_device_set_link_active() - needs to call nm_get_active_device(), which also locks the device list. - - * src/NetworkManagerDevice.c - - (nm_device_set_link_active): if a device's link switches from off->on, - and it's wired, and the active device is wireless (or there is no - active device), activate the new device whose link just came on - - (link_to_specific_ap): try to smooth over intermittency in wireless links - my only calling the link to the current ap "failed" when more than 2 - consecutive link checks have failed - -2005-05-04 Dan Williams - - * src/NetworkManagerDevice.c - - (nm_device_probe_wireless_link_state): don't lock the scan mutex here - but let link_to_specific_ap() do the locking where it needs - - Patch from Bill Moss: - * src/NetworkManagerSystem.c - - Set MTU of VPN devices to 1412 - -2005-05-04 Dan Williams - - * Remove NM_STATE_SCANNING from NetworkManager.h and applet code - - * Fix some holes in device activation and retaining the currently connected - access point - -2005-05-03 Dan Williams - - * Kill dhcpcd. We now use "dhcdbd", a dbus daemon that controls dhclient. - This means that NetworkManager shouldn't have DHCP issues anymore. It also - means you need dhcdbd, which you can get here (get the latest one): - - http://people.redhat.com/jvdias/dhcdbd/ - - Technically NetworkManager can use any DHCP daemon that uses the same DBUS - interface as dhcdbd. - - * Rewrite device activation to facilitate the new DHCP infrastructure and - future improvements. Its now "activation request" based, ie there is a single - activation request composed of the device, access point, and other info which - follows the entire activation process. There are 5 stages of the activation - process which correspond to: - - 1) Device preparation - 2) Device configuration (bring it up, set ESSID/Key/etc) - 3) IP Config Start (fire off DHCP if we're using it) - 4) IP Config Get (grab config from DHCP or static config files) - 5) IP Config Commit (set device's IP address, DNS, etc) - - Note that there is no longer a "scanning" step, since the access point must - be known _before_ activation starts. If the access point drops out or does - not exist for some reason, the entire activation process fails and must be - restarted for a different access point or device. - - Patch from Bill Moss: - * gnome/applet/applet.c - - Fix type of vpn_failure dialog -> vpn_banner dialog - -2005-04-27 Dan Williams - - * gnome/applet/applet-dbus-vpn.c - gnome/applet/applet.c - gnome/applet/applet.h - - Fix up active VPN handling so that we reliably know when a VPN - connection has been deactivated - - * src/vpn-manager/nm-vpn-manager.c - - Remove duplicate VPNConnectionChange signal - -2005-04-27 Dan Williams - - Patch from Peter Jones: - * Remove usage of varargs to fix crashes on PPC (RH #154336) - - Patch from Bill Moss: - * src/NetworkManagerSystem.c - - Fix checking of return value from ioctl() - -2005-04-27 Dan Williams - - * Fix choosing of wireless networks and "Other wireless network..." from the applet - * Warn and exit if icons cannot be found - -2005-04-27 Dan Williams - - Patch from Tom Parker: - * Update debian backend - -2005-04-27 Dan Williams - - * Merge the applet and the info-daemon, and move the converged - applet under gnome/applet - * Move libnm_glib to gnome/libnm_glib - * Convert most dbus calls between the applet, info-daemon, and NM - into async calls - * Fix a few things valgrind noticed - * Make NM broadcast state more reliably - -2005-04-22 Pawan chitrakar - - * configure.in: Added ne in ALL_LINGUAS - -2005-04-15 Dan Williams - - * libnm_glib/libnm_glib: Fix up for dbus-0.32, and remove - code for dbus 0.2x versions - -2005-04-15 Dan Williams - - Patches from Tom Parker: - - Fix memleaks - - Join with worker thread rather than polling for its exit - - Patch from Bill Moss: - - Cull duplicate ESSIDs from the scan list, taking highest strength AP - -2005-04-15 Dan Williams - - - Fixes to pass 'make distcheck' - -2005-04-15 Dan Williams - - Initial VPN Support - - supports 'vpnc' - - reworks device IP configuration, backend files have changed and will need - to be updated for all distributions. I will try to do what I can for - them, but I cannot test them. - - - Move named directory to src/named-manager - - Make backends directory self-contained - -2005-04-06 Dan Williams - - Add debug code for socket/file descriptor leaks. We register every socket - that we open (except for stuff in dhcpcd/) for tracking, and print out the - list of sockets that we forgot to close on shutdown. This also consolidates - about 4 places where we opened sockets into 1 function in NetworkManagerUtils.c - -2005-04-06 Dan Williams - - * dhcpcd/dhcpcd.c - - (dhcp_interface_free): fix a file descriptor leak that may have - caused network drivers to not unload due to refcounts > 0 - -2005-04-04 Dan Williams - - * panel-applet/NMWirelessAppletDbus.c - - (nmwa_dbus_call_nm_method): remove some commented code - - * src/NetworkManagerAPList.[ch] - - (nm_ap_list_remove_ap_by_essid): new function - - * src/NetworkManagerDevice.c - - (nm_device_wireless_force_use): remove access points from the ignore list - when the user forces them - - * src/nm-dbus-device.c - - (nm_dbus_device_get_active_network): fix up escaping of object paths - -2005-04-04 Dan Williams - - Patch from Tom Parker: include "nm-utils.h" for backend files that need it - -2005-04-04 Dan Williams - - * src/NetworkManagerDevice.c: - - (nm_completion_scan_has_results): restore pre-completion-patch behavior - of only erroring after the second consecutive scan times out. Also - don't exit when the card requires more time than we can give it, just - log the event and continue. - -2005-04-01 Steve Murphy - - * configure.in: Added "rw" to ALL_LINGUAS. - -2005-04-01 Dan Williams - - Perform scans during device activation, if needed. Both activation - and scans run in the same GMainContext. Therefore, if an access point - is not found by the time the device starts activation, it will not - be available until after activation. We now try to scan during - activation (in nm_wa_test) every 15s so that all available access - points are more likely to be found and available for the activation - procedure. - - Also change nm_wireless_link_state_handle() to only update the "best" - AP if we are not forcing a device and if we are not about to change - state. This attempts to work around a race when forcing a device, - where the forced AP would get cleared out too soon by the link state - checking timeout in the main thread, and the activation attempt with - that AP would fail. - -2005-04-01 Dan Williams - - * po/POTFILES.in - - Update with new translatables - -2005-03-31 Dan Williams - - * panel-applet/NMWirelessAppletDbus.c - - Fix device names now that hal has changed device parenting for - network devices. - -2005-03-31 Dan Williams - - Tighten up handling of wireless devices that don't support wireless - scanning (ie, Orinoco). Due to restructuring of code, these devices - hadn't been doing pseudo-scanning for a while either and would just - spin waiting for an access point. They are now manual devices where - the user must choose the access point from the menu every time. All - "allowed" access points are listed in the applet's menu regardless - of whether or not they can be seen by the card, since it can't scan - anyway. - - * src/NetworkManager.c - - (nm_wireless_link_state_handle): new function, but only update - the "best" ap for non-scanning devices when its not activating, - and when no device is being forced on the card - - (nm_link_state_monitor): split wireless link state handling out - into separate function - - * src/NetworkManagerDevice.c - - (nm_device_copy_allowed_to_dev_list): new function - - (nm_device_new): populate non-scanning cards' AP lists with - access points from the "allowed" list - - (nm_device_new): don't start a scanning timeout for devices that - can't scan - - (nm_device_activation_schedule_finish): new parameter, should be - the AP that failed to be connected to, pass it on to the - activation finish function in NetworkManagerPolicy.c - - (nm_device_activate_wireless): don't ever try to get a new AP - for non-scanning devices, just fail. The user must choose - a new access point manually. - - (nm_device_activate): grab the AP that failed connection and - pass it on - - (nm_device_update_best_ap): Clear the best AP if we don't have - a link to it, user must manually choose a new one - - (nm_device_do_pseudo_scan): remove function - - (nm_device_wireless_process_scan_results): remove bits for non- - scanning cards since they never get here - - (nm_device_wireless_scan): remove bits for non-scanning devices, - and fake the scan list for test devices a bit earlier - - * src/NetworkManagerPolicy.c - - (nm_policy_activation_finish): use the failed_ap that we get - passed rather than getting the best_ap from the card, which - may have changed since we were scheduled - - (nm_policy_allowed_ap_list_update): for non-scanning devices, - update their scan list directly from the allowed list when - we get updates to the allowed list from NetworkManagerInfo - - * src/NetworkManagerPolicy.h - - New member for failed access point in NMActivationResult - - ------------------------------------- - - Driver Notification patch: notifies the user when their driver - sucks. Gives them the option to ignore further insertions - of the card that has the sucky driver. - - * NetworkManager.h - - Remove the SEMI_SUPPORTED member from the NMDriverSupportLevel - enum and replace it with NO_CARRIER_DETECT and - NO_WIRELESS_SCAN - - * panel-applet/NMWirelessApplet.[ch] - - Merge essid.glade -> wireless-applet.glade - - Implement the "Your driver sucks" notification dialog - - * panel-applet/NMWirelessAppletDbus.c - - Change stuff from getSupportsCarrierDetect->getDriverSupportLevel - - Grab hardware address for each device from NM too - - Check whether the driver for each device sucks or not whenever - a new device is noticed - - * panel-applet/NMWirelessAppletOtherNetworkDialog.c - - Deal with stuff being in wireless-applet.glade now rather than essid.glade - - * src/NetworkManager.c - - Fix a double-unref on device removal - - * src/NetworkManagerUtils.c - - Set appropriate driver support level on a device that doesn't - support scanning or carrier detection - - * src/nm-dbus-device.c - - New "getHWAddress" dbus method on devices - - getSupportsCarrierDetect -> getDriverSupportLevel - -2005-03-31 Dan Williams - - * src/NetworkManagerDevice.c - - (nm_device_wireless_scan): Fix leak of scan results in some - instances - -2005-03-29 Dan Williams - - * src/NetworkManager.c - - (nm_poll_and_update_wireless_link_state): make code less indented - - Patch from Bill Moss: - * src/NetworkManager.c - - (nm_device_update_link_state): Update signal strength on wireless - devices every time we update link state too. - -2005-03-29 Dan Williams - - * src/NetworkManagerDevice.c - - (nm_device_set_essid): Work around Orinoco cards which need - extra time after setting the ESSID - -2005-03-29 Dan Williams - - * src/NetworkManagerDevice.c - - Merge one more bit of Peter Jones' completion patch - -2005-03-29 Dan Williams - - * src/NetworkManagerDevice.c - - (nm_device_force_use): Fix possible segfault - -2005-03-29 Dan Williams - - * src/NetworkManagerDevice.c - - Use iw_get_ext() where we should rather than iw_set_ext() - -2005-03-29 Dan Williams - - * src/NetworkManagerDevice.c - - (nm_device_set_up_down): remove check for unsupported devices - that caused NM to not bring devices up when they were - added to the device list. - -2005-03-28 Dan Williams - - * src/NetworkManagerDevice.c - - (mdio_read): Fix two bugs that caused all devices to fail - the MII carrier detection support checks - -2005-03-26 Dan Williams - - * src/NetworkManagerDevice.c - - (nm_device_wireless_scan): Remove duplicated scanning code - -2005-03-25 Dan Williams - - * panel-applet/NMWirelessApplet.c - - (nmwa_about_cb): Add some more contributors - - (nmwa_update_state): show the applet when there's no connection - - Enable the "Stop/Resume all wireless devices" option in the - context menu - - New "no connection" icon - - * src/NetworkManager.c - - (nm_poll_and_update_wireless_link_state): don't do anything if - wireless is disabled or we're asleep - - * src/NetworkManagerDHCP.c - - Remove trailing "\n" on debug messages - - * src/NetworkManagerDbus.c - - (nm_dbus_network_status_from_data): new state "asleep" - - * src/NetworkManagerDevice.c - - Merge most of Peter Jones' "completion" patch that greatly reduces - latency and wait times for most operations - - (nm_device_wireless_scan): Don't scan when asleep - - * src/NetworkManagerPolicy.c - - (nm_policy_get_best_device): return no device when asleep - - (nm_policy_allowed_ap_list_update): From Bill Moss: merge properties - for all wireless devices on update, not just active device - - * src/NetworkManagerUtils.c - - Merge Peter Jones' "completion" patch - - * src/nm-dbus-nm.c - - (nm_dbus_nm_set_wireless_enabled): bring down wireless devices when - we're told to disable them - - (nm_dbus_nm_sleep, nm_dbus_nm_wake): new functions for sleep/wake - - * utils/nm-utils.h - - New variants of the warn/info/error/debug print functions that can take - variables rather than static strings - -2005-03-24 Dan Williams - - * src/NetworkManagerUtils.c - - (nm_get_device_driver_name): driver names are now on the parents of - "Network Interface" objects, so look for them there - -2005-03-24 Dan Williams - - * test/nmtest.c - - Escape some forgotten object paths before we shove them through dbus - -2005-03-24 Dan Williams - - * dhcpcd/dhcpcd.[ch] - src/NetworkManagerDHCP.c - - Switch names from "*_record_*" -> "*_element_*" to clarify things a bit - (ie, dhcp_option_record_len -> dhcp_option_element_len) - - * src/NetworkManagerDbus.c - - spacing cleanups - - * src/nm-dbus-dhcp.c - - Make the API suck less. There is now only 1 type of each function, - ie only "getInteger" and no longer also "getIntegerv". All types - are returned encapsulated in a DBUS_TYPE_ARRAY, even for options - that will never have more than 1 element. This should simplify - things greatly. - - * test/nm-dhcp-opt-test.c - - Make the tool not segfault - - adapt to new DHCP Options API - -2005-03-22 Dan Williams - - * src/NetworkManager.c - - (nm_wired_link_deactivated): actually ignore netlink events from - wireless devices. - -2005-03-22 Dan Williams - - * src/NetworkManager.c - - (nm_wired_link_activated): actually ignore netlink events from - wireless devices. - -2005-03-17 Dan Williams - - Patch from Tom Parker: - * src/nm-netlink-monitor.c - - Include unistd.h - * info-daemon/NetworkManagerInfoDbus.c - - (nmi_dbus_update_network_auth_method): free GConf values - - Patch from Nathaniel McCallum : - * src/NetworkManagerDevice.c - - (nm_device_set_wireless_config): wait for successful - association longer for some cards (Atheros a/b/g) - -2005-03-15 Ray Strode - - * src/NetworkManager.c: - (sigterm_pipe_handler): - remove bogus FIXME - -2005-03-15 Ray Strode - - * src/NetworkManagerDbus.c: - Fix some sign weirdness that gcc4 doesn't like, - and add a header file so PPC can hopefully find - SIGTRAP - -2005-03-14 Ray Strode - - Fourth (probably working) cut at porting to - dbus 0.30 api and new hal. This cut adds - some new logging macros to make debugging - easier. - - * dispatcher-daemon/NetworkManagerDispatcher.c: - * info-daemon/NetworkmanagerInfo.c: - * info-daemon/NetworkManagerInfoPassphraseDialog.c: - * info-daemon/NetworkManagerInfoVPN.c: - * src/NetworkManager.c: - * src/NetworkManagerAP.c: - * src/NetworkManagerAPList.c: - * src/NetworkManagerDHCP.c: - * src/NetworkManagerDbus.c: - * src/NetworkManagerDevice.c: - * src/NetworkManagerPolicy.c: - * src/NetworkManagerSystem.c: - * src/NetworkManagerUtils.c: - * src/NetworkManagerWireless.c: - * src/autoip.c: - * src/nm-dbus-nm.c: - * src/backends/NetworkManagerDebian.c: - * src/backends/NetworkManagerGentoo.c: - * src/backends/NetworkManagerRedHat.c: - * src/backends/NetworkManagerSlackware.c: - use new logging macros. - - * dispatcher-daemon/NetworkManagerDispatcher.c: - (nmd_dbus_filter): s/dbus_free/g_free/ - - * info-daemon/Makefile.am: link in utils library. - * info-daemon/NetworkmanagerInfo.c: use new logging - macros. - (nmi_dbus_get_network): don't assume enumerations - are 32-bit. - (nmi_dbus_nmi_message_handler): don't free what - doesn't belong to us. - - * libnm_glib/libnm_glib.c: - (libnm_glib_get_nm_status): - (libnm_glib_init): don't free what doesn't - belong to us. - (libnm_glib_dbus): strdup result, so it doesn't get - lost when message is unref'd. - - * panel-applet/NMWirelessAppletDbus.c: - (nmwa_dbus_update_devices): s/dbus_free/g_free/ - - * src/NetworkManager.c: - (nm_monitor_wired_link_state): request initial status - dump of all cards when we start up, instead of relying - on /sys/.../carrier. - (nm_info_handler), (nm_set_up_log_handlers): - log handlers to specify what syslog priorites - the logging macros default to. - - * src/NetworkManagerAPList.c: - (nm_ap_list_populate_from_nmi): - s/dbus_free_string_array/g_strfreev/ - - * src/NetworkManagerDbus.c: - (nm_dbus_get_network_object): - validate d-bus message argument types. - Advance message iterator after reading argument, - prepend instead of append to GSList. - - * src/NetworkManagerDevice.c: - (nm_device_probe_wired_link_status): - remove redundant /sys in /sys path. remove wrong - contents == NULL means has carrier assumption. - - * src/nm-netlink-monitor.c - (nm_netlink_monitor_request_status): implement - function to ask kernel to dump interface link - status over netlink socket. - - * test/*.c: s/dbus_free/g_free/ - - * utils/nm-utils.h: - (nm_print_backtrace): new macro to print backtrace. - (nm_get_timestamp): new macro to get sub-second precise - unix timestamp. - (nm_info), (nm_debug), (nm_warning), (nm_error): - new logging functions. nm_info just prints, - nm_debug includes timestamp and function, - nm_warning includes function, nm_error includes - backtrace and sigtrap. - -2005-03-11 Ray Strode - - Third (unfinished, partially working) cut at porting to - dbus 0.30 api and new hal. - - * info-daemon/NetworkManagerInfoDbus.c: - don't free null arrays. - - * panel-applet/NMWirelessAppletDbus.c: - * src/nm-dbus-device.c: - * src/nm-dbus-net.c: - * src/NetworkManagerDbus.c: more - STRING -> OBJECT_PATH fun - * src/NetworkManagerDevice.c: - * src/NetworkManagerDevice.h: - (rename nm_device_get_link_active): rename to - nm_device_has_active_link - (nm_device_wireless_link_active): rename to - nm_device_probe_wireless_link_state - (nm_device_wired_link_active): rename to - nm_device_probe_wired_link_state. Rewrite to - use carrier file since hal doesn't maintain - link state anymore. - (nm_device_update_link_active): rename to - nm_device_update_link_state - * src/NetworkManagerPolicy.c - (nm_policy_activation_finish): check for NULL - MAC address. - - * src/Makefile.am: - * src/NetworkManagerMain.h: - * src/NetworkManager.c: - * src/nm-netlink-monitor.c: - * src/nm-netlink-monitor.h: New class to support - monitoring wired ethernet link status, since HAL - doesn't export that information anymore. - -2005-03-09 Ray Strode - - Second (unfinished, unworking) cut at porting to - dbus 0.30 api. - - * dispatcher-daemon/NetworkManagerDispatcher.c: - * info-daemon/NetworkManagerInfoDbus.c: - * panel-applet/NMWirelessAppletDbus.c: - * src/NetworkManagerDbusUtils.c: - * src/NetworkManagerDbusUtils.h: - * src/nm-dbus-device.c: - * src/nm-dbus-nm.c: - * test/nmtest.c: support dbus "object path" type - - * configure.in: - * Makefile.am: - * info-daemon/Makefile.am: - * libnm_glib/Makefile.am: - * panel-applet/Makefile.am: - * dispatcher-daemon/Makefile.am - * src/Makefile.am: - * test/Makefile.am: - * utils/Makefile.am: - * utils/nm-utils.c: - * utils/nm-utils.h: new utils static lib - -2005-03-07 Ray Strode - - * info-daemon/NetworkManagerInfoDbus.c: - * libnm_glib/libnm_glib.c: - * panel-applet/NMWirelessAppletDbus.c: - * src/NetworkManager.c: - * src/NetworkManagerDbus.c: - * src/NetworkManagerDevice.c: - * src/NetworkManagerUtils.c: - * src/nm-dbus-device.c: - * src/nm-dbus-dhcp.c: - * src/nm-dbus-net.c: - * src/nm-dbus-nm.c: - * test/nminfotest.c: - First (unfinished, unworking) cut at porting to dbus 0.30 api. - -2005-03-04 Dan Williams - - * configure.in - - Mark HEAD as 0.4 - -2005-03-04 Dan Williams - - Patch from Peter Jones: - - Make stuff work with gcc 4.0 - -2005-02-28 Maxim Dziumanenko - - * uk.po: Added "uk" (Ukrainian) to ALL_LINGUAS. - -2005-02-27 Jim Huang - - * configure.in: Added "zh_TW" (Traditional Chinese) to ALL_LINGUAS. - -2005-02-27 Dan Williams - - Patch from Bill Moss: - * panel-applet/NMWirelessAppletDbus.c - - Make sure strength for current access point is up-to-date when we - update the gui data model - -2005-02-27 Alessio Frusciante - - * configure.in: Added "it" (Italian) to ALL_LINGUAS. - -2005-02-27 Dan Williams - - * src/backends/NetworkManagerRedHat.c - - (nm_system_init): Kill any dhclient processes lying around as well - as stopping 'nifd' if its already been started. NetworkManager - subsumes the functions of nifd (kicking mDNSResponder, autoip) - -2005-02-27 Dan Williams - - * panel-applet/NMWirelessApplet.c - - (nmwa_destroy): Really mean to destroy GUI data model first, then - dbus data model, not the GUI data model twice. - -2005-02-27 Dan Williams - - * panel-applet/NMWirelessApplet.[ch] - panel-applet/NMWirelessAppletDbus.[ch] - - Move to incremental network updates. Instead of blowing away our list - of devices every time we get a signal from NetworkManager, we now - incrementally add/remove networks when NetworkManager notifies us that - a new network has appeared or disappered. Strength updates now happen - on-the-fly for each access point as well. There are now two copies of - data from NetworkManager: one for the dbus side, and one for the gui side. - When the dbus side data is modified, it is copied over to the gui side - so we don't have to hold the data_mutex for long periods of time (and - therefore block animation of the applet's icon). - - Clean up some memleaks too - - * panel-applet/NMWirelessAppletOtherNetworkDialog.c - - Minor code beautification - - * src/NetworkManagerAPList.c - - (nm_ap_list_merge_scanned_ap): return whether or not the access point is - completely new and whether or not an existing one's strength was updated. - Try to fix multiple access points and signal strength by using the highest - signal strength in each scan for any given ESSID. - - * src/NetworkManagerDbus.[ch] - - (nm_dbus_signal_wireless_network_change): consolidate signals that deal with - wireless networks; now we have only WirelessNetworkUpdate which includes - a UINT32 for Appeared, Disappeared, or StrengthChanged (see NetworkManager.h). - - Kill usage of DbusMessageIter - - * src/NetworkManagerDevice.c - - (nm_device_wireless_process_scan_results): Use the same timestamp for all APs - in the same scan result list. Copy ESSIDs-by-address earlier on, for each - AP rather than all-at-once. Also don't ever remove the AP a card is - currently associated with from the network list. - - Update for new signals during scan, send out Appeared, Disappeared, or - StrengthChanged when necessary. - -2005-02-25 Dan Williams - - * README - - Line break the README - -2005-02-25 Dan Williams - - * panel-applet/NMWirelessAppletOtherNetworkDialog.c - - Remove usage of gtk_window_set_default_size() - - * panel-applet/essid.glade - - Stick default size here - - Add in random crap that current glade wants to add in now - -2005-02-25 Dan Williams - - * src/backends/NetworkManagerRedHat.c - - For non-caching-nameserver/non-named case, ensure that nscd is running - and that we actually tell nscd to reload the hosts cache when it changes - -2005-02-25 Dan Williams - - * info-daemon/NetworkManagerInfoDbus.c - - (nmi_dbus_get_network_properties): whack usage of DbusMessageIter - - * test/nminfotest.c - - Whack usage of DbusMessageIter - - Clean up DbusError and DbusMessage handling and freeing - - Remove unused unregister handler - - * test/nmtest.c - - Whack usage of DbusMessageIter - - * test/nmtestdevices.c - - Whack usage of DbusMessageIter - -2005-02-25 Dan Williams - - * NetworkManager.h - - New signal type NMNetworkStatus in preparation for the "WirelessNetworkUpdate" - signal - -2005-02-25 Dan Williams - - * named/nm-named-manager.c - - Ensure that pid and watch variables for child named process get cleared out - when the child goes away. - -2005-02-22 Dan Williams - - * src/NetworkManagerPolicy.c - - (nm_policy_activation_finish): Deactivate a device if its activation fails, - and NULL out data->active_device so that we have to choose another one. - This may make NetworkManager keep attempting to connect to a wired network - if it fails, but if it keeps failing the wired network has more problems than - just NetworkManager. - - * src/backends/NetworkManagerRedHat.c - - (nm_system_update_dns): fix to actually run nscd -i hosts when nscd - is already running - - * named/nm-named-manager.c - - (rewrite_resolv_conf): Call nm_system_update_dns() when not using - named so that the distro can flush whatever name service caching - daemon it uses - -2005-02-21 Dan Williams - - * src/NetworkManagerDHCP.[ch] - - (nm_device_dhcp_remove_timeouts): new function - - * src/NetworkManagerDevice.c - - Use nm_device_dhcp_remove_timeouts() everywhere that we need to - remove the DHCP timeouts. - -2005-02-21 Dan Williams - - * panel-applet/NMWirelessApplet.[ch] - panel-applet/menu-info.[ch] - - Give the panel applet some major love: menu items are no longer - subclasses of GtkCheckMenuItem, they are actual GtkCheckMenuItems. - This allows the applet to actually reflect theme changes correctly, - since themeing of subclassed items in GTK _sucks_. - -2005-02-18 Dan Williams - - * libnm_glib/libnm_glib.[ch] - test/libnm_glib_test.c - - Clean up libnm_glib API a bit, callback is now passed a libnm_glib_ctx - and its data, and doesn't have to free the callback data anymore - -2005-02-18 Dan Williams - - * panel-applet/NMWirelessApplet.c - - Revert 2005-02-18 William Jon McCann fix for standard - copyright string until it passes 'make distcheck'. - With standard copyright string, xgettext complains - about "Non-ASCII string at ...". - -2005-02-18 Dan Williams - - * panel-applet/essid.glade - panel-applet/NMWirelessAppletOtherNetworksDialog.c - - Correct spelling of "adaptor"->"adapter" - -2005-02-18 William Jon McCann - - * panel-applet/NMWirelessApplet.c: Use GTK_CHECK_VERSION() macro. - (nmwa_about_cb): Use standard copyright string. Update comment - text to reflect that it is a notification area applet. Remove - leading newline in authors list. - (nmwa_menu_show_cb, nmwa_setup_widgets): Populate menu on show - instead of on parent menu item activation. Fixes #167550. - -2005-02-18 William Jon McCann - - * panel-applet/essid.glade: Capitalize items as per HIG. - Fixes #167632 - -2005-02-16 William Jon McCann - - * panel-applet/gtkcellrendererprogress.[ch]: Only compile these - files for GTK 2.4 or lower, since now public in GTK 2.6. - - * panel-applet/essid.glade: Don't specify window size. - -2005-02-17 Dan Williams - - Caught by Bill Moss: - * dhcpcd/client.c - - Time remaining for DHCP transaction calculation was incorrectly - inside a #ifdef DEBUG - -2005-02-15 Christophe Merlet - - * configure.in: Added fr (French) to ALL_LINGUAS. - -2005-02-14 Dan Williams - - * src/NetworkManagerDHCP.c - - (set_domain_searches): Fix free of invalid pointer - -2005-02-14 Dan Williams - - Patch from Peter Jones: - * dhcpcd/client.c - - Ensure we return RET_DHCP_CEASED everywhere we should - * dhcpcd/udpipgen.c - - Use faster TOS for IP packets - - Don't set ip_id since we're UDP - - Patch from Tomislav Vujec: - * src/nm-dbus-dhcp.c - test/nm-dhcp-opt-test.c - - Clean up warnings to enable cvs tree compilation. - -2005-02-14 Tomislav Vujec - - * configure.in - po/hr.po - - Add the Croatian locale. - -2005-02-14 Colin Walters - - * src/NetworkManagerDHCP.c (set_domain_searches): Handle space-separated - list of domains to search. - - * src/NetworkManagerMain.h (NMData): Handle multiple domain searches. - -2005-02-13 Dan Williams - - * dhcpcd/client.c - - Debug output cleanups of DHCP option printing and parsing. - -2005-02-13 Dan Williams - - Patch from Dan Reed: DHCP options D-BUS API - Exposes the DHCP options that a device receives to clients over D-BUS. - - * configure.in - - A few cleanups - - * dhcpcd/client.h - - Correct names, option length, and types for DHCP options - - * dhcpcd/dhcpcd.[ch] - - Clarify function names that access DHCP options & data - - * src/NetworkManagerDHCP.c - - Use new DHCP data access functions - - * src/NetworkManagerDbus.c - - Message handler for DHCP functions - - * src/nm-dbus-dhcp.[ch] (new) - - DHCP dbus methods - - * test/nm-dhcp-opt-test.c - - Test DHCP D-BUS API and return all present DHCP options - -2005-02-12 Dan Williams - - * test/Makefile.am - test/nmclienttest.c - test/nmtest.c - - Move nmclienttest.c -> nmtest.c - -2005-02-12 Dan Williams - - * dhcpcd/buildmsg.c - - Pad DHCP packets until they are at least 300 bytes in size. - -2005-02-11 Dan Williams - - * dhcpcd/client.c - - (dhcp_init): only print out client ID and class ID if they are specified - - * src/NetworkManagerDbus.[ch] - src/nm-dbus-nm.[ch] - src/nm-dbus-device.[ch] - src/nm-dbus-net.[ch] - - Move NM, Device, and Net functions to separate files and use the - dbus method list stuff in NetworkManagerDbusUtils.c to do - method dispatching - - * src/NetworkManagerDbusUtils.c - - Add new validate_method called before each dispatch (if present) - that can validate the method call - - * src/NetworkManagerWireless.c - - (nm_wireless_qual_to_percent): Fix misplaced "!" that caused signal - levels never to be evaluated - - Patch from j@bootlab.org - * src/NetworkManagerDevice.c - - Add typedef for "u64" - - * src/backends/NetworkManagerDebian.c - - Copy in Dave Woodhouse's fixes for IPv6 - -2005-02-11 Dan Williams - - Patch from Dave Woodhouse for IPv6: - * src/NetworkManagerUtils.c - - (nm_ethernet_address_is_valid): Check for prism54 dummy MAC address - and multicast addresses - - * src/NetworkManagerDevice.c - - (nm_device_set_up_down): make sure our cached MAC address is up-to-date - after bringing up a card. - -2005-02-10 Dan Williams - - Patch from Dave Woodhouse: - * src/NetworkManagerSystem.h - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerSlackware.c - - New nm_system_device_add_ip6_link_address() function to add link-local - address on an interface. Stubbed in Debian, Gentoo, and Slackware. - - * src/backends/NetworkManagerRedHat.c - - (nm_system_device_add_ip6_link_address): implement - - (nm_system_device_flush_addresses): revert to previous behavior of - flushing all addresses - -2005-02-10 Dan Williams - - Patch from Tom Parker: - * src/NetworkManagerDevice.c - - Remove the "#include " since both the ethtool.h and - mii.h headers are broken, and instead use our own typedefs - -2005-02-10 Dan Williams - - * dhcpcd/buildmsg.c - - (fill_host_and_class_id): only fill in client and class IDs if - they are set by callers. - - * dhcpcd/client.c - - (class_id_setup): don't autogenerate a class ID, only use one - we're given, if any. - - (client_id_setup): don't autogenerate a client ID, only use one - we're given, if any. - - * dhcpcd/dhcpcd.c - - (dhcp_interface_init): ensure that client options are correctly - NULL terminated - - * src/NetworkManagerDHCP.c - - (nm_device_dhcp_request): pass hostname to dhcp library - -2005-02-10 Dan Williams - - * dhcpcd/client.c - - #rh147661# Don't send kernel version in DHCP requests - - * src/NetworkManagerSystem.h - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - - Remove the nm_system_device_run_dhcp() and nm_system_device_stop_dhcp() - functions, they are no longer used anyway - - * src/backends/NetworkManagerRedHat.c - - (nm_system_device_flush_addresses): only flush "scope global" and "scope site" - addresses in an attempt to keep IPv6 local-scope addresses around - -2005-02-10 Dan Williams - - * src/NetworkManager.c - - (nm_create_device_and_add_to_list): change the add message slightly - - * src/NetworkManagerUtils.c - - (nm_get_wireless_driver_support_level, nm_get_wired_driver_support_level): - Return driver name to calling function - - (nm_get_driver_support_level): print out the driver a device is using - during the support check - - Patch from Dave Woodhouse: - * dhcpcd/udpipgen.c - - (in_cksum): copy last byte of odd-sized packets into a - 'u_short' rather than a 'u_char', should fix wrong checksums - on big-endian platforms - -2005-02-09 Dan Williams - - * Clean up usage of GSList objects and looping through their members - * Clean up DHCP rebind/renew timeouts, hopefully they will work correctly - now. - * Fix problem where even if scanning was turned off, card would still - cycle through frequencies. - -2005-02-08 Dan Williams - - * panel-applet/NMWirelessApplet.c - - Fix for gtk 2.4 - -2005-02-08 Dan Williams - - Patch from Bill Moss - * panel-applet/NMWirelessApplet.c - - Restore correct ESSID in tooltips - -2005-02-07 Dan Williams - - * panel-applet/NMWirelessApplet.[ch] - - Add a context menu that contains: - Pause/Resume Wireless Scanning - Stop/Start All Wireless Devices - About... - - Grab active device strength off active device, - not its network - - * panel-applet/NMWirelessAppletDbus.[ch] - - Add DBUS accessors for "getSupportsCarrierDetect", "setScanningEnabled", - "getScanningEnabled", "setWirelessEnabled", and "getWirelessEnabled" - - Update active device strength every 2 seconds, not every 1 second - - * panel-applet/menu-info.c - - Only disable wired devices in the menu when they support carrier detection, - and don't currently have a link. Non-carrier-detect devices will always - remain choosable - - * src/Makefile.am - src/NetworkManagerDbusUtils.[ch] - - Add new new dbus utils sources - - * src/NetworkManager.c - - Fixes for new link detection, we no longer need to call nm_device_update_link_active() - with the boolean parameter - - Set scanning_enabled & wireless_enabled to TRUE - - * src/NetworkManagerDbus.c - - Use new dbus util method dispatcher functions for org.freedesktop.NetworkManager methods - - Implement scanning & wireless enable/disable calls - - Remove the dbus vtable unregister handlers, weren't doing anything with them anyway - - * src/NetworkManagerDevice.c - - New link detection stuff again... - o Create device's mainloop earlier (but don't run it earlier) - o Hook up new carrier-detect support stuff - o Add in the ethtool & mii support detection code - - Don't scan if scanning is disabled - - * src/NetworkManagerPolicy.c - - Never automatically choose a device that doesn't support carrier detection - - Don't automatically choose a wireless device if wireless is disabled - -2005-02-07 Dan Williams - - * libnm_glib/libnm_glib.c - - Small cleanup in element list iteration - -2005-02-07 Dan Williams - - * src/NetworkManagerWireless.c - - (nm_wireless_qual_to_percent): Fix up wireless quality calculations - to be in line with the WEXT quality specification - -2005-02-02 Dan Williams - - Patch from Nathan Fredrickson - * Fix up compile for deprecation of libgnomeui - - Switch to from - - Remove includes - - Use gtk_window_set_default_icon_from_file() rather than - gnome_window_set_default_icon_from_file() - - * named/nm-named-manager.c - - (generate_named_conf): Fix return-nothing in non-void - function - -2005-02-02 Dan Williams - - * Clean up unused variables and the like - -2005-02-02 Dan Williams - - * src/NetworkManagerAPList.c - - (nm_ap_list_merge_scanned_ap): merge strength too - - * src/NetworkManagerUtils.c - - (nm_lock_mutex, nm_register_mutex_desc): new calls to facilitate debugging - of locking issues by printing out prettier information than g_mutex_lock - - Print out names of mutexes registered with nm_register_mutex_desc() - - (nm_try_lock_mutex): don't do the waiting thing when trying to lock, causes - us to seemingly block here for too long - - * src/NetworkManager.c - src/NetworkManagerAPList.c - src/NetworkManagerDevice.c - - Convert to using nm_lock_mutex/nm_unlock_mutex rather than the glib variants - so we get better debug information printed - - * src/NetworkManagerDbus.c - - (nm_dbus_devices_handle_request): reduce usage of nm_device_need_ap_switch() - since it sometimes has locking side effects - - (nm_device_get_association_pause_value): Reduce 802.11a card pause value to 8s - from 10s - - (nm_device_need_ap_switch): If we can't acquire the scan lock, return saying - we don't need a switch. This gets called often enough that we can't block - until the scan mutex is acquired, because we'll block on device activation - and a few other things, which hangs main thread for too long. - - * src/NetworkManagerPolicy.c - - (nm_policy_auto_get_best_device): reduce the possiblity that - nm_device_need_ap_switch() will be called - -2005-02-02 Dan Williams - - * panel-applet/NMWirelessApplet.c - - Display name of wireless network we are connecting to or connected to - in the tooltip of the applet - -2005-02-02 Dan Williams - - * src/NetworkManagerDHCP.c - - Hopefully fix double-default-route problem by cleaning up the default - route added by DHCP code right before the DHCP transaction begins - -2005-02-02 Dan Williams - - * named/nm-named-manager.c - - Write out valid resolv.conf when we exit - -2005-02-01 Dan Williams - - Patch from Colin Walters: - * named/nm-named-manager.c - - Make multi-domain search options work - -2005-01-31 Dan Williams - - * info-daemon/NetworkManagerInfoDbus.c - - (nmi_dbus_nmi_message_handler): make sure 'dialog' exists before using it - - * src/NetworkManagerDevice.c - - (nm_device_new): Don't store the entire range struct, use only what we need - (which is currently avg_quality, max_quality, and frequencies). Also - zero device structure when we've free'd it to maybe expose errors down - the line. - - (nm_device_update_signal_strength): grab the scan mutex before getting - quality data from the card since quality will be useless during a scan. - Call updated wireless qual-to-percent function with values stored in - nm_device_new() earlier. - - Remove some unused functions (nm_device_get_max_quality(), nm_device_get_noise(), - nm_device_get_bad_crypt_packets()) - - (nm_device_activate_wireless_adhoc): use new frequency values we go in - nm_device_new() - - (get_initial_auth_method): always use the Auth method that's in the allowed - list if available. Problem was this: when the WEP key is wrong, NM will - try OS then SK modes, and then get stuck in SK mode after that. This - should reset it. - - (nm_device_wireless_process_scan_results): work with new qual-to-percent - function - - * src/NetworkManagerWireless.c - - (nm_wireless_qual_to_percent): try to make this function actually work and - mimic iwlib behavior. Use card's idea of quality divided by max_qual - if that's all present, otherwise fall back to signal-to-noise ratios. - -2005-01-29 Dan Williams - - * initscript/RedHat/NetworkManager - - Don't spit out sysctl stuff to console - - * libnm_glib/libnm_glib.c - - (libnm_glib_init): call dbus_g_thread_init() - - * panel-applet/NMWirelessAppletDbus.c - - (nmwa_dbus_worker): call dbus_g_thread_init() - - * src/NetworkManager.c - - (main): call dbus_g_thread_init() - - * src/NetworkManagerAPList.c - - (nm_ap_list_print_members): use LOG_ERR instead of LOG_DEBUG - so we can actually see what's there in a normal syslog - - * src/NetworkManagerDevice.c - - (nm_device_activate_wireless): print out the "waiting for access point" - message only once, then say what access point we actually got after - the wait. - - (nm_device_need_ap_switch): If a scan is in progress when we're in this - function, wait until the scan is done. Scans may change the ESSID of - the card, making this function think we need to switch access points - - (nm_device_wireless_process_scan_results): for artificial access points - don't check against the card's ESSID, but the best_ap's ESSID. This - prevents collisions with the scanning code, which may change the card's - ESSID and cause the access point to get dropped from the device's AP - list. Also increase the keep-around time to 2m from 60s since the max - scan interval could be 60s in some cases. - - * src/NetworkManagerPolicy.c - - (nm_policy_activation_finish): Don't add invalid MAC addresses to GConf - - (nm_policy_allowed_ap_list_update): When we update, make sure we copy over - the new properties and ESSIDs to the device's AP list. Fixes some races - between NM and NMI. - -2005-01-27 Dan Williams - - * info-daemon/NetworkManagerInfoDbus.c - - (nmi_dbus_add_network_address): if the network doesn't yet exist in - GConf, make a minimal entry for it (essid & timestamp) - - * src/NetworkManagerAPList.c - - (nm_ap_list_populate_from_nmi): Don't try to grab network data if - NetworkManagerInfo isn't running - - * src/NetworkManagerDbus.[ch] - - (nm_dbus_nmi_is_running): new function - - * src/NetworkManagerDevice.c - - (nm_device_wireless_force_use): Don't set the created AP's MAC - address to garbage. - - * src/NetworkManagerPolicy.c - - (nm_policy_activation_finish): On successful activation, make sure - the "best" AP has a MAC address, and don't tell NMI to add the - current AP's MAC address to GConf if the AP is an Ad-hoc AP. - - (nm_policy_allowed_ap_list_update): Update a wireless card's "best" - access point after refreshing our allowed list if it doesn't already - have a "best" access point. - -2005-01-25 Dan Williams - - * panel-applet/NMWirelessAppletDbus.c - - (nmwa_dbus_filter): Fix dbus 0.23 ServiceOwnerChanged checks - so we check for NM_DBUS_SERVICE rather than not for it - - * libnm_glib/libnm_glib.c - - (libnm_glib_dbus_filter): Fix for dbus 0.23, trapping - ServiceOwnerChanged signal - -2005-01-25 Dan Williams - - * configure.in - - Check DBUS version in configure, and set the C macros - DBUS_VERSION_[MAJOR,MINOR,MICRO] - - * info-daemon/NetworkManagerInfoDbus.c - - Remove #if 0-d section of code that quit NMI if NM went away. - - * panel-applet/NMWirelessAppletDbus.c - - Trap the "ServiceOwnerChanged" signal that's new in dbus-0.23 - - * src/NetworkManager.c - src/NetworkManagerMain.h - src/NetworkManagerDbus.c - - Trap the "ServiceOwnerChanged" signal that's new in dbus-0.23 - - Make updating of our Allowed Wireless Network lists from NMI - an idle function in the main thread now, with a high priority. - -2005-01-24 Dan Williams - - * panel-applet/gtkcellview.[ch] - panel-applet/menu-info.c - - Fix GTK version checks to be <= rather than < - - * test/Makefile.am - - Include the libtool archive of libnm_glib rather than - trying to pull in the .so - -2005-01-24 Dan Williams - - * src/NetworkManagerDevice.c - src/NetworkManagerDevicePrivate.h - - Block nm_device_new() until our device's worker thread has had a - chance to start up. Fixes a race between main thread and worker - thread starting that caused activation requests to get lost. - -2005-01-24 Dan Williams - - * initscript/RedHat/NetworkManager - - Remove the ### BEGIN INIT INFO section, which caused chkconfig - to add the NM startup script at priority 50, which was - way too early - -2005-01-24 Colin Walters - - * named/named.conf: Use any port for query source instead of - restricting to port 53. - -2005-01-24 Dan Williams - - * initscript/RedHat/NetworkManager - - Remove the ### BEGIN INIT INFO section, which caused chkconfig - to add the NM startup script at priority 50, which was - way too early - -2005-01-24 Dan Williams - - Patch from Tom Parker - * Fix up compile warnings & errors in the wireless applet - -2005-01-24 Dan Williams - - * panel-applet/NMWirelessApplet.c - - Convert 24x24 icons back to 22x22 and use the 22x22 ones - -2005-01-24 Dan Williams - - * panel-applet/gtkcellview.[ch] - - Only compile these files for GTK 2.4 or lower, since - GtkCellView is now public in GTK 2.6. Fixes crasher - when choosing "Other Wireless Networks" from the panel - applet menu - -2005-01-21 Dan Williams - - * src/NetworkManager.c - - Daemonize earlier so that glib doesn't get confused (?) - -2005-01-21 Dan Williams - - * panel-applet/NMWirelessApplet.[ch] - panel-applet/NMWirelessAppletDbus.c - panel-applet/menu-info.c - src/NetworkManagerDevice.c - - Disable wired devices in the menu when they have no link. - -2005-01-21 Dan Williams - - * Cache last-known-good wireless authentication method in - NetworkManagerInfo, and use that method first during - wireless device activation. Should speed up devices that - need Shared Key authentication method since Open System is - now the default. - - * Remove the hack to not do full activation on wired connections - that are active when we launch, it causes too many problems - with name resolution and was a hack in the first place. - - * Re-work wireless device activation again somewhat to have a - clearer chain of events and to use last-known-good - authentication method of the access point. Also provide - better status throughout activation to ensure the applet - can tell the user exactly what's going on. - - * Remove the "find wireless network" code and now simply attempt - to activate with that access point. This reduces the delay - between selecting "Other wireless Network" and actually - connecting to that network. - - * Correctly stop the device's worker thread when its removed. - -2005-01-21 Dan Williams - - * dhcpcd/client.c - - Clean up some of the debug messages - -2005-01-21 Dan Williams - - * Add new icons, more frames of animation - * Remove some hacks to get the panel applet to display correct - status, an NM update will soon follow that will fix the - real issue. - -2005-01-19 Kjartan Maraas - - * panel-applet/NMWirelessApplet.c: #include must be - the first include for working i18n. Also, don't include it in .h files - * panel-applet/NMWirelessApplet.h: Same - * panel-applet/NMWirelessAppletOtherNetworkDialog.c: Same - * panel-applet/menu-info.c: Same - -2005-01-18 Dan Williams - - * dhcpcd/client.c - - Remove some debug messages - - Wrap others in #ifdef DEBUG/#endif - - * src/NetworkManager.c - - Remove some debug messages - - Clarify some debug messages - - Remove code related to old single-thread wireless scanning - - * src/NetworkManagerAP.[ch] - - New AP property "last_seen" to track how recently an AP was - found in a scan - - Start using 'const' more in function arguments - - * src/NetworkManagerAPList.[ch] - - (nm_ap_list_merge_scanned_ap): new, selectively update attributes - of an AP found in an AP list from a source AP, or if not found - in the list add the source AP - - (nm_ap_list_combine): remove, no longer needed - - * src/NetworkManagerDevice.c - - Each device now has a "worker" thread from start to end of its life. - Scanning for wireless devices now happens in that thread, - not in a single "wireless scanning thread" for all devices as - previously. Activation consists of adding an idle handler to the - thread's main loop/context, which gets run at the next available - opportunity. - - Wireless scanning is also simplified, there is now only one list of - access points per wireless device, and APs older than 60s are - removed from the list. Previously, we kept results for the last - 3 scans and merged whole lists, which was complicated. - - Cleaned up activation debug messages. - - Wireless activation and access-point search routines now use Open System - authentication before trying Shared Key. - - Removed some code in nm_device_update_best_ap() that could cause cards - to loose their link to the access point. - - Scanning now uses a backoff algorithm, where the inverval becomes - progressively longer between scans when the list of scanned access - points doesn't change. A change will revert to the shortest scan - interval (20s). - - * src/NetworkManagerWireless.[ch] - - Remove code related to old single-thread wireless scanning - -2005-01-18 Colin Walters - - * src/NetworkManagerDHCP.c (set_nameservers): Free and clear list - of older nameservers. - -2005-01-18 Colin Walters - - * named/nm-named-manager.c (generate_named_conf): Many fixes - to config file generation. - (safer_kill): Remove, was too much trouble for little gain. - (nm_named_manager_start): Run named as NM_NAMED_USER. - - * configure.in: Add option --with-named-user. - -2005-01-14 Colin Walters - - Patch from ed@catmur.co.uk (Ed Catmur) - - * named/nm-named-manager.c: Add "context" property. - Use it to add child watch source in specific GMainContext. - - * src/NetworkManager.c (nm_data_new): Initialize - named with correct main context. Start named only - after forking. - -2005-01-14 Colin Walters - - * named/nm-named-manager.c (generate_named_conf): Write config - and pid files into NM_NAMED_DATA_DIR; this allows things to - work better with FC3 named SELinux policy. Also fix up silly - format error. - - * configure.in: Add --with-named-dir option. - -2005-01-14 Colin Walters - - * configure.in: Make named support require passing --with-named. - - * named/nm-named-manager.c: Support writing resolv.conf directly - without running named. - -2005-01-13 Dan Williams - - * named/nm-named-manager.c - - Use syslog(LOG_WARNING) rather than g_warning() (gnome.org #163961) - - * src/NetworkManagerDevice.c - - Rework wireless link detection code to be more reliable - -2005-01-12 Dan Williams - - * initscripts/RedHat/NetworkManager - - Change initial level to "-" rather than "345" so that - we don't activate ourselves by default on install - -2005-01-12 Dan Williams - - * libnm_glib/ - - Client library for applications using glib - - * configure.in - various Makefiles - - Split NM_CFLAGS and NM_LIBS into separate variables - like DBUS_*, HAL_* and GLIB_* - - * src/NetworkManager.c - src/NetworkManagerMain.h - - (nm_schedule_status_signal_broadcast): at the earliest convenience, - broadcast a status changed signal over DBUS from the main thread. - Still unused anywhere for the moment. - - Patch from j@bootlab.org - * panel_applet/NMWirelessAppletDbus.c - src/NetworkManagerDbus.c - - Correct INT32->UINT32 mistmatch between NM and the panel applet - for the "getMode" method call - -2005-01-10 Dan Williams - - * src/NetworkManagerDevice.c - - Minor fixups & corrections to "auto" frequency mode, make it - less chatty with syslog - -2005-01-10 Dan Williams - - * src/NetworkManagerDevice.c - - Implement "auto" frequency/channel support, since cards like Atheros - can't use other frequencies at all when you've told it to use a - specific one, even for scanning. - - Grab the scan mutex around places where we can't tolerate wireless - settings changing underneath us, like nm_device_wireless_network_exists() - and nm_device_activate_wireless() - - * src/NetworkManagerWireless.c - - Back scan interval off to 20s instead of 14s - -2005-01-09 Dan Williams - - * src/NetworkManagerDevice.c - - Don't set mode/freq/bitrate if that mode/freq/bitrate is - already set. Stops some drivers like Atmel from continually - reloading the firmware, which they do upon every configuration - change. - -2005-01-09 Dan Williams - - * dhcpcd/client.c - - Use correct timeout value - - * info-daemon/NetworkManagerInfoDbus.c - src/NetworkManagerDbus.c - - Consolidate communication between NM and NMI by doing only 1 dbus - method call to get Wireless Network info from NMI instead of 6 - - * src/NetworkManager.c - - Make sure to cancel activation when we receive a SIGTERM, otherwise - when we didn't have an AP to use, we'd wait for one forever without - quitting - - * src/NetworkManagerDevice.c - - nm_device_activation_cancel(): Fix a race between dhcp and quitting - activation, dhcp might not have started yet but we don't quit activation - before starting it, so the quit signal gets lost - -2005-01-07 Dan Williams - - * dhcpcd/client.c - - Rework the DHCP client code to be much less chatty when - it receives non-DHCP UDP packets during the DHCP run - (reported by and preliminary patches from Bill Moss) - - * Move wireless scanning to a separate thread. This thread forwards the - results to the main thread when done where they are integrated into - the device's access point lists. This keeps the main thread (which - does all the DBUS communication) from being blocked for long periods - of time by wireless scanning. - - * Make state modification an idle routine in the main loop, and trigger - state changes rather than polling for them. - - * src/backends/NetworkManagerGentoo.c - - Fix up invalid C90 code (reported by Christoph Ruessler) - - * src/NetworkManagerDevice.c - - Revert IPv6 patch for wired devices from 2004-12-22 for - router advertisements, causing problems and infinite loop - during "best" device determination due to link going up/down - (reported by Bill Moss) - - Apply patch from Peter Jones - * src/NetworkManagerDevice.c - - Shortcut for link-checking for ipw2x00 cards - - Split out association check into separate routine - -2004-01-05 Colin Walters - - * named/named.conf: Add PID_FILE. - - * named/nm-named-manager.c: Always generate a pid - file, since older BIND versions don't support - "pid-file none". - -2005-01-01 Satoru SATOH - - * configure.in (ALL_LINGUAS): Added ja (Japanese). - -2004-12-22 Dan Williams - - * src/NetworkManagerDevice.c - - Silently fail when setting bitrate doesn't work - - - Patches from j@bootlab.org: - * src/backends/NetworkManagerDebian - - Update backend to match functionality in RedHat backend - * src/NetworkManagerDevice.c - - Take down then bring up wired devices after connection so - they send out ipv6 router advertisements - -2004-12-21 Colin Walters - - * panel-applet/NMWirelessAppletDbus.c (nmwa_dbus_update_devices): Correctly - test for NETWORK_MODE_ADHOC; spotted by: Greg . - -2004-12-21 Colin Walters - - * configure.in: Correct named detection. - -2004-12-21 Colin Walters - - * src/NetworkManager.c (nm_data_new): Initialize named. - Also, set up a signal handler for SIGINT/SIGTERM, and exit - the mainloop when these signals are received. - (nm_data_free): Unref named. - (sigterm_handler, sigterm_pipe_handler): New functions for - exiting mainloop. - - * src/NetworkManagerMain.h (NMData): Add signal handling and - nameserver bits. - - * src/NetworkManager.c (nm_device_unref): Quit device mainloop on - unref. - - * src/NetworkManagerDHCP.c (set_nameservers): New function; - set nameservers from DHCP response data. - (set_domain_search): Set domain search from DHCP response. - (nm_device_dhcp_configure): Invoke them. - - * src/NetworkManagerSystem.c - (nm_system_device_update_resolv_conf): Delete. Deleting - code is totally sweet. - - * src/Makefile.am (NetworkManager_LDADD): Add libnamed. - - * named/nm-named-manager.h, named/nm-named-manager.c: New files; - implements an object which controls a nameserver. Currently - uses bind 9. - - * configure.in: Check for named. - - * Makefile.am (SUBDIRS): Add named dir. - - * named/named.conf: New template config file. - -2004-12-20 Colin Walters - - * src/NetworkManagerPolicy.c (nm_policy_get_best_device): Fix usage of '==' - instead of '='. - -2004-12-17 Dan Williams - - * Ad Ad-Hoc networking mode support. In Ad-Hoc mode, we only try to get - link-local addresses instead of doing DHCP. - - * In the panel applet, there's a new "Create new Wireless Network..." item - - * The panel applet also sticks around now even if NetworkManager dies, but - it doesn't hide its icon when NM isn't around. Not hiding the icon is - a bug, I'll fix that later. - - * We also don't use 'nscd' anymore in the RH backend, it was impeding name - lookups after a switch rather than actually doing them. - - * Clean up some of those warnings in nm_ap_list_* functions - - * Delay between scans changed to 15s instead of 10s - -2004-12-15 Dan Williams - - Patch from Tom Parker - * Add autoip/Link Local Addressing support when we fail to get a DHCP - address - - * Longer pause after setting ESSID on cards that support a larger number - of channels to give the card time to find the right channel - - * Add system hook to restart mDNSResponder (or whatever the local implementation - of Multicast DNS is) when we activate interfaces - -2004-12-15 Dan Williams - - * Rework the DHCP code again to revert to sending full ethernet frames - rather then relying on the kernel to do the right thing with our - packets. - -2004-12-06 Dan Williams - - * dhcpcd/client.c - - Fix some minor errors in dhcp_handle_transaction() that caused - unexpected early timeouts of DHCP transactions - - * dhcpcd/client.h - - DHCP retransmit time from 4s -> 5s - -2004-12-05 Dan Williams - - * Major rework of the DHCP code, taking some cues from pump. We don't - write raw Ethernet packets anymore, which simplifies the code quite - a bit. The new code should be more robust, not hang in recvfrom() - as much, and generally work better. This also means that we need - to force HAL/dbus to use a created GMainContext rather than the - default context, since having the DHCP renew/rebind thread using - its own GMainContext seemed to give dbus a fit. There is also more - debugging information printed from the DHCP loop to help with future - problems. - - * Also, if the DHCP server doesn't give us the "routersOnSubnet" option, - assume that the default gateway should be the DHCP server. - - Patch from Matthew Schick - * src/backends/NetworkManagerGentoo.c - - Fix compilation error due to missing "ip4_broadcast" - -2004-12-03 Dan Williams - - * initscript/Makefile.am - * initscript/Debian/NetworkManager - * initscript/Gentoo/NetworkManager - * initscript/RedHat/NetworkManager - * initscript/NMLaunchHelper.c - - Remove NMLaunchHelper, if you need to wait until the network - comes up, use the dead code from CVS. - -2004-12-01 Colin Walters - - * configure.in: Suck in gcc warnings code from Rhythmbox, - but use fewer default flags, and in particular add -Wno-unused, - since the codebase has a lot of unused variables. - - * test/nmtestdevices.c (create_device): - * test/nminfotest.c (get_network_string_property) - (get_networks_of_type): - * test/nmclienttest.c (main): - * src/NetworkManagerDbus.c (nm_dbus_create_error_message): - * initscript/NMLaunchHelper.c (get_nm_status): - * info-daemon/NetworkManagerInfoPassphraseDialog.c (update_button_cb): - * info-daemon/NetworkManagerInfoDbus.c (nmi_dbus_create_error_message): - Fix declarations after statements. - -2004-12-01 Colin Walters - - * info-daemon/NetworkManagerInfoDbus.c (nmi_dbus_return_vpn_password): New method. - (nmi_dbus_get_vpn_userpass): New method. - (nmi_dbus_nmi_message_handler): Invoke it. - - * info-daemon/NetworkManagerInfoDbus.h (nmi_dbus_return_vpn_password): Prototype. - - * info-daemon/NetworkManagerInfoVPN.h, - info-daemon/NetworkManagerInfoVPN.c: New files; responds - to requests for VPN passwords. - - * configure.in (GNOME_KEYRING_LIBS): Check for gnome-keyring. - -2004-12-01 Colin Walters - - * test/nmtestdevices.c, test/nmclienttest.c: Add missing - includes. - -2004-12-01 Colin Walters - - * panel-applet/NMWirelessAppletDbus.c - (nmwa_dbus_update_active_device_strength): Fix missing - return value. - -2004-12-01 Colin Walters - - * panel-applet/NMWirelessApplet.c: Add missing include. - -2004-12-01 Colin Walters - - * src/NetworkManagerWireless.c (nm_wireless_qual_to_percent): - Remove useless CLAMP (); the value is unsigned, and the case tests - qual->qual < 100, so the value must always be between 0 and 100. - -2004-12-01 Colin Walters - - * dhcpcd/buildmsg.c, dhcpcd/dhcp_test.c: Add missing includes. - -2004-11-22 Colin Walters - - * src/backends/NetworkManagerRedHat.c (nm_system_update_dns): Run - "nscd -i hosts" to invalidate the host cache instead of restarting nscd, - which is essentially a noop since nscd caches hosts on disk too. - -2004-11-22 Colin Walters - - * src/Makefile.am (NetworkManager_SOURCES): Add - NetworkManagerDevicePrivate.h. - -2004-11-22 Dan Williams - - * src/NetworkManagerDevicePrivate.h - - Split out the NMDevice struct to a different file so that stuff like - NetworkManagerDHCP.c and NetworkManagerSystem.c can use it - - * dhcpcd/client.c - - fprintf->syslog - - (dhcpSendAndRecv): do non-blocking sends and receives, and check to see if we - need to cancel the dhcp request during the send and recv - - * dhcpcd/client.h - - Move the DHCP option enum to dhcpcd.h - - * src/NetworkManagerDHCP.c - - Split out the actual IP/netmask/etc setting code - - New Renew/Rebind functions - - New timer setup function for renew/rebind operations - - * src/NetworkManagerDevice.c - - For device activation, if we are using DHCP then keep the activation thread - alive until device deactivation. We need to renew/rebind the DHCP address - after the T1 (renew) and T2 (rebind) times have expired. - - Increase some timeouts after bringing wireless cards up/down - -2004-11-17 Dan Williams - - * Cache access point MAC addresses in NetworkManagerInfo after you've explicitly - connected to them. Then, after a scan, match up non-ESSID-broadcasting access - points with any cached MAC addresses from NetworkManagerInfo. Allows us to - show known access points that don't broadcast their ESSID in the menus without - any user intervention whatsoever. - - * info-daemon/NetworkManagerInfoDbus.c - - (nmi_dbus_get_network_addresses, nmi_dbus_add_network_address): new functions - for dbus method calls "getNetworkAddresses" and "addNetworkAddress" - - * src/NetworkManagerAP.[ch] - - Add a "user_addresses" data member to the NMAccessPoint structure - - (nm_ap_get_user_addresses, nm_ap_set_user_addresses): new functions for accessing - the user_addresses data member - - * src/NetworkManagerAPList.c - - (nm_ap_list_get_ap_by_address): check user_addresses list too, instead of just - the AP's reported address - - (nm_ap_list_update_network): grab the user_addresses list from NetworkManagerInfo - - * src/NetworkManagerDHCP.c - - Increase DHCP timeout from 25s -> 30s - - * src/NetworkManagerDbus.[ch] - - (nm_dbus_get_network_addresses, nm_dbus_add_network_address): have NMI get/set - user addresses - - * src/NetworkManagerDevice.c - - (nm_device_set_wireless_config): bring down the interface, wait 4s, bring it up, - wait 2s, then configure it. Sometimes Prism54 cards will freeze up with - "mgnt tx queue full", seemingly in response to NM controlling the card too much. - So, we take the card down to clear it out. - - (nm_device_do_normal_scan): Copy over AP ESSIDs from the allowed access point list - too, since that's where the user_addresses are - - * src/NetworkManagerPolicy.c - - (nm_state_modification_monitor): Tell NMI to add an AP's hardware address to - that wireless networks' user_addresses list upon successful activation - -2004-11-16 Dan Williams - - * src/NetworkManagerDevice.[ch] - - (nm_device_clear_activation_fail): new function - - * src/NetworkManagerPolicy.c - - (nm_state_modification_monitor): clear the activation_failed flag on devices - when we've dealt with the failure so the user doesn't get failure-dialog-spammed - -2004-11-16 Dan Williams - - * src/NetworkManagerDevice.c - - (nm_device_activate_wireless): Unref best_ap upon success so we don't - leak the structure, better updating of now_scanning status - - (nm_device_wireless_network_exists): Rewrite for better/faster checking - -2004-11-15 Dan Williams - - Major rework of link detection code. We now use DHCP - as part of the link detection which proves to be much more robust, - and also supports Open System authentication for wireless networks. - - We no longer use external DHCP client programs. Instead, we use - our own DHCP client, based on substantially reworked bits of 'dhcpcd' - which was written by: - Yoichi Hariguchi - Sergei Viznyuk - http://www.phystech.com/download/ - It resides in the "dhcpcd" directory and was refactored into a general - purpose DHCP client library by me. - - Also misc fixes (CPPFLAGS->AM_CPPFLAGS, move some stuff around), - move src/backends/NetworkManagerSystem.h -> src/NetworkManagerSystem.h - -2004-11-15 Dan Williams - - Patch from Tom Parker : - - * src/NetworkManagerDevice.c - - Less output to console when no access - points are found during a scan - -2004-11-15 Dan Williams - - Patch from Tom Parker : - - * src/backends/interface_parser.c - - Use g_strdup () - - Check for inp == NULL - - use syslog () - -2004-11-13 Colin Walters - - Patch from Tom Parker : - - * src/Makefile.am (CPPFLAGS): Switch to AM_CPPFLAGS. - - * src/backends/NetworkManagerRedHat.c: Switch to - including shvar.h instead of shvar.c. - - * src/backends/NetworkManagerDebian.c: Don't include - interface_parser.c in source file. - - (libnmbackend_la_SOURCES): Don't include shvar.[ch] - and interface_parser.[ch]. - * src/Makefile.am (libnmbackend_la_SOURCES) : - Include shvar.c and shvar.h here. - (libnmbackend_la_SOURCES) : Include - interface_parser.c and interface_parser.h here. - -2004-11-12 Colin Walters - - * configure.in: Strip out TARGET_DISTRO and - SYSTEM_BACKEND_FILE variables. Switch to Automake - conditionals. - - * src/Makefile.am (noinst_LTLIBRARIES): Add libnmbackend.la. - (libnmbackend_la_SOURCES): Use Automake conditionals - to add distro-specific files. - - * initscript/Makefile.am (SUBDIRS): Update to - use conditionals. - -2004-11-12 Colin Walters - - Patches from j bootlab org - - * src/Makefile.am (EXTRA_NetworkManager_SOURCES): - Add interface_parser.[ch]. - - * src/backends/NetworkManagerDebian.c (nm_system_device_run_dhcp): Invoke - dhclient with "-lf /var/lib/dhcp/dhclient-%s.leases". - -2004-11-12 Colin Walters - - * info-daemon/NetworkManagerInfoDbus.c (nmi_dbus_service_init): Delete - call to nmi_dbus_is_running too, not necessary anymore. - * info-daemon/NetworkManagerInfoDbus.c: Include stdlib.h to - pick up exit(). - -2004-11-11 Colin Walters - - * info-daemon/NetworkManagerInfoDbus.c (nmi_dbus_is_running): - Delete. - (nmi_dbus_service_init): Call dbus_bus_acquire_service with - the DBUS_SERVICE_FLAG_PROHIBIT_REPLACEMENT flag, and - then check the result for DBUS_SERVICE_REPLY_SERVICE_EXISTS. - This avoids a race condition that made it pretty easily - possible to get two NetworkManagerInfo daemons running. - -2004-11-11 Colin Walters - - * src/NetworkManager.c (main): Use daemon(3). - - * info-daemon/NetworkManagerInfo.c (main): Ditto. - - * dispatcher-daemon/NetworkManagerDispatcher.c (main): Ditto. - -2004-11-10 Dan Williams - - Patches from j bootlab org - * src/NetworkManagerDevice.c - - (nm_device_activate_wireless): wait 5 seconds before attempting to detect - whether the card has a link or not, some cards are slow - - (nm_device_activation_configure_ip): make ipv6 work a bit better - - * info-daemon/NetworkManagerInfoPassphraseDialog.c - - Disable the "Login" button on the passphrase dialog until the user - enters a valid passphrase or key - - Patches from Tom Parker - * src/backends/NetworkManagerDebian.c - - Add static IP support to the debian backend - - * src/backends/interface_parser.[ch] - - Parse debian interface config files - -2004-11-08 Dan Williams - - * src/NetworkManagerDevice.c - - Some random fprintf->syslog conversions - - (nm_device_wireless_network_exists): double-check for network - - (nm_device_find_and_use_essid): Copy over encryption key no matter what - - * src/NetworkManagerWireless.[ch] - - (nm_wireless_[128|64]bit_ascii_to_hex): make "ascii" argument unsigned again - so that the binary->ascii conversion works (if unsigned, the bitshift - will fill with zeros, which is what's required). Also mask bitshift - result with 0xF for futher assurance. - -2004-11-06 Dan Williams - - * src/NetworkManagerUtils.c - - (nm_get_wireless_driver_support_level): default to - FULLY_SUPPORTED rather than UNSUPPORTED, forgot to - flip this when changing from whitelist->blacklist of - wireless drivers - -2004-11-05 Dan Williams - - Patch from Robert Paskowitz: - * src/backends/NetworkManagerGentoo.c - - Update static IP config code - -2004-11-05 Dan Williams - - * info-daemon/NetworkManagerInfoDbus.c - src/NetworkManagerDbus.[ch] - src/NetworkManagerDevice.c - - Keep track of the # of attempts to get the WEP key - from the user and pass that along to the info daemon - -2004-11-05 Dan Williams - - * src/NetworkManagerUtils.c - - Blacklist wireless cards rather than whitelisting them. - - Grab driver name from HAL rather than trying to find it - ourselves. - -2004-11-03 Dan Williams - - * panel-applet/NMWirelessAppletOtherNetworkDialog.c, - - Disable OK button until valid data is entered - for encryption stuff too - - * panel-applet/NMWirelessApplet.c - - Report card strength for current AP if the card - doesn't report strength data for scanned access - points - - * src/NetworkManagerDevice.c - - Smooth out cards reported quality, Atmel card was - intermittently reporting no quality data but soon - recovers - - * src/NetworkManagerWireless.c - - Better quality data percentage calculation. Atmel - cards (mine at least) seem to report the quality - in percentage format already, so honor that - - Patch from - * NetworkManager.h - info-daemon/NetworkManagerInfoPassphraseDialog.c - info-daemon/passphrase.glade - panel-applet/NMWirelessAppletOtherNetworkDialog.c - panel-applet/essid.glade - src/NetworkManagerAP.c - src/NetworkManagerDevice.c - src/NetworkManagerWireless.[ch] - - Support ASCII WEP keys, in both 40/64 bit and 104/128 bit - -2004-11-03 Dan Williams - - * src/NetworkManagerDevice.[ch] - - (nm_device_set_enc_key): Add parameter to set Authentication - Mode (Open System, Shared Key, or None). We're still using - Shared Key for now though. - -2004-11-02 Bryan Clark - - * panel-applet/menu-info.c: change from bold text to light - colored, may cause problems with some themes, i've tested a lot - and they seem fine. - - * panel-applet/NMWirelessApplet.c: fix strength tooltip - -2004-11-01 Colin Walters - - * src/NetworkManagerWireless.h, src/NetworkManagerWireless.c - (nm_wireless_128bit_key_from_passphrase): Add const. - - * src/NetworkManagerAP.h, src/NetworkManagerAP.c - (nm_ap_set_enc_key_source): Add const. - -2004-11-01 Colin Walters - - * .cvsignore: Update. - -2004-10-29 Dan Williams - - * src/NetworkManagerDevice.c - - (nm_device_wireless_network_exists): Actually use the encryption - key we got from the applet when attempting to find a wireless network - - Don't bring devices down so much since on some cards it triggers - firmware hotplugs each time - - * src/NetworkManagerDbus.c - - (nm_dbus_nm_set_active_device): free the passphrase we may have gotten - from the caller - -2004-10-29 Dan Williams - - * src/NetworkManager.c - - (nm_hal_device_property_modified): unlock a locked active - wireless device when a wired connection gets a link. - (Means you'll switch to wired whenever you plug in no - matter what). - -2004-10-29 Dan Williams - - * panel-applet/NMWirelessAppletOtherNetworksDialog.[ch] - - New files, implement the "Other wireless network" dialog - - * panel-applet/NMWirelessApplet.c - - Move "other wireless network" dialog to separate file - - * panel-applet/NMWirelessAppletDbus.[ch] - - Take key and key_type paramaters for the set_device function - - * panel-applet/essid.glade - - Add UI bits for encryption settings - - * src/NetworkManagerDbus.c - - Retrieve key and key_type params for "setActiveDevice" method call - and pass them on - - unref AP returned from nm_device_get_best_ap() when needed - - * src/NetworkManagerDevice.c - - (nm_device_get_best_ap): ref the ap before returning it - - unref AP returned from nm_device_get_best_ap() when needed - - (nm_device_activate_wireless): add "ap" parameter so we don't - need to call nm_device_get_best_ap() here, it was pretty much - redundant anyway - - (AP_NEED_KEY): break second link check condition out into separate - function, and fix segfault when ap->enc_key_source was NULL - - (nm_device_find_and_use_essid): take key and key_type parameters and - pass them along to nm_device_wireless_network_exists(). If the - network does exist, set the passed-in key+key_type on the AP - - * src/NetworkManagerPolicy.c - - unref AP returned from nm_device_get_best_ap() when needed - -2004-10-28 Dan Williams - - * src/NetworkManagerUtils.c - - (nm_spawn_process): Fix a potential dereference of NULL - - Patches from Peter Jones: - - * src/NetworkManagerDevice.c - - (nm_device_test_wireless_extensions): Better check for - wireless devices - - * src/NetworkManagerUtils.c - - (nm_spawn_process): Pass in valid stdout and stderr so - executed programs don't randomly SIGPIPE and fail - - (nm_get_wired_driver_support_level): quash hal warning - when checking for USB ethernet device - -2004-10-27 Dan Williams - - * info-daemon/NetworkManagerInfo.c - info-daemon/NetworkManagerInfoDbus.c - info-daemon/NetworkManagerInfoPassphraseDialog.c - panel-applet/NMWirelessApplet.c - - Properly escape gconf keys - - * src/NetworkManager.c - - remove unused variables - - * src/NetworkManagerAP.c - - (nm_ap_new_from_ap): Don't redundantly set new APs - refcount since it got set in nm_ap_new() - - * src/NetworkManagerAPList.c - - (nm_ap_list_combine): Give up ownership of newly created - access points to the ap list, fixes memleak - - * src/NetworkManagerDevice.c - - Remove cached_ap_list4 member since its not really needed - - (nm_device_wireless_network_exists): Try to get correct - encryption status of a found AP if its already in our - device list - - (nm_device_do_normal_scan): Clean up scanning a bit, make - memory allocs/deallocs a bit clearer and shorter-lived - -2004-10-26 Ray Strode - - * panel-applet/NMWirelessApplet.c: - (custom_essid_item_selected): kill some compiler - warnings - -2004-10-26 John (J5) Palmieri - - * info-daemon/NetworkManagerInfoDbus.c - - (nmi_dbus_is_running): New function for determining if nmi is already running - - (nmi_dbus_service_init): exit if another instance of nmi is already running - -2004-10-23 Dan Williams - - * info-daemon/NetworkManagerInfoDbus.c - - Trap the "DeviceActivationFailed" signal - - * docs/NetworkManager DBUS API.txt - - Add "DeviceActivationFailed" signal - - * panel-applet/NMWirelessAppletDbus.c - - Quash the "NetworkManager service not available" message - - * src/NetworkManagerDbus.[ch] - - Add the "DeviceActivationFailed" signal - - * src/NetworkManagerDevice.c - - Add support for activation_failed flag - - Fix deadlock where activation thread didn't clean itself up, making - main thread still believe it was alive forever (didn't reset activation - flags like activating, just_activated, etc when IP configuration - failed) - - * src/NetworkManagerPolicy.c - - Implement logic for DeviceActivationFailed signal, and when activation fails - for wireless networks, try to fall back to some other access point - -2004-10-23 Dan Williams - - * panel-applet/NMWirelessApplet.[ch] - - Place the GtkMenuBar inside a GtkEventBox, and add the Event Box - to the applet object, so we can get tooltips - - Add tooltips (RH #136866) - - * src/NetworkManagerDevice.c - - When trying to find a wireless network, try to connect with encryption - turned on first, so that we can more accurately detect whether or not - we need to use encryption for the actual association later on - -2004-10-21 Dan Williams - - * Add some support for telling NetworkManagerInfo to tell the user - that they are using a device that's not fully supported - - * Fix some assertions in debug messages due to null access point args - -2004-10-21 Dan Williams - - * src/NetworkManagerDevice.c - - Don't try to activate/bring up/down unsupported - devices - - * src/NetworkManagerUtils.c - - Fix case of PCI ID checks for driver support levels - -2004-10-21 Dan Williams - - * NetworkManager.h - - New file, now contains commonly used structures and bits - for the dbus API of NetworkManager - - * Makefile.am - - Deliver NetworkManager.h to ${includedir}/NetworkManager - - * src/NetworkManager.h - - Rename -> src/NetworkManagerMain.c - - * Various fixups all around to use NetworkManager.h and new - src/NetworkManagerMain.h, remove redundant bits that got - moved into NetworkManager.h - - * src/NetworkManagerDevice.[ch] - src/NetworkManagerUtils.[ch] - src/NetworkManagerPolicy.c - src/NetworkManagerDbus.c - - Whitelist wireless drivers, and blacklist some wired - drivers. Also blacklist cipsec and ethernet-over-usb - devices at this time (RH #135722, RH #135648) - - Don't leak unsupported devices out over dbus, or allow - them to be set as the active device. Skip over them - during automatic device picking - - * test/nmclienttest.c - - Clean up the dbus code a lot - -Tue Oct 19 14:20:29 2004 Jonathan Blandford - - * configure.in: post release bump. - -Tue Oct 19 14:19:24 2004 Jonathan Blandford - - * configure.in: - * NEWS: Released NetworkManager-0.3.1 - -2004-10-18 Dan Williams - - Patches from Thom May: - * test/nmtestdevices.c - - Include - * src/backends/NetworkManagerDebian.c: - - (nm_system_device_run_dhcp, nm_system_device_stop_dhcp) - (nm_system_device_flush_routes, nm_system_device_flush_addresses) - Move to using g_strdup_printf rather than arbitrary buffers - - (nm_system_device_setup_static_ip4_config) Implement function. - - (nm_system_kill_all_dhcp_daemons) Use killall -q rather than killall - -2004-10-17 Dan Williams - - * info-daemon/NetworkManagerInfoDbus.c - - Display name of network in the "network not found" dialog - - * panel-applet/NMWirelessAppletDbus.c - - (nmwa_dbus_call_nm_method): new function replaces all other - nmwa_dbus_get_[string|string_array|int|boolean] methods - - nmwa_dbus_get_network_name() and nmwa_dbus_get_device_name() - consolidated into nmwa_dbus_get_object_name() - -2004-10-15 Dan Williams - - * src/NetworkManagerDbus.c - info-daemon/NetworkManagerInfoDbus.c - - Display an error dialog when the user tries to use an - "Other wireless network" that's not found. - -2004-10-15 Dan Williams - - * panel-applet/NMWirelessApplet.[ch] - - Fix up corner cases in applet state, making it - look more responsive. Change state to "connecting" when - the user is forcing a device too. - -2004-10-15 Dan Williams - - * src/NetworkManagerAPList.c - - (nm_ap_list_update_network): Disown AP after the list takes ownership - - * src/NetworkManagerDbus.c - - (nm_dbus_nm_set_active_device): Simplify the device setting logic - - * src/NetworkManagerDevice.c - - Disown APs after the device's AP list takes ownership - -2004-10-15 Dan Williams - - * panel-applet/NMWirelessApplet.c - - Update our applet state from the GUI thread - - * panel-applet/NMWirelessAppletDbus.c - - Greatly simplify the locking to make the GUI thread - smoother. Update a private copy of the device list - and active device and only when done talking to - NetworkManager turn it over to the GUI thread. - -2004-10-15 Dan Williams - - * src/NetworkManagerAP.[ch] - - Add "artificial" get/set functions, set for APs that - aren't discovered as part of a scan but instead - discovered by force-setting the ESSID - - * src/NetworkManagerDevice.[ch] - - (nm_device_wireless_network_exists): pass back whether - or not the discovered AP was encrypted. Also, try - falling back to encrypted mode on the card if unencrypted - association doesn't work - - (nm_device_find_and_use_essid): If the network requested - did in fact exists, but it wasn't in our scan list, add - an "artificial" entry for it. Some Cisco cards don't - see non-ESSID-broadcasting APs in their scan but can still - associate with them if you know the ESSID, this works around - that behavior - - (nm_device_do_normal_scan): Carry "artificial" APs over from scan - to scan if the card is currently associated with that AP - -2004-10-15 Dan Williams - - ---- We have a website ---- - http://people.redhat.com/dcbw/NetworkManager - - Patch from Robert Paskowitz: - * src/NetworkManager.c - - (main): Make sure we are run as root - * src/NetworkManagerDevice.c - - Fix type in ad-hoc setting function - - Patch from Thom May: - * src/backends/NetworkManagerDebian.c - - Make Debian backend compile again - -2004-10-14 Dan Williams - - * Tagged NetworkManager-0_3 - -2004-10-14 Dan Williams - - Patch from Robert Paskowitz: - * NEWS - src/NetworkManagerDevice.[ch] - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSlackware.c - - Add support for grabbing and using a broadcast address - from system config files - - Some Gentoo backend fixes for grabbing network config - - Fix LOG_WARN->LOG_WARNING - -2004-10-14 Dan Williams - - * NEWS: a few small fixes in the credits - -Thu Oct 14 19:12:58 2004 Jonathan Blandford - - * NEWS: prep for release. - -Thu Oct 14 16:47:12 2004 Jonathan Blandford - - * panel-applet/NMWirelessAppletDbus.c - (nmwa_dbus_update_device_wireless_networks): remove warnings. - -Thu Oct 14 16:40:39 2004 Jonathan Blandford - - * panel-applet/NMWirelessApplet.c (animation_timeout): Make - applet->state == APPLET_STATE_NO_NM animation. - - * panel-applet/NMWirelessApplet.c (custom_essid_item_selected): - set the text correctly. - -2004-10-14 Dan Williams - - * src/NetworkManager.c - - Only accept and manager 802.3 and 802.11 devices - - * src/NetworkManagerDbus.[ch] - - (nm_dbus_nm_set_active_device): move most of the actual activation - logic into NetworkManagerDevice.c - - (nm_dbus_network_status_from_data): new function - - (nm_dbus_signal_network_status_change): new function, unused for now - - (nm_dbus_nm_message_handler): use nm_dbus_network_status_from_data () now - - * src/NetworkManagerDevice.[ch] - - (nm_device_find_and_use_essid): new function. Search for, and if found use, - a random ESSID. - -2004-10-14 John (J5) Palmieri - - * info-daemon/NetworkManagerInfo.c - - (main): Added session management - -2004-10-14 Dan Williams - - * panel-applet/NMWirelessAppletDbus.[ch] - - Expose network_device_[un]ref() - - Expose wireless_network_[un]ref() - - (wireless_network_new_with_essid): new function, create and return - a wireless network with a particular essid - - * panel-applet/NMWirelessApplet.c - - Hook up the "other network" dialog to do something - -Wed Oct 13 19:31:53 2004 Jonathan Blandford - - * panel-applet/NMWirelessApplet.c: Add an essid dialog. It - doesn't work yet, but it looks okay. - - * panel-applet/icons/*png: Resize to 22x22 and install in the - right place. - -2004-10-13 Dan Williams - - * panel-applet/NMWirelessApplet.c - - Add function to print out applet_state in a readable - manner - - * src/NetworkManager.c - - (main): Don't segfault when nm_dbus_init() fails, we had - a left-over call to hal_shutdown() into which we passed NULL - - * src/NetworkManagerAP.c - - (nm_ap_set_essid): Allow NULL essids - - * src/NetworkManagerAPList.[ch] - - More use of nm_ap_list_[un]lock () - - (nm_ap_list_get_ap_by_essid): don't warn when looking for a NULL - network/essid, just return nothing. Also skip over NULL - essid access points in the list when searching - - (nm_ap_list_get_ap_by_address): new function - - (nm_ap_list_update_network): set the access point's key source to - NULL when the key returned from NetworkManagerInfo is NULL or - of 0 length - - nm_ap_list_update_keys() -> nm_ap_list_update_properties(), and - copy timestamp over too - - (nm_ap_list_copy_essids_by_address): new function, attempt to - find the correct ESSID for a blank-essid access point by searching - through another list and matching access point MAC addresses - - (nm_ap_list_diff): exclude blank-essid access points from the diffs - - * src/NetworkManagerDbus.c - - (nm_dbus_nm_set_active_device): deal with random networks the user - may specify. This is mainly for access points that don't - broadcast their essid. So if the user tells us to associate with - some random ESSID that's not in our access point list, we find - out if the access point does in fact exist (by attempting association - and then matching that access point's MAC address with the essid the - user gave us) and then we switch to it. - - (nm_dbus_devices_handle_request): don't add blank-essid access points - to the returned list of networks for the "getNetworks" method - - * src/NetworkManagerDevice.[ch] - - Extra debugging info for link detection - - (nm_device_ap_list_get_ap_by_address): new function, return an AP - based on MAC address - - (nm_device_get_path_for_ap): ignore blank-essid access points - - (nm_device_wireless_network_exists): new function, find out whether - a random ESSID exists by attempting to associate with it - - (nm_device_do_normal_scan): allow blank-essid access points in our - device list as long as they have an AP MAC address we can use. - Also send WirelessNetwork[Dis]Appeared signals for non-active - devices too. Lets the applet update more frequently. - - * src/backends/NetworkManagerGentoo.c - - Patch from: Robert Paskowitz - - Update backend code for Gentoo - - Implement nm_system_device_update_config_info () - - * test/nmclienttest.c - - (set_network_device): new function, takes a command-line argument - and tells NetworkManager to use that wireless network - -Wed Oct 13 John (J5) Palmieri - - * info-daemon/NetworkManagerInfo.c (nmi_spawn_notification_icon): Stop respawning - if the notification icon crashes 5 times within 5 seconds of each respawn - -Tue Oct 12 22:53:04 2004 Jonathan Blandford - - * panel-applet/NMWirelessApplet.c (nmwa_update_state): remove - g_print. - -Tue Oct 12 22:44:15 2004 Jonathan Blandford - - * panel-applet/NMWirelessApplet.h: Change the name of the icons. - - * panel-applet/NMWirelessApplet.c: (animation_timeout), - (nmwa_update_state), (nmwa_destroy), (nmwa_setup_widgets), - (nmwa_icons_free), (nmwa_icons_load_from_disk), (nmwa_icons_init): - Change the name of the icons. - - * panel-applet/menu-info.c: (nm_menu_wired_class_init), - (nm_menu_wired_expose_event), (nm_menu_network_class_init), - (nm_menu_wireless_class_init), (nm_menu_wireless_new), - (nm_menu_wireless_expose_event): Really bad hack to get the style - to draw in the right color. - -Tue Oct 12 John (J5) Palmieri - - * info-daemon/NetworkManagerInfo.c (main): Add child watch to respawn - Notification if it crashes - -Fri Oct 8 07:19:55 2004 Jonathan Blandford - - * panel-applet/NMWirelessAppletDbus.c (nmwa_dbus_get_double): - (nmwa_dbus_get_string): remove unused functions - - * panel-applet/NMWirelessApplet.c (nmwa_about_cb): - (nmwa_cancel_timeout), (nmwa_get_menu_pos), (nmwa_factory): - remove unused functions - - * panel-applet/NMWirelessApplet.c: Rewrite icon code. - -2004-10-12 Dan Williams - - * panel-applet/NMWirelessAppletDbus.c - - New functions: - wireless_network_new - wireless_network_copy - network_device_new - network_device_copy - - * src/NetworkManagerDevice.[ch] - - New functions: - nm_device_set_mode_managed - nm_device_set_mode_adhoc - - Use these functions where appropriate - - When creating a new wireless device, force the card - to managed/Infrastructure mode as soon as possible - -2004-10-12 Dan Williams - - * src/NetworkManagerDevice.c - - Force wireless cards into Infrastructure mode before we use them - -2004-10-12 Dan Williams - - * TODO - - Remove bit about static IP address support - - * src/NetworkManagerUtils.c - - (nm_spawn_process): Add some error reporting - - * src/NetworkManagerDevice.c - - (nm_device_activation_configure_ip): hook up to the static config - routines in the backends - - * src/backends/NetworkManagerRedHat.c - - (nm_system_device_update_config_info): use shvar.c routines to - parse the config file iformation, not our own - - (nm_system_device_setup_static_ip4_config): new function, based - heavily on 'ifup' script and 'ipcalc' tool code. Set up a device - with a static IP address and gateway - - * src/backends/shvar.[ch] - - Parser (filched from initscripts package) for ifcfg-* files - - * src/backends/NetworkManagerSystem.h - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerSlackware.c - - Stub nm_system_device_update_config_info() and nm_system_device_setup_static_ip4_config() - -2004-10-11 Dan Williams - - * TODO - - Remove bit about more robust AP diffing since I just implemented it - -2004-10-11 Dan Williams - - * src/NetworkManagerAP.c - - (nm_ap_new, nm_ap_new_from_ap): Don't crash when we don't have - enough RAM to allocate new AP structures, but return NULL instead - - * src/NetworkManagerAPList.[ch] - - (nm_ap_list_is_empty): new function - - (nm_ap_list_combine): new function, combine two access point lists - - (nm_ap_list_copy_keys): new function, copy keys from one list - into another - - * src/NetworkManagerDevice.[ch] - - Rename some functions to be clearer: - nm_device_get_best_ap_frozen -> nm_device_is_best_ap_frozen - nm_device_just_activated -> nm_device_is_just_activated - nm_device_activating -> nm_device_is_activating - nm_device_now_scanning -> nm_device_is_scanning - - Cache the last 4 scans so that the access point list is more stable. - We combine the lastest two scans and use that as the AP list, - and diff that combined list against the combination of the earliest - two cached scans for the WirelessNetworkAppeared/Dissappeared signals - -2004-10-08 John (J5) Palmieri - - * info-daemon/NWManagerInfo.h - - (struct NetworkManagerInfo): add shutdown_timeout GSource - - * info-daemon/NWManagerInfoDbus.c - - (shutdown_callback): new function - - (nmi_dbus_filter): Create a 30 second timeout until shutdown - if NetworkManager goes away. Kill the timeout - if NetworkManager restarts before the 30 seconds - are up. - - (nmi_dbus_service_init): - - call gtk_main_quit if NetworkManager is not running - - add filters to monitor dbus service creations and - deletions - -2004-10-08 John (J5) Palmieri - - * panel-applet/NMWirelessApplet.c - - (nmwa_update_state): Hide notification icon if we are only - showing one wired card and no wireless interfaces - (Red Hat Bug #134895) - - * panel-applet/NMWirelessAppletDbus.c - - (nmwa_dbus_filter): changed exit to gtk_main_quit () - - * info-daemon/NWManagerInfo.c - - (main): Terminated the notification_icon_cmd array with a NULL - -2004-10-08 Hendrik Brandt - - * configure.in (ALL_LINGUAS): Added de (German). - -2004-10-08 Dan Williams - - * src/NetworkManagerDevice.c - - Be a bit more robust about link checking, ie make sure that - the WEP key we were given actually has some data in it - -2004-10-08 Dan Williams - - * info-daemon/NetworkManagerInfo.c (main): - - Initialize GError object to NULL - -2004-10-08 Dan Williams - - * panel-applet/NMWirelessAppletDbus.c - - Die if NetworkManagerInfo dies, since it manages our lifetime - -2004-10-08 Dan Williams - - * info-daemon/NetworkManagerInfo.[ch] - info-dameon/NetworkManagerInfoDbus.[ch] - info-daemon/NetworkManagerInfoPassphraseDialog.[ch] - - Preserve original label text in the passphrase dialog so that - it actually gets updated with the new network name the next - time around. Previously, we were overwriting it so you'd get - the wrong network name to enter a key for - - Add a "Key Type" combo to the passphrase dialog, user selects - encryption key type now, type is stored in GConf too - - Adjust NM<->NMI DBUS protocol to pass the key type back to NM too - - * src/NetworkManagerAP.[ch] - - Remove all the encyption method magic. It's now set by the user - and NetworkManager retrieves the type of encryption key from - NetworkManagerInfo - - * src/NetworkManagerAPList.[ch] - src/NetworkManagerDbus.[ch] - - Adjust to new way of setting encryption key and method - - Pull encryption method down from NMI along with key - - * src/NetworkManagerDevice.[ch] - - Removed encryption method fallback magic as the method is now - determined by the user. This greatly simplifies the connection - logic. - - More robust connection/link logic. Besides removing the encryption - method fallback magic, check whether or not the card is receiving - invalidly encrypted packets, which usually indicates that we have - a bad WEP key set. - - Don't blindly forge ahead when DHCP fails (still not completely fixed) - - * test/nminfotest.c - - Test out new "Key Type" stuff in the NMI passphrase dialog - -2004-10-07 Dan Williams - - * info-daemon/NetworkManagerInfo.conf - - Allow root user to run NMI too - -2004-10-06 Dan Williams - - * src/NetworkManagerDevice.[ch] - src/NetworkManagerDbus.c - doc/NetworkManager DBUS API.txt - - Add a new status tag "scanning", which is set when there - is no active network connection, but NetworkManager is - looking for an access point to associate with - - * panel-applet/main.c - - Cast the applet appropriately for gtk_widget_show_all () - -Mon Oct 4 12:55:41 2004 Jonathan Blandford - - * panel-applet/eggtrayicon.[ch]: - * panel-applet/main.c: Add missing file - -2004-10-04 Dan Williams - - * src/NetworkManagerDevice.[ch] - - Add a slightly more robust method of determining if the WEP key - is correct or not, by checking the WEP-discarded packet count - on the card - - * info-daemon/NetworkManagerInfo.c - - (nmi_gconf_notify_callback): Fix GConf essid escaping, should - un-escape values we pull out rather than escaping them - -2004-10-03 Marcel Telka - - * configure.in (ALL_LINGUAS): Added sk. - -Fri Oct 1 18:26:03 2004 Jonathan Blandford - - * panel-applet/menu-info.c (nm_menu_wired_class_init): update look - and feel. We should be back to working, and have a good, clean - look. - -2004-09-30 Dan Williams - - * info-daemon/NetworkManagerInfo.c - info-daemon/NetworkManagerInfoDbus.c - test/nminfotest.c - - Escape ESSIDs in gconf - - * src/NetworkManagerDevice.c - - Fix pseudo-scanning to use netowrk list from info daemon - -Wed Sep 29 18:18:24 2004 Jonathan Blandford - - * configure.in: Add a temporary --enable-notification-icon. This - will prolly go away. - - * info-daemon/Makefile.am: - * info-daemon/NetworkManagerInfo.c: - * info-daemon/NetworkManagerInfo.h: Use a notification icon. - - * panel-applet/Makefile.am: - * panel-applet/NMWirelessApplet.c: Turn into a notification icon - * panel-applet/NMWirelessApplet.h: - -Tue Sep 28 16:35:20 2004 Jonathan Blandford - - * panel-applet/NMWirelessApplet.c: Fix deadlock. Add a separator - before 'select custom ESSID'. - - * panel-applet/menu-info.c: Start rewrite for better headers. Not - fully complete, but syncing in prep for merge. - - * panel-applet/icons/*png: New images - -2004-09-28 Dan Williams - - * src/NetworkManager.c - src/NetworkManagerDevice.c - src/NetworkManagerPolicy.c - - Don't blow away an active wired connection on startup - -2004-09-28 Bryan Clark - - Changes from J5 - - * info-daemon/NetworkManagerInfo.conf: fixed own permissions - - * info-daemon/NetworkManagerInfoDbus.c: added service name to - syslog output - -Wed Sep 22 14:19:48 2004 Jonathan Blandford - - * panel-applet/NMWirelessApplet.c: Only add essid's if we actually - have a wireless card. - -Wed Sep 22 14:05:48 2004 Jonathan Blandford - - * panel-applet/NMWirelessApplet.c: move the custom essid item. - Also, get the right device strings. - -Wed Sep 22 13:51:45 2004 Jonathan Blandford - - * panel-applet/menu-info.c (nm_menu_network_draw_indicator): Flip - the logic to make this right. - - * panel-applet/NMWirelessApplet.c (sort_networks_function): sort - devices so that wired networks are always first. - -2004-09-22 - - * initscript/Debian/.cvsignore: - * initscript/Slackware/.cvsignore: - Added new cvsignores for Makefile, Makefile.in - - * test/.cvsignore: - Added nmtestdevices - - * src/NetworkManagerDevice.c: - * src/NetworkManager.c: - Updated the wireless/wired HAL device strings from net.ethernet to - net.80203 or net.80211 depending on wired or wireless respectively - - * examples/python/NetworkManager.py: - s/Quality/Strength/ - - * examples/python/systray/network_tray.py: - Lots of little changes and fixes. been rotting for a while so I - figured I'd finally sync them all with CVS - -Tue Sep 21 18:05:34 2004 Jonathan Blandford - - * configure.in: Add graphics - - * panel-applet/Makefile.am: Add graphics - - * panel-applet/icons/*: Add graphics - - * panel-applet/NMWirelessApplet.c: Use new menu times to display - the icons fully lined up. - - * panel-applet/menu-info.c: - * panel-applet/menu-info.h: Add another menu type. - -Fri Sep 17 14:04:34 2004 Jonathan Blandford - - * panel-applet/NMWirelessApplet.c: Redo the menu item code. - - * panel-applet/menu-item.[ch]: Wireless menu item. - -2004-09-15 John (J5) Palmieri - - * info-daemon/NetworkManagerInfo.conf - - Created a more robust security policy for the DBus service - - everything is denied by default - - root can own and send to the service - - users logged in at the console can send to the service - -2004-09-13 Dan Williams - - * src/NetworkManagerDevice.c - - (nm_device_get_essid): use iw_get_basic_config() rather than - iw_get_ext (SIOCGIWESSID) since prism54 cards don't like - the latter - -2004-09-13 Dan Williams - - * TODO: fix typo - - * docs/NetworkManager DBUS API.txt - - Update for new signal strength changes - - * panel-applet/NMWirelessApplet.c - - Make panel icon show strength of the current connection - - Cleanups and memleak fixes - - * panel-applet/NMWirelessApplet.h - - Add data members for signal strength on devices and networks - - * panel-applet/NMWirelessAppletDbus.c - - Free more DBusErrors - - Update for new signal strength changes - - Make devices and networks more like real objects, use ref/unref methods - - Actually unlock the mutex when updating the active device - - * src/NetworkManagerAP.c - - Change AP functions and data members from "quality"->"strength" - - * src/NetworkManagerDbus.c - - Kill "getMaxQuality" and "getQuality" methods - - Add "getStrength" methods for Networks and Devices - - * src/NetworkManagerDevice.[ch] - - Add accessors for device strength - - Add functions to update strength for a device. Note that not all drivers - actually support signal strength for scanned access points (Atmel drivers - being one) - - Calculate signal strength for each AP during scan - - * src/NetworkManagerWireless.[ch] - - Add function to return signal strength % from a device and a raw quality struct - - * test/nmclienttest.c - - Update for new signal strength changes - -2004-09-11 Dan Williams - - * src/NetworkManager.c - - Fix race condition between initscripts and NM on card insertion - which could cause a card to keep an IP address and routes around - even when it was not the active device - - * src/NetworkManagerDbus.c - - Fix compile errors, free more DBusErrors - -2004-09-11 Dan Williams - - * docs/NetworkManager DBUS API.txt - - Add an explanation of NM's API - - * src/NetworkManagerDbus.c - - Free some more DBusErrors if needed - -2004-09-11 Dan Williams - - * panel-applet/NMWirelessApplet.c - panel-applet/NMWirelessAppletDbus.c - - Start using NetworkDevice/WirelessNetwork structures in more places - - Update for unified device/network forcing in NetworkManager - - * src/NetworkManager.c - - some code consolidation - - * src/NetworkManagerDbus.c - - (nm_dbus_nm_set_active_device): "setActiveDevice" now takes either one - or two arguments: the first is the NM ID of the device to switch to, - and the second (optional) argument is the ESSID of a wireless network - to use as well. - - Get rid of "setNetwork" method due to above change - - * src/NetworkManagerDevice.c - - (nm_device_new): perform scan and update best AP on device creation - - nm_device_activation_cancel_if_needed()->nm_device_activation_should_cancel() - - nm_device_activation_signal_cancel()->nm_device_activation_cancel(), and - spin waiting for cancellation to finish before returning - - * src/NetworkManagerPolicy.c - - Changes here clarify the situations in which a device switch occurs, and - make sure to keep using a forced device and network if the user gives - us one - - Remove old unused code - -2004-09-11 Martin Willemoes Hansen - - * configure.in: Added Danish (da) to ALL_LINGUAS. - -2004-09-09 Dan Williams - - * panel-applet/NMWirelessAppletDbus.c - - Pull fresh devices and networks from NM when wireless networks - change. Provides faster feedback of a forced wireless network - - * src/NetworkManagerDbus.c - - Return error when "getMaxQuality" is called on a wired device - - Make best_ap freezing actually work again, and signal cancellation - of activation if there's already a device activation when the user - freezes the best_ap - - * src/NetworkManagerDevice.c - - Don't clear out the best_ap for wireless devices when the link goes - down, that's done elsewhere - - Kill any dhcp daemons when cancelling device activation since they - may be stuck waiting for a DHCP address, and since we're cancelling - activation we don't care about that anymore - - * src/NetworkManagerPolicy.c - - Make sure to unref the device we ref earlier (we refed it to make sure - it stuck around during device activation and such) - - If we were going to change the best device, but its activating currently - (and therefore the change didn't occur due to the check earlier) - we mark the state changed to we come back to it later when device - activation has canceled and its no longer activating - - * src/backends/NetworkManagerRedHat.c - - SIGKILL dhcp daemons rather than SIGTERM-ing them - -2004-09-09 Bryan Clark - - * info-daemon/passphrase.glade: - set passphrase input to activates_default : True - - * examples/python/systray/network_tray.py - (network_tray.sort_networks): - - Added support for having wireless always scanning - -2004-09-09 Dan Williams - - NOTE: this commit changes the behavior of wireless devices in - NetworkManager. They are now up all the time, scanning all - the time. Only the active device has an IP address and routing - information set up however. Also, NetworkManager will no longer - opportunistically switch wireless networks when a better one - comes in range, it will remain associated with one wireless network - until that one drops out. - - * panel-applet/NMWirelessApplet.c - panel-applet/NMWirelessAppletDbus.c - - List all wireless cards and their respective networks - - * src/NMLoadModules - - Use full path to /sbin/ip - - * src/NetworkManager.c - - Keep wireless devices up all the time so they can scan - - * src/NetworkManagerDbus.c - - On a WirelessNetworkUpdate signal from NMI, don't update - the "best" AP - - * src/NetworkManagerDevice.c - - (nm_device_set_link_active): clear out the best ap for - wireless devices when the link is set to FALSE - - Scan on all wireless cards, all the time - - (nm_device_activation_worker): split out the wireless card - link-waiting code to a separate function - - Keep wireless cards up even if device activation fails - - Don't update the "best" ap as much - - * src/NetworkManagerPolicy.c - - Don't update the best ap when checking if its frozen, - let link checking clear out a frozen best ap for us - - * src/NetworkManagerWireless.c - - Scan on all wireless cards, all the time - -2004-09-09 Francisco Javier F. Serrador - - * configure.in: Added 'es' (Spanish) to ALL_LINGUAS. - -2004-09-09 Ankit Patel - - * configure.in: Added 'gu' (Gujarati) to ALL_LINGUAS. - -2004-09-09 Pablo Saratxaga - - * configure.in: Added Walloon (wa) to ALL_LINGUAS. - -2004-09-08 Bryan Clark - - * examples/python/NetworkManager.py: - added CONNECTED, CONNECTING, and DISCONNECTED states - added methods to return number of devices of a single type - - * examples/python/systray/network_tray.py: - did some tweaks to get the menu looking near what it is supposed - to look like. Also did a Airo card hack to make it show the - correct AP quality - -2004-09-08 Dan Williams - - * panel-applet/no-networkmanager.png - panel-applet/Makefile.am - panel-applet/NMWirelessApplet.c - - Add a "NetworkManager not running" icon and use it - - Use new consolidated GConf keys rather than Preferred/Trusted - - * TODO: update - - * info-daemon/NetworkManagerInfo.c - info-daemon/NetworkManagerInfoDbus.[ch] - info-daemon/NetworkManagerInfoPassphraseDialog.c - - There are now no longer two separate lists of wireless networks, - but one list where each network is "trusted" or not trusted - - Add a "getNetworkTrusted" dbus method - - "WirelessNetworkUpdate" signal now sent rather than - "PreferredNetworkUpdate/TrustedNetworkUpdate" signals - - Start freeing some dbus errors (not completed yet) - - * info-daemon/passphrase.glade - - Remove the "don't show" hints for pager and taskbar - - Add a title since its going to be in the taskbar - - * src/NetworkManager.[ch] - src/NetworkManagerAPList.[ch] - - There are now no longer two separate lists of wireless networks, - but one list where each network is "trusted" or not trusted - - * src/NetworkManagerAP.[ch] - - Add get/set "trusted" accessors and data bit - - * src/NetworkManagerDbus.[ch] - - Add function to get "trusted" status of a network from NetworkManagerInfo - - Trap new WirelessNetworkUpdate signal rather than old separate signals - - * src/NetworkManagerDevice.[ch] - - Add per-device config data (ip4 addr, gateway, netmask) and accessors - - (nm_device_new): Get device config from backend when initializing devices - - (nm_device_activation_worker): Split out device configuration on - activation to deal with static/dynamic IP differences, and try encryption - fallbacks on a device if the encryption method for the best AP is not good - - (nm_device_update_best_ap): convert to new consolidated access point lists from - NetworkManagerInfo, and copy over latest NMI info to best_ap when setting it - - * src/NetworkManagerWireless.c - - libgcrypt code wasn't converting the MD5 digest to an ascii string, fix it - - * src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSystem.h - - (nm_system_device_update_config_info): Add function to get device configuration - from system data in ifcfg-* files - - * src/backends/NetworkManagerDebian.c - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerSlackware.c - - Add stub functions for getting device configuration - -2004-09-07 Dan Williams - - * src/backends/NetworkManagerRedhat.c - src/backends/NetworkManagerSlackware.c - - Use full path to /sbin/ip everywhere - -2004-09-07 Dan Williams - - Patch from: Narayan Newton - - * configure.in - initscript/Makefile.am - initscript/Slackware/Makfile.am - initscript/Slackware/rc.networkmanager - src/Makefile.am - src/backends/NetworkManagerSlackware.c - - Add Slackware support - -2004-09-07 Dan Williams - - Patches below from: - - Mark Roach - Thom May - - * configure.in - initscript/Debian/NetworkManager - initscript/Debian/Makefile.am - - Initscript for Debian - - * src/backends/NetworkManagerDebian.c - - Add missing system init function to allow compilation - on Debian - -2004-09-03 Raphael Higino - - * configure.in: Added 'pt_BR' to ALL_LINGUAS. - -2004-09-03 Akagic Amila - - * configure.in: Added 'bs' to ALL_LINGUAS. - -2004-09-02 Colin Walters - - * src/backends/NetworkManagerRedHat.c (nm_system_device_run_dhcp) - (nm_system_device_stop_dhcp, nm_system_device_flush_routes): Use - g_strdup_printf instead of arbitrarily sized buffers. - -2004-09-01 Colin Walters - - * NetworkManager.pc.in: New file. - - * Makefile.am, .cvsignore, configure.in: Add NetworkManager.pc. - -2004-09-01 Amanpreet Singh Alam - - * configure.in: Punjabi(pa) is added to po/. - -2004-08-31 Dan Williams - - * Remove 'debug' extern global from all files since we now - use syslog() - - * src/NetworkManager.[ch] - - Break out routine that get the net.interface property from HAL, - removing that logic from nm_create_device_and_add_to_list() - - (nm_create_device_and_add_to_list): make this a bit more general so - it doesn't do the talking to HAL. Also add arguments to facilitate - the create of test devices. - - (nm_data_mark_state_changed): rename from nm_data_set_state_modified() - - (nm_data_new, main, nm_print_usage): add new argument "--enable-test-devices" - which makes NetworkManager listen for dbus commands to create test - devices, which have no backing hardware. Use when you're on a plane - for example, and/or forgot your wireless card at home. Test devices - _cannot_ be created unless NM is started with --enable-test-devices. - - * src/NetworkManagerDbus.[ch] - - New "getLinkActive" method for devices - - New "setLinkActive" method for devices (only works on test devices) - - New "createTestDevice" method on NetworkManager object to create a test - device of a specified type (ie wired, wireless). UDI is created from - scratch, as is the interface name. Only works when NM is started with - --enable-test-devices switch. - - New "removeTestDevice" method on NetworkManager object which removes a - test device. Only works when NM is started with --enable-test-devices - - * src/NetworkManagerDevice.[ch] - - Logic to facilitate test devices. Add variables to NMDevice struct to indicate - whether a device is a test device or not, and what its link status is. - - Deal with test devices in most functions. For those that work directly on hardware - special-case test devices. - - (nm_device_new): don't create a test device if test devices weren't enabled on the - command-line. - - (nm_device_update_link_active): split out logic for wired and wireless device link - checking to separate functions to facilitate test device link checking. - - (nm_device_set_enc_key): Since some drivers for wireless cards are daft and - don't make a distinction between System Authentication and Encryption - (namely Cisco aironet), we use Open System auth when setting a WEP key - on the card. We don't deal with Shared Key auth yet. - - (nm_device_activation_worker): split the activation cancel check logic out into - a separate routine nm_device_activation_cancel_if_needed() - - (nm_device_activation_signal_cancel): rename from nm_device_activation_cancel() - - (nm_device_fake_ap_list): Test wireless devices obviously cannot scan, so create - a list of fake access points that they can "see" - - (nm_device_is_test_device): return whether or not a device is a test device - - * src/NetworkManagerPolicy.c - - (nm_policy_get_best_device): attempt to deal with wireless network selection, - previously if you "locked"/forced NM to use a wireless device but then - selected a wireless network for NM to use, it would switch to a wired device. - So, if the active device is wireless and it has a "forced" best AP, use it - if the "forced" best AP is still valid - - (nm_state_modification_monitor): deal with NULL best devices, for example - there were no usable network devices, or the last one was removed - - * src/backends/NetworkManager*.c - - Deal with test devices, mostly just return success for operations like getting - a DHCP address - - * test/nmtestdevices.c - - Test tool to create/remove/link-switch test devices - -2004-08-30 Bryan Clark - - * examples/python/NetworkManager.py: - added convience functions has_wired_device and has_wireless_device - - * examples/python/systray/network_tray.py: - cleaned up a bunch of cruft, added support for listing wireless - networks just like the real applet. This is probably all I'm - going to work on this applet from now on. - TODO: add support for actually changing networks and devices - - * examples/python/NetworkManager.py (NetworkManager.get_device): - changed "nm.networks" into a dict from a list so I can store all - the cool information about networks in there - - * examples/python/systray/network_tray.py: - Added nice message when you try to run without running make first - - * examples/python/NetworkManager.py: - Bug fixes to the code so we get all the device information - that we need in get_device() - - * examples/python/NMTester.py: - Fixed _print_device_list to print_device_list - -2004-08-29 Seth Nickell - - * configure.in: - - Actually properly setup the Debian backend in configure. - -2004-08-29 Colin Walters - - * test/nminfotest.c: Include string.h and stdlib.h. - (get_network_string_property, get_networks_of_type): Return NULL. - - * test/nmclienttest.c (get_device_name, get_active_device): Return - NULL. - - * src/backends/NetworkManagerRedHat.c (nm_system_device_stop_dhcp): Just - use strlen, fgets always NULL-terminates the string. - - * src/NetworkManagerDbus.c (nm_dbus_nmi_filter, - dbus_message_get_member): Remove /* in comment. - - * src/NetworkManagerUtils.c (LOCKING_DEBUG): Ditto. - - * src/NetworkManager.c (quit): Unused, delete. - (nm_data_free): Cast arg to GFunc. - - * panel-applet/NMWirelessAppletDbus.c: Need to include - string.h, and dbus-glib-lowlevel.h (the latter is needed - for dbus_connection_setup_with_g_main at present). - (nmwa_dbus_update_wireless_network_list): Parenthesize - assignment in conditional. - (nmwa_dbus_worker): Return NULL. - - * panel-applet/NMWirelessApplet.c (nmwa_redraw) - (nmwa_get_menu_pos, nmwa_toplevel_menu_activate) - (nmwa_menu_add_text_item, nmwa_setup_widgets): Kill unused variables. - (nmwa_populate_menu): Return NULL on failure, instead of just - return; - - * initscript/NMLaunchHelper.c (g_timeout_add): Cast arg to GSourceFunc. - - * info-daemon/NetworkManagerInfoNetworksDialog.c (nmi_networks_dialog_init): Kill unused - variables. - - * info-daemon/NetworkManagerInfo.c (nmi_print_usage): Unused, - delete. - -2004-08-29 Colin Walters - - * src/NetworkManagerDbus.c (nm_dbus_get_network_timestamp): Return - a GTimeVal instead of time_t. This is easier to work with, - since time_t may be a long or double, we don't know. - - * src/NetworkManagerDbus.h: Update prototype. - - * src/NetworkManagerAP.c (struct NMAccessPoint): Store a GTimeVal - instead of time_t. - (nm_ap_get_timestamp): Update to return GTimeVal. - (nm_ap_set_timestamp): Update to take GTimeVal. - - * src/NetworkManagerDevice.c (nm_device_update_best_ap): Update - to handle GTimeVal. - - * src/NetworkManagerAPList.c (nm_ap_list_update_network): Handle - GTimeVal change. - (nm_ap_list_print_members): Fix warnings in printf format. - -2004-08-29 Colin Walters - - * panel-applet/NMWirelessApplet.c: Include config.h. - -2004-08-29 Colin Walters - - * configure.in: Generate config.h. - - * configure.in: Dump dependency on OpenSSL; we can't - use it since this package is GPL: - http://www.gnome.org/~markmc/openssl-and-the-gpl.html - Instead, check for libgcrypt, use it if available, - otherwise use included MD5 code. - - * src/gnome-keyring-md5.h, src/gnome-keyring-md5.c: - Suck in from gnome-keyring, munge a bit. - - * src/Makefile.am (NetworkManager_SOURCES) : Include - gnome-keyring-md5.h gnome-keyring-md5.c. - (NetworkManager_LDADD) : Add dep on LIBGCRYPT_LIBS. - - * src/NetworkManagerWireless.c (nm_md5): New function, uses - libgcrypt or included gnome-keyring md5 bits. - (nm_wireless_128bit_key_from_passphrase): Use nm_md5. - -2004-08-28 Kjartan Maraas - - * configure.in: Add «nb» and «no» to ALL_LINGUAS. - -2004-08-27 Bryan Clark - - * examples/python/systray/Makefile: - - Updated the clean section - - * examples/python/systray/trayiconmodule.c: - * examples/python/systray/trayicon.override: - * examples/python/systray/network_tray.py: - * examples/python/systray/eggtrayicon.h: - * examples/python/systray/eggtrayicon.c: - * examples/python/systray/Makefile: - * examples/python/README: - * examples/python/NetworkManager.py: - * examples/python/NMTester.py: - - Initial commit of these python example files - -Fri Aug 28 2004 Dan Williams - - * panel-applet/NMWirelessApplet.c - - Make current device bold - - Show more user-friendly device name if we got one from hal - - * panel-applet/NMWirelessAppletDbus.c - - Grab "info.product" key from hal for network devices - - Cache the current active device - -2004-08-27 Adam Weinberger - - * configure.in: Added en_CA to ALL_LINGUAS. - -2004-08-27 Christian Rose - - * configure.in: Added "sv" to ALL_LINGUAS. - -Thu Aug 26 2004 Dan Williams - - * Tag NetworkManager-0.2 - -Thu Aug 26 17:23:16 2004 Jonathan Blandford - - * initscripts/Makefile.am - * configure.in: Make pass distcheck - - * po/ChangeLog: added - -Thu Aug 26 2004 Dan Williams - - * panel-applet/NMWirelessApplet.c - - Remove debugging code - - Enable device switching from menus - - * panel-applet/NMWirelessAppletDbus.[ch] - - Method for asking NM to switch devices - - * src/NetworkManagerDevice.c - - Set dev->activating earlier, avoids race between - the dbus signal of "DeviceActivating" and setting - dev->activating (which is what NM's "status" method call - looks at) - -Thu Aug 26 2004 Dan Williams - - * panel-applet/NMWirelessApplet.[ch] - - Rework menu code to add devices to menu, and to show - signal strength for each access point. Code cleanups - too. - - * panel-applet/NMWirelessAppletDbus.c - - Grab network devices from NetworkManager too - - Grab quality information from NM for wireless networks - - * src/NetworkManagerDbus.[ch] - - Add dbus methods for getting the HAL UDI from a device and - for getting its base quality, if its wireless - - Consolidate some functions (wireless network notifications, - device notifications) - - Add method for requesting NM to use a particular device - - * src/NetworkManager.c - - Change for function consolidations from NetworkManagerDbus.c - - Implement active device locking and user-requested devices - (ie, tell NM to use a particular device instead of the one - it autochose) - - * src/NetworkManagerDevice.c - - Add method for getting the base quality of a device, if its - wireless - - Grab device base quailty info from iwlib during scans - - * src/NetworkManagerPolicy.c - - Use a user-requested device rather than the auto-chosen device - if we are told to - -Thu Aug 26 15:12:36 2004 Jonathan Blandford - - * Makefile.am: add po as a supdir - - * autogen.sh: use gnome-autogen.sh - - * initscript/Gentoo/.cvsignore: - * initscript/RedHat/.cvsignore: Shut up cvs - - * panel-applet/Makefile.am: Define GNOMELOCALEDIR for bonobo. - - * panel-applet/NMWirelessApplet.c: (nmwa_populate_menu), - (nmwa_fill): Use gettext. - - * configure.in: add gettext support - * po/.cvsignore: - * po/NetworkManager.pot: - * po/POTFILES.in: - -2004-08-26 Seth Nickell - - * panel-applet/NMWirelessApplet.c: (nmwa_destroy), - (nmwa_menu_item_activate), (nmwa_toplevel_menu_activate), - (nmwa_add_menu_item), (nmwa_menu_item_data_free), - (nmwa_dispose_menu_items), (nmwa_populate_menu), - (nmwa_setup_widgets), (do_not_eat_button_press), (nmwa_new): - * panel-applet/NMWirelessApplet.h: - - Use a menu bar instead of a button for the main clickable - thingy. - -2004-08-25 Dan Williams - - * src/NetworkManagerDevice.c - - (nm_device_set_enc_key): always set device to "open" mode instead of - turning encryption off, because the Cisco driver doesn't associate - with WEP-enabled access points unless we are in "open" - -2004-08-25 Dan Williams - - * src/NetworkManagerWireless.c - - Don't try to defererence blank passphrases - -2004-08-25 Dan Williams - - * panel-applet/NMWirelessApplet.c - - Rebuild the menu whenever a user clicks - -2004-08-25 Dan Williams - - * panel-applet/NMWirelessApplet.c - - (nmwa_udpate_state): Set panel icon to "wired" (for lack of better ones) - when NM isn't around or when its not connected - - * src/NetworkManagerDevice.c - - (nm_device_activation_worker): Make sure to reset dev->activating if we get - canceled. - -2004-08-25 Dan Williams - - * panel-applet/NMWirelessAppletDbus.c - - (nmwa_dbus_get_bool, nmwa_dbus_get_network_encrypted): correct method name - for getting encryption, and don't stop on "val" once we've gotten it - from NetworkManager. Short form: encryption should now show up. - -2004-08-25 Dan Williams - - * panel-applet/NMWirelessApplet.c - - Set ESSID on a gconf trusted network too when force-setting the wireless - network to associate with - -2004-08-25 Dan Williams - - * panel-applet/* - - Rework the panel applet to do all DBUS communication in a separate - thread - -2004-08-25 Dan Williams - - * info-daemon/NetworkManagerInfo.[ch] - - Remove "get_next_priority" function - - * info-daemon/NetworkManagerInfoDbus.[ch] - - Convert "priority" functions to "timestamp" - -2004-08-25 Dan Williams - - * src/NetworkManagerAP.[ch] - - Add a "enc_method_good" member and accessors to an Access Point - to signal when we've found the correct encryption method - for an access point - - Add a "timestamp" member and accessors, remove "priority" member - and accessors (use timestamps instead) - - Rename "wep_key"->"enc_key" - - (nm_ap_get_enc_key_hashed): new, return the correct mangled key - for a specified encryption method using the access points - source encryption key/passphrase - - * src/NetworkManagerAPList.c - - When updating a network with dbus, grab timestamp now instead of - priority - - * src/NetworkManagerDBus.[ch] - - Add signal for "DeviceActivating" - - Switch priority->timestamp - - * src/NetworkManagerDevice.c - - Change references of "wep_key" -> "enc_key" or "key" - - Signal DeviceActivating when starting activation - - When activating a wireless device, if the access point we are connecting - to is encrypted, and we have a source key, try to generate a mangled - key and use that (ie, generate real WEP key from a passphrase) - - Rework device activation to fallback to other encryption methods if - a previous one didn't work (ie, try mangling a key as a 104-bit passphrase - first, then if that doesn't work fall back to direct hex key). - - (nm_device_update_best_ap): fix a deadlock, and use timestamps instead of - priority. We now prefer the latest access point used, rather than using - a priority scheme - - (nm_device_do_normal_scan): make the encryption method "unknown" on access - points we've just discovered, and merge in correct info from the global - access point lists - -2004-08-25 Seth Nickell - - Patch from Matthew Garrett for adding - Debian support. - - * src/Makefile.am: - * src/backends/NetworkManagerDebian.c: (nm_system_device_run_dhcp), - (nm_system_device_stop_dhcp), (nm_system_device_flush_routes), - (nm_system_device_flush_addresses), (nm_system_enable_loopback), - (nm_system_delete_default_route), - (nm_system_kill_all_dhcp_daemons), (nm_system_update_dns), - (nm_system_load_device_modules): - -2004-08-24 Dan Willemsen - - * src/NetworkManager.c - src/backends/NetworkManagerGentoo.c - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerSystem.h - - Implement preliminary Gentoo support, adding a - nm_system_init function to the backend specification - - * configure.in - - Distribution auto-detection, lowercase any user-fed - distribution names - - * initscript/.cvsignore - initscript/Makefile.am - initscript/RedHat/Makefile.am - initscript/RedHat/NetworkManager - initscript/Gentoo/Makefile.am - initscript/Gentoo/NetworkManager - - Refactored initscript code separately for each - distribution - -2004-08-23 Dan Williams - - * configure.in - src/Makefile.am - src/NetworkManagerDevice.c - src/NetworkManager.c - src/NetworkManagerUtils.[ch] - src/backends/NetworkManagerSystem.h - src/backends/NetworkManagerRedHat.c - src/backends/NetworkManagerGentoo.c - - Refactor system-specific code into separate backends for - each distribution - -2004-08-23 Dan Willemsen - - * dispatcher-daemon/NetworkManagerDispatcher.c - info-daemon/NetworkManagerInfo.[ch] - info-daemon/NetworkManagerInfoDbus.c - info-daemon/NetworkManagerInfoPassphraseDialog.c - src/NetworkManager.c - src/NetworkManagerAP.c - src/NetworkManagerAPList.c - src/NetworkManagerDbus.c - src/NetworkManagerDevice.c - src/NetworkManagerPolicy.c - src/NetworkManagerUtils.[ch] - src/NetworkManagerWireless.c - - Used syslog functions for logging instead of NM_DEBUG_DISPLAY & fprintf - - * src/NetworkManager.c - - Fixed usage wording for --no-daemon - -2004-08-23 Dan Williams - - * panel-applet/NMWirelessApplet.c - - Update our state every second to get more responsive panel icon - - (nmwa_update_state): remove bogus applet->pix_state = PIX_WIRED that - was causing our marching ants status blips to never move when - looking for a wireless network - - * src/NetworkManagerDevice.c - - (nm_device_activation_begin): return if activation has already begun - - (nm_device_do_normal_scan): merge WEP key and priority from the - trusted/preferred network into the device's access point when the - scan list is processed - -2004-08-23 Dan Williams - - * initscript/NetworkManager - - Use NMLaunchHelper rather than sleeping - - * initscript/NMLaunchHelper.c - Makefile.am - - Add helper program that exits only when NM activates a device, - or 10 seconds have passed, whichever happens first. This - stops the boot processes until we have a network connection, - which NM can't do because it daemonizes and brings the connection - up in the background. Allows stuff like NFS to not die. - -2004-08-20 Dan Williams - - * info-daemon/NetworkManagerInfoPassphraseDialog.c - - (nmi_passphrase_dialog_ok_clicked): when updating the wep key - for a network, set the essid as well since it may not exist yet - - (nmi_passphrase_dialog_init): don't star out the passphrase field, - since WEP keys/passphrases are long and prone to entry-error - - * panel-applet/Makefile.am - panel-applet/wired.png - - Add (pulled from system-config-network temporarily) - - * panel-applet/NMWirelessApplet.[ch] - - Show wired picture when a wired connection is used - - Rename wireless icon enums, adding WIRELESS - - * src/NetworkManagerDevice.c - - (nm_device_activate_wireless): unset encryption before bringing - down the card and setting the essid - - (nm_device_activatin_worker): request a key from the user if the - AP we are connecting to is encrypted but we don't have a key - for it yet - - (nm_device_set_user_key_for_network): fix missing '== 0' for a - strcmp() that prevented a user-entered key from actually getting - used - -2004-08-16 Dan Williams - - * initscript/NetworkManager - - Check for /sbin/ip - - Do sysctl magic that network service does - - sleep 4s after start to allow network time to come up [hack] - - * src/Makefile.am - src/NMLoadModules - - Load all network device kernel modules (hal doesn't know devices - are ethernet until the module is loaded, and therefore we don't know) - - * src/NetworkManager.c - - (main): daemonize later, launch NMLoadModules to alert HAL of our - network devices, and bring up the loopback device explicitly - - * src/NetworkManagerUtils.[ch] - - (nm_enable_loopback): new function - -2004-08-13 Dan Williams - - * configure.in - panel-applet/Makefile.am - - Fix up cleanfiles and server_DATA/server_in_files - - * README - - Update with some comments on theory of operation - - * CONTRIBUTING - Makefile.am - - Add CONTRIBUTING - -2004-08-12 Dan Williams - - * info-daemon/passphrase.glade - - Set window title to " " - - * panel-applet/Makefile.am - panel-applet/keyring.png - - Deliver to correct place - - * panel-applet/NMWirelessApplet.[ch] - - Add comments - - Remove applet->have_active_device as its no longer used - - (nmwa_load_theme): load keyring.png too - - (error_dialog): remove - - (show_warning_dialog): subsume functionality of error dialog too - - (nmwa_destroy, nmwa_new): create and dispose of an application-wide GConfClient - - (nmwa_handle_network_choice): add to deal with user clicking on an item from - the networks menu - - (nmwa_menu_item_activated): GtkMenuItem "activate" signal handler - - (nmwa_button_clicked, nmwa_setup_widgets): create and populate the menu on startup - and when we get broadcasts of changed wireless access points only, not when the - user clicks on the button to display the menu (too long of a wait) - - (nmwa_add_menu_item): Make active network bold, and place a keyring icon beside - networks that are encrypted - - (nmwa_dispose_menu, nmwa_menu_item_data_free): dispose of the data we place on each - menu item with g_object_set_data() - - * panel-applet/NMWirelessAppletDbus.[ch] - - (nmwa_dbus_get_bool): add method to return boolean value from dbus message - - (nmwa_dbus_get_active_network): add (nmwa_dbus_get_string() wrapper to get active network) - - (nmwa_dbus_add_networks_to_menu): clean up, only show one instance of each ESSID in the menu - - (nmwa_dbus_set_network): force NetworkManager to use a particular network for wireless cards - - (nmwa_dbus_init, nmwa_dbus_filter): Trap network appear/disappear and device - activation/deactivation signals and rebuild the menu when they happen - - * src/NetworkManager.c - - (main): use new nm_spawn_process() rather than system() - - * src/NetworkManagerDbus.c - - (nm_dbus_devices_handle_request): don't compare AP structure addresses directly, but essids - instead. Since we can now force best_aps to stick around, the AP structure to which - dev->options.wireless.best_ap points to won't necessarily be in the device's device list - if a scan has happened since the best_ap was frozen. Also add "setNetwork" method - to freeze the best_ap. - - * src/NetworkManagerDevice.[ch] - - (nm_device_activation_worker): Use new nm_spawn_process() call rather than system() - - (nm_device_*_best_ap): add freeze/unfreeze/get_frozen functions, and don't really update - the best_ap in nm_device_update_best_ap() if the best_ap is frozen AND in the device's - ap list - - * src/NetworkManagerUtils.[ch] - - (nm_spawn_process): add replacement for system() usage - -2004-08-11 Dan Williams - - * panel-applet/NMWirelessApplet.[ch] - - Fix up copyright and credits to include Bastien and Eskil, - who created the gnome-applets wireless applet, from whose - skeleton this one was created - - Rework nmwa_update_state()/nmwa_draw() so that state and which - pixmap to draw is computed during nmwa_update_state() - - Applet now shows itself all the time due to panel packing issues - which caused the applet to previously never come back after hiding. - When a wired device is the active device, the applet shows "not connected" - - * panel-applet/NMWirelessAppletDbus.[ch] - - Clean up error messages and show what function they are from - - nmwa_dbus_get_active_wireless_device()->nmwa_dbus_get_active_device() - - Add new device type getters, and a status getter - - * src/NetworkManagerDbus.c - - (nm_dbus_devices_handle_request): Don't return an active network unless that - network is actually in the device's ap list - - (nm_dbus_nm_message_handler): Fix silly mistake returning status - - * src/NetworkManagerDevice.c - - (nm_device_update_best_ap): If the best AP is NULL, clear out the ESSID of the - card - - * test/nmclienttest.c - - Report status of NetworkManager too - -2004-08-11 Dan Williams - - * info-daemon/NetworkManagerInfo.c: - - (main): clean up Seth's code style - - * info-daemon/NetworkManagerInfoDbus.c: - - Use the more aptly-named path/service/interface constants from NetworkManager - - Don't return empty strings ("") as object paths ever, instead return errors - - * panel-applet/NMWirelessApplet.c: - - Clean up Seth's code style - - * src/NetworkManager.[ch] - - (nm_remove_device_from_list): remove anything having to do with pending_device - - (main, nm_print_usage): change --daemon=[yes|no] -> --no-daemon - - * src/NetworkManagerAPList.[ch] - - Move Iter struct right above the iter functions to preserve opacity - - (nm_ap_list_remove_ap): implement - - (nm_ap_list_update_network): deal with errors returned from nm_dbus_get_network_priority(), - remove AP if NetworkManagerInfo doesn't know anything about it - - (nm_ap_list_diff): user NMAPList iterators - - (nm_ap_list_print_members): implement debugging function - - * src/NetworkManagerDbus.[ch] - - (nm_dbus_nm_get_active_device): remove anything to do with pending_device - - (nm_dbus_get_user_key_for_network): remove DBusPendingCall stuff (unused), - and move the actual key setting stuff into NetworkManagerDevice.c - - (nm_dbus_get_network_priority): return -1 now on errors - - (nm_dbus_nmi_filter): fix strcmp() error that caused PreferredNetworkUpdate signals to - get lost, and force the active device to update its "best" ap when AP lists change - - (nm_dbus_nm_message_handler): Update conditions for returning "connecting" for a "status" - method call due to pending_device member removal - - * src/NetworkManagerDevice.[ch] - - Move NMDevice structure to the top - - Add a wireless scan mutex and a best_ap mutex to the Wireless Options structure - - Remove Pending Action stuff from everywhere - - (nm_device_activation_*): We now "begin" activation and start a thread to do the - activation for us. This thread blocks until all conditions for activation have - been met (ie for wireless devices, we need a valid WEP key and a "best" ap), and - then setup up the interface and runs dhclient. We have to do this because there - is no guaruntee how long dhclient takes, and while we are blocking on it, we cannot - run our main loop and respond to dbus method calls or HAL device removals/inserts - - (nm_device_set_user_key_for_network): Move logic here from NetworkManagerDbus.c so we - can tell nm_device_activation_worker() that we've got a key - - (nm_device_*_best_ap): lock access to best_ap member of Wireless Options structure - - (nm_device_get_path_for_ap): dumb it down so the list doesn't lock against itself when - diffing (AP appear/disappear signal functions make sure the AP is actually in the device's list) - - (nm_device_update_best_ap): move logic from nm_wireless_is_ap_better() here - - * src/NetworkManagerPolicy.c - - Remove anything to do with pending_device - - Adjust device activation to deal with activation-in-worker-thread - - * src/NetworkManagerUtils.c - - Clean up locking debugging a bit - - * src/NetworkManagerWireless.[ch] - - (nm_wireless_is_ap_better): remove, stick logic in nm_device_update_best_ap(). This function - was badly named and is better as a device function - - * panel-applet/.cvsignore: add - -2004-08-09 Seth Nickell - - * panel-applet/NMWirelessApplet.c: (nmwa_timeout_handler), - (nmwa_button_clicked), (nmwa_populate_menu), (nmwa_setup_widgets), - (nmwa_new): - * src/NetworkManagerDbus.c: (nm_dbus_nmi_filter): - - Don't load the menus until clicked on (also removes a call outside - normal code paths at first load). - - Hide applet when NM is not present. - - Improve printf debugging stuff. - -2004-08-09 Dan Williams - - * dispatcher-daemon/NetworkManagerDispatcher.c: - - Covert uses of dbus_message_iter_* over to dbus_message_get_args - - Use constants for NetworkManager interface, service, and path - -2004-08-09 Dan Williams - - * src/NetworkManagerDbus.c: - - (nm_dbus_nm_get_active_device, nm_dbus_nm_get_devices): Never return an empty object path, - instead return an error message - - (nm_dbus_devices_handle_request): Return error when getActiveNetwork/getNetworks is called - on a wired device. Also never return an empty object path, instead return an error message - -2004-08-06 Seth Nickell - - * panel-applet/NMWirelessApplet.c: (nmwa_new): - - Check the error code when getting a connection. - - * panel-applet/NMWirelessAppletDbus.c: (nmwa_dbus_init): - - Check if the NM service exists when initializing (rather than - assuming it does not). - - * src/NetworkManagerDbus.c: (nm_dbus_init): - - Don't acquire the well-known service name until we have - registered object/path handlers and can actually receive - calls. - -2004-08-06 Dan Williams - - * panel-applet/* - - Add panel applet - - * src/NetworkManagerPolicy.c - src/NetworkManager.c - - Get access point lists from NetworkManagerInfo on-demand, - and look for ServiceCreate/ServiceDeleted signals to see when - we should query NMI for lists - * src/NetworkManagerAPList.c - - Make sure to init the list's mutex - - Convert traversals of the list over to the list iter functions - - * src/NetworkManagerDbus.[ch] - - Use more aptly-named path/service/interface constants - - Treat both active and pending devices the same for "getActiveDevice" - - Add a "status" method returning "connected", "connecting", or "disconnected" - - * src/NetworkManagerDevice.c - - Honor "ignored" network list when picking best ap to use - -2004-08-06 Seth Nickell - - * aclocal.m4: - - Autogenerated, remove from CVS. - - * autogen.sh: - - Don't hardcode automake version. - - * configure.in: - * info-daemon/Makefile.am: - * info-daemon/NetworkManagerInfo.c: (main): - - Use GnomeProgram et al. for doing session management. - Use popt stuff for argument parsing rather than doing - it manugally. - -2004-08-05 Dan Williams - - * test/nminfotest.c - - Update to new NMI dbus API, check different network types - - * info-daemon/NetworkManagerInfoDbus.c - - Update to new NM dbus API, ie network type sent in query message - -2004-08-05 Dan Williams - - * An assload of changes - -2004-08-02 Dan Williams - - * TODO - - new task: proper logging support - - * info-daemon/NetworkManagerInfo.c - - Correct spelling of "canceled" - - Correct casting of objects for g_signal_connect() - - * info-daemon/NetworkManagerInfoDbus.c - - Add defines for NetworkManager namespace and object path, and use them - - Add filter function to trap new signals from NetworkManager: - WirelessNetworkAppeared, WirelessNetworkDisappeared - - * info-daemon/passphrase.glade - - Change name of "ok" button to "Login to Network..." - - Mark invisible - - * src/NetworkManager.c - - Code and debug message cleanups - - Rename "nm_add_current_devices"->"nm_add_initial_devices" - - (nm_add_initial_devices) Check returned string array of devices - and don't try to add devices if array is NULL - - (main) Initialize libhal a bit later, make code a bit clearer - - * src/NetworkManagerAP.[ch] - - New accessor and data member "matched": used to speed up AP list - diffing - - New accessor and data member "enc_method": will be used during key - fallback to cache which passphrase->key conversion actually works - so we don't have to do it every time - - * src/NetworkManagerAPList.[ch] - - (nm_ap_list_find_ap_in_list) New: find an AP by essid in an AP list - - (nm_ap_list_diff) New: given two lists of access points, find the differences - between them, and send WirelessNetworkAppeared/Disappeared signals over - dbus in response to those differences - - * src/NetworkManagerDbus.[ch] - - (nm_dbus_get_object_path_from_ap) New: given a device and an access point, - make an object path for that access point (NOTE that we don't yet check to - make sure that access point is actually in the device's AP list yet) - - (nm_dbus_get_ap_from_object_path) Renamed from nm_dbus_get_network_from_object_path - - (nm_dbus_signal_wireless_network_appeared, nm_dbus_signal_wireless_network_disappeared) - New: signal appearance/disappearance of wireless networks - - (nm_dbus_set_user_key_for_network) Mark the network/ap as invalid if the user cancelled - key entry - - * src/NetworkManagerDevice.[ch] - - (nm_device_ap_list_clear) Use nm_ap_list_free rather than doing it ourselves - - (nm_device_ap_list_get) New: return the AP list (static function) - - (nm_device_do_normal_scan) Destroy old AP list later, so that we can diff the - new one resulting from the scan with the old one - - * src/NetworkManagerWireless.c - - (nm_wireless_is_most_prefered_ap) "invalid" access points cannot be "best" access points - - * test/nminfotest.c - - #define object paths and namespaces and use the #defines rather than static strings - - Test out user-key functionality of NetworkManagerInfo too - -2004-07-29 Dan Williams - - * info-daemon/NetworkManagerInfoDbus.c - src/NetworkManagerDbus.c - - Update to current DBus (ie don't use decomposed paths when registering - object paths/fallbacks) - -2004-07-27 Dan Williams - - * Remove various Makefile.in files - - * TODO - - Add some more items - - * configure.in - - Add checks for OpenSSL/md5 headers and libs - - * src/Makefile.am - - Use OpenSSL CFLAGS - - * src/NetworkManagerAP.[ch] - - Remove 'stamp' functions, replace with 'invalid' functions - to support user cancelling WEP key entry - - * src/NetworkManagerDbus.c - - Remove 'stamp' return functions - - Treat returned user key as a passphrase and convert to a WEP key, - but don't actually use the WEP key yet. We use the returned user - key as a hexadecimal WEP key until we can figure out a UI for - passphrase-vs-hex key - - * src/NetworkManagerWireless.[ch] - - Add passphrase-to-128bit-key function - -2004-07-27 Dan Williams - - * TODO - - Add a couple of items - -2004-07-27 Dan Williams - - * info-daemon/NetworkManagerInfo.c - - Update allowed network's GConf key when user enters a WEP key explicitly - - * info-daemon/NetworkManagerDbus.c - - Fix some comments - - nmi_dbus_get_allowed_networks(): kill warning - -2004-07-27 Dan Williams - - * initscript/Makefile.in - - Remove - - * initscript/Makefile.am - - Add correct rules to install the init.d initscript - - * info-daemon/NetworkManagerInfoDbus.c - - Remove debug fprintf - - * src/NetworkManagerDbus.[ch] - - Remove debug fprintfs - - Add macros for NetworkManagerInfo object path/namespace - - Use said macros instead of constant strings - -2004-07-27 Dan Williams - - * initscript/.cvsignore - - Add - - * info-daemon/Makefile.am - - Install .glade files and keyring.png - - Fix stupid omission of a \ that caused half the flags not to be - passed to gcc - - * info-daemon/NetworkManagerInfo.c - - gtk_signal_connect->g_signal_connect - - Alert NetworkManagerInfo to new glade file location - -2004-07-27 Dan Williams - - * test/nmclienttest.c - test/nminfotest.c - - Add missing headers - - Add GPL message at top - -2004-07-27 Dan Williams - - * src/NetworkManagerAPList.[ch] - src/Makefile.am - - Add. Deal with allowed network list additions, deletions, and updates - - * dispatcher-daemon/NetworkManagerDispatcher.c - - Add missing header - - * info-daemon/NetworkManagerInfo.[ch] - - Add missing header - - Implement the GConf notify callback to signal NetworkManager of an allowed - network change - - Better error checking - - * info-daemon/NetworkManagerInfoDbus.[ch] - - Add missing header - - Convert to using dbus_message_append_args/dbus_message_get_args - - Implement nmi_dbus_signal_update_allowed_network() to signal NetworkManager - that an allowed network changed. We don't want to signal on individual - keys _inside_ an allowed network really, just want NM to query the info - daemon for updated info on all keys. - - Better error checking - - * src/NetworkManager.[ch] - - Add missing header - - Move allowed_ap_list free functions to NetworkManagerAPList.[ch] - - Zero out NMData structure on free - - No longer use a thread for allowed_ap_list updating, instead its now done - through dbus queries against NetworkManagerInfo - - Populate allowed_ap_list initially before adding existing network devices - to the device list, so wireless devices can get their "best" AP - - * src/NetworkManagerDbus.[ch] - - Convert to using dbus_message_append_args/dbus_message_get_args - - Better error checking - - Implement Allowed Network info functions to request allowed network - info from NetworkManagerInfo - - Implement the filter function to process signals from NetworkManagerInfo - about changing allowed networks - - * src/NetworkManagerDevice.c - - Fix file descriptor leak in nm_device_update_ip4_address() - -2004-07-27 Dan Williams - - * .cvsignore - src/.cvsignore - test/.cvsignore - dispatcher-daemon/.cvsignore - info-daemon/.cvsignore - - Add .cvsignore files to reduce noise when diffing - -2004-07-24 Dan Williams - - * src/NetworkManager.[ch] - src/NetworkManagerDbus.[ch] - src/NetworkManagerDevice.[ch] - src/NetworkManagerPolicy.c - src/NetworkManagerWireless.[ch] - - Add many more g_return_if_fail()/g_return_val_if_fail() checks - - Pass the NMData application data structure through all calls - that need it so we can get rid of nm_get_global_data() - - Change deallocation of the allowed_ap_list GSList in preparation - for not completely clearing it every time we get an update, - but instead getting incremental updates via GConf/dbus - -2004-07-22 Dan Williams - - * configure.in - - Add checks for GConf libs & headers & flags - - * info-daemon/Makefile.am - - Add GConf flags & libs to compile/link stages of NetworkManagerInfo - - * info-daemon/NetworkManagerInfo.[ch] - - Don't use gquarks for data storage, just use normal data storage - - Add gconf bits to watch /system/networking/wireless/allowed_networks - - * info-daemon/NetworkManagerDbus.[ch] - - Add method call for getting allowed networks - - Add method calls for getting an allowed network's essid, priority, and key - - Hook the method calls up to GConf - - Split user key dialog code into separate function (nmi_dbus_get_key_for_network) - - nmi_dbus_nmi_message_handler(): make sure to unref the reply message after sending - - * src/NetworkManagerDbus.[ch] - - Switch for enumeration of networks to using essid instead - - * test/Makefile.am - test/nminfotest.c - - Add test program for NetworkManagerInfo - -2004-07-19 Dan Williams - - * src/NetworkManagerDbus.c - - Switch from indexed device paths to names. Less code, more efficient. - ie "/org/freedesktop/NetworkManager/0" -> "/org/freedesktop/NetworkManager/eth0" - -2004-07-19 Dan Williams - - * dispatcher-daemon/NetworkManagerDispatcher.c - - (nm_dbus_filter): Remove obsolete response to NeedKeyForNetwork signal - -2004-07-19 Dan Williams - - * Makefile.am - - Add info-daemon directory - - * configure.in - - Check for glade libs and headers - - Add info-daemon directory - - * src/NetworkManagerAP.c - - nm_ap_new_from_ap(): Fix bug that resulted in an APs encryption status not getting - copied over to the new AP. - - * src/NetworkManagerDbus.c - src/NetworkManagerDbus.h - - Deal with nm_device_ap_list_get_ap()->nm_device_ap_list_get_ap_by_index() change - - Remove nm_dbus_signal_need_key_for_network() - - Add disabled code for asynchronous user wep key callbacks - - Add functions for getting, setting, and cancelling user key operations - - Remove "setKeyForNetwork" device dbus method call, its on NetworkManager object instead - - Add "setKeyForNetwork" dbus method call on NetworkManager object - - * src/NetworkManagerDevice.c - src/NetworkManagerDevice.h - - nm_device_update_link_active(): revert changes for wireless link detection, the WEP-key-is-wrong - logic is in device activation now - - nm_device_activate(): for wireless devices, if we can't associate with access point (perhaps - key is wrong) trigger get-user-key pending action - - Implement get-user-key pending action stuff, tie to dbus messages - - Rename nm_device_ap_list_get_ap() -> nm_device_ap_list_get_ap_by_index() - - Add nm_device_ap_list_get_ap_by_essid() - - Instead of copying "best" access points, ref them instead so that the key we set - sticks around - - * src/NetworkManagerPolicy.c - - Deal with wrong WEP key, but right access point (and if so, return link_active = TRUE) - - Don't cancel pending actions on a device if its the same device as last iteration - - Only promote pending_device->active_device if activation was successfull - - * src/Makefile.am - - Rename nmclienttest->nmtest - - * info-daemon/Makefile.am - info-daemon/NetworkManagerInfo.c - info-daemon/NetworkManagerInfo.h - info-daemon/NetworkManagerInfoDbus.c - info-daemon/NetworkManagerInfoDbus.h - info-daemon/passphrase.glade - info-daemon/NetworkManagerInfo.conf - info-daemon/keyring.png - - Import sources for info-daemon, which pops up dialog for passphrase/key when - NetworkManager asks for it, and also will (soon) provide "allowed" access point - lists to NetworkManager by proxying user's GConf - - -2004-07-15 Dan Williams - - * src/Makefile.am - - Turn on warnings - - * src/NetworkManager.c - - nm_create_device_and_add_to_list(): call nm_device_deactivate() rather - that doing the deactivation ourselves - - Cancel an pending actions on a device if its being removed - - Break up link state checking a bit, make non-active wireless cards - deactivated to save power - - Remove unused variables - - * src/NetworkManager.h - - Add support for "pending" device - - * src/NetworkManagerAP.h - src/NetworkManagerAP.c - - Add support for determining whether and AP has encryption enabled or not - - AP address is now "struct ether_addr" rather than a string - - * src/NetworkManagerDbus.h - src/NetworkManagerDbus.c - - Add signal NeedKeyForNetwork, method SetKeyForNetwork (testing only) - - Changes for AP address from struct ether_addr->string - - * src/NetworkManagerDevice.h - src/NetworkManagerDevice.c - - Remove unused variables, fix warnings - - Add support for Pending Actions (things that block a device from being "active" - until they are completed). - - First pending action: Get a WEP key from the user - - Add nm_device_is_wire[d|less](), rename nm_device_is_wireless() - - Clean up explicit testing of dev->iface_type to use nm_device_is_wireless() - - Update wireless link checking to try to determine if the AP we are associated - with is correct, but the WEP key we are using is just wrong. If its wrong, - trigger the GetUserKey pending action on the device - - If dhclient can't get an IP address, it brings the device down. Bring it back - up in that case, otherwise we can't scan or link-check on it - - Add IP address change notifications at appropriate points (still needs some work) - - Add nm_device_need_ap_switch(), checks whether we need to switch access points or not - - * src/NetworkManagerPolicy.h - src/NetworkManagerPolicy.c - - Split out "best" access point determiniation into separate function - - Make device activation 2-stage: first the device is pending, then - in the next iteration through it becomes "active" unless it has - pending actions - - * src/NetworkManagerUtils.h - src/NetworkManagerUtils.c - - Clean up unused variables and warnings - - Wrap our debug macros in {} to prevent possible confusion - - * src/NetworkManagerWireless.c - - Forgot to return current best priority, which lead to last available AP always - being chosen no matter what its priority was. Corrected. - -2004-07-15 Dan Williams - - * dispatcher-daemon/Makefile.am - - Turn on warnings - - * dispatcher-daemon/NetworkManagerDispatcher.c - - Remove unused variables due to warnings - - Fix some comments - - Print message on receipt of NeedKeyForNetwork signal (testing only) - -2004-07-06 Dan Williams - - * src/NetworkManager.c - - Add IPv4 address update for active device during link state check - - Don't allow wireless cards to be powered up when they are not the - active device - - * src/NetworkManagerDbus.c - src/NetworkManagerDbus.h - - Add DBUS IPv4 address change signal - - Add DBUS IPv4 address get method for devices - - * src/NetworkManagerDevice.c - - Make setting the WEP key actually work - - Move IP address get/set/update stuff here, per-device - - Power down/bring down wireless device when deactivated - - For scanning wireless devices, if first scan returned ENODATA, try again - - * src/NetworkManagerPolicy.c - - Only set the WEP key for an allowed access point if there is one. - We were setting it to be blank if one wasn't specified. - - * src/NetworkManagerUtils.h - src/NetworkManagerUtils.c - - Move the IP address stuff to NetworkManagerDevice.c - - * dispatcher-daemon/NetworkManagerDispatcher.c - - Add device IPv4 address change notification stuff - -2004-07-05 Dan Williams - - * dispatcher-daemon/NetworkManagerDispatcher.c - - A bit more descriptive state message - - Don't segfault when reading directory - - * src/NetworkManager.h - - Remove NMData desired_ap member, its now - per-device rather than global - - * src/NetworkManager.c - - Remove references to desired_ap - - Move the allowed AP list refresh stuff into a thread - - * src/NetworkManagerDevice.c - src/NetworkManagerDevice.h - - Each wireless device now has a "best ap" - - Make device activate/deactivate functions per-device - - Make wireless scanning per-device - - Add IPv4 address discover functions, stub IPv6 ones - - Move ethernet address validation functions to NetworkManagerUtils.c - - Add wireless access point accessor function - - Get/Set functions for "best ap" - - * src/NetworkManagerPolicy.c - - Move activate/deactivate stuff into NetworkManagerDevice.c, per-device - - Deal with per-device "best ap" rather than data->desired_apa - - Implement allowed access point worker thread - - Add nm_policy_essid_is_allowed() function - - * src/NetworkManagerUtils.c - src/NetworkManagerUtils.h - - Add nm_ethernet_address_is_valid() function - - Add IPv4/IPv6 address get functions - - * src/NetworkManagerWireless.c - src/NetworkManagerWireless.h - - Move scanning stuff into NetworkManagerDevice.c, per-device - -2004-06-29 Dan Williams - - * dispatcher-daemon/NetworkManagerDispatcher.c - - Implement script callout functionality - -2004-06-24 Dan Williams - - * NetworkManager.c - - Spacing cleanups - - Flush device routes and ip addresses when added to the device list - - * NetworkManagerDbus.c - - Spacing cleanups - - Add missing returns in the two signal functions - - * NetworkManagerPolicy.c - - Spacing and variable cleanups - -2004-06-24 Dan Williams - - * Makefile.am - Makefile.in - configure.in - dispatcher-daemon/Makefile.am - dispatcher-daemon/Makefile.in - dispatcher-daemon/NetworkManagerDispatcher.c - - Add a daemon that receives signals from NetworkManager - and will (eventually) call scripts in /etc/somewhere - when devices go up or down. - - * NetworkManager.c - - Spacing cleanups - - Flush device routes and ip addresses when added to the device list - - * NetworkManagerDbus.c - - Spacing cleanups - - Add missing returns in the two signal functions - - * NetworkManagerPolicy.c - - Spacing and variable cleanups - - Rename nm_policy_switch_interface->nm_policy_switch_device - - nm_policy_switch_device(): - Use kill (pid) instead of system ("kill ") - - nm_state_modification_monitor(): - Add wireless essid to output of debug statements - Correct typo in device compare to switch or not (should be !=) - Don't sleep after sending "no longer active" signal, was useless - -2004-06-24 Dan Williams - - * Initial import +[1] https://cgit.freedesktop.org/NetworkManager/NetworkManager/plain/ChangeLog?id=b25c227e078bc9e3a2e06b3f62bd2b727f50beee +[2] https://cgit.freedesktop.org/NetworkManager/NetworkManager/log/ +[3] https://cgit.freedesktop.org/NetworkManager/NetworkManager/plain/NEWS diff --git a/Makefile.am b/Makefile.am index 268c02c3..709d79b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ SUBDIRS = \ . \ po -if BUILD_SETTING_DOCS +if HAVE_DOCS SUBDIRS += \ docs/libnm \ @@ -123,12 +123,13 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-wext=no \ --enable-ifcfg-rh \ --enable-ifupdown \ - --enable-ifnet + --enable-ifnet \ + --disable-dependency-tracking dist-configure-check: @echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection --with-libnm-glib'. ***" @false -if !BUILD_SETTING_DOCS +if !BUILD_DOCS dist_configure_check += dist-configure-check endif if !WITH_LEGACY_LIBRARIES @@ -187,6 +188,8 @@ introspection_sources = \ introspection/org.freedesktop.NetworkManager.Device.Bridge.h \ introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c \ introspection/org.freedesktop.NetworkManager.Device.Bluetooth.h \ + introspection/org.freedesktop.NetworkManager.Device.Dummy.c \ + introspection/org.freedesktop.NetworkManager.Device.Dummy.h \ introspection/org.freedesktop.NetworkManager.Device.Wired.c \ introspection/org.freedesktop.NetworkManager.Device.Wired.h \ introspection/org.freedesktop.NetworkManager.Device.Generic.c \ @@ -261,6 +264,7 @@ DBUS_INTERFACE_DOCS = \ docs/api/dbus-org.freedesktop.NetworkManager.Device.xml \ docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \ + docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml \ @@ -288,6 +292,7 @@ DBUS_INTERFACE_DOCS = \ docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml introspection/%.c: introspection/%.xml + @$(MKDIR_P) introspection/ $(AM_V_GEN) gdbus-codegen \ --generate-c-code $(basename $@) \ --generate-docbook docs/api/dbus \ @@ -312,6 +317,7 @@ dbusinterfaces_DATA = \ introspection/org.freedesktop.NetworkManager.Device.Bond.xml \ introspection/org.freedesktop.NetworkManager.Device.Bridge.xml \ introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml \ + introspection/org.freedesktop.NetworkManager.Device.Dummy.xml \ introspection/org.freedesktop.NetworkManager.Device.Wired.xml \ introspection/org.freedesktop.NetworkManager.Device.Generic.xml \ introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \ @@ -372,6 +378,7 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-setting-cdma.h \ libnm-core/nm-setting-connection.h \ libnm-core/nm-setting-dcb.h \ + libnm-core/nm-setting-dummy.h \ libnm-core/nm-setting-generic.h \ libnm-core/nm-setting-gsm.h \ libnm-core/nm-setting-infiniband.h \ @@ -389,6 +396,7 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-setting-team-port.h \ libnm-core/nm-setting-team.h \ libnm-core/nm-setting-tun.h \ + libnm-core/nm-setting-user.h \ libnm-core/nm-setting-vlan.h \ libnm-core/nm-setting-vpn.h \ libnm-core/nm-setting-vxlan.h \ @@ -407,6 +415,8 @@ libnm_core_lib_h_pub_mkenums = \ libnm-core/nm-core-enum-types.h libnm_core_lib_h_priv = \ shared/nm-utils/nm-shared-utils.h \ + shared/nm-utils/nm-udev-utils.h \ + shared/nm-setting-metadata.h \ libnm-core/crypto.h \ libnm-core/nm-connection-private.h \ libnm-core/nm-core-internal.h \ @@ -418,6 +428,8 @@ libnm_core_lib_h_priv = \ libnm-core/nm-utils-private.h libnm_core_lib_c_real = \ shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-udev-utils.c \ + shared/nm-setting-metadata.c \ libnm-core/crypto.c \ libnm-core/nm-connection.c \ libnm-core/nm-dbus-utils.c \ @@ -435,6 +447,7 @@ libnm_core_lib_c_real = \ libnm-core/nm-setting-cdma.c \ libnm-core/nm-setting-connection.c \ libnm-core/nm-setting-dcb.c \ + libnm-core/nm-setting-dummy.c \ libnm-core/nm-setting-generic.c \ libnm-core/nm-setting-gsm.c \ libnm-core/nm-setting-infiniband.c \ @@ -452,6 +465,7 @@ libnm_core_lib_c_real = \ libnm-core/nm-setting-team-port.c \ libnm-core/nm-setting-team.c \ libnm-core/nm-setting-tun.c \ + libnm-core/nm-setting-user.c \ libnm-core/nm-setting-vlan.c \ libnm-core/nm-setting-vpn.c \ libnm-core/nm-setting-vxlan.c \ @@ -482,7 +496,11 @@ dflt_cppflags_libnm_core = \ -I$(builddir)/libnm-core \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ - $(JANSSON_CFLAGS) + $(LIBUDEV_CFLAGS) + +if WITH_JANSSON +dflt_cppflags_libnm_core += $(JANSSON_CFLAGS) +endif if WITH_GNUTLS dflt_cppflags_libnm_core += $(GNUTLS_CFLAGS) @@ -499,18 +517,17 @@ GLIB_GENERATED += \ $(libnm_core_lib_c_mkenums) nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real) +nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' + +libnm-core/nm-core-enum-types.h.stamp: libnm-core/.dirstamp +libnm-core/nm-core-enum-types.c.stamp: libnm-core/.dirstamp + $(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(dispatcher_nm_dispatcher_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_core_libnm_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_libnm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -if CONFIG_PLUGIN_IFCFG_RH -$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -endif $(src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_devices_team_libnm_device_plugin_team_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -539,7 +556,11 @@ nodist_libnm_core_libnm_core_la_SOURCES = \ libnm_core_libnm_core_la_LIBADD = \ $(GLIB_LIBS) \ $(UUID_LIBS) \ - $(JANSSON_LIBS) + $(LIBUDEV_LIBS) + +if WITH_JANSSON +libnm_core_libnm_core_la_LIBADD += $(JANSSON_LIBS) +endif libnm_core_libnm_core_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) @@ -559,10 +580,12 @@ EXTRA_DIST += \ libnm-core/crypto_nss.c libnm-core/nm-vpn-dbus-types.xml: libnm-core/nm-vpn-dbus-interface.h tools/enums-to-docbook.pl - $(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $^ >$@ + @$(MKDIR_P) libnm-core/ + $(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $< >$@ libnm-core/nm-dbus-types.xml: libnm-core/nm-dbus-interface.h tools/enums-to-docbook.pl - $(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $^ >$@ + @$(MKDIR_P) libnm-core/ + $(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $< >$@ BUILT_SOURCES += \ libnm-core/nm-vpn-dbus-types.xml \ @@ -630,6 +653,16 @@ 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_settings_defaults_LDADD = $(libnm_core_tests_ldadd) +$(libnm_core_tests_test_compare_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(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_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + # test-cert.p12 created with: # # openssl pkcs12 -export \ @@ -670,6 +703,7 @@ libnm_lib_h_pub_real = \ libnm/nm-device-bond.h \ libnm/nm-device-bridge.h \ libnm/nm-device-bt.h \ + libnm/nm-device-dummy.h \ libnm/nm-device-ethernet.h \ libnm/nm-device-generic.h \ libnm/nm-device-infiniband.h \ @@ -720,6 +754,7 @@ libnm_lib_c_real = \ libnm/nm-device-bond.c \ libnm/nm-device-bridge.c \ libnm/nm-device-bt.c \ + libnm/nm-device-dummy.c \ libnm/nm-device-ethernet.c \ libnm/nm-device-generic.c \ libnm/nm-device-infiniband.c \ @@ -785,7 +820,7 @@ libnm_libnm_la_CPPFLAGS = \ $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ - $(GUDEV_CFLAGS) \ + $(LIBUDEV_CFLAGS) \ -DG_LOG_DOMAIN=\""libnm"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DNMRUNDIR=\"$(nmrundir)\" @@ -809,7 +844,7 @@ libnm_libnm_la_LIBADD = \ $(DL_LIBS) \ $(GLIB_LIBS) \ $(UUID_LIBS) \ - $(GUDEV_LIBS) + $(LIBUDEV_LIBS) libnm_libnm_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/libnm/libnm.ver" \ @@ -834,7 +869,7 @@ EXTRA_DIST += \ if HAVE_INTROSPECTION libnm/NM-1.0.gir: libnm/libnm.la libnm_NM_1_0_gir_INCLUDES = Gio-2.0 -libnm_NM_1_0_gir_PACKAGES = gio-2.0 gudev-1.0 +libnm_NM_1_0_gir_PACKAGES = gio-2.0 libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm libnm_NM_1_0_gir_CFLAGS = $(libnm_libnm_la_CPPFLAGS) libnm_NM_1_0_gir_LIBS = libnm/libnm.la @@ -952,6 +987,10 @@ libnm_tests_test_nm_client_LDADD = $(libnm_tests_ldadd) libnm_tests_test_remote_settings_client_LDADD = $(libnm_tests_ldadd) libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd) +$(libnm_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(libnm_tests_test_secret_agent_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### # just test, that we can build "nm-vpn-plugin-utils.c" @@ -1006,10 +1045,11 @@ src_cppflags = \ -DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \ -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \ \ - $(GUDEV_CFLAGS) \ + $(LIBUDEV_CFLAGS) \ $(LIBNL_CFLAGS) \ $(LIBNDP_CFLAGS) \ - $(LIBSOUP_CFLAGS) \ + $(LIBPSL_CFLAGS) \ + $(LIBCURL_CFLAGS) \ $(SELINUX_CFLAGS) \ $(LIBAUDIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ @@ -1062,6 +1102,7 @@ src_libsystemd_nm_la_SOURCES = \ src/systemd/sd-adapt/conf-parser.h \ src/systemd/sd-adapt/def.h \ src/systemd/sd-adapt/dirent-util.h \ + src/systemd/sd-adapt/env-util.h \ src/systemd/sd-adapt/format-util.h \ src/systemd/sd-adapt/gunicode.h \ src/systemd/sd-adapt/khash.h \ @@ -1188,6 +1229,7 @@ src_libsystemd_nm_la_SOURCES = \ src_libsystemd_nm_la_CPPFLAGS = $(src_libsystemd_nm_la_cppflags) src_libsystemd_nm_la_LIBADD = $(src_libsystemd_nm_la_libadd) +$(src_libsystemd_nm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### @@ -1261,8 +1303,11 @@ src_libNetworkManagerBase_la_LIBADD = \ introspection/libnmdbus.la \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ + $(LIBUDEV_LIBS) \ $(NULL) +$(src_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### src_libNetworkManager_la_CPPFLAGS = $(src_cppflags) @@ -1293,6 +1338,8 @@ src_libNetworkManager_la_SOURCES = \ src/devices/nm-device-bond.h \ src/devices/nm-device-bridge.c \ src/devices/nm-device-bridge.h \ + src/devices/nm-device-dummy.c \ + src/devices/nm-device-dummy.h \ src/devices/nm-device-ethernet.c \ src/devices/nm-device-ethernet.h \ src/devices/nm-device-infiniband.c \ @@ -1392,10 +1439,11 @@ src_libNetworkManager_la_SOURCES = \ src/nm-config.h \ src/nm-config-data.c \ src/nm-config-data.h \ - src/nm-connectivity.c \ src/nm-connectivity.h \ src/nm-dcb.c \ src/nm-dcb.h \ + src/nm-netns.c \ + src/nm-netns.h \ src/nm-default-route-manager.c \ src/nm-default-route-manager.h \ src/nm-dhcp4-config.c \ @@ -1430,19 +1478,26 @@ src_libNetworkManager_la_SOURCES = \ \ $(NULL) +if WITH_CONCHECK +src_libNetworkManager_la_SOURCES += \ + src/nm-connectivity.c +endif + src_libNetworkManager_la_LIBADD = \ src/libNetworkManagerBase.la \ src/libsystemd-nm.la \ $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ + $(LIBUDEV_LIBS) \ $(LIBNL_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ $(LIBNDP_LIBS) \ $(DL_LIBS) \ - $(LIBM) \ $(SELINUX_LIBS) \ $(LIBAUDIT_LIBS) \ - $(LIBSOUP_LIBS) + $(LIBPSL_LIBS) \ + $(LIBCURL_LIBS) + +$(src_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### @@ -1472,9 +1527,11 @@ src_libNetworkManagerTest_la_LIBADD = \ src/libNetworkManager.la \ $(CODE_COVERAGE_LDFLAGS) \ $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ + $(LIBUDEV_LIBS) \ $(LIBNL_LIBS) +$(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### src/NetworkManager.ver: src/libNetworkManager.la $(core_plugins) @@ -1497,6 +1554,8 @@ src_NetworkManager_LDFLAGS = \ -rdynamic \ -Wl,--version-script="src/NetworkManager.ver" +$(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### src_nm_iface_helper_CPPFLAGS = $(src_cppflags) @@ -1508,15 +1567,16 @@ src_nm_iface_helper_LDADD = \ src/libNetworkManagerBase.la \ src/libsystemd-nm.la \ $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ + $(LIBUDEV_LIBS) \ $(LIBNL_LIBS) \ $(LIBNDP_LIBS) \ - $(DL_LIBS) \ - $(LIBM) + $(DL_LIBS) src_nm_iface_helper_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" +$(src_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### EXTRA_DIST += \ @@ -1569,6 +1629,9 @@ src_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_tests_cppflags) src_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_tests_ldadd) src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd) +$(src_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + EXTRA_DIST += \ src/dhcp/tests/test-dhclient-duid.leases \ src/dhcp/tests/test-dhclient-commented-duid.leases \ @@ -1609,6 +1672,8 @@ src_ppp_nm_pppd_plugin_la_LIBADD = \ $(GLIB_LIBS) \ $(DL_LIBS) +$(src_ppp_nm_pppd_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + src_ppp_libnm_ppp_plugin_la_SOURCES = \ src/ppp/nm-pppd-plugin.h \ src/ppp/nm-ppp-manager.c \ @@ -1639,6 +1704,8 @@ src_ppp_libnm_ppp_plugin_la_LIBADD = \ introspection/libnmdbus.la \ $(GLIB_LIBS) +$(src_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + endif ############################################################################### @@ -1659,6 +1726,8 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ src/libNetworkManagerTest.la +$(src_settings_plugins_keyfile_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + EXTRA_DIST += \ src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \ src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \ @@ -1726,6 +1795,8 @@ src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES = \ src/settings/plugins/ibft/nms-ibft-reader.c \ src/settings/plugins/ibft/nms-ibft-reader.h +$(src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_SOURCES = \ src/settings/plugins/ibft/nms-ibft-plugin.c \ src/settings/plugins/ibft/nms-ibft-plugin.h \ @@ -1741,6 +1812,8 @@ src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LDFLAGS = \ src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LIBADD = \ src/settings/plugins/ibft/libnms-ibft-core.la +$(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + check_programs += src/settings/plugins/ibft/tests/test-ibft src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \ @@ -1764,6 +1837,8 @@ src_settings_plugins_ibft_tests_test_ibft_LDADD = \ src/settings/plugins/ibft/libnms-ibft-core.la \ src/libNetworkManagerTest.la +$(src_settings_plugins_ibft_tests_test_ibft_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + EXTRA_DIST += \ src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \ src/settings/plugins/ibft/tests/iscsiadm-test-static \ @@ -1819,6 +1894,7 @@ src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGL CLEANFILES += $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h: src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml + @$(MKDIR_P) src/settings/plugins/ifcfg-rh/ $(AM_V_GEN) gdbus-codegen \ --generate-c-code $(basename $@) \ --c-namespace NMDBus \ @@ -1828,8 +1904,6 @@ src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h: src/settings/plugins/ifcfg-rh/n src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h @true -$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h - ############################################################################### src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \ @@ -1845,6 +1919,8 @@ src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \ src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags) +$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \ @@ -1863,6 +1939,9 @@ src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la +$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h +$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la $(call check_so_symbols,$(builddir)/src/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so) @@ -1890,6 +1969,8 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ src/libNetworkManagerTest.la +$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + endif EXTRA_DIST += \ @@ -2012,6 +2093,7 @@ EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \ @@ -2047,7 +2129,33 @@ EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected \ + 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_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 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected # make target dependencies can't have colons in their names, which ends up # meaning that we can't add the alias files to EXTRA_DIST. They are instead @@ -2060,7 +2168,9 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1 dist-hook-settings-ifcfg-rh-alias-files: @for f in $(src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files); do \ @@ -2098,7 +2208,7 @@ src_settings_plugins_ifupdown_cppflags = \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) \ + $(LIBUDEV_CFLAGS) \ -DSYSCONFDIR=\"$(sysconfdir)\" @@ -2110,6 +2220,8 @@ src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \ src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags) +src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \ + $(LIBUDEV_LIBS) src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \ src/settings/plugins/ifupdown/nms-ifupdown-connection.c \ @@ -2124,7 +2236,10 @@ src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-settings.ver" src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \ - src/settings/plugins/ifupdown/libnms-ifupdown-core.la + src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ + $(LIBUDEV_LIBS) + +$(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la $(call check_so_symbols,$(builddir)/src/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so) @@ -2147,13 +2262,15 @@ src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \ -DTEST_ENI_DIR=\"$(abs_srcdir)/src/settings/plugins/ifupdown/tests\" src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \ - $(GLIB_LDFLAGS) + $(GLIB_LDFLAGS) \ $(CODE_COVERAGE_LDFLAGS) src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \ src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ src/libNetworkManagerTest.la +$(src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + endif EXTRA_DIST += \ @@ -2200,7 +2317,7 @@ src_settings_plugins_ifnet_cppflags = \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" \ -DSBINDIR=\"$(sbindir)\" src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES = \ @@ -2292,7 +2409,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) + $(LIBUDEV_CFLAGS) src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \ -module -avoid-version \ @@ -2300,7 +2417,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ introspection/libnmdbus.la \ - $(GUDEV_LIBS) + $(LIBUDEV_LIBS) check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver" @@ -2354,6 +2471,8 @@ src_devices_wwan_libnm_wwan_la_LIBADD = \ $(LIBSYSTEMD_LIBS) \ $(MM_GLIB_LIBS) +$(src_devices_wwan_libnm_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + EXTRA_src_devices_wwan_libnm_wwan_la_DEPENDENCIES = \ src/devices/wwan/libnm-wwan.ver @@ -2431,8 +2550,7 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \ introspection/libnmdbus.la \ src/devices/wwan/libnm-wwan.la \ - $(GLIB_LIBS) \ - $(GUDEV_LIBS) + $(GLIB_LIBS) if WITH_BLUEZ5_DUN src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS += $(BLUEZ5_CFLAGS) @@ -2488,8 +2606,7 @@ src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \ src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \ introspection/libnmdbus.la \ - $(GLIB_LIBS) \ - $(GUDEV_LIBS) + $(GLIB_LIBS) check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(srcdir)/linker-script-devices.ver" @@ -2519,6 +2636,8 @@ src_devices_wifi_tests_test_general_CPPFLAGS = \ src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la +$(src_devices_wifi_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + endif ############################################################################### @@ -2544,6 +2663,7 @@ src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(LIBTEAMDCTL_CFLAGS) \ + $(JANSSON_CFLAGS) \ $(GLIB_CFLAGS) src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \ @@ -2553,8 +2673,8 @@ src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \ src_devices_team_libnm_device_plugin_team_la_LIBADD = \ introspection/libnmdbus.la \ $(LIBTEAMDCTL_LIBS) \ - $(GLIB_LIBS) \ - $(GUDEV_LIBS) + $(JANSSON_LIBS) \ + $(GLIB_LIBS) check-local-devices-team: src/devices/team/libnm-device-plugin-team.la $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so "$(srcdir)/linker-script-devices.ver" @@ -2577,6 +2697,8 @@ src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \ src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \ src/libNetworkManagerTest.la +$(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### # src/platform/tests ############################################################################### @@ -2587,7 +2709,7 @@ src_platform_tests_ldflags = \ src_platform_tests_libadd = \ src/libNetworkManagerTest.la \ $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ + $(LIBUDEV_LIBS) \ $(LIBNL_LIBS) check_programs_norun += \ @@ -2657,6 +2779,18 @@ src_platform_tests_test_general_CPPFLAGS = $(src_tests_cppflags) src_platform_tests_test_general_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la +$(src_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_link_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_link_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_address_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_address_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_route_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_route_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_cleanup_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### # src/devices/tests ############################################################################### @@ -2678,6 +2812,9 @@ src_devices_tests_test_arping_LDFLAGS = $(src_devices_tests_ldflags) src_devices_tests_test_arping_LDADD = \ src/libNetworkManagerTest.la +$(src_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_devices_tests_test_arping_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### # src/ndisc/tests ############################################################################### @@ -2700,6 +2837,9 @@ src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_tests_cppflags) src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_flags) src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd) +$(src_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### # src/supplicant/tests ############################################################################### @@ -2713,6 +2853,8 @@ src_supplicant_tests_test_supplicant_config_CPPFLAGS = \ src_supplicant_tests_test_supplicant_config_LDADD = \ src/libNetworkManagerTest.la +$(src_supplicant_tests_test_supplicant_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + EXTRA_DIST += \ src/supplicant/tests/certs/test-ca-cert.pem \ src/supplicant/tests/certs/test-cert.p12 @@ -2736,6 +2878,8 @@ src_tests_config_test_config_CPPFLAGS = \ src_tests_config_test_config_LDADD = \ src/libNetworkManagerTest.la +$(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + EXTRA_DIST += \ src/tests/config/NetworkManager.conf \ src/tests/config/NetworkManager.state \ @@ -2801,6 +2945,14 @@ src_tests_test_utils_CPPFLAGS = $(src_tests_cppflags) src_tests_test_utils_LDFLAGS = $(src_tests_ldflags) src_tests_test_utils_LDADD = $(src_tests_ldadd) +$(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_resolvconf_capture_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_general_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) src_tests_test_route_manager_ldflags = \ $(CODE_COVERAGE_LDFLAGS) @@ -2808,7 +2960,7 @@ src_tests_test_route_manager_ldflags = \ src_tests_test_route_manager_ldadd = \ src/libNetworkManagerTest.la \ $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ + $(LIBUDEV_LIBS) \ $(LIBNL_LIBS) src_tests_test_route_manager_fake_SOURCES = src/tests/test-route-manager.c @@ -2821,12 +2973,16 @@ src_tests_test_route_manager_linux_CPPFLAGS = $(src_tests_cppflags_linux) src_tests_test_route_manager_linux_LDFLAGS = $(src_tests_test_route_manager_ldflags) src_tests_test_route_manager_linux_LDADD = $(src_tests_test_route_manager_ldadd) +$(src_tests_test_route_manager_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_route_manager_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) src_tests_test_systemd_CPPFLAGS = $(src_libsystemd_nm_la_cppflags) src_tests_test_systemd_LDADD = \ src/libsystemd-nm.la \ $(src_libsystemd_nm_la_libadd) +$(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + EXTRA_DIST += \ src/tests/test-secret-agent.py @@ -2857,6 +3013,7 @@ dispatcher_nmdbus_dispatcher_sources = \ dispatcher/nmdbus-dispatcher.c dispatcher/nmdbus-dispatcher.h: dispatcher/nm-dispatcher.xml + @$(MKDIR_P) dispatcher/ $(AM_V_GEN) gdbus-codegen \ --generate-c-code $(basename $@) \ --c-namespace NMDBus \ @@ -2947,6 +3104,8 @@ dispatcher_tests_test_dispatcher_envp_LDADD = \ dispatcher/libnm-dispatcher-core.la \ $(GLIB_LIBS) +$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + EXTRA_DIST += \ dispatcher/tests/dispatcher-connectivity-full \ dispatcher/tests/dispatcher-connectivity-unknown \ @@ -2980,6 +3139,8 @@ clients_nm_online_LDADD = \ libnm/libnm.la \ $(GLIB_LIBS) +$(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### # clients/cli ############################################################################### @@ -2989,6 +3150,7 @@ if BUILD_NMCLI bin_PROGRAMS += clients/cli/nmcli clients_cli_nmcli_SOURCES = \ + \ clients/cli/agent.c \ clients/cli/agent.h \ clients/cli/common.c \ @@ -3045,6 +3207,7 @@ clients_cli_nmcli_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" $(clients_cli_nmcli_OBJECTS): $(clients_cli_settings_doc_c) +$(clients_cli_nmcli_OBJECTS): clients/cli/.dirstamp install-data-hook-nmcli: $(mkinstalldirs) $(DESTDIR)$(completiondir) @@ -3063,7 +3226,8 @@ endif clients_cli_settings_doc_c = clients/cli/settings-docs.c if HAVE_INTROSPECTION $(clients_cli_settings_doc_c): clients/cli/settings-docs.xsl libnm/nm-property-docs.xml - $(AM_V_GEN) $(XSLTPROC) --output $@ $^ + $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) +$(clients_cli_settings_doc_c): clients/cli/.dirstamp DISTCLEANFILES += $(clients_cli_settings_doc_c) else $(clients_cli_settings_doc_c): @@ -3243,7 +3407,6 @@ clients_tui_nmtui_CPPFLAGS = \ -I$(srcdir)/clients/common \ $(GLIB_CFLAGS) \ $(NEWT_CFLAGS) \ - $(GUDEV_CFLAGS) \ -DG_LOG_DOMAIN=\""nmtui"\" \ -DLOCALEDIR=\""$(localedir)"\" \ $(NULL) @@ -3254,11 +3417,12 @@ clients_tui_nmtui_LDFLAGS = \ clients_tui_nmtui_LDADD = \ libnm/libnm.la \ clients/tui/newt/libnmt-newt.a \ - $(GUDEV_LIBS) \ - $(NEWT_LIBS) \ $(GLIB_LIBS) \ + $(NEWT_LIBS) \ $(NULL) +$(clients_tui_nmtui_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + nmtui_links = nmtui-edit nmtui-connect nmtui-hostname install-exec-hook-nmtui: @@ -3282,12 +3446,19 @@ endif ############################################################################### data_edit = sed \ + -e 's|@NM_VERSION[@]|$(NM_VERSION)|g' \ -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ + -e 's|@nmrundir[@]|$(nmrundir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@libexecdir[@]|$(libexecdir)|g' \ - -e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g' + -e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g' \ + -e 's|@NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT[@]|$(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT)|g' \ + -e 's|@NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT)|g' \ + -e 's|@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT)|g' \ + -e 's|@NM_CONFIG_DEFAULT_MAIN_RC_MANAGER[@]|$(NM_CONFIG_DEFAULT_MAIN_RC_MANAGER)|g' \ + -e 's|@NM_CONFIG_DEFAULT_MAIN_DHCP[@]|$(NM_CONFIG_DEFAULT_MAIN_DHCP)|g' if HAVE_SYSTEMD @@ -3333,7 +3504,7 @@ udevrules_DATA = \ endif data/server.conf: $(srcdir)/data/server.conf.in - @mkdir -p data/ + @$(MKDIR_P) data/ $(AM_V_GEN) $(data_edit) $< >$@ EXTRA_DIST += \ @@ -3472,6 +3643,8 @@ nodist_libnm_util_libnm_util_la_SOURCES = \ $(libnm_util_lib_h_pub_mkenums) \ $(libnm_util_lib_c_mkenums) +$(libnm_util_libnm_util_la_OBJECTS): $(libnm_util_lib_h_pub_mkenums) + libnm_util_libnm_util_la_CPPFLAGS = $(libnm_util_cppflags) @@ -3622,6 +3795,14 @@ libnm_util_tests_test_libnm_linking_LDADD = \ libnm/libnm.la \ $(libnm_util_tests_ldadd) +$(libnm_util_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(libnm_util_tests_test_crypto_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(libnm_util_tests_test_secrets_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(libnm_util_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(libnm_util_tests_test_setting_8021x_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(libnm_util_tests_test_setting_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(libnm_util_tests_test_libnm_linking_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### # libnm-glib ############################################################################### @@ -3696,6 +3877,7 @@ libnm_glib_lib_h_pub_real = \ libnm_glib_lib_h_pub_mkenums = \ libnm-glib/nm-glib-enum-types.h libnm_glib_lib_h_priv = \ + shared/nm-utils/nm-udev-utils.h \ libnm-glib/nm-object-private.h \ libnm-glib/nm-device-private.h \ libnm-glib/nm-types-private.h \ @@ -3722,6 +3904,7 @@ nodist_libnm_glib_libnmvpn_HEADERS = \ $(libnm_glib_vpn_h_mkenums) libnm_glib_lib_c_real = \ + shared/nm-utils/nm-udev-utils.c \ libnm-glib/nm-object.c \ libnm-glib/nm-dbus-helpers.c \ libnm-glib/nm-client.c \ @@ -3766,7 +3949,7 @@ nodist_libnm_glib_libnm_glib_la_SOURCES = \ libnm_glib_libnm_glib_la_CPPFLAGS = \ $(libnm_glib_cppflags) \ - $(GUDEV_CFLAGS) \ + $(LIBUDEV_CFLAGS) \ -DNMRUNDIR=\"$(nmrundir)\" libnm_glib_libnm_glib_la_LDFLAGS = \ @@ -3778,8 +3961,8 @@ libnm_glib_libnm_glib_la_LIBADD = \ libnm-glib/libdeprecated-nm-glib.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) \ - $(GUDEV_LIBS) - + $(LIBUDEV_LIBS) +$(libnm_glib_libnm_glib_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) GLIB_GENERATED += \ $(libnm_glib_lib_h_pub_mkenums) \ @@ -3796,7 +3979,7 @@ libnm_glib_libnm_glib_test_LDADD = \ libnm-util/libnm-util.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) - +$(libnm_glib_libnm_glib_test_OBJECTS): $(libnm_core_lib_h_pub_mkenums) lib_LTLIBRARIES += libnm-glib/libnm-glib-vpn.la @@ -3818,6 +4001,7 @@ libnm_glib_libnm_glib_vpn_la_LIBADD = \ libnm_glib_libnm_glib_vpn_la_LDFLAGS = \ -Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib-vpn.ver \ -version-info "3:0:2" +$(libnm_glib_libnm_glib_vpn_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) GLIB_GENERATED += \ @@ -3858,7 +4042,7 @@ EXTRA_DIST += \ if HAVE_INTROSPECTION libnm-glib/NMClient-1.0.gir: libnm-glib/libnm-glib.la $(builddir)/libnm-util/NetworkManager-1.0.gir libnm_glib_NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0 -libnm_glib_NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 gudev-1.0 +libnm_glib_NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 libnm_glib_NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn libnm_glib_NMClient_1_0_gir_CFLAGS = $(libnm_glib_cppflags) libnm_glib_NMClient_1_0_gir_LIBS = \ @@ -3924,6 +4108,9 @@ libnm_glib_tests_test_nm_client_LDADD = \ $(GLIB_LIBS) \ $(DBUS_LIBS) +$(libnm_glib_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + + libnm_glib_tests_test_remote_settings_client_CPPFLAGS = $(libnm_glib_tests_cppflags) libnm_glib_tests_test_remote_settings_client_SOURCES = \ @@ -3937,12 +4124,18 @@ libnm_glib_tests_test_remote_settings_client_LDADD = \ $(GLIB_LIBS) \ $(DBUS_LIBS) +$(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + endif ############################################################################### # man ############################################################################### +man/common.ent: man/common.ent.in + @$(MKDIR_P) man/ + $(AM_V_GEN) $(data_edit) $< >$@ + xsltproc_flags = \ --path man \ --xinclude \ @@ -3951,9 +4144,10 @@ xsltproc_flags = \ --stringparam funcsynopsis.style ansi \ --stringparam man.th.extra1.suppress 1 \ --stringparam man.authors.section.enabled 0 \ - --stringparam man.copyright.section.enabled 0 + --stringparam man.copyright.section.enabled 0 \ + --stringparam man.th.title.max.length 30 -if HAVE_INTROSPECTION +if BUILD_DOCS man/%.1 man/%.5 man/%.7 man/%.8: man/%.xml man/common.ent $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< @@ -3975,16 +4169,16 @@ CLEANFILES += $(man_nm_settings_xml) endif man_pages += \ - man/nmcli.1 \ - man/nmtui.1 \ - man/nm-online.1 \ + man/NetworkManager.8 \ man/NetworkManager.conf.5 \ + man/nm-online.1 \ man/nmcli-examples.7 \ - man/NetworkManager.8 + man/nmcli.1 \ + man/nmtui.1 man_pages_autogen += \ - man/nm-settings.5 \ - man/nm-settings-keyfile.5 + man/nm-settings-keyfile.5 \ + man/nm-settings.5 if CONFIG_PLUGIN_IFCFG_RH man_pages_autogen += man/nm-settings-ifcfg-rh.5 @@ -3993,7 +4187,11 @@ EXTRA_DIST += man/nm-settings-ifcfg-rh.5 dist_dependencies += man/nm-settings-ifcfg-rh.5 endif +CLEANFILES += \ + man/common.ent + EXTRA_DIST += \ + man/common.ent.in \ $(man_nm_settings_xml) \ $(addsuffix .xsl,$(basename $(man_nm_settings_xml))) \ $(man_pages) \ @@ -4001,41 +4199,32 @@ EXTRA_DIST += \ $(man_pages_autogen) +if HAVE_DOCS + install-data-hook-man: - if test -n "$(install_manpages)"; then \ - for link in $(nmtui_links); do \ - ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \ - done; \ - ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5; \ - fi + for link in $(nmtui_links); do \ + ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \ + done; \ + ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5; install_data_hook += install-data-hook-man uninstall-hook-man: - if test -n "$(install_manpages)"; then \ - for link in $(nmtui_links); do \ - rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \ - done; \ - rm -f $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5; \ - fi + for link in $(nmtui_links); do \ + rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \ + done; \ + rm -f $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5; uninstall_hook += uninstall-hook-man -if HAVE_INTROSPECTION -install_manpages = true man_MANS += $(man_pages) -CLEANFILES += $(man_pages) -if SETTING_DOCS_AVAILABLE man_MANS += $(man_pages_autogen) -CLEANFILES += $(man_pages_autogen) -endif -else -if INSTALL_PREGEN_MANPAGES -install_manpages = true -man_MANS += \ - $(man_pages) \ - $(man_pages_autogen) + endif + +if BUILD_DOCS +CLEANFILES += $(man_pages) +CLEANFILES += $(man_pages_autogen) endif dist_dependencies += $(man_pages) @@ -4071,7 +4260,7 @@ vapi_libnm_glib_vapi_METADATADIRS = $(srcdir)/vapi vapi_libnm_glib_vapi_FILES = $(builddir)/libnm-glib/NMClient-1.0.gir vapi_libnm_glib_vapi_VAPIDIRS = $(builddir)/vapi vapi_libnm_glib_vapi_GIRDIRS = $(builddir)/libnm-util -vapi_libnm_glib_vapi_DEPS = gio-2.0 +vapi_libnm_glib_vapi_DEPS = gio-2.0 dbus-glib-1 libnm-util vapi_DATA += \ $(VAPIGEN_VAPIS) \ @@ -4207,4 +4396,5 @@ cscope: ############################################################################### +.DELETE_ON_ERROR: .PHONY: cscope dist-configure-check $(check_local) $(dist_hook) diff --git a/Makefile.examples b/Makefile.examples index 61c2b1df..63370e2c 100644 --- a/Makefile.examples +++ b/Makefile.examples @@ -3,12 +3,12 @@ ############################################################################### examples_C_glib_cppflags = \ - -I${top_srcdir}/shared \ - -I${top_builddir}/shared \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I${top_srcdir}/libnm \ - -I${top_builddir}/libnm \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/libnm \ + -I$(top_builddir)/libnm \ $(GLIB_CFLAGS) \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE @@ -29,20 +29,24 @@ examples_C_glib_add_connection_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus examples_C_glib_add_connection_gdbus_LDADD = \ $(GLIB_LIBS) \ $(UUID_LIBS) +$(examples_C_glib_add_connection_gdbus_OBJECTS): $(libnm_core_lib_h_pub_mkenums) examples_C_glib_add_connection_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm) examples_C_glib_add_connection_libnm_LDADD = \ libnm/libnm.la \ $(GLIB_LIBS) +$(examples_C_glib_add_connection_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums) examples_C_glib_get_active_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) examples_C_glib_get_active_connections_gdbus_LDADD = \ $(GLIB_LIBS) +$(examples_C_glib_get_active_connections_gdbus_OBJECTS): $(libnm_core_lib_h_pub_mkenums) examples_C_glib_get_ap_info_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm) examples_C_glib_get_ap_info_libnm_LDADD = \ libnm/libnm.la \ $(GLIB_LIBS) +$(examples_C_glib_get_ap_info_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums) examples_C_glib_list_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) examples_C_glib_list_connections_gdbus_LDADD = \ @@ -52,6 +56,7 @@ examples_C_glib_list_connections_libnm_CPPFLAGS = $(examples_C_glib_cppflags_lib examples_C_glib_list_connections_libnm_LDADD = \ libnm/libnm.la \ $(GLIB_LIBS) +$(examples_C_glib_list_connections_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums) examples_C_glib_monitor_nm_running_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) examples_C_glib_monitor_nm_running_gdbus_LDADD = \ @@ -68,9 +73,9 @@ examples_C_glib_monitor_nm_state_gdbus_LDADD = \ if WITH_QT examples_C_qt_cppflags = \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I${builddir}/examples/C/qt \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(builddir)/examples/C/qt \ $(DBUS_CFLAGS) \ $(QT_CFLAGS) @@ -138,6 +143,7 @@ EXTRA_DIST += \ examples/lua/lgi/deactivate-all.lua \ \ examples/nm-conf.d/30-anon.conf \ + examples/nm-conf.d/31-mac-addr-change.conf \ \ examples/python/dbus/nm-state.py \ examples/python/dbus/add-connection.py \ @@ -157,16 +163,17 @@ EXTRA_DIST += \ examples/python/dbus/create-bond.py \ examples/python/dbus/wifi-active-ap.py\ \ - examples/python/gi/list-connections.py \ + examples/python/gi/README \ + examples/python/gi/add_connection.py \ + examples/python/gi/deactivate-all.py \ examples/python/gi/device-state-ip4config.py \ examples/python/gi/firewall-zone.py \ - examples/python/gi/show-wifi-networks.py \ - examples/python/gi/get_ips.py \ - examples/python/gi/add_connection.py \ examples/python/gi/get-active-connections.py \ + examples/python/gi/get_ips.py \ + examples/python/gi/list-connections.py \ + examples/python/gi/setting-user-data.py \ + examples/python/gi/show-wifi-networks.py \ examples/python/gi/update-ip4-method.py \ - examples/python/gi/deactivate-all.py \ - examples/python/gi/README \ \ examples/python/python-networkmanager/README \ \ diff --git a/Makefile.in b/Makefile.in index 5b52db3c..2dfe0d0a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -143,44 +143,49 @@ libexec_PROGRAMS = src/nm-iface-helper$(EXEEXT) \ src/dhcp/nm-dhcp-helper$(EXEEXT) \ dispatcher/nm-dispatcher$(EXEEXT) TESTS = $(am__EXEEXT_10) -@BUILD_SETTING_DOCS_TRUE@am__append_1 = \ -@BUILD_SETTING_DOCS_TRUE@ docs/libnm \ -@BUILD_SETTING_DOCS_TRUE@ docs/api +@HAVE_DOCS_TRUE@am__append_1 = \ +@HAVE_DOCS_TRUE@ docs/libnm \ +@HAVE_DOCS_TRUE@ docs/api -@BUILD_SETTING_DOCS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_2 = \ -@BUILD_SETTING_DOCS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ docs/libnm-util \ -@BUILD_SETTING_DOCS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ docs/libnm-glib +@HAVE_DOCS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_2 = \ +@HAVE_DOCS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ docs/libnm-util \ +@HAVE_DOCS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ docs/libnm-glib -@BUILD_SETTING_DOCS_FALSE@am__append_3 = dist-configure-check +@BUILD_DOCS_FALSE@am__append_3 = dist-configure-check @WITH_LEGACY_LIBRARIES_FALSE@am__append_4 = dist-configure-check -@WITH_GNUTLS_TRUE@am__append_5 = $(GNUTLS_CFLAGS) -@WITH_NSS_TRUE@am__append_6 = $(NSS_CFLAGS) -@WITH_GNUTLS_TRUE@am__append_7 = libnm-core/crypto_gnutls.c -@WITH_GNUTLS_TRUE@am__append_8 = $(GNUTLS_LIBS) -@WITH_NSS_TRUE@am__append_9 = libnm-core/crypto_nss.c -@WITH_NSS_TRUE@am__append_10 = $(NSS_LIBS) -@HAVE_INTROSPECTION_TRUE@am__append_11 = libnm/NM-1.0.gir -@HAVE_INTROSPECTION_TRUE@am__append_12 = $(libnm_noinst_data) -@HAVE_INTROSPECTION_TRUE@am__append_13 = $(libnm_noinst_data) -@WITH_WEXT_TRUE@am__append_14 = \ +@WITH_JANSSON_TRUE@am__append_5 = $(JANSSON_CFLAGS) +@WITH_GNUTLS_TRUE@am__append_6 = $(GNUTLS_CFLAGS) +@WITH_NSS_TRUE@am__append_7 = $(NSS_CFLAGS) +@WITH_JANSSON_TRUE@am__append_8 = $(JANSSON_LIBS) +@WITH_GNUTLS_TRUE@am__append_9 = libnm-core/crypto_gnutls.c +@WITH_GNUTLS_TRUE@am__append_10 = $(GNUTLS_LIBS) +@WITH_NSS_TRUE@am__append_11 = libnm-core/crypto_nss.c +@WITH_NSS_TRUE@am__append_12 = $(NSS_LIBS) +@HAVE_INTROSPECTION_TRUE@am__append_13 = libnm/NM-1.0.gir +@HAVE_INTROSPECTION_TRUE@am__append_14 = $(libnm_noinst_data) +@HAVE_INTROSPECTION_TRUE@am__append_15 = $(libnm_noinst_data) +@WITH_WEXT_TRUE@am__append_16 = \ @WITH_WEXT_TRUE@ src/platform/wifi/wifi-utils-wext.c \ @WITH_WEXT_TRUE@ src/platform/wifi/wifi-utils-wext.h -@REQUIRE_ROOT_TESTS_TRUE@am__append_15 = -DREQUIRE_ROOT_TESTS=1 +@WITH_CONCHECK_TRUE@am__append_17 = \ +@WITH_CONCHECK_TRUE@ src/nm-connectivity.c + +@REQUIRE_ROOT_TESTS_TRUE@am__append_18 = -DREQUIRE_ROOT_TESTS=1 ############################################################################### # src/ppp ############################################################################### -@WITH_PPP_TRUE@am__append_16 = src/ppp/libnm-ppp-plugin.la -@WITH_PPP_TRUE@am__append_17 = src/ppp/nm-pppd-plugin.la +@WITH_PPP_TRUE@am__append_19 = src/ppp/libnm-ppp-plugin.la +@WITH_PPP_TRUE@am__append_20 = src/ppp/nm-pppd-plugin.la ############################################################################### # src/settings/plugins/ibft ############################################################################### -@CONFIG_PLUGIN_IBFT_TRUE@am__append_18 = src/settings/plugins/ibft/libnm-settings-plugin-ibft.la -@CONFIG_PLUGIN_IBFT_TRUE@am__append_19 = src/settings/plugins/ibft/libnms-ibft-core.la -@CONFIG_PLUGIN_IBFT_TRUE@am__append_20 = src/settings/plugins/ibft/tests/test-ibft -@CONFIG_PLUGIN_IBFT_TRUE@am__append_21 = \ +@CONFIG_PLUGIN_IBFT_TRUE@am__append_21 = src/settings/plugins/ibft/libnm-settings-plugin-ibft.la +@CONFIG_PLUGIN_IBFT_TRUE@am__append_22 = src/settings/plugins/ibft/libnms-ibft-core.la +@CONFIG_PLUGIN_IBFT_TRUE@am__append_23 = src/settings/plugins/ibft/tests/test-ibft +@CONFIG_PLUGIN_IBFT_TRUE@am__append_24 = \ @CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \ @CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-static \ @CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-bad-ipaddr \ @@ -191,124 +196,124 @@ TESTS = $(am__EXEEXT_10) @CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-bad-record \ @CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-vlan -@CONFIG_PLUGIN_IBFT_TRUE@am__append_22 = check-local-symbols-settings-ibft +@CONFIG_PLUGIN_IBFT_TRUE@am__append_25 = check-local-symbols-settings-ibft ############################################################################### # src/settings/plugins/ifcfg-rh ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_23 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_24 = \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_26 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_25 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_26 = check-local-symbols-settings-ifcfg-rh +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_29 = check-local-symbols-settings-ifcfg-rh ############################################################################### # src/settings/plugins/ifcfg-rh/tests ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_30 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_31 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf ############################################################################### # src/settings/plugins/ifupdown ############################################################################### -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_29 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_30 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_31 = check-local-symbols-settings-ifupdown +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_32 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_33 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_34 = check-local-symbols-settings-ifupdown ############################################################################### -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_32 = src/settings/plugins/ifupdown/tests/test-ifupdown +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_35 = src/settings/plugins/ifupdown/tests/test-ifupdown ############################################################################### # src/settings/plugins/ifnet ############################################################################### -@CONFIG_PLUGIN_IFNET_TRUE@am__append_33 = src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la -@CONFIG_PLUGIN_IFNET_TRUE@am__append_34 = src/settings/plugins/ifnet/libnms-ifnet-core.la -@CONFIG_PLUGIN_IFNET_TRUE@am__append_35 = check-local-symbols-settings-ifnet +@CONFIG_PLUGIN_IFNET_TRUE@am__append_36 = src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la +@CONFIG_PLUGIN_IFNET_TRUE@am__append_37 = src/settings/plugins/ifnet/libnms-ifnet-core.la +@CONFIG_PLUGIN_IFNET_TRUE@am__append_38 = check-local-symbols-settings-ifnet ############################################################################### -@CONFIG_PLUGIN_IFNET_TRUE@am__append_36 = src/settings/plugins/ifnet/tests/test-ifnet +@CONFIG_PLUGIN_IFNET_TRUE@am__append_39 = src/settings/plugins/ifnet/tests/test-ifnet ############################################################################### # src/devices/bluetooth ############################################################################### -@WITH_MODEM_MANAGER_1_TRUE@am__append_37 = \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_40 = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-device-plugin-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/libnm-device-plugin-bluetooth.la -@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_38 = \ +@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_41 = \ @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@ src/devices/wwan/nm-modem-ofono.c \ @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@ src/devices/wwan/nm-modem-ofono.h -@WITH_MODEM_MANAGER_1_TRUE@am__append_39 = check-local-devices-wwan \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = check-local-devices-wwan \ @WITH_MODEM_MANAGER_1_TRUE@ check-local-devices-bluetooth -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_40 = $(BLUEZ5_CFLAGS) -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_41 = \ +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = $(BLUEZ5_CFLAGS) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_44 = \ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-bluez5-dun.c \ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-bluez5-dun.h -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = $(BLUEZ5_LIBS) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_45 = $(BLUEZ5_LIBS) ############################################################################### # src/devices/wifi ############################################################################### -@WITH_WIFI_TRUE@am__append_43 = src/devices/wifi/libnm-device-plugin-wifi.la -@WITH_WIFI_TRUE@am__append_44 = check-local-devices-wifi -@WITH_WIFI_TRUE@am__append_45 = src/devices/wifi/tests/test-general +@WITH_WIFI_TRUE@am__append_46 = src/devices/wifi/libnm-device-plugin-wifi.la +@WITH_WIFI_TRUE@am__append_47 = check-local-devices-wifi +@WITH_WIFI_TRUE@am__append_48 = src/devices/wifi/tests/test-general ############################################################################### # src/devices/team ############################################################################### -@WITH_TEAMDCTL_TRUE@am__append_46 = src/devices/team/libnm-device-plugin-team.la -@WITH_TEAMDCTL_TRUE@am__append_47 = check-local-devices-team +@WITH_TEAMDCTL_TRUE@am__append_49 = src/devices/team/libnm-device-plugin-team.la +@WITH_TEAMDCTL_TRUE@am__append_50 = check-local-devices-team ############################################################################### # clients/cli ############################################################################### -@BUILD_NMCLI_TRUE@am__append_48 = clients/cli/nmcli -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_49 = $(POLKIT_CFLAGS) -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_50 = \ +@BUILD_NMCLI_TRUE@am__append_51 = clients/cli/nmcli +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_52 = $(POLKIT_CFLAGS) +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_53 = \ @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@ clients/common/nm-polkit-listener.c \ @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@ clients/common/nm-polkit-listener.h -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_51 = $(POLKIT_LIBS) -@BUILD_NMCLI_TRUE@am__append_52 = install-data-hook-nmcli -@BUILD_NMCLI_TRUE@am__append_53 = uninstall-hook-nmcli -@HAVE_INTROSPECTION_TRUE@am__append_54 = $(clients_cli_settings_doc_c) +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_54 = $(POLKIT_LIBS) +@BUILD_NMCLI_TRUE@am__append_55 = install-data-hook-nmcli +@BUILD_NMCLI_TRUE@am__append_56 = uninstall-hook-nmcli +@HAVE_INTROSPECTION_TRUE@am__append_57 = $(clients_cli_settings_doc_c) ############################################################################### # clients/tui ############################################################################### -@BUILD_NMTUI_TRUE@am__append_55 = clients/tui/newt/libnmt-newt.a -@BUILD_NMTUI_TRUE@am__append_56 = clients/tui/nmtui -@BUILD_NMTUI_TRUE@am__append_57 = install-exec-hook-nmtui -@BUILD_NMTUI_TRUE@am__append_58 = uninstall-hook-nmtui -@HAVE_SYSTEMD_TRUE@am__append_59 = data/org.freedesktop.NetworkManager.service -@HAVE_SYSTEMD_TRUE@am__append_60 = install-exec-local-data +@BUILD_NMTUI_TRUE@am__append_58 = clients/tui/newt/libnmt-newt.a +@BUILD_NMTUI_TRUE@am__append_59 = clients/tui/nmtui +@BUILD_NMTUI_TRUE@am__append_60 = install-exec-hook-nmtui +@BUILD_NMTUI_TRUE@am__append_61 = uninstall-hook-nmtui +@HAVE_SYSTEMD_TRUE@am__append_62 = data/org.freedesktop.NetworkManager.service +@HAVE_SYSTEMD_TRUE@am__append_63 = install-exec-local-data ############################################################################### # libnm-util ############################################################################### -@WITH_LEGACY_LIBRARIES_TRUE@am__append_61 = libnm-util/libnm-util.la \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_64 = libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_62 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_65 = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_util_lib_h_pub_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_util_lib_c_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_lib_h_pub_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_lib_c_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_vpn_h_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_vpn_c_mkenums) -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_63 = $(GNUTLS_CFLAGS) -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_64 = libnm-util/crypto_gnutls.c -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_65 = $(GNUTLS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_66 = $(NSS_CFLAGS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_67 = libnm-util/crypto_nss.c -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_68 = $(NSS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@am__append_69 = \ +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_66 = $(GNUTLS_CFLAGS) +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_67 = libnm-util/crypto_gnutls.c +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_68 = $(GNUTLS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_69 = $(NSS_CFLAGS) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_70 = libnm-util/crypto_nss.c +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_71 = $(NSS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto_gnutls.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto_nss.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/COPYING \ @@ -318,26 +323,26 @@ TESTS = $(am__EXEEXT_10) @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.pc.in \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.ver \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.ver -@WITH_LEGACY_LIBRARIES_TRUE@am__append_70 = libnm-util/libtest-crypto.la -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 = libnm-util/crypto_gnutls.c -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = $(GNUTLS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_73 = libnm-util/crypto_nss.c -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_74 = $(NSS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@am__append_75 = libnm-util/libnm-util.pc \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_73 = libnm-util/libtest-crypto.la +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_74 = libnm-util/crypto_gnutls.c +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_75 = $(GNUTLS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_76 = libnm-util/crypto_nss.c +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_77 = $(NSS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@am__append_78 = libnm-util/libnm-util.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.pc -@WITH_LEGACY_LIBRARIES_TRUE@am__append_76 = libnm-util/libnm-util.pc \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = libnm-util/libnm-util.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc -@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 = libnm-util/NetworkManager-1.0.gir \ +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_80 = libnm-util/NetworkManager-1.0.gir \ @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/NMClient-1.0.gir -@WITH_LEGACY_LIBRARIES_TRUE@am__append_78 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_81 = \ @WITH_LEGACY_LIBRARIES_TRUE@ check-local-exports-libnm-util \ @WITH_LEGACY_LIBRARIES_TRUE@ check-local-exports-libnm-glib -@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = libnm-util/libnm-util.la \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_82 = libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_80 = libnm-util/tests/test-settings-defaults \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/tests/test-settings-defaults \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-crypto \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-secrets \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-general \ @@ -345,54 +350,50 @@ TESTS = $(am__EXEEXT_10) @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-setting-dcb \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-nm-client \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-remote-settings-client -@WITH_LEGACY_LIBRARIES_TRUE@am__append_81 = libnm-util/tests/test-libnm-linking \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_84 = libnm-util/tests/test-libnm-linking \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-test -@WITH_LEGACY_LIBRARIES_TRUE@am__append_82 = libnm-glib/libdeprecated-nm-glib.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_85 = libnm-glib/libdeprecated-nm-glib.la +@WITH_LEGACY_LIBRARIES_TRUE@am__append_86 = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-vpn-plugin-glue.h \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-secret-agent-glue.h -@HAVE_INTROSPECTION_TRUE@am__append_84 = $(man_nm_settings_xml) \ -@HAVE_INTROSPECTION_TRUE@ $(man_pages) -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_85 = man/nm-settings-ifcfg-rh.5 -@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_86 = man/nm-settings-ifcfg-rh.5 -@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_87 = man/nm-settings-ifcfg-rh.5 -@HAVE_INTROSPECTION_TRUE@am__append_88 = $(man_pages) -@HAVE_INTROSPECTION_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_89 = $(man_pages_autogen) -@HAVE_INTROSPECTION_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_90 = $(man_pages_autogen) -@HAVE_INTROSPECTION_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@am__append_91 = \ -@HAVE_INTROSPECTION_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@ $(man_pages) \ -@HAVE_INTROSPECTION_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@ $(man_pages_autogen) - +@HAVE_INTROSPECTION_TRUE@am__append_87 = $(man_nm_settings_xml) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_88 = man/nm-settings-ifcfg-rh.5 +@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_89 = man/nm-settings-ifcfg-rh.5 +@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_90 = man/nm-settings-ifcfg-rh.5 +@HAVE_DOCS_TRUE@am__append_91 = install-data-hook-man +@HAVE_DOCS_TRUE@am__append_92 = uninstall-hook-man +@HAVE_DOCS_TRUE@am__append_93 = $(man_pages) $(man_pages_autogen) +@BUILD_DOCS_TRUE@am__append_94 = $(man_pages) $(man_pages_autogen) ############################################################################### # vapi ############################################################################### -@ENABLE_VAPIGEN_TRUE@am__append_92 = \ +@ENABLE_VAPIGEN_TRUE@am__append_95 = \ @ENABLE_VAPIGEN_TRUE@ vapi/libnm.vapi -@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_93 = \ +@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_96 = \ @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ vapi/libnm-util.vapi \ @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ vapi/libnm-glib.vapi -@ENABLE_VAPIGEN_TRUE@am__append_94 = \ +@ENABLE_VAPIGEN_TRUE@am__append_97 = \ @ENABLE_VAPIGEN_TRUE@ $(VAPIGEN_VAPIS) \ @ENABLE_VAPIGEN_TRUE@ $(VAPIGEN_VAPIS:.vapi=.deps) -@ENABLE_VAPIGEN_TRUE@am__append_95 = $(VAPIGEN_VAPIS) +@ENABLE_VAPIGEN_TRUE@am__append_98 = $(VAPIGEN_VAPIS) ############################################################################### -@ENABLE_TESTS_TRUE@am__append_96 = $(check_programs) $(check_programs_norun) -@ENABLE_TESTS_TRUE@am__append_97 = $(check_ltlibraries) -@ENABLE_TESTS_FALSE@am__append_98 = $(check_programs) $(check_programs_norun) -@ENABLE_TESTS_FALSE@am__append_99 = $(check_ltlibraries) -@WITH_QT_TRUE@am__append_100 = \ +@ENABLE_TESTS_TRUE@am__append_99 = $(check_programs) $(check_programs_norun) +@ENABLE_TESTS_TRUE@am__append_100 = $(check_ltlibraries) +@ENABLE_TESTS_FALSE@am__append_101 = $(check_programs) $(check_programs_norun) +@ENABLE_TESTS_FALSE@am__append_102 = $(check_ltlibraries) +@WITH_QT_TRUE@am__append_103 = \ @WITH_QT_TRUE@ examples/C/qt/add-connection-wired \ @WITH_QT_TRUE@ examples/C/qt/list-connections \ @WITH_QT_TRUE@ examples/C/qt/change-ipv4-addresses \ @WITH_QT_TRUE@ examples/C/qt/monitor-nm-running -@WITH_QT_TRUE@am__append_101 = \ +@WITH_QT_TRUE@am__append_104 = \ @WITH_QT_TRUE@ examples/C/qt/monitor-nm-running.moc subdir = . @@ -425,7 +426,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = shared/nm-version-macros.h libnm/libnm.pc \ libnm-util/libnm-util.pc libnm-glib/libnm-glib.pc \ - libnm-glib/libnm-glib-vpn.pc man/common.ent \ + libnm-glib/libnm-glib-vpn.pc \ data/org.freedesktop.NetworkManager.policy.in \ NetworkManager.pc CONFIG_CLEAN_VPATH_FILES = @@ -570,6 +571,7 @@ am__objects_1 = introspection/introspection_libnmdbus_la-org.freedesktop.Network introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Bond.lo \ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Bridge.lo \ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo \ + introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo \ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo \ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.lo \ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo \ @@ -602,11 +604,13 @@ am__objects_1 = introspection/introspection_libnmdbus_la-org.freedesktop.Network nodist_introspection_libnmdbus_la_OBJECTS = $(am__objects_1) introspection_libnmdbus_la_OBJECTS = \ $(nodist_introspection_libnmdbus_la_OBJECTS) -@WITH_GNUTLS_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -@WITH_NSS_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) +@WITH_JANSSON_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +@WITH_GNUTLS_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) +@WITH_NSS_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) libnm_core_libnm_core_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_4) am__libnm_core_libnm_core_la_SOURCES_DIST = \ shared/nm-version-macros.h libnm-core/nm-connection.h \ libnm-core/nm-core-types.h libnm-core/nm-dbus-interface.h \ @@ -616,8 +620,8 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ libnm-core/nm-setting-bridge-port.h \ libnm-core/nm-setting-bridge.h libnm-core/nm-setting-cdma.h \ libnm-core/nm-setting-connection.h libnm-core/nm-setting-dcb.h \ - libnm-core/nm-setting-generic.h libnm-core/nm-setting-gsm.h \ - libnm-core/nm-setting-infiniband.h \ + libnm-core/nm-setting-dummy.h libnm-core/nm-setting-generic.h \ + libnm-core/nm-setting-gsm.h libnm-core/nm-setting-infiniband.h \ libnm-core/nm-setting-ip-config.h \ libnm-core/nm-setting-ip-tunnel.h \ libnm-core/nm-setting-ip4-config.h \ @@ -627,34 +631,38 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ libnm-core/nm-setting-pppoe.h libnm-core/nm-setting-proxy.h \ libnm-core/nm-setting-serial.h \ libnm-core/nm-setting-team-port.h libnm-core/nm-setting-team.h \ - libnm-core/nm-setting-tun.h libnm-core/nm-setting-vlan.h \ - libnm-core/nm-setting-vpn.h libnm-core/nm-setting-vxlan.h \ - libnm-core/nm-setting-wimax.h libnm-core/nm-setting-wired.h \ + libnm-core/nm-setting-tun.h libnm-core/nm-setting-user.h \ + libnm-core/nm-setting-vlan.h libnm-core/nm-setting-vpn.h \ + libnm-core/nm-setting-vxlan.h libnm-core/nm-setting-wimax.h \ + libnm-core/nm-setting-wired.h \ libnm-core/nm-setting-wireless-security.h \ libnm-core/nm-setting-wireless.h libnm-core/nm-setting.h \ libnm-core/nm-simple-connection.h libnm-core/nm-utils.h \ libnm-core/nm-version.h libnm-core/nm-vpn-dbus-interface.h \ libnm-core/nm-vpn-editor-plugin.h \ libnm-core/nm-vpn-plugin-info.h \ - shared/nm-utils/nm-shared-utils.h libnm-core/crypto.h \ - libnm-core/nm-connection-private.h \ + shared/nm-utils/nm-shared-utils.h \ + shared/nm-utils/nm-udev-utils.h shared/nm-setting-metadata.h \ + libnm-core/crypto.h libnm-core/nm-connection-private.h \ libnm-core/nm-core-internal.h \ libnm-core/nm-core-types-internal.h \ libnm-core/nm-keyfile-internal.h libnm-core/nm-keyfile-utils.h \ libnm-core/nm-property-compare.h \ libnm-core/nm-setting-private.h libnm-core/nm-utils-private.h \ - shared/nm-utils/nm-shared-utils.c libnm-core/crypto.c \ - libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \ - libnm-core/nm-errors.c libnm-core/nm-keyfile-reader.c \ - libnm-core/nm-keyfile-utils.c libnm-core/nm-keyfile-writer.c \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-udev-utils.c shared/nm-setting-metadata.c \ + libnm-core/crypto.c libnm-core/nm-connection.c \ + libnm-core/nm-dbus-utils.c libnm-core/nm-errors.c \ + libnm-core/nm-keyfile-reader.c libnm-core/nm-keyfile-utils.c \ + libnm-core/nm-keyfile-writer.c \ libnm-core/nm-property-compare.c libnm-core/nm-setting-8021x.c \ libnm-core/nm-setting-adsl.c libnm-core/nm-setting-bluetooth.c \ libnm-core/nm-setting-bond.c \ libnm-core/nm-setting-bridge-port.c \ libnm-core/nm-setting-bridge.c libnm-core/nm-setting-cdma.c \ libnm-core/nm-setting-connection.c libnm-core/nm-setting-dcb.c \ - libnm-core/nm-setting-generic.c libnm-core/nm-setting-gsm.c \ - libnm-core/nm-setting-infiniband.c \ + libnm-core/nm-setting-dummy.c libnm-core/nm-setting-generic.c \ + libnm-core/nm-setting-gsm.c libnm-core/nm-setting-infiniband.c \ libnm-core/nm-setting-ip-config.c \ libnm-core/nm-setting-ip-tunnel.c \ libnm-core/nm-setting-ip4-config.c \ @@ -664,9 +672,10 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ libnm-core/nm-setting-pppoe.c libnm-core/nm-setting-proxy.c \ libnm-core/nm-setting-serial.c \ libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \ - libnm-core/nm-setting-tun.c libnm-core/nm-setting-vlan.c \ - libnm-core/nm-setting-vpn.c libnm-core/nm-setting-vxlan.c \ - libnm-core/nm-setting-wimax.c libnm-core/nm-setting-wired.c \ + libnm-core/nm-setting-tun.c libnm-core/nm-setting-user.c \ + libnm-core/nm-setting-vlan.c libnm-core/nm-setting-vpn.c \ + libnm-core/nm-setting-vxlan.c libnm-core/nm-setting-wimax.c \ + libnm-core/nm-setting-wired.c \ libnm-core/nm-setting-wireless-security.c \ libnm-core/nm-setting-wireless.c libnm-core/nm-setting.c \ libnm-core/nm-simple-connection.c libnm-core/nm-utils.c \ @@ -678,6 +687,8 @@ am__objects_2 = @WITH_NSS_TRUE@am__objects_4 = libnm-core/libnm_core_libnm_core_la-crypto_nss.lo am__objects_5 = \ shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo \ + shared/libnm_core_libnm_core_la-nm-setting-metadata.lo \ libnm-core/libnm_core_libnm_core_la-crypto.lo \ libnm-core/libnm_core_libnm_core_la-nm-connection.lo \ libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo \ @@ -695,6 +706,7 @@ am__objects_5 = \ libnm-core/libnm_core_libnm_core_la-nm-setting-cdma.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-connection.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-dcb.lo \ + libnm-core/libnm_core_libnm_core_la-nm-setting-dummy.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-generic.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-gsm.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-infiniband.lo \ @@ -712,6 +724,7 @@ am__objects_5 = \ 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 \ + libnm-core/libnm_core_libnm_core_la-nm-setting-user.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-vlan.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-vpn.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-vxlan.lo \ @@ -778,7 +791,8 @@ libnm_glib_libnm_glib_vpn_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) -am__libnm_glib_libnm_glib_la_SOURCES_DIST = libnm-glib/nm-object.c \ +am__libnm_glib_libnm_glib_la_SOURCES_DIST = \ + shared/nm-utils/nm-udev-utils.c libnm-glib/nm-object.c \ libnm-glib/nm-dbus-helpers.c libnm-glib/nm-client.c \ libnm-glib/nm-device.c libnm-glib/nm-device-ethernet.c \ libnm-glib/nm-device-infiniband.c libnm-glib/nm-device-adsl.c \ @@ -808,11 +822,13 @@ am__libnm_glib_libnm_glib_la_SOURCES_DIST = libnm-glib/nm-object.c \ libnm-glib/nm-dhcp6-config.h libnm-glib/nm-remote-connection.h \ libnm-glib/nm-remote-settings.h libnm-glib/nm-secret-agent.h \ libnm-glib/nm-device-wimax.h libnm-glib/nm-wimax-nsp.h \ - libnm-glib/nm-object-private.h libnm-glib/nm-device-private.h \ - libnm-glib/nm-types-private.h libnm-glib/nm-object-cache.h \ + shared/nm-utils/nm-udev-utils.h libnm-glib/nm-object-private.h \ + libnm-glib/nm-device-private.h libnm-glib/nm-types-private.h \ + libnm-glib/nm-object-cache.h \ libnm-glib/nm-remote-connection-private.h \ libnm-glib/nm-dbus-helpers-private.h -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_9 = libnm-glib/libnm_glib_libnm_glib_la-nm-object.lo \ +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_9 = shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-object.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-dbus-helpers.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-client.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-device.lo \ @@ -857,14 +873,14 @@ libnm_glib_libnm_glib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(LDFLAGS) -o $@ @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_la_rpath = \ @WITH_LEGACY_LIBRARIES_TRUE@ -rpath $(libdir) -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_4) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_5) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_5) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_6) am__libnm_util_libnm_util_la_SOURCES_DIST = \ shared/nm-utils/nm-shared-utils.c libnm-util/crypto.c \ libnm-util/nm-connection.c \ @@ -966,8 +982,8 @@ libnm_util_libnm_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @WITH_LEGACY_LIBRARIES_TRUE@ -rpath $(libdir) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_4) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_5) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_5) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_6) am__libnm_util_libtest_crypto_la_SOURCES_DIST = libnm-util/crypto.c \ libnm-util/crypto_gnutls.c libnm-util/crypto_nss.c @WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_15 = libnm-util/libnm_util_libtest_crypto_la-crypto_gnutls.lo @@ -991,6 +1007,7 @@ am__objects_17 = libnm/libnm_libnm_la-nm-access-point.lo \ libnm/libnm_libnm_la-nm-device-bond.lo \ libnm/libnm_libnm_la-nm-device-bridge.lo \ libnm/libnm_libnm_la-nm-device-bt.lo \ + libnm/libnm_libnm_la-nm-device-dummy.lo \ libnm/libnm_libnm_la-nm-device-ethernet.lo \ libnm/libnm_libnm_la-nm-device-generic.lo \ libnm/libnm_libnm_la-nm-device-infiniband.lo \ @@ -1056,13 +1073,12 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LINK = $(LIBTOOL) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS) \ $(LDFLAGS) -o $@ -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES = \ @WITH_MODEM_MANAGER_1_TRUE@ introspection/libnmdbus.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_1) \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_1) \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_6) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_7) am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST = \ src/devices/bluetooth/nm-bluez-manager.c \ src/devices/bluetooth/nm-bluez-common.h \ @@ -1119,7 +1135,7 @@ src_devices_team_libnm_device_plugin_team_la_LINK = $(LIBTOOL) \ @WITH_TEAMDCTL_TRUE@ -rpath $(pkglibdir) @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES = \ @WITH_WIFI_TRUE@ introspection/libnmdbus.la \ -@WITH_WIFI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@WITH_WIFI_TRUE@ $(am__DEPENDENCIES_1) am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST = \ src/devices/wifi/nm-wifi-factory.c \ src/devices/wifi/nm-device-wifi.c \ @@ -1194,6 +1210,102 @@ src_libNetworkManager_la_DEPENDENCIES = src/libNetworkManagerBase.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +am__src_libNetworkManager_la_SOURCES_DIST = \ + src/nm-checkpoint-manager.c src/nm-checkpoint-manager.h \ + src/nm-checkpoint.c src/nm-checkpoint.h \ + src/devices/nm-device.c src/devices/nm-device.h \ + src/devices/nm-lldp-listener.c src/devices/nm-lldp-listener.h \ + src/devices/nm-arping-manager.c \ + src/devices/nm-arping-manager.h \ + src/devices/nm-device-ethernet-utils.c \ + src/devices/nm-device-ethernet-utils.h \ + src/devices/nm-device-factory.c \ + src/devices/nm-device-factory.h \ + src/devices/nm-device-generic.c \ + src/devices/nm-device-generic.h \ + src/devices/nm-device-logging.h \ + src/devices/nm-device-private.h src/devices/nm-device-bond.c \ + src/devices/nm-device-bond.h src/devices/nm-device-bridge.c \ + src/devices/nm-device-bridge.h src/devices/nm-device-dummy.c \ + src/devices/nm-device-dummy.h src/devices/nm-device-ethernet.c \ + src/devices/nm-device-ethernet.h \ + src/devices/nm-device-infiniband.c \ + src/devices/nm-device-infiniband.h \ + src/devices/nm-device-ip-tunnel.c \ + src/devices/nm-device-ip-tunnel.h \ + src/devices/nm-device-macsec.c src/devices/nm-device-macsec.h \ + src/devices/nm-device-macvlan.c \ + src/devices/nm-device-macvlan.h src/devices/nm-device-tun.c \ + src/devices/nm-device-tun.h src/devices/nm-device-veth.c \ + src/devices/nm-device-veth.h src/devices/nm-device-vlan.c \ + src/devices/nm-device-vlan.h src/devices/nm-device-vxlan.c \ + src/devices/nm-device-vxlan.h src/dhcp/nm-dhcp-dhclient.c \ + src/dhcp/nm-dhcp-dhcpcd.c src/dhcp/nm-dhcp-helper-api.h \ + src/dhcp/nm-dhcp-listener.c src/dhcp/nm-dhcp-listener.h \ + src/dhcp/nm-dhcp-dhclient-utils.c \ + src/dhcp/nm-dhcp-dhclient-utils.h src/dns/nm-dns-dnsmasq.c \ + src/dns/nm-dns-dnsmasq.h src/dns/nm-dns-systemd-resolved.c \ + src/dns/nm-dns-systemd-resolved.h src/dns/nm-dns-unbound.c \ + src/dns/nm-dns-unbound.h src/dns/nm-dns-manager.c \ + src/dns/nm-dns-manager.h src/dns/nm-dns-plugin.c \ + src/dns/nm-dns-plugin.h src/dnsmasq/nm-dnsmasq-manager.c \ + src/dnsmasq/nm-dnsmasq-manager.h \ + src/dnsmasq/nm-dnsmasq-utils.c src/dnsmasq/nm-dnsmasq-utils.h \ + src/ppp/nm-ppp-manager-call.c src/ppp/nm-ppp-manager-call.h \ + src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.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-settings-connection.c \ + src/settings/nm-settings-connection.h \ + src/settings/nm-settings-plugin.c \ + src/settings/nm-settings-plugin.h src/settings/nm-settings.c \ + src/settings/nm-settings.h \ + src/settings/plugins/keyfile/nms-keyfile-connection.c \ + src/settings/plugins/keyfile/nms-keyfile-connection.h \ + src/settings/plugins/keyfile/nms-keyfile-plugin.c \ + src/settings/plugins/keyfile/nms-keyfile-plugin.h \ + src/settings/plugins/keyfile/nms-keyfile-reader.c \ + src/settings/plugins/keyfile/nms-keyfile-reader.h \ + src/settings/plugins/keyfile/nms-keyfile-utils.c \ + src/settings/plugins/keyfile/nms-keyfile-utils.h \ + src/settings/plugins/keyfile/nms-keyfile-writer.c \ + src/settings/plugins/keyfile/nms-keyfile-writer.h \ + src/supplicant/nm-supplicant-config.c \ + src/supplicant/nm-supplicant-config.h \ + src/supplicant/nm-supplicant-interface.c \ + src/supplicant/nm-supplicant-interface.h \ + src/supplicant/nm-supplicant-manager.c \ + src/supplicant/nm-supplicant-manager.h \ + src/supplicant/nm-supplicant-settings-verify.c \ + src/supplicant/nm-supplicant-settings-verify.h \ + src/supplicant/nm-supplicant-types.h \ + src/vpn/nm-vpn-connection.c src/vpn/nm-vpn-connection.h \ + src/vpn/nm-vpn-manager.c src/vpn/nm-vpn-manager.h \ + src/nm-act-request.c src/nm-act-request.h \ + src/nm-active-connection.c src/nm-active-connection.h \ + src/nm-audit-manager.c src/nm-audit-manager.h \ + src/nm-bus-manager.c src/nm-bus-manager.h src/nm-config.c \ + src/nm-config.h src/nm-config-data.c src/nm-config-data.h \ + src/nm-connectivity.h src/nm-dcb.c src/nm-dcb.h src/nm-netns.c \ + src/nm-netns.h src/nm-default-route-manager.c \ + src/nm-default-route-manager.h src/nm-dhcp4-config.c \ + src/nm-dhcp4-config.h src/nm-dhcp6-config.c \ + src/nm-dhcp6-config.h src/nm-dispatcher.c src/nm-dispatcher.h \ + src/nm-firewall-manager.c src/nm-firewall-manager.h \ + src/nm-proxy-config.c src/nm-proxy-config.h \ + src/nm-auth-manager.c src/nm-auth-manager.h \ + src/nm-auth-subject.c src/nm-auth-subject.h \ + src/nm-auth-utils.c src/nm-auth-utils.h src/nm-manager.c \ + src/nm-manager.h src/nm-pacrunner-manager.c \ + src/nm-pacrunner-manager.h src/nm-policy.c src/nm-policy.h \ + src/nm-rfkill-manager.c src/nm-rfkill-manager.h \ + src/nm-session-monitor.h src/nm-session-monitor.c \ + src/nm-sleep-monitor.c src/nm-sleep-monitor.h src/nm-types.h \ + src/nm-connectivity.c +@WITH_CONCHECK_TRUE@am__objects_21 = src/src_libNetworkManager_la-nm-connectivity.lo am_src_libNetworkManager_la_OBJECTS = \ src/src_libNetworkManager_la-nm-checkpoint-manager.lo \ src/src_libNetworkManager_la-nm-checkpoint.lo \ @@ -1205,6 +1317,7 @@ am_src_libNetworkManager_la_OBJECTS = \ src/devices/src_libNetworkManager_la-nm-device-generic.lo \ src/devices/src_libNetworkManager_la-nm-device-bond.lo \ src/devices/src_libNetworkManager_la-nm-device-bridge.lo \ + src/devices/src_libNetworkManager_la-nm-device-dummy.lo \ src/devices/src_libNetworkManager_la-nm-device-ethernet.lo \ src/devices/src_libNetworkManager_la-nm-device-infiniband.lo \ src/devices/src_libNetworkManager_la-nm-device-ip-tunnel.lo \ @@ -1249,8 +1362,8 @@ am_src_libNetworkManager_la_OBJECTS = \ src/src_libNetworkManager_la-nm-bus-manager.lo \ src/src_libNetworkManager_la-nm-config.lo \ src/src_libNetworkManager_la-nm-config-data.lo \ - src/src_libNetworkManager_la-nm-connectivity.lo \ src/src_libNetworkManager_la-nm-dcb.lo \ + src/src_libNetworkManager_la-nm-netns.lo \ src/src_libNetworkManager_la-nm-default-route-manager.lo \ src/src_libNetworkManager_la-nm-dhcp4-config.lo \ src/src_libNetworkManager_la-nm-dhcp6-config.lo \ @@ -1265,12 +1378,13 @@ am_src_libNetworkManager_la_OBJECTS = \ src/src_libNetworkManager_la-nm-policy.lo \ src/src_libNetworkManager_la-nm-rfkill-manager.lo \ src/src_libNetworkManager_la-nm-session-monitor.lo \ - src/src_libNetworkManager_la-nm-sleep-monitor.lo + src/src_libNetworkManager_la-nm-sleep-monitor.lo \ + $(am__objects_21) src_libNetworkManager_la_OBJECTS = \ $(am_src_libNetworkManager_la_OBJECTS) src_libNetworkManagerBase_la_DEPENDENCIES = libnm-core/libnm-core.la \ introspection/libnmdbus.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \ src/nm-core-utils.h src/nm-logging.c src/nm-logging.h \ src/nm-multi-index.c src/nm-multi-index.h \ @@ -1298,7 +1412,7 @@ am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \ src/main-utils.c src/main-utils.h \ src/platform/wifi/wifi-utils-wext.c \ src/platform/wifi/wifi-utils-wext.h -@WITH_WEXT_TRUE@am__objects_21 = src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo +@WITH_WEXT_TRUE@am__objects_22 = src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo am_src_libNetworkManagerBase_la_OBJECTS = \ src/src_libNetworkManagerBase_la-nm-core-utils.lo \ src/src_libNetworkManagerBase_la-nm-logging.lo \ @@ -1322,7 +1436,7 @@ am_src_libNetworkManagerBase_la_OBJECTS = \ src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-systemd.lo \ src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-manager.lo \ src/src_libNetworkManagerBase_la-main-utils.lo \ - $(am__objects_21) + $(am__objects_22) src_libNetworkManagerBase_la_OBJECTS = \ $(am_src_libNetworkManagerBase_la_OBJECTS) src_libNetworkManagerTest_la_DEPENDENCIES = src/libNetworkManager.la \ @@ -1336,8 +1450,8 @@ src_libNetworkManagerTest_la_OBJECTS = \ $(am_src_libNetworkManagerTest_la_OBJECTS) @ENABLE_TESTS_FALSE@am_src_libNetworkManagerTest_la_rpath = @ENABLE_TESTS_TRUE@am_src_libNetworkManagerTest_la_rpath = -am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -src_libsystemd_nm_la_DEPENDENCIES = $(am__DEPENDENCIES_7) +am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +src_libsystemd_nm_la_DEPENDENCIES = $(am__DEPENDENCIES_8) am_src_libsystemd_nm_la_OBJECTS = \ src/systemd/src_libsystemd_nm_la-nm-sd.lo \ src/systemd/sd-adapt/src_libsystemd_nm_la-nm-sd-adapt.lo \ @@ -1513,7 +1627,8 @@ am__src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES_DIST = \ src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS = \ $(am_src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS) @CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnms_ifnet_core_la_rpath = -@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_DEPENDENCIES = src/settings/plugins/ifupdown/libnms-ifupdown-core.la +@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_DEPENDENCIES = src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(am__DEPENDENCIES_1) am__src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES_DIST = \ src/settings/plugins/ifupdown/nms-ifupdown-connection.c \ src/settings/plugins/ifupdown/nms-ifupdown-connection.h \ @@ -1529,7 +1644,8 @@ src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LINK = \ $(LDFLAGS) -o $@ @CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_rpath = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -rpath $(pkglibdir) -src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = +@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_DEPENDENCIES = \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(am__DEPENDENCIES_1) am__src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES_DIST = \ src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \ src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \ @@ -1636,7 +1752,7 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/agent.c \ clients/common/nm-vpn-helpers.h \ clients/common/nm-polkit-listener.c \ clients/common/nm-polkit-listener.h -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_22 = clients/common/clients_cli_nmcli-nm-polkit-listener.$(OBJEXT) +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_23 = clients/common/clients_cli_nmcli-nm-polkit-listener.$(OBJEXT) @BUILD_NMCLI_TRUE@am_clients_cli_nmcli_OBJECTS = clients/cli/clients_cli_nmcli-agent.$(OBJEXT) \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-common.$(OBJEXT) \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-connections.$(OBJEXT) \ @@ -1648,12 +1764,12 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/agent.c \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-polkit-agent.$(OBJEXT) \ @BUILD_NMCLI_TRUE@ clients/common/clients_cli_nmcli-nm-secret-agent-simple.$(OBJEXT) \ @BUILD_NMCLI_TRUE@ clients/common/clients_cli_nmcli-nm-vpn-helpers.$(OBJEXT) \ -@BUILD_NMCLI_TRUE@ $(am__objects_22) +@BUILD_NMCLI_TRUE@ $(am__objects_23) clients_cli_nmcli_OBJECTS = $(am_clients_cli_nmcli_OBJECTS) -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) @BUILD_NMCLI_TRUE@clients_cli_nmcli_DEPENDENCIES = \ @BUILD_NMCLI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -@BUILD_NMCLI_TRUE@ libnm/libnm.la $(am__DEPENDENCIES_8) +@BUILD_NMCLI_TRUE@ libnm/libnm.la $(am__DEPENDENCIES_9) clients_cli_nmcli_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(clients_cli_nmcli_LDFLAGS) $(LDFLAGS) \ @@ -1764,16 +1880,15 @@ am__clients_tui_nmtui_SOURCES_DIST = clients/tui/nmtui.c \ clients_tui_nmtui_OBJECTS = $(am_clients_tui_nmtui_OBJECTS) @BUILD_NMTUI_TRUE@clients_tui_nmtui_DEPENDENCIES = libnm/libnm.la \ @BUILD_NMTUI_TRUE@ clients/tui/newt/libnmt-newt.a \ -@BUILD_NMTUI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -@BUILD_NMTUI_TRUE@ $(am__DEPENDENCIES_1) +@BUILD_NMTUI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) clients_tui_nmtui_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(clients_tui_nmtui_LDFLAGS) $(LDFLAGS) \ -o $@ am_dispatcher_nm_dispatcher_OBJECTS = \ dispatcher/dispatcher_nm_dispatcher-nm-dispatcher.$(OBJEXT) -am__objects_23 = dispatcher/dispatcher_nm_dispatcher-nmdbus-dispatcher.$(OBJEXT) -nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_23) +am__objects_24 = dispatcher/dispatcher_nm_dispatcher-nmdbus-dispatcher.$(OBJEXT) +nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_24) dispatcher_nm_dispatcher_OBJECTS = \ $(am_dispatcher_nm_dispatcher_OBJECTS) \ $(nodist_dispatcher_nm_dispatcher_OBJECTS) @@ -1859,45 +1974,45 @@ examples_C_qt_monitor_nm_running_OBJECTS = \ libnm_core_tests_test_compare_SOURCES = \ libnm-core/tests/test-compare.c libnm_core_tests_test_compare_OBJECTS = libnm-core/tests/libnm_core_tests_test_compare-test-compare.$(OBJEXT) -am__DEPENDENCIES_9 = libnm-core/libnm-core.la $(am__DEPENDENCIES_1) -libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_9) +am__DEPENDENCIES_10 = libnm-core/libnm-core.la $(am__DEPENDENCIES_1) +libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_10) libnm_core_tests_test_crypto_SOURCES = libnm-core/tests/test-crypto.c libnm_core_tests_test_crypto_OBJECTS = libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.$(OBJEXT) -libnm_core_tests_test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_9) +libnm_core_tests_test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_10) am_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/libnm_core_tests_test_general-test-general.$(OBJEXT) nodist_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.$(OBJEXT) libnm_core_tests_test_general_OBJECTS = \ $(am_libnm_core_tests_test_general_OBJECTS) \ $(nodist_libnm_core_tests_test_general_OBJECTS) -libnm_core_tests_test_general_DEPENDENCIES = $(am__DEPENDENCIES_9) +libnm_core_tests_test_general_DEPENDENCIES = $(am__DEPENDENCIES_10) libnm_core_tests_test_keyfile_SOURCES = \ libnm-core/tests/test-keyfile.c libnm_core_tests_test_keyfile_OBJECTS = libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.$(OBJEXT) -libnm_core_tests_test_keyfile_DEPENDENCIES = $(am__DEPENDENCIES_9) +libnm_core_tests_test_keyfile_DEPENDENCIES = $(am__DEPENDENCIES_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_9) +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_9) + $(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_9) + $(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_9) + $(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) libnm_core_tests_test_settings_defaults_DEPENDENCIES = \ - $(am__DEPENDENCIES_9) + $(am__DEPENDENCIES_10) libnm_glib_libnm_glib_test_SOURCES = libnm-glib/libnm-glib-test.c libnm_glib_libnm_glib_test_OBJECTS = libnm-glib/libnm_glib_libnm_glib_test-libnm-glib-test.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_test_DEPENDENCIES = \ @@ -1935,13 +2050,13 @@ libnm_glib_tests_test_remote_settings_client_OBJECTS = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) libnm_util_tests_test_crypto_SOURCES = libnm-util/tests/test-crypto.c libnm_util_tests_test_crypto_OBJECTS = libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.$(OBJEXT) -@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_10 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_11 = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libtest-crypto.la \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_11) libnm_util_tests_test_general_SOURCES = \ libnm-util/tests/test-general.c libnm_util_tests_test_general_OBJECTS = libnm-util/tests/libnm_util_tests_test_general-test-general.$(OBJEXT) @@ -1950,44 +2065,44 @@ libnm_util_tests_test_libnm_linking_SOURCES = \ libnm_util_tests_test_libnm_linking_OBJECTS = libnm-util/tests/libnm_util_tests_test_libnm_linking-test-libnm-linking.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm/libnm.la \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_11) libnm_util_tests_test_secrets_SOURCES = \ libnm-util/tests/test-secrets.c libnm_util_tests_test_secrets_OBJECTS = libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_DEPENDENCIES = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_11) libnm_util_tests_test_setting_8021x_SOURCES = \ libnm-util/tests/test-setting-8021x.c libnm_util_tests_test_setting_8021x_OBJECTS = libnm-util/tests/libnm_util_tests_test_setting_8021x-test-setting-8021x.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_DEPENDENCIES = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_11) libnm_util_tests_test_setting_dcb_SOURCES = \ libnm-util/tests/test-setting-dcb.c libnm_util_tests_test_setting_dcb_OBJECTS = libnm-util/tests/libnm_util_tests_test_setting_dcb-test-setting-dcb.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_DEPENDENCIES = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_11) libnm_util_tests_test_settings_defaults_SOURCES = \ libnm-util/tests/test-settings-defaults.c libnm_util_tests_test_settings_defaults_OBJECTS = libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_DEPENDENCIES = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_11) am_libnm_tests_test_nm_client_OBJECTS = shared/libnm_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT) \ libnm/tests/libnm_tests_test_nm_client-test-nm-client.$(OBJEXT) libnm_tests_test_nm_client_OBJECTS = \ $(am_libnm_tests_test_nm_client_OBJECTS) -am__DEPENDENCIES_11 = libnm/libnm.la $(am__DEPENDENCIES_1) -libnm_tests_test_nm_client_DEPENDENCIES = $(am__DEPENDENCIES_11) +am__DEPENDENCIES_12 = libnm/libnm.la $(am__DEPENDENCIES_1) +libnm_tests_test_nm_client_DEPENDENCIES = $(am__DEPENDENCIES_12) am_libnm_tests_test_remote_settings_client_OBJECTS = shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.$(OBJEXT) \ libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.$(OBJEXT) libnm_tests_test_remote_settings_client_OBJECTS = \ $(am_libnm_tests_test_remote_settings_client_OBJECTS) libnm_tests_test_remote_settings_client_DEPENDENCIES = \ - $(am__DEPENDENCIES_11) + $(am__DEPENDENCIES_12) am_libnm_tests_test_secret_agent_OBJECTS = shared/libnm_tests_test_secret_agent-nm-test-utils-impl.$(OBJEXT) \ libnm/tests/libnm_tests_test_secret_agent-test-secret-agent.$(OBJEXT) libnm_tests_test_secret_agent_OBJECTS = \ $(am_libnm_tests_test_secret_agent_OBJECTS) -libnm_tests_test_secret_agent_DEPENDENCIES = $(am__DEPENDENCIES_11) +libnm_tests_test_secret_agent_DEPENDENCIES = $(am__DEPENDENCIES_12) am_src_NetworkManager_OBJECTS = src/src_NetworkManager-main.$(OBJEXT) src_NetworkManager_OBJECTS = $(am_src_NetworkManager_OBJECTS) src_NetworkManager_DEPENDENCIES = src/libNetworkManager.la @@ -2050,9 +2165,9 @@ src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES = \ src_ndisc_tests_test_ndisc_fake_SOURCES = \ src/ndisc/tests/test-ndisc-fake.c src_ndisc_tests_test_ndisc_fake_OBJECTS = src/ndisc/tests/src_ndisc_tests_test_ndisc_fake-test-ndisc-fake.$(OBJEXT) -am__DEPENDENCIES_12 = src/libNetworkManagerTest.la \ +am__DEPENDENCIES_13 = src/libNetworkManagerTest.la \ $(am__DEPENDENCIES_1) -src_ndisc_tests_test_ndisc_fake_DEPENDENCIES = $(am__DEPENDENCIES_12) +src_ndisc_tests_test_ndisc_fake_DEPENDENCIES = $(am__DEPENDENCIES_13) src_ndisc_tests_test_ndisc_fake_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) \ @@ -2061,7 +2176,7 @@ src_ndisc_tests_test_ndisc_linux_SOURCES = \ src/ndisc/tests/test-ndisc-linux.c src_ndisc_tests_test_ndisc_linux_OBJECTS = src/ndisc/tests/src_ndisc_tests_test_ndisc_linux-test-ndisc-linux.$(OBJEXT) src_ndisc_tests_test_ndisc_linux_DEPENDENCIES = \ - $(am__DEPENDENCIES_12) + $(am__DEPENDENCIES_13) src_ndisc_tests_test_ndisc_linux_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) \ @@ -2072,18 +2187,17 @@ src_nm_iface_helper_OBJECTS = $(am_src_nm_iface_helper_OBJECTS) src_nm_iface_helper_DEPENDENCIES = src/libNetworkManagerBase.la \ src/libsystemd-nm.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(src_nm_iface_helper_LDFLAGS) \ $(LDFLAGS) -o $@ src_platform_tests_monitor_SOURCES = src/platform/tests/monitor.c src_platform_tests_monitor_OBJECTS = src/platform/tests/src_platform_tests_monitor-monitor.$(OBJEXT) -am__DEPENDENCIES_13 = src/libNetworkManagerTest.la \ +am__DEPENDENCIES_14 = src/libNetworkManagerTest.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -src_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_13) +src_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_14) src_platform_tests_monitor_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(src_platform_tests_monitor_LDFLAGS) \ @@ -2092,7 +2206,7 @@ am_src_platform_tests_test_address_fake_OBJECTS = src/platform/tests/src_platfor src_platform_tests_test_address_fake_OBJECTS = \ $(am_src_platform_tests_test_address_fake_OBJECTS) src_platform_tests_test_address_fake_DEPENDENCIES = \ - $(am__DEPENDENCIES_13) + $(am__DEPENDENCIES_14) src_platform_tests_test_address_fake_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2102,7 +2216,7 @@ am_src_platform_tests_test_address_linux_OBJECTS = src/platform/tests/src_platfo src_platform_tests_test_address_linux_OBJECTS = \ $(am_src_platform_tests_test_address_linux_OBJECTS) src_platform_tests_test_address_linux_DEPENDENCIES = \ - $(am__DEPENDENCIES_13) + $(am__DEPENDENCIES_14) src_platform_tests_test_address_linux_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2112,7 +2226,7 @@ am_src_platform_tests_test_cleanup_fake_OBJECTS = src/platform/tests/src_platfor src_platform_tests_test_cleanup_fake_OBJECTS = \ $(am_src_platform_tests_test_cleanup_fake_OBJECTS) src_platform_tests_test_cleanup_fake_DEPENDENCIES = \ - $(am__DEPENDENCIES_13) + $(am__DEPENDENCIES_14) src_platform_tests_test_cleanup_fake_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2122,7 +2236,7 @@ am_src_platform_tests_test_cleanup_linux_OBJECTS = src/platform/tests/src_platfo src_platform_tests_test_cleanup_linux_OBJECTS = \ $(am_src_platform_tests_test_cleanup_linux_OBJECTS) src_platform_tests_test_cleanup_linux_DEPENDENCIES = \ - $(am__DEPENDENCIES_13) + $(am__DEPENDENCIES_14) src_platform_tests_test_cleanup_linux_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2141,7 +2255,7 @@ am_src_platform_tests_test_link_fake_OBJECTS = src/platform/tests/src_platform_t src_platform_tests_test_link_fake_OBJECTS = \ $(am_src_platform_tests_test_link_fake_OBJECTS) src_platform_tests_test_link_fake_DEPENDENCIES = \ - $(am__DEPENDENCIES_13) + $(am__DEPENDENCIES_14) src_platform_tests_test_link_fake_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2150,7 +2264,7 @@ am_src_platform_tests_test_link_linux_OBJECTS = src/platform/tests/src_platform_ src_platform_tests_test_link_linux_OBJECTS = \ $(am_src_platform_tests_test_link_linux_OBJECTS) src_platform_tests_test_link_linux_DEPENDENCIES = \ - $(am__DEPENDENCIES_13) + $(am__DEPENDENCIES_14) src_platform_tests_test_link_linux_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2168,7 +2282,7 @@ am_src_platform_tests_test_route_fake_OBJECTS = src/platform/tests/src_platform_ src_platform_tests_test_route_fake_OBJECTS = \ $(am_src_platform_tests_test_route_fake_OBJECTS) src_platform_tests_test_route_fake_DEPENDENCIES = \ - $(am__DEPENDENCIES_13) + $(am__DEPENDENCIES_14) src_platform_tests_test_route_fake_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2177,7 +2291,7 @@ am_src_platform_tests_test_route_linux_OBJECTS = src/platform/tests/src_platform src_platform_tests_test_route_linux_OBJECTS = \ $(am_src_platform_tests_test_route_linux_OBJECTS) src_platform_tests_test_route_linux_DEPENDENCIES = \ - $(am__DEPENDENCIES_13) + $(am__DEPENDENCIES_14) src_platform_tests_test_route_linux_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2297,7 +2411,7 @@ am_src_tests_test_route_manager_fake_OBJECTS = src/tests/src_tests_test_route_ma src_tests_test_route_manager_fake_OBJECTS = \ $(am_src_tests_test_route_manager_fake_OBJECTS) src_tests_test_route_manager_fake_DEPENDENCIES = \ - $(am__DEPENDENCIES_13) + $(am__DEPENDENCIES_14) src_tests_test_route_manager_fake_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2306,7 +2420,7 @@ am_src_tests_test_route_manager_linux_OBJECTS = src/tests/src_tests_test_route_m src_tests_test_route_manager_linux_OBJECTS = \ $(am_src_tests_test_route_manager_linux_OBJECTS) src_tests_test_route_manager_linux_DEPENDENCIES = \ - $(am__DEPENDENCIES_13) + $(am__DEPENDENCIES_14) src_tests_test_route_manager_linux_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2315,7 +2429,7 @@ src_tests_test_systemd_SOURCES = src/tests/test-systemd.c src_tests_test_systemd_OBJECTS = \ src/tests/src_tests_test_systemd-test-systemd.$(OBJEXT) src_tests_test_systemd_DEPENDENCIES = src/libsystemd-nm.la \ - $(am__DEPENDENCIES_7) + $(am__DEPENDENCIES_8) src_tests_test_utils_SOURCES = src/tests/test-utils.c src_tests_test_utils_OBJECTS = \ src/tests/src_tests_test_utils-test-utils.$(OBJEXT) @@ -2507,7 +2621,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ $(am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST) \ $(am__src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST) \ $(am__src_devices_wwan_libnm_wwan_la_SOURCES_DIST) \ - $(src_libNetworkManager_la_SOURCES) \ + $(am__src_libNetworkManager_la_SOURCES_DIST) \ $(am__src_libNetworkManagerBase_la_SOURCES_DIST) \ $(src_libNetworkManagerTest_la_SOURCES) \ $(src_libsystemd_nm_la_SOURCES) \ @@ -2887,7 +3001,6 @@ am__DIST_COMMON = $(srcdir)/Makefile.examples $(srcdir)/Makefile.in \ $(top_srcdir)/libnm-glib/libnm-glib.pc.in \ $(top_srcdir)/libnm-util/libnm-util.pc.in \ $(top_srcdir)/libnm/libnm.pc.in \ - $(top_srcdir)/man/common.ent.in \ $(top_srcdir)/shared/nm-version-macros.h.in ABOUT-NLS AUTHORS \ COPYING ChangeLog INSTALL NEWS README TODO build-aux/compile \ build-aux/config.guess build-aux/config.rpath \ @@ -2979,6 +3092,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ELOGIND_INHIBIT_CFLAGS = @ELOGIND_INHIBIT_CFLAGS@ +ELOGIND_INHIBIT_LIBS = @ELOGIND_INHIBIT_LIBS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GENHTML = @GENHTML@ @@ -3000,8 +3115,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GUDEV_CFLAGS = @GUDEV_CFLAGS@ -GUDEV_LIBS = @GUDEV_LIBS@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -3035,22 +3148,25 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ +LIBCURL_CFLAGS = @LIBCURL_CFLAGS@ +LIBCURL_LIBS = @LIBCURL_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBM = @LIBM@ LIBNDP_CFLAGS = @LIBNDP_CFLAGS@ LIBNDP_LIBS = @LIBNDP_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ LIBNL_LIBS = @LIBNL_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ +LIBPSL_LIBS = @LIBPSL_LIBS@ LIBS = @LIBS@ -LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ -LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@ LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@ LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ +LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@ +LIBUDEV_LIBS = @LIBUDEV_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LOG_DRIVER = @LOG_DRIVER@ @@ -3231,43 +3347,43 @@ AUTOMAKE_OPTIONS = subdir-objects ############################################################################### noinst_LTLIBRARIES = introspection/libnmdbus.la \ libnm-core/libnm-core.la src/libNetworkManagerBase.la \ - src/libNetworkManager.la src/libsystemd-nm.la $(am__append_19) \ - $(am__append_24) $(am__append_30) $(am__append_34) \ - dispatcher/libnm-dispatcher-core.la $(am__append_82) \ - $(am__append_97) -check_LTLIBRARIES = $(am__append_99) -noinst_LIBRARIES = $(am__append_55) -noinst_DATA = $(am__append_12) + src/libNetworkManager.la src/libsystemd-nm.la $(am__append_22) \ + $(am__append_27) $(am__append_33) $(am__append_37) \ + dispatcher/libnm-dispatcher-core.la $(am__append_85) \ + $(am__append_100) +check_LTLIBRARIES = $(am__append_102) +noinst_LIBRARIES = $(am__append_58) +noinst_DATA = $(am__append_14) ############################################################################### -lib_LTLIBRARIES = libnm/libnm.la $(am__append_61) +lib_LTLIBRARIES = libnm/libnm.la $(am__append_64) pkglib_LTLIBRARIES = $(core_plugins) ############################################################################### # src/devices/adsl ############################################################################### -core_plugins = $(am__append_16) $(am__append_18) $(am__append_23) \ - $(am__append_29) $(am__append_33) \ - src/devices/adsl/libnm-device-plugin-adsl.la $(am__append_37) \ - $(am__append_43) $(am__append_46) -service_DATA = $(am__append_59) -man_MANS = $(am__append_88) $(am__append_89) $(am__append_91) +core_plugins = $(am__append_19) $(am__append_21) $(am__append_26) \ + $(am__append_32) $(am__append_36) \ + src/devices/adsl/libnm-device-plugin-adsl.la $(am__append_40) \ + $(am__append_46) $(am__append_49) +service_DATA = $(am__append_62) +man_MANS = $(am__append_93) examples_DATA = data/server.conf CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \ - src/NetworkManager.ver $(am__append_25) \ + src/NetworkManager.ver $(am__append_28) \ $(dispatcher_nmdbus_dispatcher_sources) \ dispatcher/org.freedesktop.nm_dispatcher.service \ data/NetworkManager.service \ data/NetworkManager-wait-online.service \ data/NetworkManager-dispatcher.service \ data/org.freedesktop.NetworkManager.service data/server.conf \ - $(am__append_83) $(am__append_84) $(am__append_90) \ - $(am__append_95) $(GLIB_GENERATED) $(INTROSPECTION_GIRS) \ - $(typelib_DATA) cscope.in.out cscope.out cscope.po.out $(NULL) \ - $(am__append_101) + $(am__append_86) $(am__append_87) man/common.ent \ + $(am__append_94) $(am__append_98) $(GLIB_GENERATED) \ + $(INTROSPECTION_GIRS) $(typelib_DATA) cscope.in.out cscope.out \ + cscope.po.out $(NULL) $(am__append_104) DISTCLEANFILES = intltool-extract intltool-merge intltool-update \ - $(polkit_policy_DATA) libnm/libnm.pc $(am__append_54) \ - $(am__append_76) + $(polkit_policy_DATA) libnm/libnm.pc $(am__append_57) \ + $(am__append_79) # test-cert.p12 created with: # @@ -3302,7 +3418,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ libnm-core/tests/certs/test-key-only-decrypted.der \ libnm-core/tests/certs/test-key-only-decrypted.pem \ libnm-core/tests/certs/test-key-only.pem libnm/libnm.pc.in \ - libnm/libnm.ver $(am__append_13) \ + libnm/libnm.ver $(am__append_15) \ libnm/generate-setting-docs.py libnm/generate-plugin-docs.pl \ src/org.freedesktop.NetworkManager.conf \ src/nm-test-utils-core.h \ @@ -3348,7 +3464,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection \ src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \ src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \ - $(am__append_21) \ + $(am__append_24) \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 \ @@ -3468,6 +3584,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \ @@ -3504,6 +3621,32 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected \ + 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_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 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected \ src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \ src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \ src/settings/plugins/ifupdown/tests/test1 \ @@ -3562,15 +3705,15 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ data/NetworkManager-dispatcher.service.in \ data/org.freedesktop.NetworkManager.service.in \ data/84-nm-drivers.rules data/85-nm-unmanaged.rules \ - data/server.conf.in $(am__append_69) $(am__append_86) \ - $(man_nm_settings_xml) $(addsuffix .xsl,$(basename \ - $(man_nm_settings_xml))) $(man_pages) $(addsuffix \ - .xml,$(basename $(man_pages))) $(man_pages_autogen) \ - vapi/NM-1.0.metadata vapi/NetworkManager-1.0.metadata \ - vapi/NMClient-1.0.metadata vapi/libnm.deps \ - vapi/libnm-util.deps vapi/libnm-glib.deps CONTRIBUTING \ - NetworkManager.pc.in intltool-extract.in intltool-merge.in \ - intltool-update.in linker-script-binary.ver \ + data/server.conf.in $(am__append_72) $(am__append_89) \ + man/common.ent.in $(man_nm_settings_xml) $(addsuffix \ + .xsl,$(basename $(man_nm_settings_xml))) $(man_pages) \ + $(addsuffix .xml,$(basename $(man_pages))) \ + $(man_pages_autogen) vapi/NM-1.0.metadata \ + vapi/NetworkManager-1.0.metadata vapi/NMClient-1.0.metadata \ + vapi/libnm.deps vapi/libnm-util.deps vapi/libnm-glib.deps \ + CONTRIBUTING NetworkManager.pc.in intltool-extract.in \ + intltool-merge.in intltool-update.in linker-script-binary.ver \ linker-script-devices.ver linker-script-settings.ver \ src/ppp/nm-ppp-plugin.ver Makefile.glib autogen.sh \ valgrind.suppressions shared/nm-common-macros.h \ @@ -3607,6 +3750,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ examples/lua/lgi/change-vpn-username.lua \ examples/lua/lgi/deactivate-all.lua \ examples/nm-conf.d/30-anon.conf \ + examples/nm-conf.d/31-mac-addr-change.conf \ examples/python/dbus/nm-state.py \ examples/python/dbus/add-connection.py \ examples/python/dbus/add-connection-compat.py \ @@ -3624,15 +3768,16 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ examples/python/dbus/wifi-hotspot.py \ examples/python/dbus/create-bond.py \ examples/python/dbus/wifi-active-ap.py \ - examples/python/gi/list-connections.py \ + examples/python/gi/README examples/python/gi/add_connection.py \ + examples/python/gi/deactivate-all.py \ examples/python/gi/device-state-ip4config.py \ examples/python/gi/firewall-zone.py \ - examples/python/gi/show-wifi-networks.py \ - examples/python/gi/get_ips.py \ - examples/python/gi/add_connection.py \ examples/python/gi/get-active-connections.py \ + examples/python/gi/get_ips.py \ + examples/python/gi/list-connections.py \ + examples/python/gi/setting-user-data.py \ + examples/python/gi/show-wifi-networks.py \ examples/python/gi/update-ip4-method.py \ - examples/python/gi/deactivate-all.py examples/python/gi/README \ examples/python/python-networkmanager/README \ examples/ruby/add-connection.rb \ examples/ruby/get-basic-nm-info.rb \ @@ -3642,14 +3787,14 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ examples/shell/active-wifi.sh $(NULL) dist_hook = dist-hook-settings-ifcfg-rh-alias-files dist_dependencies = libnm-core/nm-vpn-dbus-types.xml \ - libnm-core/nm-dbus-types.xml $(am__append_79) $(am__append_87) \ + libnm-core/nm-dbus-types.xml $(am__append_82) $(am__append_90) \ $(man_pages) $(man_pages_autogen) dist_configure_check = $(am__append_3) $(am__append_4) -install_data_hook = install-data-hook-dispatcher $(am__append_52) \ - install-data-hook-man -install_exec_hook = $(am__append_57) -install_exec_local = $(am__append_60) -uninstall_hook = $(am__append_53) $(am__append_58) uninstall-hook-man +install_data_hook = install-data-hook-dispatcher $(am__append_55) \ + $(am__append_91) +install_exec_hook = $(am__append_60) +install_exec_local = $(am__append_63) +uninstall_hook = $(am__append_56) $(am__append_61) $(am__append_92) BUILT_SOURCES = libnm-core/nm-vpn-dbus-types.xml \ libnm-core/nm-dbus-types.xml $(gir_DATA) $(typelib_DATA) GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \ @@ -3657,12 +3802,11 @@ GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \ libnm-core/tests/nm-core-tests-enum-types.h \ libnm-core/tests/nm-core-tests-enum-types.c \ $(libnm_lib_h_pub_mkenums) $(libnm_lib_c_mkenums) \ - $(am__append_62) -man_pages = man/nmcli.1 man/nmtui.1 man/nm-online.1 \ - man/NetworkManager.conf.5 man/nmcli-examples.7 \ - man/NetworkManager.8 -man_pages_autogen = man/nm-settings.5 man/nm-settings-keyfile.5 \ - $(am__append_85) + $(am__append_65) +man_pages = man/NetworkManager.8 man/NetworkManager.conf.5 \ + man/nm-online.1 man/nmcli-examples.7 man/nmcli.1 man/nmtui.1 +man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \ + $(am__append_88) ############################################################################### @@ -3695,8 +3839,8 @@ check_programs = libnm-core/tests/test-compare \ $(libnm_tests_programs) src/dhcp/tests/test-dhcp-dhclient \ src/dhcp/tests/test-dhcp-utils \ src/settings/plugins/keyfile/tests/test-keyfile \ - $(am__append_20) $(am__append_27) $(am__append_32) \ - $(am__append_36) $(am__append_45) \ + $(am__append_23) $(am__append_30) $(am__append_35) \ + $(am__append_39) $(am__append_48) \ src/dnsmasq/tests/test-dnsmasq-utils \ src/platform/tests/test-link-fake \ src/platform/tests/test-link-linux \ @@ -3717,9 +3861,9 @@ check_programs = libnm-core/tests/test-compare \ src/tests/test-route-manager-fake src/tests/test-dcb \ src/tests/test-systemd src/tests/test-resolvconf-capture \ src/tests/test-wired-defname src/tests/test-utils \ - dispatcher/tests/test-dispatcher-envp $(am__append_80) + dispatcher/tests/test-dispatcher-envp $(am__append_83) check_programs_norun = src/platform/tests/monitor \ - src/ndisc/tests/test-ndisc-linux $(am__append_81) \ + src/ndisc/tests/test-ndisc-linux $(am__append_84) \ examples/C/glib/add-connection-gdbus \ examples/C/glib/add-connection-libnm \ examples/C/glib/get-active-connections-gdbus \ @@ -3727,7 +3871,7 @@ check_programs_norun = src/platform/tests/monitor \ examples/C/glib/list-connections-gdbus \ examples/C/glib/list-connections-libnm \ examples/C/glib/monitor-nm-running-gdbus \ - examples/C/glib/monitor-nm-state-gdbus $(am__append_100) + examples/C/glib/monitor-nm-state-gdbus $(am__append_103) ############################################################################### @@ -3735,17 +3879,17 @@ check_programs_norun = src/platform/tests/monitor \ ############################################################################### check_ltlibraries = libnm/tests/libnm-vpn-plugin-utils-test.la \ - src/libNetworkManagerTest.la $(am__append_70) -check_local = check-local-exports-libnm $(am__append_22) \ - $(am__append_26) $(am__append_31) $(am__append_35) \ - check-local-devices-adsl $(am__append_39) $(am__append_44) \ - $(am__append_47) $(am__append_78) -VAPIGEN_VAPIS = $(am__append_92) $(am__append_93) -dbusservice_DATA = $(am__append_28) dispatcher/nm-dispatcher.conf \ + src/libNetworkManagerTest.la $(am__append_73) +check_local = check-local-exports-libnm $(am__append_25) \ + $(am__append_29) $(am__append_34) $(am__append_38) \ + check-local-devices-adsl $(am__append_42) $(am__append_47) \ + $(am__append_50) $(am__append_81) +VAPIGEN_VAPIS = $(am__append_95) $(am__append_96) +dbusservice_DATA = $(am__append_31) dispatcher/nm-dispatcher.conf \ src/org.freedesktop.NetworkManager.conf dbusactivation_DATA = \ dispatcher/org.freedesktop.nm_dispatcher.service -INTROSPECTION_GIRS = $(am__append_11) $(am__append_77) +INTROSPECTION_GIRS = $(am__append_13) $(am__append_80) INTROSPECTION_SCANNER_ARGS = INTROSPECTION_COMPILER_ARGS = # Pass SANITIZER_ENV where a command that uses built libraries is @@ -3759,11 +3903,11 @@ nodist_libnminclude_HEADERS = $(libnm_core_lib_h_pub_mkenums) \ pkgconfigdir = $(libdir)/pkgconfig ############################################################################### -pkgconfig_DATA = NetworkManager.pc libnm/libnm.pc $(am__append_75) +pkgconfig_DATA = NetworkManager.pc libnm/libnm.pc $(am__append_78) pppd_plugindir = $(PPPD_PLUGIN_DIR) -pppd_plugin_LTLIBRARIES = $(am__append_17) +pppd_plugin_LTLIBRARIES = $(am__append_20) vapidir = $(datadir)/vala/vapi -vapi_DATA = $(am__append_94) +vapi_DATA = $(am__append_97) examplesdir = $(docdir)/examples rundir = $(runstatedir)/NetworkManager statedir = $(localstatedir)/lib/NetworkManager @@ -3796,7 +3940,8 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-wext=no \ --enable-ifcfg-rh \ --enable-ifupdown \ - --enable-ifnet + --enable-ifnet \ + --disable-dependency-tracking ############################################################################### @@ -3831,6 +3976,8 @@ introspection_sources = \ introspection/org.freedesktop.NetworkManager.Device.Bridge.h \ introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c \ introspection/org.freedesktop.NetworkManager.Device.Bluetooth.h \ + introspection/org.freedesktop.NetworkManager.Device.Dummy.c \ + introspection/org.freedesktop.NetworkManager.Device.Dummy.h \ introspection/org.freedesktop.NetworkManager.Device.Wired.c \ introspection/org.freedesktop.NetworkManager.Device.Wired.h \ introspection/org.freedesktop.NetworkManager.Device.Generic.c \ @@ -3904,6 +4051,7 @@ DBUS_INTERFACE_DOCS = \ docs/api/dbus-org.freedesktop.NetworkManager.Device.xml \ docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \ + docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml \ @@ -3940,6 +4088,7 @@ dbusinterfaces_DATA = \ introspection/org.freedesktop.NetworkManager.Device.Bond.xml \ introspection/org.freedesktop.NetworkManager.Device.Bridge.xml \ introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml \ + introspection/org.freedesktop.NetworkManager.Device.Dummy.xml \ introspection/org.freedesktop.NetworkManager.Device.Wired.xml \ introspection/org.freedesktop.NetworkManager.Device.Generic.xml \ introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \ @@ -3988,6 +4137,7 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-setting-cdma.h \ libnm-core/nm-setting-connection.h \ libnm-core/nm-setting-dcb.h \ + libnm-core/nm-setting-dummy.h \ libnm-core/nm-setting-generic.h \ libnm-core/nm-setting-gsm.h \ libnm-core/nm-setting-infiniband.h \ @@ -4005,6 +4155,7 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-setting-team-port.h \ libnm-core/nm-setting-team.h \ libnm-core/nm-setting-tun.h \ + libnm-core/nm-setting-user.h \ libnm-core/nm-setting-vlan.h \ libnm-core/nm-setting-vpn.h \ libnm-core/nm-setting-vxlan.h \ @@ -4025,6 +4176,8 @@ libnm_core_lib_h_pub_mkenums = \ libnm_core_lib_h_priv = \ shared/nm-utils/nm-shared-utils.h \ + shared/nm-utils/nm-udev-utils.h \ + shared/nm-setting-metadata.h \ libnm-core/crypto.h \ libnm-core/nm-connection-private.h \ libnm-core/nm-core-internal.h \ @@ -4036,6 +4189,7 @@ libnm_core_lib_h_priv = \ libnm-core/nm-utils-private.h libnm_core_lib_c_real = shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-udev-utils.c shared/nm-setting-metadata.c \ libnm-core/crypto.c libnm-core/nm-connection.c \ libnm-core/nm-dbus-utils.c libnm-core/nm-errors.c \ libnm-core/nm-keyfile-reader.c libnm-core/nm-keyfile-utils.c \ @@ -4046,8 +4200,8 @@ libnm_core_lib_c_real = shared/nm-utils/nm-shared-utils.c \ libnm-core/nm-setting-bridge-port.c \ libnm-core/nm-setting-bridge.c libnm-core/nm-setting-cdma.c \ libnm-core/nm-setting-connection.c libnm-core/nm-setting-dcb.c \ - libnm-core/nm-setting-generic.c libnm-core/nm-setting-gsm.c \ - libnm-core/nm-setting-infiniband.c \ + libnm-core/nm-setting-dummy.c libnm-core/nm-setting-generic.c \ + libnm-core/nm-setting-gsm.c libnm-core/nm-setting-infiniband.c \ libnm-core/nm-setting-ip-config.c \ libnm-core/nm-setting-ip-tunnel.c \ libnm-core/nm-setting-ip4-config.c \ @@ -4057,15 +4211,16 @@ libnm_core_lib_c_real = shared/nm-utils/nm-shared-utils.c \ libnm-core/nm-setting-pppoe.c libnm-core/nm-setting-proxy.c \ libnm-core/nm-setting-serial.c \ libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \ - libnm-core/nm-setting-tun.c libnm-core/nm-setting-vlan.c \ - libnm-core/nm-setting-vpn.c libnm-core/nm-setting-vxlan.c \ - libnm-core/nm-setting-wimax.c libnm-core/nm-setting-wired.c \ + libnm-core/nm-setting-tun.c libnm-core/nm-setting-user.c \ + libnm-core/nm-setting-vlan.c libnm-core/nm-setting-vpn.c \ + libnm-core/nm-setting-vxlan.c libnm-core/nm-setting-wimax.c \ + libnm-core/nm-setting-wired.c \ libnm-core/nm-setting-wireless-security.c \ libnm-core/nm-setting-wireless.c libnm-core/nm-setting.c \ libnm-core/nm-simple-connection.c libnm-core/nm-utils.c \ libnm-core/nm-vpn-editor-plugin.c \ - libnm-core/nm-vpn-plugin-info.c $(am__append_7) \ - $(am__append_9) + libnm-core/nm-vpn-plugin-info.c $(am__append_9) \ + $(am__append_11) libnm_core_lib_c_mkenums = \ libnm-core/nm-core-enum-types.c @@ -4073,9 +4228,10 @@ libnm_core_lib_c_mkenums = \ ############################################################################### dflt_cppflags_libnm_core = -I$(srcdir)/shared -I$(builddir)/shared \ -I$(srcdir)/libnm-core -I$(builddir)/libnm-core \ - $(CODE_COVERAGE_CFLAGS) $(GLIB_CFLAGS) $(JANSSON_CFLAGS) \ - $(am__append_5) $(am__append_6) + $(CODE_COVERAGE_CFLAGS) $(GLIB_CFLAGS) $(LIBUDEV_CFLAGS) \ + $(am__append_5) $(am__append_6) $(am__append_7) nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real) +nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' libnm_core_libnm_core_la_CPPFLAGS = \ $(dflt_cppflags_libnm_core) \ -DG_LOG_DOMAIN=\""libnm"\" \ @@ -4096,7 +4252,8 @@ nodist_libnm_core_libnm_core_la_SOURCES = \ $(libnm_core_lib_c_mkenums) libnm_core_libnm_core_la_LIBADD = $(GLIB_LIBS) $(UUID_LIBS) \ - $(JANSSON_LIBS) $(am__append_8) $(am__append_10) + $(LIBUDEV_LIBS) $(am__append_8) $(am__append_10) \ + $(am__append_12) libnm_core_libnm_core_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) @@ -4149,6 +4306,7 @@ libnm_lib_h_pub_real = \ libnm/nm-device-bond.h \ libnm/nm-device-bridge.h \ libnm/nm-device-bt.h \ + libnm/nm-device-dummy.h \ libnm/nm-device-ethernet.h \ libnm/nm-device-generic.h \ libnm/nm-device-infiniband.h \ @@ -4203,6 +4361,7 @@ libnm_lib_c_real = \ libnm/nm-device-bond.c \ libnm/nm-device-bridge.c \ libnm/nm-device-bt.c \ + libnm/nm-device-dummy.c \ libnm/nm-device-ethernet.c \ libnm/nm-device-generic.c \ libnm/nm-device-infiniband.c \ @@ -4250,7 +4409,7 @@ libnm_libnm_la_CPPFLAGS = \ $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ - $(GUDEV_CFLAGS) \ + $(LIBUDEV_CFLAGS) \ -DG_LOG_DOMAIN=\""libnm"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DNMRUNDIR=\"$(nmrundir)\" @@ -4274,7 +4433,7 @@ libnm_libnm_la_LIBADD = \ $(DL_LIBS) \ $(GLIB_LIBS) \ $(UUID_LIBS) \ - $(GUDEV_LIBS) + $(LIBUDEV_LIBS) libnm_libnm_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/libnm/libnm.ver" \ @@ -4282,7 +4441,7 @@ libnm_libnm_la_LDFLAGS = \ -version-info "1:0:1" @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_INCLUDES = Gio-2.0 -@HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_PACKAGES = gio-2.0 gudev-1.0 +@HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_PACKAGES = gio-2.0 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_CFLAGS = $(libnm_libnm_la_CPPFLAGS) @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_LIBS = libnm/libnm.la @@ -4393,10 +4552,11 @@ src_cppflags = \ -DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \ -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \ \ - $(GUDEV_CFLAGS) \ + $(LIBUDEV_CFLAGS) \ $(LIBNL_CFLAGS) \ $(LIBNDP_CFLAGS) \ - $(LIBSOUP_CFLAGS) \ + $(LIBPSL_CFLAGS) \ + $(LIBCURL_CFLAGS) \ $(SELINUX_CFLAGS) \ $(LIBAUDIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ @@ -4437,6 +4597,7 @@ src_libsystemd_nm_la_SOURCES = \ src/systemd/sd-adapt/conf-parser.h \ src/systemd/sd-adapt/def.h \ src/systemd/sd-adapt/dirent-util.h \ + src/systemd/sd-adapt/env-util.h \ src/systemd/sd-adapt/format-util.h \ src/systemd/sd-adapt/gunicode.h \ src/systemd/sd-adapt/khash.h \ @@ -4590,29 +4751,23 @@ src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \ src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-utils.c \ src/dhcp/nm-dhcp-utils.h src/dhcp/nm-dhcp-systemd.c \ src/dhcp/nm-dhcp-manager.c src/dhcp/nm-dhcp-manager.h \ - src/main-utils.c src/main-utils.h $(NULL) $(am__append_14) + src/main-utils.c src/main-utils.h $(NULL) $(am__append_16) src_libNetworkManagerBase_la_LIBADD = \ libnm-core/libnm-core.la \ introspection/libnmdbus.la \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ + $(LIBUDEV_LIBS) \ $(NULL) ############################################################################### src_libNetworkManager_la_CPPFLAGS = $(src_cppflags) -src_libNetworkManager_la_SOURCES = \ - \ - src/nm-checkpoint-manager.c \ - src/nm-checkpoint-manager.h \ - src/nm-checkpoint.c \ - src/nm-checkpoint.h \ - \ - src/devices/nm-device.c \ - src/devices/nm-device.h \ - src/devices/nm-lldp-listener.c \ - src/devices/nm-lldp-listener.h \ - src/devices/nm-arping-manager.c \ +src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \ + src/nm-checkpoint-manager.h src/nm-checkpoint.c \ + src/nm-checkpoint.h src/devices/nm-device.c \ + src/devices/nm-device.h src/devices/nm-lldp-listener.c \ + src/devices/nm-lldp-listener.h src/devices/nm-arping-manager.c \ src/devices/nm-arping-manager.h \ src/devices/nm-device-ethernet-utils.c \ src/devices/nm-device-ethernet-utils.h \ @@ -4621,73 +4776,45 @@ src_libNetworkManager_la_SOURCES = \ src/devices/nm-device-generic.c \ src/devices/nm-device-generic.h \ src/devices/nm-device-logging.h \ - src/devices/nm-device-private.h \ - \ - src/devices/nm-device-bond.c \ - src/devices/nm-device-bond.h \ - src/devices/nm-device-bridge.c \ - src/devices/nm-device-bridge.h \ - src/devices/nm-device-ethernet.c \ + src/devices/nm-device-private.h src/devices/nm-device-bond.c \ + src/devices/nm-device-bond.h src/devices/nm-device-bridge.c \ + src/devices/nm-device-bridge.h src/devices/nm-device-dummy.c \ + src/devices/nm-device-dummy.h src/devices/nm-device-ethernet.c \ src/devices/nm-device-ethernet.h \ src/devices/nm-device-infiniband.c \ src/devices/nm-device-infiniband.h \ src/devices/nm-device-ip-tunnel.c \ src/devices/nm-device-ip-tunnel.h \ - src/devices/nm-device-macsec.c \ - src/devices/nm-device-macsec.h \ + src/devices/nm-device-macsec.c src/devices/nm-device-macsec.h \ src/devices/nm-device-macvlan.c \ - src/devices/nm-device-macvlan.h \ - src/devices/nm-device-tun.c \ - src/devices/nm-device-tun.h \ - src/devices/nm-device-veth.c \ - src/devices/nm-device-veth.h \ - src/devices/nm-device-vlan.c \ - src/devices/nm-device-vlan.h \ - src/devices/nm-device-vxlan.c \ - src/devices/nm-device-vxlan.h \ - \ - src/dhcp/nm-dhcp-dhclient.c \ - src/dhcp/nm-dhcp-dhcpcd.c \ - src/dhcp/nm-dhcp-helper-api.h \ - src/dhcp/nm-dhcp-listener.c \ - src/dhcp/nm-dhcp-listener.h \ + src/devices/nm-device-macvlan.h src/devices/nm-device-tun.c \ + src/devices/nm-device-tun.h src/devices/nm-device-veth.c \ + src/devices/nm-device-veth.h src/devices/nm-device-vlan.c \ + src/devices/nm-device-vlan.h src/devices/nm-device-vxlan.c \ + src/devices/nm-device-vxlan.h src/dhcp/nm-dhcp-dhclient.c \ + src/dhcp/nm-dhcp-dhcpcd.c src/dhcp/nm-dhcp-helper-api.h \ + src/dhcp/nm-dhcp-listener.c src/dhcp/nm-dhcp-listener.h \ src/dhcp/nm-dhcp-dhclient-utils.c \ - src/dhcp/nm-dhcp-dhclient-utils.h \ - \ - src/dns/nm-dns-dnsmasq.c \ - src/dns/nm-dns-dnsmasq.h \ - src/dns/nm-dns-systemd-resolved.c \ - src/dns/nm-dns-systemd-resolved.h \ - src/dns/nm-dns-unbound.c \ - src/dns/nm-dns-unbound.h \ - src/dns/nm-dns-manager.c \ - src/dns/nm-dns-manager.h \ - src/dns/nm-dns-plugin.c \ - src/dns/nm-dns-plugin.h \ - \ - src/dnsmasq/nm-dnsmasq-manager.c \ + src/dhcp/nm-dhcp-dhclient-utils.h src/dns/nm-dns-dnsmasq.c \ + src/dns/nm-dns-dnsmasq.h src/dns/nm-dns-systemd-resolved.c \ + src/dns/nm-dns-systemd-resolved.h src/dns/nm-dns-unbound.c \ + src/dns/nm-dns-unbound.h src/dns/nm-dns-manager.c \ + src/dns/nm-dns-manager.h src/dns/nm-dns-plugin.c \ + src/dns/nm-dns-plugin.h src/dnsmasq/nm-dnsmasq-manager.c \ src/dnsmasq/nm-dnsmasq-manager.h \ - src/dnsmasq/nm-dnsmasq-utils.c \ - src/dnsmasq/nm-dnsmasq-utils.h \ - \ - src/ppp/nm-ppp-manager-call.c \ - src/ppp/nm-ppp-manager-call.h \ - src/ppp/nm-ppp-manager.h \ - src/ppp/nm-ppp-status.h \ - \ + src/dnsmasq/nm-dnsmasq-utils.c src/dnsmasq/nm-dnsmasq-utils.h \ + src/ppp/nm-ppp-manager-call.c src/ppp/nm-ppp-manager-call.h \ + src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.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-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 \ - src/settings/nm-settings-plugin.h \ - src/settings/nm-settings.c \ + src/settings/nm-settings-plugin.h src/settings/nm-settings.c \ src/settings/nm-settings.h \ - \ src/settings/plugins/keyfile/nms-keyfile-connection.c \ src/settings/plugins/keyfile/nms-keyfile-connection.h \ src/settings/plugins/keyfile/nms-keyfile-plugin.c \ @@ -4698,7 +4825,6 @@ src_libNetworkManager_la_SOURCES = \ src/settings/plugins/keyfile/nms-keyfile-utils.h \ src/settings/plugins/keyfile/nms-keyfile-writer.c \ src/settings/plugins/keyfile/nms-keyfile-writer.h \ - \ src/supplicant/nm-supplicant-config.c \ src/supplicant/nm-supplicant-config.h \ src/supplicant/nm-supplicant-interface.c \ @@ -4708,77 +4834,44 @@ src_libNetworkManager_la_SOURCES = \ src/supplicant/nm-supplicant-settings-verify.c \ src/supplicant/nm-supplicant-settings-verify.h \ src/supplicant/nm-supplicant-types.h \ - \ - src/vpn/nm-vpn-connection.c \ - src/vpn/nm-vpn-connection.h \ - src/vpn/nm-vpn-manager.c \ - src/vpn/nm-vpn-manager.h \ - \ - src/nm-act-request.c \ - src/nm-act-request.h \ - src/nm-active-connection.c \ - src/nm-active-connection.h \ - src/nm-audit-manager.c \ - src/nm-audit-manager.h \ - src/nm-bus-manager.c \ - src/nm-bus-manager.h \ - src/nm-config.c \ - src/nm-config.h \ - src/nm-config-data.c \ - src/nm-config-data.h \ - src/nm-connectivity.c \ - src/nm-connectivity.h \ - src/nm-dcb.c \ - src/nm-dcb.h \ - src/nm-default-route-manager.c \ - src/nm-default-route-manager.h \ - src/nm-dhcp4-config.c \ - src/nm-dhcp4-config.h \ - src/nm-dhcp6-config.c \ - src/nm-dhcp6-config.h \ - src/nm-dispatcher.c \ - src/nm-dispatcher.h \ - src/nm-firewall-manager.c \ - src/nm-firewall-manager.h \ - src/nm-proxy-config.c \ - src/nm-proxy-config.h \ - src/nm-auth-manager.c \ - src/nm-auth-manager.h \ - src/nm-auth-subject.c \ - src/nm-auth-subject.h \ - src/nm-auth-utils.c \ - src/nm-auth-utils.h \ - src/nm-manager.c \ - src/nm-manager.h \ - src/nm-pacrunner-manager.c \ - src/nm-pacrunner-manager.h \ - src/nm-policy.c \ - src/nm-policy.h \ - src/nm-rfkill-manager.c \ - src/nm-rfkill-manager.h \ - src/nm-session-monitor.h \ - src/nm-session-monitor.c \ - src/nm-sleep-monitor.c \ - src/nm-sleep-monitor.h \ - src/nm-types.h \ - \ - $(NULL) - + src/vpn/nm-vpn-connection.c src/vpn/nm-vpn-connection.h \ + src/vpn/nm-vpn-manager.c src/vpn/nm-vpn-manager.h \ + src/nm-act-request.c src/nm-act-request.h \ + src/nm-active-connection.c src/nm-active-connection.h \ + src/nm-audit-manager.c src/nm-audit-manager.h \ + src/nm-bus-manager.c src/nm-bus-manager.h src/nm-config.c \ + src/nm-config.h src/nm-config-data.c src/nm-config-data.h \ + src/nm-connectivity.h src/nm-dcb.c src/nm-dcb.h src/nm-netns.c \ + src/nm-netns.h src/nm-default-route-manager.c \ + src/nm-default-route-manager.h src/nm-dhcp4-config.c \ + src/nm-dhcp4-config.h src/nm-dhcp6-config.c \ + src/nm-dhcp6-config.h src/nm-dispatcher.c src/nm-dispatcher.h \ + src/nm-firewall-manager.c src/nm-firewall-manager.h \ + src/nm-proxy-config.c src/nm-proxy-config.h \ + src/nm-auth-manager.c src/nm-auth-manager.h \ + src/nm-auth-subject.c src/nm-auth-subject.h \ + src/nm-auth-utils.c src/nm-auth-utils.h src/nm-manager.c \ + src/nm-manager.h src/nm-pacrunner-manager.c \ + src/nm-pacrunner-manager.h src/nm-policy.c src/nm-policy.h \ + src/nm-rfkill-manager.c src/nm-rfkill-manager.h \ + src/nm-session-monitor.h src/nm-session-monitor.c \ + src/nm-sleep-monitor.c src/nm-sleep-monitor.h src/nm-types.h \ + $(NULL) $(am__append_17) src_libNetworkManager_la_LIBADD = \ src/libNetworkManagerBase.la \ src/libsystemd-nm.la \ $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ + $(LIBUDEV_LIBS) \ $(LIBNL_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ $(LIBNDP_LIBS) \ $(DL_LIBS) \ - $(LIBM) \ $(SELINUX_LIBS) \ $(LIBAUDIT_LIBS) \ - $(LIBSOUP_LIBS) + $(LIBPSL_LIBS) \ + $(LIBCURL_LIBS) -src_tests_cppflags = $(src_cppflags) $(am__append_15) +src_tests_cppflags = $(src_cppflags) $(am__append_18) src_tests_cppflags_fake = $(src_tests_cppflags) -DSETUP=nm_fake_platform_setup src_tests_cppflags_linux = $(src_tests_cppflags) -DSETUP=nm_linux_platform_setup src_libNetworkManagerTest_la_CPPFLAGS = $(src_tests_cppflags) @@ -4794,7 +4887,7 @@ src_libNetworkManagerTest_la_LIBADD = \ src/libNetworkManager.la \ $(CODE_COVERAGE_LDFLAGS) \ $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ + $(LIBUDEV_LIBS) \ $(LIBNL_LIBS) EXTRA_src_NetworkManager_DEPENDENCIES = \ @@ -4821,11 +4914,10 @@ src_nm_iface_helper_LDADD = \ src/libNetworkManagerBase.la \ src/libsystemd-nm.la \ $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ + $(LIBUDEV_LIBS) \ $(LIBNL_LIBS) \ $(LIBNDP_LIBS) \ - $(DL_LIBS) \ - $(LIBM) + $(DL_LIBS) src_nm_iface_helper_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" @@ -5059,7 +5151,9 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_cppflags = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(srcdir)/src \ @@ -5070,7 +5164,7 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(GLIB_CFLAGS) \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(GUDEV_CFLAGS) \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(LIBUDEV_CFLAGS) \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DSYSCONFDIR=\"$(sysconfdir)\" @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \ @@ -5080,6 +5174,9 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ src/settings/plugins/ifupdown/nms-ifupdown-parser.h @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags) +@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(LIBUDEV_LIBS) + @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ src/settings/plugins/ifupdown/nms-ifupdown-connection.c \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ src/settings/plugins/ifupdown/nms-ifupdown-connection.h \ @@ -5092,7 +5189,8 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-settings.ver" @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ src/settings/plugins/ifupdown/libnms-ifupdown-core.la +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(LIBUDEV_LIBS) @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(srcdir)/shared \ @@ -5106,7 +5204,8 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DTEST_ENI_DIR=\"$(abs_srcdir)/src/settings/plugins/ifupdown/tests\" @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(GLIB_LDFLAGS) +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(GLIB_LDFLAGS) \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(CODE_COVERAGE_LDFLAGS) @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ @@ -5121,7 +5220,8 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ @CONFIG_PLUGIN_IFNET_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ @CONFIG_PLUGIN_IFNET_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @CONFIG_PLUGIN_IFNET_TRUE@ $(GLIB_CFLAGS) \ -@CONFIG_PLUGIN_IFNET_TRUE@ -DSYSCONFDIR=\"$(sysconfdir)\" +@CONFIG_PLUGIN_IFNET_TRUE@ -DSYSCONFDIR=\"$(sysconfdir)\" \ +@CONFIG_PLUGIN_IFNET_TRUE@ -DSBINDIR=\"$(sbindir)\" @CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES = \ @CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-net-parser.c\ @@ -5185,7 +5285,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) + $(LIBUDEV_CFLAGS) src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \ -module -avoid-version \ @@ -5193,7 +5293,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ introspection/libnmdbus.la \ - $(GUDEV_LIBS) + $(LIBUDEV_LIBS) ############################################################################### @@ -5218,7 +5318,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/nm-modem-manager.h \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/nm-modem.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/nm-modem.h \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_38) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_41) @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags) @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_LDFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ -avoid-version \ @@ -5261,7 +5361,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-bt-error.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-device-bt.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-device-bt.h \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_41) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_44) @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(srcdir)/src -I$(builddir)/src \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(srcdir)/shared \ @@ -5270,7 +5370,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(srcdir)/libnm-core \ @WITH_MODEM_MANAGER_1_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ @WITH_MODEM_MANAGER_1_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_CFLAGS) $(am__append_40) +@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_CFLAGS) $(am__append_43) @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ -module -avoid-version \ @WITH_MODEM_MANAGER_1_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" @@ -5278,8 +5378,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ introspection/libnmdbus.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ -@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_LIBS) $(GUDEV_LIBS) \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_42) +@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_LIBS) $(am__append_45) @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-factory.c \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-device-wifi.c \ @@ -5308,8 +5407,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \ @WITH_WIFI_TRUE@ introspection/libnmdbus.la \ -@WITH_WIFI_TRUE@ $(GLIB_LIBS) \ -@WITH_WIFI_TRUE@ $(GUDEV_LIBS) +@WITH_WIFI_TRUE@ $(GLIB_LIBS) @WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_SOURCES = \ @WITH_WIFI_TRUE@ src/devices/wifi/tests/test-general.c \ @@ -5345,6 +5443,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_TEAMDCTL_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ @WITH_TEAMDCTL_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @WITH_TEAMDCTL_TRUE@ $(LIBTEAMDCTL_CFLAGS) \ +@WITH_TEAMDCTL_TRUE@ $(JANSSON_CFLAGS) \ @WITH_TEAMDCTL_TRUE@ $(GLIB_CFLAGS) @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \ @@ -5354,8 +5453,8 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_LIBADD = \ @WITH_TEAMDCTL_TRUE@ introspection/libnmdbus.la \ @WITH_TEAMDCTL_TRUE@ $(LIBTEAMDCTL_LIBS) \ -@WITH_TEAMDCTL_TRUE@ $(GLIB_LIBS) \ -@WITH_TEAMDCTL_TRUE@ $(GUDEV_LIBS) +@WITH_TEAMDCTL_TRUE@ $(JANSSON_LIBS) \ +@WITH_TEAMDCTL_TRUE@ $(GLIB_LIBS) src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \ $(src_tests_cppflags) \ @@ -5374,7 +5473,7 @@ src_platform_tests_ldflags = \ src_platform_tests_libadd = \ src/libNetworkManagerTest.la \ $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ + $(LIBUDEV_LIBS) \ $(LIBNL_LIBS) src_platform_tests_monitor_CPPFLAGS = $(src_tests_cppflags) @@ -5512,7 +5611,7 @@ src_tests_test_route_manager_ldflags = \ src_tests_test_route_manager_ldadd = \ src/libNetworkManagerTest.la \ $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ + $(LIBUDEV_LIBS) \ $(LIBNL_LIBS) src_tests_test_route_manager_fake_SOURCES = src/tests/test-route-manager.c @@ -5619,7 +5718,7 @@ clients_nm_online_LDADD = \ @BUILD_NMCLI_TRUE@ clients/common/nm-secret-agent-simple.h \ @BUILD_NMCLI_TRUE@ clients/common/nm-vpn-helpers.c \ @BUILD_NMCLI_TRUE@ clients/common/nm-vpn-helpers.h $(NULL) \ -@BUILD_NMCLI_TRUE@ $(am__append_50) +@BUILD_NMCLI_TRUE@ $(am__append_53) @BUILD_NMCLI_TRUE@clients_cli_nmcli_CPPFLAGS = -I$(srcdir)/shared \ @BUILD_NMCLI_TRUE@ -I$(builddir)/shared -I$(srcdir)/libnm-core \ @BUILD_NMCLI_TRUE@ -I$(builddir)/libnm-core -I$(srcdir)/libnm \ @@ -5628,10 +5727,10 @@ clients_nm_online_LDADD = \ @BUILD_NMCLI_TRUE@ -I$(srcdir)/clients/common $(GLIB_CFLAGS) \ @BUILD_NMCLI_TRUE@ -DG_LOG_DOMAIN=\""nmcli"\" \ @BUILD_NMCLI_TRUE@ -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \ -@BUILD_NMCLI_TRUE@ $(am__append_49) +@BUILD_NMCLI_TRUE@ $(am__append_52) @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDADD = $(GLIB_LIBS) \ @BUILD_NMCLI_TRUE@ $(READLINE_LIBS) libnm/libnm.la \ -@BUILD_NMCLI_TRUE@ $(am__append_51) +@BUILD_NMCLI_TRUE@ $(am__append_54) @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDFLAGS = \ @BUILD_NMCLI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" @@ -5791,7 +5890,6 @@ clients_cli_settings_doc_c = clients/cli/settings-docs.c @BUILD_NMTUI_TRUE@ -I$(srcdir)/clients/common \ @BUILD_NMTUI_TRUE@ $(GLIB_CFLAGS) \ @BUILD_NMTUI_TRUE@ $(NEWT_CFLAGS) \ -@BUILD_NMTUI_TRUE@ $(GUDEV_CFLAGS) \ @BUILD_NMTUI_TRUE@ -DG_LOG_DOMAIN=\""nmtui"\" \ @BUILD_NMTUI_TRUE@ -DLOCALEDIR=\""$(localedir)"\" \ @BUILD_NMTUI_TRUE@ $(NULL) @@ -5802,9 +5900,8 @@ clients_cli_settings_doc_c = clients/cli/settings-docs.c @BUILD_NMTUI_TRUE@clients_tui_nmtui_LDADD = \ @BUILD_NMTUI_TRUE@ libnm/libnm.la \ @BUILD_NMTUI_TRUE@ clients/tui/newt/libnmt-newt.a \ -@BUILD_NMTUI_TRUE@ $(GUDEV_LIBS) \ -@BUILD_NMTUI_TRUE@ $(NEWT_LIBS) \ @BUILD_NMTUI_TRUE@ $(GLIB_LIBS) \ +@BUILD_NMTUI_TRUE@ $(NEWT_LIBS) \ @BUILD_NMTUI_TRUE@ $(NULL) @BUILD_NMTUI_TRUE@nmtui_links = nmtui-edit nmtui-connect nmtui-hostname @@ -5813,12 +5910,19 @@ clients_cli_settings_doc_c = clients/cli/settings-docs.c # data ############################################################################### data_edit = sed \ + -e 's|@NM_VERSION[@]|$(NM_VERSION)|g' \ -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ + -e 's|@nmrundir[@]|$(nmrundir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@libexecdir[@]|$(libexecdir)|g' \ - -e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g' + -e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g' \ + -e 's|@NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT[@]|$(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT)|g' \ + -e 's|@NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT)|g' \ + -e 's|@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT)|g' \ + -e 's|@NM_CONFIG_DEFAULT_MAIN_RC_MANAGER[@]|$(NM_CONFIG_DEFAULT_MAIN_RC_MANAGER)|g' \ + -e 's|@NM_CONFIG_DEFAULT_MAIN_DHCP[@]|$(NM_CONFIG_DEFAULT_MAIN_DHCP)|g' @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \ @HAVE_SYSTEMD_TRUE@ data/NetworkManager.service \ @@ -5840,8 +5944,8 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ -DLOCALEDIR=\"$(datadir)/locale\" \ @WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_CFLAGS) $(am__append_63) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_66) +@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_CFLAGS) $(am__append_66) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_69) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_h_pub_real = \ @WITH_LEGACY_LIBRARIES_TRUE@ shared/nm-version-macros.h \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/NetworkManager.h \ @@ -5929,7 +6033,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-setting-vpn.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-value-transforms.c \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_64) $(am__append_67) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_67) $(am__append_70) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_c_mkenums = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils-enum-types.c @@ -5946,19 +6050,19 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_util_lib_h_pub_real)) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LIBADD = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(DBUS_LIBS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_LIBS) $(am__append_65) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_68) +@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_LIBS) $(am__append_68) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_71) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LDFLAGS = \ @WITH_LEGACY_LIBRARIES_TRUE@ -Wl,--version-script=$(srcdir)/libnm-util/libnm-util.ver \ @WITH_LEGACY_LIBRARIES_TRUE@ -version-info "9:0:7" @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_SOURCES = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto.c \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_71) $(am__append_73) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_74) $(am__append_76) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_CPPFLAGS = $(libnm_util_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_LIBADD = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(am__append_72) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_74) +@WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(am__append_75) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_77) @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util @@ -6086,6 +6190,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-glib-enum-types.h @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_lib_h_priv = \ +@WITH_LEGACY_LIBRARIES_TRUE@ shared/nm-utils/nm-udev-utils.h \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-object-private.h \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-device-private.h \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-types-private.h \ @@ -6114,6 +6219,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_vpn_h_mkenums) @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_lib_c_real = \ +@WITH_LEGACY_LIBRARIES_TRUE@ shared/nm-utils/nm-udev-utils.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-object.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-dbus-helpers.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-client.c \ @@ -6159,7 +6265,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_CPPFLAGS = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_cppflags) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(GUDEV_CFLAGS) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(LIBUDEV_CFLAGS) \ @WITH_LEGACY_LIBRARIES_TRUE@ -DNMRUNDIR=\"$(nmrundir)\" @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_LDFLAGS = \ @@ -6171,7 +6277,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libdeprecated-nm-glib.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(DBUS_LIBS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(GUDEV_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@ $(LIBUDEV_LIBS) @WITH_LEGACY_LIBRARIES_TRUE@nm_glib_enum_types_sources = $(libnm_glib_lib_h_pub_real) @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_test_CFLAGS = $(libnm_glib_cppflags) @@ -6207,7 +6313,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@nm_vpn_enum_types_sources = $(libnm_glib_vpn_h_real) @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0 -@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 gudev-1.0 +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_CFLAGS = $(libnm_glib_cppflags) @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_LIBS = \ @@ -6267,10 +6373,6 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(DBUS_LIBS) - -############################################################################### -# man -############################################################################### xsltproc_flags = \ --path man \ --xinclude \ @@ -6279,15 +6381,14 @@ xsltproc_flags = \ --stringparam funcsynopsis.style ansi \ --stringparam man.th.extra1.suppress 1 \ --stringparam man.authors.section.enabled 0 \ - --stringparam man.copyright.section.enabled 0 + --stringparam man.copyright.section.enabled 0 \ + --stringparam man.th.title.max.length 30 man_nm_settings_xml = \ man/nm-settings.xml \ man/nm-settings-keyfile.xml \ man/nm-settings-ifcfg-rh.xml -@HAVE_INTROSPECTION_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@install_manpages = true -@HAVE_INTROSPECTION_TRUE@install_manpages = true @ENABLE_VAPIGEN_TRUE@vapi_libnm_vapi_METADATADIRS = $(srcdir)/vapi @ENABLE_VAPIGEN_TRUE@vapi_libnm_vapi_FILES = $(builddir)/libnm/NM-1.0.gir @ENABLE_VAPIGEN_TRUE@vapi_libnm_vapi_DEPS = gio-2.0 @@ -6297,7 +6398,7 @@ man_nm_settings_xml = \ @ENABLE_VAPIGEN_TRUE@vapi_libnm_glib_vapi_FILES = $(builddir)/libnm-glib/NMClient-1.0.gir @ENABLE_VAPIGEN_TRUE@vapi_libnm_glib_vapi_VAPIDIRS = $(builddir)/vapi @ENABLE_VAPIGEN_TRUE@vapi_libnm_glib_vapi_GIRDIRS = $(builddir)/libnm-util -@ENABLE_VAPIGEN_TRUE@vapi_libnm_glib_vapi_DEPS = gio-2.0 +@ENABLE_VAPIGEN_TRUE@vapi_libnm_glib_vapi_DEPS = gio-2.0 dbus-glib-1 libnm-util ############################################################################### girdir = $(datadir)/gir-1.0 @@ -6306,12 +6407,12 @@ typelibdir = $(libdir)/girepository-1.0 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) dbusservicedir = $(DBUS_SYS_DIR) examples_C_glib_cppflags = \ - -I${top_srcdir}/shared \ - -I${top_builddir}/shared \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I${top_srcdir}/libnm \ - -I${top_builddir}/libnm \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/libnm \ + -I$(top_builddir)/libnm \ $(GLIB_CFLAGS) \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE @@ -6358,9 +6459,9 @@ examples_C_glib_monitor_nm_state_gdbus_LDADD = \ # examples/C/qt ############################################################################### @WITH_QT_TRUE@examples_C_qt_cppflags = \ -@WITH_QT_TRUE@ -I${top_srcdir}/libnm-core \ -@WITH_QT_TRUE@ -I${top_builddir}/libnm-core \ -@WITH_QT_TRUE@ -I${builddir}/examples/C/qt \ +@WITH_QT_TRUE@ -I$(top_srcdir)/libnm-core \ +@WITH_QT_TRUE@ -I$(top_builddir)/libnm-core \ +@WITH_QT_TRUE@ -I$(builddir)/examples/C/qt \ @WITH_QT_TRUE@ $(DBUS_CFLAGS) \ @WITH_QT_TRUE@ $(QT_CFLAGS) @@ -6452,8 +6553,6 @@ libnm-glib/libnm-glib.pc: $(top_builddir)/config.status $(top_srcdir)/libnm-glib cd $(top_builddir) && $(SHELL) ./config.status $@ libnm-glib/libnm-glib-vpn.pc: $(top_builddir)/config.status $(top_srcdir)/libnm-glib/libnm-glib-vpn.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ -man/common.ent: $(top_builddir)/config.status $(top_srcdir)/man/common.ent.in - cd $(top_builddir) && $(SHELL) ./config.status $@ data/org.freedesktop.NetworkManager.policy.in: $(top_builddir)/config.status $(top_srcdir)/data/org.freedesktop.NetworkManager.policy.in.in cd $(top_builddir) && $(SHELL) ./config.status $@ NetworkManager.pc: $(top_builddir)/config.status $(srcdir)/NetworkManager.pc.in @@ -6701,6 +6800,9 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.B introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo: \ introspection/$(am__dirstamp) \ introspection/$(DEPDIR)/$(am__dirstamp) +introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo: \ + introspection/$(am__dirstamp) \ + introspection/$(DEPDIR)/$(am__dirstamp) introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo: \ introspection/$(am__dirstamp) \ introspection/$(DEPDIR)/$(am__dirstamp) @@ -6800,6 +6902,17 @@ shared/nm-utils/$(DEPDIR)/$(am__dirstamp): shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: \ shared/nm-utils/$(am__dirstamp) \ shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/$(am__dirstamp): + @$(MKDIR_P) shared + @: > shared/$(am__dirstamp) +shared/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) shared/$(DEPDIR) + @: > shared/$(DEPDIR)/$(am__dirstamp) +shared/libnm_core_libnm_core_la-nm-setting-metadata.lo: \ + shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) libnm-core/$(am__dirstamp): @$(MKDIR_P) libnm-core @: > libnm-core/$(am__dirstamp) @@ -6857,6 +6970,9 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-connection.lo: \ libnm-core/libnm_core_libnm_core_la-nm-setting-dcb.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-setting-dummy.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) libnm-core/libnm_core_libnm_core_la-nm-setting-generic.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) @@ -6908,6 +7024,9 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-team.lo: \ libnm-core/libnm_core_libnm_core_la-nm-setting-tun.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-setting-user.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) libnm-core/libnm_core_libnm_core_la-nm-setting-vlan.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) @@ -6983,6 +7102,9 @@ libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-enum-types.lo: \ libnm-glib/libnm-glib-vpn.la: $(libnm_glib_libnm_glib_vpn_la_OBJECTS) $(libnm_glib_libnm_glib_vpn_la_DEPENDENCIES) $(EXTRA_libnm_glib_libnm_glib_vpn_la_DEPENDENCIES) libnm-glib/$(am__dirstamp) $(AM_V_CCLD)$(libnm_glib_libnm_glib_vpn_la_LINK) $(am_libnm_glib_libnm_glib_vpn_la_rpath) $(libnm_glib_libnm_glib_vpn_la_OBJECTS) $(libnm_glib_libnm_glib_vpn_la_LIBADD) $(LIBS) +shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) libnm-glib/libnm_glib_libnm_glib_la-nm-object.lo: \ libnm-glib/$(am__dirstamp) \ libnm-glib/$(DEPDIR)/$(am__dirstamp) @@ -7230,6 +7352,8 @@ libnm/libnm_libnm_la-nm-device-bridge.lo: libnm/$(am__dirstamp) \ libnm/$(DEPDIR)/$(am__dirstamp) libnm/libnm_libnm_la-nm-device-bt.lo: libnm/$(am__dirstamp) \ libnm/$(DEPDIR)/$(am__dirstamp) +libnm/libnm_libnm_la-nm-device-dummy.lo: libnm/$(am__dirstamp) \ + libnm/$(DEPDIR)/$(am__dirstamp) libnm/libnm_libnm_la-nm-device-ethernet.lo: libnm/$(am__dirstamp) \ libnm/$(DEPDIR)/$(am__dirstamp) libnm/libnm_libnm_la-nm-device-generic.lo: libnm/$(am__dirstamp) \ @@ -7465,6 +7589,9 @@ src/devices/src_libNetworkManager_la-nm-device-bond.lo: \ src/devices/src_libNetworkManager_la-nm-device-bridge.lo: \ src/devices/$(am__dirstamp) \ src/devices/$(DEPDIR)/$(am__dirstamp) +src/devices/src_libNetworkManager_la-nm-device-dummy.lo: \ + src/devices/$(am__dirstamp) \ + src/devices/$(DEPDIR)/$(am__dirstamp) src/devices/src_libNetworkManager_la-nm-device-ethernet.lo: \ src/devices/$(am__dirstamp) \ src/devices/$(DEPDIR)/$(am__dirstamp) @@ -7627,10 +7754,10 @@ src/src_libNetworkManager_la-nm-config.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-config-data.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) -src/src_libNetworkManager_la-nm-connectivity.lo: src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-dcb.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) +src/src_libNetworkManager_la-nm-netns.lo: src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-default-route-manager.lo: \ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-dhcp4-config.lo: src/$(am__dirstamp) \ @@ -7661,6 +7788,8 @@ src/src_libNetworkManager_la-nm-session-monitor.lo: \ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-sleep-monitor.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) +src/src_libNetworkManager_la-nm-connectivity.lo: src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) src/libNetworkManager.la: $(src_libNetworkManager_la_OBJECTS) $(src_libNetworkManager_la_DEPENDENCIES) $(EXTRA_src_libNetworkManager_la_DEPENDENCIES) src/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(src_libNetworkManager_la_OBJECTS) $(src_libNetworkManager_la_LIBADD) $(LIBS) @@ -8632,12 +8761,6 @@ libnm-glib/libnm_glib_libnm_glib_test-libnm-glib-test.$(OBJEXT): \ libnm-glib/libnm-glib-test$(EXEEXT): $(libnm_glib_libnm_glib_test_OBJECTS) $(libnm_glib_libnm_glib_test_DEPENDENCIES) $(EXTRA_libnm_glib_libnm_glib_test_DEPENDENCIES) libnm-glib/$(am__dirstamp) @rm -f libnm-glib/libnm-glib-test$(EXEEXT) $(AM_V_CCLD)$(libnm_glib_libnm_glib_test_LINK) $(libnm_glib_libnm_glib_test_OBJECTS) $(libnm_glib_libnm_glib_test_LDADD) $(LIBS) -shared/$(am__dirstamp): - @$(MKDIR_P) shared - @: > shared/$(am__dirstamp) -shared/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) shared/$(DEPDIR) - @: > shared/$(DEPDIR)/$(am__dirstamp) shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT): \ shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) libnm-glib/tests/$(am__dirstamp): @@ -9128,6 +9251,7 @@ mostlyclean-compile: -rm -f libnm/*.lo -rm -f libnm/tests/*.$(OBJEXT) -rm -f shared/*.$(OBJEXT) + -rm -f shared/*.lo -rm -f shared/nm-utils/*.$(OBJEXT) -rm -f shared/nm-utils/*.lo -rm -f src/*.$(OBJEXT) @@ -9308,6 +9432,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Bond.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Bridge.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.Plo@am__quote@ @@ -9355,6 +9480,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-cdma.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-connection.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-dcb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-dummy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-generic.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-gsm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-infiniband.Plo@am__quote@ @@ -9372,6 +9498,7 @@ distclean-compile: @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@ +@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-user.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-vlan.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-vpn.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-vxlan.Plo@am__quote@ @@ -9486,6 +9613,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-bond.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-bridge.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-bt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-dummy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ethernet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-generic.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-infiniband.Plo@am__quote@ @@ -9522,12 +9650,15 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_secret_agent-test-secret-agent.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-metadata.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_util_libnm_util_la-nm-shared-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_NetworkManager-main.Po@am__quote@ @@ -9559,6 +9690,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dispatcher.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-firewall-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-netns.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-pacrunner-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-policy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-proxy-config.Plo@am__quote@ @@ -9569,6 +9701,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-bond.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-bridge.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-dummy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ethernet-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ethernet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-factory.Plo@am__quote@ @@ -10132,6 +10265,13 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.B @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c +introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo: introspection/org.freedesktop.NetworkManager.Device.Dummy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Dummy.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Dummy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.Dummy.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Dummy.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Dummy.c + introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo: introspection/org.freedesktop.NetworkManager.Device.Wired.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Wired.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Wired.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Plo @@ -10342,6 +10482,20 @@ shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: shared/nm-utils/nm- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c +shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: shared/nm-utils/nm-udev-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-udev-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c + +shared/libnm_core_libnm_core_la-nm-setting-metadata.lo: shared/nm-setting-metadata.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-setting-metadata.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-metadata.Tpo -c -o shared/libnm_core_libnm_core_la-nm-setting-metadata.lo `test -f 'shared/nm-setting-metadata.c' || echo '$(srcdir)/'`shared/nm-setting-metadata.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-metadata.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-metadata.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-setting-metadata.c' object='shared/libnm_core_libnm_core_la-nm-setting-metadata.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_core_libnm_core_la-nm-setting-metadata.lo `test -f 'shared/nm-setting-metadata.c' || echo '$(srcdir)/'`shared/nm-setting-metadata.c + libnm-core/libnm_core_libnm_core_la-crypto.lo: libnm-core/crypto.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo -c -o libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Plo @@ -10461,6 +10615,13 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-dcb.lo: libnm-core/nm-setting-dcb @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @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-dcb.lo `test -f 'libnm-core/nm-setting-dcb.c' || echo '$(srcdir)/'`libnm-core/nm-setting-dcb.c +libnm-core/libnm_core_libnm_core_la-nm-setting-dummy.lo: libnm-core/nm-setting-dummy.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-dummy.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-dummy.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-dummy.lo `test -f 'libnm-core/nm-setting-dummy.c' || echo '$(srcdir)/'`libnm-core/nm-setting-dummy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-dummy.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-dummy.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-setting-dummy.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-dummy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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-dummy.lo `test -f 'libnm-core/nm-setting-dummy.c' || echo '$(srcdir)/'`libnm-core/nm-setting-dummy.c + libnm-core/libnm_core_libnm_core_la-nm-setting-generic.lo: libnm-core/nm-setting-generic.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-generic.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-generic.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-generic.lo `test -f 'libnm-core/nm-setting-generic.c' || echo '$(srcdir)/'`libnm-core/nm-setting-generic.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-generic.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-generic.Plo @@ -10580,6 +10741,13 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-tun.lo: libnm-core/nm-setting-tun @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @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-tun.lo `test -f 'libnm-core/nm-setting-tun.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tun.c +libnm-core/libnm_core_libnm_core_la-nm-setting-user.lo: libnm-core/nm-setting-user.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-user.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-user.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-user.lo `test -f 'libnm-core/nm-setting-user.c' || echo '$(srcdir)/'`libnm-core/nm-setting-user.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-user.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-user.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-setting-user.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-user.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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-user.lo `test -f 'libnm-core/nm-setting-user.c' || echo '$(srcdir)/'`libnm-core/nm-setting-user.c + libnm-core/libnm_core_libnm_core_la-nm-setting-vlan.lo: libnm-core/nm-setting-vlan.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-vlan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-vlan.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-vlan.lo `test -f 'libnm-core/nm-setting-vlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vlan.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-vlan.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-vlan.Plo @@ -10720,6 +10888,13 @@ libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-enum-types.lo: libnm-glib/nm-vpn- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_vpn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-enum-types.lo `test -f 'libnm-glib/nm-vpn-enum-types.c' || echo '$(srcdir)/'`libnm-glib/nm-vpn-enum-types.c +shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo: shared/nm-utils/nm-udev-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-udev-utils.c' object='shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c + libnm-glib/libnm_glib_libnm_glib_la-nm-object.lo: libnm-glib/nm-object.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_libnm_glib_la-nm-object.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-object.Tpo -c -o libnm-glib/libnm_glib_libnm_glib_la-nm-object.lo `test -f 'libnm-glib/nm-object.c' || echo '$(srcdir)/'`libnm-glib/nm-object.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-object.Tpo libnm-glib/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-object.Plo @@ -11266,6 +11441,13 @@ libnm/libnm_libnm_la-nm-device-bt.lo: libnm/nm-device-bt.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-device-bt.lo `test -f 'libnm/nm-device-bt.c' || echo '$(srcdir)/'`libnm/nm-device-bt.c +libnm/libnm_libnm_la-nm-device-dummy.lo: libnm/nm-device-dummy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-device-dummy.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-device-dummy.Tpo -c -o libnm/libnm_libnm_la-nm-device-dummy.lo `test -f 'libnm/nm-device-dummy.c' || echo '$(srcdir)/'`libnm/nm-device-dummy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-device-dummy.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-device-dummy.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm/nm-device-dummy.c' object='libnm/libnm_libnm_la-nm-device-dummy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-device-dummy.lo `test -f 'libnm/nm-device-dummy.c' || echo '$(srcdir)/'`libnm/nm-device-dummy.c + libnm/libnm_libnm_la-nm-device-ethernet.lo: libnm/nm-device-ethernet.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-device-ethernet.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ethernet.Tpo -c -o libnm/libnm_libnm_la-nm-device-ethernet.lo `test -f 'libnm/nm-device-ethernet.c' || echo '$(srcdir)/'`libnm/nm-device-ethernet.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ethernet.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ethernet.Plo @@ -11735,6 +11917,13 @@ src/devices/src_libNetworkManager_la-nm-device-bridge.lo: src/devices/nm-device- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-device-bridge.lo `test -f 'src/devices/nm-device-bridge.c' || echo '$(srcdir)/'`src/devices/nm-device-bridge.c +src/devices/src_libNetworkManager_la-nm-device-dummy.lo: src/devices/nm-device-dummy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-device-dummy.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-dummy.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device-dummy.lo `test -f 'src/devices/nm-device-dummy.c' || echo '$(srcdir)/'`src/devices/nm-device-dummy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-dummy.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-dummy.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/nm-device-dummy.c' object='src/devices/src_libNetworkManager_la-nm-device-dummy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-device-dummy.lo `test -f 'src/devices/nm-device-dummy.c' || echo '$(srcdir)/'`src/devices/nm-device-dummy.c + src/devices/src_libNetworkManager_la-nm-device-ethernet.lo: src/devices/nm-device-ethernet.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-device-ethernet.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ethernet.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device-ethernet.lo `test -f 'src/devices/nm-device-ethernet.c' || echo '$(srcdir)/'`src/devices/nm-device-ethernet.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ethernet.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ethernet.Plo @@ -12043,13 +12232,6 @@ src/src_libNetworkManager_la-nm-config-data.lo: src/nm-config-data.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-config-data.lo `test -f 'src/nm-config-data.c' || echo '$(srcdir)/'`src/nm-config-data.c -src/src_libNetworkManager_la-nm-connectivity.lo: src/nm-connectivity.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/src_libNetworkManager_la-nm-connectivity.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-connectivity.c' object='src/src_libNetworkManager_la-nm-connectivity.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@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/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c - src/src_libNetworkManager_la-nm-dcb.lo: src/nm-dcb.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/src_libNetworkManager_la-nm-dcb.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Tpo -c -o src/src_libNetworkManager_la-nm-dcb.lo `test -f 'src/nm-dcb.c' || echo '$(srcdir)/'`src/nm-dcb.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Plo @@ -12057,6 +12239,13 @@ src/src_libNetworkManager_la-nm-dcb.lo: src/nm-dcb.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-dcb.lo `test -f 'src/nm-dcb.c' || echo '$(srcdir)/'`src/nm-dcb.c +src/src_libNetworkManager_la-nm-netns.lo: src/nm-netns.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/src_libNetworkManager_la-nm-netns.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-netns.Tpo -c -o src/src_libNetworkManager_la-nm-netns.lo `test -f 'src/nm-netns.c' || echo '$(srcdir)/'`src/nm-netns.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-netns.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-netns.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-netns.c' object='src/src_libNetworkManager_la-nm-netns.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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/src_libNetworkManager_la-nm-netns.lo `test -f 'src/nm-netns.c' || echo '$(srcdir)/'`src/nm-netns.c + src/src_libNetworkManager_la-nm-default-route-manager.lo: src/nm-default-route-manager.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-default-route-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-default-route-manager.Tpo -c -o src/src_libNetworkManager_la-nm-default-route-manager.lo `test -f 'src/nm-default-route-manager.c' || echo '$(srcdir)/'`src/nm-default-route-manager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-default-route-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-default-route-manager.Plo @@ -12162,6 +12351,13 @@ src/src_libNetworkManager_la-nm-sleep-monitor.lo: src/nm-sleep-monitor.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-sleep-monitor.lo `test -f 'src/nm-sleep-monitor.c' || echo '$(srcdir)/'`src/nm-sleep-monitor.c +src/src_libNetworkManager_la-nm-connectivity.lo: src/nm-connectivity.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/src_libNetworkManager_la-nm-connectivity.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-connectivity.c' object='src/src_libNetworkManager_la-nm-connectivity.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c + src/src_libNetworkManagerBase_la-nm-core-utils.lo: src/nm-core-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_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-core-utils.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Tpo -c -o src/src_libNetworkManagerBase_la-nm-core-utils.lo `test -f 'src/nm-core-utils.c' || echo '$(srcdir)/'`src/nm-core-utils.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Plo @@ -14860,6 +15056,7 @@ clean-libtool: -rm -rf libnm-util/.libs libnm-util/_libs -rm -rf libnm-util/tests/.libs libnm-util/tests/_libs -rm -rf libnm/tests/.libs libnm/tests/_libs + -rm -rf shared/.libs shared/_libs -rm -rf shared/nm-utils/.libs shared/nm-utils/_libs -rm -rf src/.libs src/_libs -rm -rf src/devices/.libs src/devices/_libs @@ -16751,6 +16948,7 @@ dist: $(dist_configure_check) $(dist_dependencies) @INTLTOOL_POLICY_RULE@ introspection/%.c: introspection/%.xml + @$(MKDIR_P) introspection/ $(AM_V_GEN) gdbus-codegen \ --generate-c-code $(basename $@) \ --generate-docbook docs/api/dbus \ @@ -16770,16 +16968,15 @@ $(libnm_libnm_la_OBJECTS): $(introspection_sources) $(src_libNetworkManager_la_OBJECTS): $(introspection_sources) $(src_libNetworkManagerBase_la_OBJECTS): $(introspection_sources) +libnm-core/nm-core-enum-types.h.stamp: libnm-core/.dirstamp +libnm-core/nm-core-enum-types.c.stamp: libnm-core/.dirstamp + $(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(dispatcher_nm_dispatcher_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_core_libnm_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_libnm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_devices_team_libnm_device_plugin_team_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -16787,13 +16984,25 @@ $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS): $(li $(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) libnm-core/nm-vpn-dbus-types.xml: libnm-core/nm-vpn-dbus-interface.h tools/enums-to-docbook.pl - $(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $^ >$@ + @$(MKDIR_P) libnm-core/ + $(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $< >$@ libnm-core/nm-dbus-types.xml: libnm-core/nm-dbus-interface.h tools/enums-to-docbook.pl - $(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $^ >$@ + @$(MKDIR_P) libnm-core/ + $(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $< >$@ $(libnm_core_tests_test_general_OBJECTS): libnm-core/tests/nm-core-tests-enum-types.h +$(libnm_core_tests_test_compare_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(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_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + $(dispatcher_nm_dispatcher_OBJECTS): $(libnm_lib_h_pub_mkenums) $(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(libnm_lib_h_pub_mkenums) $(libnm_libnm_la_OBJECTS): $(libnm_lib_h_pub_mkenums) @@ -16839,15 +17048,46 @@ check-local-exports-libnm: libnm/libnm.la @HAVE_INTROSPECTION_TRUE@libnm/nm-settings-ifcfg-rh-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh "$(srcdir)" $@ +$(libnm_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(libnm_tests_test_secret_agent_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_libsystemd_nm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + ############################################################################### src/NetworkManager.ver: src/libNetworkManager.la $(core_plugins) $(AM_V_GEN) BINUTILS_NM="$(BINUTILS_NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-make "$(srcdir)" +$(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +@WITH_PPP_TRUE@$(src_ppp_nm_pppd_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +@WITH_PPP_TRUE@$(src_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_settings_plugins_keyfile_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +@CONFIG_PLUGIN_IBFT_TRUE@$(src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +@CONFIG_PLUGIN_IBFT_TRUE@$(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +@CONFIG_PLUGIN_IBFT_TRUE@$(src_settings_plugins_ibft_tests_test_ibft_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + @CONFIG_PLUGIN_IBFT_TRUE@check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la @CONFIG_PLUGIN_IBFT_TRUE@ $(call check_so_symbols,$(builddir)/src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.so) @CONFIG_PLUGIN_IFCFG_RH_TRUE@src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h: src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ @$(MKDIR_P) src/settings/plugins/ifcfg-rh/ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(AM_V_GEN) gdbus-codegen \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ --generate-c-code $(basename $@) \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ --c-namespace NMDBus \ @@ -16857,20 +17097,27 @@ src/NetworkManager.ver: src/libNetworkManager.la $(core_plugins) @CONFIG_PLUGIN_IFCFG_RH_TRUE@src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h @CONFIG_PLUGIN_IFCFG_RH_TRUE@ @true +@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + @CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h +@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @CONFIG_PLUGIN_IFCFG_RH_TRUE@check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la @CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(call check_so_symbols,$(builddir)/src/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + dist-hook-settings-ifcfg-rh-alias-files: @for f in $(src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files); do \ cp $(abs_srcdir)/$$f $(distdir)/src/settings/plugins/ifcfg-rh/tests/network-scripts/; \ done +@CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + @CONFIG_PLUGIN_IFUPDOWN_TRUE@check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(call check_so_symbols,$(builddir)/src/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so) -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(CODE_COVERAGE_LDFLAGS) -@CONFIG_PLUGIN_IFNET_TRUE@ -DSBINDIR=\"$(sbindir)\" + +@CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @CONFIG_PLUGIN_IFNET_TRUE@check-local-symbols-settings-ifnet: src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la @CONFIG_PLUGIN_IFNET_TRUE@ $(call check_so_symbols,$(builddir)/src/settings/plugins/ifnet/.libs/libnm-settings-plugin-ifnet.so) @@ -16880,6 +17127,8 @@ check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver" $(call check_so_symbols,$(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so) +@WITH_MODEM_MANAGER_1_TRUE@$(src_devices_wwan_libnm_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + @WITH_MODEM_MANAGER_1_TRUE@check-local-devices-wwan: src/devices/wwan/libnm-device-plugin-wwan.la src/devices/wwan/libnm-wwan.la @WITH_MODEM_MANAGER_1_TRUE@ $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so "$(srcdir)/linker-script-devices.ver" @WITH_MODEM_MANAGER_1_TRUE@ $(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so) @@ -16894,11 +17143,52 @@ check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la @WITH_WIFI_TRUE@ $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(srcdir)/linker-script-devices.ver" @WITH_WIFI_TRUE@ $(call check_so_symbols,$(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so) +@WITH_WIFI_TRUE@$(src_devices_wifi_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + @WITH_TEAMDCTL_TRUE@check-local-devices-team: src/devices/team/libnm-device-plugin-team.la @WITH_TEAMDCTL_TRUE@ $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so "$(srcdir)/linker-script-devices.ver" @WITH_TEAMDCTL_TRUE@ $(call check_so_symbols,$(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so) +$(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_link_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_link_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_address_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_address_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_route_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_route_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_cleanup_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_devices_tests_test_arping_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_supplicant_tests_test_supplicant_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_resolvconf_capture_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_general_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_tests_test_route_manager_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_route_manager_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + dispatcher/nmdbus-dispatcher.h: dispatcher/nm-dispatcher.xml + @$(MKDIR_P) dispatcher/ $(AM_V_GEN) gdbus-codegen \ --generate-c-code $(basename $@) \ --c-namespace NMDBus \ @@ -16923,7 +17213,12 @@ install-data-hook-dispatcher: $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-up.d $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/no-wait.d +$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + @BUILD_NMCLI_TRUE@$(clients_cli_nmcli_OBJECTS): $(clients_cli_settings_doc_c) +@BUILD_NMCLI_TRUE@$(clients_cli_nmcli_OBJECTS): clients/cli/.dirstamp @BUILD_NMCLI_TRUE@install-data-hook-nmcli: @BUILD_NMCLI_TRUE@ $(mkinstalldirs) $(DESTDIR)$(completiondir) @@ -16932,12 +17227,15 @@ install-data-hook-dispatcher: @BUILD_NMCLI_TRUE@uninstall-hook-nmcli: @BUILD_NMCLI_TRUE@ rm -f $(DESTDIR)$(completiondir)/nmcli @HAVE_INTROSPECTION_TRUE@$(clients_cli_settings_doc_c): clients/cli/settings-docs.xsl libnm/nm-property-docs.xml -@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(XSLTPROC) --output $@ $^ +@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) +@HAVE_INTROSPECTION_TRUE@$(clients_cli_settings_doc_c): clients/cli/.dirstamp @HAVE_INTROSPECTION_FALSE@$(clients_cli_settings_doc_c): @HAVE_INTROSPECTION_FALSE@ @echo "to generate $(clients_cli_settings_doc_c), configure with --enable-introspection" @HAVE_INTROSPECTION_FALSE@ @echo "alternatively, build --without-nmcli" @HAVE_INTROSPECTION_FALSE@ @false +@BUILD_NMTUI_TRUE@$(clients_tui_nmtui_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + @BUILD_NMTUI_TRUE@install-exec-hook-nmtui: @BUILD_NMTUI_TRUE@ for link in $(nmtui_links); do \ @BUILD_NMTUI_TRUE@ $(LN_S) -f nmtui "$(DESTDIR)$(bindir)/$$link"; \ @@ -16967,11 +17265,13 @@ install-data-hook-dispatcher: @HAVE_SYSTEMD_TRUE@ ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants data/server.conf: $(srcdir)/data/server.conf.in - @mkdir -p data/ + @$(MKDIR_P) data/ $(AM_V_GEN) $(data_edit) $< >$@ @WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_libnm_util_la_OBJECTS): $(libnm_util_lib_h_pub_mkenums) +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_libnm_util_la_OBJECTS): $(libnm_util_lib_h_pub_mkenums) + @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm-util/NetworkManager-1.0.gir: libnm-util/libnm-util.la @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm-util/NetworkManager-1.0.typelib: libnm-util/NetworkManager-1.0.gir @@ -16980,7 +17280,18 @@ data/server.conf: $(srcdir)/data/server.conf.in @WITH_LEGACY_LIBRARIES_TRUE@check-local-exports-libnm-util: libnm-util/libnm-util.la @WITH_LEGACY_LIBRARIES_TRUE@ $(srcdir)/tools/check-exports.sh "$(builddir)/libnm-util/.libs/libnm-util.so" "$(srcdir)/libnm-util/libnm-util.ver" +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_crypto_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_secrets_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_setting_8021x_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_setting_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_libnm_linking_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + @WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_la_OBJECTS): $(libnm_glib_lib_h_pub_mkenums) +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_test_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_vpn_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_vpn_la_OBJECTS): $(libnm_glib_vpn_h_mkenums) @@ -17001,31 +17312,44 @@ data/server.conf: $(srcdir)/data/server.conf.in @WITH_LEGACY_LIBRARIES_TRUE@check-local-exports-libnm-glib: @WITH_LEGACY_LIBRARIES_TRUE@ $(srcdir)/tools/check-exports.sh $(builddir)/libnm-glib/.libs/libnm-glib.so $(srcdir)/libnm-glib/libnm-glib.ver -@HAVE_INTROSPECTION_TRUE@man/%.1 man/%.5 man/%.7 man/%.8: man/%.xml man/common.ent -@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +############################################################################### +# man +############################################################################### + +man/common.ent: man/common.ent.in + @$(MKDIR_P) man/ + $(AM_V_GEN) $(data_edit) $< >$@ + +@BUILD_DOCS_TRUE@man/%.1 man/%.5 man/%.7 man/%.8: man/%.xml man/common.ent +@BUILD_DOCS_TRUE@ $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< @HAVE_INTROSPECTION_TRUE@man/nm-setting%.xml: man/nm-setting%.xsl libnm/nm-setting%-docs.xml @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $^ -install-data-hook-man: - if test -n "$(install_manpages)"; then \ - for link in $(nmtui_links); do \ - ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \ - done; \ - ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5; \ - fi +@HAVE_DOCS_TRUE@install-data-hook-man: +@HAVE_DOCS_TRUE@ for link in $(nmtui_links); do \ +@HAVE_DOCS_TRUE@ ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \ +@HAVE_DOCS_TRUE@ done; \ +@HAVE_DOCS_TRUE@ ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5; -uninstall-hook-man: - if test -n "$(install_manpages)"; then \ - for link in $(nmtui_links); do \ - rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \ - done; \ - rm -f $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5; \ - fi +@HAVE_DOCS_TRUE@uninstall-hook-man: +@HAVE_DOCS_TRUE@ for link in $(nmtui_links); do \ +@HAVE_DOCS_TRUE@ rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \ +@HAVE_DOCS_TRUE@ done; \ +@HAVE_DOCS_TRUE@ rm -f $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5; @ENABLE_VAPIGEN_TRUE@vapi/libnm.vapi: $(builddir)/libnm/NM-1.0.gir vapi/libnm.deps vapi/NM-1.0.metadata @ENABLE_VAPIGEN_TRUE@vapi/libnm-util.vapi: $(builddir)/libnm-util/NetworkManager-1.0.gir vapi/libnm-util.deps vapi/NetworkManager-1.0.metadata @ENABLE_VAPIGEN_TRUE@vapi/libnm-glib.vapi: $(builddir)/libnm-glib/NMClient-1.0.gir vapi/libnm-glib.deps vapi/NMClient-1.0.metadata vapi/libnm-util.vapi +$(examples_C_glib_add_connection_gdbus_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(examples_C_glib_add_connection_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(examples_C_glib_get_active_connections_gdbus_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(examples_C_glib_get_ap_info_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(examples_C_glib_list_connections_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @WITH_QT_TRUE@examples/C/qt/monitor-nm-running.moc: examples/C/qt/monitor-nm-running.cpp @WITH_QT_TRUE@ $(AM_V_GEN) $(MOC) -i $< -o $@ @@ -17065,6 +17389,7 @@ cscope: ############################################################################### +.DELETE_ON_ERROR: .PHONY: cscope dist-configure-check $(check_local) $(dist_hook) # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/NEWS b/NEWS index 834dc94f..63284c3f 100644 --- a/NEWS +++ b/NEWS @@ -1,13 +1,53 @@ -============================================== -NetworkManager-1.6.2 -Overview of changes since NetworkManager-1.6.0 -============================================== +============================================ +NetworkManager-1.8 +Overview of changes since NetworkManager-1.6 +============================================ This is a new stable release of NetworkManager. Notable changes include: -* Fixed build warnings with GCC 7 -* Multiple bug fixes in NetworkManager, nmcli and nm-online including - several crashes. +* Default routes set by devices that failed connectivity checks are now + penalized with a higher metric +* nmcli is now able to produce output more friendly for machine parsing +* The slaves available at the time a master connection is activated are + enslaved in a stable order, making the automatic MAC address for Bonding + devices more predictable. +* Hostname management is now more flexibly configured +* Support for additional route options (pref-src, src, tos, window, cwnd, + initcwnd, initrwnd, mtu, lock-window, lock-cwnd, lock-initcwnd, lock-initrwnd, + and lock-mtu). +* Fixed detection of EAP-FAST support in wpa_supplicant +* Support for handling PINs for PKCS#11 tokens as secrets +* GSM and CDMA connections now have a MTU property +* An option to disable selected TLS versions during EAP phase 1 authentication +* The 802.1x authentication timeout is now configurable to allow a faster + fallback to other connections +* Persist managed state of device until reboot. This improves seamless take over + of a previously managed device after restart of NetworkManager. +* Better handle devices that are externally managed by somebody else by + consistently generating an in-memory connection to reflect the external + state. +* Expose SRIOV capability of a device on D-Bus and support configuring the + number of virtual functions via NetworkManager.conf. +* Support matching networking devices via new "driver:" device spec in + NetworkManager.conf. +* Introduced support for creating and managing dummy links +* The teaming devices now support setting a hardcoded MAC address +* Settings of bonding devices can now be modified on-the-fly, without the + need to reactivate a connection +* The failures to activate a connection now communicate better error + responses to nmcli +* Dropped dependency on libgudev +* Reverse Path filtering is now disabled in multihoming configurations where + it would interfere with legitimate network traffic +* libcurl is used instead of libsoup for connectivity checking, resulting in + a smaller dependency footprint +* With DNS mode "rc-manager=symlink", don't write /etc/resolv.conf as + a symlink if it already exists as a regular file. +* Support attaching user-data in form of key-value pairs to connection profiles. +* Fix accpeting fully qualified name for ipv4.dhcp-hostname setting. +* Make NetworkManager more forgiving to failure to change the MAC address during + scanning. +* Many bug fixes and improvements ============================================ NetworkManager-1.6 @@ -476,6 +516,8 @@ This is a new stable release of NetworkManager. Notable changes include: * Add support for ModemManager 0.7/0.8 * Allow more human-readable formatting of IP address in keyfile connections * Drop support for dhclient v3 +* Move PPP support to a separate plugin, so that it can be packaged separately + and reduce the dependency on the core package. * Add support for DHCPv6 server-side Dynamic DNS * Add support for bridge master devices and bridge ports * Fix canceling secrets requests in GUI agents diff --git a/clients/cli/agent.c b/clients/cli/agent.c index 4cbf7d2d..23582f49 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -139,6 +139,7 @@ secrets_requested (NMSecretAgentSimple *agent, static NMCResultCode do_agent_secret (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); if (nmc->complete) return nmc->return_value; @@ -167,6 +168,7 @@ do_agent_polkit (NmCli *nmc, int argc, char **argv) { GError *error = NULL; + next_arg (nmc, &argc, &argv, NULL); if (nmc->complete) return nmc->return_value; @@ -192,6 +194,7 @@ do_agent_all (NmCli *nmc, int argc, char **argv) { NMCResultCode secret_res; + next_arg (nmc, &argc, &argv, NULL); if (nmc->complete) return nmc->return_value; @@ -218,6 +221,7 @@ static const NMCCommand agent_cmds[] = { NMCResultCode do_agent (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); nmc_do_cmd (nmc, agent_cmds, *argv, argc, argv); return nmc->return_value; diff --git a/clients/cli/common.c b/clients/cli/common.c index 47e858e7..4d89c3f8 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -395,26 +395,20 @@ finish: /* * nmc_parse_and_build_route: * @family: AF_INET or AF_INET6 - * @first: the route destination in the form of "address/prefix" - (/prefix is optional) - * @second: (allow-none): next hop address, if third is not NULL. Otherwise it could be - either next hop address or metric. (It can be NULL when @third is NULL). - * @third: (allow-none): route metric + * @str: route string to be parsed * @error: location to store GError * - * Parse route from strings and return an #NMIPRoute + * Parse route from string and return an #NMIPRoute * - * Returns: %TRUE on success, %FALSE on failure + * Returns: a new #NMIPRoute or %NULL on error */ NMIPRoute * nmc_parse_and_build_route (int family, - const char *first, - const char *second, - const char *third, + const char *str, GError **error) { int max_prefix = (family == AF_INET) ? 32 : 128; - char *dest = NULL, *plen = NULL; + char *plen = NULL; const char *next_hop = NULL; const char *canon_dest; long int prefix = max_prefix; @@ -423,13 +417,28 @@ nmc_parse_and_build_route (int family, gboolean success = FALSE; GError *local = NULL; gint64 metric = -1; + guint i, len; + gs_strfreev char **routev = NULL; + gs_free char *value = NULL; + gs_free char *dest = NULL; + gs_unref_hashtable GHashTable *attrs = NULL; + GHashTable *tmp_attrs; + const char *syntax = _("The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/prefix] ...]'"); g_return_val_if_fail (family == AF_INET || family == AF_INET6, FALSE); - g_return_val_if_fail (first != NULL, FALSE); - g_return_val_if_fail (second || !third, FALSE); + g_return_val_if_fail (str, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - dest = g_strdup (first); + value = g_strdup (str); + routev = nmc_strsplit_set (g_strstrip (value), " \t", 0); + len = g_strv_length (routev); + if (len < 1) { + g_set_error (error, 1, 0, "%s", syntax); + g_prefix_error (error, "'%s' is not valid. ", str); + goto finish; + } + + dest = g_strdup (routev[0]); plen = strchr (dest, '/'); /* prefix delimiter */ if (plen) *plen++ = '\0'; @@ -443,32 +452,56 @@ nmc_parse_and_build_route (int family, } } - if (second) { - if (third || nm_utils_ipaddr_valid (family, second)) - next_hop = second; - else { - /* 'second' can be a metric */ - if (!nmc_string_to_uint (second, TRUE, 0, G_MAXUINT32, &tmp_ulong)) { - g_set_error (error, 1, 0, _("the second component of route ('%s') is neither " - "a next hop address nor a metric"), second); + for (i = 1; i < len; i++) { + if (nm_utils_ipaddr_valid (family, routev[i])) { + if (metric != -1 || attrs) { + g_set_error (error, 1, 0, _("the next hop ('%s') must be first"), routev[i]); + goto finish; + } + next_hop = routev[i]; + } else if (nmc_string_to_uint (routev[i], TRUE, 0, G_MAXUINT32, &tmp_ulong)) { + if (attrs) { + g_set_error (error, 1, 0, _("the metric ('%s') must be before attributes"), routev[i]); goto finish; } metric = tmp_ulong; - } - } + } else if (strchr (routev[i], '=')) { + GHashTableIter iter; + char *iter_key; + GVariant *iter_value; + + tmp_attrs = nm_utils_parse_variant_attributes (routev[i], ' ', '=', FALSE, + nm_ip_route_get_variant_attribute_spec(), + error); + if (!tmp_attrs) { + g_prefix_error (error, "invalid option '%s': ", routev[i]); + goto finish; + } + + if (!attrs) + attrs = g_hash_table_new (g_str_hash, g_str_equal); - if (third) { - if (!nmc_string_to_uint (third, TRUE, 0, G_MAXUINT32, &tmp_ulong)) { - g_set_error (error, 1, 0, _("invalid metric '%s'"), third); + g_hash_table_iter_init (&iter, tmp_attrs); + while (g_hash_table_iter_next (&iter, (gpointer *) &iter_key, (gpointer *) &iter_value)) { + if (!nm_ip_route_attribute_validate (iter_key, iter_value, family, NULL, error)) { + g_prefix_error (error, "%s: ", iter_key); + g_hash_table_unref (tmp_attrs); + goto finish; + } + g_hash_table_insert (attrs, iter_key, iter_value); + g_hash_table_iter_steal (&iter); + } + g_hash_table_unref (tmp_attrs); + } else { + g_set_error (error, 1, 0, "%s", syntax); goto finish; } - metric = tmp_ulong; } route = nm_ip_route_new (family, dest, prefix, next_hop, metric, &local); if (!route) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("invalid route: %s"), local->message); + g_set_error (error, 1, 0, "%s", syntax); + g_prefix_error (error, _("invalid route: %s. "), local->message); g_clear_error (&local); goto finish; } @@ -485,10 +518,19 @@ nmc_parse_and_build_route (int family, goto finish; } + if (attrs) { + GHashTableIter iter; + char *name; + GVariant *variant; + + g_hash_table_iter_init (&iter, attrs); + while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &variant)) + nm_ip_route_set_attribute (route, name, variant); + } + success = TRUE; finish: - g_free (dest); return route; } @@ -1253,7 +1295,7 @@ nmc_unique_connection_name (const GPtrArray *connections, const char *try_name) NMConnection *connection; const char *name; char *new_name; - unsigned int num = 1; + unsigned num = 1; int i = 0; new_name = g_strdup (try_name); @@ -1643,6 +1685,14 @@ call_cmd (NmCli *nmc, GSimpleAsyncResult *simple, const NMCCommand *cmd, int arg } } +static void +nmc_complete_help (const char *prefix) +{ + nmc_complete_strings (prefix, "help", NULL); + if (*prefix == '-') + nmc_complete_strings (prefix, "-help", "--help", NULL); +} + /** * nmc_do_cmd: * @nmc: Client instance @@ -1681,27 +1731,32 @@ nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char if (argc == 1 && nmc->complete) { for (c = cmds; c->cmd; ++c) { - if (!*cmd || matches (cmd, c->cmd) == 0) + if (!*cmd || matches (cmd, c->cmd)) g_print ("%s\n", c->cmd); } + nmc_complete_help (cmd); g_simple_async_result_complete_in_idle (simple); g_object_unref (simple); return; } for (c = cmds; c->cmd; ++c) { - if (cmd && matches (cmd, c->cmd) == 0) + if (cmd && matches (cmd, c->cmd)) break; } if (c->cmd) { /* A valid command was specified. */ + if (c->usage && argc == 2 && nmc->complete) + nmc_complete_help (*(argv+1)); if (c->usage && nmc_arg_is_help (*(argv+1))) { - c->usage (); + if (!nmc->complete) + c->usage (); g_simple_async_result_complete_in_idle (simple); g_object_unref (simple); - } else - call_cmd (nmc, simple, c, argc-1, argv+1); + } else { + call_cmd (nmc, simple, c, argc, argv); + } } else if (cmd) { /* Not a known command. */ if (nmc_arg_is_help (cmd) && c->usage) { @@ -1742,7 +1797,7 @@ nmc_complete_strings (const char *prefix, ...) va_start (args, prefix); while ((candidate = va_arg (args, const char *))) { - if (!*prefix || matches (prefix, candidate) == 0) + if (!*prefix || matches (prefix, candidate)) g_print ("%s\n", candidate); } va_end (args); diff --git a/clients/cli/common.h b/clients/cli/common.h index 42091363..3a598f63 100644 --- a/clients/cli/common.h +++ b/clients/cli/common.h @@ -31,7 +31,7 @@ gboolean print_dhcp4_config (NMDhcpConfig *dhcp4, NmCli *nmc, const char *group_ gboolean print_dhcp6_config (NMDhcpConfig *dhcp6, NmCli *nmc, const char *group_prefix, const char *one_field); NMIPAddress *nmc_parse_and_build_address (int family, const char *ip_str, GError **error); -NMIPRoute *nmc_parse_and_build_route (int family, const char *first, const char *second, const char *third, GError **error); +NMIPRoute *nmc_parse_and_build_route (int family, const char *str, GError **error); const char * nmc_device_state_to_string (NMDeviceState state); const char * nmc_device_reason_to_string (NMDeviceStateReason reason); diff --git a/clients/cli/connections.c b/clients/cli/connections.c index b40d517b..a93dc15f 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -183,6 +183,7 @@ NmcOutputField nmc_fields_settings_names[] = { SETTING_FIELD (NM_SETTING_MACVLAN_SETTING_NAME, nmc_fields_setting_macvlan + 1), /* 28 */ SETTING_FIELD (NM_SETTING_VXLAN_SETTING_NAME, nmc_fields_setting_vxlan + 1), /* 29 */ SETTING_FIELD (NM_SETTING_PROXY_SETTING_NAME, nmc_fields_setting_proxy + 1), /* 30 */ + SETTING_FIELD (NM_SETTING_DUMMY_SETTING_NAME, nmc_fields_setting_dummy + 1), /* 31 */ {NULL, NULL, 0, NULL, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTINGS_NAMES_ALL_X NM_SETTING_CONNECTION_SETTING_NAME","\ @@ -477,6 +478,7 @@ usage_connection_add (void) " [source-port-min <0-65535>]\n" " [source-port-max <0-65535>]\n" " [destination-port <0-65535>]\n\n" + " dummy: \n\n" " SLAVE_OPTIONS:\n" " bridge: [priority <0-63>]\n" " [path-cost <1-65535>]\n" @@ -1658,13 +1660,13 @@ parse_preferred_connection_order (const char *order, GError **error) if (str[0] == '+' || str[0] == '-') str++; - if (matches (str, "active") == 0) + if (matches (str, "active")) val = inverse ? NMC_SORT_ACTIVE_INV : NMC_SORT_ACTIVE; - else if (matches (str, "name") == 0) + else if (matches (str, "name")) val = inverse ? NMC_SORT_NAME_INV : NMC_SORT_NAME; - else if (matches (str, "type") == 0) + else if (matches (str, "type")) val = inverse ? NMC_SORT_TYPE_INV : NMC_SORT_TYPE; - else if (matches (str, "path") == 0) + else if (matches (str, "path")) val = inverse ? NMC_SORT_PATH_INV : NMC_SORT_PATH; else { g_array_unref (order_arr); @@ -1711,7 +1713,9 @@ get_connection (NmCli *nmc, int *argc, char ***argv, int *pos, GError **error) || strcmp (**argv, "uuid") == 0 || strcmp (**argv, "path") == 0) { selector = **argv; - if (next_arg (argc, argv) != 0) { + (*argc)--; + (*argv)++; + if (!*argc) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("%s argument is missing"), selector); return NULL; @@ -1730,7 +1734,7 @@ get_connection (NmCli *nmc, int *argc, char ***argv, int *pos, GError **error) * don't switch to next argument. */ if (!pos || !*pos) - next_arg (argc, argv); + next_arg (nmc, argc, argv, NULL); return connection; } @@ -1742,41 +1746,32 @@ do_connections_show (NmCli *nmc, int argc, char **argv) char *profile_flds = NULL, *active_flds = NULL; GPtrArray *invisibles, *sorted_cons; gboolean active_only = FALSE; - gboolean show_secrets = FALSE; GArray *order = NULL; - int i; - - /* check connection show options [--active] [--show-secrets] */ - for (i = 0; i < 3; i++) { - if (argc == 1 && nmc->complete) { - nmc_complete_strings (*argv, "--active", "--show-secrets", - "--order", NULL); - } + int i, option; - if (!active_only && nmc_arg_is_option (*argv, "active")) { + /* check connection show options [--active] [--order ] */ + while ((option = next_arg (nmc, &argc, &argv, "--active", "--order", NULL)) > 0) { + switch (option) { + case 1: /* --active */ active_only = TRUE; - next_arg (&argc, &argv); - } else if (!show_secrets && nmc_arg_is_option (*argv, "show-secrets")) { - /* --show-secrets is deprecated in favour of global --show-secrets */ - /* Keep it here for backwards compatibility */ - show_secrets = TRUE; - next_arg (&argc, &argv); - } else if (!order && nmc_arg_is_option (*argv, "order")) { - if (next_arg (&argc, &argv) != 0) { + break; + case 2: /* --order */ + argc--; + argv++; + if (!argc) { g_set_error_literal (&err, NMCLI_ERROR, 0, _("'--order' argument is missing")); goto finish; } - /* TODO: complete --order */ order = parse_preferred_connection_order (*argv, &err); if (err) goto finish; - next_arg (&argc, &argv); - } else { + break; + default: + g_assert_not_reached(); break; } } - show_secrets = nmc->show_secrets || show_secrets; if (argc == 0) { const GPtrArray *connections; @@ -1799,10 +1794,7 @@ do_connections_show (NmCli *nmc, int argc, char **argv) tmpl = nmc_fields_con_show; tmpl_len = sizeof (nmc_fields_con_show); nmc->print_fields.indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &err); - if (err) { - goto finish; - } - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &err)) + if (err) goto finish; /* Add headers */ @@ -1842,6 +1834,23 @@ do_connections_show (NmCli *nmc, int argc, char **argv) g_free (nmc->required_fields); nmc->required_fields = NULL; + /* Before printing the connections check if we have a "--show-secret" + * option after the connection ids */ + if (!nmc->show_secrets && !nmc->complete) { + int argc_cp = argc; + char **argv_cp = argv; + + do { + if ( nm_streq (*argv_cp, "id") + || nm_streq (*argv_cp, "uuid") + || nm_streq (*argv_cp, "path") + || nm_streq (*argv_cp, "apath")) { + argc_cp--; + argv_cp++; + } + } while (next_arg (nmc, &argc_cp, &argv_cp, NULL) != -1); + } + while (argc > 0) { const GPtrArray *connections; gboolean res; @@ -1857,7 +1866,9 @@ do_connections_show (NmCli *nmc, int argc, char **argv) || strcmp (*argv, "path") == 0 || strcmp (*argv, "apath") == 0) { selector = *argv; - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; @@ -1892,12 +1903,12 @@ do_connections_show (NmCli *nmc, int argc, char **argv) if (!acon) acon = get_ac_for_connection (active_cons, con); if (active_only && !acon) { - next_arg (&argc, &argv); + next_arg (nmc, &argc, &argv, NULL); continue; } if (nmc->complete) { - next_arg (&argc, &argv); + next_arg (nmc, &argc, &argv, NULL); continue; } @@ -1909,9 +1920,9 @@ do_connections_show (NmCli *nmc, int argc, char **argv) if (without_fields || profile_flds) { if (con) { nmc->required_fields = profile_flds; - if (show_secrets) + if (nmc->show_secrets) update_secrets_in_connection (NM_REMOTE_CONNECTION (con), con); - res = nmc_connection_profile_details (con, nmc, show_secrets); + res = nmc_connection_profile_details (con, nmc, nmc->show_secrets); nmc->required_fields = NULL; if (!res) goto finish; @@ -1935,7 +1946,7 @@ do_connections_show (NmCli *nmc, int argc, char **argv) * so process the same argument again. */ if (!pos) - next_arg (&argc, &argv); + next_arg (nmc, &argc, &argv, NULL); } } @@ -2122,104 +2133,90 @@ typedef struct { static void activate_connection_info_finish (ActivateConnectionInfo *info); static const char * -vpn_connection_state_reason_to_string (NMVpnConnectionStateReason reason) +active_connection_state_reason_to_string (NMActiveConnectionStateReason reason) { switch (reason) { - case NM_VPN_CONNECTION_STATE_REASON_UNKNOWN: - return _("unknown reason"); - case NM_VPN_CONNECTION_STATE_REASON_NONE: - return _("none"); - case NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED: - return _("the user was disconnected"); - case NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED: - return _("the base network connection was interrupted"); - case NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED: - return _("the VPN service stopped unexpectedly"); - case NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID: - return _("the VPN service returned invalid configuration"); - case NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT: - return _("the connection attempt timed out"); - case NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT: - return _("the VPN service did not start in time"); - case NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED: - return _("the VPN service failed to start"); - case NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS: - return _("no valid VPN secrets"); - case NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED: - return _("invalid VPN secrets"); - case NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED: - return _("the connection was removed"); - default: - return _("unknown"); - } + case NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN: + return _("Unknown reason"); + case NM_ACTIVE_CONNECTION_STATE_REASON_NONE: + return _("The connection was disconnected"); + case NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED: + return _("Disconnected by user"); + case NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED: + return _("The base network connection was interrupted"); + case NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED: + return _("The VPN service stopped unexpectedly"); + case NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID: + return _("The VPN service returned invalid configuration"); + case NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT: + return _("The connection attempt timed out"); + case NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT: + return _("The VPN service did not start in time"); + case NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED: + return _("The VPN service failed to start"); + case NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS: + return _("No valid secrets"); + case NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED: + return _("Invalid secrets"); + case NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED: + return _("The connection was removed"); + case NM_ACTIVE_CONNECTION_STATE_REASON_DEPENDENCY_FAILED: + return _("Master connection failed"); + case NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REALIZE_FAILED: + return _("Could not create a software link"); + case NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REMOVED: + return _("The device disappeared"); + } + + g_return_val_if_reached (_("Invalid reason")); } static void -device_state_cb (NMDevice *device, GParamSpec *pspec, ActivateConnectionInfo *info) +check_activated (ActivateConnectionInfo *info) { NmCli *nmc = info->nmc; - NMActiveConnection *active; - NMDeviceState state; + NMDevice *device = info->device; + NMActiveConnection *active = info->active; NMActiveConnectionState ac_state; + NMActiveConnectionStateReason ac_reason; + NMDeviceState dev_state; + NMDeviceStateReason dev_reason; - active = nm_device_get_active_connection (device); - state = nm_device_get_state (device); - - ac_state = active ? nm_active_connection_get_state (active) : NM_ACTIVE_CONNECTION_STATE_UNKNOWN; - - if (ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { - if (nmc->print_output == NMC_PRINT_PRETTY) - nmc_terminal_erase_line (); - g_print (_("Connection successfully activated (D-Bus active path: %s)\n"), - nm_object_get_path (NM_OBJECT (active))); - activate_connection_info_finish (info); - } else if ( ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING - && state >= NM_DEVICE_STATE_IP_CONFIG - && state <= NM_DEVICE_STATE_ACTIVATED) { - if (nmc->print_output == NMC_PRINT_PRETTY) - nmc_terminal_erase_line (); - g_print (_("Connection successfully activated (master waiting for slaves) (D-Bus active path: %s)\n"), - nm_object_get_path (NM_OBJECT (active))); - activate_connection_info_finish (info); - } -} - -static void -active_connection_removed_cb (NMClient *client, NMActiveConnection *active, ActivateConnectionInfo *info) -{ - NmCli *nmc = info->nmc; + ac_state = nm_active_connection_get_state (active); + ac_reason = nm_active_connection_get_state_reason (active); - if (active == info->active) { - g_string_printf (nmc->return_text, _("Error: Connection activation failed.")); - nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; - activate_connection_info_finish (info); + if (device) { + dev_state = nm_device_get_state (device); + dev_reason = nm_device_get_state_reason (device); } -} -static void -active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, ActivateConnectionInfo *info) -{ - NmCli *nmc = info->nmc; - NMActiveConnectionState state; - - state = nm_active_connection_get_state (active); - - if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { + if (ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { if (nmc->print_output == NMC_PRINT_PRETTY) nmc_terminal_erase_line (); g_print (_("Connection successfully activated (D-Bus active path: %s)\n"), nm_object_get_path (NM_OBJECT (active))); activate_connection_info_finish (info); - } else if (state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATED) { - g_string_printf (nmc->return_text, _("Error: Connection activation failed.")); - nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; - activate_connection_info_finish (info); - } else if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING) { + } else if (ac_state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATED) { + if (device && ac_reason == NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED) { + if (dev_state == NM_DEVICE_STATE_FAILED || dev_state == NM_DEVICE_STATE_DISCONNECTED) { + g_string_printf (nmc->return_text, _("Error: Connection activation failed: %s"), + nmc_device_reason_to_string (dev_reason)); + nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; + activate_connection_info_finish (info); + } else { + /* Just wait for the device to go failed. We'll get a better error message. */ + return; + } + } else { + g_string_printf (nmc->return_text, _("Error: Connection activation failed: %s"), + active_connection_state_reason_to_string (ac_reason)); + nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; + activate_connection_info_finish (info); + } + } else if (ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING) { /* activating master connection does not automatically activate any slaves, so their * active connection state will not progress beyond ACTIVATING state. * Monitor the device instead. */ - const GPtrArray *devices; - NMDevice *device; if (nmc->secret_agent) { NMRemoteConnection *connection = nm_active_connection_get_connection (active); @@ -2228,53 +2225,34 @@ active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, Activ nm_connection_get_path (NM_CONNECTION (connection))); } - devices = nm_active_connection_get_devices (active); - device = devices->len ? g_ptr_array_index (devices, 0) : NULL; if ( device && ( NM_IS_DEVICE_BOND (device) || NM_IS_DEVICE_TEAM (device) - || NM_IS_DEVICE_BRIDGE (device))) { - g_signal_connect (device, "notify::" NM_DEVICE_STATE, G_CALLBACK (device_state_cb), info); - device_state_cb (device, NULL, info); + || NM_IS_DEVICE_BRIDGE (device)) + && dev_state >= NM_DEVICE_STATE_IP_CONFIG + && dev_state <= NM_DEVICE_STATE_ACTIVATED) { + if (nmc->print_output == NMC_PRINT_PRETTY) + nmc_terminal_erase_line (); + g_print (_("Connection successfully activated (master waiting for slaves) (D-Bus active path: %s)\n"), + nm_object_get_path (NM_OBJECT (active))); + activate_connection_info_finish (info); } } } static void -vpn_connection_state_cb (NMVpnConnection *vpn, - NMVpnConnectionState state, - NMVpnConnectionStateReason reason, - ActivateConnectionInfo *info) +device_state_cb (NMDevice *device, GParamSpec *pspec, ActivateConnectionInfo *info) { - NmCli *nmc = info->nmc; - - switch (state) { - case NM_VPN_CONNECTION_STATE_PREPARE: - case NM_VPN_CONNECTION_STATE_NEED_AUTH: - case NM_VPN_CONNECTION_STATE_CONNECT: - case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: - /* no operation */ - break; - - case NM_VPN_CONNECTION_STATE_ACTIVATED: - if (nmc->print_output == NMC_PRINT_PRETTY) - nmc_terminal_erase_line (); - g_print (_("VPN connection successfully activated (D-Bus active path: %s)\n"), - nm_object_get_path (NM_OBJECT (vpn))); - activate_connection_info_finish (info); - break; - - case NM_VPN_CONNECTION_STATE_FAILED: - case NM_VPN_CONNECTION_STATE_DISCONNECTED: - g_string_printf (nmc->return_text, _("Error: Connection activation failed: %s."), - vpn_connection_state_reason_to_string (reason)); - nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; - activate_connection_info_finish (info); - break; + check_activated (info); +} - default: - break; - } +static void +active_connection_state_cb (NMActiveConnection *active, + NMActiveConnectionState state, + NMActiveConnectionStateReason reason, + ActivateConnectionInfo *info) +{ + check_activated (info); } static void @@ -2306,24 +2284,28 @@ progress_cb (gpointer user_data) } static gboolean -progress_device_cb (gpointer user_data) +progress_active_connection_cb (gpointer user_data) { - NMDevice *device = (NMDevice *) user_data; - - nmc_terminal_show_progress (device ? nmc_device_state_to_string (nm_device_get_state (device)) : ""); + NMActiveConnection *active = user_data; + const char *str; + NMDevice *device; + NMActiveConnectionState ac_state; + const GPtrArray *ac_devs; - return TRUE; -} + ac_state = nm_active_connection_get_state (active); -static gboolean -progress_vpn_cb (gpointer user_data) -{ - NMVpnConnection *vpn = (NMVpnConnection *) user_data; - const char *str; + if (ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING) { + /* If the connection is activating, the device state + * is more interesting. */ + ac_devs = nm_active_connection_get_devices (active); + device = ac_devs->len > 0 ? g_ptr_array_index (ac_devs, 0) : NULL; + } else { + device = NULL; + } - str = NM_IS_VPN_CONNECTION (vpn) ? - vpn_connection_state_to_string (nm_vpn_connection_get_vpn_state (vpn)) : - ""; + str = device + ? nmc_device_state_to_string (nm_device_get_state (device)) + : active_connection_state_to_string (ac_state); nmc_terminal_show_progress (str); @@ -2339,14 +2321,9 @@ activate_connection_info_finish (ActivateConnectionInfo *info) } if (info->active) { - if (NM_IS_VPN_CONNECTION (info->active)) - g_signal_handlers_disconnect_by_func (info->active, G_CALLBACK (vpn_connection_state_cb), info); - else - g_signal_handlers_disconnect_by_func (info->active, G_CALLBACK (active_connection_state_cb), info); + g_signal_handlers_disconnect_by_func (info->active, G_CALLBACK (active_connection_state_cb), info); g_object_unref (info->active); - } - g_signal_handlers_disconnect_by_func (info->nmc->client, G_CALLBACK (active_connection_removed_cb), info); g_free (info); quit (); @@ -2391,34 +2368,26 @@ activate_connection_cb (GObject *client, GAsyncResult *result, gpointer user_dat } activate_connection_info_finish (info); } else { - if (NM_IS_VPN_CONNECTION (active)) { - /* Monitor VPN state */ - g_signal_connect (G_OBJECT (active), "vpn-state-changed", G_CALLBACK (vpn_connection_state_cb), info); - - /* Start progress indication showing VPN states */ - if (nmc->print_output == NMC_PRINT_PRETTY) { - if (progress_id) - g_source_remove (progress_id); - progress_id = g_timeout_add (120, progress_vpn_cb, NM_VPN_CONNECTION (active)); - } - } else { - g_signal_connect (active, "notify::state", G_CALLBACK (active_connection_state_cb), info); - active_connection_state_cb (active, NULL, info); - - /* Start progress indication showing device states */ - if (nmc->print_output == NMC_PRINT_PRETTY) { - if (progress_id) - g_source_remove (progress_id); - progress_id = g_timeout_add (120, progress_device_cb, device); - } + /* Monitor the active connection and device (if available) states */ + g_signal_connect (active, "state-changed", G_CALLBACK (active_connection_state_cb), info); + if (device) + g_signal_connect (device, "notify::" NM_DEVICE_STATE, G_CALLBACK (device_state_cb), info); + /* Both active_connection_state_cb () and device_state_cb () will just + * call check_activated (info). So, just call it once directly after + * connecting on both the signals of the objects and skip the call to + * the callbacks. + */ + check_activated (info); + + /* Start progress indication showing VPN states */ + if (nmc->print_output == NMC_PRINT_PRETTY) { + if (progress_id) + g_source_remove (progress_id); + progress_id = g_timeout_add (120, progress_active_connection_cb, active); } /* Start timer not to loop forever when signals are not emitted */ g_timeout_add_seconds (nmc->timeout, activate_connection_timeout_cb, info); - - /* Fail when the active connection goes away. */ - g_signal_connect (nmc->client, NM_CLIENT_ACTIVE_CONNECTION_REMOVED, - G_CALLBACK (active_connection_removed_cb), info); } } } @@ -2602,8 +2571,8 @@ do_connection_up (NmCli *nmc, int argc, char **argv) gs_free_error GError *error = NULL; char **arg_arr = NULL; int arg_num; - char ***argv_ptr = &argv; - int *argc_ptr = &argc; + char ***argv_ptr; + int *argc_ptr; /* * Set default timeout for connection activation. @@ -2612,6 +2581,10 @@ do_connection_up (NmCli *nmc, int argc, char **argv) if (nmc->timeout == -1) nmc->timeout = 90; + next_arg (nmc, &argc, &argv, NULL); + argv_ptr = &argv; + argc_ptr = &argc; + if (argc == 0 && nmc->ask) { char *line; @@ -2638,7 +2611,9 @@ do_connection_up (NmCli *nmc, int argc, char **argv) nmc_complete_strings (*argv, "ifname", "ap", "passwd-file", NULL); if (strcmp (*argv, "ifname") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } @@ -2648,7 +2623,9 @@ do_connection_up (NmCli *nmc, int argc, char **argv) nmc_complete_device (nmc->client, ifname, ap != NULL); } else if (strcmp (*argv, "ap") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } @@ -2658,7 +2635,9 @@ do_connection_up (NmCli *nmc, int argc, char **argv) nmc_complete_bssid (nmc->client, ifname, ap); } else if (strcmp (*argv, "passwd-file") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } @@ -2672,8 +2651,7 @@ do_connection_up (NmCli *nmc, int argc, char **argv) g_printerr (_("Unknown parameter: %s\n"), *argv); } - argc--; - argv++; + next_arg (nmc, &argc, &argv, NULL); } if (nmc->complete) @@ -2788,15 +2766,19 @@ do_connection_down (NmCli *nmc, int argc, char **argv) NMActiveConnection *active; ConnectionCbInfo *info = NULL; const GPtrArray *active_cons; - GSList *queue = NULL, *iter; + GSList *queue = NULL, *iter, *next; char **arg_arr = NULL; - char **arg_ptr = argv; - int arg_num = argc; + char **arg_ptr; + int arg_num; int idx = 0; if (nmc->timeout == -1) nmc->timeout = 10; + next_arg (nmc, &argc, &argv, NULL); + arg_ptr = argv; + arg_num = argc; + if (argc == 0) { /* nmc_do_cmd() should not call this with argc=0. */ g_assert (!nmc->complete); @@ -2829,7 +2811,9 @@ do_connection_down (NmCli *nmc, int argc, char **argv) || strcmp (*arg_ptr, "apath") == 0) { selector = *arg_ptr; - if (next_arg (&arg_num, &arg_ptr) != 0) { + arg_num--; + arg_ptr++; + if (!arg_num) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), selector); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; @@ -2853,7 +2837,7 @@ do_connection_down (NmCli *nmc, int argc, char **argv) } if (idx == 0) - next_arg (&arg_num, &arg_ptr); + next_arg (nmc->ask ? NULL : nmc, &arg_num, &arg_ptr, NULL); } if (!queue) { @@ -2875,17 +2859,36 @@ do_connection_down (NmCli *nmc, int argc, char **argv) info->timeout_id = g_timeout_add_seconds (nmc->timeout, connection_op_timeout_cb, info); } - for (iter = queue; iter; iter = g_slist_next (iter)) { + iter = queue; + while (iter) { + GError *error = NULL; + + next = g_slist_next (iter); active = iter->data; - if (info) + if (info) { g_signal_connect (active, "notify::" NM_ACTIVE_CONNECTION_STATE, G_CALLBACK (down_active_connection_state_cb), info); + } /* Now deactivate the connection */ - nm_client_deactivate_connection (nmc->client, active, NULL, NULL); + if (!nm_client_deactivate_connection (nmc->client, active, NULL, &error)) { + g_print (_("Connection '%s' deactivation failed: %s\n"), + nm_active_connection_get_id (active), error->message); + g_error_free (error); + + if (info) { + g_signal_handlers_disconnect_by_func (active, + down_active_connection_state_cb, + info); + /* Remove the active connection from @queue */ + connection_cb_info_finish (info, active); + } + } + + iter = next; } finish: @@ -3071,6 +3074,13 @@ static const NameItem nmc_vxlan_settings [] = { { NULL, NULL, NULL, FALSE } }; +static const NameItem nmc_dummy_settings [] = { + { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, + { NM_SETTING_DUMMY_SETTING_NAME, NULL, NULL, TRUE }, + { NM_SETTING_WIRED_SETTING_NAME, "ethernet", NULL, FALSE }, + { NULL, NULL, NULL, FALSE } +}; + /* Available connection types */ static const NameItem nmc_valid_connection_types[] = { { NM_SETTING_GENERIC_SETTING_NAME, NULL, nmc_generic_settings }, /* Needs to be first. */ @@ -3098,6 +3108,7 @@ static const NameItem nmc_valid_connection_types[] = { { NM_SETTING_MACSEC_SETTING_NAME, NULL, nmc_macsec_settings }, { NM_SETTING_MACVLAN_SETTING_NAME, NULL, nmc_macvlan_settings }, { NM_SETTING_VXLAN_SETTING_NAME, NULL, nmc_vxlan_settings }, + { NM_SETTING_DUMMY_SETTING_NAME, NULL, nmc_dummy_settings }, { NULL, NULL, NULL } }; @@ -3545,7 +3556,7 @@ unique_master_iface_ifname (const GPtrArray *connections, { NMConnection *connection; char *new_name; - unsigned int num = 1; + unsigned num = 1; int i = 0; const char *ifname = NULL; @@ -4156,9 +4167,9 @@ set_bond_monitoring_mode (NmCli *nmc, NMConnection *con, OptionInfo *option, con monitor_mode = g_strdup (WORD_MIIMON); } - if (matches (monitor_mode, WORD_MIIMON) == 0) + if (matches (monitor_mode, WORD_MIIMON)) enable_options (NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, miimon_opts); - else if (matches (monitor_mode, WORD_ARP) == 0) + else if (matches (monitor_mode, WORD_ARP)) enable_options (NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, arp_opts); else { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, @@ -4535,7 +4546,8 @@ get_value (const char **value, int *argc, char ***argv, const char *option, GErr else *value = *argv[0]; - next_arg (argc, argv); + (*argc)--; + (*argv)++; return TRUE; } @@ -4599,7 +4611,8 @@ nmc_read_connection_properties (NmCli *nmc, return FALSE; } - next_arg (argc, argv); + (*argc)--; + (*argv)++; if (!get_value (&value, argc, argv, option, error)) return FALSE; @@ -4638,7 +4651,8 @@ nmc_read_connection_properties (NmCli *nmc, if (*argc == 1 && nmc->complete) complete_property_name (nmc, connection, modifier, option, NULL); - next_arg (argc, argv); + (*argc)--; + (*argv)++; if (!get_value (&value, argc, argv, option, error)) return FALSE; @@ -4844,7 +4858,7 @@ want_provide_opt_args (const char *type, int num) "Do you want to provide them? %s", num), prompt_yes_no (TRUE, NULL)); answer = answer ? g_strstrip (answer) : NULL; - if (answer && matches (answer, WORD_LOC_YES) != 0) + if (answer && !matches (answer, WORD_LOC_YES)) ret = FALSE; g_free (answer); return ret; @@ -4956,6 +4970,8 @@ do_connection_add (NmCli *nmc, int argc, char **argv) OptionInfo *candidate; gboolean seen_dash_dash = FALSE; + next_arg (nmc, &argc, &argv, NULL); + rl_attempted_completion_function = (rl_completion_func_t *) nmcli_con_add_tab_completion; nmc->return_value = NMC_RESULT_SUCCESS; @@ -4975,13 +4991,15 @@ read_properties: * options and properties to be separated with "--" */ g_clear_error (&error); seen_dash_dash = TRUE; - next_arg (&argc, &argv); + next_arg (nmc, &argc, &argv, NULL); goto read_properties; } else if (g_strcmp0 (*argv, "save") == 0) { /* It would be better if "save" was a separate argument and not * mixed with properties, but there's not much we can do about it now. */ g_clear_error (&error); - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: value for '%s' argument is required."), "save"); @@ -4995,7 +5013,7 @@ read_properties: g_clear_error (&error); goto finish; } - next_arg (&argc, &argv); + next_arg (nmc, &argc, &argv, NULL); goto read_properties; } @@ -5441,13 +5459,13 @@ get_gen_func_cmd_nmcli (const char *str) { if (!str) return NULL; - if (matches (str, "status-line") == 0) + if (matches (str, "status-line")) return gen_func_bool_values; - if (matches (str, "save-confirmation") == 0) + if (matches (str, "save-confirmation")) return gen_func_bool_values; - if (matches (str, "show-secrets") == 0) + if (matches (str, "show-secrets")) return gen_func_bool_values; - if (matches (str, "prompt-color") == 0) + if (matches (str, "prompt-color")) return gen_cmd_nmcli_prompt_color; return NULL; } @@ -5524,7 +5542,7 @@ should_complete_cmd (const char *line, int end, const char *cmd, *prev_word = g_strdup (word3); } - if (word1 && matches (word1, cmd) == 0) + if (word1 && matches (word1, cmd)) ret = TRUE; g_free (tmp); @@ -6075,29 +6093,29 @@ parse_editor_main_cmd (const char *cmd, char **cmd_arg) return NMC_EDITOR_MAIN_CMD_UNKNOWN; } - if (matches (vec[0], "goto") == 0) + if (matches (vec[0], "goto")) editor_cmd = NMC_EDITOR_MAIN_CMD_GOTO; - else if (matches (vec[0], "remove") == 0) + else if (matches (vec[0], "remove")) editor_cmd = NMC_EDITOR_MAIN_CMD_REMOVE; - else if (matches (vec[0], "set") == 0) + else if (matches (vec[0], "set")) editor_cmd = NMC_EDITOR_MAIN_CMD_SET; - else if (matches (vec[0], "describe") == 0) + else if (matches (vec[0], "describe")) editor_cmd = NMC_EDITOR_MAIN_CMD_DESCRIBE; - else if (matches (vec[0], "print") == 0) + else if (matches (vec[0], "print")) editor_cmd = NMC_EDITOR_MAIN_CMD_PRINT; - else if (matches (vec[0], "verify") == 0) + else if (matches (vec[0], "verify")) editor_cmd = NMC_EDITOR_MAIN_CMD_VERIFY; - else if (matches (vec[0], "save") == 0) + else if (matches (vec[0], "save")) editor_cmd = NMC_EDITOR_MAIN_CMD_SAVE; - else if (matches (vec[0], "activate") == 0) + else if (matches (vec[0], "activate")) editor_cmd = NMC_EDITOR_MAIN_CMD_ACTIVATE; - else if (matches (vec[0], "back") == 0) + else if (matches (vec[0], "back")) editor_cmd = NMC_EDITOR_MAIN_CMD_BACK; - else if (matches (vec[0], "help") == 0 || strcmp (vec[0], "?") == 0) + else if (matches (vec[0], "help") || strcmp (vec[0], "?") == 0) editor_cmd = NMC_EDITOR_MAIN_CMD_HELP; - else if (matches (vec[0], "quit") == 0) + else if (matches (vec[0], "quit")) editor_cmd = NMC_EDITOR_MAIN_CMD_QUIT; - else if (matches (vec[0], "nmcli") == 0) + else if (matches (vec[0], "nmcli")) editor_cmd = NMC_EDITOR_MAIN_CMD_NMCLI; /* set pointer to command argument */ @@ -6263,23 +6281,23 @@ parse_editor_sub_cmd (const char *cmd, char **cmd_arg) return NMC_EDITOR_SUB_CMD_UNKNOWN; } - if (matches (vec[0], "set") == 0) + if (matches (vec[0], "set")) editor_cmd = NMC_EDITOR_SUB_CMD_SET; - else if (matches (vec[0], "add") == 0) + else if (matches (vec[0], "add")) editor_cmd = NMC_EDITOR_SUB_CMD_ADD; - else if (matches (vec[0], "change") == 0) + else if (matches (vec[0], "change")) editor_cmd = NMC_EDITOR_SUB_CMD_CHANGE; - else if (matches (vec[0], "remove") == 0) + else if (matches (vec[0], "remove")) editor_cmd = NMC_EDITOR_SUB_CMD_REMOVE; - else if (matches (vec[0], "describe") == 0) + else if (matches (vec[0], "describe")) editor_cmd = NMC_EDITOR_SUB_CMD_DESCRIBE; - else if (matches (vec[0], "print") == 0) + else if (matches (vec[0], "print")) editor_cmd = NMC_EDITOR_SUB_CMD_PRINT; - else if (matches (vec[0], "back") == 0) + else if (matches (vec[0], "back")) editor_cmd = NMC_EDITOR_SUB_CMD_BACK; - else if (matches (vec[0], "help") == 0 || strcmp (vec[0], "?") == 0) + else if (matches (vec[0], "help") || strcmp (vec[0], "?") == 0) editor_cmd = NMC_EDITOR_SUB_CMD_HELP; - else if (matches (vec[0], "quit") == 0) + else if (matches (vec[0], "quit")) editor_cmd = NMC_EDITOR_SUB_CMD_QUIT; /* set pointer to command argument */ @@ -6595,7 +6613,7 @@ confirm_quit (void) "Do you really want to quit? %s"), prompt_yes_no (FALSE, NULL)); answer = answer ? g_strstrip (answer) : NULL; - if (answer && matches (answer, WORD_LOC_YES) == 0) + if (answer && matches (answer, WORD_LOC_YES)) want_quit = TRUE; g_free (answer); @@ -6750,10 +6768,10 @@ property_edit_submenu (NmCli *nmc, case NMC_EDITOR_SUB_CMD_PRINT: /* Print current connection settings/properties */ if (cmd_property_arg) { - if (matches (cmd_property_arg, "setting") == 0) + if (matches (cmd_property_arg, "setting")) editor_show_setting (curr_setting, nmc); - else if ( matches (cmd_property_arg, "connection") == 0 - || matches (cmd_property_arg, "all") == 0) + else if ( matches (cmd_property_arg, "connection") + || matches (cmd_property_arg, "all")) editor_show_connection (connection, nmc); else g_print (_("Unknown command argument: '%s'\n"), cmd_property_arg); @@ -6943,7 +6961,7 @@ confirm_connection_saving (NMConnection *local, NMConnection *remote) "That might result in an immediate activation of the connection.\n" "Do you still want to save? %s"), prompt_yes_no (TRUE, NULL)); answer = answer ? g_strstrip (answer) : NULL; - if (!answer || matches (answer, WORD_LOC_YES) == 0) + if (!answer || matches (answer, WORD_LOC_YES)) confirmed = TRUE; else confirmed = FALSE; @@ -6995,7 +7013,7 @@ menu_switch_to_level1 (NmCli *nmc, } static gboolean -editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_type) +editor_menu_main (NmCli *nmc, NMConnection *connection) { NMSettingConnection *s_con; NMRemoteConnection *rem_con; @@ -7023,7 +7041,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t s_type = nm_setting_connection_get_slave_type (s_con); slv_type = g_strdup_printf ("%s-slave", s_type ? s_type : "no"); - valid_settings_main = get_valid_settings_array (connection_type); + valid_settings_main = get_valid_settings_array (nm_connection_get_connection_type (connection)); valid_settings_slave = get_valid_settings_array (slv_type); g_free (slv_type); @@ -7510,9 +7528,9 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t /* parse argument */ if (cmd_arg) { - if (matches (cmd_arg, "temporary") == 0) + if (matches (cmd_arg, "temporary")) persistent = FALSE; - else if (matches (cmd_arg, "persistent") == 0) + else if (matches (cmd_arg, "persistent")) persistent = TRUE; else { g_print (_("Error: invalid argument '%s'\n"), cmd_arg); @@ -7672,7 +7690,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t break; case NMC_EDITOR_MAIN_CMD_NMCLI: - if (cmd_arg_p && matches (cmd_arg_p, "status-line") == 0) { + if (cmd_arg_p && matches (cmd_arg_p, "status-line")) { GError *tmp_err = NULL; gboolean bb; if (!nmc_string_to_bool (cmd_arg_v ? g_strstrip (cmd_arg_v) : "", &bb, &tmp_err)) { @@ -7680,7 +7698,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t g_clear_error (&tmp_err); } else nmc->editor_status_line = bb; - } else if (cmd_arg_p && matches (cmd_arg_p, "save-confirmation") == 0) { + } else if (cmd_arg_p && matches (cmd_arg_p, "save-confirmation")) { GError *tmp_err = NULL; gboolean bb; if (!nmc_string_to_bool (cmd_arg_v ? g_strstrip (cmd_arg_v) : "", &bb, &tmp_err)) { @@ -7688,7 +7706,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t g_clear_error (&tmp_err); } else nmc->editor_save_confirmation = bb; - } else if (cmd_arg_p && matches (cmd_arg_p, "show-secrets") == 0) { + } else if (cmd_arg_p && matches (cmd_arg_p, "show-secrets")) { GError *tmp_err = NULL; gboolean bb; if (!nmc_string_to_bool (cmd_arg_v ? g_strstrip (cmd_arg_v) : "", &bb, &tmp_err)) { @@ -7696,7 +7714,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t g_clear_error (&tmp_err); } else nmc->editor_show_secrets = bb; - } else if (cmd_arg_p && matches (cmd_arg_p, "prompt-color") == 0) { + } else if (cmd_arg_p && matches (cmd_arg_p, "prompt-color")) { GError *tmp_err = NULL; NmcTermColor color; color = nmc_term_color_parse_string (cmd_arg_v ? g_strstrip (cmd_arg_v) : " ", &tmp_err); @@ -7876,6 +7894,18 @@ editor_init_existing_connection (NMConnection *connection) nmc_setting_connection_connect_handlers (s_con, connection); } +static void +nmc_complete_connection_type (const char *prefix, const NameItem *types) +{ + while (types->name) { + if (!*prefix || matches (prefix, types->name)) + g_print ("%s\n", types->name); + if (types->alias && (!*prefix || matches (prefix, types->alias))) + g_print ("%s\n", types->alias); + types++; + } +} + static NMCResultCode do_connection_edit (NmCli *nmc, int argc, char **argv) { @@ -7903,9 +7933,9 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) {"path", TRUE, &con_path, FALSE}, {NULL} }; - /* TODO: complete uuid, path or id */ - if (nmc->complete) - return nmc->return_value; + next_arg (nmc, &argc, &argv, NULL); + if (argc == 1 && nmc->complete) + nmc_complete_strings (*argv, "type", "con-name", "id", "uuid", "path", NULL); nmc->return_value = NMC_RESULT_SUCCESS; @@ -7952,7 +7982,10 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) /* Existing connection */ NMConnection *found_con; - found_con = nmc_find_connection (connections, selector, con, NULL, FALSE); + found_con = nmc_find_connection (connections, selector, con, NULL, nmc->complete); + if (nmc->complete) + goto error; + if (!found_con) { g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), con); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; @@ -7984,6 +8017,12 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) editor_init_existing_connection (connection); } else { /* New connection */ + if (nmc->complete) { + if (type && argc == 0) + nmc_complete_connection_type (type, nmc_valid_connection_types); + goto error; + } + connection_type = check_valid_name (type, nmc_valid_connection_types, NULL, &err1); tmp_str = get_valid_options_string (nmc_valid_connection_types, NULL); @@ -8044,11 +8083,11 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) /* Set global variables for use in TAB completion */ nmc_tab_completion.nmc = nmc; - nmc_tab_completion.con_type = g_strdup (connection_type); + nmc_tab_completion.con_type = g_strdup (nm_connection_get_connection_type (connection)); nmc_tab_completion.connection = connection; /* Run menu loop */ - editor_menu_main (nmc, connection, connection_type); + editor_menu_main (nmc, connection); if (connection) g_object_unref (connection); @@ -8098,11 +8137,10 @@ do_connection_modify (NmCli *nmc, GError *error = NULL; gboolean temporary = FALSE; - if (argc && nmc_arg_is_option (*argv, "temporary")) { - if (nmc->complete) - goto finish; + /* Check --temporary */ + if (next_arg (nmc, &argc, &argv, "--temporary", NULL) > 0) { temporary = TRUE; - next_arg (&argc, &argv); + next_arg (nmc, &argc, &argv, NULL); } connection = get_connection (nmc, &argc, &argv, NULL, &error); @@ -8191,12 +8229,17 @@ do_connection_clone (NmCli *nmc, int argc, char **argv) gboolean temporary = FALSE; char **arg_arr = NULL; int arg_num; - char ***argv_ptr = &argv; - int *argc_ptr = &argc; + char ***argv_ptr; + int *argc_ptr; GError *error = NULL; - if (argc == 1 && nmc->complete) - nmc_complete_strings (*argv, "temporary", NULL); + if (next_arg (nmc, &argc, &argv, "--temporary", NULL) > 0) { + temporary = TRUE; + next_arg (nmc, &argc, &argv, NULL); + } + + argv_ptr = &argv; + argc_ptr = &argc; if (argc == 0 && nmc->ask) { char *line; @@ -8209,9 +8252,6 @@ do_connection_clone (NmCli *nmc, int argc, char **argv) g_free (line); argv_ptr = &arg_arr; argc_ptr = &arg_num; - } else if (nmc_arg_is_option (*argv, "temporary")) { - temporary = TRUE; - next_arg (&argc, &argv); } connection = get_connection (nmc, argc_ptr, argv_ptr, NULL, &error); @@ -8234,7 +8274,7 @@ do_connection_clone (NmCli *nmc, int argc, char **argv) goto finish; } - if (next_arg (argc_ptr, argv_ptr) == 0) { + if (next_arg (nmc->ask ? NULL : nmc, argc_ptr, argv_ptr, NULL) == 0) { g_string_printf (nmc->return_text, _("Error: unknown extra argument: '%s'."), *argv); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; @@ -8305,8 +8345,8 @@ do_connection_delete (NmCli *nmc, int argc, char **argv) ConnectionCbInfo *info = NULL; GSList *queue = NULL, *iter; char **arg_arr = NULL, *old_arg; - char **arg_ptr = argv; - int arg_num = argc; + char **arg_ptr; + int arg_num; GString *invalid_cons = NULL; int pos = 0; GError *error = NULL; @@ -8314,6 +8354,10 @@ do_connection_delete (NmCli *nmc, int argc, char **argv) if (nmc->timeout == -1) nmc->timeout = 10; + next_arg (nmc, &argc, &argv, NULL); + arg_ptr = argv; + arg_num = argc; + if (argc == 0) { if (nmc->ask) { char *line; @@ -8444,6 +8488,7 @@ do_connection_monitor (NmCli *nmc, int argc, char **argv) { GError *error = NULL; + next_arg (nmc, &argc, &argv, NULL); if (argc == 0) { /* No connections specified. Monitor all. */ const GPtrArray *connections; @@ -8492,6 +8537,7 @@ do_connection_reload (NmCli *nmc, int argc, char **argv) { GError *error = NULL; + next_arg (nmc, &argc, &argv, NULL); if (nmc->complete) return nmc->return_value; @@ -8512,6 +8558,7 @@ do_connection_load (NmCli *nmc, int argc, char **argv) char **filenames, **failures = NULL; int i; + next_arg (nmc, &argc, &argv, NULL); if (argc == 0) { g_string_printf (nmc->return_text, _("Error: No connection specified.")); return NMC_RESULT_ERROR_USER_INPUT; @@ -8547,6 +8594,22 @@ do_connection_load (NmCli *nmc, int argc, char **argv) #define PROMPT_IMPORT_TYPE PROMPT_VPN_TYPE #define PROMPT_IMPORT_FILE N_("File to import: ") +static void +nmc_complete_vpn_service (const char *prefix) +{ + char **services; + char **candidate; + + services = nm_vpn_plugin_info_list_get_service_types (NULL, FALSE, TRUE); + for (candidate = services; *candidate; candidate++) { + if (!*prefix && g_str_has_prefix (*candidate, NM_DBUS_INTERFACE)) + continue; + if (!*prefix || matches (prefix, *candidate)) + g_print ("%s\n", *candidate); + } + g_strfreev (services); +} + static NMCResultCode do_connection_import (NmCli *nmc, int argc, char **argv) { @@ -8559,6 +8622,13 @@ do_connection_import (NmCli *nmc, int argc, char **argv) gs_free char *service_type = NULL; gboolean temporary = FALSE; + /* Check --temporary */ + if (next_arg (nmc, &argc, &argv, "--temporary", NULL) > 0) { + temporary = TRUE; + next_arg (nmc, &argc, &argv, NULL); + } + + if (argc == 0) { /* nmc_do_cmd() should not call this with argc=0. */ g_assert (!nmc->complete); @@ -8577,25 +8647,29 @@ do_connection_import (NmCli *nmc, int argc, char **argv) while (argc > 0) { if (argc == 1 && nmc->complete) - nmc_complete_strings (*argv, "temporary", "type", "file", NULL); - if (nmc_arg_is_option (*argv, "temporary")) { - temporary = TRUE; - next_arg (&argc, &argv); - } + nmc_complete_strings (*argv, "type", "file", NULL); if (strcmp (*argv, "type") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; } + + if (argc == 1 && nmc->complete) + nmc_complete_vpn_service (*argv); + if (!type) type = *argv; else g_printerr (_("Warning: 'type' already specified, ignoring extra one.\n")); } else if (strcmp (*argv, "file") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; @@ -8612,8 +8686,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv) goto finish; } - argc--; - argv++; + next_arg (nmc, &argc, &argv, NULL); } if (nmc->complete) @@ -8689,8 +8762,12 @@ do_connection_export (NmCli *nmc, int argc, char **argv) char tmpfile[] = "/tmp/nmcli-export-temp-XXXXXX"; char **arg_arr = NULL; int arg_num; - char ***argv_ptr = &argv; - int *argc_ptr = &argc; + char ***argv_ptr; + int *argc_ptr; + + next_arg (nmc, &argc, &argv, NULL); + argv_ptr = &argv; + argc_ptr = &argc; if (argc == 0 && nmc->ask) { char *line; @@ -8715,17 +8792,17 @@ do_connection_export (NmCli *nmc, int argc, char **argv) if (nmc->complete) return nmc->return_value; - if (next_arg (&argc, &argv) == 0) - out_name = *argv; - else if (nmc->ask) - out_name = out_name_ask = nmc_readline (_("Output file name: ")); + out_name = *argv; - if (next_arg (argc_ptr, argv_ptr) == 0) { + if (next_arg (nmc->ask ? NULL : nmc, argc_ptr, argv_ptr, NULL) == 0) { g_string_printf (nmc->return_text, _("Error: unknown extra argument: '%s'."), *argv); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; } + if (out_name == NULL && nmc->ask) + out_name = out_name_ask = nmc_readline (_("Output file name: ")); + type = nm_connection_get_connection_type (connection); if (g_strcmp0 (type, NM_SETTING_VPN_SETTING_NAME) != 0) { g_string_printf (nmc->return_text, _("Error: the connection is not VPN.")); @@ -8893,6 +8970,8 @@ static const NMCCommand connection_cmds[] = { NMCResultCode do_connections (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); + /* Register polkit agent */ nmc_start_polkit_agent_start_try (nmc); diff --git a/clients/cli/devices.c b/clients/cli/devices.c index eaded0ca..387edef8 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -92,8 +92,8 @@ NmcOutputField nmc_fields_dev_show_connections[] = { {"AVAILABLE-CONNECTIONS", N_("AVAILABLE-CONNECTIONS")}, /* 2 */ {NULL, NULL} }; -#define NMC_FIELDS_DEV_SHOW_CONNECTIONS_ALL "AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS" -#define NMC_FIELDS_DEV_SHOW_CONNECTIONS_COMMON "AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS" +#define NMC_FIELDS_DEV_SHOW_CONNECTIONS_ALL "NAME,AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS" +#define NMC_FIELDS_DEV_SHOW_CONNECTIONS_COMMON "NAME,AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS" /* Available fields for 'device show' - CAPABILITIES part */ NmcOutputField nmc_fields_dev_show_cap[] = { @@ -101,10 +101,11 @@ NmcOutputField nmc_fields_dev_show_cap[] = { {"CARRIER-DETECT", N_("CARRIER-DETECT")}, /* 1 */ {"SPEED", N_("SPEED")}, /* 2 */ {"IS-SOFTWARE", N_("IS-SOFTWARE")}, /* 3 */ + {"SRIOV", N_("SRIOV")}, /* 4 */ {NULL, NULL} }; -#define NMC_FIELDS_DEV_SHOW_CAP_ALL "NAME,CARRIER-DETECT,SPEED,IS-SOFTWARE" -#define NMC_FIELDS_DEV_SHOW_CAP_COMMON "NAME,CARRIER-DETECT,SPEED,IS-SOFTWARE" +#define NMC_FIELDS_DEV_SHOW_CAP_ALL "NAME,CARRIER-DETECT,SPEED,IS-SOFTWARE,SRIOV" +#define NMC_FIELDS_DEV_SHOW_CAP_COMMON "NAME,CARRIER-DETECT,SPEED,IS-SOFTWARE,SRIOV" /* Available fields for 'device show' - wired properties part */ NmcOutputField nmc_fields_dev_show_wired_prop[] = { @@ -613,7 +614,7 @@ get_device_list (NmCli *nmc, int argc, char **argv) } /* Take next argument */ - next_arg (&arg_num, &arg_ptr); + next_arg (nmc->ask ? NULL : nmc, &arg_num, &arg_ptr, NULL); } g_free (devices); @@ -642,7 +643,7 @@ get_device (NmCli *nmc, int *argc, char ***argv, GError **error) } } else { ifname = **argv; - next_arg (argc, argv); + next_arg (nmc, argc, argv, NULL); } devices = nmc_get_devices_sorted (nmc->client); @@ -1084,7 +1085,7 @@ show_device_info (NMDevice *device, NmCli *nmc) if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) fields_str = fields_common; - else if (!nmc->required_fields || strcasecmp (nmc->required_fields, "all") == 0) + else if (strcasecmp (nmc->required_fields, "all") == 0) fields_str = fields_all; else fields_str = nmc->required_fields; @@ -1097,8 +1098,10 @@ show_device_info (NMDevice *device, NmCli *nmc) return FALSE; } - /* Main header */ + /* Main header (pretty only) */ nmc->print_fields.header_name = (char *) construct_header_name (base_hdr, nm_device_get_iface (device)); + + /* Lazy way to retrieve sorted array from 0 to the number of dev fields */ nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_SHOW_GENERAL_ALL, nmc_fields_dev_show_general, FALSE, NULL, NULL); @@ -1194,6 +1197,7 @@ show_device_info (NMDevice *device, NmCli *nmc) set_val_strc (arr, 1, (caps & NM_DEVICE_CAP_CARRIER_DETECT) ? _("yes") : _("no")); set_val_str (arr, 2, speed_str); set_val_strc (arr, 3, (caps & NM_DEVICE_CAP_IS_SOFTWARE) ? _("yes") : _("no")); + set_val_strc (arr, 4, (caps & NM_DEVICE_CAP_SRIOV) ? _("yes") : _("no")); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -1488,20 +1492,15 @@ do_devices_status (NmCli *nmc, int argc, char **argv) NmcOutputField *tmpl, *arr; size_t tmpl_len; + next_arg (nmc, &argc, &argv, NULL); + /* Nothing to complete */ if (nmc->complete) return nmc->return_value; - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - g_error_free (error); - return NMC_RESULT_ERROR_USER_INPUT; - } - while (argc > 0) { g_printerr (_("Unknown parameter: %s\n"), *argv); - argc--; - argv++; + next_arg (nmc, &argc, &argv, NULL); } if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) @@ -1543,6 +1542,7 @@ do_device_show (NmCli *nmc, int argc, char **argv) { gs_free_error GError *error = NULL; + next_arg (nmc, &argc, &argv, NULL); if (!nmc->mode_specified) nmc->multiline_output = TRUE; /* multiline mode is default for 'device show' */ @@ -1835,6 +1835,7 @@ do_device_connect (NmCli *nmc, int argc, char **argv) if (nmc->timeout == -1) nmc->timeout = 90; + next_arg (nmc, &argc, &argv, NULL); device = get_device (nmc, &argc, &argv, &error); if (!device) { g_string_printf (nmc->return_text, _("Error: %s."), error->message); @@ -2003,6 +2004,7 @@ do_device_reapply (NmCli *nmc, int argc, char **argv) if (nmc->timeout == -1) nmc->timeout = 10; + next_arg (nmc, &argc, &argv, NULL); device = get_device (nmc, &argc, &argv, &error); if (!device) { g_string_printf (nmc->return_text, _("Error: %s."), error->message); @@ -2110,6 +2112,7 @@ do_device_modify (NmCli *nmc, int argc, char **argv) ModifyInfo *info = NULL; gs_free_error GError *error = NULL; + next_arg (nmc, &argc, &argv, NULL); device = get_device (nmc, &argc, &argv, &error); if (!device) { g_string_printf (nmc->return_text, _("Error: %s."), error->message); @@ -2176,6 +2179,7 @@ do_devices_disconnect (NmCli *nmc, int argc, char **argv) if (nmc->timeout == -1) nmc->timeout = 10; + next_arg (nmc, &argc, &argv, NULL); queue = get_device_list (nmc, argc, argv); if (!queue) return nmc->return_value; @@ -2245,6 +2249,7 @@ do_devices_delete (NmCli *nmc, int argc, char **argv) if (nmc->timeout == -1) nmc->timeout = 10; + next_arg (nmc, &argc, &argv, NULL); queue = get_device_list (nmc, argc, argv); if (!queue) return nmc->return_value; @@ -2293,10 +2298,9 @@ do_device_set (NmCli *nmc, int argc, char **argv) }; gs_free_error GError *error = NULL; - if (argc >= 1 && g_strcmp0 (*argv, "ifname") == 0) { - argc--; - argv++; - } + next_arg (nmc, &argc, &argv, NULL); + if (argc >= 1 && g_strcmp0 (*argv, "ifname") == 0) + next_arg (nmc, &argc, &argv, NULL); device = get_device (nmc, &argc, &argv, &error); if (!device) { @@ -2316,8 +2320,10 @@ do_device_set (NmCli *nmc, int argc, char **argv) if (argc == 1 && nmc->complete) nmc_complete_strings (*argv, "managed", "autoconnect", NULL); - if (matches (*argv, "managed") == 0) { - if (next_arg (&argc, &argv) != 0) { + if (matches (*argv, "managed")) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: '%s' argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } @@ -2331,8 +2337,10 @@ do_device_set (NmCli *nmc, int argc, char **argv) values[DEV_SET_MANAGED].idx = ++i; values[DEV_SET_MANAGED].value = flag; } - else if (matches (*argv, "autoconnect") == 0) { - if (next_arg (&argc, &argv) != 0) { + else if (matches (*argv, "autoconnect")) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: '%s' argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } @@ -2350,7 +2358,7 @@ do_device_set (NmCli *nmc, int argc, char **argv) g_string_printf (nmc->return_text, _("Error: property '%s' is not known."), *argv); return NMC_RESULT_ERROR_USER_INPUT; } - } while (next_arg (&argc, &argv) == 0); + } while (next_arg (nmc, &argc, &argv, NULL) == 0); if (nmc->complete) return nmc->return_value; @@ -2437,12 +2445,10 @@ device_removed (NMClient *client, NMDevice *device, NmCli *nmc) static NMCResultCode do_devices_monitor (NmCli *nmc, int argc, char **argv) { - GSList *queue = get_device_list (nmc, argc, argv); - GSList *iter; - if (nmc->complete) return nmc->return_value; + next_arg (nmc, &argc, &argv, NULL); if (argc == 0) { /* No devices specified. Monitor all. */ const GPtrArray *devices = nm_client_get_devices (nmc->client); @@ -2455,6 +2461,9 @@ do_devices_monitor (NmCli *nmc, int argc, char **argv) nmc->should_wait++; g_signal_connect (nmc->client, NM_CLIENT_DEVICE_ADDED, G_CALLBACK (device_added), nmc); } else { + GSList *queue = get_device_list (nmc, argc, argv); + GSList *iter; + /* Monitor the specified devices. */ for (iter = queue; iter; iter = g_slist_next (iter)) device_watch (nmc, NM_DEVICE (iter->data)); @@ -2631,12 +2640,15 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) devices = nmc_get_devices_sorted (nmc->client); + next_arg (nmc, &argc, &argv, NULL); while (argc > 0) { if (argc == 1 && nmc->complete) nmc_complete_strings (*argv, "ifname", "bssid", NULL); if (strcmp (*argv, "ifname") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } @@ -2644,7 +2656,9 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) complete_device (devices, ifname, TRUE); } else if (strcmp (*argv, "bssid") == 0 || strcmp (*argv, "hwaddr") == 0) { /* hwaddr is deprecated and will be removed later */ - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } @@ -2655,8 +2669,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) g_printerr (_("Unknown parameter: %s\n"), *argv); } - argc--; - argv++; + next_arg (nmc, &argc, &argv, NULL); } if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) @@ -2845,6 +2858,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) devices = nmc_get_devices_sorted (nmc->client); + next_arg (nmc, &argc, &argv, NULL); /* Get the first compulsory argument (SSID or BSSID) */ if (argc > 0) { param_user = *argv; @@ -2853,8 +2867,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) if (argc == 1 && nmc->complete) complete_aps (devices, NULL, param_user, param_user); - argc--; - argv++; + next_arg (nmc, &argc, &argv, NULL); } else { /* nmc_do_cmd() should not call this with argc=0. */ g_assert (!nmc->complete); @@ -2879,7 +2892,9 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) } if (strcmp (*argv, "ifname") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; @@ -2887,7 +2902,9 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) ifname = *argv; complete_device (devices, ifname, TRUE); } else if (strcmp (*argv, "bssid") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; @@ -2903,14 +2920,18 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) goto finish; } } else if (strcmp (*argv, "password") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; } password = *argv; } else if (strcmp (*argv, "wep-key-type") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; @@ -2929,7 +2950,9 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) goto finish; } } else if (strcmp (*argv, "name") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; @@ -2937,7 +2960,10 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) con_name = *argv; } else if (strcmp (*argv, "private") == 0) { GError *err_tmp = NULL; - if (next_arg (&argc, &argv) != 0) { + + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; @@ -2952,7 +2978,10 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) } } else if (strcmp (*argv, "hidden") == 0) { GError *err_tmp = NULL; - if (next_arg (&argc, &argv) != 0) { + + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; @@ -2969,8 +2998,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) g_printerr (_("Unknown parameter: %s\n"), *argv); } - argc--; - argv++; + next_arg (nmc, &argc, &argv, NULL); } if (nmc->complete) @@ -3064,7 +3092,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) if (con_name) g_object_set (s_con, NM_SETTING_CONNECTION_ID, con_name, NULL); - /* Connection will only be visible to this user when '--private' is specified */ + /* Connection will only be visible to this user when 'private' is specified */ if (private) nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL); } @@ -3321,6 +3349,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) devices = nmc_get_devices_sorted (nmc->client); + next_arg (nmc, &argc, &argv, NULL); while (argc > 0) { if (argc == 1 && nmc->complete) { nmc_complete_strings (*argv, "ifname", "con-name", "ssid", "band", @@ -3328,7 +3357,9 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) } if (strcmp (*argv, "ifname") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } @@ -3336,13 +3367,17 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) if (argc == 1 && nmc->complete) complete_device (devices, ifname, TRUE); } else if (strcmp (*argv, "con-name") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } con_name = *argv; } else if (strcmp (*argv, "ssid") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } @@ -3352,7 +3387,9 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) return NMC_RESULT_ERROR_USER_INPUT; } } else if (strcmp (*argv, "band") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } @@ -3365,13 +3402,17 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) return NMC_RESULT_ERROR_USER_INPUT; } } else if (strcmp (*argv, "channel") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } channel = *argv; } else if (strcmp (*argv, "password") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } @@ -3385,8 +3426,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) return NMC_RESULT_ERROR_USER_INPUT; } - argc--; - argv++; + next_arg (nmc, &argc, &argv, NULL); } show_password = nmc->show_secrets || show_password; @@ -3532,6 +3572,7 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv) ssids = g_ptr_array_new (); devices = nmc_get_devices_sorted (nmc->client); + next_arg (nmc, &argc, &argv, NULL); /* Get the parameters */ while (argc > 0) { if (argc == 1 && nmc->complete) @@ -3543,7 +3584,9 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv) nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; } - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; @@ -3552,7 +3595,9 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv) if (argc == 1 && nmc->complete) complete_device (devices, ifname, TRUE); } else if (strcmp (*argv, "ssid") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; @@ -3561,8 +3606,7 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv) } else if (!nmc->complete) g_printerr (_("Unknown parameter: %s\n"), *argv); - argc--; - argv++; + next_arg (nmc, &argc, &argv, NULL); } if (nmc->complete) @@ -3617,14 +3661,7 @@ static NMCCommand device_wifi_cmds[] = { static NMCResultCode do_device_wifi (NmCli *nmc, int argc, char **argv) { - GError *error = NULL; - - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - g_error_free (error); - return NMC_RESULT_ERROR_USER_INPUT; - } - + next_arg (nmc, &argc, &argv, NULL); nmc_do_cmd (nmc, device_wifi_cmds, *argv, argc, argv); return nmc->return_value; @@ -3722,12 +3759,15 @@ do_device_lldp_list (NmCli *nmc, int argc, char **argv) char *fields_str; int counter = 0; + next_arg (nmc, &argc, &argv, NULL); while (argc > 0) { if (argc == 1 && nmc->complete) nmc_complete_strings (*argv, "ifname", NULL); if (strcmp (*argv, "ifname") == 0) { - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); return NMC_RESULT_ERROR_USER_INPUT; } @@ -3742,8 +3782,7 @@ do_device_lldp_list (NmCli *nmc, int argc, char **argv) return NMC_RESULT_ERROR_USER_INPUT; } - argc--; - argv++; + next_arg (nmc, &argc, &argv, NULL); } if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) @@ -3789,17 +3828,10 @@ static NMCCommand device_lldp_cmds[] = { static NMCResultCode do_device_lldp (NmCli *nmc, int argc, char **argv) { - GError *error = NULL; - - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - g_error_free (error); - return NMC_RESULT_ERROR_USER_INPUT; - } - if (!nmc->mode_specified) nmc->multiline_output = TRUE; /* multiline mode is default for 'device lldp' */ + next_arg (nmc, &argc, &argv, NULL); nmc_do_cmd (nmc, device_lldp_cmds, *argv, argc, argv); return nmc->return_value; @@ -3865,6 +3897,8 @@ static const NMCCommand device_cmds[] = { NMCResultCode do_devices (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); + /* Register polkit agent */ nmc_start_polkit_agent_start_try (nmc); diff --git a/clients/cli/general.c b/clients/cli/general.c index 512ec291..12e76efd 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -385,13 +385,7 @@ show_nm_status (NmCli *nmc, const char *pretty_header_name, const char *print_fl static NMCResultCode do_general_status (NmCli *nmc, int argc, char **argv) { - gs_free_error GError *error = NULL; - - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - return NMC_RESULT_ERROR_USER_INPUT; - } - + next_arg (nmc, &argc, &argv, NULL); if (nmc->complete) return nmc->return_value; @@ -566,13 +560,7 @@ show_nm_permissions (NmCli *nmc) static NMCResultCode do_general_permissions (NmCli *nmc, int argc, char **argv) { - gs_free_error GError *error = NULL; - - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - return NMC_RESULT_ERROR_USER_INPUT; - } - + next_arg (nmc, &argc, &argv, NULL); if (nmc->complete) return nmc->return_value; @@ -632,18 +620,30 @@ show_general_logging (NmCli *nmc) return TRUE; } +static void +nmc_complete_strings_nocase (const char *prefix, ...) +{ + va_list args; + const char *candidate; + int len; + + len = strlen (prefix); + + va_start (args, prefix); + while ((candidate = va_arg (args, const char *))) { + if (strncasecmp (prefix, candidate, len) == 0) + g_print ("%s\n", candidate); + } + va_end (args); +} + static NMCResultCode do_general_logging (NmCli *nmc, int argc, char **argv) { gs_free_error GError *error = NULL; + next_arg (nmc, &argc, &argv, NULL); if (argc == 0) { - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - g_error_free (error); - return NMC_RESULT_ERROR_USER_INPUT; - } - if (nmc->complete) return nmc->return_value; @@ -652,19 +652,49 @@ do_general_logging (NmCli *nmc, int argc, char **argv) /* arguments provided -> set logging level and domains */ const char *level = NULL; const char *domains = NULL; - nmc_arg_t exp_args[] = { {"level", TRUE, &level, TRUE}, - {"domains", TRUE, &domains, TRUE}, - {NULL} }; - /* TODO: nmc_parse_args needs completion */ + do { + if (argc == 1 && nmc->complete) + nmc_complete_strings (*argv, "level", "domains", NULL); + + if (matches (*argv, "level")) { + argc--; + argv++; + if (!argc) { + g_string_printf (nmc->return_text, _("Error: '%s' argument is missing."), *(argv-1)); + return NMC_RESULT_ERROR_USER_INPUT; + } + if (argc == 1 && nmc->complete) { + nmc_complete_strings_nocase (*argv, "TRACE", "DEBUG", "INFO", "WARN", + "ERR", "OFF", "KEEP", NULL); + } + level = *argv; + } else if (matches (*argv, "domains")) { + argc--; + argv++; + if (!argc) { + g_string_printf (nmc->return_text, _("Error: '%s' argument is missing."), *(argv-1)); + return NMC_RESULT_ERROR_USER_INPUT; + } + if (argc == 1 && nmc->complete) { + nmc_complete_strings_nocase (*argv, "PLATFORM", "RFKILL", "ETHER", "WIFI", "BT", + "MB", "DHCP4", "DHCP6", "PPP", "WIFI_SCAN", "IP4", + "IP6", "AUTOIP4", "DNS", "VPN", "SHARING", "SUPPLICANT", + "AGENTS", "SETTINGS", "SUSPEND", "CORE", "DEVICE", "OLPC", + "INFINIBAND", "FIREWALL", "ADSL", "BOND", "VLAN", "BRIDGE", + "DBUS_PROPS", "TEAM", "CONCHECK", "DCB", "DISPATCH", "AUDIT", + "SYSTEMD", "VPN_PLUGIN", "PROXY", NULL); + } + domains = *argv; + } else { + g_string_printf (nmc->return_text, _("Error: property '%s' is not known."), *argv); + return NMC_RESULT_ERROR_USER_INPUT; + } + } while (next_arg (nmc, &argc, &argv, NULL) == 0); + if (nmc->complete) return nmc->return_value; - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, &error)) { - g_string_assign (nmc->return_text, error->message); - return error->code; - } - nm_client_set_logging (nmc->client, level, domains, &error); if (error) { g_string_printf (nmc->return_text, _("Error: failed to set logging: %s"), @@ -695,6 +725,7 @@ save_hostname_cb (GObject *object, GAsyncResult *result, gpointer user_data) static NMCResultCode do_general_hostname (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); if (nmc->complete) return nmc->return_value; @@ -710,7 +741,7 @@ do_general_hostname (NmCli *nmc, int argc, char **argv) /* hostname provided -> set it */ const char *hostname = *argv; - if (next_arg (&argc, &argv) == 0) + if (next_arg (nmc, &argc, &argv, NULL) == 0) g_print ("Warning: ignoring extra garbage after '%s' hostname\n", hostname); nmc->should_wait++; @@ -735,6 +766,8 @@ static const NMCCommand general_cmds[] = { NMCResultCode do_general (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); + /* Register polkit agent */ nmc_start_polkit_agent_start_try (nmc); @@ -800,18 +833,21 @@ do_networking_on_off (NmCli *nmc, int argc, char **argv, gboolean enable) static NMCResultCode do_networking_on (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); return do_networking_on_off (nmc, argc, argv, TRUE); } static NMCResultCode do_networking_off (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); return do_networking_on_off (nmc, argc, argv, FALSE); } static NMCResultCode do_networking_connectivity (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); if (nmc->complete) { if (argc == 1) nmc_complete_strings (*argv, "check", NULL); @@ -821,7 +857,7 @@ do_networking_connectivity (NmCli *nmc, int argc, char **argv) if (!argc) { /* no arguments -> get current state */ nmc_switch_show (nmc, NMC_FIELDS_NM_CONNECTIVITY, _("Connectivity")); - } else if (matches (*argv, "check") == 0) { + } else if (matches (*argv, "check")) { gs_free_error GError *error = NULL; /* Register polkit agent */ @@ -845,6 +881,7 @@ do_networking_connectivity (NmCli *nmc, int argc, char **argv) static NMCResultCode do_networking_show (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); if (nmc->complete) return nmc->return_value; @@ -866,6 +903,7 @@ static const NMCCommand networking_cmds[] = { NMCResultCode do_networking (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); nmc_do_cmd (nmc, networking_cmds, *argv, argc, argv); return nmc->return_value; @@ -875,17 +913,13 @@ static NMCResultCode do_radio_all (NmCli *nmc, int argc, char **argv) { gboolean enable_flag; - gs_free_error GError *error = NULL; + next_arg (nmc, &argc, &argv, NULL); if (argc == 0) { if (nmc->complete) return nmc->return_value; /* no argument, show all radio switches */ - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - return NMC_RESULT_ERROR_USER_INPUT; - } show_nm_status (nmc, _("Radio switches"), NMC_FIELDS_NM_STATUS_RADIO); } else { if (nmc->complete) { @@ -910,6 +944,7 @@ do_radio_wifi (NmCli *nmc, int argc, char **argv) { gboolean enable_flag; + next_arg (nmc, &argc, &argv, NULL); if (argc == 0) { if (nmc->complete) return nmc->return_value; @@ -936,6 +971,7 @@ do_radio_wwan (NmCli *nmc, int argc, char **argv) { gboolean enable_flag; + next_arg (nmc, &argc, &argv, NULL); if (argc == 0) { if (nmc->complete) return nmc->return_value; @@ -970,6 +1006,8 @@ static const NMCCommand radio_cmds[] = { NMCResultCode do_radio (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); + /* Register polkit agent */ nmc_start_polkit_agent_start_try (nmc); @@ -1124,7 +1162,7 @@ ac_overview (NmCli *nmc, NMActiveConnection *ac) NMIPConfig *ip; if (nm_active_connection_get_master (ac)) { - g_string_append_printf (outbuf, "%s %s,", _("master"), + g_string_append_printf (outbuf, "%s %s, ", _("master"), nm_device_get_iface (nm_active_connection_get_master (ac))); } if (nm_active_connection_get_vpn (ac)) @@ -1195,6 +1233,8 @@ do_overview (NmCli *nmc, int argc, char **argv) char *tmp; int i; + next_arg (nmc, &argc, &argv, NULL); + /* Register polkit agent */ nmc_start_polkit_agent_start_try (nmc); @@ -1294,6 +1334,8 @@ do_overview (NmCli *nmc, int argc, char **argv) NMCResultCode do_monitor (NmCli *nmc, int argc, char **argv) { + next_arg (nmc, &argc, &argv, NULL); + if (nmc->complete) return nmc->return_value; diff --git a/clients/cli/nmcli-completion b/clients/cli/nmcli-completion index e1716f60..45dfe89c 100644 --- a/clients/cli/nmcli-completion +++ b/clients/cli/nmcli-completion @@ -1,16 +1,65 @@ -# nmcli(1) completion -*- shell-script -*- -# Originally based on -# https://github.com/GArik/bash-completion/blob/master/completions/nmcli +# nmcli(1) completion -_nmcli_list() +_nmcli_array_delete_at() { - COMPREPLY=( $( compgen -W '$1' -- $cur ) ) + eval "local ARRAY=(\"\${$1[@]}\")" + local i + local tmp=() + local lower=$2 + local upper=${3:-$lower} + + # for some reason the following fails. So this clumsy workaround... + # A=(a "") + # echo " >> ${#A[@]}" + # >> 2 + # A=("${A[@]:1}") + # echo " >> ${#A[@]}" + # >> 0 + # ... seriously??? + + for i in "${!ARRAY[@]}"; do + if [[ "$i" -lt "$2" || "$i" -gt "${3-$2}" ]]; then + tmp=("${tmp[@]}" "${ARRAY[$i]}") + fi + done + eval "$1=(\"\${tmp[@]}\")" } -_nmcli_list_nl() +_nmcli() { + local cur words cword i output + _init_completion || return + + # we don't care about any arguments after the current cursor position + # because we only parse from left to right. So, if there are some arguments + # right of the cursor, just ignore them. Also don't care about ${words[0]}. + _nmcli_array_delete_at words $((cword+1)) ${#words[@]} + _nmcli_array_delete_at words 0 + + # _init_completion returns the words with all the quotes and escaping + # characters. We don't care about them, drop them at first. + for i in ${!words[@]}; do + words[i]="$(printf '%s' "${words[i]}" | xargs printf '%s\n' 2>/dev/null || true)" + done + + # In case the cursor is not at the end of the line, + # $cur consists of spaces that we want do remove. + # For example: `nmcli connection modify id lo` + if [[ "$cur" =~ ^[[:space:]]+ ]]; then + cur='' + fi + + output="$(nmcli --complete-args "${words[@]}" 2>/dev/null)" + + # Bail out early if we're completing a file name + if [ $? = 65 ]; then + compopt -o default + COMPREPLY=() + return 0 + fi + local IFS=$'\n' - COMPREPLY=( $( compgen -W '$1' -- $cur ) ) + COMPREPLY=( $( compgen -W '$output' -- $cur ) ) # Now escape special characters (spaces, single and double quotes), # so that the argument is really regarded a single argument by bash. @@ -25,7 +74,7 @@ _nmcli_list_nl() # [']bla'bla"bla\bla bla --> [']bla'\''bla"bla\bla bla COMPREPLY[$i]="${entry//\'/${escaped_single_quote}}" elif [[ "${cur:0:1}" == '"' ]]; then - # started with double quote, escaping all double quotes, backslashes and ! + # started with double quote, escaping all double quotes and all backslashes # ["]bla'bla"bla\bla bla --> ["]bla'bla\"bla\\bla bla entry="${entry//\\/\\\\}" entry="${entry//\"/\\\"}" @@ -60,1239 +109,7 @@ _nmcli_list_nl() COMPREPLY[$i]=${entry} (( i++ )) done -} - -_nmcli_con_show() -{ - nmcli -t -f "$1" connection show $2 2> /dev/null -} - -_nmcli_wifi_list() -{ - nmcli -t -f "$1" device wifi list 2>/dev/null -} - -_nmcli_dev_status() -{ - nmcli -t -f "$1" device status 2>/dev/null -} - -_nmcli_array_has_value() { - # expects the name of an array as first parameter and - # returns true if if one of the remaining arguments is - # contained in the array ${$1[@]} - eval "local ARRAY=(\"\${$1[@]}\")" - local arg a - shift - for arg; do - for a in "${ARRAY[@]}"; do - if [[ "$a" = "$arg" ]]; then - return 0 - fi - done - done - return 1 -} - -_nmcli_array_delete_at() -{ - eval "local ARRAY=(\"\${$1[@]}\")" - local i - local tmp=() - local lower=$2 - local upper=${3:-$lower} - - # for some reason the following fails. So this clumsy workaround... - # A=(a "") - # echo " >> ${#A[@]}" - # >> 2 - # A=("${A[@]:1}") - # echo " >> ${#A[@]}" - # >> 0 - # ... seriously??? - - for i in "${!ARRAY[@]}"; do - if [[ "$i" -lt "$2" || "$i" -gt "${3-$2}" ]]; then - tmp=("${tmp[@]}" "${ARRAY[$i]}") - fi - done - eval "$1=(\"\${tmp[@]}\")" -} - -_nmcli_compl_match_option() -{ - local S="$1" - local V - shift - if [[ "${S:0:2}" == "--" ]]; then - S="${S:2}" - elif [[ "${S:0:1}" == "-" ]]; then - S="${S:1}" - else - return 1 - fi - for V; do - case "$V" in - "$S"*) - printf "%s" "$V" - return 0 - ;; - esac - done - return 1 -} - -# OPTIONS appear first at the command line (before the OBJECT). -# This iterates over the argument list and tries to complete -# the options. If there are options that are to be completed, -# zero is returned and completion will be performed. -# Otherwise it will remove all the option parameters from the ${words[@]} -# array and return with zero (so that completion of OBJECT can continue). -_nmcli_compl_OPTIONS() -{ - local i W - - for (( ; ; )); do - if [[ "${#words[@]}" -le 1 ]]; then - return 1 - fi - W="$(_nmcli_compl_match_option "${words[0]}" "${LONG_OPTIONS[@]}")" - if [[ $? != 0 ]]; then - return 2 - fi - - # remove the options already seen. - for i in ${!LONG_OPTIONS[@]}; do - if [[ "${LONG_OPTIONS[$i]}" == "$W" ]]; then - _nmcli_array_delete_at LONG_OPTIONS $i - break - fi - done - - if [[ "$HELP_ONLY_AS_FIRST" == '1' ]]; then - for i in ${!LONG_OPTIONS[@]}; do - if [[ "${LONG_OPTIONS[$i]}" == "help" ]]; then - _nmcli_array_delete_at LONG_OPTIONS $i - break - fi - done - fi - - case "$W" in - terse) - _nmcli_array_delete_at words 0 - ;; - pretty) - _nmcli_array_delete_at words 0 - ;; - ask) - _nmcli_array_delete_at words 0 - ;; - show-secrets) - _nmcli_array_delete_at words 0 - ;; - order) - if [[ "${#words[@]}" -eq 2 ]]; then - local ord="${words[1]}" - local ord_sta="" - local i - local c=() - - # FIXME: currently the completion considers colon as separator - # for words. Hence the following doesn't work as $ord will - # not contain any colons at this point. - # See https://bugzilla.gnome.org/show_bug.cgi?id=745157 - - if [[ $ord = *":"* ]]; then - ord_sta="${ord%:*}:" - ord="${ord##*:}" - fi - if [[ $ord = [-+]* ]]; then - ord_sta="$ord_sta${ord:0:1}" - fi - for i in active name type path; do - c=("${c[@]}" "$ord_sta$i") - done - _nmcli_list "${c[*]}" - return 0 - fi - _nmcli_array_delete_at words 0 1 - ;; - active) - _nmcli_array_delete_at words 0 - ;; - version) - _nmcli_array_delete_at words 0 - ;; - help) - _nmcli_array_delete_at words 0 - if [[ "$HELP_ONLY_AS_FIRST" == 1 ]]; then - HELP_ONLY_AS_FIRST=0 - return 0 - fi - HELP_ONLY_AS_FIRST=0 - ;; - temporary) - _nmcli_array_delete_at words 0 - ;; - mode) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "tabular multiline" - return 0 - fi - _nmcli_array_delete_at words 0 1 - ;; - colors) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "yes no auto" - return 0 - fi - _nmcli_array_delete_at words 0 1 - ;; - fields) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "all common - NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH - connection 802-3-ethernet 802-1x 802-11-wireless 802-11-wireless-security ipv4 ipv6 serial ppp pppoe gsm cdma bluetooth 802-11-olpc-mesh vpn wimax infiniband bond vlan adsl bridge bridge-port team team-port dcb tun ip-tunnel macvlan vxlan - GENERAL IP4 DHCP4 IP6 DHCP6 VPN - profile active" - return 0 - fi - _nmcli_array_delete_at words 0 1 - ;; - escape) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "no yes" - return 0 - fi - _nmcli_array_delete_at words 0 1 - ;; - wait) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "" - return 0 - fi - _nmcli_array_delete_at words 0 1 - ;; - *) - # something unexpected. We are finished with parsing the OPTIONS. - return 2 - ;; - esac - done -} - -# after the OPTIONS, the OBJECT, the COMMAND and possible the COMMAND_CONNECTION, the syntax for nmcli -# expects several options with parameters. This function can parse them and remove them from the words array. -_nmcli_compl_ARGS() -{ - local aliases=${@} - local OPTIONS_ALL N_REMOVE_WORDS REMOVE_OPTIONS OPTIONS_HAS_MANDATORY i - OPTIONS_ALL=("${OPTIONS[@]}") - OPTIONS_UNKNOWN_OPTION= - - OPTIONS_HAS_MANDATORY=0 - if [[ "${#OPTIONS_MANDATORY[@]}" -ge 1 ]]; then - OPTIONS_HAS_MANDATORY=1 - fi - - for (( ; ; )); do - if [[ "${#words[@]}" -le 1 ]]; then - # we have no more words left... - if [[ ${#OPTIONS[@]} -eq 0 ]]; then - return 1; - fi - if [[ "$COMMAND_ARGS_WAIT_OPTIONS" -ne 1 ]]; then - _nmcli_list "$(echo "${OPTIONS[@]}")" - return 0 - fi - COMMAND_ARGS_WAIT_OPTIONS=0 - return 1 - fi - if ! _nmcli_array_has_value OPTIONS_ALL "${words[0]}"; then - # This is an entirely unknown option. - OPTIONS_UNKNOWN_OPTION="?${words[0]}" - return 1 - fi - if [[ "$OPTIONS_HAS_MANDATORY" -eq 1 && "${#OPTIONS_MANDATORY[@]}" -eq 0 ]]; then - # we had some mandatory options, but they are all satisfied... stop here... - # This means, that we can continue with more additional options from the NEXT_GROUP. - return 1 - fi - - N_REMOVE_WORDS=2 - REMOVE_OPTIONS=("${words[0]}") - - # change option name to alias - WORD0="${words[0]}" - for alias in "${aliases[@]}" ; do - if [[ "${WORD0}" == ${alias%%:*} ]]; then - WORD0=${alias#*:} - break - fi - done - - case "${WORD0}" in - level) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "OFF ERR WARN INFO DEBUG TRACE KEEP" - return 0 - fi - ;; - domains) - if [[ "${#words[@]}" -eq 2 ]]; then - local OPTIONS_DOM=(ALL DEFAULT DHCP IP PLATFORM RFKILL ETHER WIFI BT MB DHCP4 DHCP6 PPP WIFI_SCAN IP4 IP6 AUTOIP4 DNS VPN SHARING SUPPLICANT AGENTS SETTINGS SUSPEND CORE DEVICE OLPC WIMAX INFINIBAND FIREWALL ADSL BOND VLAN BRIDGE DBUS_PROPS TEAM CONCHECK DCB DISPATCH AUDIT SYSTEMD VPN_PLUGIN) - if [[ "${words[1]}" != "" ]]; then - - # split the comma separaeted domain string into its parts LOGD - local oIFS="$IFS" - IFS="," - local LOGD=($(printf '%s' "${words[1]}" | sed 's/\(^\|,\)/,#/g')) - IFS="$oIFS" - unset oIFS - - local LOGDLAST LOGDLAST_IS_OPTION LOGDI i - # first we iterate over all present domains and remove them from OPTIONS_DOM - for LOGDI in ${LOGD[@]}; do - LOGDI="${LOGDI:1}" - LOGDLAST="$LOGDI" - LOGDLAST_IS_OPTION=0 - for i in ${!OPTIONS_DOM[*]}; do - if [[ "${OPTIONS_DOM[$i]}" = "$LOGDI" ]]; then - LOGDLAST_IS_OPTION=1 - unset OPTIONS_DOM[$i] - fi - done - done - - local OPTIONS_DOM2=() - if [[ "$LOGDLAST" = "" ]]; then - # we have a word that ends with ','. Just append all remaining options. - for i in ${!OPTIONS_DOM[*]}; do - OPTIONS_DOM2[${#OPTIONS_DOM2[@]}]="${words[1]}${OPTIONS_DOM[$i]}" - done - else - # if the last option is not "" we keep only those option with the same prefix - # as the last domain (LOGDLAST) - for i in ${!OPTIONS_DOM[*]}; do - if [[ "${OPTIONS_DOM[$i]:0:${#LOGDLAST}}" == "$LOGDLAST" ]]; then - # modify the option with the present prefix - OPTIONS_DOM2[${#OPTIONS_DOM2[@]}]="${words[1]}${OPTIONS_DOM[$i]:${#LOGDLAST}}" - fi - done - - if [[ $LOGDLAST_IS_OPTION -eq 1 ]]; then - # if the last logd itself was a valid iption, ${words[1]} is itself a valid match - OPTIONS_DOM2[${#OPTIONS_DOM2[@]}]="${words[1]}" - - # also, add all remaining options by comma separated to the word. - for i in ${!OPTIONS_DOM[*]}; do - OPTIONS_DOM2[${#OPTIONS_DOM2[@]}]="${words[1]},${OPTIONS_DOM[$i]}" - done - fi - if [[ ${#OPTIONS_DOM2[@]} -eq 1 ]]; then - for i in ${!OPTIONS_DOM[*]}; do - if [[ "$LOGDLAST" != "${OPTIONS_DOM[$i]:0:${#LOGDLAST}}" ]]; then - OPTIONS_DOM2[${#OPTIONS_DOM2[@]}]="${OPTIONS_DOM2[0]},${OPTIONS_DOM[$i]}" - fi - done - fi - - fi - OPTIONS_DOM=(${OPTIONS_DOM2[@]}) - fi - - _nmcli_list "$(echo "${OPTIONS_DOM[@]}")" - return 0 - fi - ;; - type) - if [[ "$OPTIONS_TYPE" != "" ]]; then - return 1 - fi - if [[ "${#words[@]}" -eq 2 ]]; then - if [[ "${words[1]:0:1}" = "8" ]]; then - # usually we don't want to show the 802-x types (because the shorter aliases are more - # user friendly. Only complete them, if the current word already starts with an "8". - _nmcli_list "802-3-ethernet 802-11-wireless 802-11-olpc-mesh" - else - _nmcli_list "ethernet wifi wimax gsm cdma infiniband bluetooth vpn olpc-mesh vlan bond bridge team pppoe adsl tun ip-tunnel macvlan vxlan" - fi - return 0 - fi - OPTIONS_TYPE="${words[1]}" - - if [[ "x$OPTIONS_MANDATORY_IFNAME" != x ]]; then - # the ifname is not a mandatory option for a few connection types... - # Check, if we have such a 'type' and remove the 'ifname' from the list - # of mandatory options. - case "$OPTIONS_TYPE" in - vl|vla|vlan| \ - bond| \ - team| \ - bridge) - for i in ${!OPTIONS_MANDATORY[*]}; do - if [[ "${OPTIONS_MANDATORY[$i]}" = "ifname" ]]; then - unset OPTIONS_MANDATORY[$i] - fi - done - ;; - *) - ;; - - esac - OPTIONS_MANDATORY_IFNAME= - fi - ;; - master) - if [[ "${#words[@]}" -eq 2 ]]; then - if [[ "${words[1]}" = "" ]]; then - _nmcli_list_nl "$(_nmcli_dev_status DEVICE)" - else - _nmcli_list_nl "$(printf "%s\n%s\n%s" "$(_nmcli_dev_status DEVICE)" "$(_nmcli_con_show UUID)")" - fi - return 0 - fi - ;; - dev) - if [[ "${#words[@]}" -eq 2 ]]; then - if [[ "${words[1]}" = "" ]]; then - _nmcli_list_nl "$(_nmcli_dev_status DEVICE)" - else - _nmcli_list_nl "$(printf "%s\n%s\n%s" "$(_nmcli_dev_status DEVICE)" "$(_nmcli_wifi_list BSSID)" "$(_nmcli_con_show UUID)")" - fi - return 0 - fi - ;; - primary| \ - ifname) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list_nl "$(_nmcli_dev_status DEVICE)" - return 0 - fi - ;; - mode) - if [[ "${#words[@]}" -eq 2 ]]; then - case "$OPTIONS_TYPE" in - "wifi") - _nmcli_list "infrastructure ap adhoc" - ;; - "tun") - _nmcli_list "tun tap" - ;; - "ip-tunnel") - _nmcli_list "ipip gre sit isatap vti ip6ip6 ipip6 ip6gre vti6" - ;; - "macvlan") - _nmcli_list "vepa bridge private passthru source" - ;; - "bond"| \ - *) - _nmcli_list "balance-rr active-backup balance-xor broadcast 802.3ad balance-tlb balance-alb" - esac - return 0 - fi - ;; - transport-mode) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "datagram connected" - return 0 - fi - ;; - vpn-type) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "vpnc openvpn pptp openconnect openswan libreswan strongswan ssh l2tp iodine fortisslvpn" - return 0 - fi - ;; - slave-type) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "bond team bridge" - return 0 - fi - ;; - lacp-rate) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "slow fast" - return 0 - fi - ;; - bt-type) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "panu dun-gsm dun-cdma" - return 0 - fi - ;; - wep-key-type) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "key phrase" - return 0 - fi - ;; - managed| \ - autoconnect| \ - stp| \ - hairpin| \ - save| \ - hidden| \ - private| \ - pi| \ - vnet-hdr| \ - multi-queue|\ - tap) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "yes no" - return 0 - fi - ;; - config) - if [[ "${#words[@]}" -eq 2 ]]; then - compopt -o default - COMPREPLY=() - return 0 - fi - ;; - ip4| \ - ip6| \ - gw4| \ - gw6| \ - priority| \ - forward-delay| \ - hello-time| \ - max-age| \ - ageing-time| \ - nsp| \ - path-cost| \ - name| \ - mtu| \ - cloned-mac| \ - addr| \ - parent| \ - miimon| \ - arp-interval| \ - arp-ip-target| \ - downdelay| \ - updelay| \ - p-key| \ - mac| \ - id| \ - flags| \ - ingress| \ - dhcp-anycast| \ - channel| \ - egress| \ - apn| \ - con-name| \ - user| \ - username| \ - service| \ - password) - if [[ "${#words[@]}" -eq 2 ]]; then - return 0 - fi - ;; - passwd-file| \ - file) - if [[ "${#words[@]}" -eq 2 ]]; then - compopt -o default - COMPREPLY=() - return 0 - fi - ;; - ssid) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list_nl "$(_nmcli_wifi_list SSID)" - return 0 - fi - ;; - ap| \ - bssid) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list_nl "$(_nmcli_wifi_list BSSID)" - return 0 - fi - ;; - encapsulation) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "vcmux llc" - return 0 - fi - ;; - protocol) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "pppoa pppoe ipoatm" - return 0 - fi - ;; - band) - if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "a bg" - return 0 - fi - ;; - *) - return 1 - ;; - esac - - - if [[ "${#OPTIONS_NEXT_GROUP[@]}" -gt 0 ]]; then - if _nmcli_array_has_value OPTIONS_NEXT_GROUP "${words[0]}"; then - # the current value is from the next group... - # We back off, because the current group is complete. - return 1 - fi - fi - - _nmcli_array_delete_at words 0 $((N_REMOVE_WORDS-1)) - # remove the options already seen. - for i in ${!OPTIONS[*]}; do - if [[ "${OPTIONS[$i]}" = "${REMOVE_OPTIONS[0]}" || "${OPTIONS[$i]}" = "${REMOVE_OPTIONS[1]}" ]]; then - if ! _nmcli_array_has_value OPTIONS_REPEATABLE "${OPTIONS[$i]}" ; then - unset OPTIONS[$i] - fi - fi - done - for i in ${!OPTIONS_MANDATORY[*]}; do - if [[ "${OPTIONS_MANDATORY[$i]}" = "${REMOVE_OPTIONS[0]}" || "${OPTIONS_MANDATORY[$i]}" = "${REMOVE_OPTIONS[1]}" ]]; then - unset OPTIONS_MANDATORY[$i] - fi - done - done -} - -# some commands expect a connection as parameter. This connection can either be given -# as id|uuid|path|apath. Parse that connection parameter. -# Actually, it can also ask for a device name, like `nmcli device set [ifname] ` -_nmcli_compl_ARGS_CONNECTION() -{ - if ! _nmcli_array_has_value OPTIONS "${words[0]}"; then - COMMAND_CONNECTION_TYPE= - COMMAND_CONNECTION_ID="${words[0]}" - _nmcli_array_delete_at words 0 - return 1 - fi - COMMAND_CONNECTION_TYPE="${words[0]}" - COMMAND_CONNECTION_ID="${words[1]}" - local CON_TYPE= - if [[ "x$COMMAND_CONNECTION_ACTIVE" != x ]]; then - CON_TYPE=--active - fi - case "${words[0]}" in - id) - if [[ ${#words[@]} -le 2 ]]; then - _nmcli_list_nl "$(_nmcli_con_show NAME $CON_TYPE)" - return 0 - fi - _nmcli_array_delete_at words 0 1 - ;; - uuid) - if [[ ${#words[@]} -le 2 ]]; then - _nmcli_list_nl "$(_nmcli_con_show UUID $CON_TYPE)" - return 0 - fi - _nmcli_array_delete_at words 0 1 - ;; - path) - if [[ ${#words[@]} -le 2 ]]; then - _nmcli_list_nl "$(_nmcli_con_show DBUS-PATH $CON_TYPE)" - return 0 - fi - _nmcli_array_delete_at words 0 1 - ;; - apath) - if [[ ${#words[@]} -le 2 ]]; then - _nmcli_list_nl "$(_nmcli_con_show ACTIVE-PATH --active)" - return 0 - fi - _nmcli_array_delete_at words 0 1 - ;; - ifname) - if [[ ${#words[@]} -le 2 ]]; then - _nmcli_list_nl "$(_nmcli_dev_status DEVICE)" - return 0 - fi - _nmcli_array_delete_at words 0 1 - ;; - *) - COMMAND_CONNECTION_TYPE= - COMMAND_CONNECTION_ID="${words[0]}" - _nmcli_array_delete_at words 0 - ;; - esac - return 1 -} - -_nmcli_compl_COMMAND() { - local command="$1" - shift - local V=("$@") - local H= - if [[ "${command[0]:0:1}" != '-' ]]; then - H=help - elif [[ "${command[0]:1:1}" == '-' || "${command[0]}" == "-" ]]; then - H=--help - else - H=-help - fi - if [[ "x$COMPL_COMMAND_NO_HELP" == x ]]; then - V=("${V[@]}" "$H") - fi - _nmcli_list "${V[*]}" -} - -_nmcli_compl_COMMAND_nl() { - local command="$1" - local a="$2" - shift - shift - local V=("$@") - local H= - if [[ "${command[0]:0:1}" != '-' ]]; then - V=("${V[@]/#/--}") - H=help - elif [[ "${command[0]:1:1}" == '-' || "${command[0]}" == "-" ]]; then - V=("${V[@]/#/--}") - H=--help - else - V=("${V[@]/#/-}") - H=-help - fi - if [[ "x$COMPL_COMMAND_NO_HELP" == x ]]; then - V=("${V[@]}" "$H") - fi - local IFS=$'\n' - V="${V[*]}" - _nmcli_list_nl "$(printf "%s%s\n%s" "" "$V" "$a")" -} - -_nmcli_compl_PROPERTIES() -{ - while [[ ${#words[@]} -gt 0 ]]; do - if [[ ${#words[@]} -eq 1 ]]; then - _nmcli_list_nl "$(nmcli --complete-args connection modify "$@" "${words[@]}" 2>/dev/null)" - return 0 - fi - _nmcli_array_delete_at words 0 1 - done - return 0 -} - -_nmcli() -{ - local cur prev words cword i - _init_completion || return - - # we don't care about any arguments after the current cursor position - # because we only parse from left to right. So, if there are some arguments - # right of the cursor, just ignore them. Also don't care about ${words[0]}. - _nmcli_array_delete_at words $((cword+1)) ${#words[@]} - _nmcli_array_delete_at words 0 - - # _init_completion returns the words with all the quotes and escaping - # characters. We don't care about them, drop them at first. - for i in ${!words[@]}; do - words[i]="$(printf '%s' "${words[i]}" | xargs printf '%s\n' 2>/dev/null || true)" - done - - # In case the cursor is not at the end of the line, - # $cur consists of spaces that we want do remove. - # For example: `nmcli connection modify id lo` - if [[ "$cur" =~ ^[[:space:]]+ ]]; then - cur='' - fi - - local OPTIONS OPTIONS_UNKNOWN_OPTION OPTIONS_TYPE OPTIONS_TYPED OPTIONS_IP OPTIONS_NEXT_GROUP \ - OPTIONS_SEP OPTIONS_REPEATABLE OPTIONS_MANDATORY OPTIONS_MANDATORY_IFNAME \ - COMMAND_ARGS_WAIT_OPTIONS COMMAND_CONNECTION_TYPE COMMAND_CONNECTION_ID \ - COMMAND_CONNECTION_ACTIVE="" HELP_ONLY_AS_FIRST="" \ - LONG_OPTIONS=(terse pretty mode fields colors escape ask show-secrets wait version help) - - _nmcli_compl_OPTIONS - i=$? - - case $i in - 0) - # We have just completed an option or got an --help: terminate. - return 0 - ;; - 1) - # we show for completion either the (remaining) OPTIONS - # (if the current word starts with a dash) or the OBJECT list - # otherwise. - if [[ "${words[0]:0:1}" != '-' ]]; then - OPTIONS=(help general networking radio connection device agent monitor) - elif [[ "${words[0]:1:1}" == '-' || "${words[0]}" == "-" ]]; then - OPTIONS=("${LONG_OPTIONS[@]/#/--}") - else - OPTIONS=("${LONG_OPTIONS[@]/#/-}") - fi - _nmcli_list "${OPTIONS[*]}" - return 0 - ;; - esac - - local command="${words[1]}" - case "${words[0]}" in - h|he|hel|help) - ;; - g|ge|gen|gene|gener|genera|general) - if [[ ${#words[@]} -eq 2 ]]; then - _nmcli_compl_COMMAND "$command" status permissions logging hostname - elif [[ ${#words[@]} -gt 2 ]]; then - case "$command" in - ho|hos|host|hostn|hostna|hostnam|hostname) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" \ - "$(printf '%s\n%s\n%s\n' \ - "$(nmcli general hostname 2>/dev/null)" \ - "$(cat /etc/hostname 2>/dev/null)" \ - "$(hostnamectl status 2>/dev/null | sed -n '1s/^.\+hostname: \(.\+\)$/\1/p')" \ - "$HOSTNAME")" - fi - ;; - l|lo|log|logg|loggi|loggin|logging) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND "${words[2]}" level domains - else - _nmcli_array_delete_at words 0 1 - OPTIONS=(level domains) - _nmcli_compl_ARGS - fi - ;; - s|st|sta|stat|statu|status| \ - p|pe|per|perm|permi|permis|permiss|permissi|permissio|permission|permissions) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND "${words[2]}" - fi - ;; - esac - fi - ;; - n|ne|net|netw|netwo|networ|network|networki|networkin|networking) - if [[ ${#words[@]} -eq 2 ]]; then - _nmcli_compl_COMMAND "$command" on off connectivity - elif [[ ${#words[@]} -eq 3 ]]; then - case "$command" in - c|co|con|conn|conne|connec|connect|connecti|connectiv|connectivi|connectivit|connectivity) - _nmcli_compl_COMMAND "${words[2]}" "check" - ;; - esac - fi - ;; - r|ra|rad|radi|radio) - if [[ ${#words[@]} -eq 2 ]]; then - _nmcli_compl_COMMAND "$command" all wifi wwan - elif [[ ${#words[@]} -eq 3 ]]; then - case "$command" in - a|al|all | w|wi|wif|wifi | ww|wwa|wwan) - _nmcli_compl_COMMAND "${words[2]}" "on off" - ;; - esac - fi - ;; - c|co|con|conn|conne|connec|connect|connecti|connectio|connection) - if [[ ${#words[@]} -eq 2 ]]; then - _nmcli_compl_COMMAND "$command" show up down add modify clone edit delete monitor reload load import export - elif [[ ${#words[@]} -gt 2 ]]; then - case "$command" in - s|sh|sho|show) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\napath\n%s" "$(_nmcli_con_show NAME)")" active order - elif [[ ${#words[@]} -gt 3 ]]; then - _nmcli_array_delete_at words 0 1 - - LONG_OPTIONS=(help active order) - HELP_ONLY_AS_FIRST=1 - _nmcli_compl_OPTIONS - i=$? - - if ! _nmcli_array_has_value LONG_OPTIONS active; then - COMMAND_CONNECTION_ACTIVE=1 - fi - - case $i in - 0) - return 0 - ;; - 1) - if [[ "$HELP_ONLY_AS_FIRST" == 1 ]]; then - if [[ "x$COMMAND_CONNECTION_ACTIVE" = x ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\napath\n%s" "$(_nmcli_con_show NAME)")" "${LONG_OPTIONS[@]}" - - else - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\napath\n%s" "$(_nmcli_con_show NAME --active)")" "${LONG_OPTIONS[@]}" - fi - fi - return 0 - ;; - esac - - OPTIONS=(id uuid path apath) - while [[ ${#words[@]} -gt 0 ]]; do - _nmcli_compl_ARGS_CONNECTION && return 0 - done - if [[ "x$COMMAND_CONNECTION_ACTIVE" = x ]]; then - _nmcli_list_nl "$(printf "id\nuuid\npath\napath\n%s" "$(_nmcli_con_show NAME)")" - else - _nmcli_list_nl "$(printf "id\nuuid\npath\napath\n%s" "$(_nmcli_con_show NAME --active)")" - fi - fi - ;; - u|up) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "ifname\nid\nuuid\npath\n%s" "$(_nmcli_con_show NAME)")" - elif [[ ${#words[@]} -gt 3 ]]; then - _nmcli_array_delete_at words 0 1 - - LONG_OPTIONS=(help) - HELP_ONLY_AS_FIRST=1 - _nmcli_compl_OPTIONS - - case $? in - 0) - return 0 - ;; - 1) - if [[ "$HELP_ONLY_AS_FIRST" == 1 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "ifname\nid\nuuid\npath\n%s" "$(_nmcli_con_show NAME)")" "${LONG_OPTIONS[@]}" - fi - return 0 - ;; - esac - - local COMMAND_CONNECTION_TYPE='' - OPTIONS=(ifname id uuid path) - _nmcli_compl_ARGS_CONNECTION && return 0 - - if [[ "$COMMAND_CONNECTION_TYPE" = "ifname" ]]; then - OPTIONS=(ap nsp passwd-file) - else - OPTIONS=(ifname ap nsp passwd-file) - fi - _nmcli_compl_ARGS - fi - ;; - d|do|dow|down) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\napath\n%s" "$(_nmcli_con_show NAME --active)")" - elif [[ ${#words[@]} -gt 3 ]]; then - _nmcli_array_delete_at words 0 1 - - LONG_OPTIONS=(help) - HELP_ONLY_AS_FIRST=1 - _nmcli_compl_OPTIONS - case $? in - 0) - return 0 - ;; - 1) - if [[ "$HELP_ONLY_AS_FIRST" == 1 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\napath\n%s" "$(_nmcli_con_show NAME --active)")" "${LONG_OPTIONS[@]}" - fi - return 0 - ;; - esac - - OPTIONS=(id uuid path apath) - COMMAND_CONNECTION_ACTIVE=1 - _nmcli_compl_ARGS_CONNECTION && return 0 - fi - ;; - a|ad|add) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(nmcli --complete-args connection add "" 2>/dev/null)" - else - _nmcli_array_delete_at words 0 1 - _nmcli_list_nl "$(nmcli --complete-args connection add "${words[@]}" 2>/dev/null)" - fi - ;; - e|ed|edi|edit) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\ntype\ncon-name\n%s" "$(_nmcli_con_show NAME)")" - elif [[ ${#words[@]} -gt 3 ]]; then - _nmcli_array_delete_at words 0 1 - - LONG_OPTIONS=(help) - HELP_ONLY_AS_FIRST=1 - _nmcli_compl_OPTIONS - - case $? in - 0) - return 0 - ;; - 1) - if [[ "$HELP_ONLY_AS_FIRST" == 1 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\ntype\ncon-name\n%s" "$(_nmcli_con_show NAME)")" "${LONG_OPTIONS[@]}" - fi - return 0 - ;; - esac - - if [[ "${words[0]}" = 'type' || "${words[0]}" = 'con-name' ]]; then - OPTIONS=(type con-name) - _nmcli_compl_ARGS - else - OPTIONS=(id uuid path apath) - _nmcli_compl_ARGS_CONNECTION - fi - fi - ;; - m|mo|mod|modi|modif|modify) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\n%s" "$(_nmcli_con_show NAME)")" temporary - elif [[ ${#words[@]} -gt 3 ]]; then - _nmcli_array_delete_at words 0 1 - - LONG_OPTIONS=(help temporary) - HELP_ONLY_AS_FIRST=1 - _nmcli_compl_OPTIONS - case $? in - 0) - return 0 - ;; - 1) - if [[ "$HELP_ONLY_AS_FIRST" == 1 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\n%s" "$(_nmcli_con_show NAME)")" "${LONG_OPTIONS[@]}" - fi - return 0 - ;; - esac - - OPTIONS=(id uuid path) - _nmcli_compl_ARGS_CONNECTION && return 0 - - _nmcli_compl_PROPERTIES ${COMMAND_CONNECTION_TYPE} "$COMMAND_CONNECTION_ID" - - return 0 - fi - ;; - c|cl|clo|clon|clone) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\n%s" "$(_nmcli_con_show NAME)")" temporary - elif [[ ${#words[@]} -gt 3 ]]; then - _nmcli_array_delete_at words 0 1 - - LONG_OPTIONS=(help temporary) - HELP_ONLY_AS_FIRST=1 - _nmcli_compl_OPTIONS - case $? in - 0) - return 0 - ;; - 1) - if [[ "$HELP_ONLY_AS_FIRST" == 1 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\n%s" "$(_nmcli_con_show NAME)")" "${LONG_OPTIONS[@]}" - fi - return 0 - ;; - esac - - OPTIONS=(id uuid path) - _nmcli_compl_ARGS_CONNECTION && return 0 - - return 0 - fi - ;; - - de|del|dele|delet|delete| \ - mon|moni|monit|monito|monitor) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\n%s" "$(_nmcli_con_show NAME)")" - elif [[ ${#words[@]} -gt 3 ]]; then - _nmcli_array_delete_at words 0 1 - - LONG_OPTIONS=(help) - _nmcli_compl_OPTIONS - case $? in - 0) - return 0 - ;; - 1) - if ! _nmcli_array_has_value LONG_OPTIONS "help"; then - return 0 - fi - ;; - esac - - OPTIONS=(id uuid path apath) - while [[ ${#words[@]} -gt 0 ]]; do - _nmcli_compl_ARGS_CONNECTION && return 0 - done - _nmcli_list_nl "$(printf "id\nuuid\npath\n%s" "$(_nmcli_con_show NAME)")" - fi - ;; - l|lo|loa|load) - if [[ ${#words[@]} -gt 2 ]]; then - # we should also complete for help/--help, but who to mix that - # with file name completion? - compopt -o default - COMPREPLY=() - fi - ;; - i|im|imp|impo|impor|import) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND "${words[2]}" type file --temporary - elif [[ ${#words[@]} -gt 3 ]]; then - _nmcli_array_delete_at words 0 1 - - LONG_OPTIONS=(help temporary) - HELP_ONLY_AS_FIRST=1 - _nmcli_compl_OPTIONS - case $? in - 0) - return 0 - ;; - 1) - if [[ "$HELP_ONLY_AS_FIRST" == 1 ]]; then - _nmcli_compl_COMMAND "${words[2]}" type file - fi - return 0 - ;; - esac - - OPTIONS=(type file) - OPTIONS_MANDATORY=(type file) - _nmcli_compl_ARGS type:vpn-type - return 0 - fi - ;; - e|ex|exp|expo|expor|export) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\n%s" "$(_nmcli_con_show NAME)")" - elif [[ ${#words[@]} -gt 3 ]]; then - _nmcli_array_delete_at words 0 1 - - LONG_OPTIONS=(help) - HELP_ONLY_AS_FIRST=1 - _nmcli_compl_OPTIONS - case $? in - 0) - return 0 - ;; - 1) - if [[ "$HELP_ONLY_AS_FIRST" == 1 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\n%s" "$(_nmcli_con_show NAME)")" "${LONG_OPTIONS[@]}" - fi - return 0 - ;; - esac - - OPTIONS=(id uuid path) - _nmcli_compl_ARGS_CONNECTION && return 0 - return 0 - fi - ;; - - esac - fi - ;; - d|de|dev|devi|devic|device) - if [[ ${#words[@]} -eq 2 ]]; then - _nmcli_compl_COMMAND "$command" status show connect reapply modify disconnect delete monitor wifi set lldp - elif [[ ${#words[@]} -gt 2 ]]; then - case "$command" in - s|st|sta|stat|statu|status) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND "${words[2]}" - fi - ;; - sh|sho|show| \ - r|re|rea|reap|reapp|reappl|reapply| \ - c|co|con|conn|conne|connec|connect) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(_nmcli_dev_status DEVICE)" - fi - ;; - mod|modi|modif|modify) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(nmcli --complete-args device modify "" 2>/dev/null)" - else - _nmcli_array_delete_at words 0 1 - _nmcli_list_nl "$(nmcli --complete-args device modify "${words[@]}" 2>/dev/null)" - fi - ;; - d|di|dis|disc|disco|discon|disconn|disconne|disconnec|disconnect| \ - de|del|dele|delet|delete| \ - m|mo|mon|moni|monit|monito|monitor) - if [[ ${#words[@]} -ge 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(_nmcli_dev_status DEVICE)" - fi - ;; - se|set) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "ifname\n%s" "$(_nmcli_dev_status DEVICE)")" - else - _nmcli_array_delete_at words 0 1 - OPTIONS=(ifname) - _nmcli_compl_ARGS_CONNECTION && return 0 - OPTIONS=(autoconnect managed) - _nmcli_compl_ARGS - fi - ;; - w|wi|wif|wifi) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND "${words[2]}" list connect hotspot rescan - else - case "${words[2]}" in - l|li|lis|list) - _nmcli_array_delete_at words 0 2 - OPTIONS=(ifname bssid) - _nmcli_compl_ARGS - ;; - c|co|con|conn|conne|connec|connect) - if [[ ${#words[@]} -eq 4 ]]; then - if [[ "${words[3]}" = "" ]]; then - _nmcli_list_nl "$(_nmcli_wifi_list SSID)" - else - _nmcli_list_nl "$(printf "%s\n%s" "$(_nmcli_wifi_list SSID)" "$(_nmcli_wifi_list BSSID)")" - fi - else - _nmcli_array_delete_at words 0 3 - local OPTIONS=(password wep-key-type ifname bssid name private hidden) - _nmcli_compl_ARGS - fi - ;; - h|ho|hot|hots|hotsp|hotspo|hotspot) - _nmcli_array_delete_at words 0 2 - OPTIONS=(ifname con-name ssid band channel password) - _nmcli_compl_ARGS - ;; - r|re|res|resc|resca|rescan) - _nmcli_array_delete_at words 0 2 - OPTIONS_REPEATABLE=(ssid) - OPTIONS=(ifname ssid) - _nmcli_compl_ARGS - ;; - esac - fi - ;; - l|ll|lld|lldp) - if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND "${words[2]}" list - else - case "${words[2]}" in - l|li|lis|list) - _nmcli_array_delete_at words 0 2 - OPTIONS=(ifname) - _nmcli_compl_ARGS - ;; - esac - fi - ;; - esac - fi - ;; - a|ag|age|agen|agent) - if [[ ${#words[@]} -eq 2 ]]; then - _nmcli_compl_COMMAND "$command" secret polkit all - fi - ;; - m|mo|mon|moni|monit|monito|monitor) - ;; - esac - return 0 } && complete -F _nmcli nmcli diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 5c47e440..b8019403 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -63,6 +63,8 @@ typedef struct { GMainLoop *loop = NULL; struct termios termios_orig; +NM_CACHED_QUARK_FCN ("nmcli-error-quark", nmcli_error_quark) + static void complete_field (GHashTable *h, const char *setting, NmcOutputField field[]) { @@ -89,7 +91,7 @@ complete_one (gpointer key, gpointer value, gpointer user_data) else last = prefix; - if ((!*last && !strchr (name, '.')) || matches (last, name) == 0) { + if ((!*last && !strchr (name, '.')) || matches (last, name)) { g_print ("%.*s%s%s\n", (int)(last-prefix), prefix, name, strcmp (last, name) == 0 ? "," : ""); } @@ -129,12 +131,12 @@ complete_fields (const char *prefix) complete_field (h, NULL, nmc_fields_dev_lldp_list); complete_field (h, "connection", nmc_fields_setting_connection); - complete_field (h, "wired", nmc_fields_setting_wired); - complete_field (h, "8021X", nmc_fields_setting_8021X); - complete_field (h, "wireless", nmc_fields_setting_wireless); - complete_field (h, "wireless_security", nmc_fields_setting_wireless_security); - complete_field (h, "ip4-config", nmc_fields_setting_ip4_config); - complete_field (h, "ip6-config", nmc_fields_setting_ip6_config); + complete_field (h, "802-3-ethernet", nmc_fields_setting_wired); + complete_field (h, "802-1x", nmc_fields_setting_8021X); + complete_field (h, "802-11-wireless", nmc_fields_setting_wireless); + complete_field (h, "802-11-wireless-security", nmc_fields_setting_wireless_security); + complete_field (h, "ipv4", nmc_fields_setting_ip4_config); + complete_field (h, "ipv6", nmc_fields_setting_ip6_config); complete_field (h, "serial", nmc_fields_setting_serial); complete_field (h, "ppp", nmc_fields_setting_ppp); complete_field (h, "pppoe", nmc_fields_setting_pppoe); @@ -142,7 +144,7 @@ complete_fields (const char *prefix) complete_field (h, "gsm", nmc_fields_setting_gsm); complete_field (h, "cdma", nmc_fields_setting_cdma); complete_field (h, "bluetooth", nmc_fields_setting_bluetooth); - complete_field (h, "olpc-mesh", nmc_fields_setting_olpc_mesh); + complete_field (h, "802-11-olpc-mesh", nmc_fields_setting_olpc_mesh); complete_field (h, "vpn", nmc_fields_setting_vpn); complete_field (h, "wimax", nmc_fields_setting_wimax); complete_field (h, "infiniband", nmc_fields_setting_infiniband); @@ -151,7 +153,7 @@ complete_fields (const char *prefix) complete_field (h, "bridge", nmc_fields_setting_bridge); complete_field (h, "bridge-port", nmc_fields_setting_bridge_port); complete_field (h, "team", nmc_fields_setting_team); - complete_field (h, "team0port", nmc_fields_setting_team_port); + complete_field (h, "team-port", nmc_fields_setting_team_port); complete_field (h, "dcb", nmc_fields_setting_dcb); complete_field (h, "tun", nmc_fields_setting_tun); complete_field (h, "ip-tunnel", nmc_fields_setting_ip_tunnel); @@ -163,35 +165,24 @@ complete_fields (const char *prefix) } -/* Get an error quark for use with GError */ -GQuark -nmcli_error_quark (void) -{ - static GQuark error_quark = 0; - - if (G_UNLIKELY (error_quark == 0)) - error_quark = g_quark_from_static_string ("nmcli-error-quark"); - - return error_quark; -} - static void usage (void) { g_printerr (_("Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n" "\n" "OPTIONS\n" - " -t[erse] terse output\n" - " -p[retty] pretty output\n" - " -m[ode] tabular|multiline output mode\n" - " -c[olors] auto|yes|no whether to use colors in output\n" - " -f[ields] |all|common specify fields to output\n" - " -e[scape] yes|no escape columns separators in values\n" - " -a[sk] ask for missing parameters\n" - " -s[how-secrets] allow displaying passwords\n" - " -w[ait] set timeout waiting for finishing operations\n" - " -v[ersion] show program version\n" - " -h[elp] print this help\n" + " -t[erse] terse output\n" + " -p[retty] pretty output\n" + " -m[ode] tabular|multiline output mode\n" + " -c[olors] auto|yes|no whether to use colors in output\n" + " -f[ields] |all|common specify fields to output\n" + " -g[et-values] |all|common shortcut for -m tabular -t -f\n" + " -e[scape] yes|no escape columns separators in values\n" + " -a[sk] ask for missing parameters\n" + " -s[how-secrets] allow displaying passwords\n" + " -w[ait] set timeout waiting for finishing operations\n" + " -v[ersion] show program version\n" + " -h[elp] print this help\n" "\n" "OBJECT\n" " g[eneral] NetworkManager's general status and operations\n" @@ -228,9 +219,9 @@ process_command_line (NmCli *nmc, int argc, char **argv) if (argc > 1 && nm_streq (argv[1], "--complete-args")) { nmc->complete = TRUE; argv[1] = argv[0]; - argc--; argv++; + next_arg (nmc, &argc, &argv, NULL); } - argc--; argv++; + next_arg (nmc, &argc, &argv, NULL); /* parse options */ while (argc) { @@ -240,20 +231,20 @@ process_command_line (NmCli *nmc, int argc, char **argv) if (argc == 1 && nmc->complete) { nmc_complete_strings (opt, "--terse", "--pretty", "--mode", "--colors", "--escape", - "--fields", "--nocheck", "--ask", "--show-secrets", - "--wait", "--version", "--help", NULL); + "--fields", "--nocheck", "--get-values", + "--wait", "--version", "--help", NULL); } if (opt[1] == '-') { opt++; /* '--' ends options */ if (opt[1] == '\0') { - argc--; argv++; + next_arg (nmc, &argc, &argv, NULL); break; } } - if (matches (opt, "-terse") == 0) { + if (matches (opt, "-terse")) { if (nmc->print_output == NMC_PRINT_TERSE) { g_string_printf (nmc->return_text, _("Error: Option '--terse' is specified the second time.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; @@ -266,7 +257,7 @@ process_command_line (NmCli *nmc, int argc, char **argv) } else nmc->print_output = NMC_PRINT_TERSE; - } else if (matches (opt, "-pretty") == 0) { + } else if (matches (opt, "-pretty")) { if (nmc->print_output == NMC_PRINT_PRETTY) { g_string_printf (nmc->return_text, _("Error: Option '--pretty' is specified the second time.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; @@ -279,62 +270,70 @@ process_command_line (NmCli *nmc, int argc, char **argv) } else nmc->print_output = NMC_PRINT_PRETTY; - } else if (matches (opt, "-mode") == 0) { + } else if (matches (opt, "-mode")) { nmc->mode_specified = TRUE; - if (next_arg (&argc, &argv) != 0) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return FALSE; } if (argc == 1 && nmc->complete) nmc_complete_strings (argv[0], "tabular", "multiline", NULL); - if (matches (argv[0], "tabular") == 0) + if (matches (argv[0], "tabular")) nmc->multiline_output = FALSE; - else if (matches (argv[0], "multiline") == 0) + else if (matches (argv[0], "multiline")) nmc->multiline_output = TRUE; else { g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[0], opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return FALSE; } - } else if (matches (opt, "-colors") == 0) { - if (next_arg (&argc, &argv) != 0) { + } else if (matches (opt, "-colors")) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return FALSE; } if (argc == 1 && nmc->complete) nmc_complete_strings (argv[0], "yes", "no", "auto", NULL); - if (matches (argv[0], "auto") == 0) + if (matches (argv[0], "auto")) nmc->use_colors = NMC_USE_COLOR_AUTO; - else if (matches (argv[0], "yes") == 0) + else if (matches (argv[0], "yes")) nmc->use_colors = NMC_USE_COLOR_YES; - else if (matches (argv[0], "no") == 0) + else if (matches (argv[0], "no")) nmc->use_colors = NMC_USE_COLOR_NO; else { g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[0], opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return FALSE; } - } else if (matches (opt, "-escape") == 0) { - if (next_arg (&argc, &argv) != 0) { + } else if (matches (opt, "-escape")) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return FALSE; } if (argc == 1 && nmc->complete) nmc_complete_strings (argv[0], "yes", "no", NULL); - if (matches (argv[0], "yes") == 0) + if (matches (argv[0], "yes")) nmc->escape_values = TRUE; - else if (matches (argv[0], "no") == 0) + else if (matches (argv[0], "no")) nmc->escape_values = FALSE; else { g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[0], opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return FALSE; } - } else if (matches (opt, "-fields") == 0) { - if (next_arg (&argc, &argv) != 0) { + } else if (matches (opt, "-fields")) { + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: fields for '%s' options are missing."), opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return FALSE; @@ -342,15 +341,31 @@ process_command_line (NmCli *nmc, int argc, char **argv) if (argc == 1 && nmc->complete) complete_fields (argv[0]); nmc->required_fields = g_strdup (argv[0]); - } else if (matches (opt, "-nocheck") == 0) { + } else if (matches (opt, "-get-values")) { + argc--; + argv++; + if (!argc) { + g_string_printf (nmc->return_text, _("Error: fields for '%s' options are missing."), opt); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + return FALSE; + } + if (argc == 1 && nmc->complete) + complete_fields (argv[0]); + nmc->required_fields = g_strdup (argv[0]); + nmc->print_output = NMC_PRINT_TERSE; + /* We want fixed tabular mode here, but just set the mode specified and rely on the initialization + * in nmc_init: in this way we allow use of "-m multiline" to swap the output mode also if placed + * before the "-g " option (-g may be still more practical and easy to remember than -t -f). + */ + nmc->mode_specified = TRUE; + } else if (matches (opt, "-nocheck")) { /* ignore for backward compatibility */ - } else if (matches (opt, "-ask") == 0) { - nmc->ask = TRUE; - } else if (matches (opt, "-show-secrets") == 0) { - nmc->show_secrets = TRUE; - } else if (matches (opt, "-wait") == 0) { + } else if (matches (opt, "-wait")) { unsigned long timeout; - if (next_arg (&argc, &argv) != 0) { + + argc--; + argv++; + if (!argc) { g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return FALSE; @@ -362,11 +377,11 @@ process_command_line (NmCli *nmc, int argc, char **argv) return FALSE; } nmc->timeout = (int) timeout; - } else if (matches (opt, "-version") == 0) { + } else if (matches (opt, "-version")) { if (!nmc->complete) g_print (_("nmcli tool, version %s\n"), NMCLI_VERSION); return NMC_RESULT_SUCCESS; - } else if (matches (opt, "-help") == 0) { + } else if (matches (opt, "-help")) { if (!nmc->complete) usage (); return NMC_RESULT_SUCCESS; @@ -375,8 +390,7 @@ process_command_line (NmCli *nmc, int argc, char **argv) nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return FALSE; } - argc--; - argv++; + next_arg (nmc, &argc, &argv, NULL); } /* Now run the requested command */ diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index 30600d21..7e33e3a7 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -20,8 +20,8 @@ #ifndef NMC_NMCLI_H #define NMC_NMCLI_H -#include -#include +#include "NetworkManager.h" +#include "nm-secret-agent-old.h" #if WITH_POLKIT_AGENT #include "nm-polkit-listener.h" diff --git a/clients/cli/settings-docs.c b/clients/cli/settings-docs.c index 2520ba0e..3d9e7aa9 100644 --- a/clients/cli/settings-docs.c +++ b/clients/cli/settings-docs.c @@ -56,9 +56,14 @@ NmcPropertyDesc setting_802_11_wireless_security[] = { NmcPropertyDesc setting_802_1x[] = { { "altsubject-matches", "List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed." }, { "anonymous-identity", "Anonymous identity string for EAP authentication methods. Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS." }, + { "auth-timeout", "A timeout for the authentication. Zero means the global default; if the global default is not set, the authentication timeout is 25 seconds." }, { "ca-cert", "Contains the CA certificate if used by the EAP method specified in the \"eap\" property. Certificate data is specified using a \"scheme\"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string \"file://\" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended." }, + { "ca-cert-password", "The password used to access the CA certificate stored in \"ca-cert\" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login." }, + { "ca-cert-password-flags", "Flags indicating how to handle the \"ca-cert-password\" property." }, { "ca-path", "UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the \"ca-cert\" property." }, { "client-cert", "Contains the client certificate if used by the EAP method specified in the \"eap\" property. Certificate data is specified using a \"scheme\"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string \"file://\" and ending with a terminating NUL byte." }, + { "client-cert-password", "The password used to access the client certificate stored in \"client-cert\" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login." }, + { "client-cert-password-flags", "Flags indicating how to handle the \"client-cert-password\" property." }, { "domain-suffix-match", "Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server. If a matching dNSName is found, this constraint is met. If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison." }, { "eap", "The allowed EAP method to be used when authenticating to the network with 802.1x. Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", \"pwd\", and \"fast\". Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations." }, { "identity", "Identity string for EAP authentication methods. Often the user's user or login name." }, @@ -68,6 +73,7 @@ NmcPropertyDesc setting_802_1x[] = { { "password-flags", "Flags indicating how to handle the \"password\" property." }, { "password-raw", "Password used for EAP authentication methods, given as a byte array to allow passwords in other encodings than UTF-8 to be used. If both the \"password\" property and the \"password-raw\" property are specified, \"password\" is preferred." }, { "password-raw-flags", "Flags indicating how to handle the \"password-raw\" property." }, + { "phase1-auth-flags", "Specifies authentication flags to use in \"phase 1\" outer authentication using NMSetting8021xAuthFlags options. The invidual TLS versions can be explicitly disabled. If a certain TLS disable flag is not set, it is up to the supplicant to allow or forbid it. The TLS options map to tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more details." }, { "phase1-fast-provisioning", "Enables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the \"eap\" property. Recognized values are \"0\" (disabled), \"1\" (allow unauthenticated provisioning), \"2\" (allow authenticated provisioning), and \"3\" (allow both authenticated and unauthenticated provisioning). See the wpa_supplicant documentation for more details." }, { "phase1-peaplabel", "Forces use of the new PEAP label during key derivation. Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1. Set to \"1\" to force use of the new PEAP label. See the wpa_supplicant documentation for more details." }, { "phase1-peapver", "Forces which PEAP version is used when PEAP is set as the EAP method in the \"eap\" property. When unset, the version reported by the server will be used. Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version. To do so, this property may be set to \"0\" or \"1\" to force that specific PEAP version." }, @@ -75,16 +81,20 @@ NmcPropertyDesc setting_802_1x[] = { { "phase2-auth", "Specifies the allowed \"phase 2\" inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" property. Recognized non-EAP \"phase 2\" methods are \"pap\", \"chap\", \"mschap\", \"mschapv2\", \"gtc\", \"otp\", \"md5\", and \"tls\". Each \"phase 2\" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details." }, { "phase2-autheap", "Specifies the allowed \"phase 2\" inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" property. Recognized EAP-based \"phase 2\" methods are \"md5\", \"mschapv2\", \"otp\", \"gtc\", and \"tls\". Each \"phase 2\" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details." }, { "phase2-ca-cert", "Contains the \"phase 2\" CA certificate if used by the EAP method specified in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is specified using a \"scheme\"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string \"file://\" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended." }, + { "phase2-ca-cert-password", "The password used to access the \"phase2\" CA certificate stored in \"phase2-ca-cert\" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login." }, + { "phase2-ca-cert-password-flags", "Flags indicating how to handle the \"phase2-ca-cert-password\" property." }, { "phase2-ca-path", "UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the \"phase2-ca-cert\" property." }, { "phase2-client-cert", "Contains the \"phase 2\" client certificate if used by the EAP method specified in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is specified using a \"scheme\"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string \"file://\" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended." }, + { "phase2-client-cert-password", "The password used to access the \"phase2\" client certificate stored in \"phase2-client-cert\" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login." }, + { "phase2-client-cert-password-flags", "Flags indicating how to handle the \"phase2-client-cert-password\" property." }, { "phase2-domain-suffix-match", "Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server during the inner \"phase 2\" authentication. If a matching dNSName is found, this constraint is met. If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison." }, - { "phase2-private-key", "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or \"phase2-autheap\" property is set to \"tls\". Key data is specified using a \"scheme\"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string \"file://\" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the \"phase2-private-key-password\" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string \"file://\" and and ending with a terminating NUL byte, and as with the blob scheme the \"phase2-private-key-password\" property must be set to the password used to decode the PKCS#12 private key and certificate." }, + { "phase2-private-key", "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or \"phase2-autheap\" property is set to \"tls\". Key data is specified using a \"scheme\"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string \"file://\" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the \"phase2-private-key-password\" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string \"file://\" and ending with a terminating NUL byte, and as with the blob scheme the \"phase2-private-key-password\" property must be set to the password used to decode the PKCS#12 private key and certificate." }, { "phase2-private-key-password", "The password used to decrypt the \"phase 2\" private key specified in the \"phase2-private-key\" property when the private key either uses the path scheme, or is a PKCS#12 format key." }, { "phase2-private-key-password-flags", "Flags indicating how to handle the \"phase2-private-key-password\" property." }, { "phase2-subject-match", "Substring to be matched against the subject of the certificate presented by the authentication server during the inner \"phase 2\" authentication. When unset, no verification of the authentication server certificate's subject is performed. This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:phase2-domain-suffix-match." }, { "pin", "PIN used for EAP authentication methods." }, { "pin-flags", "Flags indicating how to handle the \"pin\" property." }, - { "private-key", "Contains the private key when the \"eap\" property is set to \"tls\". Key data is specified using a \"scheme\"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string \"file://\" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the \"private-key-password\" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string \"file://\" and and ending with a terminating NUL byte, and as with the blob scheme the \"private-key-password\" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: \"private-key\" is not a \"secret\" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users. Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data." }, + { "private-key", "Contains the private key when the \"eap\" property is set to \"tls\". Key data is specified using a \"scheme\"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string \"file://\" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the \"private-key-password\" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string \"file://\" and ending with a terminating NUL byte, and as with the blob scheme the \"private-key-password\" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: \"private-key\" is not a \"secret\" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users. Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data." }, { "private-key-password", "The password used to decrypt the private key specified in the \"private-key\" property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key." }, { "private-key-password-flags", "Flags indicating how to handle the \"private-key-password\" property." }, { "subject-match", "Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed. This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match." }, @@ -151,6 +161,7 @@ NmcPropertyDesc setting_bridge_port[] = { }; NmcPropertyDesc setting_cdma[] = { + { "mtu", "If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames." }, { "name", "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\"." }, { "number", "The number to dial to establish the connection to the CDMA-based mobile broadband network, if any. If not specified, the default number (#777) is used when required." }, { "password", "The password used to authenticate with the network, if required. Many providers do not require a password, or accept any password. But if a password is required, it is specified here." }, @@ -200,6 +211,10 @@ NmcPropertyDesc setting_dcb[] = { { "priority-traffic-class", "An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which the priority is mapped." }, }; +NmcPropertyDesc setting_dummy[] = { + { "name", "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\"." }, +}; + NmcPropertyDesc setting_generic[] = { { "name", "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\"." }, }; @@ -208,6 +223,7 @@ NmcPropertyDesc setting_gsm[] = { { "apn", "The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network. The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan. The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9." }, { "device-id", "The device unique identifier (as given by the WWAN management service) which this connection applies to. If given, the connection will only apply to the specified device." }, { "home-only", "When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made." }, + { "mtu", "If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames." }, { "name", "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\"." }, { "network-id", "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration. If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible." }, { "number", "Number to dial when establishing a PPP data session with the GSM-based mobile broadband network. Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically." }, @@ -379,6 +395,11 @@ NmcPropertyDesc setting_tun[] = { { "vnet-hdr", "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network header." }, }; +NmcPropertyDesc setting_user[] = { + { "data", "A dictionary of key/value pairs with user data. This data is ignored by NetworkManager and can be used at the users discretion. The keys only support a strict ascii format, but the values can be arbitrary UTF8 strings up to a certain length." }, + { "name", "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\"." }, +}; + NmcPropertyDesc setting_vlan[] = { { "egress-priority-map", "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities. The mapping is given in the format \"from:to\" where both \"from\" and \"to\" are unsigned integers, ie \"7:3\"." }, { "flags", "One or more flags which control the behavior and features of the VLAN interface. Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of output packet headers), NM_VLAN_FLAG_GVRP (0x2) (use of the GVRP protocol), and NM_VLAN_FLAG_LOOSE_BINDING (0x4) (loose binding of the interface to its master device's operating state). NM_VLAN_FLAG_MVRP (0x8) (use of the MVRP protocol). The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0." }, @@ -436,18 +457,19 @@ NmcSettingDesc all_settings[] = { { "802-11-olpc-mesh", setting_802_11_olpc_mesh, 4 }, { "802-11-wireless", setting_802_11_wireless, 17 }, { "802-11-wireless-security", setting_802_11_wireless_security, 18 }, - { "802-1x", setting_802_1x, 35 }, + { "802-1x", setting_802_1x, 45 }, { "802-3-ethernet", setting_802_3_ethernet, 15 }, { "adsl", setting_adsl, 8 }, { "bluetooth", setting_bluetooth, 3 }, { "bond", setting_bond, 2 }, { "bridge", setting_bridge, 9 }, { "bridge-port", setting_bridge_port, 4 }, - { "cdma", setting_cdma, 5 }, + { "cdma", setting_cdma, 6 }, { "connection", setting_connection, 20 }, { "dcb", setting_dcb, 16 }, + { "dummy", setting_dummy, 1 }, { "generic", setting_generic, 1 }, - { "gsm", setting_gsm, 13 }, + { "gsm", setting_gsm, 14 }, { "infiniband", setting_infiniband, 6 }, { "ip-tunnel", setting_ip_tunnel, 13 }, { "ipv4", setting_ipv4, 20 }, @@ -461,6 +483,7 @@ NmcSettingDesc all_settings[] = { { "team", setting_team, 2 }, { "team-port", setting_team_port, 2 }, { "tun", setting_tun, 7 }, + { "user", setting_user, 2 }, { "vlan", setting_vlan, 6 }, { "vpn", setting_vpn, 7 }, { "vxlan", setting_vxlan, 17 }, diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 1c8d5462..87b1f50f 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -128,35 +128,45 @@ NmcOutputField nmc_fields_setting_8021X[] = { SETTING_FIELD (NM_SETTING_802_1X_ANONYMOUS_IDENTITY), /* 3 */ SETTING_FIELD (NM_SETTING_802_1X_PAC_FILE), /* 4 */ SETTING_FIELD (NM_SETTING_802_1X_CA_CERT), /* 5 */ - SETTING_FIELD (NM_SETTING_802_1X_CA_PATH), /* 6 */ - SETTING_FIELD (NM_SETTING_802_1X_SUBJECT_MATCH), /* 7 */ - SETTING_FIELD (NM_SETTING_802_1X_ALTSUBJECT_MATCHES), /* 8 */ - SETTING_FIELD (NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH), /* 9 */ - SETTING_FIELD (NM_SETTING_802_1X_CLIENT_CERT), /* 10 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPVER), /* 11 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPLABEL), /* 12 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING), /* 13 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTH), /* 14 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTHEAP), /* 15 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_CERT), /* 16 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_PATH), /* 17 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH), /* 18 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES), /* 19 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH), /* 20 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CLIENT_CERT), /* 21 */ - SETTING_FIELD (NM_SETTING_802_1X_PASSWORD), /* 22 */ - SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_FLAGS), /* 23 */ - SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_RAW), /* 24 */ - SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS), /* 25 */ - SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY), /* 26 */ - SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD), /* 27 */ - SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS), /* 28 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY), /* 29 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD), /* 30 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS), /* 31 */ - SETTING_FIELD (NM_SETTING_802_1X_PIN), /* 32 */ - SETTING_FIELD (NM_SETTING_802_1X_PIN_FLAGS), /* 33 */ - SETTING_FIELD (NM_SETTING_802_1X_SYSTEM_CA_CERTS), /* 34 */ + SETTING_FIELD (NM_SETTING_802_1X_CA_CERT_PASSWORD), /* 6 */ + SETTING_FIELD (NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS), /* 7 */ + SETTING_FIELD (NM_SETTING_802_1X_CA_PATH), /* 8 */ + SETTING_FIELD (NM_SETTING_802_1X_SUBJECT_MATCH), /* 9 */ + SETTING_FIELD (NM_SETTING_802_1X_ALTSUBJECT_MATCHES), /* 10 */ + SETTING_FIELD (NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH), /* 11 */ + SETTING_FIELD (NM_SETTING_802_1X_CLIENT_CERT), /* 12 */ + SETTING_FIELD (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD), /* 13 */ + SETTING_FIELD (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS), /* 14 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPVER), /* 15 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPLABEL), /* 16 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING), /* 17 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE1_AUTH_FLAGS), /* 18 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTH), /* 19 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTHEAP), /* 20 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD), /* 21 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS), /* 22 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_CERT), /* 23 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_PATH), /* 24 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH), /* 25 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES), /* 26 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH), /* 27 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CLIENT_CERT), /* 28 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD), /* 29 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS), /* 30 */ + SETTING_FIELD (NM_SETTING_802_1X_PASSWORD), /* 31 */ + SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_FLAGS), /* 32 */ + SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_RAW), /* 33 */ + SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS), /* 34 */ + SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY), /* 35 */ + SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD), /* 36 */ + SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS), /* 37 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY), /* 38 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD), /* 39 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS), /* 40 */ + SETTING_FIELD (NM_SETTING_802_1X_PIN), /* 41 */ + SETTING_FIELD (NM_SETTING_802_1X_PIN_FLAGS), /* 42 */ + SETTING_FIELD (NM_SETTING_802_1X_SYSTEM_CA_CERTS), /* 43 */ + SETTING_FIELD (NM_SETTING_802_1X_AUTH_TIMEOUT), /* 44 */ {NULL, NULL, 0, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTING_802_1X_ALL "name"","\ @@ -165,22 +175,31 @@ NmcOutputField nmc_fields_setting_8021X[] = { NM_SETTING_802_1X_ANONYMOUS_IDENTITY","\ NM_SETTING_802_1X_PAC_FILE","\ NM_SETTING_802_1X_CA_CERT","\ + NM_SETTING_802_1X_CA_CERT_PASSWORD","\ + NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS","\ NM_SETTING_802_1X_CA_PATH","\ NM_SETTING_802_1X_SUBJECT_MATCH","\ NM_SETTING_802_1X_ALTSUBJECT_MATCHES","\ NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH","\ NM_SETTING_802_1X_CLIENT_CERT","\ + NM_SETTING_802_1X_CLIENT_CERT_PASSWORD","\ + NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS","\ NM_SETTING_802_1X_PHASE1_PEAPVER","\ NM_SETTING_802_1X_PHASE1_PEAPLABEL","\ NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING","\ + NM_SETTING_802_1X_PHASE1_AUTH_FLAGS","\ NM_SETTING_802_1X_PHASE2_AUTH","\ NM_SETTING_802_1X_PHASE2_AUTHEAP","\ NM_SETTING_802_1X_PHASE2_CA_CERT","\ + NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD","\ + NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS","\ NM_SETTING_802_1X_PHASE2_CA_PATH","\ NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH","\ NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES","\ NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH","\ NM_SETTING_802_1X_PHASE2_CLIENT_CERT","\ + NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD","\ + NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS","\ NM_SETTING_802_1X_PASSWORD","\ NM_SETTING_802_1X_PASSWORD_FLAGS","\ NM_SETTING_802_1X_PASSWORD_RAW","\ @@ -193,7 +212,8 @@ NmcOutputField nmc_fields_setting_8021X[] = { NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS","\ NM_SETTING_802_1X_PIN","\ NM_SETTING_802_1X_PIN_FLAGS","\ - NM_SETTING_802_1X_SYSTEM_CA_CERTS + NM_SETTING_802_1X_SYSTEM_CA_CERTS","\ + NM_SETTING_802_1X_AUTH_TIMEOUT /* Available fields for NM_SETTING_WIRELESS_SETTING_NAME */ NmcOutputField nmc_fields_setting_wireless[] = { @@ -474,6 +494,7 @@ NmcOutputField nmc_fields_setting_gsm[] = { SETTING_FIELD (NM_SETTING_GSM_DEVICE_ID), /* 10 */ SETTING_FIELD (NM_SETTING_GSM_SIM_ID), /* 11 */ SETTING_FIELD (NM_SETTING_GSM_SIM_OPERATOR_ID), /* 12 */ + SETTING_FIELD (NM_SETTING_GSM_MTU), /* 13 */ {NULL, NULL, 0, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTING_GSM_ALL "name"","\ @@ -488,7 +509,8 @@ NmcOutputField nmc_fields_setting_gsm[] = { NM_SETTING_GSM_HOME_ONLY","\ NM_SETTING_GSM_DEVICE_ID","\ NM_SETTING_GSM_SIM_ID","\ - NM_SETTING_GSM_SIM_OPERATOR_ID + NM_SETTING_GSM_SIM_OPERATOR_ID","\ + NM_SETTING_GSM_MTU /* Available fields for NM_SETTING_CDMA_SETTING_NAME */ NmcOutputField nmc_fields_setting_cdma[] = { @@ -497,13 +519,15 @@ NmcOutputField nmc_fields_setting_cdma[] = { SETTING_FIELD (NM_SETTING_CDMA_USERNAME), /* 2 */ SETTING_FIELD (NM_SETTING_CDMA_PASSWORD), /* 3 */ SETTING_FIELD (NM_SETTING_CDMA_PASSWORD_FLAGS), /* 4 */ + SETTING_FIELD (NM_SETTING_CDMA_MTU), /* 5 */ {NULL, NULL, 0, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTING_CDMA_ALL "name"","\ NM_SETTING_CDMA_NUMBER","\ NM_SETTING_CDMA_USERNAME","\ NM_SETTING_CDMA_PASSWORD","\ - NM_SETTING_CDMA_PASSWORD_FLAGS + NM_SETTING_CDMA_PASSWORD_FLAGS","\ + NM_SETTING_CDMA_MTU /* Available fields for NM_SETTING_BLUETOOTH_SETTING_NAME */ NmcOutputField nmc_fields_setting_bluetooth[] = { @@ -693,6 +717,13 @@ NmcOutputField nmc_fields_setting_dcb[] = { NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH","\ NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS +/* Available fields for NM_SETTING_DUMMY_SETTING_NAME */ +NmcOutputField nmc_fields_setting_dummy[] = { + SETTING_FIELD ("name"), /* 0 */ + {NULL, NULL, 0, NULL, FALSE, FALSE, 0} +}; +#define NMC_FIELDS_SETTING_DUMMY_ALL "name" + /* Available fields for NM_SETTING_TUN_SETTING_NAME */ NmcOutputField nmc_fields_setting_tun[] = { SETTING_FIELD ("name"), /* 0 */ @@ -869,10 +900,13 @@ bytes_to_string (GBytes *bytes) } static char * -vlan_flags_to_string (guint32 flags) +vlan_flags_to_string (guint32 flags, NmcPropertyGetType get_type) { GString *flag_str; + if (get_type == NMC_PROPERTY_GET_PARSABLE) + return g_strdup_printf ("%u", flags); + if (flags == 0) return g_strdup (_("0 (NONE)")); @@ -1660,19 +1694,27 @@ DEFINE_GETTER (nmc_property_802_1X_get_eap, NM_SETTING_802_1X_EAP) DEFINE_GETTER (nmc_property_802_1X_get_identity, NM_SETTING_802_1X_IDENTITY) DEFINE_GETTER (nmc_property_802_1X_get_anonymous_identity, NM_SETTING_802_1X_ANONYMOUS_IDENTITY) DEFINE_GETTER (nmc_property_802_1X_get_pac_file, NM_SETTING_802_1X_PAC_FILE) +DEFINE_GETTER (nmc_property_802_1X_get_ca_cert_password, NM_SETTING_802_1X_CA_CERT_PASSWORD) +DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_ca_cert_password_flags, NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS) DEFINE_GETTER (nmc_property_802_1X_get_ca_path, NM_SETTING_802_1X_CA_PATH) DEFINE_GETTER (nmc_property_802_1X_get_subject_match, NM_SETTING_802_1X_SUBJECT_MATCH) DEFINE_GETTER (nmc_property_802_1X_get_altsubject_matches, NM_SETTING_802_1X_ALTSUBJECT_MATCHES) DEFINE_GETTER (nmc_property_802_1X_get_domain_suffix_match, NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH) +DEFINE_GETTER (nmc_property_802_1X_get_client_cert_password, NM_SETTING_802_1X_CLIENT_CERT_PASSWORD) +DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_client_cert_password_flags, NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS) DEFINE_GETTER (nmc_property_802_1X_get_phase1_peapver, NM_SETTING_802_1X_PHASE1_PEAPVER) DEFINE_GETTER (nmc_property_802_1X_get_phase1_peaplabel, NM_SETTING_802_1X_PHASE1_PEAPLABEL) DEFINE_GETTER (nmc_property_802_1X_get_phase1_fast_provisioning, NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING) DEFINE_GETTER (nmc_property_802_1X_get_phase2_auth, NM_SETTING_802_1X_PHASE2_AUTH) DEFINE_GETTER (nmc_property_802_1X_get_phase2_autheap, NM_SETTING_802_1X_PHASE2_AUTHEAP) +DEFINE_GETTER (nmc_property_802_1X_get_phase2_ca_cert_password, NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD) +DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_phase2_ca_cert_password_flags, NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS) DEFINE_GETTER (nmc_property_802_1X_get_phase2_ca_path, NM_SETTING_802_1X_PHASE2_CA_PATH) DEFINE_GETTER (nmc_property_802_1X_get_phase2_subject_match, NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH) DEFINE_GETTER (nmc_property_802_1X_get_phase2_altsubject_matches, NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES) DEFINE_GETTER (nmc_property_802_1X_get_phase2_domain_suffix_match, NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH) +DEFINE_GETTER (nmc_property_802_1X_get_phase2_client_cert_password, NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD) +DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_phase2_client_cert_password_flags, NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS) DEFINE_GETTER (nmc_property_802_1X_get_password, NM_SETTING_802_1X_PASSWORD) DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_password_flags, NM_SETTING_802_1X_PASSWORD_FLAGS) DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_password_raw_flags, NM_SETTING_802_1X_PASSWORD_RAW_FLAGS) @@ -1683,6 +1725,7 @@ DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_phase2_private_key_password_ DEFINE_GETTER (nmc_property_802_1X_get_pin, NM_SETTING_802_1X_PIN) DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_pin_flags, NM_SETTING_802_1X_PIN_FLAGS) DEFINE_GETTER (nmc_property_802_1X_get_system_ca_certs, NM_SETTING_802_1X_SYSTEM_CA_CERTS) +DEFINE_GETTER (nmc_property_802_1X_get_auth_timeout, NM_SETTING_802_1X_AUTH_TIMEOUT) static char * nmc_property_802_1X_get_ca_cert (NMSetting *setting, NmcPropertyGetType get_type) @@ -2158,6 +2201,58 @@ nmc_property_802_1X_describe_password_raw (NMSetting *setting, const char *prop) " ab 4 55 0xa6 ea 3a 74 C2\n"); } +static char * +nmc_property_802_1X_get_phase1_auth_flags (NMSetting *setting, NmcPropertyGetType get_type) +{ + NMSetting8021x *s_8021x = NM_SETTING_802_1X (setting); + NMSetting8021xAuthFlags flags; + char *tmp, *str; + + flags = nm_setting_802_1x_get_phase1_auth_flags (s_8021x); + tmp = nm_utils_enum_to_str (nm_setting_802_1x_auth_flags_get_type (), flags); + if (get_type == NMC_PROPERTY_GET_PARSABLE) + str = g_strdup_printf ("%s", tmp && *tmp ? tmp : "none"); + else + str = g_strdup_printf ("%d (%s)", flags, tmp && *tmp ? tmp : "none"); + g_free (tmp); + return str; +} + +static gboolean +nmc_property_802_1X_set_phase1_auth_flags (NMSetting *setting, const char *prop, + const char *val, GError **error) +{ + NMSetting8021xAuthFlags flags; + gs_free char *err_token = NULL; + gboolean ret; + long int t; + + if (nmc_string_to_int_base (val, 0, TRUE, + NM_SETTING_802_1X_AUTH_FLAGS_NONE, + NM_SETTING_802_1X_AUTH_FLAGS_ALL, + &t)) + flags = (NMSetting8021xAuthFlags) t; + else { + ret = nm_utils_enum_from_str (nm_setting_802_1x_auth_flags_get_type (), val, + (int *) &flags, &err_token); + + if (!ret) { + if (g_ascii_strcasecmp (err_token, "none") == 0) + flags = NM_SETTING_802_1X_AUTH_FLAGS_NONE; + else { + g_set_error (error, 1, 0, _("invalid option '%s', use a combination of [%s]"), + err_token, + nm_utils_enum_to_str (nm_setting_802_1x_auth_flags_get_type (), + NM_SETTING_802_1X_AUTH_FLAGS_ALL)); + return FALSE; + } + } + } + + g_object_set (setting, prop, (guint) flags, NULL); + return TRUE; +} + /* --- NM_SETTING_ADSL_SETTING_NAME property functions --- */ DEFINE_GETTER (nmc_property_adsl_get_username, NM_SETTING_ADSL_USERNAME) @@ -2358,6 +2453,7 @@ DEFINE_GETTER (nmc_property_bridge_port_get_hairpin_mode, NM_SETTING_BRIDGE_PORT DEFINE_GETTER (nmc_property_cdma_get_number, NM_SETTING_CDMA_NUMBER) DEFINE_GETTER (nmc_property_cdma_get_username, NM_SETTING_CDMA_USERNAME) DEFINE_GETTER (nmc_property_cdma_get_password, NM_SETTING_CDMA_PASSWORD) +DEFINE_GETTER (nmc_property_cdma_get_mtu, NM_SETTING_CDMA_MTU) DEFINE_SECRET_FLAGS_GETTER (nmc_property_cdma_get_password_flags, NM_SETTING_CDMA_PASSWORD_FLAGS) @@ -2407,10 +2503,13 @@ nmc_property_connection_get_permissions (NMSetting *setting, NmcPropertyGetType if (nm_setting_connection_get_permission (s_con, i, &perm_type, &perm_item, NULL)) g_string_append_printf (perm, "%s:%s,", perm_type, perm_item); } - if (perm->len > 0) + if (perm->len > 0) { g_string_truncate (perm, perm->len-1); /* remove trailing , */ + return g_string_free (perm, FALSE); + } - return g_string_free (perm, FALSE); + /* No value from get_permission */ + return g_string_free (perm, TRUE); } DEFINE_GETTER (nmc_property_connection_get_zone, NM_SETTING_CONNECTION_ZONE) @@ -3194,6 +3293,7 @@ DEFINE_GETTER (nmc_property_gsm_get_home_only, NM_SETTING_GSM_HOME_ONLY) DEFINE_GETTER (nmc_property_gsm_get_device_id, NM_SETTING_GSM_DEVICE_ID) DEFINE_GETTER (nmc_property_gsm_get_sim_id, NM_SETTING_GSM_SIM_ID) DEFINE_GETTER (nmc_property_gsm_get_sim_operator_id, NM_SETTING_GSM_SIM_OPERATOR_ID) +DEFINE_GETTER (nmc_property_gsm_get_mtu, NM_SETTING_GSM_MTU) static gboolean nmc_property_gsm_set_sim_operator_id (NMSetting *setting, const char *prop, const char *val, GError **error) @@ -3376,29 +3476,6 @@ _parse_ip_address (int family, const char *address, GError **error) return ipaddr; } -static NMIPRoute * -_parse_ip_route (int family, const char *route, GError **error) -{ - char *value = g_strdup (route); - char **routev; - guint len; - NMIPRoute *iproute = NULL; - - routev = nmc_strsplit_set (g_strstrip (value), " \t", 0); - len = g_strv_length (routev); - if (len < 1 || len > 3) { - g_set_error (error, 1, 0, _("'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"), - route); - goto finish; - } - iproute = nmc_parse_and_build_route (family, routev[0], routev[1], len >= 2 ? routev[2] : NULL, error); - -finish: - g_free (value); - g_strfreev (routev); - return iproute; -} - DEFINE_GETTER (nmc_property_ipv4_get_method, NM_SETTING_IP_CONFIG_METHOD) DEFINE_GETTER (nmc_property_ipv4_get_dns, NM_SETTING_IP_CONFIG_DNS) DEFINE_GETTER (nmc_property_ipv4_get_dns_search, NM_SETTING_IP_CONFIG_DNS_SEARCH) @@ -3442,8 +3519,21 @@ nmc_property_ipvx_get_routes (NMSetting *setting, NmcPropertyGetType get_type) num_routes = 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; + gs_unref_hashtable GHashTable *hash = g_hash_table_new (g_str_hash, g_str_equal); + int j; + route = nm_setting_ip_config_get_route (s_ip, i); + attr_names = nm_ip_route_get_attribute_names (route); + for (j = 0; attr_names && attr_names[j]; j++) { + g_hash_table_insert (hash, attr_names[j], + nm_ip_route_get_attribute (route, attr_names[j])); + } + + attr_str = nm_utils_format_variant_attributes (hash, ' ', '='); + if (get_type == NMC_PROPERTY_GET_PARSABLE) { if (printable->len > 0) g_string_append (printable, ", "); @@ -3456,7 +3546,10 @@ nmc_property_ipvx_get_routes (NMSetting *setting, NmcPropertyGetType get_type) g_string_append_printf (printable, " %s", nm_ip_route_get_next_hop (route)); if (nm_ip_route_get_metric (route) != -1) g_string_append_printf (printable, " %u", (guint32) nm_ip_route_get_metric (route)); + if (attr_str) + g_string_append_printf (printable, " %s", attr_str); } else { + if (printable->len > 0) g_string_append (printable, "; "); @@ -3473,6 +3566,8 @@ nmc_property_ipvx_get_routes (NMSetting *setting, NmcPropertyGetType get_type) if (nm_ip_route_get_metric (route) != -1) g_string_append_printf (printable, ", mt = %u", (guint32) nm_ip_route_get_metric (route)); + if (attr_str) + g_string_append_printf (printable, " %s", attr_str); g_string_append (printable, " }"); } @@ -3533,7 +3628,7 @@ static gboolean nmc_property_ipv4_set_method (NMSetting *setting, const char *prop, const char *val, GError **error) { /* Silently accept "static" and convert to "manual" */ - if (val && strlen (val) > 1 && matches (val, "static") == 0) + if (val && strlen (val) > 1 && matches (val, "static")) val = NM_SETTING_IP4_CONFIG_METHOD_MANUAL; return check_and_set_string (setting, prop, val, ipv4_valid_methods, error); @@ -3764,7 +3859,7 @@ nmc_property_ipv4_set_gateway (NMSetting *setting, const char *prop, const char static NMIPRoute * _parse_ipv4_route (const char *route, GError **error) { - return _parse_ip_route (AF_INET, route, error); + return nmc_parse_and_build_route (AF_INET, route, error); } static gboolean @@ -3871,7 +3966,7 @@ static gboolean nmc_property_ipv6_set_method (NMSetting *setting, const char *prop, const char *val, GError **error) { /* Silently accept "static" and convert to "manual" */ - if (val && strlen (val) > 1 && matches (val, "static") == 0) + if (val && strlen (val) > 1 && matches (val, "static")) val = NM_SETTING_IP6_CONFIG_METHOD_MANUAL; return check_and_set_string (setting, prop, val, ipv6_valid_methods, error); @@ -4107,7 +4202,7 @@ nmc_property_ipv6_set_gateway (NMSetting *setting, const char *prop, const char static NMIPRoute * _parse_ipv6_route (const char *route, GError **error) { - return _parse_ip_route (AF_INET6, route, error); + return nmc_parse_and_build_route (AF_INET6, route, error); } static gboolean @@ -4635,7 +4730,7 @@ static char * nmc_property_vlan_get_flags (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting); - return vlan_flags_to_string (nm_setting_vlan_get_flags (s_vlan)); + return vlan_flags_to_string (nm_setting_vlan_get_flags (s_vlan), get_type); } static char * @@ -5726,7 +5821,7 @@ get_answer (const char *prop, const char *value) else question = g_strdup_printf (_("Do you also want to clear '%s'? [yes]: "), prop); tmp_str = nmc_get_user_input (question); - if (!tmp_str || matches (tmp_str, "yes") == 0) + if (!tmp_str || matches (tmp_str, "yes")) answer = TRUE; g_free (tmp_str); g_free (question); @@ -5922,7 +6017,7 @@ connection_master_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_ g_print (_("Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"), nm_setting_get_name (NM_SETTING (s_con)), g_param_spec_get_name (pspec)); tmp_str = nmc_get_user_input (_("Do you want to remove them? [yes] ")); - if (!tmp_str || matches (tmp_str, "yes") == 0) { + if (!tmp_str || matches (tmp_str, "yes")) { if (s_ipv4) nm_connection_remove_setting (connection, G_OBJECT_TYPE (s_ipv4)); if (s_ipv6) @@ -6129,6 +6224,20 @@ nmc_properties_init (void) nmc_property_802_1X_describe_ca_cert, NULL, NULL); + nmc_add_prop_funcs (GLUE (802_1X, CA_CERT_PASSWORD), + nmc_property_802_1X_get_ca_cert_password, + nmc_property_set_string, + NULL, + NULL, + NULL, + NULL); + nmc_add_prop_funcs (GLUE (802_1X, CA_CERT_PASSWORD_FLAGS), + nmc_property_802_1X_get_ca_cert_password_flags, + nmc_property_set_secret_flags, + NULL, + NULL, + NULL, + NULL); nmc_add_prop_funcs (GLUE (802_1X, CA_PATH), nmc_property_802_1X_get_ca_path, nmc_property_set_string, @@ -6164,6 +6273,20 @@ nmc_properties_init (void) nmc_property_802_1X_describe_client_cert, NULL, NULL); + nmc_add_prop_funcs (GLUE (802_1X, CLIENT_CERT_PASSWORD), + nmc_property_802_1X_get_client_cert_password, + nmc_property_set_string, + NULL, + NULL, + NULL, + NULL); + nmc_add_prop_funcs (GLUE (802_1X, CLIENT_CERT_PASSWORD_FLAGS), + nmc_property_802_1X_get_client_cert_password_flags, + nmc_property_set_secret_flags, + NULL, + NULL, + NULL, + NULL); nmc_add_prop_funcs (GLUE (802_1X, PHASE1_PEAPVER), nmc_property_802_1X_get_phase1_peapver, nmc_property_802_1X_set_phase1_peapver, @@ -6185,6 +6308,13 @@ nmc_properties_init (void) NULL, nmc_property_802_1X_allowed_phase1_fast_provisioning, NULL); + nmc_add_prop_funcs (GLUE (802_1X, PHASE1_AUTH_FLAGS), + nmc_property_802_1X_get_phase1_auth_flags, + nmc_property_802_1X_set_phase1_auth_flags, + NULL, + NULL, + NULL, + NULL); nmc_add_prop_funcs (GLUE (802_1X, PHASE2_AUTH), nmc_property_802_1X_get_phase2_auth, nmc_property_802_1X_set_phase2_auth, @@ -6206,6 +6336,20 @@ nmc_properties_init (void) nmc_property_802_1X_describe_phase2_ca_cert, NULL, NULL); + nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CA_CERT_PASSWORD), + nmc_property_802_1X_get_phase2_ca_cert_password, + nmc_property_set_string, + NULL, + NULL, + NULL, + NULL); + nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CA_CERT_PASSWORD_FLAGS), + nmc_property_802_1X_get_phase2_ca_cert_password_flags, + nmc_property_set_secret_flags, + NULL, + NULL, + NULL, + NULL); nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CA_PATH), nmc_property_802_1X_get_phase2_ca_path, nmc_property_set_string, @@ -6241,6 +6385,20 @@ nmc_properties_init (void) nmc_property_802_1X_describe_phase2_client_cert, NULL, NULL); + nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CLIENT_CERT_PASSWORD), + nmc_property_802_1X_get_phase2_client_cert_password, + nmc_property_set_string, + NULL, + NULL, + NULL, + NULL); + nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CLIENT_CERT_PASSWORD_FLAGS), + nmc_property_802_1X_get_phase2_client_cert_password_flags, + nmc_property_set_secret_flags, + NULL, + NULL, + NULL, + NULL); nmc_add_prop_funcs (GLUE (802_1X, PASSWORD), nmc_property_802_1X_get_password, nmc_property_set_string, @@ -6332,6 +6490,13 @@ nmc_properties_init (void) NULL, NULL, NULL); + nmc_add_prop_funcs (GLUE (802_1X, AUTH_TIMEOUT), + nmc_property_802_1X_get_auth_timeout, + nmc_property_set_int, + NULL, + NULL, + NULL, + NULL); /* Add editable properties for NM_SETTING_ADSL_SETTING_NAME */ nmc_add_prop_funcs (GLUE (ADSL, USERNAME), @@ -6520,6 +6685,13 @@ nmc_properties_init (void) NULL, NULL, NULL); + nmc_add_prop_funcs (GLUE (CDMA, MTU), + nmc_property_cdma_get_mtu, + nmc_property_set_uint, + NULL, + NULL, + NULL, + NULL); /* Add editable properties for NM_SETTING_CONNECTION_SETTING_NAME */ nmc_add_prop_funcs (GLUE (CONNECTION, ID), @@ -6848,6 +7020,13 @@ nmc_properties_init (void) NULL, NULL, NULL); + nmc_add_prop_funcs (GLUE (GSM, MTU), + nmc_property_gsm_get_mtu, + nmc_property_set_uint, + NULL, + NULL, + NULL, + NULL); /* Add editable properties for NM_SETTING_INFINIBAND_SETTING_NAME */ nmc_add_prop_funcs (GLUE (INFINIBAND, MAC_ADDRESS), @@ -8471,11 +8650,14 @@ nmc_property_set_gvalue (NMSetting *setting, const char *prop, GValue *value) /*----------------------------------------------------------------------------*/ -#define GET_SECRET(show, setting, func) \ - (show ? func (setting, NMC_PROPERTY_GET_PRETTY) : g_strdup (_(""))) +#define GET_SECRET(show, setting, func, type) \ + (show ? func (setting, type) : g_strdup (_(""))) static gboolean -setting_connection_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_connection_details (NMSetting *setting, NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting); NmcOutputField *tmpl, *arr; @@ -8492,25 +8674,25 @@ setting_connection_details (NMSetting *setting, NmCli *nmc, const char *one_pro arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_connection_get_id (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_connection_get_uuid (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_connection_get_stable_id (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_connection_get_interface_name (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_connection_get_type (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_connection_get_autoconnect (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_connection_get_autoconnect_priority (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_connection_get_autoconnect_retries (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_connection_get_timestamp (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_connection_get_read_only (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_connection_get_permissions (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_connection_get_zone (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_connection_get_master (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 14, nmc_property_connection_get_slave_type (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 15, nmc_property_connection_get_autoconnect_slaves (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 16, nmc_property_connection_get_secondaries (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 17, nmc_property_connection_get_gateway_ping_timeout (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 18, nmc_property_connection_get_metered (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 19, nmc_property_connection_get_lldp (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_connection_get_id (setting, type)); + set_val_str (arr, 2, nmc_property_connection_get_uuid (setting, type)); + set_val_str (arr, 3, nmc_property_connection_get_stable_id (setting, type)); + set_val_str (arr, 4, nmc_property_connection_get_interface_name (setting, type)); + set_val_str (arr, 5, nmc_property_connection_get_type (setting, type)); + set_val_str (arr, 6, nmc_property_connection_get_autoconnect (setting, type)); + set_val_str (arr, 7, nmc_property_connection_get_autoconnect_priority (setting, type)); + set_val_str (arr, 8, nmc_property_connection_get_autoconnect_retries (setting, type)); + set_val_str (arr, 9, nmc_property_connection_get_timestamp (setting, type)); + set_val_str (arr, 10, nmc_property_connection_get_read_only (setting, type)); + set_val_str (arr, 11, nmc_property_connection_get_permissions (setting, type)); + set_val_str (arr, 12, nmc_property_connection_get_zone (setting, type)); + set_val_str (arr, 13, nmc_property_connection_get_master (setting, type)); + set_val_str (arr, 14, nmc_property_connection_get_slave_type (setting, type)); + set_val_str (arr, 15, nmc_property_connection_get_autoconnect_slaves (setting, type)); + set_val_str (arr, 16, nmc_property_connection_get_secondaries (setting, type)); + set_val_str (arr, 17, nmc_property_connection_get_gateway_ping_timeout (setting, type)); + set_val_str (arr, 18, nmc_property_connection_get_metered (setting, type)); + set_val_str (arr, 19, nmc_property_connection_get_lldp (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8519,7 +8701,11 @@ setting_connection_details (NMSetting *setting, NmCli *nmc, const char *one_pro } static gboolean -setting_wired_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_wired_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingWired *s_wired = NM_SETTING_WIRED (setting); NmcOutputField *tmpl, *arr; @@ -8536,20 +8722,20 @@ setting_wired_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_wired_get_port (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_wired_get_speed (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_wired_get_duplex (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_wired_get_auto_negotiate (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_wired_get_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_wired_get_cloned_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_wired_get_generate_mac_address_mask (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_wired_get_mac_address_blacklist (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_wired_get_mtu (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_wired_get_s390_subchannels (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_wired_get_s390_nettype (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_wired_get_s390_options (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_wired_get_wake_on_lan (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 14, nmc_property_wired_get_wake_on_lan_password (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_wired_get_port (setting, type)); + set_val_str (arr, 2, nmc_property_wired_get_speed (setting, type)); + set_val_str (arr, 3, nmc_property_wired_get_duplex (setting, type)); + set_val_str (arr, 4, nmc_property_wired_get_auto_negotiate (setting, type)); + set_val_str (arr, 5, nmc_property_wired_get_mac_address (setting, type)); + set_val_str (arr, 6, nmc_property_wired_get_cloned_mac_address (setting, type)); + set_val_str (arr, 7, nmc_property_wired_get_generate_mac_address_mask (setting, type)); + set_val_str (arr, 8, nmc_property_wired_get_mac_address_blacklist (setting, type)); + set_val_str (arr, 9, nmc_property_wired_get_mtu (setting, type)); + set_val_str (arr, 10, nmc_property_wired_get_s390_subchannels (setting, type)); + set_val_str (arr, 11, nmc_property_wired_get_s390_nettype (setting, type)); + set_val_str (arr, 12, nmc_property_wired_get_s390_options (setting, type)); + set_val_str (arr, 13, nmc_property_wired_get_wake_on_lan (setting, type)); + set_val_str (arr, 14, nmc_property_wired_get_wake_on_lan_password (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8558,7 +8744,11 @@ setting_wired_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb } static gboolean -setting_802_1X_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_802_1X_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSetting8021x *s_8021x = NM_SETTING_802_1X (setting); NmcOutputField *tmpl, *arr; @@ -8575,40 +8765,50 @@ setting_802_1X_details (NMSetting *setting, NmCli *nmc, const char *one_prop, g arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_802_1X_get_eap (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_802_1X_get_identity (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_802_1X_get_anonymous_identity (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_802_1X_get_pac_file (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_802_1X_get_ca_cert (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_802_1X_get_ca_path (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_802_1X_get_subject_match (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_802_1X_get_altsubject_matches (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_802_1X_get_domain_suffix_match (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_802_1X_get_client_cert (setting, NMC_PROPERTY_GET_PRETTY, secrets)); - set_val_str (arr, 11, nmc_property_802_1X_get_phase1_peapver (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_802_1X_get_phase1_peaplabel (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_802_1X_get_phase1_fast_provisioning (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 14, nmc_property_802_1X_get_phase2_auth (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 15, nmc_property_802_1X_get_phase2_autheap (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 16, nmc_property_802_1X_get_phase2_ca_cert (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 17, nmc_property_802_1X_get_phase2_ca_path (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 18, nmc_property_802_1X_get_phase2_subject_match (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 19, nmc_property_802_1X_get_phase2_altsubject_matches (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 20, nmc_property_802_1X_get_phase2_domain_suffix_match (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 21, nmc_property_802_1X_get_phase2_client_cert (setting, NMC_PROPERTY_GET_PRETTY, secrets)); - set_val_str (arr, 22, GET_SECRET (secrets, setting, nmc_property_802_1X_get_password)); - set_val_str (arr, 23, nmc_property_802_1X_get_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 24, GET_SECRET (secrets, setting, nmc_property_802_1X_get_password_raw)); - set_val_str (arr, 25, nmc_property_802_1X_get_password_raw_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 26, nmc_property_802_1X_get_private_key (setting, NMC_PROPERTY_GET_PRETTY, secrets)); - set_val_str (arr, 27, GET_SECRET (secrets, setting, nmc_property_802_1X_get_private_key_password)); - set_val_str (arr, 28, nmc_property_802_1X_get_private_key_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 29, nmc_property_802_1X_get_phase2_private_key (setting, NMC_PROPERTY_GET_PRETTY, secrets)); - set_val_str (arr, 30, GET_SECRET (secrets, setting, nmc_property_802_1X_get_phase2_private_key_password)); - set_val_str (arr, 31, nmc_property_802_1X_get_phase2_private_key_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 32, GET_SECRET (secrets, setting, nmc_property_802_1X_get_pin)); - set_val_str (arr, 33, nmc_property_802_1X_get_pin_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 34, nmc_property_802_1X_get_system_ca_certs (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_802_1X_get_eap (setting, type)); + set_val_str (arr, 2, nmc_property_802_1X_get_identity (setting, type)); + set_val_str (arr, 3, nmc_property_802_1X_get_anonymous_identity (setting, type)); + set_val_str (arr, 4, nmc_property_802_1X_get_pac_file (setting, type)); + set_val_str (arr, 5, nmc_property_802_1X_get_ca_cert (setting, type)); + set_val_str (arr, 6, GET_SECRET (secrets, setting, nmc_property_802_1X_get_ca_cert_password, type)); + set_val_str (arr, 7, nmc_property_802_1X_get_ca_cert_password_flags (setting, type)); + set_val_str (arr, 8, nmc_property_802_1X_get_ca_path (setting, type)); + set_val_str (arr, 9, nmc_property_802_1X_get_subject_match (setting, type)); + set_val_str (arr, 10, nmc_property_802_1X_get_altsubject_matches (setting, type)); + set_val_str (arr, 11, nmc_property_802_1X_get_domain_suffix_match (setting, type)); + set_val_str (arr, 12, nmc_property_802_1X_get_client_cert (setting, type, secrets)); + set_val_str (arr, 13, GET_SECRET (secrets, setting, nmc_property_802_1X_get_client_cert_password, type)); + set_val_str (arr, 14, nmc_property_802_1X_get_client_cert_password_flags (setting, type)); + set_val_str (arr, 15, nmc_property_802_1X_get_phase1_peapver (setting, type)); + set_val_str (arr, 16, nmc_property_802_1X_get_phase1_peaplabel (setting, type)); + set_val_str (arr, 17, nmc_property_802_1X_get_phase1_fast_provisioning (setting, type)); + set_val_str (arr, 18, nmc_property_802_1X_get_phase1_auth_flags (setting, type)); + set_val_str (arr, 19, nmc_property_802_1X_get_phase2_auth (setting, type)); + set_val_str (arr, 20, nmc_property_802_1X_get_phase2_autheap (setting, type)); + set_val_str (arr, 21, nmc_property_802_1X_get_phase2_ca_cert (setting, type)); + set_val_str (arr, 22, GET_SECRET (secrets, setting, nmc_property_802_1X_get_phase2_ca_cert_password, type)); + set_val_str (arr, 23, nmc_property_802_1X_get_phase2_ca_cert_password_flags (setting, type)); + set_val_str (arr, 24, nmc_property_802_1X_get_phase2_ca_path (setting, type)); + set_val_str (arr, 25, nmc_property_802_1X_get_phase2_subject_match (setting, type)); + set_val_str (arr, 26, nmc_property_802_1X_get_phase2_altsubject_matches (setting, type)); + set_val_str (arr, 27, nmc_property_802_1X_get_phase2_domain_suffix_match (setting, type)); + set_val_str (arr, 28, nmc_property_802_1X_get_phase2_client_cert (setting, type, secrets)); + set_val_str (arr, 29, GET_SECRET (secrets, setting, nmc_property_802_1X_get_phase2_client_cert_password, type)); + set_val_str (arr, 30, nmc_property_802_1X_get_phase2_client_cert_password_flags (setting, type)); + set_val_str (arr, 31, GET_SECRET (secrets, setting, nmc_property_802_1X_get_password, type)); + set_val_str (arr, 32, nmc_property_802_1X_get_password_flags (setting, type)); + set_val_str (arr, 33, GET_SECRET (secrets, setting, nmc_property_802_1X_get_password_raw, type)); + set_val_str (arr, 34, nmc_property_802_1X_get_password_raw_flags (setting, type)); + set_val_str (arr, 35, nmc_property_802_1X_get_private_key (setting, type, secrets)); + set_val_str (arr, 36, GET_SECRET (secrets, setting, nmc_property_802_1X_get_private_key_password, type)); + set_val_str (arr, 37, nmc_property_802_1X_get_private_key_password_flags (setting, type)); + set_val_str (arr, 38, nmc_property_802_1X_get_phase2_private_key (setting, type, secrets)); + set_val_str (arr, 39, GET_SECRET (secrets, setting, nmc_property_802_1X_get_phase2_private_key_password, type)); + set_val_str (arr, 40, nmc_property_802_1X_get_phase2_private_key_password_flags (setting, type)); + set_val_str (arr, 41, GET_SECRET (secrets, setting, nmc_property_802_1X_get_pin, type)); + set_val_str (arr, 42, nmc_property_802_1X_get_pin_flags (setting, type)); + set_val_str (arr, 43, nmc_property_802_1X_get_system_ca_certs (setting, type)); + set_val_str (arr, 44, nmc_property_802_1X_get_auth_timeout (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8617,7 +8817,11 @@ setting_802_1X_details (NMSetting *setting, NmCli *nmc, const char *one_prop, g } static gboolean -setting_wireless_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_wireless_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting); NmcOutputField *tmpl, *arr; @@ -8634,22 +8838,22 @@ setting_wireless_details (NMSetting *setting, NmCli *nmc, const char *one_prop, arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_wireless_get_ssid (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_wireless_get_mode (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_wireless_get_band (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_wireless_get_channel (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_wireless_get_bssid (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_wireless_get_rate (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_wireless_get_tx_power (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_wireless_get_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_wireless_get_cloned_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_wireless_get_generate_mac_address_mask (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_wireless_get_mac_address_blacklist (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_wireless_get_mac_address_randomization (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_wireless_get_mtu (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 14, nmc_property_wireless_get_seen_bssids (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 15, nmc_property_wireless_get_hidden (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 16, nmc_property_wireless_get_powersave (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_wireless_get_ssid (setting, type)); + set_val_str (arr, 2, nmc_property_wireless_get_mode (setting, type)); + set_val_str (arr, 3, nmc_property_wireless_get_band (setting, type)); + set_val_str (arr, 4, nmc_property_wireless_get_channel (setting, type)); + set_val_str (arr, 5, nmc_property_wireless_get_bssid (setting, type)); + set_val_str (arr, 6, nmc_property_wireless_get_rate (setting, type)); + set_val_str (arr, 7, nmc_property_wireless_get_tx_power (setting, type)); + set_val_str (arr, 8, nmc_property_wireless_get_mac_address (setting, type)); + set_val_str (arr, 9, nmc_property_wireless_get_cloned_mac_address (setting, type)); + set_val_str (arr, 10, nmc_property_wireless_get_generate_mac_address_mask (setting, type)); + set_val_str (arr, 11, nmc_property_wireless_get_mac_address_blacklist (setting, type)); + set_val_str (arr, 12, nmc_property_wireless_get_mac_address_randomization (setting, type)); + set_val_str (arr, 13, nmc_property_wireless_get_mtu (setting, type)); + set_val_str (arr, 14, nmc_property_wireless_get_seen_bssids (setting, type)); + set_val_str (arr, 15, nmc_property_wireless_get_hidden (setting, type)); + set_val_str (arr, 16, nmc_property_wireless_get_powersave (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8658,7 +8862,11 @@ setting_wireless_details (NMSetting *setting, NmCli *nmc, const char *one_prop, } static gboolean -setting_wireless_security_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_wireless_security_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting); NmcOutputField *tmpl, *arr; @@ -8675,23 +8883,23 @@ setting_wireless_security_details (NMSetting *setting, NmCli *nmc, const char *o arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_wifi_sec_get_key_mgmt (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_wifi_sec_get_wep_tx_keyidx (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_wifi_sec_get_auth_alg (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_wifi_sec_get_proto (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_wifi_sec_get_pairwise (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_wifi_sec_get_group (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_wifi_sec_get_leap_username (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key0)); - set_val_str (arr, 9, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key1)); - set_val_str (arr, 10, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key2)); - set_val_str (arr, 11, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key3)); - set_val_str (arr, 12, nmc_property_wifi_sec_get_wep_key_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_wifi_sec_get_wep_key_type (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 14, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_psk)); - set_val_str (arr, 15, nmc_property_wifi_sec_get_psk_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 16, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_leap_password)); - set_val_str (arr, 17, nmc_property_wifi_sec_get_leap_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_wifi_sec_get_key_mgmt (setting, type)); + set_val_str (arr, 2, nmc_property_wifi_sec_get_wep_tx_keyidx (setting, type)); + set_val_str (arr, 3, nmc_property_wifi_sec_get_auth_alg (setting, type)); + set_val_str (arr, 4, nmc_property_wifi_sec_get_proto (setting, type)); + set_val_str (arr, 5, nmc_property_wifi_sec_get_pairwise (setting, type)); + set_val_str (arr, 6, nmc_property_wifi_sec_get_group (setting, type)); + set_val_str (arr, 7, nmc_property_wifi_sec_get_leap_username (setting, type)); + set_val_str (arr, 8, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key0, type)); + set_val_str (arr, 9, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key1, type)); + set_val_str (arr, 10, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key2, type)); + set_val_str (arr, 11, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key3, type)); + set_val_str (arr, 12, nmc_property_wifi_sec_get_wep_key_flags (setting, type)); + set_val_str (arr, 13, nmc_property_wifi_sec_get_wep_key_type (setting, type)); + set_val_str (arr, 14, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_psk, type)); + set_val_str (arr, 15, nmc_property_wifi_sec_get_psk_flags (setting, type)); + set_val_str (arr, 16, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_leap_password, type)); + set_val_str (arr, 17, nmc_property_wifi_sec_get_leap_password_flags (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8700,7 +8908,11 @@ setting_wireless_security_details (NMSetting *setting, NmCli *nmc, const char *o } static gboolean -setting_ip4_config_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_ip4_config_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingIPConfig *s_ip4 = NM_SETTING_IP_CONFIG (setting); NmcOutputField *tmpl, *arr; @@ -8717,25 +8929,25 @@ setting_ip4_config_details (NMSetting *setting, NmCli *nmc, const char *one_pro arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_ipv4_get_method (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_ipv4_get_dns (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_ipv4_get_dns_search (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_ipv4_get_dns_options (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_ipv4_get_dns_priority (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_ip_get_addresses (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_ipv4_get_gateway (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_ipv4_get_routes (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_ipv4_get_route_metric (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_ipv4_get_ignore_auto_routes (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_ipv4_get_ignore_auto_dns (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_ipv4_get_dhcp_client_id (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_ipv4_get_dhcp_timeout (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 14, nmc_property_ipv4_get_dhcp_send_hostname (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 15, nmc_property_ipv4_get_dhcp_hostname (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 16, nmc_property_ipv4_get_dhcp_fqdn (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 17, nmc_property_ipv4_get_never_default (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 18, nmc_property_ipv4_get_may_fail (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 19, nmc_property_ipv4_get_dad_timeout (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_ipv4_get_method (setting, type)); + set_val_str (arr, 2, nmc_property_ipv4_get_dns (setting, type)); + set_val_str (arr, 3, nmc_property_ipv4_get_dns_search (setting, type)); + set_val_str (arr, 4, nmc_property_ipv4_get_dns_options (setting, type)); + set_val_str (arr, 5, nmc_property_ipv4_get_dns_priority (setting, type)); + set_val_str (arr, 6, nmc_property_ip_get_addresses (setting, type)); + set_val_str (arr, 7, nmc_property_ipv4_get_gateway (setting, type)); + set_val_str (arr, 8, nmc_property_ipv4_get_routes (setting, type)); + set_val_str (arr, 9, nmc_property_ipv4_get_route_metric (setting, type)); + set_val_str (arr, 10, nmc_property_ipv4_get_ignore_auto_routes (setting, type)); + set_val_str (arr, 11, nmc_property_ipv4_get_ignore_auto_dns (setting, type)); + set_val_str (arr, 12, nmc_property_ipv4_get_dhcp_client_id (setting, type)); + set_val_str (arr, 13, nmc_property_ipv4_get_dhcp_timeout (setting, type)); + set_val_str (arr, 14, nmc_property_ipv4_get_dhcp_send_hostname (setting, type)); + set_val_str (arr, 15, nmc_property_ipv4_get_dhcp_hostname (setting, type)); + set_val_str (arr, 16, nmc_property_ipv4_get_dhcp_fqdn (setting, type)); + set_val_str (arr, 17, nmc_property_ipv4_get_never_default (setting, type)); + set_val_str (arr, 18, nmc_property_ipv4_get_may_fail (setting, type)); + set_val_str (arr, 19, nmc_property_ipv4_get_dad_timeout (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8744,7 +8956,11 @@ setting_ip4_config_details (NMSetting *setting, NmCli *nmc, const char *one_pro } static gboolean -setting_ip6_config_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_ip6_config_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingIPConfig *s_ip6 = NM_SETTING_IP_CONFIG (setting); NmcOutputField *tmpl, *arr; @@ -8761,24 +8977,24 @@ setting_ip6_config_details (NMSetting *setting, NmCli *nmc, const char *one_pro arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_ipv6_get_method (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_ipv6_get_dns (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_ipv6_get_dns_search (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_ipv6_get_dns_options (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_ipv6_get_dns_priority (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_ip_get_addresses (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_ipv6_get_gateway (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_ipv6_get_routes (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_ipv6_get_route_metric (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_ipv6_get_ignore_auto_routes (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_ipv6_get_ignore_auto_dns (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_ipv6_get_never_default (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_ipv6_get_may_fail (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 14, nmc_property_ipv6_get_ip6_privacy (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 15, nmc_property_ipv6_get_addr_gen_mode (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 16, nmc_property_ipv6_get_dhcp_send_hostname (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 17, nmc_property_ipv6_get_dhcp_hostname (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 18, nmc_property_ipv6_get_token (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_ipv6_get_method (setting, type)); + set_val_str (arr, 2, nmc_property_ipv6_get_dns (setting, type)); + set_val_str (arr, 3, nmc_property_ipv6_get_dns_search (setting, type)); + set_val_str (arr, 4, nmc_property_ipv6_get_dns_options (setting, type)); + set_val_str (arr, 5, nmc_property_ipv6_get_dns_priority (setting, type)); + set_val_str (arr, 6, nmc_property_ip_get_addresses (setting, type)); + set_val_str (arr, 7, nmc_property_ipv6_get_gateway (setting, type)); + set_val_str (arr, 8, nmc_property_ipv6_get_routes (setting, type)); + set_val_str (arr, 9, nmc_property_ipv6_get_route_metric (setting, type)); + set_val_str (arr, 10, nmc_property_ipv6_get_ignore_auto_routes (setting, type)); + set_val_str (arr, 11, nmc_property_ipv6_get_ignore_auto_dns (setting, type)); + set_val_str (arr, 12, nmc_property_ipv6_get_never_default (setting, type)); + set_val_str (arr, 13, nmc_property_ipv6_get_may_fail (setting, type)); + set_val_str (arr, 14, nmc_property_ipv6_get_ip6_privacy (setting, type)); + set_val_str (arr, 15, nmc_property_ipv6_get_addr_gen_mode (setting, type)); + set_val_str (arr, 16, nmc_property_ipv6_get_dhcp_send_hostname (setting, type)); + set_val_str (arr, 17, nmc_property_ipv6_get_dhcp_hostname (setting, type)); + set_val_str (arr, 18, nmc_property_ipv6_get_token (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8787,7 +9003,11 @@ setting_ip6_config_details (NMSetting *setting, NmCli *nmc, const char *one_pro } static gboolean -setting_serial_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_serial_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingSerial *s_serial = NM_SETTING_SERIAL (setting); NmcOutputField *tmpl, *arr; @@ -8804,11 +9024,11 @@ setting_serial_details (NMSetting *setting, NmCli *nmc, const char *one_prop, g arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_serial_get_baud (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_serial_get_bits (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_serial_get_parity (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_serial_get_stopbits (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_serial_get_send_delay (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_serial_get_baud (setting, type)); + set_val_str (arr, 2, nmc_property_serial_get_bits (setting, type)); + set_val_str (arr, 3, nmc_property_serial_get_parity (setting, type)); + set_val_str (arr, 4, nmc_property_serial_get_stopbits (setting, type)); + set_val_str (arr, 5, nmc_property_serial_get_send_delay (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8817,7 +9037,10 @@ setting_serial_details (NMSetting *setting, NmCli *nmc, const char *one_prop, g } static gboolean -setting_ppp_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_ppp_details (NMSetting *setting, NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingPpp *s_ppp = NM_SETTING_PPP (setting); NmcOutputField *tmpl, *arr; @@ -8834,24 +9057,24 @@ setting_ppp_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_ppp_get_noauth (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_ppp_get_refuse_eap (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_ppp_get_refuse_pap (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_ppp_get_refuse_chap (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_ppp_get_refuse_mschap (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_ppp_get_refuse_mschapv2 (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_ppp_get_nobsdcomp (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_ppp_get_nodeflate (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_ppp_get_no_vj_comp (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_ppp_get_require_mppe (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_ppp_get_require_mppe_128 (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_ppp_get_mppe_stateful (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_ppp_get_crtscts (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 14, nmc_property_ppp_get_baud (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 15, nmc_property_ppp_get_mru (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 16, nmc_property_ppp_get_mtu (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 17, nmc_property_ppp_get_lcp_echo_failure (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 18, nmc_property_ppp_get_lcp_echo_interval (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_ppp_get_noauth (setting, type)); + set_val_str (arr, 2, nmc_property_ppp_get_refuse_eap (setting, type)); + set_val_str (arr, 3, nmc_property_ppp_get_refuse_pap (setting, type)); + set_val_str (arr, 4, nmc_property_ppp_get_refuse_chap (setting, type)); + set_val_str (arr, 5, nmc_property_ppp_get_refuse_mschap (setting, type)); + set_val_str (arr, 6, nmc_property_ppp_get_refuse_mschapv2 (setting, type)); + set_val_str (arr, 7, nmc_property_ppp_get_nobsdcomp (setting, type)); + set_val_str (arr, 8, nmc_property_ppp_get_nodeflate (setting, type)); + set_val_str (arr, 9, nmc_property_ppp_get_no_vj_comp (setting, type)); + set_val_str (arr, 10, nmc_property_ppp_get_require_mppe (setting, type)); + set_val_str (arr, 11, nmc_property_ppp_get_require_mppe_128 (setting, type)); + set_val_str (arr, 12, nmc_property_ppp_get_mppe_stateful (setting, type)); + set_val_str (arr, 13, nmc_property_ppp_get_crtscts (setting, type)); + set_val_str (arr, 14, nmc_property_ppp_get_baud (setting, type)); + set_val_str (arr, 15, nmc_property_ppp_get_mru (setting, type)); + set_val_str (arr, 16, nmc_property_ppp_get_mtu (setting, type)); + set_val_str (arr, 17, nmc_property_ppp_get_lcp_echo_failure (setting, type)); + set_val_str (arr, 18, nmc_property_ppp_get_lcp_echo_interval (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8860,7 +9083,11 @@ setting_ppp_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo } static gboolean -setting_pppoe_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_pppoe_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingPppoe *s_pppoe = NM_SETTING_PPPOE (setting); NmcOutputField *tmpl, *arr; @@ -8877,10 +9104,10 @@ setting_pppoe_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_pppoe_get_service (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_pppoe_get_username (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, GET_SECRET (secrets, setting, nmc_property_pppoe_get_password)); - set_val_str (arr, 4, nmc_property_pppoe_get_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_pppoe_get_service (setting, type)); + set_val_str (arr, 2, nmc_property_pppoe_get_username (setting, type)); + set_val_str (arr, 3, GET_SECRET (secrets, setting, nmc_property_pppoe_get_password, type)); + set_val_str (arr, 4, nmc_property_pppoe_get_password_flags (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8889,7 +9116,11 @@ setting_pppoe_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb } static gboolean -setting_gsm_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_gsm_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingGsm *s_gsm = NM_SETTING_GSM (setting); NmcOutputField *tmpl, *arr; @@ -8906,18 +9137,19 @@ setting_gsm_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_gsm_get_number (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_gsm_get_username (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, GET_SECRET (secrets, setting, nmc_property_gsm_get_password)); - set_val_str (arr, 4, nmc_property_gsm_get_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_gsm_get_apn (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_gsm_get_network_id (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, GET_SECRET (secrets, setting, nmc_property_gsm_get_pin)); - set_val_str (arr, 8, nmc_property_gsm_get_pin_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_gsm_get_home_only (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_gsm_get_device_id (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_gsm_get_sim_id (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_gsm_get_sim_operator_id (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_gsm_get_number (setting, type)); + set_val_str (arr, 2, nmc_property_gsm_get_username (setting, type)); + set_val_str (arr, 3, GET_SECRET (secrets, setting, nmc_property_gsm_get_password, type)); + set_val_str (arr, 4, nmc_property_gsm_get_password_flags (setting, type)); + set_val_str (arr, 5, nmc_property_gsm_get_apn (setting, type)); + set_val_str (arr, 6, nmc_property_gsm_get_network_id (setting, type)); + set_val_str (arr, 7, GET_SECRET (secrets, setting, nmc_property_gsm_get_pin, type)); + set_val_str (arr, 8, nmc_property_gsm_get_pin_flags (setting, type)); + set_val_str (arr, 9, nmc_property_gsm_get_home_only (setting, type)); + set_val_str (arr, 10, nmc_property_gsm_get_device_id (setting, type)); + set_val_str (arr, 11, nmc_property_gsm_get_sim_id (setting, type)); + set_val_str (arr, 12, nmc_property_gsm_get_sim_operator_id (setting, type)); + set_val_str (arr, 13, nmc_property_gsm_get_mtu (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8926,7 +9158,11 @@ setting_gsm_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo } static gboolean -setting_cdma_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_cdma_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingCdma *s_cdma = NM_SETTING_CDMA (setting); NmcOutputField *tmpl, *arr; @@ -8943,10 +9179,11 @@ setting_cdma_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_cdma_get_number (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_cdma_get_username (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, GET_SECRET (secrets, setting, nmc_property_cdma_get_password)); - set_val_str (arr, 4, nmc_property_cdma_get_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_cdma_get_number (setting, type)); + set_val_str (arr, 2, nmc_property_cdma_get_username (setting, type)); + set_val_str (arr, 3, GET_SECRET (secrets, setting, nmc_property_cdma_get_password, type)); + set_val_str (arr, 4, nmc_property_cdma_get_password_flags (setting, type)); + set_val_str (arr, 5, nmc_property_cdma_get_mtu (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8955,7 +9192,11 @@ setting_cdma_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo } static gboolean -setting_bluetooth_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_bluetooth_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingBluetooth *s_bluetooth = NM_SETTING_BLUETOOTH (setting); NmcOutputField *tmpl, *arr; @@ -8972,8 +9213,8 @@ setting_bluetooth_details (NMSetting *setting, NmCli *nmc, const char *one_prop arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_bluetooth_get_bdaddr (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_bluetooth_get_type (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_bluetooth_get_bdaddr (setting, type)); + set_val_str (arr, 2, nmc_property_bluetooth_get_type (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8982,7 +9223,11 @@ setting_bluetooth_details (NMSetting *setting, NmCli *nmc, const char *one_prop } static gboolean -setting_olpc_mesh_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_olpc_mesh_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingOlpcMesh *s_olpc_mesh = NM_SETTING_OLPC_MESH (setting); NmcOutputField *tmpl, *arr; @@ -8999,9 +9244,9 @@ setting_olpc_mesh_details (NMSetting *setting, NmCli *nmc, const char *one_prop arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_olpc_get_ssid (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_olpc_get_channel (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_olpc_get_anycast_address (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_olpc_get_ssid (setting, type)); + set_val_str (arr, 2, nmc_property_olpc_get_channel (setting, type)); + set_val_str (arr, 3, nmc_property_olpc_get_anycast_address (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9010,7 +9255,11 @@ setting_olpc_mesh_details (NMSetting *setting, NmCli *nmc, const char *one_prop } static gboolean -setting_vpn_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_vpn_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingVpn *s_vpn = NM_SETTING_VPN (setting); NmcOutputField *tmpl, *arr; @@ -9027,12 +9276,12 @@ setting_vpn_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_vpn_get_service_type (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_vpn_get_user_name (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_vpn_get_data (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, GET_SECRET (secrets, setting, nmc_property_vpn_get_secrets)); - set_val_str (arr, 5, nmc_property_vpn_get_persistent (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_vpn_get_timeout (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_vpn_get_service_type (setting, type)); + set_val_str (arr, 2, nmc_property_vpn_get_user_name (setting, type)); + set_val_str (arr, 3, nmc_property_vpn_get_data (setting, type)); + set_val_str (arr, 4, GET_SECRET (secrets, setting, nmc_property_vpn_get_secrets, type)); + set_val_str (arr, 5, nmc_property_vpn_get_persistent (setting, type)); + set_val_str (arr, 6, nmc_property_vpn_get_timeout (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9041,7 +9290,11 @@ setting_vpn_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo } static gboolean -setting_wimax_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_wimax_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingWimax *s_wimax = NM_SETTING_WIMAX (setting); NmcOutputField *tmpl, *arr; @@ -9058,8 +9311,8 @@ setting_wimax_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_wimax_get_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_wimax_get_network_name (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_wimax_get_mac_address (setting, type)); + set_val_str (arr, 2, nmc_property_wimax_get_network_name (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9068,7 +9321,11 @@ setting_wimax_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb } static gboolean -setting_infiniband_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_infiniband_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingInfiniband *s_infiniband = NM_SETTING_INFINIBAND (setting); NmcOutputField *tmpl, *arr; @@ -9085,11 +9342,11 @@ setting_infiniband_details (NMSetting *setting, NmCli *nmc, const char *one_pro arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_ib_get_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_ib_get_mtu (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_ib_get_transport_mode (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_ib_get_p_key (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_ib_get_parent (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_ib_get_mac_address (setting, type)); + set_val_str (arr, 2, nmc_property_ib_get_mtu (setting, type)); + set_val_str (arr, 3, nmc_property_ib_get_transport_mode (setting, type)); + set_val_str (arr, 4, nmc_property_ib_get_p_key (setting, type)); + set_val_str (arr, 5, nmc_property_ib_get_parent (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9098,7 +9355,11 @@ setting_infiniband_details (NMSetting *setting, NmCli *nmc, const char *one_pro } static gboolean -setting_bond_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_bond_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingBond *s_bond = NM_SETTING_BOND (setting); NmcOutputField *tmpl, *arr; @@ -9115,7 +9376,7 @@ setting_bond_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_bond_get_options (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_bond_get_options (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9124,7 +9385,11 @@ setting_bond_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo } static gboolean -setting_vlan_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_vlan_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting); NmcOutputField *tmpl, *arr; @@ -9141,11 +9406,11 @@ setting_vlan_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_vlan_get_parent (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_vlan_get_id (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_vlan_get_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_vlan_get_ingress_priority_map (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_vlan_get_egress_priority_map (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_vlan_get_parent (setting, type)); + set_val_str (arr, 2, nmc_property_vlan_get_id (setting, type)); + set_val_str (arr, 3, nmc_property_vlan_get_flags (setting, type)); + set_val_str (arr, 4, nmc_property_vlan_get_ingress_priority_map (setting, type)); + set_val_str (arr, 5, nmc_property_vlan_get_egress_priority_map (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9154,7 +9419,11 @@ setting_vlan_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo } static gboolean -setting_adsl_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_adsl_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingAdsl *s_adsl = NM_SETTING_ADSL (setting); NmcOutputField *tmpl, *arr; @@ -9171,13 +9440,13 @@ setting_adsl_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_adsl_get_username (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, GET_SECRET (secrets, setting, nmc_property_adsl_get_password)); - set_val_str (arr, 3, nmc_property_adsl_get_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_adsl_get_protocol (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_adsl_get_encapsulation (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_adsl_get_vpi (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_adsl_get_vci (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_adsl_get_username (setting, type)); + set_val_str (arr, 2, GET_SECRET (secrets, setting, nmc_property_adsl_get_password, type)); + set_val_str (arr, 3, nmc_property_adsl_get_password_flags (setting, type)); + set_val_str (arr, 4, nmc_property_adsl_get_protocol (setting, type)); + set_val_str (arr, 5, nmc_property_adsl_get_encapsulation (setting, type)); + set_val_str (arr, 6, nmc_property_adsl_get_vpi (setting, type)); + set_val_str (arr, 7, nmc_property_adsl_get_vci (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9186,7 +9455,11 @@ setting_adsl_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo } static gboolean -setting_bridge_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_bridge_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingBridge *s_bridge = NM_SETTING_BRIDGE (setting); NmcOutputField *tmpl, *arr; @@ -9203,14 +9476,14 @@ setting_bridge_details (NMSetting *setting, NmCli *nmc, const char *one_prop, g arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_bridge_get_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_bridge_get_stp (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_bridge_get_priority (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_bridge_get_forward_delay (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_bridge_get_hello_time (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_bridge_get_max_age (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_bridge_get_ageing_time (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_bridge_get_multicast_snooping (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_bridge_get_mac_address (setting, type)); + set_val_str (arr, 2, nmc_property_bridge_get_stp (setting, type)); + set_val_str (arr, 3, nmc_property_bridge_get_priority (setting, type)); + set_val_str (arr, 4, nmc_property_bridge_get_forward_delay (setting, type)); + set_val_str (arr, 5, nmc_property_bridge_get_hello_time (setting, type)); + set_val_str (arr, 6, nmc_property_bridge_get_max_age (setting, type)); + set_val_str (arr, 7, nmc_property_bridge_get_ageing_time (setting, type)); + set_val_str (arr, 8, nmc_property_bridge_get_multicast_snooping (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9219,7 +9492,11 @@ setting_bridge_details (NMSetting *setting, NmCli *nmc, const char *one_prop, g } static gboolean -setting_bridge_port_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_bridge_port_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingBridgePort *s_bridge_port = NM_SETTING_BRIDGE_PORT (setting); NmcOutputField *tmpl, *arr; @@ -9236,9 +9513,9 @@ setting_bridge_port_details (NMSetting *setting, NmCli *nmc, const char *one_pr arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_bridge_port_get_priority (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_bridge_port_get_path_cost (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_bridge_port_get_hairpin_mode (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_bridge_port_get_priority (setting, type)); + set_val_str (arr, 2, nmc_property_bridge_port_get_path_cost (setting, type)); + set_val_str (arr, 3, nmc_property_bridge_port_get_hairpin_mode (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9247,7 +9524,11 @@ setting_bridge_port_details (NMSetting *setting, NmCli *nmc, const char *one_pr } static gboolean -setting_team_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_team_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingTeam *s_team = NM_SETTING_TEAM (setting); NmcOutputField *tmpl, *arr; @@ -9264,7 +9545,7 @@ setting_team_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_team_get_config (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_team_get_config (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9273,7 +9554,11 @@ setting_team_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo } static gboolean -setting_team_port_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_team_port_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingTeamPort *s_team_port = NM_SETTING_TEAM_PORT (setting); NmcOutputField *tmpl, *arr; @@ -9290,7 +9575,7 @@ setting_team_port_details (NMSetting *setting, NmCli *nmc, const char *one_prop arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_team_port_get_config (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_team_port_get_config (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9299,7 +9584,11 @@ setting_team_port_details (NMSetting *setting, NmCli *nmc, const char *one_prop } static gboolean -setting_dcb_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_dcb_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingDcb *s_dcb = NM_SETTING_DCB (setting); NmcOutputField *tmpl, *arr; @@ -9316,21 +9605,21 @@ setting_dcb_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_dcb_get_app_fcoe_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_dcb_get_app_fcoe_priority (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_dcb_get_app_fcoe_mode (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_dcb_get_app_iscsi_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_dcb_get_app_iscsi_priority (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_dcb_get_app_fip_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_dcb_get_app_fip_priority (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_dcb_get_pfc_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_dcb_get_pfc (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_dcb_get_pg_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_dcb_get_pg_group_id (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_dcb_get_pg_group_bandwidth (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_dcb_get_pg_bandwidth (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 14, nmc_property_dcb_get_pg_strict (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 15, nmc_property_dcb_get_pg_traffic_class (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_dcb_get_app_fcoe_flags (setting, type)); + set_val_str (arr, 2, nmc_property_dcb_get_app_fcoe_priority (setting, type)); + set_val_str (arr, 3, nmc_property_dcb_get_app_fcoe_mode (setting, type)); + set_val_str (arr, 4, nmc_property_dcb_get_app_iscsi_flags (setting, type)); + set_val_str (arr, 5, nmc_property_dcb_get_app_iscsi_priority (setting, type)); + set_val_str (arr, 6, nmc_property_dcb_get_app_fip_flags (setting, type)); + set_val_str (arr, 7, nmc_property_dcb_get_app_fip_priority (setting, type)); + set_val_str (arr, 8, nmc_property_dcb_get_pfc_flags (setting, type)); + set_val_str (arr, 9, nmc_property_dcb_get_pfc (setting, type)); + set_val_str (arr, 10, nmc_property_dcb_get_pg_flags (setting, type)); + set_val_str (arr, 11, nmc_property_dcb_get_pg_group_id (setting, type)); + set_val_str (arr, 12, nmc_property_dcb_get_pg_group_bandwidth (setting, type)); + set_val_str (arr, 13, nmc_property_dcb_get_pg_bandwidth (setting, type)); + set_val_str (arr, 14, nmc_property_dcb_get_pg_strict (setting, type)); + set_val_str (arr, 15, nmc_property_dcb_get_pg_traffic_class (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9339,7 +9628,11 @@ setting_dcb_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo } static gboolean -setting_tun_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_tun_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingTun *s_tun = NM_SETTING_TUN (setting); NmcOutputField *tmpl, *arr; @@ -9356,12 +9649,12 @@ setting_tun_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_tun_get_mode (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_tun_get_owner (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_tun_get_group (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_tun_get_pi (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_tun_get_vnet_hdr (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_tun_get_multi_queue (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_tun_get_mode (setting, type)); + set_val_str (arr, 2, nmc_property_tun_get_owner (setting, type)); + set_val_str (arr, 3, nmc_property_tun_get_group (setting, type)); + set_val_str (arr, 4, nmc_property_tun_get_pi (setting, type)); + set_val_str (arr, 5, nmc_property_tun_get_vnet_hdr (setting, type)); + set_val_str (arr, 6, nmc_property_tun_get_multi_queue (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9370,7 +9663,11 @@ setting_tun_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo } static gboolean -setting_ip_tunnel_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_ip_tunnel_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingIPTunnel *s_ip_tunnel = NM_SETTING_IP_TUNNEL (setting); NmcOutputField *tmpl, *arr; @@ -9387,18 +9684,18 @@ setting_ip_tunnel_details (NMSetting *setting, NmCli *nmc, const char *one_prop arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_ip_tunnel_get_mode (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_ip_tunnel_get_parent (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_ip_tunnel_get_local (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_ip_tunnel_get_remote (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_ip_tunnel_get_ttl (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_ip_tunnel_get_tos (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_ip_tunnel_get_path_mtu_discovery (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_ip_tunnel_get_input_key (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_ip_tunnel_get_output_key (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_ip_tunnel_get_encapsulation_limit (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_ip_tunnel_get_flow_label (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_ip_tunnel_get_mtu (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_ip_tunnel_get_mode (setting, type)); + set_val_str (arr, 2, nmc_property_ip_tunnel_get_parent (setting, type)); + set_val_str (arr, 3, nmc_property_ip_tunnel_get_local (setting, type)); + set_val_str (arr, 4, nmc_property_ip_tunnel_get_remote (setting, type)); + set_val_str (arr, 5, nmc_property_ip_tunnel_get_ttl (setting, type)); + set_val_str (arr, 6, nmc_property_ip_tunnel_get_tos (setting, type)); + set_val_str (arr, 7, nmc_property_ip_tunnel_get_path_mtu_discovery (setting, type)); + set_val_str (arr, 8, nmc_property_ip_tunnel_get_input_key (setting, type)); + set_val_str (arr, 9, nmc_property_ip_tunnel_get_output_key (setting, type)); + set_val_str (arr, 10, nmc_property_ip_tunnel_get_encapsulation_limit (setting, type)); + set_val_str (arr, 11, nmc_property_ip_tunnel_get_flow_label (setting, type)); + set_val_str (arr, 12, nmc_property_ip_tunnel_get_mtu (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9407,7 +9704,11 @@ setting_ip_tunnel_details (NMSetting *setting, NmCli *nmc, const char *one_prop } static gboolean -setting_macsec_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_macsec_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingMacsec *s_macsec = NM_SETTING_MACSEC (setting); NmcOutputField *tmpl, *arr; @@ -9424,14 +9725,14 @@ setting_macsec_details (NMSetting *setting, NmCli *nmc, const char *one_prop, g arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_macsec_get_parent (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_macsec_get_mode (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_macsec_get_encrypt (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, GET_SECRET (secrets, setting, nmc_property_macsec_get_mka_cak)); - set_val_str (arr, 5, nmc_property_macsec_get_mka_cak_flags (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_macsec_get_mka_ckn (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_macsec_get_port (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_macsec_get_validation (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_macsec_get_parent (setting, type)); + set_val_str (arr, 2, nmc_property_macsec_get_mode (setting, type)); + set_val_str (arr, 3, nmc_property_macsec_get_encrypt (setting, type)); + set_val_str (arr, 4, GET_SECRET (secrets, setting, nmc_property_macsec_get_mka_cak, type)); + set_val_str (arr, 5, nmc_property_macsec_get_mka_cak_flags (setting, type)); + set_val_str (arr, 6, nmc_property_macsec_get_mka_ckn (setting, type)); + set_val_str (arr, 7, nmc_property_macsec_get_port (setting, type)); + set_val_str (arr, 8, nmc_property_macsec_get_validation (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9440,7 +9741,11 @@ setting_macsec_details (NMSetting *setting, NmCli *nmc, const char *one_prop, g } static gboolean -setting_macvlan_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_macvlan_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingMacvlan *s_macvlan = NM_SETTING_MACVLAN (setting); NmcOutputField *tmpl, *arr; @@ -9457,10 +9762,10 @@ setting_macvlan_details (NMSetting *setting, NmCli *nmc, const char *one_prop, arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_macvlan_get_parent (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_macvlan_get_mode (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_macvlan_get_promiscuous (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_macvlan_get_tap (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_macvlan_get_parent (setting, type)); + set_val_str (arr, 2, nmc_property_macvlan_get_mode (setting, type)); + set_val_str (arr, 3, nmc_property_macvlan_get_promiscuous (setting, type)); + set_val_str (arr, 4, nmc_property_macvlan_get_tap (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9469,7 +9774,11 @@ setting_macvlan_details (NMSetting *setting, NmCli *nmc, const char *one_prop, } static gboolean -setting_vxlan_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_vxlan_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingVxlan *s_vxlan = NM_SETTING_VXLAN (setting); NmcOutputField *tmpl, *arr; @@ -9486,22 +9795,22 @@ setting_vxlan_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_vxlan_get_parent (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_vxlan_get_id (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_vxlan_get_local (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_vxlan_get_remote (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_vxlan_get_source_port_min (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_vxlan_get_source_port_max (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_vxlan_get_destination_port (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_vxlan_get_tos (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_vxlan_get_ttl (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_vxlan_get_ageing (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_vxlan_get_limit (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_vxlan_get_learning (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_vxlan_get_proxy (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 14, nmc_property_vxlan_get_rsc (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 15, nmc_property_vxlan_get_l2_miss (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 16, nmc_property_vxlan_get_l3_miss (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_vxlan_get_parent (setting, type)); + set_val_str (arr, 2, nmc_property_vxlan_get_id (setting, type)); + set_val_str (arr, 3, nmc_property_vxlan_get_local (setting, type)); + set_val_str (arr, 4, nmc_property_vxlan_get_remote (setting, type)); + set_val_str (arr, 5, nmc_property_vxlan_get_source_port_min (setting, type)); + set_val_str (arr, 6, nmc_property_vxlan_get_source_port_max (setting, type)); + set_val_str (arr, 7, nmc_property_vxlan_get_destination_port (setting, type)); + set_val_str (arr, 8, nmc_property_vxlan_get_tos (setting, type)); + set_val_str (arr, 9, nmc_property_vxlan_get_ttl (setting, type)); + set_val_str (arr, 10, nmc_property_vxlan_get_ageing (setting, type)); + set_val_str (arr, 11, nmc_property_vxlan_get_limit (setting, type)); + set_val_str (arr, 12, nmc_property_vxlan_get_learning (setting, type)); + set_val_str (arr, 13, nmc_property_vxlan_get_proxy (setting, type)); + set_val_str (arr, 14, nmc_property_vxlan_get_rsc (setting, type)); + set_val_str (arr, 15, nmc_property_vxlan_get_l2_miss (setting, type)); + set_val_str (arr, 16, nmc_property_vxlan_get_l3_miss (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9510,7 +9819,11 @@ setting_vxlan_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb } static gboolean -setting_proxy_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) +setting_proxy_details (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type) { NMSettingProxy *s_proxy = NM_SETTING_PROXY (setting); NmcOutputField *tmpl, *arr; @@ -9527,10 +9840,10 @@ setting_proxy_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_proxy_get_method (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 2, nmc_property_proxy_get_browser_only (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 3, nmc_property_proxy_get_pac_url (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_proxy_get_pac_script (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 1, nmc_property_proxy_get_method (setting, type)); + set_val_str (arr, 2, nmc_property_proxy_get_browser_only (setting, type)); + set_val_str (arr, 3, nmc_property_proxy_get_pac_url (setting, type)); + set_val_str (arr, 4, nmc_property_proxy_get_pac_script (setting, type)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -9540,7 +9853,11 @@ setting_proxy_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb typedef struct { const char *sname; - gboolean (*func) (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets); + gboolean (*func) (NMSetting *setting, + NmCli *nmc, + const char *one_prop, + gboolean secrets, + NmcPropertyGetType type); } SettingDetails; static const SettingDetails detail_printers[] = { @@ -9582,12 +9899,16 @@ gboolean setting_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) { const SettingDetails *iter = &detail_printers[0]; + NmcPropertyGetType type = NMC_PROPERTY_GET_PRETTY; g_return_val_if_fail (NM_IS_SETTING (setting), FALSE); + if (nmc->print_output == NMC_PRINT_TERSE) + type = NMC_PROPERTY_GET_PARSABLE; + while (iter->sname) { if (nm_setting_lookup_type (iter->sname) == G_OBJECT_TYPE (setting)) - return iter->func (setting, nmc, one_prop, secrets); + return iter->func (setting, nmc, one_prop, secrets, type); iter++; } diff --git a/clients/cli/settings.h b/clients/cli/settings.h index ad503f9e..f663aa46 100644 --- a/clients/cli/settings.h +++ b/clients/cli/settings.h @@ -95,5 +95,6 @@ extern NmcOutputField nmc_fields_setting_macvlan[]; extern NmcOutputField nmc_fields_setting_macsec[]; extern NmcOutputField nmc_fields_setting_vxlan[]; extern NmcOutputField nmc_fields_setting_proxy[]; +extern NmcOutputField nmc_fields_setting_dummy[]; #endif /* NMC_SETTINGS_H */ diff --git a/clients/cli/utils.c b/clients/cli/utils.c index ff98276a..24686ec7 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -28,27 +28,90 @@ #include #include "utils.h" +#include "common.h" -int +gboolean matches (const char *cmd, const char *pattern) { size_t len = strlen (cmd); if (!len || len > strlen (pattern)) - return -1; - return memcmp (pattern, cmd, len); + return FALSE; + return memcmp (pattern, cmd, len) == 0; } +static gboolean +parse_global_arg (NmCli *nmc, const char *arg) +{ + if (nmc_arg_is_option (arg, "ask")) + nmc->ask = TRUE; + else if (nmc_arg_is_option (arg, "show-secrets")) + nmc->show_secrets = TRUE; + else + return FALSE; + + return TRUE; +} +/** + * next_arg: + * @nmc: NmCli data + * @*argc: pointer to left number of arguments to parse + * @***argv: pointer to const char *array of arguments still to parse + * @...: a %NULL terminated list of cmd options to match (e.g., "--active") + * + * Takes care of autocompleting options when needed and performs + * match against passed options while moving forward the pointer + * to the remaining arguments. + * + * Returns: the number of the matched option if a match is found against + * one of the custom options passed; 0 if no custom option matched and still + * some args need to be processed or autocompletion has been performed; + * -1 otherwise (no more args). + */ int -next_arg (int *argc, char ***argv) +next_arg (NmCli *nmc, int *argc, char ***argv, ...) { - int arg_num = *argc; + va_list args; + const char *cmd_option; - if (arg_num > 0) { - (*argc)--; - (*argv)++; - } - if (arg_num <= 1) - return -1; + g_assert (*argc >= 0); + + do { + int cmd_option_pos = 1; + + if (*argc > 0) { + (*argc)--; + (*argv)++; + } + if (*argc == 0) + return -1; + + + va_start (args, argv); + + if (nmc && nmc->complete && *argc == 1) { + while ((cmd_option = va_arg (args, const char *))) + nmc_complete_strings (**argv, cmd_option, NULL); + + if (***argv == '-') + nmc_complete_strings (**argv, "--ask", "--show-secrets", NULL); + + va_end (args); + return 0; + } + + /* Check command dependent options first */ + while ((cmd_option = va_arg (args, const char *))) { + /* strip heading "--" form cmd_option */ + if (nmc_arg_is_option (**argv, cmd_option + 2)) { + va_end (args); + return cmd_option_pos; + } + cmd_option_pos++; + } + + va_end (args); + + } while (nmc && parse_global_arg (nmc, **argv)); return 0; } @@ -58,9 +121,9 @@ nmc_arg_is_help (const char *arg) { if (!arg) return FALSE; - if ( matches (arg, "help") == 0 - || (g_str_has_prefix (arg, "-") && matches (arg+1, "help") == 0) - || (g_str_has_prefix (arg, "--") && matches (arg+2, "help") == 0)) { + if ( matches (arg, "help") + || (g_str_has_prefix (arg, "-") && matches (arg + 1, "help")) + || (g_str_has_prefix (arg, "--") && matches (arg + 2, "help"))) { return TRUE; } return FALSE; @@ -79,10 +142,9 @@ nmc_arg_is_option (const char *str, const char *opt_name) p = (str[1] == '-') ? str + 2 : str + 1; - return (*p ? (matches (p, opt_name) == 0) : FALSE); + return (*p ? matches (p, opt_name) : FALSE); } - /* * Helper function to parse command-line arguments. * arg_arr: description of arguments to look for @@ -117,7 +179,9 @@ nmc_parse_args (nmc_arg_t *arg_arr, gboolean last, int *argc, char ***argv, GErr } if (p->has_value) { - if (next_arg (argc, argv) != 0) { + (*argc)--; + (*argv)++; + if (!*argc) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("Error: value for '%s' argument is required."), *(*argv-1)); return FALSE; @@ -151,7 +215,7 @@ nmc_parse_args (nmc_arg_t *arg_arr, gboolean last, int *argc, char ***argv, GErr return FALSE; } - next_arg (argc, argv); + next_arg (NULL, argc, argv, NULL); } return TRUE; @@ -941,24 +1005,6 @@ nmc_get_allowed_fields (const NmcOutputField fields_array[], int group_idx) return g_string_free (allowed_fields, FALSE); } -gboolean -nmc_terse_option_check (NMCPrintOutput print_output, const char *fields, GError **error) -{ - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - if (print_output == NMC_PRINT_TERSE) { - if (!fields) { - g_set_error_literal (error, NMCLI_ERROR, 0, _("Option '--terse' requires specifying '--fields'")); - return FALSE; - } else if ( !strcasecmp (fields, "all") - || !strcasecmp (fields, "common")) { - g_set_error (error, NMCLI_ERROR, 0, _("Option '--terse' requires specific '--fields' option values , not '%s'"), fields); - return FALSE; - } - } - return TRUE; -} - NmcOutputField * nmc_dup_fields_array (NmcOutputField fields[], size_t size, guint32 flags) { @@ -992,54 +1038,55 @@ nmc_empty_output_fields (NmCli *nmc) } } -static char * +static const char * colorize_string (NmCli *nmc, NmcTermColor color, NmcTermFormat color_fmt, const char *str, - gboolean *dealloc) + char **out_to_free) { - char *out; + const char *out = str; if ( use_colors (nmc) && (color != NMC_TERM_COLOR_NORMAL || color_fmt != NMC_TERM_FORMAT_NORMAL)) { - out = nmc_colorize (nmc, color, color_fmt, "%s", str); - *dealloc = TRUE; - } else { - out = (char *) str; - *dealloc = FALSE; + *out_to_free = nmc_colorize (nmc, color, color_fmt, "%s", str); + out = *out_to_free; } + return out; } -static char * +static const char * get_value_to_print (NmCli *nmc, NmcOutputField *field, gboolean field_name, const char *not_set_str, - gboolean *dealloc) + char **out_to_free) { gboolean is_array = field->value_is_array; - char *value, *out; - gboolean free_value, free_out; + char *value; + const char *out; + gboolean free_value; if (field_name) value = _(field->name_l10n); else - value = field->value ? - (is_array ? g_strjoinv (" | ", (char **) field->value) : - (char *) field->value) : - (char *) not_set_str; + value = field->value + ? (is_array + ? g_strjoinv (" | ", (char **) field->value) + : (*((char *) field->value) + ? (char *) field->value + : (char *) not_set_str)) + : (char *) not_set_str; free_value = field->value && is_array && !field_name; /* colorize the value */ - out = colorize_string (nmc, field->color, field->color_fmt, value, &free_out); - if (free_out) { + out = colorize_string (nmc, field->color, field->color_fmt, value, out_to_free); + if (*out_to_free) { if (free_value) g_free (value); - *dealloc = TRUE; - } else - *dealloc = free_value; + } else if (free_value) + *out_to_free = value; return out; } @@ -1072,104 +1119,111 @@ print_required_fields (NmCli *nmc, const NmcOutputField field_values[]) gboolean section_prefix = field_values[0].flags & NMC_OF_FLAG_SECTION_PREFIX; gboolean main_header = main_header_add || main_header_only; - /* No headers are printed in terse mode: - * - neither main header nor field (column) names - */ - if ((main_header_only || field_names) && terse) - return; + enum { ML_HEADER_WIDTH = 79 }; + enum { ML_VALUE_INDENT = 40 }; - if (multiline) { - /* --- Multiline mode --- */ - enum { ML_HEADER_WIDTH = 79 }; - enum { ML_VALUE_INDENT = 40 }; - if (main_header && pretty) { - /* Print the main header */ - int header_width = nmc_string_screen_width (fields.header_name, NULL) + 4; - table_width = header_width < ML_HEADER_WIDTH ? ML_HEADER_WIDTH : header_width; + /* --- Main header --- */ + if (main_header && pretty) { + int header_width = nmc_string_screen_width (fields.header_name, NULL) + 4; + + if (multiline) { + table_width = header_width < ML_HEADER_WIDTH ? ML_HEADER_WIDTH : header_width; line = g_strnfill (ML_HEADER_WIDTH, '='); - width1 = strlen (fields.header_name); - width2 = nmc_string_screen_width (fields.header_name, NULL); - g_print ("%s\n", line); - g_print ("%*s\n", (table_width + width2)/2 + width1 - width2, fields.header_name); - g_print ("%s\n", line); - g_free (line); + } else { /* tabular */ + table_width = table_width < header_width ? header_width : table_width; + line = g_strnfill (table_width, '='); } - /* Print values */ - if (!main_header_only && !field_names) { - for (i = 0; i < fields.indices->len; i++) { - char *tmp; - gboolean free_print_val; - int idx = g_array_index (fields.indices, int, i); - gboolean is_array = field_values[idx].value_is_array; - - /* section prefix can't be an array */ - g_assert (!is_array || !section_prefix || idx != 0); - - if (section_prefix && idx == 0) /* The first field is section prefix */ - continue; - - if (is_array) { - /* value is a null-terminated string array */ - const char **p, *val; - char *print_val; - int j; - - for (p = (const char **) field_values[idx].value, j = 1; p && *p; p++, j++) { - val = *p ? *p : not_set_str; - print_val = colorize_string (nmc, field_values[idx].color, field_values[idx].color_fmt, - val, &free_print_val); - tmp = g_strdup_printf ("%s%s%s[%d]:", - section_prefix ? (const char*) field_values[0].value : "", - section_prefix ? "." : "", - _(field_values[idx].name_l10n), - j); - width1 = strlen (tmp); - width2 = nmc_string_screen_width (tmp, NULL); - g_print ("%-*s%s\n", terse ? 0 : ML_VALUE_INDENT+width1-width2, tmp, print_val); - g_free (tmp); - if (free_print_val) - g_free (print_val); - } - } else { - /* value is a string */ - const char *hdr_name = (const char*) field_values[0].value; - const char *val = (const char*) field_values[idx].value; - char *print_val; + width1 = strlen (fields.header_name); + width2 = nmc_string_screen_width (fields.header_name, NULL); + g_print ("%s\n", line); + g_print ("%*s\n", (table_width + width2)/2 + width1 - width2, fields.header_name); + g_print ("%s\n", line); + g_free (line); + } + + if (main_header_only) + return; + + /* No field headers are printed in terse mode nor for multiline output */ + if ((terse || multiline) && field_names) + return; + + if (terse) + not_set_str = ""; /* Don't replace empty strings in terse mode */ + + + if (multiline) { + for (i = 0; i < fields.indices->len; i++) { + char *tmp; + int idx = g_array_index (fields.indices, int, i); + gboolean is_array = field_values[idx].value_is_array; - val = val ? val : not_set_str; + /* section prefix can't be an array */ + g_assert (!is_array || !section_prefix || idx != 0); + + if (section_prefix && idx == 0) /* The first field is section prefix */ + continue; + + if (is_array) { + /* value is a null-terminated string array */ + const char **p, *val, *print_val; + gs_free char *val_to_free = NULL; + int j; + + for (p = (const char **) field_values[idx].value, j = 1; p && *p; p++, j++) { + val = *p ? *p : not_set_str; print_val = colorize_string (nmc, field_values[idx].color, field_values[idx].color_fmt, - val, &free_print_val); - tmp = g_strdup_printf ("%s%s%s:", - section_prefix ? hdr_name : "", + val, &val_to_free); + tmp = g_strdup_printf ("%s%s%s[%d]:", + section_prefix ? (const char*) field_values[0].value : "", section_prefix ? "." : "", - _(field_values[idx].name_l10n)); + _(field_values[idx].name_l10n), + j); width1 = strlen (tmp); width2 = nmc_string_screen_width (tmp, NULL); g_print ("%-*s%s\n", terse ? 0 : ML_VALUE_INDENT+width1-width2, tmp, print_val); g_free (tmp); - if (free_print_val) - g_free (print_val); } + } else { + /* value is a string */ + const char *hdr_name = (const char*) field_values[0].value; + const char *val = (const char*) field_values[idx].value; + const char *print_val; + gs_free char *val_to_free = NULL; + + val = val && *val ? val : not_set_str; + print_val = colorize_string (nmc, field_values[idx].color, field_values[idx].color_fmt, + val, &val_to_free); + tmp = g_strdup_printf ("%s%s%s:", + section_prefix ? hdr_name : "", + section_prefix ? "." : "", + _(field_values[idx].name_l10n)); + width1 = strlen (tmp); + width2 = nmc_string_screen_width (tmp, NULL); + g_print ("%-*s%s\n", terse ? 0 : ML_VALUE_INDENT+width1-width2, tmp, print_val); + g_free (tmp); } - if (pretty) { - line = g_strnfill (ML_HEADER_WIDTH, '-'); - g_print ("%s\n", line); - g_free (line); - } } + if (pretty) { + line = g_strnfill (ML_HEADER_WIDTH, '-'); + g_print ("%s\n", line); + g_free (line); + } + return; } /* --- Tabular mode: each line = one object --- */ + str = g_string_new (NULL); for (i = 0; i < fields.indices->len; i++) { int idx = g_array_index (fields.indices, int, i); - gboolean dealloc; - char *value = get_value_to_print (nmc, (NmcOutputField *) field_values+idx, field_names, - not_set_str, &dealloc); + gs_free char *val_to_free = NULL; + const char *value = get_value_to_print (nmc, (NmcOutputField *) field_values+idx, field_names, + not_set_str, &val_to_free); if (terse) { if (escape) { @@ -1187,31 +1241,14 @@ print_required_fields (NmCli *nmc, const NmcOutputField field_values[]) } else { width1 = strlen (value); width2 = nmc_string_screen_width (value, NULL); /* Width of the string (in screen colums) */ - g_string_append_printf (str, "%-*s", field_values[idx].width + width1 - width2, strlen (value) > 0 ? value : "--"); + g_string_append_printf (str, "%-*s", field_values[idx].width + width1 - width2, strlen (value) > 0 ? value : not_set_str); g_string_append_c (str, ' '); /* Column separator */ table_width += field_values[idx].width + width1 - width2 + 1; } - - if (dealloc) - g_free (value); - } - - /* Print the main table header */ - if (main_header && pretty) { - int header_width = nmc_string_screen_width (fields.header_name, NULL) + 4; - table_width = table_width < header_width ? header_width : table_width; - - line = g_strnfill (table_width, '='); - width1 = strlen (fields.header_name); - width2 = nmc_string_screen_width (fields.header_name, NULL); - g_print ("%s\n", line); - g_print ("%*s\n", (table_width + width2)/2 + width1 - width2, fields.header_name); - g_print ("%s\n", line); - g_free (line); } /* Print actual values */ - if (!main_header_only && str->len > 0) { + if (str->len > 0) { g_string_truncate (str, str->len-1); /* Chop off last column separator */ if (fields.indent > 0) { indent_str = g_strnfill (fields.indent, ' '); @@ -1219,11 +1256,9 @@ print_required_fields (NmCli *nmc, const NmcOutputField field_values[]) g_free (indent_str); } g_print ("%s\n", str->str); - } - /* Print horizontal separator */ - if (!main_header_only && field_names && pretty) { - if (str->len > 0) { + /* Print horizontal separator */ + if (field_names && pretty) { line = g_strnfill (table_width, '-'); g_print ("%s\n", line); g_free (line); @@ -1263,15 +1298,15 @@ print_data (NmCli *nmc) for (i = 0; i < num_fields; i++) { size_t max_width = 0; for (j = 0; j < nmc->output_data->len; j++) { - gboolean field_names, dealloc; - char *value; + gboolean field_names; + gs_free char * val_to_free = NULL; + const char *value; + row = g_ptr_array_index (nmc->output_data, j); field_names = row[0].flags & NMC_OF_FLAG_FIELD_NAMES; - value = get_value_to_print (NULL, row+i, field_names, "--", &dealloc); + value = get_value_to_print (NULL, row+i, field_names, "--", &val_to_free); len = nmc_string_screen_width (value, NULL); max_width = len > max_width ? len : max_width; - if (dealloc) - g_free (value); } for (j = 0; j < nmc->output_data->len; j++) { row = g_ptr_array_index (nmc->output_data, j); diff --git a/clients/cli/utils.h b/clients/cli/utils.h index 5adbd2be..a1c08764 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -39,8 +39,8 @@ typedef enum { } NMCTriStateValue; /* === Functions === */ -int matches (const char *cmd, const char *pattern); -int next_arg (int *argc, char ***argv); +gboolean matches (const char *cmd, const char *pattern); +int next_arg (NmCli *nmc, int *argc, char ***argv, ...); gboolean nmc_arg_is_help (const char *arg); gboolean nmc_arg_is_option (const char *arg, const char *opt_name); gboolean nmc_parse_args (nmc_arg_t *arg_arr, gboolean last, int *argc, char ***argv, GError **error); @@ -97,7 +97,6 @@ GArray *parse_output_fields (const char *fields_str, GPtrArray **group_fields, GError **error); char *nmc_get_allowed_fields (const NmcOutputField fields_array[], int group_idx); -gboolean nmc_terse_option_check (NMCPrintOutput print_output, const char *fields, GError **error); NmcOutputField *nmc_dup_fields_array (NmcOutputField fields[], size_t size, guint32 flags); void nmc_empty_output_fields (NmCli *nmc); void print_required_fields (NmCli *nmc, const NmcOutputField field_values[]); diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h index f85ba65c..2989723d 100644 --- a/clients/common/nm-secret-agent-simple.h +++ b/clients/common/nm-secret-agent-simple.h @@ -19,8 +19,8 @@ #ifndef __NM_SECRET_AGENT_SIMPLE_H__ #define __NM_SECRET_AGENT_SIMPLE_H__ -#include -#include +#include "NetworkManager.h" +#include "nm-secret-agent-old.h" #define NM_TYPE_SECRET_AGENT_SIMPLE (nm_secret_agent_simple_get_type ()) #define NM_SECRET_AGENT_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple)) diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h index 9ad6b3b6..9e3b8539 100644 --- a/clients/common/nm-vpn-helpers.h +++ b/clients/common/nm-vpn-helpers.h @@ -19,7 +19,7 @@ #ifndef __NM_VPN_HELPERS_H__ #define __NM_VPN_HELPERS_H__ -#include +#include "NetworkManager.h" typedef struct { const char *name; diff --git a/clients/tui/nm-editor-bindings.h b/clients/tui/nm-editor-bindings.h index fd4fcd30..facbf1c6 100644 --- a/clients/tui/nm-editor-bindings.h +++ b/clients/tui/nm-editor-bindings.h @@ -19,7 +19,7 @@ #ifndef NM_EDITOR_BINDINGS_H #define NM_EDITOR_BINDINGS_H -#include +#include "NetworkManager.h" void nm_editor_bindings_init (void); diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index 90a0c83b..b71e9fbe 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -316,6 +316,33 @@ get_available_connection_name (const char *format, return cname; } +static char * +get_available_iface_name (const char *try_name, + NMClient *client) +{ + const GPtrArray *connections; + NMConnection *connection; + char *new_name; + unsigned num = 1; + int i = 0; + const char *ifname = NULL; + + connections = nm_client_get_connections (client); + + new_name = g_strdup (try_name); + while (i < connections->len) { + connection = NM_CONNECTION (connections->pdata[i]); + ifname = nm_connection_get_interface_name (connection); + if (g_strcmp0 (new_name, ifname) == 0) { + g_free (new_name); + new_name = g_strdup_printf ("%s%d", try_name, num++); + i = 0; + } else + i++; + } + return new_name; +} + /** * nm_editor_utils_create_connection: * @type: the type of the connection's primary #NMSetting @@ -343,7 +370,7 @@ nm_editor_utils_create_connection (GType type, NMConnection *connection; NMSettingConnection *s_con; NMSetting *s_hw, *s_slave; - char *uuid, *id; + char *uuid, *id, *ifname; int i; if (master) { @@ -376,6 +403,15 @@ nm_editor_utils_create_connection (GType type, s_hw = g_object_new (type, NULL); nm_connection_add_setting (connection, s_hw); + if (type == NM_TYPE_SETTING_BOND) + ifname = get_available_iface_name ("nm-bond", client); + else if (type == NM_TYPE_SETTING_TEAM) + ifname = get_available_iface_name ("nm-team", client); + else if (type == NM_TYPE_SETTING_BRIDGE) + ifname = get_available_iface_name ("nm-bridge", client); + else + ifname = NULL; + if (slave_setting_type != G_TYPE_INVALID) { s_slave = g_object_new (slave_setting_type, NULL); nm_connection_add_setting (connection, s_slave); @@ -391,10 +427,12 @@ nm_editor_utils_create_connection (GType type, NM_SETTING_CONNECTION_AUTOCONNECT, !type_data->no_autoconnect, NM_SETTING_CONNECTION_MASTER, master_uuid, NM_SETTING_CONNECTION_SLAVE_TYPE, master_setting_type, + NM_SETTING_CONNECTION_INTERFACE_NAME, ifname, NULL); g_free (uuid); g_free (id); + g_free (ifname); if (type_data->connection_setup_func) type_data->connection_setup_func (connection, s_con, s_hw); diff --git a/clients/tui/nm-editor-utils.h b/clients/tui/nm-editor-utils.h index 15a16cd2..6f66edfe 100644 --- a/clients/tui/nm-editor-utils.h +++ b/clients/tui/nm-editor-utils.h @@ -19,7 +19,7 @@ #ifndef NM_EDITOR_UTILS_H #define NM_EDITOR_UTILS_H -#include +#include "NetworkManager.h" typedef struct { const char *name; diff --git a/clients/tui/nmt-device-entry.h b/clients/tui/nmt-device-entry.h index 4945e7c2..9278244f 100644 --- a/clients/tui/nmt-device-entry.h +++ b/clients/tui/nmt-device-entry.h @@ -21,7 +21,7 @@ #include "nmt-editor-grid.h" -#include +#include "NetworkManager.h" #define NMT_TYPE_DEVICE_ENTRY (nmt_device_entry_get_type ()) #define NMT_DEVICE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_DEVICE_ENTRY, NmtDeviceEntry)) diff --git a/clients/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c index a1a59e01..e90140b3 100644 --- a/clients/tui/nmt-edit-connection-list.c +++ b/clients/tui/nmt-edit-connection-list.c @@ -319,6 +319,33 @@ listbox_activated (NmtNewtWidget *listbox, gpointer list) edit_clicked (NMT_NEWT_BUTTON (priv->edit), list); } + +static void +connection_saved (GObject *conn, + GAsyncResult *result, + gpointer user_data) +{ + nm_remote_connection_save_finish (NM_REMOTE_CONNECTION (conn), result, NULL); +} + +void +nmt_edit_connection_list_recommit (NmtEditConnectionList *list) +{ + NmtEditConnectionListPrivate *priv = NMT_EDIT_CONNECTION_LIST_GET_PRIVATE (list); + NMConnection *conn; + GSList *iter; + + for (iter = priv->connections; iter; iter = iter->next) { + conn = iter->data; + + if ( NM_IS_REMOTE_CONNECTION (conn) + && (nm_remote_connection_get_unsaved (NM_REMOTE_CONNECTION (conn)) == FALSE)) { + nm_remote_connection_save_async (NM_REMOTE_CONNECTION (conn), + NULL, connection_saved, NULL); + } + } +} + static void nmt_edit_connection_list_finalize (GObject *object) { diff --git a/clients/tui/nmt-edit-connection-list.h b/clients/tui/nmt-edit-connection-list.h index fd492bce..9726e287 100644 --- a/clients/tui/nmt-edit-connection-list.h +++ b/clients/tui/nmt-edit-connection-list.h @@ -21,7 +21,7 @@ #include "nmt-newt.h" -#include +#include "NetworkManager.h" #define NMT_TYPE_EDIT_CONNECTION_LIST (nmt_edit_connection_list_get_type ()) #define NMT_EDIT_CONNECTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDIT_CONNECTION_LIST, NmtEditConnectionList)) @@ -52,4 +52,6 @@ typedef gboolean (*NmtEditConnectionListFilter) (NmtEditConnectionList *list, NMConnection *connection, gpointer user_data); +void nmt_edit_connection_list_recommit (NmtEditConnectionList *list); + #endif /* NMT_EDIT_CONNECTION_LIST_H */ diff --git a/clients/tui/nmt-editor-page.c b/clients/tui/nmt-editor-page.c index 44abe273..99475a91 100644 --- a/clients/tui/nmt-editor-page.c +++ b/clients/tui/nmt-editor-page.c @@ -112,6 +112,23 @@ nmt_editor_page_add_section (NmtEditorPage *page, priv->sections = g_slist_append (priv->sections, g_object_ref_sink (section)); } +/** + * nmt_editor_page_saved: + * @page: the #NmtEditorPage + * + * This method is called when the user saves the connection. It gives + * the page a chance to do save its data outside the connections (such as + * recommit the slave connections). + */ +void +nmt_editor_page_saved (NmtEditorPage *page) +{ + NmtEditorPageClass *editor_page_class = NMT_EDITOR_PAGE_GET_CLASS (page); + + if (editor_page_class->saved) + editor_page_class->saved (page); +} + static void nmt_editor_page_set_property (GObject *object, guint prop_id, diff --git a/clients/tui/nmt-editor-page.h b/clients/tui/nmt-editor-page.h index 8da5ea9f..93a66155 100644 --- a/clients/tui/nmt-editor-page.h +++ b/clients/tui/nmt-editor-page.h @@ -19,7 +19,7 @@ #ifndef NMT_EDITOR_PAGE_H #define NMT_EDITOR_PAGE_H -#include +#include "NetworkManager.h" #include "nmt-editor-grid.h" #include "nmt-editor-section.h" @@ -39,6 +39,7 @@ typedef struct { typedef struct { GObjectClass parent; + void (*saved) (NmtEditorPage *page); } NmtEditorPageClass; GType nmt_editor_page_get_type (void); @@ -47,6 +48,8 @@ NMConnection *nmt_editor_page_get_connection (NmtEditorPage *page); GSList *nmt_editor_page_get_sections (NmtEditorPage *page); +void nmt_editor_page_saved (NmtEditorPage *page); + /*< protected >*/ void nmt_editor_page_add_section (NmtEditorPage *page, NmtEditorSection *section); diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c index 395e661a..515e3471 100644 --- a/clients/tui/nmt-editor.c +++ b/clients/tui/nmt-editor.c @@ -145,6 +145,15 @@ connection_added (GObject *client, g_clear_error (&error); } +static void +page_saved (gpointer data, gpointer user_data) +{ + NmtEditorPage *page = data; + + nmt_editor_page_saved (page); +} + + static void save_connection_and_exit (NmtNewtButton *button, gpointer user_data) @@ -183,6 +192,9 @@ save_connection_and_exit (NmtNewtButton *button, } } + /* Let the page know that it was saved. */ + g_slist_foreach (priv->pages, page_saved, NULL); + nmt_newt_form_quit (NMT_NEWT_FORM (editor)); } diff --git a/clients/tui/nmt-editor.h b/clients/tui/nmt-editor.h index b000f64e..5620c5e8 100644 --- a/clients/tui/nmt-editor.h +++ b/clients/tui/nmt-editor.h @@ -19,7 +19,7 @@ #ifndef NMT_EDITOR_H #define NMT_EDITOR_H -#include +#include "NetworkManager.h" #include "nmt-newt.h" diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c index 259ecfc1..48070dbf 100644 --- a/clients/tui/nmt-page-bond.c +++ b/clients/tui/nmt-page-bond.c @@ -423,12 +423,22 @@ nmt_page_bond_constructed (GObject *object) G_OBJECT_CLASS (nmt_page_bond_parent_class)->constructed (object); } +static void +nmt_page_bond_saved (NmtEditorPage *editor_page) +{ + NmtPageBondPrivate *priv = NMT_PAGE_BOND_GET_PRIVATE (editor_page); + + nmt_edit_connection_list_recommit (NMT_EDIT_CONNECTION_LIST (priv->slaves)); +} + static void nmt_page_bond_class_init (NmtPageBondClass *bond_class) { GObjectClass *object_class = G_OBJECT_CLASS (bond_class); + NmtEditorPageClass *editor_page_class = NMT_EDITOR_PAGE_CLASS (bond_class); g_type_class_add_private (bond_class, sizeof (NmtPageBondPrivate)); object_class->constructed = nmt_page_bond_constructed; + editor_page_class->saved = nmt_page_bond_saved; } diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c index b5eb9ec8..08526db4 100644 --- a/clients/tui/nmt-page-bridge.c +++ b/clients/tui/nmt-page-bridge.c @@ -30,6 +30,12 @@ G_DEFINE_TYPE (NmtPageBridge, nmt_page_bridge, NMT_TYPE_EDITOR_PAGE_DEVICE) +#define NMT_PAGE_BRIDGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NMT_TYPE_PAGE_BRIDGE, NmtPageBridgePrivate)) + +typedef struct { + NmtSlaveList *slaves; +} NmtPageBridgePrivate; + NmtEditorPage * nmt_page_bridge_new (NMConnection *conn, NmtDeviceEntry *deventry) @@ -58,6 +64,7 @@ static void nmt_page_bridge_constructed (GObject *object) { NmtPageBridge *bridge = NMT_PAGE_BRIDGE (object); + NmtPageBridgePrivate *priv = NMT_PAGE_BRIDGE_GET_PRIVATE (bridge); NmtEditorSection *section; NmtEditorGrid *grid; NMSettingBridge *s_bridge; @@ -80,6 +87,7 @@ nmt_page_bridge_constructed (GObject *object) widget = nmt_slave_list_new (conn, bridge_connection_type_filter, bridge); nmt_editor_grid_append (grid, NULL, widget, NULL); + priv->slaves = NMT_SLAVE_LIST (widget); widget = nmt_newt_entry_numeric_new (10, 0, 1000000); g_object_bind_property (s_bridge, NM_SETTING_BRIDGE_AGEING_TIME, @@ -144,10 +152,20 @@ nmt_page_bridge_constructed (GObject *object) G_OBJECT_CLASS (nmt_page_bridge_parent_class)->constructed (object); } +static void +nmt_page_bridge_saved (NmtEditorPage *editor_page) +{ + NmtPageBridgePrivate *priv = NMT_PAGE_BRIDGE_GET_PRIVATE (editor_page); + + nmt_edit_connection_list_recommit (NMT_EDIT_CONNECTION_LIST (priv->slaves)); +} + static void nmt_page_bridge_class_init (NmtPageBridgeClass *bridge_class) { GObjectClass *object_class = G_OBJECT_CLASS (bridge_class); + NmtEditorPageClass *editor_page_class = NMT_EDITOR_PAGE_CLASS (bridge_class); object_class->constructed = nmt_page_bridge_constructed; + editor_page_class->saved = nmt_page_bridge_saved; } diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c index d7c4c425..2523bd85 100644 --- a/clients/tui/nmt-page-team.c +++ b/clients/tui/nmt-page-team.c @@ -179,12 +179,22 @@ nmt_page_team_constructed (GObject *object) G_OBJECT_CLASS (nmt_page_team_parent_class)->constructed (object); } +static void +nmt_page_team_saved (NmtEditorPage *editor_page) +{ + NmtPageTeamPrivate *priv = NMT_PAGE_TEAM_GET_PRIVATE (editor_page); + + nmt_edit_connection_list_recommit (NMT_EDIT_CONNECTION_LIST (priv->slaves)); +} + static void nmt_page_team_class_init (NmtPageTeamClass *team_class) { GObjectClass *object_class = G_OBJECT_CLASS (team_class); + NmtEditorPageClass *editor_page_class = NMT_EDITOR_PAGE_CLASS (team_class); g_type_class_add_private (team_class, sizeof (NmtPageTeamPrivate)); object_class->constructed = nmt_page_team_constructed; + editor_page_class->saved = nmt_page_team_saved; } diff --git a/clients/tui/nmt-route-editor.h b/clients/tui/nmt-route-editor.h index febcb402..8e63830e 100644 --- a/clients/tui/nmt-route-editor.h +++ b/clients/tui/nmt-route-editor.h @@ -19,7 +19,7 @@ #ifndef NMT_ROUTE_EDITOR_H #define NMT_ROUTE_EDITOR_H -#include +#include "NetworkManager.h" #include "nmt-newt.h" diff --git a/clients/tui/nmtui.h b/clients/tui/nmtui.h index 53c20cb4..efb59622 100644 --- a/clients/tui/nmtui.h +++ b/clients/tui/nmtui.h @@ -19,7 +19,7 @@ #ifndef NMTUI_H #define NMTUI_H -#include +#include "NetworkManager.h" extern NMClient *nm_client; diff --git a/config.h.in b/config.h.in index 71a93990..ff4567ea 100644 --- a/config.h.in +++ b/config.h.in @@ -34,6 +34,10 @@ */ #undef HAVE_DCGETTEXT +/* Define to 1 if you have the declaration of `explicit_bzero', and to 0 if + you don't. */ +#undef HAVE_DECL_EXPLICIT_BZERO + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H @@ -200,18 +204,27 @@ /* Define to 1 if ConsoleKit is available */ #undef SESSION_TRACKING_CONSOLEKIT +/* Define to 1 if libelogin is available */ +#undef SESSION_TRACKING_ELOGIND + /* Define to 1 if libsystemd-login is available */ #undef SESSION_TRACKING_SYSTEMD /* The size of `dev_t', as computed by sizeof. */ #undef SIZEOF_DEV_T +/* The size of `time_t', as computed by sizeof. */ +#undef SIZEOF_TIME_T + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS /* Define to 1 to use ConsoleKit2 suspend api */ #undef SUSPEND_RESUME_CONSOLEKIT +/* Define to 1 to use elogind suspend api */ +#undef SUSPEND_RESUME_ELOGIND + /* Define to 1 to use systemd suspend api */ #undef SUSPEND_RESUME_SYSTEMD @@ -267,8 +280,8 @@ /* Define if JANSSON is enabled */ #undef WITH_JANSSON -/* Define if you have libsoup */ -#undef WITH_LIBSOUP +/* Define if you have libpsl */ +#undef WITH_LIBPSL /* Define if you have ModemManager1 support */ #undef WITH_MODEM_MANAGER_1 diff --git a/configure b/configure index ad6974b6..81af3511 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.6.2. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.8.0. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.6.2' -PACKAGE_STRING='NetworkManager 1.6.2' +PACKAGE_VERSION='1.8.0' +PACKAGE_STRING='NetworkManager 1.8.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -637,24 +637,12 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -SETTING_DOCS_AVAILABLE_FALSE -SETTING_DOCS_AVAILABLE_TRUE -BUILD_SETTING_DOCS_FALSE -BUILD_SETTING_DOCS_TRUE +HAVE_DOCS_FALSE +HAVE_DOCS_TRUE +BUILD_DOCS_FALSE +BUILD_DOCS_TRUE XSLTPROC PERL -BINUTILS_NM -pkgpyexecdir -pyexecdir -pkgpythondir -pythondir -PYTHON_PLATFORM -PYTHON_EXEC_PREFIX -PYTHON_PREFIX -PYTHON_VERSION -PYTHON -INSTALL_PREGEN_MANPAGES_FALSE -INSTALL_PREGEN_MANPAGES_TRUE GTK_DOC_USE_REBASE_FALSE GTK_DOC_USE_REBASE_TRUE GTK_DOC_USE_LIBTOOL_FALSE @@ -674,6 +662,16 @@ GTKDOC_MKPDF GTKDOC_REBASE GTKDOC_CHECK_PATH GTKDOC_CHECK +pkgpyexecdir +pyexecdir +pkgpythondir +pythondir +PYTHON_PLATFORM +PYTHON_EXEC_PREFIX +PYTHON_PREFIX +PYTHON_VERSION +PYTHON +BINUTILS_NM NM_LOG_COMPILER REQUIRE_ROOT_TESTS_FALSE REQUIRE_ROOT_TESTS_TRUE @@ -698,10 +696,12 @@ LIBNDP_LIBS LIBNDP_CFLAGS WITH_CONCHECK_FALSE WITH_CONCHECK_TRUE -WITH_LIBSOUP_FALSE -WITH_LIBSOUP_TRUE -LIBSOUP_LIBS -LIBSOUP_CFLAGS +LIBCURL_LIBS +LIBCURL_CFLAGS +WITH_LIBPSL_FALSE +WITH_LIBPSL_TRUE +LIBPSL_LIBS +LIBPSL_CFLAGS KERNEL_FIRMWARE_DIR SYSTEM_CA_PATH DNSSEC_TRIGGER_SCRIPT @@ -747,12 +747,14 @@ WITH_POLKIT_AGENT_TRUE POLKIT_LIBS POLKIT_CFLAGS NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT -JANSSON_LIBS -JANSSON_CFLAGS +WITH_JANSSON_FALSE +WITH_JANSSON_TRUE WITH_TEAMDCTL_FALSE WITH_TEAMDCTL_TRUE LIBTEAMDCTL_LIBS LIBTEAMDCTL_CFLAGS +JANSSON_LIBS +JANSSON_CFLAGS UUID_LIBS UUID_CFLAGS LIBNL_LIBS @@ -762,6 +764,8 @@ LIBAUDIT_LIBS LIBAUDIT_CFLAGS SELINUX_LIBS SELINUX_CFLAGS +ELOGIND_INHIBIT_LIBS +ELOGIND_INHIBIT_CFLAGS SYSTEMD_INHIBIT_LIBS SYSTEMD_INHIBIT_CFLAGS SYSTEMD_LOGIN_LIBS @@ -796,8 +800,8 @@ INTROSPECTION_GIRDIR INTROSPECTION_GENERATE INTROSPECTION_COMPILER INTROSPECTION_SCANNER -GUDEV_LIBS -GUDEV_CFLAGS +LIBUDEV_LIBS +LIBUDEV_CFLAGS WITH_LEGACY_LIBRARIES_FALSE WITH_LEGACY_LIBRARIES_TRUE DBUS_LIBS @@ -810,7 +814,6 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG DL_LIBS -LIBM WITH_WEXT_FALSE WITH_WEXT_TRUE WITH_WIFI_FALSE @@ -1082,7 +1085,7 @@ with_dnsmasq with_dnssec_trigger with_system_ca_path with_kernel_firmware_dir -with_libsoup +with_libpsl enable_concheck with_nmcli with_nmtui @@ -1125,8 +1128,8 @@ GLIB_CFLAGS GLIB_LIBS DBUS_CFLAGS DBUS_LIBS -GUDEV_CFLAGS -GUDEV_LIBS +LIBUDEV_CFLAGS +LIBUDEV_LIBS QT_CFLAGS QT_LIBS SYSTEMD_200_CFLAGS @@ -1139,6 +1142,8 @@ SYSTEMD_LOGIN_CFLAGS SYSTEMD_LOGIN_LIBS SYSTEMD_INHIBIT_CFLAGS SYSTEMD_INHIBIT_LIBS +ELOGIND_INHIBIT_CFLAGS +ELOGIND_INHIBIT_LIBS SELINUX_CFLAGS SELINUX_LIBS LIBAUDIT_CFLAGS @@ -1147,10 +1152,10 @@ LIBNL_CFLAGS LIBNL_LIBS UUID_CFLAGS UUID_LIBS -LIBTEAMDCTL_CFLAGS -LIBTEAMDCTL_LIBS JANSSON_CFLAGS JANSSON_LIBS +LIBTEAMDCTL_CFLAGS +LIBTEAMDCTL_LIBS POLKIT_CFLAGS POLKIT_LIBS NSS_CFLAGS @@ -1161,15 +1166,17 @@ MM_GLIB_CFLAGS MM_GLIB_LIBS BLUEZ5_CFLAGS BLUEZ5_LIBS -LIBSOUP_CFLAGS -LIBSOUP_LIBS +LIBPSL_CFLAGS +LIBPSL_LIBS +LIBCURL_CFLAGS +LIBCURL_LIBS LIBNDP_CFLAGS LIBNDP_LIBS NEWT_CFLAGS NEWT_LIBS +PYTHON GTKDOC_DEPS_CFLAGS -GTKDOC_DEPS_LIBS -PYTHON' +GTKDOC_DEPS_LIBS' # Initialize some variables set by options. @@ -1710,7 +1717,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.6.2 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.8.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1780,7 +1787,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.6.2:";; + short | recursive ) echo "Configuration of NetworkManager 1.8.0:";; esac cat <<\_ACEOF @@ -1889,10 +1896,10 @@ Optional Packages: Support systemd session tracking --with-consolekit=yes|no Support consolekit session tracking - --with-session-tracking=systemd|consolekit|no + --with-session-tracking=systemd|elogind|consolekit|no Compatibility option to choose one session tracking module - --with-suspend-resume=upower|systemd|consolekit + --with-suspend-resume=upower|systemd|elogind|consolekit Build NetworkManager with specific suspend/resume support --with-selinux=yes|no|auto @@ -1938,7 +1945,7 @@ Optional Packages: --with-kernel-firmware-dir=DIR where kernel firmware directory is (default is /lib/firmware) - --with-libsoup=yes|no Link against libsoup + --with-libpsl=yes|no Link against libpsl --with-nmcli=yes|no Build nmcli --with-nmtui=yes|no Build nmtui --with-more-asserts=level @@ -1974,9 +1981,10 @@ Some influential environment variables: GLIB_LIBS linker flags for GLIB, overriding pkg-config DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config DBUS_LIBS linker flags for DBUS, overriding pkg-config - GUDEV_CFLAGS - C compiler flags for GUDEV, overriding pkg-config - GUDEV_LIBS linker flags for GUDEV, overriding pkg-config + LIBUDEV_CFLAGS + C compiler flags for LIBUDEV, overriding pkg-config + LIBUDEV_LIBS + linker flags for LIBUDEV, overriding pkg-config QT_CFLAGS C compiler flags for QT, overriding pkg-config QT_LIBS linker flags for QT, overriding pkg-config SYSTEMD_200_CFLAGS @@ -1999,6 +2007,10 @@ Some influential environment variables: C compiler flags for SYSTEMD_INHIBIT, overriding pkg-config SYSTEMD_INHIBIT_LIBS linker flags for SYSTEMD_INHIBIT, overriding pkg-config + ELOGIND_INHIBIT_CFLAGS + C compiler flags for ELOGIND_INHIBIT, overriding pkg-config + ELOGIND_INHIBIT_LIBS + linker flags for ELOGIND_INHIBIT, overriding pkg-config SELINUX_CFLAGS C compiler flags for SELINUX, overriding pkg-config SELINUX_LIBS @@ -2012,14 +2024,14 @@ Some influential environment variables: LIBNL_LIBS linker flags for LIBNL, overriding pkg-config UUID_CFLAGS C compiler flags for UUID, overriding pkg-config UUID_LIBS linker flags for UUID, overriding pkg-config - LIBTEAMDCTL_CFLAGS - C compiler flags for LIBTEAMDCTL, overriding pkg-config - LIBTEAMDCTL_LIBS - linker flags for LIBTEAMDCTL, overriding pkg-config JANSSON_CFLAGS C compiler flags for JANSSON, overriding pkg-config JANSSON_LIBS linker flags for JANSSON, overriding pkg-config + LIBTEAMDCTL_CFLAGS + C compiler flags for LIBTEAMDCTL, overriding pkg-config + LIBTEAMDCTL_LIBS + linker flags for LIBTEAMDCTL, overriding pkg-config POLKIT_CFLAGS C compiler flags for POLKIT, overriding pkg-config POLKIT_LIBS linker flags for POLKIT, overriding pkg-config @@ -2035,20 +2047,23 @@ Some influential environment variables: BLUEZ5_CFLAGS C compiler flags for BLUEZ5, overriding pkg-config BLUEZ5_LIBS linker flags for BLUEZ5, overriding pkg-config - LIBSOUP_CFLAGS - C compiler flags for LIBSOUP, overriding pkg-config - LIBSOUP_LIBS - linker flags for LIBSOUP, overriding pkg-config + LIBPSL_CFLAGS + C compiler flags for LIBPSL, overriding pkg-config + LIBPSL_LIBS linker flags for LIBPSL, overriding pkg-config + LIBCURL_CFLAGS + C compiler flags for LIBCURL, overriding pkg-config + LIBCURL_LIBS + linker flags for LIBCURL, overriding pkg-config LIBNDP_CFLAGS C compiler flags for LIBNDP, overriding pkg-config LIBNDP_LIBS linker flags for LIBNDP, overriding pkg-config NEWT_CFLAGS C compiler flags for NEWT, overriding pkg-config NEWT_LIBS linker flags for NEWT, overriding pkg-config + PYTHON the Python interpreter GTKDOC_DEPS_CFLAGS C compiler flags for GTKDOC_DEPS, overriding pkg-config GTKDOC_DEPS_LIBS linker flags for GTKDOC_DEPS, overriding pkg-config - PYTHON the Python interpreter Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2116,7 +2131,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.6.2 +NetworkManager configure 1.8.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2839,11 +2854,57 @@ rm -f conftest.val as_fn_set_status $ac_retval } # ac_fn_c_compute_int + +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_c_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_decl 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.6.2, which was +It was created by NetworkManager $as_me 1.8.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3713,7 +3774,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.6.2' + VERSION='1.8.0' cat >>confdefs.h <<_ACEOF @@ -6610,6 +6671,7 @@ $as_echo "no, using $LN_S" >&6; } fi + # Prefer gcc-* variants; the ones libtool would choose don't work with LTO if test -n "$ac_tool_prefix"; then for ac_prog in gcc-ar ar @@ -17795,9 +17857,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 -NM_MINOR_VERSION=6 -NM_MICRO_VERSION=2 -NM_VERSION=1.6.2 +NM_MINOR_VERSION=8 +NM_MICRO_VERSION=0 +NM_VERSION=1.8.0 @@ -17805,7 +17867,7 @@ NM_VERSION=1.6.2 -NM_GIT_SHA=cef2c19623951b7454205ab83f8860b7b5cdd774 +NM_GIT_SHA=9c3df9caa3296a55fe54e6aa02fe8a11b27deaba if test """" != "no-config-h" ; then @@ -17860,6 +17922,54 @@ cat >>confdefs.h <<_ACEOF _ACEOF +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 +$as_echo_n "checking size of time_t... " >&6; } +if ${ac_cv_sizeof_time_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_time_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (time_t) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_time_t=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 +$as_echo "$ac_cv_sizeof_time_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_TIME_T $ac_cv_sizeof_time_t +_ACEOF + + + +ac_fn_c_check_decl "$LINENO" "explicit_bzero" "ac_cv_have_decl_explicit_bzero" " +#include + +" +if test "x$ac_cv_have_decl_explicit_bzero" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_EXPLICIT_BZERO $ac_have_decl +_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 @@ -21203,7 +21313,7 @@ $as_echo_n "checking Linux kernel nl80211 Critical Protocol Start/Stop... " >&6; int main () { -unsigned int a = NL80211_CMD_CRIT_PROTOCOL_START; a++; +unsigned a = NL80211_CMD_CRIT_PROTOCOL_START; a++; ; return 0; } @@ -21242,7 +21352,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int main () { -unsigned int a = VLAN_FLAG_LOOSE_BINDING; +unsigned a = VLAN_FLAG_LOOSE_BINDING; ; return 0; } @@ -21265,139 +21375,6 @@ $as_echo "#define HAVE_VLAN_FLAG_LOOSE_BINDING 0" >>confdefs.h fi -LIBM= -case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5 -$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; } -if ${ac_cv_lib_mw__mwvalidcheckl+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmw $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _mwvalidcheckl (); -int -main () -{ -return _mwvalidcheckl (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mw__mwvalidcheckl=yes -else - ac_cv_lib_mw__mwvalidcheckl=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5 -$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; } -if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes; then : - LIBM=-lmw -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 -$as_echo_n "checking for cos in -lm... " >&6; } -if ${ac_cv_lib_m_cos+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cos (); -int -main () -{ -return cos (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_cos=yes -else - ac_cv_lib_m_cos=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 -$as_echo "$ac_cv_lib_m_cos" >&6; } -if test "x$ac_cv_lib_m_cos" = xyes; then : - LIBM="$LIBM -lm" -fi - - ;; -*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 -$as_echo_n "checking for cos in -lm... " >&6; } -if ${ac_cv_lib_m_cos+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cos (); -int -main () -{ -return cos (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_cos=yes -else - ac_cv_lib_m_cos=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 -$as_echo "$ac_cv_lib_m_cos" >&6; } -if test "x$ac_cv_lib_m_cos" = xyes; then : - LIBM=-lm -fi - - ;; -esac - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 $as_echo_n "checking for library containing dlopen... " >&6; } if ${ac_cv_search_dlopen+:} false; then : @@ -21944,19 +21921,19 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUDEV" >&5 -$as_echo_n "checking for GUDEV... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5 +$as_echo_n "checking for LIBUDEV... " >&6; } -if test -n "$GUDEV_CFLAGS"; then - pkg_cv_GUDEV_CFLAGS="$GUDEV_CFLAGS" +if test -n "$LIBUDEV_CFLAGS"; then + pkg_cv_LIBUDEV_CFLAGS="$LIBUDEV_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 165\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 165") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 175\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libudev >= 175") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0 >= 165" 2>/dev/null` + pkg_cv_LIBUDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= 175" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -21964,16 +21941,16 @@ fi else pkg_failed=untried fi -if test -n "$GUDEV_LIBS"; then - pkg_cv_GUDEV_LIBS="$GUDEV_LIBS" +if test -n "$LIBUDEV_LIBS"; then + pkg_cv_LIBUDEV_LIBS="$LIBUDEV_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 165\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 165") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 175\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libudev >= 175") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0 >= 165" 2>/dev/null` + pkg_cv_LIBUDEV_LIBS=`$PKG_CONFIG --libs "libudev >= 175" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -21994,22 +21971,22 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gudev-1.0 >= 165" 2>&1` + LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 175" 2>&1` else - GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gudev-1.0 >= 165" 2>&1` + LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 175" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$GUDEV_PKG_ERRORS" >&5 + echo "$LIBUDEV_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gudev-1.0 >= 165) were not met: + as_fn_error $? "Package requirements (libudev >= 175) were not met: -$GUDEV_PKG_ERRORS +$LIBUDEV_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables GUDEV_CFLAGS -and GUDEV_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables LIBUDEV_CFLAGS +and LIBUDEV_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -22020,15 +21997,15 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables GUDEV_CFLAGS -and GUDEV_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables LIBUDEV_CFLAGS +and LIBUDEV_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - GUDEV_CFLAGS=$pkg_cv_GUDEV_CFLAGS - GUDEV_LIBS=$pkg_cv_GUDEV_LIBS + LIBUDEV_CFLAGS=$pkg_cv_LIBUDEV_CFLAGS + LIBUDEV_LIBS=$pkg_cv_LIBUDEV_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -22824,19 +22801,22 @@ fi # backwards compatibility if test "$with_session_tracking" = "ck"; then : - use_consolekit="yes" use_systemd_logind="no" + use_consolekit="yes" use_systemd_logind="no" use_elogind="no" fi if test "$with_session_tracking" = "consolekit"; then : - use_consolekit="yes" use_systemd_logind="no" + use_consolekit="yes" use_systemd_logind="no" use_elogind="no" fi if test "$with_session_tracking" = "systemd"; then : - use_consolekit="no" use_systemd_logind="yes" + use_consolekit="no" use_systemd_logind="yes" use_elogind="no" +fi +if test "$with_session_tracking" = "elogind"; then : + use_consolekit="no" use_systemd_logind="no" use_elogind="yes" fi if test "$with_session_tracking" = "no"; then : - use_consolekit="no" use_systemd_logind="no" + use_consolekit="no" use_systemd_logind="no" use_elogind="no" fi if test "$with_session_tracking" = "none"; then : - use_consolekit="no" use_systemd_logind="no" + use_consolekit="no" use_systemd_logind="no" use_elogind="no" fi # current options if test -n "$with_systemd_logind" ; then : @@ -23076,57 +23056,310 @@ if test "$have_systemd_logind" = "yes"; then $as_echo "#define SESSION_TRACKING_SYSTEMD 1" >>confdefs.h - session_tracking="$session_tracking, systemd-logind" + session_tracking="$session_tracking, systemd-logind" fi -if test "$use_consolekit" = "yes"; then - -$as_echo "#define SESSION_TRACKING_CONSOLEKIT 1" >>confdefs.h - - -$as_echo "#define CKDB_PATH \"/var/run/ConsoleKit/database\"" >>confdefs.h - session_tracking="$session_tracking, consolekit" +if test "$use_elogind" = "yes" -a "$have_systemd_logind" = "yes"; then + as_fn_error $? "Cannot enable systemd-logind together with elogind." "$LINENO" 5 fi -session_tracking="$(printf '%s' "${session_tracking}" | sed 's/^, //')" +if test "$use_elogind" = "yes"; then +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 +$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; } -# Check whether --with-suspend-resume was given. -if test "${with_suspend_resume+set}" = set; then : - withval=$with_suspend_resume; -fi - -if test "z$with_suspend_resume" = "z"; then +if test -n "$SYSTEMD_LOGIN_CFLAGS"; then + pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" + elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - have_systemd_inhibit=yes + pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5 + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$SYSTEMD_LOGIN_LIBS"; then + pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - have_systemd_inhibit=yes + pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - have_systemd_inhibit=no + pkg_failed=yes fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1` + else + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 +$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; } + +if test -n "$SYSTEMD_LOGIN_CFLAGS"; then + pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$SYSTEMD_LOGIN_LIBS"; then + pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1` + else + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 + + have_elogind=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_elogind=no +else + SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS + SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_elogind=yes +fi +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 +$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; } + +if test -n "$SYSTEMD_LOGIN_CFLAGS"; then + pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$SYSTEMD_LOGIN_LIBS"; then + pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1` + else + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 + + have_elogind=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_elogind=no +else + SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS + SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_elogind=yes +fi +else + SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS + SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_elogind=yes +fi +else + have_elogind=no +fi +if test "$use_elogind" = "yes" -a "$have_elogind" = "no"; then + as_fn_error $? "You must have libelogind installed to build with elogind support." "$LINENO" 5 +fi +if test "$have_elogind" = "yes"; then + +$as_echo "#define SESSION_TRACKING_ELOGIND 1" >>confdefs.h + + session_tracking="$session_tracking, elogind" +fi + +if test "$use_consolekit" = "yes"; then + +$as_echo "#define SESSION_TRACKING_CONSOLEKIT 1" >>confdefs.h + + +$as_echo "#define CKDB_PATH \"/var/run/ConsoleKit/database\"" >>confdefs.h + + session_tracking="$session_tracking, consolekit" +fi +session_tracking="$(printf '%s' "${session_tracking}" | sed 's/^, //')" + + +# Check whether --with-suspend-resume was given. +if test "${with_suspend_resume+set}" = set; then : + withval=$with_suspend_resume; +fi + +if test "z$with_suspend_resume" = "z"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_systemd_inhibit=yes +else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_systemd_inhibit=yes +else + have_systemd_inhibit=no +fi +fi + if test "z${have_systemd_inhibit}" = "zyes"; then + # Use systemd if it's new enough + with_suspend_resume="systemd" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_elogind_inhibit=yes +else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_elogind_inhibit=yes +else + have_elogind_inhibit=no +fi +fi + if test "z${have_elogind_inhibit}" = "zyes"; then + # Use elogind if it's new enough + with_suspend_resume="elogind" + else + if test "$use_consolekit" = "yes"; then + # Use consolekit suspend if session tracking is consolekit + with_suspend_resume="consolekit" + else + # Fall back to upower + with_suspend_resume="upower" + fi + fi fi - if test "z${have_systemd_inhibit}" = "zyes"; then - # Use systemd if it's new enough - with_suspend_resume="systemd" - else - if test "$use_consolekit" = "yes"; then - # Use consolekit suspend if session tracking is consolekit - with_suspend_resume="consolekit" - else - # Fall back to upower - with_suspend_resume="upower" - fi - fi fi case $with_suspend_resume in @@ -23391,41 +23624,22 @@ fi $as_echo "#define SUSPEND_RESUME_SYSTEMD 1" >>confdefs.h ;; - consolekit) - -$as_echo "#define SUSPEND_RESUME_CONSOLEKIT 1" >>confdefs.h - - ;; - *) - as_fn_error $? "--with-suspend-resume must be one of upower, systemd, consolekit" "$LINENO" 5 - ;; -esac - -# SELinux support - -# Check whether --with-selinux was given. -if test "${with_selinux+set}" = set; then : - withval=$with_selinux; -else - with_selinux=auto -fi - -if test "$with_selinux" = "yes" -o "$with_selinux" = "auto"; then + elogind) pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5 -$as_echo_n "checking for SELINUX... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 +$as_echo_n "checking for ELOGIND_INHIBIT... " >&6; } -if test -n "$SELINUX_CFLAGS"; then - pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS" +if test -n "$ELOGIND_INHIBIT_CFLAGS"; then + pkg_cv_ELOGIND_INHIBIT_CFLAGS="$ELOGIND_INHIBIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SELINUX_CFLAGS=`$PKG_CONFIG --cflags "libselinux" 2>/dev/null` + pkg_cv_ELOGIND_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libelogind >= 219" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -23433,16 +23647,16 @@ fi else pkg_failed=untried fi -if test -n "$SELINUX_LIBS"; then - pkg_cv_SELINUX_LIBS="$SELINUX_LIBS" +if test -n "$ELOGIND_INHIBIT_LIBS"; then + pkg_cv_ELOGIND_INHIBIT_LIBS="$ELOGIND_INHIBIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SELINUX_LIBS=`$PKG_CONFIG --libs "libselinux" 2>/dev/null` + pkg_cv_ELOGIND_INHIBIT_LIBS=`$PKG_CONFIG --libs "libelogind >= 219" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -23463,18 +23677,293 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libselinux" 2>&1` + ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind >= 219" 2>&1` else - SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libselinux" 2>&1` + ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind >= 219" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$SELINUX_PKG_ERRORS" >&5 + echo "$ELOGIND_INHIBIT_PKG_ERRORS" >&5 - have_selinux=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - have_selinux=no + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 +$as_echo_n "checking for ELOGIND_INHIBIT... " >&6; } + +if test -n "$ELOGIND_INHIBIT_CFLAGS"; then + pkg_cv_ELOGIND_INHIBIT_CFLAGS="$ELOGIND_INHIBIT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELOGIND_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libelogind >= 219" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ELOGIND_INHIBIT_LIBS"; then + pkg_cv_ELOGIND_INHIBIT_LIBS="$ELOGIND_INHIBIT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELOGIND_INHIBIT_LIBS=`$PKG_CONFIG --libs "libelogind >= 219" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind >= 219" 2>&1` + else + ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind >= 219" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELOGIND_INHIBIT_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (libelogind >= 219) were not met: + +$ELOGIND_INHIBIT_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables ELOGIND_INHIBIT_CFLAGS +and ELOGIND_INHIBIT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables ELOGIND_INHIBIT_CFLAGS +and ELOGIND_INHIBIT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS + ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 +$as_echo_n "checking for ELOGIND_INHIBIT... " >&6; } + +if test -n "$ELOGIND_INHIBIT_CFLAGS"; then + pkg_cv_ELOGIND_INHIBIT_CFLAGS="$ELOGIND_INHIBIT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELOGIND_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libelogind >= 219" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ELOGIND_INHIBIT_LIBS"; then + pkg_cv_ELOGIND_INHIBIT_LIBS="$ELOGIND_INHIBIT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELOGIND_INHIBIT_LIBS=`$PKG_CONFIG --libs "libelogind >= 219" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind >= 219" 2>&1` + else + ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind >= 219" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELOGIND_INHIBIT_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (libelogind >= 219) were not met: + +$ELOGIND_INHIBIT_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables ELOGIND_INHIBIT_CFLAGS +and ELOGIND_INHIBIT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables ELOGIND_INHIBIT_CFLAGS +and ELOGIND_INHIBIT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS + ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi +else + ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS + ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + +$as_echo "#define SUSPEND_RESUME_ELOGIND 1" >>confdefs.h + + ;; + consolekit) + +$as_echo "#define SUSPEND_RESUME_CONSOLEKIT 1" >>confdefs.h + + ;; + *) + as_fn_error $? "--with-suspend-resume must be one of upower, systemd, elogind, consolekit" "$LINENO" 5 + ;; +esac + +# SELinux support + +# Check whether --with-selinux was given. +if test "${with_selinux+set}" = set; then : + withval=$with_selinux; +else + with_selinux=auto +fi + +if test "$with_selinux" = "yes" -o "$with_selinux" = "auto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5 +$as_echo_n "checking for SELINUX... " >&6; } + +if test -n "$SELINUX_CFLAGS"; then + pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SELINUX_CFLAGS=`$PKG_CONFIG --cflags "libselinux" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$SELINUX_LIBS"; then + pkg_cv_SELINUX_LIBS="$SELINUX_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SELINUX_LIBS=`$PKG_CONFIG --libs "libselinux" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libselinux" 2>&1` + else + SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libselinux" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SELINUX_PKG_ERRORS" >&5 + + have_selinux=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_selinux=no else SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS SELINUX_LIBS=$pkg_cv_SELINUX_LIBS @@ -23799,20 +24288,21 @@ fi # Teamd control checks + pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTEAMDCTL" >&5 -$as_echo_n "checking for LIBTEAMDCTL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5 +$as_echo_n "checking for JANSSON... " >&6; } -if test -n "$LIBTEAMDCTL_CFLAGS"; then - pkg_cv_LIBTEAMDCTL_CFLAGS="$LIBTEAMDCTL_CFLAGS" +if test -n "$JANSSON_CFLAGS"; then + pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libteamdctl >= 1.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libteamdctl >= 1.9") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5 + ($PKG_CONFIG --exists --print-errors "jansson") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBTEAMDCTL_CFLAGS=`$PKG_CONFIG --cflags "libteamdctl >= 1.9" 2>/dev/null` + pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -23820,16 +24310,16 @@ fi else pkg_failed=untried fi -if test -n "$LIBTEAMDCTL_LIBS"; then - pkg_cv_LIBTEAMDCTL_LIBS="$LIBTEAMDCTL_LIBS" +if test -n "$JANSSON_LIBS"; then + pkg_cv_JANSSON_LIBS="$JANSSON_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libteamdctl >= 1.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libteamdctl >= 1.9") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5 + ($PKG_CONFIG --exists --print-errors "jansson") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBTEAMDCTL_LIBS=`$PKG_CONFIG --libs "libteamdctl >= 1.9" 2>/dev/null` + pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -23850,81 +24340,40 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBTEAMDCTL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libteamdctl >= 1.9" 2>&1` + JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson" 2>&1` else - LIBTEAMDCTL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libteamdctl >= 1.9" 2>&1` + JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LIBTEAMDCTL_PKG_ERRORS" >&5 + echo "$JANSSON_PKG_ERRORS" >&5 - have_teamdctl=no + have_jansson=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_teamdctl=no + have_jansson=no else - LIBTEAMDCTL_CFLAGS=$pkg_cv_LIBTEAMDCTL_CFLAGS - LIBTEAMDCTL_LIBS=$pkg_cv_LIBTEAMDCTL_LIBS + JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS + JANSSON_LIBS=$pkg_cv_JANSSON_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_teamdctl=yes -fi -# Check whether --enable-teamdctl was given. -if test "${enable_teamdctl+set}" = set; then : - enableval=$enable_teamdctl; enable_teamdctl=${enableval} -else - enable_teamdctl=${have_teamdctl} -fi - -if (test "${enable_teamdctl}" = "yes"); then - if test x"$have_teamdctl" = x"no"; then - as_fn_error $? "Teamd control is required" "$LINENO" 5 - fi - # temporary bug workaround - LIBTEAMDCTL_CFLAGS=`echo $LIBTEAMDCTL_CFLAGS | sed -e 's:/teamdctl.h::'` - -$as_echo "#define WITH_TEAMDCTL 1" >>confdefs.h - -else - -$as_echo "#define WITH_TEAMDCTL 0" >>confdefs.h - -fi - if test "${enable_teamdctl}" = "yes"; then - WITH_TEAMDCTL_TRUE= - WITH_TEAMDCTL_FALSE='#' -else - WITH_TEAMDCTL_TRUE='#' - WITH_TEAMDCTL_FALSE= -fi - - -# Jansson for team configuration validation -# Check whether --enable-json-validation was given. -if test "${enable_json_validation+set}" = set; then : - enableval=$enable_json_validation; + have_jansson=yes fi -if (test "${enable_json_validation}" == "no"); then - -$as_echo "#define WITH_JANSSON 0" >>confdefs.h - -else - pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5 -$as_echo_n "checking for JANSSON... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTEAMDCTL" >&5 +$as_echo_n "checking for LIBTEAMDCTL... " >&6; } -if test -n "$JANSSON_CFLAGS"; then - pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS" +if test -n "$LIBTEAMDCTL_CFLAGS"; then + pkg_cv_LIBTEAMDCTL_CFLAGS="$LIBTEAMDCTL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5 - ($PKG_CONFIG --exists --print-errors "jansson") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libteamdctl >= 1.9\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libteamdctl >= 1.9") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson" 2>/dev/null` + pkg_cv_LIBTEAMDCTL_CFLAGS=`$PKG_CONFIG --cflags "libteamdctl >= 1.9" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -23932,16 +24381,16 @@ fi else pkg_failed=untried fi -if test -n "$JANSSON_LIBS"; then - pkg_cv_JANSSON_LIBS="$JANSSON_LIBS" +if test -n "$LIBTEAMDCTL_LIBS"; then + pkg_cv_LIBTEAMDCTL_LIBS="$LIBTEAMDCTL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5 - ($PKG_CONFIG --exists --print-errors "jansson") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libteamdctl >= 1.9\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libteamdctl >= 1.9") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson" 2>/dev/null` + pkg_cv_LIBTEAMDCTL_LIBS=`$PKG_CONFIG --libs "libteamdctl >= 1.9" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -23962,30 +24411,93 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson" 2>&1` + LIBTEAMDCTL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libteamdctl >= 1.9" 2>&1` else - JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson" 2>&1` + LIBTEAMDCTL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libteamdctl >= 1.9" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$JANSSON_PKG_ERRORS" >&5 + echo "$LIBTEAMDCTL_PKG_ERRORS" >&5 - as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5 + have_teamdctl=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5 + have_teamdctl=no else - JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS - JANSSON_LIBS=$pkg_cv_JANSSON_LIBS + LIBTEAMDCTL_CFLAGS=$pkg_cv_LIBTEAMDCTL_CFLAGS + LIBTEAMDCTL_LIBS=$pkg_cv_LIBTEAMDCTL_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + have_teamdctl=yes +fi +if test "$have_jansson" = "yes" -a "$have_teamdctl" = "yes"; then + have_team_prereq=yes +else + have_team_prereq=no +fi + +# Check whether --enable-teamdctl was given. +if test "${enable_teamdctl+set}" = set; then : + enableval=$enable_teamdctl; enable_teamdctl=${enableval} +else + enable_teamdctl=${have_team_prereq} +fi + +if (test "${enable_teamdctl}" = "yes"); then + if test "$have_teamdctl" = "no"; then + as_fn_error $? "Libteamdctl is required for team support" "$LINENO" 5 + fi + if test "$have_jansson" = "no"; then + as_fn_error $? "Jansson is required for team support" "$LINENO" 5 + fi + # temporary bug workaround + LIBTEAMDCTL_CFLAGS=`echo $LIBTEAMDCTL_CFLAGS | sed -e 's:/teamdctl.h::'` + +$as_echo "#define WITH_TEAMDCTL 1" >>confdefs.h + +else + +$as_echo "#define WITH_TEAMDCTL 0" >>confdefs.h + +fi + if test "${enable_teamdctl}" = "yes"; then + WITH_TEAMDCTL_TRUE= + WITH_TEAMDCTL_FALSE='#' +else + WITH_TEAMDCTL_TRUE='#' + WITH_TEAMDCTL_FALSE= +fi + +# Jansson for team configuration validation +# Check whether --enable-json-validation was given. +if test "${enable_json_validation+set}" = set; then : + enableval=$enable_json_validation; enable_json_validation=${enableval} +else + enable_json_validation=${have_jansson} fi +if (test "${enable_json_validation}" == "no"); then + +$as_echo "#define WITH_JANSSON 0" >>confdefs.h + +else + if test "$have_jansson" = "no"; then + as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5 + fi + $as_echo "#define WITH_JANSSON 1" >>confdefs.h +fi + if test "${enable_json_validation}" != "no"; then + WITH_JANSSON_TRUE= + WITH_JANSSON_FALSE='#' +else + WITH_JANSSON_TRUE='#' + WITH_JANSSON_FALSE= fi + # we usually compile with polkit support. --enable-polkit=yes|no only sets the # default configuration for main.auth-polkit. User can always enable/disable polkit # autorization via config. Only when specifying --enable-polkit=disabled, we do @@ -25371,19 +25883,19 @@ _ACEOF pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSOUP" >&5 -$as_echo_n "checking for LIBSOUP... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPSL" >&5 +$as_echo_n "checking for LIBPSL... " >&6; } -if test -n "$LIBSOUP_CFLAGS"; then - pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS" +if test -n "$LIBPSL_CFLAGS"; then + pkg_cv_LIBPSL_CFLAGS="$LIBPSL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.40\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.40") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpsl >= 0.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpsl >= 0.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBSOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.40" 2>/dev/null` + pkg_cv_LIBPSL_CFLAGS=`$PKG_CONFIG --cflags "libpsl >= 0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -25391,16 +25903,16 @@ fi else pkg_failed=untried fi -if test -n "$LIBSOUP_LIBS"; then - pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS" +if test -n "$LIBPSL_LIBS"; then + pkg_cv_LIBPSL_LIBS="$LIBPSL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.40\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.40") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpsl >= 0.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpsl >= 0.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBSOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.40" 2>/dev/null` + pkg_cv_LIBPSL_LIBS=`$PKG_CONFIG --libs "libpsl >= 0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -25421,71 +25933,142 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-2.4 >= 2.40" 2>&1` + LIBPSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpsl >= 0.1" 2>&1` else - LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-2.4 >= 2.40" 2>&1` + LIBPSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpsl >= 0.1" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LIBSOUP_PKG_ERRORS" >&5 + echo "$LIBPSL_PKG_ERRORS" >&5 - have_libsoup=no + have_libpsl=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_libsoup=no + have_libpsl=no else - LIBSOUP_CFLAGS=$pkg_cv_LIBSOUP_CFLAGS - LIBSOUP_LIBS=$pkg_cv_LIBSOUP_LIBS + LIBPSL_CFLAGS=$pkg_cv_LIBPSL_CFLAGS + LIBPSL_LIBS=$pkg_cv_LIBPSL_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_libsoup=yes + have_libpsl=yes fi -# Check whether --with-libsoup was given. -if test "${with_libsoup+set}" = set; then : - withval=$with_libsoup; +# Check whether --with-libpsl was given. +if test "${with_libpsl+set}" = set; then : + withval=$with_libpsl; else - with_libsoup=${have_libsoup} + with_libpsl=${have_libpsl} fi -if test "$with_libsoup" != "no"; then - if test "$have_libsoup" != "yes"; then - as_fn_error $? "libsoup library not found" "$LINENO" 5 +if test "$with_libpsl" != "no"; then + if test "$have_libpsl" != "yes"; then + as_fn_error $? "libpsl library not found" "$LINENO" 5 fi - with_libsoup='yes' + with_libpsl='yes' -$as_echo "#define WITH_LIBSOUP 1" >>confdefs.h +$as_echo "#define WITH_LIBPSL 1" >>confdefs.h else -$as_echo "#define WITH_LIBSOUP 0" >>confdefs.h +$as_echo "#define WITH_LIBPSL 0" >>confdefs.h fi - if test "$with_libsoup" != "no"; then - WITH_LIBSOUP_TRUE= - WITH_LIBSOUP_FALSE='#' + if test "$with_libpsl" != "no"; then + WITH_LIBPSL_TRUE= + WITH_LIBPSL_FALSE='#' else - WITH_LIBSOUP_TRUE='#' - WITH_LIBSOUP_FALSE= + WITH_LIBPSL_TRUE='#' + WITH_LIBPSL_FALSE= fi -LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS -DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_40" # Check whether --enable-concheck was given. if test "${enable_concheck+set}" = set; then : enableval=$enable_concheck; enable_concheck=${enableval} else - enable_concheck=${with_libsoup} + enable_concheck=yes +fi + +if test "${enable_concheck}" = "yes"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5 +$as_echo_n "checking for LIBCURL... " >&6; } + +if test -n "$LIBCURL_CFLAGS"; then + pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libcurl >= 7.24.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.24.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBCURL_LIBS"; then + pkg_cv_LIBCURL_LIBS="$LIBCURL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libcurl >= 7.24.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.24.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1` + else + LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBCURL_PKG_ERRORS" >&5 -if (test "${enable_concheck}" = "yes"); then - if test x"$with_libsoup" = x"no"; then - as_fn_error $? "Connectivity checking requires libsoup" "$LINENO" 5 + have_libcurl=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_libcurl=no +else + LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS + LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_libcurl=yes +fi + if test "$have_libcurl" != "yes"; then + as_fn_error $? "--enable-concheck requires libcurl library." "$LINENO" 5 fi $as_echo "#define WITH_CONCHECK 1" >>confdefs.h else + enable_concheck=no $as_echo "#define WITH_CONCHECK 0" >>confdefs.h @@ -26265,6 +26848,52 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + CFLAGS_SAVED="$CFLAGS" + CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wmissing-braces" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wmissing-braces works as expected" >&5 +$as_echo_n "checking whether -Wmissing-braces works as expected... " >&6; } + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +union { int a[1]; int b[2]; } c = { 0 } + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wmissing-braces" + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wno-missing-braces" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +$as_echo "not supported" >&6; } + CFLAGS="$CFLAGS_SAVED" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -26359,9 +26988,41 @@ if test "${enable_lto+set}" = set; then : fi if (test "${enable_lto}" = "yes"); then - CFLAGS="-flto $CFLAGS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag -flto in envvar CFLAGS" >&5 +$as_echo_n "checking if $CC supports flag -flto in envvar CFLAGS... " >&6; } +if ${cc_cv_CFLAGS__flto+:} false; then : + $as_echo_n "(cached) " >&6 else - enable_lto='no' + eval "cc_save_CFLAGS='${CFLAGS}'" + eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "-flto" | sed 's/^-Wno-/-W/'`'" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "cc_cv_CFLAGS__flto='yes'" +else + eval "cc_cv_CFLAGS__flto='no'" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + eval "CFLAGS='$cc_save_CFLAGS'" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_cv_CFLAGS__flto" >&5 +$as_echo "$cc_cv_CFLAGS__flto" >&6; } + + if eval test x$cc_cv_CFLAGS__flto = xyes; then : + eval "lto_flags='${lto_flags} -flto'" +fi + + if (test -n "${lto_flags}"); then + CFLAGS="-flto $CFLAGS" + else + as_fn_error $? "Link Time Optimization -flto is not supported." "$LINENO" 5 + fi +else + enable_lto='no' fi # Check whether --enable-ld-gc was given. @@ -26400,7 +27061,7 @@ fi if (test -n "${ld_gc_flags}"); then enable_ld_gc="yes" - CFLAGS="$CFLAGS $ld_gc_flags" + CFLAGS="$ld_gc_flags $CFLAGS" else if (test "${enable_ld_gc}" = "yes"); then as_fn_error $? "Unused symbol eviction requested but not supported." "$LINENO" 5 @@ -26410,6 +27071,7 @@ fi fi fi + # Check whether --enable-address-sanitizer was given. if test "${enable_address_sanitizer+set}" = set; then : enableval=$enable_address_sanitizer; @@ -26875,81 +27537,17 @@ fi NM_LOG_COMPILER='LOG_COMPILER = "$(top_srcdir)/tools/run-nm-test.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" "'"$with_valgrind_suppressions"'" --launch-dbus=auto' - - - - gtk_doc_requires="gtk-doc >= 1.0" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 -$as_echo_n "checking for gtk-doc... " >&6; } - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - have_gtk_doc=yes -else - have_gtk_doc=no -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 -$as_echo "$have_gtk_doc" >&6; } - - if test "$have_gtk_doc" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: - You will not be able to create source packages with 'make dist' - because $gtk_doc_requires is not found." >&5 -$as_echo "$as_me: WARNING: - You will not be able to create source packages with 'make dist' - because $gtk_doc_requires is not found." >&2;} - fi - - # Extract the first word of "gtkdoc-check", so it can be a program name with args. -set dummy gtkdoc-check; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$GTKDOC_CHECK"; then - ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - # Extract the first word of "gtkdoc-check", so it can be a program name with args. -set dummy gtkdoc-check; ac_word=$2 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. +set dummy ${ac_tool_prefix}nm; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : +if ${ac_cv_path_BINUTILS_NM+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_CHECK_PATH in + case $BINUTILS_NM in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. + ac_cv_path_BINUTILS_NM="$BINUTILS_NM" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -26959,7 +27557,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_BINUTILS_NM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -26970,72 +27568,29 @@ IFS=$as_save_IFS ;; esac fi -GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH -if test -n "$GTKDOC_CHECK_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 -$as_echo "$GTKDOC_CHECK_PATH" >&6; } +BINUTILS_NM=$ac_cv_path_BINUTILS_NM +if test -n "$BINUTILS_NM"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BINUTILS_NM" >&5 +$as_echo "$BINUTILS_NM" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - for ac_prog in gtkdoc-rebase -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_REBASE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GTKDOC_REBASE in - [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE -if test -n "$GTKDOC_REBASE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 -$as_echo "$GTKDOC_REBASE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } fi - - - test -n "$GTKDOC_REBASE" && break -done -test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true" - - # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. -set dummy gtkdoc-mkpdf; ac_word=$2 +if test -z "$ac_cv_path_BINUTILS_NM"; then + ac_pt_BINUTILS_NM=$BINUTILS_NM + # Extract the first word of "nm", so it can be a program name with args. +set dummy nm; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_MKPDF+:} false; then : +if ${ac_cv_path_ac_pt_BINUTILS_NM+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_MKPDF in + case $ac_pt_BINUTILS_NM in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path. + ac_cv_path_ac_pt_BINUTILS_NM="$ac_pt_BINUTILS_NM" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -27045,7 +27600,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_ac_pt_BINUTILS_NM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -27056,216 +27611,28 @@ IFS=$as_save_IFS ;; esac fi -GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF -if test -n "$GTKDOC_MKPDF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 -$as_echo "$GTKDOC_MKPDF" >&6; } +ac_pt_BINUTILS_NM=$ac_cv_path_ac_pt_BINUTILS_NM +if test -n "$ac_pt_BINUTILS_NM"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_BINUTILS_NM" >&5 +$as_echo "$ac_pt_BINUTILS_NM" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - - - -# Check whether --with-html-dir was given. -if test "${with_html_dir+set}" = set; then : - withval=$with_html_dir; -else - with_html_dir='${datadir}/gtk-doc/html' -fi - - HTML_DIR="$with_html_dir" - - - # Check whether --enable-gtk-doc was given. -if test "${enable_gtk_doc+set}" = set; then : - enableval=$enable_gtk_doc; -else - enable_gtk_doc=no -fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } - - if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then - as_fn_error $? " - You must have $gtk_doc_requires installed to build documentation for - $PACKAGE_NAME. Please install gtk-doc or disable building the - documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 - fi - - if test "x$PACKAGE_NAME" != "xglib"; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 -$as_echo_n "checking for GTKDOC_DEPS... " >&6; } - -if test -n "$GTKDOC_DEPS_CFLAGS"; then - pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GTKDOC_DEPS_LIBS"; then - pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` - else - GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 - - : -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - : -else - GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS - GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - fi - - # Check whether --enable-gtk-doc-html was given. -if test "${enable_gtk_doc_html+set}" = set; then : - enableval=$enable_gtk_doc_html; -else - enable_gtk_doc_html=yes -fi - - # Check whether --enable-gtk-doc-pdf was given. -if test "${enable_gtk_doc_pdf+set}" = set; then : - enableval=$enable_gtk_doc_pdf; -else - enable_gtk_doc_pdf=no -fi - - - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi - - if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 + if test "x$ac_pt_BINUTILS_NM" = x; then + BINUTILS_NM="nm" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + BINUTILS_NM=$ac_pt_BINUTILS_NM fi - - - if test x$have_gtk_doc = xyes; then - HAVE_GTK_DOC_TRUE= - HAVE_GTK_DOC_FALSE='#' -else - HAVE_GTK_DOC_TRUE='#' - HAVE_GTK_DOC_FALSE= -fi - - if test x$enable_gtk_doc = xyes; then - ENABLE_GTK_DOC_TRUE= - ENABLE_GTK_DOC_FALSE='#' -else - ENABLE_GTK_DOC_TRUE='#' - ENABLE_GTK_DOC_FALSE= -fi - - if test x$enable_gtk_doc_html = xyes; then - GTK_DOC_BUILD_HTML_TRUE= - GTK_DOC_BUILD_HTML_FALSE='#' -else - GTK_DOC_BUILD_HTML_TRUE='#' - GTK_DOC_BUILD_HTML_FALSE= -fi - - if test x$enable_gtk_doc_pdf = xyes; then - GTK_DOC_BUILD_PDF_TRUE= - GTK_DOC_BUILD_PDF_FALSE='#' -else - GTK_DOC_BUILD_PDF_TRUE='#' - GTK_DOC_BUILD_PDF_FALSE= -fi - - if test -n "$LIBTOOL"; then - GTK_DOC_USE_LIBTOOL_TRUE= - GTK_DOC_USE_LIBTOOL_FALSE='#' -else - GTK_DOC_USE_LIBTOOL_TRUE='#' - GTK_DOC_USE_LIBTOOL_FALSE= -fi - - if test -n "$GTKDOC_REBASE"; then - GTK_DOC_USE_REBASE_TRUE= - GTK_DOC_USE_REBASE_FALSE='#' -else - GTK_DOC_USE_REBASE_TRUE='#' - GTK_DOC_USE_REBASE_FALSE= -fi - - - -# check for pregenerated manpages to be installed -install_pregen_manpages=no -if test "$enable_gtk_doc" != "yes" \ - -a -f man/nmcli.1 \ - -a -f man/nmtui.1 \ - -a -f man/nm-online.1 \ - -a -f man/NetworkManager.conf.5 \ - -a -f man/nm-settings.5 \ - -a -f man/nm-settings-keyfile.5 \ - -a -f man/nm-settings-ifcfg-rh.5 \ - -a -f man/nmcli-examples.7 \ - -a -f man/NetworkManager.8; then - install_pregen_manpages=yes -fi - if test "x${install_pregen_manpages}" = "xyes"; then - INSTALL_PREGEN_MANPAGES_TRUE= - INSTALL_PREGEN_MANPAGES_FALSE='#' else - INSTALL_PREGEN_MANPAGES_TRUE='#' - INSTALL_PREGEN_MANPAGES_FALSE= + BINUTILS_NM="$ac_cv_path_BINUTILS_NM" fi @@ -27484,17 +27851,123 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. -set dummy ${ac_tool_prefix}nm; ac_word=$2 + + + + gtk_doc_requires="gtk-doc >= 1.0" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 +$as_echo_n "checking for gtk-doc... " >&6; } + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_gtk_doc=yes +else + have_gtk_doc=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 +$as_echo "$have_gtk_doc" >&6; } + + if test "$have_gtk_doc" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&5 +$as_echo "$as_me: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&2;} + fi + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GTKDOC_CHECK"; then + ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GTKDOC_CHECK_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH +if test -n "$GTKDOC_CHECK_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 +$as_echo "$GTKDOC_CHECK_PATH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + for ac_prog in gtkdoc-rebase +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_BINUTILS_NM+:} false; then : +if ${ac_cv_path_GTKDOC_REBASE+:} false; then : $as_echo_n "(cached) " >&6 else - case $BINUTILS_NM in + case $GTKDOC_REBASE in [\\/]* | ?:[\\/]*) - ac_cv_path_BINUTILS_NM="$BINUTILS_NM" # Let the user override the test with a path. + ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -27504,7 +27977,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_BINUTILS_NM="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -27515,29 +27988,30 @@ IFS=$as_save_IFS ;; esac fi -BINUTILS_NM=$ac_cv_path_BINUTILS_NM -if test -n "$BINUTILS_NM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BINUTILS_NM" >&5 -$as_echo "$BINUTILS_NM" >&6; } +GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE +if test -n "$GTKDOC_REBASE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 +$as_echo "$GTKDOC_REBASE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -fi -if test -z "$ac_cv_path_BINUTILS_NM"; then - ac_pt_BINUTILS_NM=$BINUTILS_NM - # Extract the first word of "nm", so it can be a program name with args. -set dummy nm; ac_word=$2 + test -n "$GTKDOC_REBASE" && break +done +test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true" + + # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. +set dummy gtkdoc-mkpdf; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_BINUTILS_NM+:} false; then : +if ${ac_cv_path_GTKDOC_MKPDF+:} false; then : $as_echo_n "(cached) " >&6 else - case $ac_pt_BINUTILS_NM in + case $GTKDOC_MKPDF in [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_BINUTILS_NM="$ac_pt_BINUTILS_NM" # Let the user override the test with a path. + ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -27547,7 +28021,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_BINUTILS_NM="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -27558,33 +28032,198 @@ IFS=$as_save_IFS ;; esac fi -ac_pt_BINUTILS_NM=$ac_cv_path_ac_pt_BINUTILS_NM -if test -n "$ac_pt_BINUTILS_NM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_BINUTILS_NM" >&5 -$as_echo "$ac_pt_BINUTILS_NM" >&6; } +GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF +if test -n "$GTKDOC_MKPDF"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 +$as_echo "$GTKDOC_MKPDF" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_pt_BINUTILS_NM" = x; then - BINUTILS_NM="nm" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - BINUTILS_NM=$ac_pt_BINUTILS_NM + + + +# Check whether --with-html-dir was given. +if test "${with_html_dir+set}" = set; then : + withval=$with_html_dir; +else + with_html_dir='${datadir}/gtk-doc/html' +fi + + HTML_DIR="$with_html_dir" + + + # Check whether --enable-gtk-doc was given. +if test "${enable_gtk_doc+set}" = set; then : + enableval=$enable_gtk_doc; +else + enable_gtk_doc=no +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + as_fn_error $? " + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 fi + + if test "x$PACKAGE_NAME" != "xglib"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +$as_echo_n "checking for GTKDOC_DEPS... " >&6; } + +if test -n "$GTKDOC_DEPS_CFLAGS"; then + pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - BINUTILS_NM="$ac_cv_path_BINUTILS_NM" + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTKDOC_DEPS_LIBS"; then + pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + else + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + + : +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +else + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi + + # Check whether --enable-gtk-doc-html was given. +if test "${enable_gtk_doc_html+set}" = set; then : + enableval=$enable_gtk_doc_html; +else + enable_gtk_doc_html=yes +fi + + # Check whether --enable-gtk-doc-pdf was given. +if test "${enable_gtk_doc_pdf+set}" = set; then : + enableval=$enable_gtk_doc_pdf; +else + enable_gtk_doc_pdf=no +fi + + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + + + if test x$have_gtk_doc = xyes; then + HAVE_GTK_DOC_TRUE= + HAVE_GTK_DOC_FALSE='#' +else + HAVE_GTK_DOC_TRUE='#' + HAVE_GTK_DOC_FALSE= +fi + + if test x$enable_gtk_doc = xyes; then + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' +else + ENABLE_GTK_DOC_TRUE='#' + ENABLE_GTK_DOC_FALSE= +fi + + if test x$enable_gtk_doc_html = xyes; then + GTK_DOC_BUILD_HTML_TRUE= + GTK_DOC_BUILD_HTML_FALSE='#' +else + GTK_DOC_BUILD_HTML_TRUE='#' + GTK_DOC_BUILD_HTML_FALSE= +fi + + if test x$enable_gtk_doc_pdf = xyes; then + GTK_DOC_BUILD_PDF_TRUE= + GTK_DOC_BUILD_PDF_FALSE='#' +else + GTK_DOC_BUILD_PDF_TRUE='#' + GTK_DOC_BUILD_PDF_FALSE= +fi + + if test -n "$LIBTOOL"; then + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' +else + GTK_DOC_USE_LIBTOOL_TRUE='#' + GTK_DOC_USE_LIBTOOL_FALSE= +fi + + if test -n "$GTKDOC_REBASE"; then + GTK_DOC_USE_REBASE_TRUE= + GTK_DOC_USE_REBASE_FALSE='#' +else + GTK_DOC_USE_REBASE_TRUE='#' + GTK_DOC_USE_REBASE_FALSE= fi + # check if we can build setting property documentation -build_setting_docs=no +build_docs=no if test -n "$INTROSPECTION_MAKEFILE"; then # If g-i is installed we know we have python, but we might not have pygobject if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then @@ -27618,7 +28257,6 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no" ;; esac fi @@ -27632,6 +28270,9 @@ $as_echo "no" >&6; } fi + if test -z "$PERL"; then + as_fn_error $? "--enable-introspection requires perl" "$LINENO" 5 + fi # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -27659,7 +28300,6 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no" ;; esac fi @@ -27673,10 +28313,13 @@ $as_echo "no" >&6; } fi + if test -z "$XSLTPROC"; then + as_fn_error $? "--enable-introspection requires xsltproc" "$LINENO" 5 + fi have_introspection=yes if test "$enable_gtk_doc" = "yes"; then - build_setting_docs=yes + build_docs=yes fi else if test "$enable_gtk_doc" = "yes"; then @@ -27687,33 +28330,47 @@ else have_introspection=no fi -# check for pre-built setting docs -if test "$build_setting_docs" != "yes" \ - -a -f man/nm-settings.xml \ - -a -f man/nm-settings-keyfile.xml \ - -a -f man/nm-settings-ifcfg-rh.xml \ - -a -f docs/api/settings-spec.xml; then - have_setting_docs=yes +# check for pregenerated manpages and documentation to be installed +use_pregen_docs=no +if test "$build_docs" != "yes" \ + -a -f man/NetworkManager.8 \ + -a -f man/NetworkManager.conf.5 \ + -a -f man/nm-online.1 \ + -a -f man/nmcli-examples.7 \ + -a -f man/nmcli.1 \ + -a -f man/nmtui.1 \ + \ + -a -f man/nm-settings-ifcfg-rh.5 \ + -a -f man/nm-settings-keyfile.5 \ + -a -f man/nm-settings.5 \ + \ + -a -f man/nm-settings.xml \ + -a -f man/nm-settings-keyfile.xml \ + -a -f man/nm-settings-ifcfg-rh.xml \ + \ + -a -f docs/api/settings-spec.xml \ + ; then + use_pregen_docs=yes fi - if test "$build_setting_docs" = "yes"; then - BUILD_SETTING_DOCS_TRUE= - BUILD_SETTING_DOCS_FALSE='#' + if test "$build_docs" = "yes"; then + BUILD_DOCS_TRUE= + BUILD_DOCS_FALSE='#' else - BUILD_SETTING_DOCS_TRUE='#' - BUILD_SETTING_DOCS_FALSE= + BUILD_DOCS_TRUE='#' + BUILD_DOCS_FALSE= fi - if test "$build_setting_docs" = "yes" -o "$have_setting_docs" = "yes"; then - SETTING_DOCS_AVAILABLE_TRUE= - SETTING_DOCS_AVAILABLE_FALSE='#' + if test "$build_docs" = "yes" -o "$use_pregen_docs" = "yes"; then + HAVE_DOCS_TRUE= + HAVE_DOCS_FALSE='#' else - SETTING_DOCS_AVAILABLE_TRUE='#' - SETTING_DOCS_AVAILABLE_FALSE= + HAVE_DOCS_TRUE='#' + HAVE_DOCS_FALSE= fi -ac_config_files="$ac_config_files Makefile shared/nm-version-macros.h libnm/libnm.pc libnm-util/libnm-util.pc libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc man/common.ent po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc" +ac_config_files="$ac_config_files Makefile shared/nm-version-macros.h libnm/libnm.pc libnm-util/libnm-util.pc libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -27921,6 +28578,10 @@ if test -z "${WITH_TEAMDCTL_TRUE}" && test -z "${WITH_TEAMDCTL_FALSE}"; then as_fn_error $? "conditional \"WITH_TEAMDCTL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WITH_JANSSON_TRUE}" && test -z "${WITH_JANSSON_FALSE}"; then + as_fn_error $? "conditional \"WITH_JANSSON\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${WITH_POLKIT_AGENT_TRUE}" && test -z "${WITH_POLKIT_AGENT_FALSE}"; then as_fn_error $? "conditional \"WITH_POLKIT_AGENT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -27949,8 +28610,8 @@ if test -z "${WITH_OFONO_TRUE}" && test -z "${WITH_OFONO_FALSE}"; then as_fn_error $? "conditional \"WITH_OFONO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WITH_LIBSOUP_TRUE}" && test -z "${WITH_LIBSOUP_FALSE}"; then - as_fn_error $? "conditional \"WITH_LIBSOUP\" was never defined. +if test -z "${WITH_LIBPSL_TRUE}" && test -z "${WITH_LIBPSL_FALSE}"; then + as_fn_error $? "conditional \"WITH_LIBPSL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${WITH_CONCHECK_TRUE}" && test -z "${WITH_CONCHECK_FALSE}"; then @@ -28001,16 +28662,12 @@ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}" as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${INSTALL_PREGEN_MANPAGES_TRUE}" && test -z "${INSTALL_PREGEN_MANPAGES_FALSE}"; then - as_fn_error $? "conditional \"INSTALL_PREGEN_MANPAGES\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${BUILD_SETTING_DOCS_TRUE}" && test -z "${BUILD_SETTING_DOCS_FALSE}"; then - as_fn_error $? "conditional \"BUILD_SETTING_DOCS\" was never defined. +if test -z "${BUILD_DOCS_TRUE}" && test -z "${BUILD_DOCS_FALSE}"; then + as_fn_error $? "conditional \"BUILD_DOCS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${SETTING_DOCS_AVAILABLE_TRUE}" && test -z "${SETTING_DOCS_AVAILABLE_FALSE}"; then - as_fn_error $? "conditional \"SETTING_DOCS_AVAILABLE\" was never defined. +if test -z "${HAVE_DOCS_TRUE}" && test -z "${HAVE_DOCS_FALSE}"; then + as_fn_error $? "conditional \"HAVE_DOCS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -28410,7 +29067,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.6.2, which was +This file was extended by NetworkManager $as_me 1.8.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28476,7 +29133,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.6.2 +NetworkManager config.status 1.8.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -29004,7 +29661,6 @@ do "libnm-util/libnm-util.pc") CONFIG_FILES="$CONFIG_FILES libnm-util/libnm-util.pc" ;; "libnm-glib/libnm-glib.pc") CONFIG_FILES="$CONFIG_FILES libnm-glib/libnm-glib.pc" ;; "libnm-glib/libnm-glib-vpn.pc") CONFIG_FILES="$CONFIG_FILES libnm-glib/libnm-glib-vpn.pc" ;; - "man/common.ent") CONFIG_FILES="$CONFIG_FILES man/common.ent" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "data/org.freedesktop.NetworkManager.policy.in") CONFIG_FILES="$CONFIG_FILES data/org.freedesktop.NetworkManager.policy.in" ;; "docs/api/Makefile") CONFIG_FILES="$CONFIG_FILES docs/api/Makefile" ;; @@ -30654,9 +31310,9 @@ echo " dhcpcd-supports-ipv6: $with_dhcpcd_supports_ipv6" echo echo "Miscellaneous:" -echo " documentation: $enable_gtk_doc" -echo " documentation-settings: $build_setting_docs" -echo " introspection: $have_introspection" +echo " have introspection: $have_introspection" +echo " build documentation and manpages: $build_docs" +echo " install pregenerated documentation and manpages: $use_pregen_docs" echo " tests: $enable_tests" echo " more-asserts: $more_asserts" echo " more-logging: $enable_more_logging" @@ -30665,6 +31321,7 @@ echo " valgrind: $with_valgrind $with_valgrind_suppressions" echo " code coverage: $enable_code_coverage" echo " LTO: $enable_lto" echo " linker garbage collection: $enable_ld_gc" -echo " JSON validation: $enable_json_validation" +echo " JSON validation for libnm: $enable_json_validation" echo " sanitizers: $sanitizers" +echo " Mozilla Public Suffix List: $with_libpsl" echo diff --git a/configure.ac b/configure.ac index 6116df3c..6f190c04 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ AC_PREREQ([2.63]) dnl The NM version number m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [6]) -m4_define([nm_micro_version], [2]) +m4_define([nm_minor_version], [8]) +m4_define([nm_micro_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) @@ -33,6 +33,7 @@ AM_PROG_CC_C_O AC_PROG_CXX AC_PROG_LN_S +AC_PROG_MKDIR_P # Prefer gcc-* variants; the ones libtool would choose don't work with LTO AC_CHECK_TOOLS(AR, [gcc-ar ar], false) @@ -59,6 +60,13 @@ dnl Checks for typedefs, structures, and compiler characteristics. dnl AC_TYPE_PID_T AC_CHECK_SIZEOF(dev_t) +AC_CHECK_SIZEOF(time_t) + +AC_CHECK_DECLS([ + explicit_bzero], + [], [], [[ +#include +]]) dnl dnl translation support @@ -231,7 +239,7 @@ if test "$with_wifi" = "yes"; then #include #include #include ]], - [[unsigned int a = NL80211_CMD_CRIT_PROTOCOL_START; a++;]])], + [[unsigned a = NL80211_CMD_CRIT_PROTOCOL_START; a++;]])], [ac_have_nl80211_critproto=yes], [ac_have_nl80211_critproto=no]) AC_MSG_RESULT($ac_have_nl80211_critproto) @@ -256,7 +264,7 @@ AC_COMPILE_IFELSE( #include #include #include ]], - [[unsigned int a = VLAN_FLAG_LOOSE_BINDING;]])], + [[unsigned a = VLAN_FLAG_LOOSE_BINDING;]])], [ac_have_vlan_flag_loose_binding=yes], [ac_have_vlan_flag_loose_binding=no]) AC_MSG_RESULT($ac_have_vlan_flag_loose_binding) @@ -266,11 +274,6 @@ else AC_DEFINE(HAVE_VLAN_FLAG_LOOSE_BINDING, 0, [Define if you have VLAN_FLAG_LOOSE_BINDING]) fi -dnl -dnl Checks for libm - needed for pow() -dnl -LT_LIB_M - dnl dnl Checks for libdl - on certain platforms its part of libc dnl @@ -302,7 +305,7 @@ Configure with --without-libnm-glib if you do not need the legacy libraries])]) fi AM_CONDITIONAL(WITH_LEGACY_LIBRARIES, test "$with_libnm_glib" != "no") -PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 165) +PKG_CHECK_MODULES([LIBUDEV], [libudev >= 175]) GOBJECT_INTROSPECTION_CHECK([0.9.6]) @@ -426,14 +429,15 @@ AC_ARG_WITH(systemd-logind, AS_HELP_STRING([--with-systemd-logind=yes|no], [Support systemd session tracking])) AC_ARG_WITH(consolekit, AS_HELP_STRING([--with-consolekit=yes|no], [Support consolekit session tracking])) -AC_ARG_WITH(session-tracking, AS_HELP_STRING([--with-session-tracking=systemd|consolekit|no], +AC_ARG_WITH(session-tracking, AS_HELP_STRING([--with-session-tracking=systemd|elogind|consolekit|no], [Compatibility option to choose one session tracking module])) # backwards compatibility -AS_IF([test "$with_session_tracking" = "ck"], [use_consolekit="yes" use_systemd_logind="no"]) -AS_IF([test "$with_session_tracking" = "consolekit"], [use_consolekit="yes" use_systemd_logind="no"]) -AS_IF([test "$with_session_tracking" = "systemd"], [use_consolekit="no" use_systemd_logind="yes"]) -AS_IF([test "$with_session_tracking" = "no"], [use_consolekit="no" use_systemd_logind="no"]) -AS_IF([test "$with_session_tracking" = "none"], [use_consolekit="no" use_systemd_logind="no"]) +AS_IF([test "$with_session_tracking" = "ck"], [use_consolekit="yes" use_systemd_logind="no" use_elogind="no"]) +AS_IF([test "$with_session_tracking" = "consolekit"], [use_consolekit="yes" use_systemd_logind="no" use_elogind="no"]) +AS_IF([test "$with_session_tracking" = "systemd"], [use_consolekit="no" use_systemd_logind="yes" use_elogind="no"]) +AS_IF([test "$with_session_tracking" = "elogind"], [use_consolekit="no" use_systemd_logind="no" use_elogind="yes"]) +AS_IF([test "$with_session_tracking" = "no"], [use_consolekit="no" use_systemd_logind="no" use_elogind="no"]) +AS_IF([test "$with_session_tracking" = "none"], [use_consolekit="no" use_systemd_logind="no" use_elogind="no"]) # current options AS_IF([test -n "$with_systemd_logind" ], [use_systemd_logind="$with_systemd_logind"]) AS_IF([test -n "$with_consolekit" ], [use_consolekit="$with_consolekit"]) @@ -451,9 +455,26 @@ if test "$use_systemd_logind" = "yes" -a "$have_systemd_logind" = "no"; then AC_MSG_ERROR([You must have libsystemd installed to build with systemd-logind support.]) fi if test "$have_systemd_logind" = "yes"; then - AC_DEFINE([SESSION_TRACKING_SYSTEMD], 1, [Define to 1 if libsystemd-login is available]) - session_tracking="$session_tracking, systemd-logind" + AC_DEFINE([SESSION_TRACKING_SYSTEMD], 1, [Define to 1 if libsystemd-login is available]) + session_tracking="$session_tracking, systemd-logind" +fi + +if test "$use_elogind" = "yes" -a "$have_systemd_logind" = "yes"; then + AC_MSG_ERROR([Cannot enable systemd-logind together with elogind.]) +fi +if test "$use_elogind" = "yes"; then + PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libelogind], [have_elogind=yes], [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libelogind], [have_elogind=yes], [have_elogind=no])]) +else + have_elogind=no +fi +if test "$use_elogind" = "yes" -a "$have_elogind" = "no"; then + AC_MSG_ERROR([You must have libelogind installed to build with elogind support.]) +fi +if test "$have_elogind" = "yes"; then + AC_DEFINE([SESSION_TRACKING_ELOGIND], 1, [Define to 1 if libelogin is available]) + session_tracking="$session_tracking, elogind" fi + if test "$use_consolekit" = "yes"; then AC_DEFINE([SESSION_TRACKING_CONSOLEKIT], 1, [Define to 1 if ConsoleKit is available]) AC_DEFINE([CKDB_PATH], "/var/run/ConsoleKit/database", [Path to ConsoleKit database]) @@ -461,7 +482,7 @@ if test "$use_consolekit" = "yes"; then fi session_tracking="$(printf '%s' "${session_tracking}" | sed 's/^, //')" -AC_ARG_WITH(suspend-resume, AS_HELP_STRING([--with-suspend-resume=upower|systemd|consolekit], [Build NetworkManager with specific suspend/resume support])) +AC_ARG_WITH(suspend-resume, AS_HELP_STRING([--with-suspend-resume=upower|systemd|elogind|consolekit], [Build NetworkManager with specific suspend/resume support])) if test "z$with_suspend_resume" = "z"; then PKG_CHECK_EXISTS([libsystemd >= 209], [have_systemd_inhibit=yes], [PKG_CHECK_EXISTS([libsystemd-login >= 183], [have_systemd_inhibit=yes], [have_systemd_inhibit=no])]) @@ -469,6 +490,12 @@ if test "z$with_suspend_resume" = "z"; then # Use systemd if it's new enough with_suspend_resume="systemd" else + PKG_CHECK_EXISTS([libelogind >= 219], [have_elogind_inhibit=yes], + [PKG_CHECK_EXISTS([libelogind >= 219], [have_elogind_inhibit=yes], [have_elogind_inhibit=no])]) + if test "z${have_elogind_inhibit}" = "zyes"; then + # Use elogind if it's new enough + with_suspend_resume="elogind" + else if test "$use_consolekit" = "yes"; then # Use consolekit suspend if session tracking is consolekit with_suspend_resume="consolekit" @@ -478,6 +505,7 @@ if test "z$with_suspend_resume" = "z"; then fi fi fi +fi case $with_suspend_resume in upower) @@ -488,11 +516,16 @@ case $with_suspend_resume in [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183])]) AC_DEFINE([SUSPEND_RESUME_SYSTEMD], 1, [Define to 1 to use systemd suspend api]) ;; + elogind) + PKG_CHECK_MODULES(ELOGIND_INHIBIT, [libelogind >= 219],, + [PKG_CHECK_MODULES(ELOGIND_INHIBIT, [libelogind >= 219])]) + AC_DEFINE([SUSPEND_RESUME_ELOGIND], 1, [Define to 1 to use elogind suspend api]) + ;; consolekit) AC_DEFINE([SUSPEND_RESUME_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit2 suspend api]) ;; *) - AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd, consolekit]) + AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd, elogind, consolekit]) ;; esac @@ -545,12 +578,23 @@ PKG_CHECK_MODULES(LIBNL, libnl-3.0 >= 3.2.8) PKG_CHECK_MODULES(UUID, uuid) # Teamd control checks + +PKG_CHECK_MODULES(JANSSON, [jansson], [have_jansson=yes], [have_jansson=no]) PKG_CHECK_MODULES(LIBTEAMDCTL, [libteamdctl >= 1.9], [have_teamdctl=yes],[have_teamdctl=no]) +if test "$have_jansson" = "yes" -a "$have_teamdctl" = "yes"; then + have_team_prereq=yes +else + have_team_prereq=no +fi + AC_ARG_ENABLE(teamdctl, AS_HELP_STRING([--enable-teamdctl], [enable Teamd control support]), - [enable_teamdctl=${enableval}], [enable_teamdctl=${have_teamdctl}]) + [enable_teamdctl=${enableval}], [enable_teamdctl=${have_team_prereq}]) if (test "${enable_teamdctl}" = "yes"); then - if test x"$have_teamdctl" = x"no"; then - AC_MSG_ERROR(Teamd control is required) + if test "$have_teamdctl" = "no"; then + AC_MSG_ERROR(Libteamdctl is required for team support) + fi + if test "$have_jansson" = "no"; then + AC_MSG_ERROR(Jansson is required for team support) fi # temporary bug workaround LIBTEAMDCTL_CFLAGS=`echo $LIBTEAMDCTL_CFLAGS | sed -e 's:/teamdctl.h::'` @@ -561,14 +605,18 @@ fi AM_CONDITIONAL(WITH_TEAMDCTL, test "${enable_teamdctl}" = "yes") # Jansson for team configuration validation -AC_ARG_ENABLE(json-validation, AS_HELP_STRING([--enable-json-validation], [Enable JSON validation in libnm])) +AC_ARG_ENABLE(json-validation, AS_HELP_STRING([--enable-json-validation], [Enable JSON validation in libnm]), + [enable_json_validation=${enableval}], + [enable_json_validation=${have_jansson}]) if (test "${enable_json_validation}" == "no"); then AC_DEFINE(WITH_JANSSON, 0, [Define if JANSSON is enabled]) else - PKG_CHECK_MODULES(JANSSON, jansson,, - AC_MSG_ERROR([jansson is needed for team configuration validation. Use --disable-json-validation to build without it.])) + if test "$have_jansson" = "no"; then + AC_MSG_ERROR([jansson is needed for team configuration validation. Use --disable-json-validation to build without it.]) + fi AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) fi +AM_CONDITIONAL(WITH_JANSSON, test "${enable_json_validation}" != "no") # we usually compile with polkit support. --enable-polkit=yes|no only sets the # default configuration for main.auth-polkit. User can always enable/disable polkit @@ -912,28 +960,30 @@ fi AC_DEFINE_UNQUOTED(KERNEL_FIRMWARE_DIR, "$KERNEL_FIRMWARE_DIR", [Define to path of the kernel firmware directory]) AC_SUBST(KERNEL_FIRMWARE_DIR) -PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= 2.40], [have_libsoup=yes],[have_libsoup=no]) -AC_ARG_WITH(libsoup, AS_HELP_STRING([--with-libsoup=yes|no], [Link against libsoup]), [], [with_libsoup=${have_libsoup}]) -if test "$with_libsoup" != "no"; then - if test "$have_libsoup" != "yes"; then - AC_MSG_ERROR(libsoup library not found) +PKG_CHECK_MODULES(LIBPSL, [libpsl >= 0.1], [have_libpsl=yes],[have_libpsl=no]) +AC_ARG_WITH(libpsl, AS_HELP_STRING([--with-libpsl=yes|no], [Link against libpsl]), [], [with_libpsl=${have_libpsl}]) +if test "$with_libpsl" != "no"; then + if test "$have_libpsl" != "yes"; then + AC_MSG_ERROR(libpsl library not found) fi - with_libsoup='yes' - AC_DEFINE(WITH_LIBSOUP, 1, [Define if you have libsoup]) + with_libpsl='yes' + AC_DEFINE(WITH_LIBPSL, 1, [Define if you have libpsl]) else - AC_DEFINE(WITH_LIBSOUP, 0, [Define if you have libsoup]) + AC_DEFINE(WITH_LIBPSL, 0, [Define if you have libpsl]) fi -AM_CONDITIONAL(WITH_LIBSOUP, test "$with_libsoup" != "no") -LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS -DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_40" +AM_CONDITIONAL(WITH_LIBPSL, test "$with_libpsl" != "no") -AC_ARG_ENABLE(concheck, AS_HELP_STRING([--enable-concheck], [enable connectivity checking support]), - [enable_concheck=${enableval}], [enable_concheck=${with_libsoup}]) -if (test "${enable_concheck}" = "yes"); then - if test x"$with_libsoup" = x"no"; then - AC_MSG_ERROR(Connectivity checking requires libsoup) +AC_ARG_ENABLE(concheck, + AS_HELP_STRING([--enable-concheck], [enable connectivity checking support]), + [enable_concheck=${enableval}], [enable_concheck=yes]) +if test "${enable_concheck}" = "yes"; then + PKG_CHECK_MODULES(LIBCURL, [libcurl >= 7.24.0], [have_libcurl=yes], [have_libcurl=no]) + if test "$have_libcurl" != "yes"; then + AC_MSG_ERROR(--enable-concheck requires libcurl library.) fi AC_DEFINE(WITH_CONCHECK, 1, [Define if you want connectivity checking support]) else + enable_concheck=no AC_DEFINE(WITH_CONCHECK, 0, [Define if you want connectivity checking support]) fi AM_CONDITIONAL(WITH_CONCHECK, test "${enable_concheck}" = "yes") @@ -1009,27 +1059,8 @@ if test "${enable_more_logging}" = "yes"; then AC_DEFINE(NM_MORE_LOGGING, [1], [Define if more debug logging is enabled]) fi -AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)])) -if (test "${enable_lto}" = "yes"); then - CFLAGS="-flto $CFLAGS" -else - enable_lto='no' -fi - -AC_ARG_ENABLE(ld-gc, AS_HELP_STRING([--enable-ld-gc], [Enable garbage collection of unused symbols on linking (default: auto)])) -if (test "${enable_ld_gc}" != "no"); then - CC_CHECK_FLAG_APPEND([ld_gc_flags], [CFLAGS], [-fdata-sections -ffunction-sections -Wl,--gc-sections]) - if (test -n "${ld_gc_flags}"); then - enable_ld_gc="yes" - CFLAGS="$CFLAGS $ld_gc_flags" - else - if (test "${enable_ld_gc}" = "yes"); then - AC_MSG_ERROR([Unused symbol eviction requested but not supported.]) - else - enable_ld_gc="no" - fi - fi -fi +NM_LTO +NM_LD_GC AC_ARG_ENABLE(address-sanitizer, AS_HELP_STRING([--enable-address-sanitizer], [Compile with address sanitizer (default: no)])) @@ -1098,44 +1129,34 @@ else fi AC_SUBST(NM_LOG_COMPILER, 'LOG_COMPILER = "$(top_srcdir)/tools/run-nm-test.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" "'"$with_valgrind_suppressions"'" --launch-dbus=auto') -GTK_DOC_CHECK(1.0) - -# check for pregenerated manpages to be installed -install_pregen_manpages=no -if test "$enable_gtk_doc" != "yes" \ - -a -f man/nmcli.1 \ - -a -f man/nmtui.1 \ - -a -f man/nm-online.1 \ - -a -f man/NetworkManager.conf.5 \ - -a -f man/nm-settings.5 \ - -a -f man/nm-settings-keyfile.5 \ - -a -f man/nm-settings-ifcfg-rh.5 \ - -a -f man/nmcli-examples.7 \ - -a -f man/NetworkManager.8; then - install_pregen_manpages=yes -fi -AM_CONDITIONAL(INSTALL_PREGEN_MANPAGES, test "x${install_pregen_manpages}" = "xyes") +AC_PATH_TOOL(BINUTILS_NM, nm, nm) AM_PATH_PYTHON([], [], [PYTHON=python]) AC_SUBST(PYTHON, [$PYTHON]) AC_DEFINE_UNQUOTED(TEST_NM_PYTHON, "$PYTHON", [Define python path for test binary]) -AC_PATH_TOOL(BINUTILS_NM, nm, nm) +GTK_DOC_CHECK(1.0) # check if we can build setting property documentation -build_setting_docs=no +build_docs=no if test -n "$INTROSPECTION_MAKEFILE"; then # If g-i is installed we know we have python, but we might not have pygobject if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) fi - AC_PATH_PROG(PERL, perl, no) - AC_PATH_PROG(XSLTPROC, xsltproc, no) + AC_PATH_PROG(PERL, perl) + if test -z "$PERL"; then + AC_MSG_ERROR([--enable-introspection requires perl]) + fi + AC_PATH_PROG(XSLTPROC, xsltproc) + if test -z "$XSLTPROC"; then + AC_MSG_ERROR([--enable-introspection requires xsltproc]) + fi have_introspection=yes if test "$enable_gtk_doc" = "yes"; then - build_setting_docs=yes + build_docs=yes fi else if test "$enable_gtk_doc" = "yes"; then @@ -1146,17 +1167,31 @@ else have_introspection=no fi -# check for pre-built setting docs -if test "$build_setting_docs" != "yes" \ - -a -f man/nm-settings.xml \ - -a -f man/nm-settings-keyfile.xml \ - -a -f man/nm-settings-ifcfg-rh.xml \ - -a -f docs/api/settings-spec.xml; then - have_setting_docs=yes -fi - -AM_CONDITIONAL(BUILD_SETTING_DOCS, test "$build_setting_docs" = "yes") -AM_CONDITIONAL(SETTING_DOCS_AVAILABLE, test "$build_setting_docs" = "yes" -o "$have_setting_docs" = "yes") +# check for pregenerated manpages and documentation to be installed +use_pregen_docs=no +if test "$build_docs" != "yes" \ + -a -f man/NetworkManager.8 \ + -a -f man/NetworkManager.conf.5 \ + -a -f man/nm-online.1 \ + -a -f man/nmcli-examples.7 \ + -a -f man/nmcli.1 \ + -a -f man/nmtui.1 \ + \ + -a -f man/nm-settings-ifcfg-rh.5 \ + -a -f man/nm-settings-keyfile.5 \ + -a -f man/nm-settings.5 \ + \ + -a -f man/nm-settings.xml \ + -a -f man/nm-settings-keyfile.xml \ + -a -f man/nm-settings-ifcfg-rh.xml \ + \ + -a -f docs/api/settings-spec.xml \ + ; then + use_pregen_docs=yes +fi + +AM_CONDITIONAL(BUILD_DOCS, test "$build_docs" = "yes") +AM_CONDITIONAL(HAVE_DOCS, test "$build_docs" = "yes" -o "$use_pregen_docs" = "yes") AC_CONFIG_FILES([ Makefile @@ -1165,7 +1200,6 @@ libnm/libnm.pc libnm-util/libnm-util.pc libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc -man/common.ent po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile @@ -1246,9 +1280,9 @@ echo " dhcpcd-supports-ipv6: $with_dhcpcd_supports_ipv6" echo echo "Miscellaneous:" -echo " documentation: $enable_gtk_doc" -echo " documentation-settings: $build_setting_docs" -echo " introspection: $have_introspection" +echo " have introspection: $have_introspection" +echo " build documentation and manpages: $build_docs" +echo " install pregenerated documentation and manpages: $use_pregen_docs" echo " tests: $enable_tests" echo " more-asserts: $more_asserts" echo " more-logging: $enable_more_logging" @@ -1257,6 +1291,7 @@ echo " valgrind: $with_valgrind $with_valgrind_suppressions" echo " code coverage: $enable_code_coverage" echo " LTO: $enable_lto" echo " linker garbage collection: $enable_ld_gc" -echo " JSON validation: $enable_json_validation" +echo " JSON validation for libnm: $enable_json_validation" echo " sanitizers: $sanitizers" +echo " Mozilla Public Suffix List: $with_libpsl" echo diff --git a/data/server.conf.in b/data/server.conf.in index a63be511..2eac5a12 100644 --- a/data/server.conf.in +++ b/data/server.conf.in @@ -1,4 +1,4 @@ -# This configuration file, when placed into into +# This configuration file, when placed into # @sysconfdir@/NetworkManager/conf.d will change NetworkManager's # behavior to what's expected on "traditional UNIX server" type # deployments. diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index bb54fb35..f5def7b8 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -5,7 +5,7 @@ XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) GENERATED_FILES = -if SETTING_DOCS_AVAILABLE +if BUILD_DOCS settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm/nm-settings-docs.xml $(AM_V_GEN) xsltproc --output $@ $^ @@ -38,8 +38,9 @@ MKTMPL_OPTIONS= # Extra options to supply to gtkdoc-mkhtml MKHTML_OPTIONS=--path="$(abs_srcdir)" -# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) +# Files to be included in $(DOC_MAIN_SGML_FILE) content_files = \ + $(GENERATED_FILES) \ dbus-org.freedesktop.NetworkManager.AccessPoint.xml \ dbus-org.freedesktop.NetworkManager.Connection.Active.xml \ dbus-org.freedesktop.NetworkManager.Device.Team.xml \ @@ -51,6 +52,7 @@ content_files = \ dbus-org.freedesktop.NetworkManager.Device.xml \ dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \ dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \ + dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \ dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \ dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \ dbus-org.freedesktop.NetworkManager.Device.Bond.xml \ diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index d76b3d47..f316d853 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -93,7 +93,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@SETTING_DOCS_AVAILABLE_TRUE@am__append_1 = settings-spec.xml +@BUILD_DOCS_TRUE@am__append_1 = settings-spec.xml @CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_2 = $(top_builddir)/man/nm-settings-ifcfg-rh.xml subdir = docs/api ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -185,6 +185,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ELOGIND_INHIBIT_CFLAGS = @ELOGIND_INHIBIT_CFLAGS@ +ELOGIND_INHIBIT_LIBS = @ELOGIND_INHIBIT_LIBS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GENHTML = @GENHTML@ @@ -206,8 +208,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GUDEV_CFLAGS = @GUDEV_CFLAGS@ -GUDEV_LIBS = @GUDEV_LIBS@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -241,22 +241,25 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ +LIBCURL_CFLAGS = @LIBCURL_CFLAGS@ +LIBCURL_LIBS = @LIBCURL_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBM = @LIBM@ LIBNDP_CFLAGS = @LIBNDP_CFLAGS@ LIBNDP_LIBS = @LIBNDP_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ LIBNL_LIBS = @LIBNL_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ +LIBPSL_LIBS = @LIBPSL_LIBS@ LIBS = @LIBS@ -LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ -LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@ LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@ LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ +LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@ +LIBUDEV_LIBS = @LIBUDEV_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LOG_DRIVER = @LOG_DRIVER@ @@ -445,8 +448,9 @@ MKTMPL_OPTIONS = # Extra options to supply to gtkdoc-mkhtml MKHTML_OPTIONS = --path="$(abs_srcdir)" -# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) -content_files = dbus-org.freedesktop.NetworkManager.AccessPoint.xml \ +# Files to be included in $(DOC_MAIN_SGML_FILE) +content_files = $(GENERATED_FILES) \ + dbus-org.freedesktop.NetworkManager.AccessPoint.xml \ dbus-org.freedesktop.NetworkManager.Connection.Active.xml \ dbus-org.freedesktop.NetworkManager.Device.Team.xml \ dbus-org.freedesktop.NetworkManager.DHCP6Config.xml \ @@ -457,6 +461,7 @@ content_files = dbus-org.freedesktop.NetworkManager.AccessPoint.xml \ dbus-org.freedesktop.NetworkManager.Device.xml \ dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \ dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \ + dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \ dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \ dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \ dbus-org.freedesktop.NetworkManager.Device.Bond.xml \ @@ -775,13 +780,13 @@ uninstall-am: uninstall-local .PRECIOUS: Makefile -@SETTING_DOCS_AVAILABLE_TRUE@settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm/nm-settings-docs.xml -@SETTING_DOCS_AVAILABLE_TRUE@ $(AM_V_GEN) xsltproc --output $@ $^ +@BUILD_DOCS_TRUE@settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm/nm-settings-docs.xml +@BUILD_DOCS_TRUE@ $(AM_V_GEN) xsltproc --output $@ $^ # Top-level SGML file includes (depends on) settings-spec.xml -@SETTING_DOCS_AVAILABLE_TRUE@$(DOC_MAIN_SGML_FILE): settings-spec.xml +@BUILD_DOCS_TRUE@$(DOC_MAIN_SGML_FILE): settings-spec.xml -@SETTING_DOCS_AVAILABLE_TRUE@all: $(GENERATED_FILES) +@BUILD_DOCS_TRUE@all: $(GENERATED_FILES) gtkdoc-check.test: Makefile $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.AccessPoint.xml b/docs/api/dbus-org.freedesktop.NetworkManager.AccessPoint.xml index 41816641..e37d4ff7 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.AccessPoint.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.AccessPoint.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.AccessPoint org.freedesktop.NetworkManager.AccessPoint - org.freedesktop.NetworkManager.AccessPoint + org.freedesktop.NetworkManager.AccessPoint Wi-Fi Access Point Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml b/docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml index 2f074cbe..d411fc2c 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.AgentManager org.freedesktop.NetworkManager.AgentManager - org.freedesktop.NetworkManager.AgentManager + org.freedesktop.NetworkManager.AgentManager Secret Agent Manager Methods Register (IN s identifier); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml index 36bbe0c2..cea4ce0b 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml @@ -5,9 +5,11 @@ org.freedesktop.NetworkManager.Connection.Active org.freedesktop.NetworkManager.Connection.Active - org.freedesktop.NetworkManager.Connection.Active + org.freedesktop.NetworkManager.Connection.Active Active Connection Signals +StateChanged (u state, + u reason); PropertiesChanged (a{sv} properties); @@ -51,6 +53,27 @@ Signal Details + + The "StateChanged" signal + org.freedesktop.NetworkManager.Connection.Active::StateChanged + +StateChanged (u state, + u reason); + + Emitted when the state of the active connection has changed. + Since: 1.8 + + + + u state: + (NMActiveConnectionState) The new state of the active connection. + + + u reason: + (NMActiveConnectionStateReason) Reason code describing the change to the new state. + + + The "PropertiesChanged" signal org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml b/docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml index e50f3fe6..6ea8e530 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.DHCP4Config org.freedesktop.NetworkManager.DHCP4Config - org.freedesktop.NetworkManager.DHCP4Config + org.freedesktop.NetworkManager.DHCP4Config IPv4 DHCP Client State Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.DHCP6Config.xml b/docs/api/dbus-org.freedesktop.NetworkManager.DHCP6Config.xml index bd3bb4c7..1ee1ca4a 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.DHCP6Config.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.DHCP6Config.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.DHCP6Config org.freedesktop.NetworkManager.DHCP6Config - org.freedesktop.NetworkManager.DHCP6Config + org.freedesktop.NetworkManager.DHCP6Config IPv6 DHCP Client State Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml index b1e12b2f..3fd726cf 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Adsl org.freedesktop.NetworkManager.Device.Adsl - org.freedesktop.NetworkManager.Device.Adsl + org.freedesktop.NetworkManager.Device.Adsl ADSL Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml index ceb4f70c..815d26fe 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Bluetooth org.freedesktop.NetworkManager.Device.Bluetooth - org.freedesktop.NetworkManager.Device.Bluetooth + org.freedesktop.NetworkManager.Device.Bluetooth Bluetooth Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml index b44af671..7ac07ab3 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Bond org.freedesktop.NetworkManager.Device.Bond - org.freedesktop.NetworkManager.Device.Bond + org.freedesktop.NetworkManager.Device.Bond Bonding Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml index 2e34b368..aabe5ef3 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Bridge org.freedesktop.NetworkManager.Device.Bridge - org.freedesktop.NetworkManager.Device.Bridge + org.freedesktop.NetworkManager.Device.Bridge Bridging Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml new file mode 100644 index 00000000..76e41649 --- /dev/null +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml @@ -0,0 +1,37 @@ + + + + org.freedesktop.NetworkManager.Device.Dummy + org.freedesktop.NetworkManager.Device.Dummy + org.freedesktop.NetworkManager.Device.Dummy Dummy Device + Signals + +PropertiesChanged (a{sv} properties); + + + + Description + + + + Signal Details + + The "PropertiesChanged" signal + org.freedesktop.NetworkManager.Device.Dummy::PropertiesChanged + +PropertiesChanged (a{sv} properties); + + DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0. + + + + a{sv} properties: + A dictionary mapping property names to variant boxed values + + + + + + diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml index ea7761f7..853dcffa 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Generic org.freedesktop.NetworkManager.Device.Generic - org.freedesktop.NetworkManager.Device.Generic + org.freedesktop.NetworkManager.Device.Generic Unrecognized Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml index 9e25e3d4..cf6a8f91 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.IPTunnel org.freedesktop.NetworkManager.Device.IPTunnel - org.freedesktop.NetworkManager.Device.IPTunnel + org.freedesktop.NetworkManager.Device.IPTunnel IP Tunneling Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml index b48327a7..cd03752c 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Infiniband org.freedesktop.NetworkManager.Device.Infiniband - org.freedesktop.NetworkManager.Device.Infiniband + org.freedesktop.NetworkManager.Device.Infiniband Infiniband Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macsec.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macsec.xml index cfcb3f02..246d8bb7 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macsec.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macsec.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Macsec org.freedesktop.NetworkManager.Device.Macsec - org.freedesktop.NetworkManager.Device.Macsec + org.freedesktop.NetworkManager.Device.Macsec MACSec Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml index 644550fa..d060be4c 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Macvlan org.freedesktop.NetworkManager.Device.Macvlan - org.freedesktop.NetworkManager.Device.Macvlan + org.freedesktop.NetworkManager.Device.Macvlan MAC VLAN Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml index 7841771d..65c66a97 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Modem org.freedesktop.NetworkManager.Device.Modem - org.freedesktop.NetworkManager.Device.Modem + org.freedesktop.NetworkManager.Device.Modem Modem Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml index 9e6c36d2..e15d40ba 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.OlpcMesh org.freedesktop.NetworkManager.Device.OlpcMesh - org.freedesktop.NetworkManager.Device.OlpcMesh + org.freedesktop.NetworkManager.Device.OlpcMesh OLPC Wireless Mesh Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml index 0c063ee0..8bc9acd6 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Statistics org.freedesktop.NetworkManager.Device.Statistics - org.freedesktop.NetworkManager.Device.Statistics + org.freedesktop.NetworkManager.Device.Statistics Device Statistic Counters Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml index a97b633a..5bd8802e 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Team org.freedesktop.NetworkManager.Device.Team - org.freedesktop.NetworkManager.Device.Team + org.freedesktop.NetworkManager.Device.Team Teaming Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml index e2d9f466..901ee895 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Tun org.freedesktop.NetworkManager.Device.Tun - org.freedesktop.NetworkManager.Device.Tun + org.freedesktop.NetworkManager.Device.Tun Userspace Tunneling Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml index 2086d618..3d7745c3 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Veth org.freedesktop.NetworkManager.Device.Veth - org.freedesktop.NetworkManager.Device.Veth + org.freedesktop.NetworkManager.Device.Veth Virtual Ethernet Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml index a4e7348f..3154b3c2 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Vlan org.freedesktop.NetworkManager.Device.Vlan - org.freedesktop.NetworkManager.Device.Vlan + org.freedesktop.NetworkManager.Device.Vlan Virtual LAN Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml index d8e45816..4786905e 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Vxlan org.freedesktop.NetworkManager.Device.Vxlan - org.freedesktop.NetworkManager.Device.Vxlan + org.freedesktop.NetworkManager.Device.Vxlan VXLAN Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml index d3c1487f..f14aca72 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.WiMax org.freedesktop.NetworkManager.Device.WiMax - org.freedesktop.NetworkManager.Device.WiMax + org.freedesktop.NetworkManager.Device.WiMax WiMax Device Methods GetNspList (OUT ao nsps); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml index adf7e35a..32f6e399 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Wired org.freedesktop.NetworkManager.Device.Wired - org.freedesktop.NetworkManager.Device.Wired + org.freedesktop.NetworkManager.Device.Wired Wired Ethernet Device Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml index 3652c937..19519dde 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device.Wireless org.freedesktop.NetworkManager.Device.Wireless - org.freedesktop.NetworkManager.Device.Wireless + org.freedesktop.NetworkManager.Device.Wireless Wi-Fi Device Methods GetAccessPoints (OUT ao access_points); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml index 883c5d75..e8c8ffca 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Device org.freedesktop.NetworkManager.Device - org.freedesktop.NetworkManager.Device + org.freedesktop.NetworkManager.Device Device Methods Reapply (IN a{sa{sv}} connection, diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml b/docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml index 33ec88ff..4529e7d4 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.DnsManager org.freedesktop.NetworkManager.DnsManager - org.freedesktop.NetworkManager.DnsManager + org.freedesktop.NetworkManager.DnsManager DNS Configuration State Properties Mode readable s diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml b/docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml index 2a337154..22e6f243 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.IP4Config org.freedesktop.NetworkManager.IP4Config - org.freedesktop.NetworkManager.IP4Config + org.freedesktop.NetworkManager.IP4Config IPv4 Configuration Set Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml b/docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml index 99fe3324..d4cf6836 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.IP6Config org.freedesktop.NetworkManager.IP6Config - org.freedesktop.NetworkManager.IP6Config + org.freedesktop.NetworkManager.IP6Config IPv6 Configuration Set Signals PropertiesChanged (a{sv} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml b/docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml index 79370cd3..1d3fa72e 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.PPP org.freedesktop.NetworkManager.PPP - org.freedesktop.NetworkManager.PPP + org.freedesktop.NetworkManager.PPP Helper interface for a PPP plugin Methods NeedSecrets (OUT s username, diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml b/docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml index 0a77ec15..43eaef64 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.SecretAgent org.freedesktop.NetworkManager.SecretAgent - org.freedesktop.NetworkManager.SecretAgent + org.freedesktop.NetworkManager.SecretAgent User Secret Agent Methods GetSecrets (IN a{sa{sv}} connection, diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml index 2de23972..c5938c0a 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Settings.Connection org.freedesktop.NetworkManager.Settings.Connection - org.freedesktop.NetworkManager.Settings.Connection + org.freedesktop.NetworkManager.Settings.Connection Connection Settings Profile Methods Update (IN a{sa{sv}} properties); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml index 9882f812..a0f61b21 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.Settings org.freedesktop.NetworkManager.Settings - org.freedesktop.NetworkManager.Settings + org.freedesktop.NetworkManager.Settings Connection Settings Profile Manager Methods ListConnections (OUT ao connections); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml b/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml index 523acbba..106b324c 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.VPN.Connection org.freedesktop.NetworkManager.VPN.Connection - org.freedesktop.NetworkManager.VPN.Connection + org.freedesktop.NetworkManager.VPN.Connection Active VPN Connection Signals PropertiesChanged (a{sv} properties); @@ -58,7 +58,7 @@ VpnStateChanged (u state, u reason: - (NMVpnConnectionStateReason) Reason code describing the change to the new state. + (NMActiveConnectionStateReason) Reason code describing the change to the new state. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml b/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml index 80eaebc3..2084cbc5 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager.VPN.Plugin org.freedesktop.NetworkManager.VPN.Plugin - org.freedesktop.NetworkManager.VPN.Plugin + org.freedesktop.NetworkManager.VPN.Plugin VPN Service Methods Connect (IN a{sa{sv}} connection); diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.xml b/docs/api/dbus-org.freedesktop.NetworkManager.xml index f8f7c5ab..0ef23d79 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.xml @@ -5,7 +5,7 @@ org.freedesktop.NetworkManager org.freedesktop.NetworkManager - org.freedesktop.NetworkManager + org.freedesktop.NetworkManager Connection Manager Methods Reload (IN u flags); @@ -705,6 +705,13 @@ Capabilities readable au State readable u The overall state of the NetworkManager daemon. + This takes state of all active connections and the connectivity state into account + to produce a single indicator of the network accessibility status. + The graphical shells may use this property to provide network connection status + indication and applications may use this to check if Internet connection is + accessible. Shell that is able to cope with captive portals should use the + "Connectivity" property to decide whether to present a captive portal authentication + dialog. Returns: NMState @@ -714,7 +721,17 @@ State readable u Connectivity readable u - The network connectivity state. + The result of the last connectivity check. The connectivity check is triggered + automatically when a default connection becomes available, periodically and by + calling a CheckConnectivity() method. + This property is in general useful for the graphical shell to determine whether + the Internet access is being hijacked by an authentication gateway (a "captive + portal"). In such case it would typically present a web browser window to give + the user a chance to authenticate and call CheckConnectivity() when the user + submits a form or dismisses the window. + To determine the whether the user is able to access the Internet without dealing + with captive portals (e.g. to provide a network connection indicator or disable + controls that require Internet access), the "State" property is more suitable. Returns: NMConnectivityState diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index 70f10154..b43f5ac5 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -5,9 +5,9 @@ NetworkManager.conf: NetworkManager Reference Manual - - - + + + @@ -16,8 +16,8 @@ Home Up -Prev -Next +Prev +Next
@@ -38,7 +38,7 @@

-

Description

+

Description

NetworkManager.conf is the configuration file for NetworkManager. It is used to set up various aspects of NetworkManager's behavior. The location of the main file and configuration directories may be changed @@ -74,7 +74,7 @@

-

File Format

+

File Format

The configuration file format is so-called key file (sort of ini-style format). It consists of sections (groups) of @@ -111,7 +111,7 @@ plugins-=remove-me

-

+

main section

@@ -183,7 +183,7 @@ plugins-=remove-me clients to be installed. The internal option uses a built-in DHCP client which is not currently as featureful as the external clients.

-

If this key is missing, it defaults to dhclient. +

If this key is missing, it defaults to internal. It the chosen plugin is not available, clients are looked for in this order: dhclient, dhcpcd, internal.

@@ -267,6 +267,34 @@ no-auto-default=*

+ + + +

hostname-mode

 +

+ Set the management mode of the hostname. This parameter will + affect only the transient hostname. If a valid static hostname is set, + NetworkManager will skip the update of the hostname despite the value of + this option. An hostname empty or equal to 'localhost', 'localhost6', + 'localhost.localdomain' or 'localhost6.localdomain' is considered invalid. +

+

default: NetworkManager will update the hostname + with the one provided via DHCP on the main connection (the one with a default + route). If not present, the hostname will be updated to the last one set + outside NetworkManager. If it is not valid, NetworkManager will try to recover + the hostname from the reverse lookup of the IP address of the main connection. + If this fails too, the hostname will be set to 'localhost.localdomain'. +

+

dhcp: NetworkManager will update the transient hostname + only with information coming from DHCP. No fallback nor reverse lookup will be + performed, but when the dhcp connection providing the hostname is deactivated, + the hostname is reset to the last hostname set outside NetworkManager or + 'localhost' if none valid is there. +

+

none: NetworkManager will not manage the transient + hostname and will never set it. +

+

dns

Set the DNS (resolv.conf) processing mode. @@ -286,7 +314,7 @@ no-auto-default=* resolv.conf to point to the local nameserver. It is possible to pass custom options to the dnsmasq instance by adding them to files in the - "${prefix}/etc/NetworkManager/dnsmasq.d/" + "/etc/NetworkManager/dnsmasq.d/" directory. Note that when multiple upstream servers are available, dnsmasq will initially contact them in parallel and then use the fastest to respond, probing again other servers @@ -312,15 +340,17 @@ no-auto-default=* options, and this version of NetworkManager was build with a default of "symlink". Regardless of this setting, NetworkManager will - always write resolv.conf to its runtime state directory.

-

symlink: NetworkManager will symlink - /etc/resolv.conf to its private - resolv.conf file in the runtime state directory. If - /etc/resolv.conf - already is a symlink pointing to a different location, the file - will not be modified. This allows the user to disable managing - by pointing the link /etc/resolv.conf to - somewhere else.

+ always write resolv.conf to its runtime state directory + /var/run/NetworkManager/resolv.conf.

+

symlink: If /etc/resolv.conf is + a regular file, NetworkManager will replace the file on update. If + /etc/resolv.conf is instead a symlink, NetworkManager + will leave it alone. Unless the symlink points to the internal file + /var/run/NetworkManager/resolv.conf, + in which case the symlink will be updated to emit an inotify notification. + This allows the user to conveniently instruct NetworkManager not + to manage /etc/resolv.conf by replacing it with + a symlink.

file: NetworkManager will write /etc/resolv.conf as file. If it finds a symlink, it will follow the symlink and update the target @@ -370,7 +400,7 @@ no-auto-default=*

-

+

keyfile section

This section contains keyfile-plugin-specific options, and is normally only used when you are not using any other @@ -393,7 +423,7 @@ no-auto-default=*

path

The location where keyfiles are read and stored. - This defaults to "${prefix}/etc/NetworkManager/conf.d". + This defaults to "/etc/NetworkManager/system-connections".

@@ -422,7 +452,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth

-

+

ifupdown section

This section contains ifupdown-specific options and thus only has effect when using the ifupdown plugin.

@@ -456,7 +486,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth

-

+

logging section

This section controls NetworkManager's logging. Any settings here are overridden by the --log-level @@ -511,7 +541,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth "debug" uses syslog and logs to standard error. If NetworkManager is started in debug mode (--debug) this option is ignored and "debug" is always used. - Otherwise, the default is "journal". + Otherwise, the default is "syslog".

@@ -520,7 +550,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth auditd, the audit daemon. If false, audit records will be sent only to the NetworkManager logging system. If set to true, they will be also - sent to auditd. The default value is true. + sent to auditd. The default value is false.

@@ -529,7 +559,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth

-

+

connection section

Specify default values for connections.

@@ -543,7 +573,7 @@ ipv6.ip6-privacy=0

-

Supported Properties

+

Supported Properties

Not all properties can be overwritten, only the following properties are supported to have their default values configured @@ -730,7 +760,7 @@ ipv6.ip6-privacy=1

-

+

device section

Contains per-device persistent configuration.

@@ -745,7 +775,7 @@ unmanaged=1

-

Supported Properties

+

Supported Properties

The following properties can be configured per-device.

@@ -811,6 +841,14 @@ unmanaged=1 for details.

+ +

sriov-num-vfs

+

+ Specify the number of virtual functions (VF) to enable + for a PCI physical device that supports single-root I/O + virtualization (SR-IOV). +

+

@@ -818,7 +856,7 @@ unmanaged=1

-

Sections

+

Sections

The [device] section works the same as the [connection] section. That is, multiple sections that all start with the prefix "device" can be specified. @@ -830,7 +868,7 @@ unmanaged=1

-

+

connectivity section

This section controls NetworkManager's optional connectivity checking functionality. This allows NetworkManager to detect @@ -876,7 +914,7 @@ unmanaged=1

-

+

global-dns section

This section specifies global DNS settings that override connection-specific configuration.

@@ -906,7 +944,7 @@ unmanaged=1

-

+

global-dns-domain sections

Sections with a name starting with the "global-dns-domain-" prefix allow to define global DNS configuration for specific @@ -942,7 +980,7 @@ unmanaged=1

-

+

.config sections

This is a special section that contains options which apply to the configuration file that contains the option. @@ -1045,7 +1083,7 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16

-

Plugins

+

Plugins

@@ -1135,7 +1173,7 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
-

Appendix

+

Appendix

Device List Format

@@ -1188,6 +1226,13 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16 Globbing is not supported.

+

driver:DRIVER

+

Match the device driver as reported by "nmcli -f GENERAL.DRIVER,GENERAL.DRIVER-VERSION device show". + "DRIVER" must match the driver name exactly and does not support globbing. + Optionally, a driver version may be specified separated by '/'. Globbing is supported for the version. +

+ +

except:SPEC

Negative match of a device. SPEC must be explicitly qualified with a prefix such as interface-name:. A negative match has higher priority then the positive @@ -1225,7 +1270,7 @@ interface-name:vboxnet*,except:interface-name:vboxnet2

-

See Also

+

See Also

NetworkManager(8), nmcli(1), diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index e7291ee8..b77a879d 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -2,31 +2,79 @@ + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + - - + + + + + + + + - - + + + + @@ -42,23 +90,43 @@ - - + + + + + + + + + - - - - + + + + + + + + + - - - - + + + + + + + + + + + + @@ -106,6 +174,12 @@ + + + + + + @@ -119,24 +193,6 @@ - - - - - - - - - - - - - - - - - - @@ -148,26 +204,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -199,6 +235,10 @@ + + + + @@ -213,6 +253,7 @@ + @@ -326,10 +367,31 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -353,34 +415,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -397,237 +446,276 @@ + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html index 3fa72590..bd6db0dc 100644 --- a/docs/api/html/NetworkManager.html +++ b/docs/api/html/NetworkManager.html @@ -5,9 +5,9 @@ NetworkManager: NetworkManager Reference Manual - - - + + + @@ -16,8 +16,8 @@ Home Up -Prev -Next +Prev +Next

@@ -33,7 +33,7 @@

NetworkManager [OPTIONS...]

-

Description

+

Description

The NetworkManager daemon attempts to make networking configuration and operation as painless and automatic as @@ -48,7 +48,7 @@

-

Dispatcher scripts

+

Dispatcher scripts

NetworkManager will execute scripts in the /etc/NetworkManager/dispatcher.d @@ -314,7 +314,7 @@

-

Options

+

Options

The following options are understood:

@@ -409,7 +409,7 @@
-

Udev Properties

+

Udev Properties

udev(7) device manager is used for the network device discovery. The following @@ -440,7 +440,7 @@

-

SIGNALS

+

SIGNALS

NetworkManager process handles the following signals:

@@ -499,7 +499,7 @@

-

Debugging

+

Debugging

The following environment variables are supported to help debugging. When used in conjunction with the @@ -516,14 +516,14 @@

-

Bugs

+

Bugs

Please report any bugs you find in NetworkManager at the NetworkManager bug tracker.

-

See Also

+

See Also

NetworkManager home page, NetworkManager.conf(5), diff --git a/docs/api/html/ch01.html b/docs/api/html/ch01.html new file mode 100644 index 00000000..b4faa0c0 --- /dev/null +++ b/docs/api/html/ch01.html @@ -0,0 +1,133 @@ + + + + +Configuration Settings: NetworkManager Reference Manual + + + + + + + + + + + + + + + + +

+

+Configuration Settings

+
+
+connection — General Connection Profile Settings +
+
+802-1x — AIEEE 802.1x Authentication Settings +
+
+adsl — ADSL Settings +
+
+bluetooth — Bluetooth Settings +
+
+bond — Bonding Settings +
+
+bridge — Bridging Settings +
+
+bridge-port — Bridge Port Settings +
+
+cdma — CDMA-based Mobile Broadband Settings +
+
+dcb — Data Center Bridging Settings +
+
+dummy — Dummy Link Settings +
+
+generic — Generic Link Settings +
+
+gsm — GSM-based Mobile Broadband Settings +
+
+infiniband — Infiniband Settings +
+
+ipv4 — IPv4 Settings +
+
+ipv6 — IPv6 Settings +
+
+ip-tunnel — IP Tunneling Settings +
+
+macsec — MACSec Settings +
+
+macvlan — MAC VLAN Settings +
+
+802-11-olpc-mesh — OLPC Wireless Mesh Settings +
+
+ppp — Point-to-Point Protocol Settings +
+
+pppoe — PPP-over-Ethernet Settings +
+
+proxy — WWW Proxy Settings +
+
+serial — Serial Link Settings +
+
+team — Teaming Settings +
+
+team-port — Team Port Settings +
+
+tun — Tunnel Settings +
+
+user — General User Profile Settings +
+
+vlan — VLAN Settings +
+
+vpn — VPN Settings +
+
+vxlan — VXLAN Settings +
+
+wimax — WiMax Settings +
+
+802-3-ethernet — Wired Ethernet Settings +
+
+802-11-wireless — Wi-Fi Settings +
+
+802-11-wireless-security — Wi-Fi Security Settings +
+
+
+
+
Generated by GTK-Doc V1.25
+ + \ No newline at end of file diff --git a/docs/api/html/dbus-secret-agent.html b/docs/api/html/dbus-secret-agent.html new file mode 100644 index 00000000..db133a82 --- /dev/null +++ b/docs/api/html/dbus-secret-agent.html @@ -0,0 +1,32 @@ + + + + +Secret agents: NetworkManager Reference Manual + + + + + + + + + + + + + + + + +
+

+Secret agents

+
+org.freedesktop.NetworkManager.SecretAgent — User Secret Agent +
+
+
+
Generated by GTK-Doc V1.25
+ + \ No newline at end of file diff --git a/docs/api/html/dbus-types.html b/docs/api/html/dbus-types.html index 7180e901..14a90057 100644 --- a/docs/api/html/dbus-types.html +++ b/docs/api/html/dbus-types.html @@ -5,8 +5,8 @@ Types: NetworkManager Reference Manual - - + + @@ -16,11 +16,16 @@ Home Up -Prev +Prev Next -

-Types

+
+

+Types

+
+NetworkManager D-Bus API Types +
+
Generated by GTK-Doc V1.25
diff --git a/docs/api/html/dbus-vpn-types.html b/docs/api/html/dbus-vpn-types.html new file mode 100644 index 00000000..12806ac6 --- /dev/null +++ b/docs/api/html/dbus-vpn-types.html @@ -0,0 +1,32 @@ + + + + +Types: NetworkManager Reference Manual + + + + + + + + + + + + + + + + +
+

+Types

+
+VPN Plugin D-Bus API Types +
+
+
+
Generated by GTK-Doc V1.25
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html index d0113f82..73315894 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html @@ -5,9 +5,9 @@ org.freedesktop.NetworkManager.AccessPoint: NetworkManager Reference Manual - - - + + + @@ -20,27 +20,27 @@ Signals Home -Up -Prev -Next +Up +Prev +Next

org.freedesktop.NetworkManager.AccessPoint

-

org.freedesktop.NetworkManager.AccessPoint

+

org.freedesktop.NetworkManager.AccessPoint — Wi-Fi Access Point
-

Signals

+

Signals

 PropertiesChanged (a{sv} properties);
-

Properties

+

Properties

 Flags       readable   u
 WpaFlags    readable   u
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
index 2c425a52..4cd46169 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.AgentManager: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -18,16 +18,16 @@
                   Description
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.AgentManager

-
org.freedesktop.NetworkManager.AgentManager

+
org.freedesktop.NetworkManager.AgentManager — Secret Agent Manager

 		
 
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
index 5ea85290..9cfc1a5a 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.Connection.Active: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -20,27 +20,29 @@
                   Signals
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.Connection.Active

-
org.freedesktop.NetworkManager.Connection.Active

+
org.freedesktop.NetworkManager.Connection.Active — Active Connection

 		
 
 

 

-
Signals

+
Signals

 
+StateChanged      (u     state,
+                   u     reason);
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Connection      readable   o
 SpecificObject  readable   o
@@ -80,6 +82,34 @@
 

 
Signal Details

 

+
The "StateChanged" signal

+
+StateChanged (u state,
+              u reason);
+

+
        Emitted when the state of the active connection has changed.
+

+
        Since: 1.8
+

+

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




u state:
(NMActiveConnectionState) The new state of the active connection.
u reason:
(NMActiveConnectionStateReason) Reason code describing the change to the new state.

+

+

+

 
The "PropertiesChanged" signal

 
 PropertiesChanged (a{sv} properties);
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html
index a9963ed8..7acb1288 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.DHCP4Config: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -20,27 +20,27 @@
                   Signals
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.DHCP4Config

-
org.freedesktop.NetworkManager.DHCP4Config

+
org.freedesktop.NetworkManager.DHCP4Config — IPv4 DHCP Client State

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Options  readable   a{sv}
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html
index 707b39ab..7f5671b1 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.DHCP6Config: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -20,27 +20,27 @@
                   Signals
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.DHCP6Config

-
org.freedesktop.NetworkManager.DHCP6Config

+
org.freedesktop.NetworkManager.DHCP6Config — IPv6 DHCP Client State

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Options  readable   a{sv}
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
index ab5b8192..dd87e1d3 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
@@ -5,8 +5,8 @@
 org.freedesktop.NetworkManager.Device.Adsl: NetworkManager Reference Manual
 
 
-
-
+
+
 
 
 
@@ -20,8 +20,8 @@
                   Signals
 
 Home
-Up
-Prev
+Up
+Prev
 Next
 
 

@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Adsl

-
org.freedesktop.NetworkManager.Device.Adsl

+
org.freedesktop.NetworkManager.Device.Adsl — ADSL Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Carrier  readable   b
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
index c9149fd5..e64c4763 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.Device.Bluetooth: NetworkManager Reference Manual
 
 
-
+
 
-
+
 
 
 
@@ -20,27 +20,27 @@
                   Signals
 
 Home
-Up
+Up
 Prev
-Next
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.Device.Bluetooth

-
org.freedesktop.NetworkManager.Device.Bluetooth

+
org.freedesktop.NetworkManager.Device.Bluetooth — Bluetooth Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress       readable   s
 Name            readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
index 80bb5969..d0f3821f 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Bond: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Bond

-
org.freedesktop.NetworkManager.Device.Bond

+
org.freedesktop.NetworkManager.Device.Bond — Bonding Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress  readable   s
 Carrier    readable   b
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
index 99e3e8a1..54f3eb14 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Bridge: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Bridge

-
org.freedesktop.NetworkManager.Device.Bridge

+
org.freedesktop.NetworkManager.Device.Bridge — Bridging Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress  readable   s
 Carrier    readable   b
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html
new file mode 100644
index 00000000..179250e9
--- /dev/null
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html
@@ -0,0 +1,70 @@
+
+
+
+
+org.freedesktop.NetworkManager.Device.Dummy: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
org.freedesktop.NetworkManager.Device.Dummy

+
org.freedesktop.NetworkManager.Device.Dummy — Dummy Device

+

+

+
Signals

+
+PropertiesChanged (a{sv} properties);
+

+

+

+
Description

+

+

+

+
Signal Details

+

+
The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+

+
        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
+

+

++++
+
+
+
+
+




a{sv} properties:
A dictionary mapping property names to variant boxed values

+

+

+

+

+
Generated by GTK-Doc V1.25

+
+
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
index be8471b8..a8eb18eb 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Generic: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Generic

-
org.freedesktop.NetworkManager.Device.Generic

+
org.freedesktop.NetworkManager.Device.Generic — Unrecognized Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress        readable   s
 TypeDescription  readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
index 26ecb40e..3f943671 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.IPTunnel: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.IPTunnel

-
org.freedesktop.NetworkManager.Device.IPTunnel

+
org.freedesktop.NetworkManager.Device.IPTunnel — IP Tunneling Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Mode                readable   u
 Parent              readable   o
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
index 1f25e486..c21a6e2a 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Infiniband: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Infiniband

-
org.freedesktop.NetworkManager.Device.Infiniband

+
org.freedesktop.NetworkManager.Device.Infiniband — Infiniband Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress  readable   s
 Carrier    readable   b
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html
index 3caa79f6..c994f2e6 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Macsec: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Macsec

-
org.freedesktop.NetworkManager.Device.Macsec

+
org.freedesktop.NetworkManager.Device.Macsec — MACSec Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Parent         readable   o
 Sci            readable   t
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
index 0ad93634..e960b9f5 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Macvlan: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Macvlan

-
org.freedesktop.NetworkManager.Device.Macvlan

+
org.freedesktop.NetworkManager.Device.Macvlan — MAC VLAN Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Parent     readable   o
 Mode       readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
index 134c40c7..9dfe927a 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Modem: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Modem

-
org.freedesktop.NetworkManager.Device.Modem

+
org.freedesktop.NetworkManager.Device.Modem — Modem Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 ModemCapabilities    readable   u
 CurrentCapabilities  readable   u
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
index bf9f3b22..8ece0883 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.OlpcMesh: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.OlpcMesh

-
org.freedesktop.NetworkManager.Device.OlpcMesh

+
org.freedesktop.NetworkManager.Device.OlpcMesh — OLPC Wireless Mesh Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress      readable   s
 Companion      readable   o
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html
index 5ca6a026..5e820c55 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.Device.Statistics: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -20,27 +20,27 @@
                   Signals
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.Device.Statistics

-
org.freedesktop.NetworkManager.Device.Statistics

+
org.freedesktop.NetworkManager.Device.Statistics — Device Statistic Counters

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 RefreshRateMs  readwrite  u
 TxBytes        readable   t
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
index e62077fd..240ab0fd 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Team: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Team

-
org.freedesktop.NetworkManager.Device.Team

+
org.freedesktop.NetworkManager.Device.Team — Teaming Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress  readable   s
 Carrier    readable   b
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
index 9605d5eb..ae4c4e3e 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Tun: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Tun

-
org.freedesktop.NetworkManager.Device.Tun

+
org.freedesktop.NetworkManager.Device.Tun — Userspace Tunneling Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Owner       readable   x
 Group       readable   x
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
index 8b3738e9..0bb9e30b 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Veth: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Veth

-
org.freedesktop.NetworkManager.Device.Veth

+
org.freedesktop.NetworkManager.Device.Veth — Virtual Ethernet Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Peer  readable   o
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
index 85fbdb3c..bcdb41aa 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Vlan: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Vlan

-
org.freedesktop.NetworkManager.Device.Vlan

+
org.freedesktop.NetworkManager.Device.Vlan — Virtual LAN Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress  readable   s
 Carrier    readable   b
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
index 4cb9693d..d11c39af 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Vxlan: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Vxlan

-
org.freedesktop.NetworkManager.Device.Vxlan

+
org.freedesktop.NetworkManager.Device.Vxlan — VXLAN Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Parent      readable   o
 HwAddress   readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html
index 27e1987b..d5f63e56 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.Device.WiMax: NetworkManager Reference Manual
 
 
-
+
 
-
+
 
 
 
@@ -20,16 +20,16 @@
                   Signals
 
 Home
-Up
+Up
 Prev
-Next
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.Device.WiMax

-
org.freedesktop.NetworkManager.Device.WiMax

+
org.freedesktop.NetworkManager.Device.WiMax — WiMax Device

 		
 
 

@@ -40,7 +40,7 @@
 

 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 NspAdded          (o     nsp);
@@ -48,7 +48,7 @@
 

 

 

-
Properties

+
Properties

 
 Nsps             readable   ao
 HwAddress        readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
index 9ad5d2cc..5d2cd59f 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
@@ -5,8 +5,8 @@
 org.freedesktop.NetworkManager.Device.Wired: NetworkManager Reference Manual
 
 
-
-
+
+
 
 
 
@@ -20,8 +20,8 @@
                   Signals
 
 Home
-Up
-Prev
+Up
+Prev
 Next
 
 

@@ -29,18 +29,18 @@
 

 
 
org.freedesktop.NetworkManager.Device.Wired

-
org.freedesktop.NetworkManager.Device.Wired

+
org.freedesktop.NetworkManager.Device.Wired — Wired Ethernet Device

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress        readable   s
 PermHwAddress    readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
index 39914887..b6208657 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
@@ -5,7 +5,7 @@
 org.freedesktop.NetworkManager.Device.Wireless: NetworkManager Reference Manual
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
                   Signals
 
 Home
-Up
+Up
 Prev
 Next
 
@@ -29,7 +29,7 @@
 

 
 
org.freedesktop.NetworkManager.Device.Wireless

-
org.freedesktop.NetworkManager.Device.Wireless

+
org.freedesktop.NetworkManager.Device.Wireless — Wi-Fi Device

 		
 
 

@@ -42,7 +42,7 @@
 

 

 

-
Signals

+
Signals

 
 PropertiesChanged  (a{sv} properties);
 AccessPointAdded   (o     access_point);
@@ -50,7 +50,7 @@
 

 

 

-
Properties

+
Properties

 
 HwAddress             readable   s
 PermHwAddress         readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
index 8e0e3807..b46b05ed 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.Device: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -20,16 +20,16 @@
                   Signals
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.Device

-
org.freedesktop.NetworkManager.Device

+
org.freedesktop.NetworkManager.Device — Device

 		
 
 

@@ -47,7 +47,7 @@
 

 

 

-
Signals

+
Signals

 
 StateChanged (u new_state,
               u old_state,
@@ -55,7 +55,7 @@
 

 

 

-
Properties

+
Properties

 
 Udi                   readable   s
 Interface             readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html
index 30c008db..faa22047 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.DnsManager: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -19,21 +19,21 @@
                   Properties
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.DnsManager

-
org.freedesktop.NetworkManager.DnsManager

+
org.freedesktop.NetworkManager.DnsManager — DNS Configuration State

 		
 
 

 

-
Properties

+
Properties

 
 Mode           readable   s
 RcManager      readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
index 33f57443..de6d4ac7 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.IP4Config: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -20,27 +20,27 @@
                   Signals
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.IP4Config

-
org.freedesktop.NetworkManager.IP4Config

+
org.freedesktop.NetworkManager.IP4Config — IPv4 Configuration Set

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Addresses    readable   aau
 AddressData  readable   aa{sv}
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
index 65d596ef..a8affa7c 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.IP6Config: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -20,27 +20,27 @@
                   Signals
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.IP6Config

-
org.freedesktop.NetworkManager.IP6Config

+
org.freedesktop.NetworkManager.IP6Config — IPv6 Configuration Set

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Addresses    readable   a(ayuay)
 AddressData  readable   aa{sv}
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html
index 3b5b0952..0a6e5171 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.PPP: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -18,16 +18,16 @@
                   Description
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.PPP

-
org.freedesktop.NetworkManager.PPP

+
org.freedesktop.NetworkManager.PPP — Helper interface for a PPP plugin

 		
 
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
index 889b5acf..11eb273b 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.SecretAgent: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -18,16 +18,16 @@
                   Description
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.SecretAgent

-
org.freedesktop.NetworkManager.SecretAgent

+
org.freedesktop.NetworkManager.SecretAgent — User Secret Agent

 		
 
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html
index 0e204915..ce051c36 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.Settings.Connection: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -20,16 +20,16 @@
                   Signals
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.Settings.Connection

-
org.freedesktop.NetworkManager.Settings.Connection

+
org.freedesktop.NetworkManager.Settings.Connection — Connection Settings Profile

 		
 
 

@@ -47,7 +47,7 @@
 

 

 

-
Signals

+
Signals

 
 Updated           ();
 Removed           ();
@@ -55,7 +55,7 @@
 

 

 

-
Properties

+
Properties

 
 Unsaved  readable   b
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html
index 6a5062d0..e0bda2e1 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.Settings: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -20,16 +20,16 @@
                   Signals
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.Settings

-
org.freedesktop.NetworkManager.Settings

+
org.freedesktop.NetworkManager.Settings — Connection Settings Profile Manager

 		
 
 

@@ -51,7 +51,7 @@
 

 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 NewConnection     (o     connection);
@@ -59,7 +59,7 @@
 

 

 

-
Properties

+
Properties

 
 Connections  readable   ao
 Hostname     readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
index 339777f2..9e652a3a 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.VPN.Connection: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -20,21 +20,21 @@
                   Signals
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.VPN.Connection

-
org.freedesktop.NetworkManager.VPN.Connection

+
org.freedesktop.NetworkManager.VPN.Connection — Active VPN Connection

 		
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 VpnStateChanged   (u     state,
@@ -42,7 +42,7 @@
 

 

 

-
Properties

+
Properties

 
 VpnState  readable   u
 Banner    readable   s
@@ -94,7 +94,7 @@ VpnStateChanged (u state,
 
 
 
u reason:

-
(NMVpnConnectionStateReason) Reason code describing the change to the new state.

+
(NMActiveConnectionStateReason) Reason code describing the change to the new state.

 
 
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
index 1a133fcc..62c5a04c 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager.VPN.Plugin: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -20,16 +20,16 @@
                   Signals
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager.VPN.Plugin

-
org.freedesktop.NetworkManager.VPN.Plugin

+
org.freedesktop.NetworkManager.VPN.Plugin — VPN Service

 		
 
 

@@ -50,7 +50,7 @@
 

 

 

-
Signals

+
Signals

 
 StateChanged    (u     state);
 SecretsRequired (s     message,
@@ -63,7 +63,7 @@
 

 

 

-
Properties

+
Properties

 
 State  readable   u
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
index 0163abd2..84407127 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
@@ -5,9 +5,9 @@
 org.freedesktop.NetworkManager: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -20,16 +20,16 @@
                   Signals
 
 Home
-Up
-Prev
-Next
+Up
+Prev
+Next
 
 

 

 

 
 
org.freedesktop.NetworkManager

-
org.freedesktop.NetworkManager

+
org.freedesktop.NetworkManager — Connection Manager

 		
 
 

@@ -70,7 +70,7 @@
 

 

 

-
Signals

+
Signals

 
 CheckPermissions  ();
 StateChanged      (u     state);
@@ -80,7 +80,7 @@
 

 

 

-
Properties

+
Properties

 
 Devices                  readable   ao
 AllDevices               readable   ao
@@ -831,6 +831,15 @@ State  readable   u
 

 
        The overall state of the NetworkManager daemon.
 

+
        This takes state of all active connections and the connectivity state into account
+        to produce a single indicator of the network accessibility status.
+

+
        The graphical shells may use this property to provide network connection status
+        indication and applications may use this to check if Internet connection is
+        accessible. Shell that is able to cope with captive portals should use the
+        "Connectivity" property to decide whether to present a captive portal authentication
+        dialog.
+

 
        Returns: NMState
 

 

@@ -840,7 +849,19 @@ State  readable   u
 
 Connectivity  readable   u
 

-
        The network connectivity state.
+
        The result of the last connectivity check. The connectivity check is triggered
+        automatically when a default connection becomes available, periodically and by
+        calling a CheckConnectivity() method.
+

+
        This property is in general useful for the graphical shell to determine whether
+        the Internet access is being hijacked by an authentication gateway (a "captive
+        portal"). In such case it would typically present a web browser window to give
+        the user a chance to authenticate and call CheckConnectivity() when the user
+        submits a form or dismisses the window.
+

+
        To determine the whether the user is able to access the Internet without dealing
+        with captive portals (e.g. to provide a network connection indicator or disable
+        controls that require Internet access), the "State" property is more suitable.
 

 
        Returns: NMConnectivityState
 

diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index 31b20cb5..59c9f18a 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -4,8 +4,9 @@
 
 NetworkManager Reference Manual: NetworkManager Reference Manual
 
+
 
-
+
 
 
 
@@ -14,9 +15,13 @@
 

 

 

-
Version 1.6.2
-

-
Copyright © 2012, 2013, 2014, 2015, 2016 The NetworkManager Authors

+

+      for NetworkManager 1.8.0
+
+      The latest version of this documentation can be found on-line at
+      https://developer.gnome.org/NetworkManager/stable/.
+    

+
Copyright © 2012, 2013, 2014, 2015, 2016, 2017 The NetworkManager Authors

 

 

 	Permission is granted to copy, distribute and/or modify this
@@ -39,23 +44,46 @@
 

       

 

+

+
Abstract

+

+        This manual is the reference documentation for NetworkManager, the standard
+        Linux network management service. It is intended for system administrators and
+        integrators who need to understand the capabilities of NetworkManager, its
+        configuration options, command line tools and the D-Bus API for programmatic
+        control of the service.
+      

+

+        The end users NetworkManager should instead refer to respective documentation
+        of their desktop environment of choice.
+      

+

+        The application developers who prefer not to use the D-Bus API directly can use the
+        libnm library
+        shipped with NetworkManager or its bindings to a higher level language such as
+        Python, Ruby or Vala via GObject introspection.
+      

+

 

 

 

 

-
Manual Pages

+
I. Manual Pages

 

 

-nmcli — command-line tool for controlling NetworkManager
+NetworkManager — network management daemon
 

 

-nmtui — Text User Interface for controlling NetworkManager
+NetworkManager.conf — NetworkManager configuration file
 

 

-nm-online — ask NetworkManager whether the network is connected
+nmcli — command-line tool for controlling NetworkManager
 

 

-NetworkManager.conf — NetworkManager configuration file
+nmcli-examples — usage examples of nmcli
+

+

+nmtui — Text User Interface for controlling NetworkManager
 

 

 nm-settings — Description of settings and properties of NetworkManager connection profiles
@@ -67,139 +95,263 @@
 nm-settings-ifcfg-rh — Description of ifcfg-rh settings plugin
 

 

-nmcli-examples — usage examples of nmcli
-

-

-NetworkManager — network management daemon
+nm-online — ask NetworkManager whether the network is connected
 

 

-
D-Bus API Reference

+
II. Network Configuration Setting Specification

 

-
Interfaces

+
Configuration Settings

 

 

-org.freedesktop.NetworkManager
+connection — General Connection Profile Settings
+

+

+802-1x — AIEEE 802.1x Authentication Settings
+

+

+adsl — ADSL Settings
+

+

+bluetooth — Bluetooth Settings
+

+

+bond — Bonding Settings
+

+

+bridge — Bridging Settings
+

+

+bridge-port — Bridge Port Settings
+

+

+cdma — CDMA-based Mobile Broadband Settings
 

 

-org.freedesktop.NetworkManager.Settings
+dcb — Data Center Bridging Settings
 

 

-org.freedesktop.NetworkManager.AgentManager
+dummy — Dummy Link Settings
 

 

-org.freedesktop.NetworkManager.AccessPoint
+generic — Generic Link Settings
 

 

-org.freedesktop.NetworkManager.PPP
+gsm — GSM-based Mobile Broadband Settings
 

 

-org.freedesktop.NetworkManager.Settings.Connection
+infiniband — Infiniband Settings
 

 

-org.freedesktop.NetworkManager.VPN.Connection
+ipv4 — IPv4 Settings
 

 

-org.freedesktop.NetworkManager.Connection.Active
+ipv6 — IPv6 Settings
 

 

-org.freedesktop.NetworkManager.Device
+ip-tunnel — IP Tunneling Settings
 

 

-org.freedesktop.NetworkManager.Device.Adsl
+macsec — MACSec Settings
 

 

-org.freedesktop.NetworkManager.Device.Bond
+macvlan — MAC VLAN Settings
 

 

-org.freedesktop.NetworkManager.Device.Bridge
+802-11-olpc-mesh — OLPC Wireless Mesh Settings
 

 

-org.freedesktop.NetworkManager.Device.Bluetooth
+ppp — Point-to-Point Protocol Settings
 

 

-org.freedesktop.NetworkManager.Device.Wired
+pppoe — PPP-over-Ethernet Settings
 

 

-org.freedesktop.NetworkManager.Device.Generic
+proxy — WWW Proxy Settings
 

 

-org.freedesktop.NetworkManager.Device.Infiniband
+serial — Serial Link Settings
 

 

-org.freedesktop.NetworkManager.Device.IPTunnel
+team — Teaming Settings
 

 

-org.freedesktop.NetworkManager.Device.Macsec
+team-port — Team Port Settings
 

 

-org.freedesktop.NetworkManager.Device.Macvlan
+tun — Tunnel Settings
 

 

-org.freedesktop.NetworkManager.Device.Modem
+user — General User Profile Settings
 

 

-org.freedesktop.NetworkManager.Device.OlpcMesh
+vlan — VLAN Settings
 

 

-org.freedesktop.NetworkManager.Device.Team
+vpn — VPN Settings
 

 

-org.freedesktop.NetworkManager.Device.Tun
+vxlan — VXLAN Settings
 

 

-org.freedesktop.NetworkManager.Device.Veth
+wimax — WiMax Settings
 

 

-org.freedesktop.NetworkManager.Device.Vlan
+802-3-ethernet — Wired Ethernet Settings
 

 

-org.freedesktop.NetworkManager.Device.Vxlan
+802-11-wireless — Wi-Fi Settings
 

 

-org.freedesktop.NetworkManager.Device.Wireless
+802-11-wireless-security — Wi-Fi Security Settings
+

+

+
Secret flag types

+

+
III. D-Bus API Reference

+

+
The /org/freedesktop/NetworkManager object

+

+org.freedesktop.NetworkManager — Connection Manager
+

+
The /org/freedesktop/NetworkManager/AgentManager object

+

+org.freedesktop.NetworkManager.AgentManager — Secret Agent Manager
+

+
The /org/freedesktop/NetworkManager/DnsManager object

+

+org.freedesktop.NetworkManager.DnsManager — DNS Configuration State
+

+
The /org/freedesktop/NetworkManager/Settings object

+

+org.freedesktop.NetworkManager.Settings — Connection Settings Profile Manager
+

+
The /org/freedesktop/NetworkManager/Settings/* objects

+

+org.freedesktop.NetworkManager.Settings.Connection — Connection Settings Profile
+

+
The /org/freedesktop/NetworkManager/Devices/* objects

+

+

+org.freedesktop.NetworkManager.Device — Device
+

+

+org.freedesktop.NetworkManager.Device.Statistics — Device Statistic Counters
+

+

+org.freedesktop.NetworkManager.Device.Adsl — ADSL Device
+

+

+org.freedesktop.NetworkManager.Device.Bond — Bonding Device
+

+

+org.freedesktop.NetworkManager.Device.Bridge — Bridging Device
+

+

+org.freedesktop.NetworkManager.Device.Bluetooth — Bluetooth Device
+

+

+org.freedesktop.NetworkManager.Device.Dummy — Dummy Device
+

+

+org.freedesktop.NetworkManager.Device.Wired — Wired Ethernet Device
+

+

+org.freedesktop.NetworkManager.Device.Generic — Unrecognized Device
+

+

+org.freedesktop.NetworkManager.Device.Infiniband — Infiniband Device
 

 

-org.freedesktop.NetworkManager.Device.WiMax
+org.freedesktop.NetworkManager.Device.IPTunnel — IP Tunneling Device
 

 

-org.freedesktop.NetworkManager.DHCP4Config
+org.freedesktop.NetworkManager.Device.Macsec — MACSec Device
 

 

-org.freedesktop.NetworkManager.DHCP6Config
+org.freedesktop.NetworkManager.Device.Macvlan — MAC VLAN Device
 

 

-org.freedesktop.NetworkManager.IP4Config
+org.freedesktop.NetworkManager.Device.Modem — Modem Device
 

 

-org.freedesktop.NetworkManager.IP6Config
+org.freedesktop.NetworkManager.Device.OlpcMesh — OLPC Wireless Mesh Device
 

 

-org.freedesktop.NetworkManager.VPN.Plugin
+org.freedesktop.NetworkManager.Device.Team — Teaming Device
 

 

-org.freedesktop.NetworkManager.SecretAgent
+org.freedesktop.NetworkManager.Device.Tun — Userspace Tunneling Device
 

 

-org.freedesktop.NetworkManager.Device.Statistics
+org.freedesktop.NetworkManager.Device.Veth — Virtual Ethernet Device
 

 

-org.freedesktop.NetworkManager.DnsManager
+org.freedesktop.NetworkManager.Device.Vlan — Virtual LAN Device
+

+

+org.freedesktop.NetworkManager.Device.Vxlan — VXLAN Device
+

+

+org.freedesktop.NetworkManager.Device.Wireless — Wi-Fi Device
+

+

+org.freedesktop.NetworkManager.Device.WiMax — WiMax Device
+

+

+org.freedesktop.NetworkManager.PPP — Helper interface for a PPP plugin
 

 

-
Types

+
The /org/freedesktop/NetworkManager/ActiveConnection/* objects

 

 

-NetworkManager D-Bus API Types
+org.freedesktop.NetworkManager.Connection.Active — Active Connection
 

 

-VPN Plugin D-Bus API Types
+org.freedesktop.NetworkManager.VPN.Connection — Active VPN Connection
 

 

+
The /org/freedesktop/NetworkManager/IP4Config/* objects

+

+org.freedesktop.NetworkManager.IP4Config — IPv4 Configuration Set
+

+
The /org/freedesktop/NetworkManager/IP6Config/* objects

+

+org.freedesktop.NetworkManager.IP6Config — IPv6 Configuration Set
+

+
The /org/freedesktop/NetworkManager/DHCP4Config/* objects

+

+org.freedesktop.NetworkManager.DHCP4Config — IPv4 DHCP Client State
+

+
The /org/freedesktop/NetworkManager/DHCP4Config/* objects

+

+org.freedesktop.NetworkManager.DHCP6Config — IPv6 DHCP Client State
+

+
The /org/freedesktop/NetworkManager/AccessPoint/* objects

+

+org.freedesktop.NetworkManager.AccessPoint — Wi-Fi Access Point
+

+
Types

+

+NetworkManager D-Bus API Types
+

+

+
IV. Secret Agent D-Bus API Reference

+

+
Secret agents

+

+org.freedesktop.NetworkManager.SecretAgent — User Secret Agent
+

 

-
Network Configuration Setting Specification

+
V. VPN Plugin D-Bus API Reference

 

-
Configuration Settings

-
Secret flag types

+
VPN services

+

+org.freedesktop.NetworkManager.VPN.Plugin — VPN Service
+

+
Types

+

+VPN Plugin D-Bus API Types
+

 

 
Index

 
A. License

diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index 75c36502..f08bb66e 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -16,804 +16,1368 @@
 
 Home
 
-Prev
+Prev
 Next
 
 

 

-Index

+Index

 

 

 
Symbols

 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-
org.freedesktop.NetworkManager.Device.GetAppliedConnection(), The GetAppliedConnection() method
+
org.freedesktop.NetworkManager.Device.Generic:HwAddress, The "HwAddress" property
 

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

-
org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.GetAppliedConnection(), The GetAppliedConnection() method
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-
org.freedesktop.NetworkManager.Device.Reapply(), The Reapply() method
+
org.freedesktop.NetworkManager.Device.OlpcMesh:Companion, The "Companion" property
 

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

-
org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Reapply(), The Reapply() method
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-
org.freedesktop.NetworkManager.Device.WiMax.GetNspList(), The GetNspList() method
+
org.freedesktop.NetworkManager.Device.Vxlan:Ttl, The "Ttl" property
 

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

-
org.freedesktop.NetworkManager.Device.WiMax::NspRemoved, The "NspRemoved" signal
+
org.freedesktop.NetworkManager.Device.WiMax.GetNspList(), The GetNspList() method
 

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

-
org.freedesktop.NetworkManager.Device.WiMax:ActiveNsp, The "ActiveNsp" property
+
org.freedesktop.NetworkManager.Device.WiMax::NspRemoved, The "NspRemoved" signal
 

-
org.freedesktop.NetworkManager.Device.WiMax:Bsid, The "Bsid" property
+
org.freedesktop.NetworkManager.Device.WiMax::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.WiMax:CenterFrequency, The "CenterFrequency" property
+
org.freedesktop.NetworkManager.Device.WiMax:ActiveNsp, The "ActiveNsp" property
 

-
org.freedesktop.NetworkManager.Device.WiMax:Cinr, The "Cinr" property
+
org.freedesktop.NetworkManager.Device.WiMax:Bsid, The "Bsid" property
 

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

-
org.freedesktop.NetworkManager.Device.WiMax:Nsps, The "Nsps" property
+
org.freedesktop.NetworkManager.Device.WiMax:Cinr, The "Cinr" property
 

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

-
org.freedesktop.NetworkManager.Device.WiMax:TxPower, The "TxPower" property
+
org.freedesktop.NetworkManager.Device.WiMax:Nsps, The "Nsps" property
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-
org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets(), The CancelGetSecrets() method
+
org.freedesktop.NetworkManager.IP6Config:Searches, The "Searches" property
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-
org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Settings.Connection.Update(), The Update() method
 

-
org.freedesktop.NetworkManager.Settings.Connection::Removed, The "Removed" signal
+
org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved(), The UpdateUnsaved() method
 

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

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

-
org.freedesktop.NetworkManager.Settings.GetConnectionByUuid(), The GetConnectionByUuid() method
+
org.freedesktop.NetworkManager.Settings.Connection::Updated, The "Updated" signal
 

-
org.freedesktop.NetworkManager.Settings.ListConnections(), The ListConnections() method
+
org.freedesktop.NetworkManager.Settings.Connection:Unsaved, The "Unsaved" property
 

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

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

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

-
org.freedesktop.NetworkManager.Settings::ConnectionRemoved, The "ConnectionRemoved" signal
+
org.freedesktop.NetworkManager.Settings.ReloadConnections(), The ReloadConnections() method
 

-
org.freedesktop.NetworkManager.Settings::NewConnection, The "NewConnection" signal
+
org.freedesktop.NetworkManager.Settings.SaveHostname(), The SaveHostname() method
 

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

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

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

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

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

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

 

 

 

 
A

 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+
addr-gen-mode, ipv6
+

+
address-data, ipv4, ipv6
+

+
addresses, ipv4, ipv6
+

+
ageing, vxlan
+

+
ageing-time, bridge
+

+
altsubject-matches, 802-1x
+

+
anonymous-identity, 802-1x
+

+
apn, gsm
+

+
app-fcoe-flags, dcb
+

+
app-fcoe-mode, dcb
+

+
app-fcoe-priority, dcb
+

+
app-fip-flags, dcb
+

+
app-fip-priority, dcb
+

+
app-iscsi-flags, dcb
+

+
app-iscsi-priority, dcb
+

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

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

+
auth-timeout, 802-1x
+

+
auto-negotiate, 802-3-ethernet
+

+
autoconnect, connection
+

+
autoconnect-priority, connection
+

+
autoconnect-retries, connection
+

+
autoconnect-slaves, connection
+

+

+

+

+
B

+

+
band, 802-11-wireless
 

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

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

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

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

-
org.freedesktop.NetworkManager.Connection.Active:Devices, The "Devices" property
+
bssid, 802-11-wireless
 

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

+

+

+
C

+

+
ca-cert, 802-1x
 

-
org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config, The "Dhcp6Config" property
+
ca-cert-password, 802-1x
 

-
org.freedesktop.NetworkManager.Connection.Active:Id, The "Id" property
+
ca-cert-password-flags, 802-1x
 

-
org.freedesktop.NetworkManager.Connection.Active:Ip4Config, The "Ip4Config" property
+
ca-path, 802-1x
 

-
org.freedesktop.NetworkManager.Connection.Active:Ip6Config, The "Ip6Config" property
+
channel, 802-11-olpc-mesh, 802-11-wireless
 

-
org.freedesktop.NetworkManager.Connection.Active:Master, The "Master" property
+
client-cert, 802-1x
 

-
org.freedesktop.NetworkManager.Connection.Active:SpecificObject, The "SpecificObject" property
+
client-cert-password, 802-1x
 

-
org.freedesktop.NetworkManager.Connection.Active:State, The "State" property
+
client-cert-password-flags, 802-1x
 

-
org.freedesktop.NetworkManager.Connection.Active:Type, The "Type" property
+
cloned-mac-address, 802-3-ethernet, 802-11-wireless
 

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

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

 

 

 

 
D

 

-
org.freedesktop.NetworkManager.Device.Wired, org.freedesktop.NetworkManager.Device.Wired
+
dad-timeout, ipv4, ipv6
+

+
data, user, vpn
+

+
destination-port, vxlan
+

+
device-id, gsm
+

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

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

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

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

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

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

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

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

-
org.freedesktop.NetworkManager.Device.Wired:Speed, The "Speed" property
+
org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints(), The GetAccessPoints() method
 

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

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

-
org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints(), The GetAllAccessPoints() method
+
org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded, The "AccessPointAdded" signal
 

-
org.freedesktop.NetworkManager.Device.Wireless.RequestScan(), The RequestScan() method
+
org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved, The "AccessPointRemoved" signal
 

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

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

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

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

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

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

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

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

-
org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress, The "PermHwAddress" property
+
dhcp-anycast-address, 802-11-olpc-mesh
 

-
org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities, The "WirelessCapabilities" property
+
dhcp-client-id, ipv4
 

-
org.freedesktop.NetworkManager.DHCP4Config, org.freedesktop.NetworkManager.DHCP4Config
+
dhcp-fqdn, ipv4
 

-
org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged, The "PropertiesChanged" signal
+
dhcp-hostname, ipv4, ipv6
+

+
dhcp-send-hostname, ipv4, ipv6
+

+
dhcp-timeout, ipv4, ipv6
+

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

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

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

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

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

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

+
dns, ipv4, ipv6
+

+
dns-options, ipv4, ipv6
+

+
dns-priority, ipv4, ipv6
+

+
dns-search, ipv4, ipv6
+

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

+
duplex, 802-3-ethernet
+

+

+

+

+
E

+

+
eap, 802-1x
 

-
org.freedesktop.NetworkManager.DHCP4Config:Options, The "Options" property
+
egress-priority-map, vlan
 

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

-
org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged, The "PropertiesChanged" signal
+
encapsulation-limit, ip-tunnel
 

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

+

+

+

+
F

+

+
flags, vlan
+

+
flow-label, ip-tunnel
+

+
forward-delay, bridge
+

+

+

+

+
G

+

+
gateway, ipv4, ipv6
+

+
gateway-ping-timeout, connection
+

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

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

+

+

+

+
H

+

+
hairpin-mode, bridge-port
+

+
hello-time, bridge
+

+
hidden, 802-11-wireless
+

+
home-only, gsm
+

+

+

+

+
I

+

+
id, connection, vlan, vxlan
+

+
identity, 802-1x
+

+
ignore-auto-dns, ipv4, ipv6
+

+
ignore-auto-routes, ipv4, ipv6
+

+
ingress-priority-map, vlan
+

+
input-key, ip-tunnel
+

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

+
ip6-privacy, ipv6
+

+

+

+

+
K

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

+

+

+
L

+

+
l2-miss, vxlan
+

+
l3-miss, vxlan
+

+
lcp-echo-failure, ppp
+

+
lcp-echo-interval, ppp
+

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

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

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

+
learning, vxlan
+

+
limit, vxlan
+

+
lldp, connection
+

+
local, ip-tunnel, vxlan
 

 

 

 

 
M

 

-
org.freedesktop.NetworkManager, org.freedesktop.NetworkManager
+
mac-address, bridge, infiniband, wimax, 802-3-ethernet, 802-11-wireless
+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-
org.freedesktop.NetworkManager.Sleep(), The Sleep() method
+
org.freedesktop.NetworkManager::CheckPermissions, The "CheckPermissions" signal
 

-
org.freedesktop.NetworkManager.state(), The state() method
+
org.freedesktop.NetworkManager::DeviceAdded, The "DeviceAdded" signal
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+
may-fail, ipv4, ipv6
+

+
metered, connection
+

+
method, ipv4, ipv6, proxy
+

+
mka-cak, macsec
+

+
mka-cak-flags, macsec
+

+
mka-ckn, macsec
+

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

+
mppe-stateful, ppp
+

+
mru, ppp
+

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

+
multi-queue, tun
+

+
multicast-snooping, bridge
 

 

 

 

 
N

 

-
NM80211ApFlags, enum NM80211ApFlags
+
name, connection, 802-1x, adsl, bluetooth, bond, bridge, bridge-port, cdma, dcb, dummy, generic, gsm, infiniband, ipv4, ipv6, ip-tunnel, macsec, macvlan, 802-11-olpc-mesh, ppp, pppoe, proxy, serial, team, team-port, tun, user, vlan, vpn, vxlan, wimax, 802-3-ethernet, 802-11-wireless, 802-11-wireless-security
+

+
network-id, gsm
+

+
network-name, wimax
+

+
never-default, ipv4, ipv6
+

+
NM80211ApFlags, enum NM80211ApFlags
+

+
NM80211ApSecurityFlags, enum NM80211ApSecurityFlags
+

+
NM80211Mode, enum NM80211Mode
 

-
NM80211ApSecurityFlags, enum NM80211ApSecurityFlags
+
NMActiveConnectionState, enum NMActiveConnectionState
 

-
NM80211Mode, enum NM80211Mode
+
NMActiveConnectionStateReason, enum NMActiveConnectionStateReason
 

-
NMActiveConnectionState, enum NMActiveConnectionState
+
NMBluetoothCapabilities, enum NMBluetoothCapabilities
 

-
NMBluetoothCapabilities, enum NMBluetoothCapabilities
+
NMCapability, enum NMCapability
 

-
NMCapability, enum NMCapability
+
NMCheckpointCreateFlags, enum NMCheckpointCreateFlags
 

-
NMCheckpointCreateFlags, enum NMCheckpointCreateFlags
+
NMConnectivityState, enum NMConnectivityState
 

-
NMConnectivityState, enum NMConnectivityState
+
NMDeviceCapabilities, enum NMDeviceCapabilities
 

-
NMDeviceCapabilities, enum NMDeviceCapabilities
+
NMDeviceModemCapabilities, enum NMDeviceModemCapabilities
 

-
NMDeviceModemCapabilities, enum NMDeviceModemCapabilities
+
NMDeviceState, enum NMDeviceState
 

-
NMDeviceState, enum NMDeviceState
+
NMDeviceStateReason, enum NMDeviceStateReason
 

-
NMDeviceStateReason, enum NMDeviceStateReason
+
NMDeviceType, enum NMDeviceType
 

-
NMDeviceType, enum NMDeviceType
+
NMDeviceWifiCapabilities, enum NMDeviceWifiCapabilities
 

-
NMDeviceWifiCapabilities, enum NMDeviceWifiCapabilities
+
NMIPTunnelMode, enum NMIPTunnelMode
 

-
NMIPTunnelMode, enum NMIPTunnelMode
+
NMMetered, enum NMMetered
 

-
NMMetered, enum NMMetered
+
NMRollbackResult, enum NMRollbackResult
 

-
NMRollbackResult, enum NMRollbackResult
+
NMSecretAgentCapabilities, enum NMSecretAgentCapabilities
 

-
NMSecretAgentCapabilities, enum NMSecretAgentCapabilities
+
NMSecretAgentGetSecretsFlags, enum NMSecretAgentGetSecretsFlags
 

-
NMSecretAgentGetSecretsFlags, enum NMSecretAgentGetSecretsFlags
+
NMState, enum NMState
 

-
NMState, enum NMState
+
NMVpnConnectionState, enum NMVpnConnectionState
 

-
NMVpnConnectionState, enum NMVpnConnectionState
+
NMVpnConnectionStateReason, enum NMVpnConnectionStateReason
 

-
NMVpnConnectionStateReason, enum NMVpnConnectionStateReason
+
NMVpnPluginFailure, enum NMVpnPluginFailure
 

-
NMVpnPluginFailure, enum NMVpnPluginFailure
+
NMVpnServiceState, enum NMVpnServiceState
 

-
NMVpnServiceState, enum NMVpnServiceState
+
NMWimaxNspNetworkType, enum NMWimaxNspNetworkType
 

-
NMWimaxNspNetworkType, enum NMWimaxNspNetworkType
+
no-vj-comp, ppp
+

+
noauth, ppp
+

+
nobsdcomp, ppp
+

+
nodeflate, ppp
+

+
number, cdma, gsm
+

+

+

+

+
O

+

+
options, bond
+

+
output-key, ip-tunnel
+

+
owner, tun
 

 

 

 

 
P

 

-
org.freedesktop.NetworkManager.PPP, org.freedesktop.NetworkManager.PPP
+
p-key, infiniband
+

+
pac-file, 802-1x
+

+
pac-script, proxy
+

+
pac-url, proxy
+

+
pairwise, 802-11-wireless-security
+

+
parent, infiniband, ip-tunnel, macsec, macvlan, vlan, vxlan
+

+
parity, serial
+

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

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

+
password-raw, 802-1x
+

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

+
path-cost, bridge-port
+

+
path-mtu-discovery, ip-tunnel
+

+
permissions, connection
+

+
persistent, vpn
+

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

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

+
phase1-peaplabel, 802-1x
+

+
phase1-peapver, 802-1x
+

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

+
phase2-auth, 802-1x
+

+
phase2-autheap, 802-1x
+

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

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

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

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

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

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

-
org.freedesktop.NetworkManager.PPP.NeedSecrets(), The NeedSecrets() method
+
phase2-client-cert-password-flags, 802-1x
 

-
org.freedesktop.NetworkManager.PPP.SetIp4Config(), The SetIp4Config() method
+
phase2-domain-suffix-match, 802-1x
 

-
org.freedesktop.NetworkManager.PPP.SetIp6Config(), The SetIp6Config() method
+
phase2-private-key, 802-1x
 

-
org.freedesktop.NetworkManager.PPP.SetState(), The SetState() method
+
phase2-private-key-password, 802-1x
+

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

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

+
pi, tun
+

+
pin, 802-1x, gsm
+

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

+
port, macsec, 802-3-ethernet
+

+
powersave, 802-11-wireless
+

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

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

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

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

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

+
priority, bridge, bridge-port
+

+
priority-bandwidth, dcb
+

+
priority-flow-control, dcb
+

+
priority-flow-control-flags, dcb
+

+
priority-group-bandwidth, dcb
+

+
priority-group-flags, dcb
+

+
priority-group-id, dcb
+

+
priority-strict-bandwidth, dcb
+

+
priority-traffic-class, dcb
+

+
private-key, 802-1x
+

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

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

+
promiscuous, macvlan
+

+
proto, 802-11-wireless-security
+

+
protocol, adsl
+

+
proxy, vxlan
+

+
psk, 802-11-wireless-security
+

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

+

+

+

+
R

+

+
rate, 802-11-wireless
+

+
read-only, connection
+

+
refuse-chap, ppp
+

+
refuse-eap, ppp
+

+
refuse-mschap, ppp
+

+
refuse-mschapv2, ppp
+

+
refuse-pap, ppp
+

+
remote, ip-tunnel, vxlan
+

+
require-mppe, ppp
+

+
require-mppe-128, ppp
+

+
route-data, ipv4, ipv6
+

+
route-metric, ipv4, ipv6
+

+
routes, ipv4, ipv6
+

+
rsc, vxlan
+

+

+

+

+
S

+

+
s390-nettype, 802-3-ethernet
+

+
s390-options, 802-3-ethernet
+

+
s390-subchannels, 802-3-ethernet
+

+
secondaries, connection
+

+
secrets, vpn
+

+
security, 802-11-wireless
+

+
seen-bssids, 802-11-wireless
+

+
send-delay, serial
+

+
service, pppoe
+

+
service-type, vpn
+

+
sim-id, gsm
+

+
sim-operator-id, gsm
+

+
slave-type, connection
+

+
source-port-max, vxlan
+

+
source-port-min, vxlan
+

+
speed, 802-3-ethernet
+

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

+
stable-id, connection
+

+
stopbits, serial
+

+
stp, bridge
+

+
subject-match, 802-1x
+

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

+

+

+

+
T

+

+
tap, macvlan
+

+
timeout, vpn
+

+
timestamp, connection
+

+
token, ipv6
+

+
tos, ip-tunnel, vxlan
+

+
transport-mode, infiniband
+

+
ttl, ip-tunnel, vxlan
+

+
tx-power, 802-11-wireless
+

+
type, connection, bluetooth
+

+

+

+

+
U

+

+
user-name, vpn
+

+
username, adsl, cdma, gsm, pppoe
+

+
uuid, connection
 

 

 

 

 
V

 

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

+
vci, adsl
 

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

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

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

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

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

-
org.freedesktop.NetworkManager.VPN.Plugin.Connect(), The Connect() method
+
org.freedesktop.NetworkManager.VPN.Connection:Banner, The "Banner" property
 

-
org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive(), The ConnectInteractive() method
+
org.freedesktop.NetworkManager.VPN.Connection:VpnState, The "VpnState" property
 

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

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

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

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

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

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

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

-
org.freedesktop.NetworkManager.VPN.Plugin::Config, The "Config" signal
+
org.freedesktop.NetworkManager.VPN.Plugin.SetFailure(), The SetFailure() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Failure, The "Failure" signal
+
org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config(), The SetIp4Config() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config, The "Ip4Config" signal
+
org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config(), The SetIp6Config() method
 

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

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

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

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

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

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

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

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

+

+

+

+
W

+

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

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

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

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

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

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

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

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

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

 

 

+

+
Z

+
zone, connection
+

+

 

 

 

diff --git a/docs/api/html/manpages.html b/docs/api/html/manpages.html
index 1e07597e..a24733fe 100644
--- a/docs/api/html/manpages.html
+++ b/docs/api/html/manpages.html
@@ -2,12 +2,12 @@
 
 
 
-Manual Pages: NetworkManager Reference Manual
+Part I. Manual Pages: NetworkManager Reference Manual
 
 
 
 
-
+
 
 
 
@@ -17,23 +17,28 @@
 Home
 
 Prev
-Next
+Next
 
-

+

 

-Manual Pages

-

+Part I. Manual Pages

+

+
Table of Contents

+

 

-nmcli — command-line tool for controlling NetworkManager
+NetworkManager — network management daemon
 

 

-nmtui — Text User Interface for controlling NetworkManager
+NetworkManager.conf — NetworkManager configuration file
 

 

-nm-online — ask NetworkManager whether the network is connected
+nmcli — command-line tool for controlling NetworkManager
 

 

-NetworkManager.conf — NetworkManager configuration file
+nmcli-examples — usage examples of nmcli
+

+

+nmtui — Text User Interface for controlling NetworkManager
 

 

 nm-settings — Description of settings and properties of NetworkManager connection profiles
@@ -45,12 +50,10 @@
 nm-settings-ifcfg-rh — Description of ifcfg-rh settings plugin
 

 

-nmcli-examples — usage examples of nmcli
-

-

-NetworkManager — network management daemon
+nm-online — ask NetworkManager whether the network is connected
 

-

+
+

 

 

 
Generated by GTK-Doc V1.25

diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html
index c3d51edc..7971b211 100644
--- a/docs/api/html/nm-dbus-types.html
+++ b/docs/api/html/nm-dbus-types.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -17,7 +17,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 

 

@@ -34,7 +34,7 @@
 
The range 0x7000 - 0x7FFF of capabilities is guaranteed not to be used by upstream NetworkManager. It could thus be used for downstream extensions.

 

 

-
Values

+
Values

 
@@ -66,7 +66,7 @@
 
NMState values indicate the current overall networking state.

-
Values

+
Values

 

 
 

 
 
@@ -85,7 +85,7 @@
 

@@ -100,7 +100,7 @@
 

@@ -115,7 +115,7 @@
 

@@ -130,7 +130,7 @@
 

@@ -145,7 +145,7 @@
 

@@ -160,7 +160,7 @@
 

@@ -175,7 +175,7 @@
 

@@ -190,7 +190,7 @@
 

@@ -204,7 +204,7 @@
 
enum NMConnectivityState

-
Values

+
Values

 

 
 

 
 

-
networking state is unknown

+
Networking state is unknown. This indicates a daemon error that makes it unable to reasonably assess the state. In such event the applications are expected to assume Internet connectivity might be present and not disable controls that require network access. The graphical shells may hide the network accessibility indicator altogether since no meaningful status indication can be provided.

 

 		
  
 
 
-
networking is not enabled

+
Networking is not enabled, the system is being suspended or resumed from suspend.

 

 		
  
 
 
-
there is no active network connection

+
There is no active network connection. The graphical shell should indicate  no network connectivity and the applications should not attempt to access the network.

 

 		
  
 
 
-
network connections are being cleaned up

+
Network connections are being cleaned up. The applications should tear down their network sessions.

 

 		
  
 
 
-
a network connection is being started

+
A network connection is being started The graphical shell should indicate the network is being connected while the applications should still make no attempts to connect the network.

 

 		
  
 
 
-
there is only local IPv4 and/or IPv6 connectivity

+
There is only local IPv4 and/or IPv6 connectivity, but no default route to access the Internet. The graphical shell should indicate no network connectivity.

 

 		
  
 
 
-
there is only site-wide IPv4 and/or IPv6 connectivity

+
There is only site-wide IPv4 and/or IPv6 connectivity. This means a default route is available, but the Internet connectivity check (see "Connectivity" property) did not succeed. The graphical shell should indicate limited network connectivity.

 

 		
  
 
 
-
there is global IPv4 and/or IPv6 Internet connectivity

+
There is global IPv4 and/or IPv6 Internet connectivity This means the Internet connectivity check succeeded, the graphical shell should indicate full network connectivity.

 

 		
  
 
 
@@ -223,7 +223,7 @@
 

@@ -238,7 +238,7 @@
 

@@ -253,7 +253,7 @@
 

@@ -268,7 +268,7 @@
 

@@ -298,7 +298,7 @@
 
NMDeviceType values indicate the type of hardware represented by a device object.

-
Values

+
Values

 

 
 

 
 

-
Network connectivity is unknown.

+
Network connectivity is unknown. This means the connectivity checks are disabled (e.g. on server installations) or has not run yet. The graphical shell should assume the Internet connection might be available and not present a captive portal window.

 

 		
  
 
 
-
The host is not connected to any network.

+
The host is not connected to any network. There's no active connection that contains a default route to the internet and thus it makes no sense to even attempt a connectivity check. The graphical shell should use this state to indicate the network connection is unavailable.

 

 		
  
 
 
-
The host is behind a captive portal and cannot reach the full Internet.

+
The Internet connection is hijacked by a captive portal gateway. The graphical shell may open a sandboxed web browser window (because the captive portals typically attempt a man-in-the-middle attacks agains the https connections) for the purpose of authenticating to a gateway and retrigger the connectivity check with CheckConnectivity() when the browser window is dismissed.

 

 		
  
 
 
-
The host is connected to a network, but does not appear to be able to reach the full Internet.

+
The host is connected to a network, does not appear to be able to reach the full Internet, but a captive portal has not been detected.

 

 		
  
 
 
@@ -637,6 +637,21 @@
 
+
+
+
+
+
+

 
 

 
 
 

+
NM_DEVICE_TYPE_DUMMY

+

+		
+
= 22

+

+		
+
a dummy interface

+

+		 

 
 

 

@@ -647,7 +662,7 @@
 
General device capability flags.

 

 

-
Values

+
Values

 
@@ -716,6 +731,21 @@
 
+
+
+
+
+
+

 
 

 
 
 

+
NM_DEVICE_CAP_SRIOV

+

+		
+
= 0x00000008

+

+		
+
this device supports single-root I/O virtualization

+

+		 

 
 

 

@@ -726,7 +756,7 @@
 
802.11 specific device encryption and authentication capabilities.

 

 

-
Values

+
Values

 
@@ -925,7 +955,7 @@
 
802.11 access point flags.

-
Values

+
Values

 

 
 

 
 
@@ -974,7 +1004,7 @@
 
802.11 access point security and authentication flags.  These flags describe the current security requirements of an access point as determined from the access point's beacon.

-
Values

+
Values

 

 
 

 
 
@@ -1158,7 +1188,7 @@
 
Indicates the 802.11 mode an access point or device is currently in.

-
Values

+
Values

 

 
 

 
 
@@ -1237,7 +1267,7 @@
 
NMBluetoothCapabilities values indicate the usable capabilities of a Bluetooth device.

-
Values

+
Values

 

 
 

 
 
@@ -1301,7 +1331,7 @@
 
NMDeviceModemCapabilities values indicate the generic radio access technology families a modem device supports.  For more information on the specific access technologies the device supports use the ModemManager D-Bus API.

-
Values

+
Values

 

 
 

 
 
@@ -1395,7 +1425,7 @@
 
WiMAX network type.

-
Values

+
Values

 

 
 

 
 
@@ -1473,7 +1503,7 @@
 
enum NMDeviceState

-
Values

+
Values

 

 
 

 
 
@@ -1687,7 +1717,7 @@
 
Device state change reason codes

-
Values

+
Values

 

 
 

 
 
@@ -2651,7 +2681,7 @@
 
Since: 1.2

-
Values

+
Values

 

 
 

 
 
@@ -2745,7 +2775,7 @@
 
NMActiveConnectionState values indicate the state of a connection to a specific network while it is starting, connected, or disconnecting from that network.

-
Values

+
Values

 

 
 

 
 
@@ -2835,11 +2865,256 @@
 

+
enum NMActiveConnectionStateReason

+
Active connection state reasons.

+
Since: 1.8

+

+

+
Values

+

 
 

 
 

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







+
NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN

+

+		
+
= 0

+

+		
+
The reason for the active connection state change is unknown.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_NONE

+

+		
+
= 1

+

+		
+
No reason was given for the active connection state change.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED

+

+		
+
= 2

+

+		
+
The active connection changed state because the user disconnected it.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED

+

+		
+
= 3

+

+		
+
The active connection changed state because the device it was using was disconnected.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED

+

+		
+
= 4

+

+		
+
The service providing the VPN connection was stopped.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID

+

+		
+
= 5

+

+		
+
The IP config of the active connection was invalid.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT

+

+		
+
= 6

+

+		
+
The connection attempt to the VPN service timed out.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT

+

+		
+
= 7

+

+		
+
A timeout occurred while starting the service providing the VPN connection.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED

+

+		
+
= 8

+

+		
+
Starting the service providing the VPN connection failed.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS

+

+		
+
= 9

+

+		
+
Necessary secrets for the connection were not provided.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED

+

+		
+
= 10

+

+		
+
Authentication to the server failed.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED

+

+		
+
= 11

+

+		
+
The connection was deleted from settings.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_DEPENDENCY_FAILED

+

+		
+
= 12

+

+		
+
Master connection of this connection failed to activate.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REALIZE_FAILED

+

+		
+
= 13

+

+		
+
Could not create the software device link.

+

+		 

+
NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REMOVED

+

+		
+
= 14

+

+		
+
The device this connection depended on disappeared.

+

+		 

+

+

+

+

 
enum NMSecretAgentGetSecretsFlags

 
NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.

 

 

-
Values

+
Values

 
@@ -2948,7 +3223,7 @@
 
NMSecretAgentCapabilities indicate various capabilities of the agent.

-
Values

+
Values

 

 
 

 
 
@@ -2998,7 +3273,7 @@
 
Since: 1.2

-
Values

+
Values

 

 
 

 
 
@@ -3168,7 +3443,7 @@
 
Since: 1.4

-
Values

+
Values

 

 
 

 
 
@@ -3248,7 +3523,7 @@
 
Since: 1.4

-
Values

+
Values

 

 
 

 
 
diff --git a/docs/api/html/nm-online.html b/docs/api/html/nm-online.html
index b13bd4c5..f497fde2 100644
--- a/docs/api/html/nm-online.html
+++ b/docs/api/html/nm-online.html
@@ -5,9 +5,9 @@
 nm-online: NetworkManager Reference Manual
-
-
-
+
+
+
@@ -16,8 +16,8 @@
 
-
-
+
+

 
 

 
 
 
 
 

 Home
 UpPrevNextPrevNext
 

 

 

diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index abea717e..afd683e9 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -5,9 +5,9 @@
 nm-settings-ifcfg-rh: NetworkManager Reference Manual
 
 
-
+
 
-
+
 
 
 
@@ -17,7 +17,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 

 

@@ -252,7 +252,7 @@ DEVICETYPE=TeamPort
           are NetworkManager specific extensions not understood by traditional initscripts.
         

 

-
Table 65. 802-1x setting

+
Table 33. 802-1x setting

 
@@ -382,6 +382,17 @@ Example: IEEE_8021X_FAST_PROVISIONING="allow-auth allow-unauth"<
 Allowed values: space-separated list of these values [allow-auth, allow-unauth]
+
+
+
+
+
+
@@ -523,11 +534,18 @@ Example: IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12
+
+
+
+
+
+

 
 

 
 
phase1-auth-flagsIEEE_8021X_PHASE1_AUTH_FLAGS(+)
+ Authentication flags for the supplicant
+
+Example: IEEE_8021X_PHASE1_AUTH_FLAGS="tls-1-0-disable tls-1-1-disable"
+
+Allowed values: space-separated list of authentication flags names

 phase2-auth
 IEEE_8021X_INNER_AUTH_METHODS(+)
 
  
 The property is not handled by ifcfg-rh plugin.
 
auth-timeoutIEEE_8021X_AUTH_TIMEOUT(+)
+0Timeout in seconds for the 802.1X authentication. Zero means the global default or 25.

 
 

 

 

-
Table 66. bond setting

+
Table 34. bond setting

 
@@ -552,7 +570,7 @@ Example: BONDING_OPTS="miimon=100 mode=broadcast"

 
 

 

 

 

-
Table 67. bridge-port setting

+
Table 35. bridge-port setting

 
@@ -593,7 +611,7 @@ Allowed values: 1 - 65535

 
 

 

 

 

-
Table 68. bridge setting

+
Table 36. bridge setting

 
@@ -673,7 +691,7 @@ Allowed values: 0 or 1

 
 

 

 

 

-
Table 69. connection setting

+
Table 37. connection setting

 
@@ -832,7 +850,7 @@ Allowed values: boolean value or 'rx'

 
 

 

 

 

-
Table 70. dcb setting

+
Table 38. dcb setting

 
@@ -967,7 +985,25 @@ Example: DCB_PG_UP2TC=01623701
           used explicitly to enable DCB so that the rest of the DCB_* variables can apply.
         

-
Table 71. infiniband setting

+
Table 39. dummy setting

+

 
 

 

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






PropertyIfcfg-rh VariableDefaultDescription

+

+

+
Table 40. infiniband setting

 
@@ -1022,7 +1058,7 @@ Example: PHYSDEV=ib0

 
 

 

 

 

-
Table 72. ipv4 setting

+
Table 41. ipv4 setting

 
@@ -1077,7 +1113,7 @@ Example: GATEWAY=10.5.5.1
-
+
@@ -1174,7 +1210,7 @@ Example: DHCP_FQDN=foo.bar.com

 
 

 
 

 routesADDRESS1, NETMASK1, GATEWAY1, METRIC1, ...ADDRESS1, NETMASK1, GATEWAY1, METRIC1, OPTIONS1, ...
  
 List of static routes. They are not stored in ifcfg-* file, but in route-* file instead.
 

 

 

 

-
Table 73. ipv6 setting

+
Table 42. ipv6 setting

 
@@ -1311,7 +1347,7 @@ Example: IPV6_TOKEN=::53

 
 

 

 

 

-
Table 74. macsec setting

+
Table 43. macsec setting

 
@@ -1329,7 +1365,7 @@ Example: IPV6_TOKEN=::53

 
 

 

 

 

-
Table 75. proxy setting

+
Table 44. proxy setting

 
@@ -1382,7 +1418,7 @@ Example: PAC_SCRIPT=/home/joe/proxy.pac

 
 

 

 

 

-
Table 76. team-port setting

+
Table 45. team-port setting

 
@@ -1405,7 +1441,7 @@ Example: PAC_SCRIPT=/home/joe/proxy.pac

 
 

 

 

 

-
Table 77. team setting

+
Table 46. team setting

 
@@ -1428,7 +1464,25 @@ Example: PAC_SCRIPT=/home/joe/proxy.pac

 
 

 

 

 

-
Table 78. 802-3-ethernet setting

+
Table 47. user setting

+

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






PropertyIfcfg-rh VariableDefaultDescription

+

+

+
Table 48. 802-3-ethernet setting

 
@@ -1529,7 +1583,7 @@ Allowed values: "qeth", "lcs" or "ctc"

 
 

 

 

 

-
Table 79. 802-11-wireless-security setting

+
Table 49. 802-11-wireless-security setting

 
@@ -1681,7 +1735,7 @@ Example: KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysuperse
 

 
 


 

 

-
Table 80. 802-11-wireless setting

+
Table 50. 802-11-wireless setting

 
diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html
index bd2b1920..4ea43e48 100644
--- a/docs/api/html/nm-settings-keyfile.html
+++ b/docs/api/html/nm-settings-keyfile.html
@@ -5,7 +5,7 @@
 nm-settings-keyfile: NetworkManager Reference Manual
-
+
@@ -188,7 +188,7 @@ id=4
 

 
 

 
 
 
 
 
802-11-wireless-security  =  wifi-security

 

 

-
Table 57. bridge setting (section)

+
Table 25. bridge setting (section)

 
@@ -213,7 +213,7 @@ Example: mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;1
 

 
 


 

 

-
Table 58. infiniband setting (section)

+
Table 26. infiniband setting (section)

 
@@ -238,7 +238,7 @@ Example: mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:
 

 
 


 

 

-
Table 59. ipv4 setting (section)

+
Table 27. ipv4 setting (section)

 
@@ -289,7 +289,7 @@ Example: route1=8.8.8.0/24,10.1.1.1,77 route2=7.7.0.0/16

 
 

 

 

 

-
Table 60. ipv6 setting (section)

+
Table 28. ipv6 setting (section)

 
@@ -340,7 +340,7 @@ Example: route1=2001:4860:4860::/64,2620:52:0:2219:222:68ff:fe11
 

 
 


 

 

-
Table 61. serial setting (section)

+
Table 29. serial setting (section)

 
@@ -365,7 +365,7 @@ Example: parity=n

 
 

 

 

 

-
Table 62. vpn setting (section)

+
Table 30. vpn setting (section)

 
@@ -400,7 +400,7 @@ Example: password=Popocatepetl

 
 

 

 

 

-
Table 63. 802-3-ethernet setting (section)

+
Table 31. 802-3-ethernet setting (section)

 
@@ -439,7 +439,7 @@ Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
 

 
 


 

 

-
Table 64. 802-11-wireless setting (section)

+
Table 32. 802-11-wireless setting (section)

 
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index 9501aa71..38c28d64 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -5,8 +5,8 @@
 nm-settings: NetworkManager Reference Manual
-
-
+
+
@@ -16,7 +16,7 @@
 
-
+

 
 

 
 
 
 
 

 Home
 UpPrevPrev
 Next
 

 

@@ -93,9 +93,171 @@
 
 
 

-

-
Table 25. 802-1x setting

-

+

+
connection setting

+
General Connection Profile Settings.

+

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






Key NameValue TypeDefault ValueValue Description

+autoconnectbooleanTRUEWhether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.

+autoconnect-priorityint320The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.

+autoconnect-retriesint32-1The number of times a connection should be tried when autoctivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden).

+autoconnect-slavesNMSettingConnectionAutoconnectSlaves (int32) Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.

+gateway-ping-timeoutuint320If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.

+idstring A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".

+interface-namestring The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.

+lldpint32-1Whether LLDP is enabled for the connection.

+masterstring Interface name of the master device or UUID of the master connection.

+meteredNMMetered (int32) Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.

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

+permissionsarray of string[]An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this list. Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". At this time only the "user" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ":" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.

+read-onlybooleanFALSEFALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.

+secondariesarray of string[]List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.

+slave-typestring Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.

+stable-idstring Token to generate stable IDs for the connection. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note that also the interface name of the activating connection and a per-host secret key is included into the address generation so that the same stable-id on different hosts/devices yields different addresses. If the value is unset, an ID unique for the connection is used. Specifing a stable-id allows multiple connections to generate the same addresses. Another use is to generate IDs at runtime via dynamic substitutions. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are "${CONNECTION}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-boot, or every time. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as "$$". For example, set it to "${CONNECTION}/${BOOT}" to create a unique id for this connection that changes with every reboot. Note that two connections only use the same effective id if their stable-id is also identical before performing dynamic substitutions.

+timestampuint640The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).

+typestring Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).

+uuidstring A universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").

+zonestring The trust level of a the connection.  Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.

+

+

+

+
802-1x setting

+
AIEEE 802.1x Authentication Settings.

+
@@ -125,6 +287,13 @@
 
+
+
+
+
+
+
@@ -132,6 +301,20 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
@@ -146,6 +329,20 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
@@ -209,6 +406,13 @@
 
+
+
+
+
+
+
@@ -258,6 +462,20 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
@@ -272,6 +490,20 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
@@ -282,7 +514,7 @@
 phase2-private-key
-
+
-
+

 
 
 

 

 
+auth-timeoutint320A timeout for the authentication. Zero means the global default; if the global default is not set, the authentication timeout is 25 seconds.

 ca-cert
 byte array
  

 

 
+ca-cert-passwordstring The password used to access the CA certificate stored in "ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.

+ca-cert-password-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "ca-cert-password" property. (see the section called “Secret flag types:” for flag values)

 ca-path
 string
  

 

 
+client-cert-passwordstring The password used to access the client certificate stored in "client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.

+client-cert-password-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "client-cert-password" property. (see the section called “Secret flag types:” for flag values)

 domain-suffix-match
 string
  

 

 
+phase1-auth-flagsuint320Specifies authentication flags to use in "phase 1" outer authentication using NMSetting8021xAuthFlags options. The invidual TLS versions can be explicitly disabled. If a certain TLS disable flag is not set, it is up to the supplicant to allow or forbid it. The TLS options map to tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more details.

 phase1-fast-provisioning
 string
  

 

 
+phase2-ca-cert-passwordstring The password used to access the "phase2" CA certificate stored in "phase2-ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.

+phase2-ca-cert-password-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "phase2-ca-cert-password" property. (see the section called “Secret flag types:” for flag values)

 phase2-ca-path
 string
  

 

 
+phase2-client-cert-passwordstring The password used to access the "phase2" client certificate stored in "phase2-client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.

+phase2-client-cert-password-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "phase2-client-cert-password" property. (see the section called “Secret flag types:” for flag values)

 phase2-domain-suffix-match
 string
  
 byte array
  Contains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate.Contains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate.
 

 

 
@@ -324,7 +556,7 @@
 private-key
 byte array
  Contains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users.  Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data.Contains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users.  Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data.
 

 

 
@@ -357,9 +589,11 @@
 

 

 

-

-
Table 26. adsl setting

-

+

+

+
adsl setting

+
ADSL Settings.

+
@@ -432,9 +666,11 @@
 

 
 
 

 

 

-

-
Table 27. bluetooth setting

-

+

+

+
bluetooth setting

+
Bluetooth Settings.

+
@@ -472,9 +708,11 @@
 

 
 
 

 

 

-

-
Table 28. bond setting

-

+

+

+
bond setting

+
Bonding Settings.

+
@@ -512,9 +750,11 @@
 

 
 
 

 

 

-

-
Table 29. bridge setting

-

+

+

+
bridge setting

+
Bridging Settings.

+
@@ -601,9 +841,11 @@
 

 
 
 

 

 

-

-
Table 30. bridge-port setting

-

+

+

+
bridge-port setting

+
Bridge Port Settings.

+
@@ -648,9 +890,11 @@
 

 
 
 

 

 

-

-
Table 31. cdma setting

-

+

+

+
cdma setting

+
CDMA-based Mobile Broadband Settings.

+
@@ -666,6 +910,13 @@
 
+
+
+
+
+
+
@@ -702,168 +953,11 @@
 

 
 
 

 

 
+mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.

 name
 string
 cdma

 

 

-

-
Table 32. connection setting

-

------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-






Key NameValue TypeDefault ValueValue Description

-autoconnectbooleanTRUEWhether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.

-autoconnect-priorityint320The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.

-autoconnect-retriesint32-1The number of times a connection should be tried when autoctivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden).

-autoconnect-slavesNMSettingConnectionAutoconnectSlaves (int32) Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.

-gateway-ping-timeoutuint320If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.

-idstring A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".

-interface-namestring The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.

-lldpint32-1Whether LLDP is enabled for the connection.

-masterstring Interface name of the master device or UUID of the master connection.

-meteredNMMetered (int32) Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.

-namestringconnectionThe 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".

-permissionsarray of string[]An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this list. Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". At this time only the "user" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ":" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.

-read-onlybooleanFALSEFALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.

-secondariesarray of string[]List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.

-slave-typestring Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.

-stable-idstring Token to generate stable IDs for the connection. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note that also the interface name of the activating connection and a per-host secret key is included into the address generation so that the same stable-id on different hosts/devices yields different addresses. If the value is unset, an ID unique for the connection is used. Specifing a stable-id allows multiple connections to generate the same addresses. Another use is to generate IDs at runtime via dynamic substitutions. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are "${CONNECTION}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-boot, or every time. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as "$$". For example, set it to "${CONNECTION}/${BOOT}" to create a unique id for this connection that changes with every reboot. Note that two connections only use the same effective id if their stable-id is also identical before performing dynamic substitutions.

-timestampuint640The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).

-typestring Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).

-uuidstring A universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").

-zonestring The trust level of a the connection.  Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.

-

-

-
Table 33. dcb setting

-

+

+

+
dcb setting

+
Data Center Bridging Settings.

+
@@ -992,9 +1086,37 @@
 

 
 
 

 

 

-

-
Table 34. generic setting

-

+

+

+
dummy setting

+
Dummy Link Settings.

+

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






Key NameValue TypeDefault ValueValue Description

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

+

+

+

+
generic setting

+
Generic Link Settings.

+
@@ -1016,9 +1138,11 @@
 

 
 
 

 

 

-

-
Table 35. gsm setting

-

+

+

+
gsm setting

+
GSM-based Mobile Broadband Settings.

+
@@ -1055,6 +1179,13 @@
 
+
+
+
+
+
+
@@ -1126,9 +1257,11 @@
 

 
 
 

 

 
+mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.

 name
 string
 gsm

 

 

-

-
Table 36. infiniband setting

-

+

+

+
infiniband setting

+
Infiniband Settings.

+
@@ -1187,9 +1320,11 @@
 

 
 
 

 

 

-

-
Table 37. ipv4 setting

-

+

+

+
ipv4 setting

+
IPv4 Settings.

+
@@ -1360,9 +1495,11 @@
 

 
 
 

 

 

-

-
Table 38. ipv6 setting

-

+

+

+
ipv6 setting

+
IPv6 Settings.

+
@@ -1540,9 +1677,11 @@
 

 
 
 

 

 

-

-
Table 39. ip-tunnel setting

-

+

+

+
ip-tunnel setting

+
IP Tunneling Settings.

+
@@ -1650,9 +1789,11 @@
 

 
 
 

 

 

-

-
Table 40. macsec setting

-

+

+

+
macsec setting

+
MACSec Settings.

+
@@ -1732,9 +1873,11 @@
 

 
 
 

 

 

-

-
Table 41. macvlan setting

-

+

+

+
macvlan setting

+
MAC VLAN Settings.

+
@@ -1786,9 +1929,11 @@
 

 
 
 

 

 

-

-
Table 42. 802-11-olpc-mesh setting

-

+

+

+
802-11-olpc-mesh setting

+
OLPC Wireless Mesh Settings.

+
@@ -1833,9 +1978,11 @@
 

 
 
 

 

 

-

-
Table 43. ppp setting

-

+

+

+
ppp setting

+
Point-to-Point Protocol Settings.

+
@@ -1985,9 +2132,11 @@
 

 
 
 

 

 

-

-
Table 44. pppoe setting

-

+

+

+
pppoe setting

+
PPP-over-Ethernet Settings.

+
@@ -2039,9 +2188,11 @@
 

 
 
 

 

 

-

-
Table 45. proxy setting

-

+

+

+
proxy setting

+
WWW Proxy Settings.

+
@@ -2093,9 +2244,11 @@
 

 
 
 

 

 

-

-
Table 46. serial setting

-

+

+

+
serial setting

+
Serial Link Settings.

+
@@ -2154,9 +2307,11 @@
 

 
 
 

 

 

-

-
Table 47. team setting

-

+

+

+
team setting

+
Teaming Settings.

+
@@ -2194,9 +2349,11 @@
 

 
 
 

 

 

-

-
Table 48. team-port setting

-

+

+

+
team-port setting

+
Team Port Settings.

+
@@ -2227,9 +2384,11 @@
 

 
 
 

 

 

-

-
Table 49. tun setting

-

+

+

+
tun setting

+
Tunnel Settings.

+
@@ -2295,9 +2454,46 @@
 

 
 
 

 

 

-

-
Table 50. vlan setting

-

+

+

+
user setting

+
General User Profile Settings.

+

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






Key NameValue TypeDefault ValueValue Description

+datadict of string to string{}A dictionary of key/value pairs with user data. This data is ignored by NetworkManager and can be used at the users discretion. The keys only support a strict ascii format, but the values can be arbitrary UTF8 strings up to a certain length.

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

+

+

+

+
vlan setting

+
VLAN Settings.

+
@@ -2363,9 +2559,11 @@
 

 
 
 

 

 

-

-
Table 51. vpn setting

-

+

+

+
vpn setting

+
VPN Settings.

+
@@ -2431,9 +2629,11 @@
 

 
 
 

 

 

-

-
Table 52. vxlan setting

-

+

+

+
vxlan setting

+
VXLAN Settings.

+
@@ -2569,9 +2769,11 @@
 

 
 
 

 

 

-

-
Table 53. wimax setting

-

+

+

+
wimax setting

+
WiMax Settings.

+
@@ -2609,9 +2811,11 @@
 

 
 
 

 

 

-

-
Table 54. 802-3-ethernet setting

-

+

+

+
802-3-ethernet setting

+
Wired Ethernet Settings.

+
@@ -2740,9 +2944,11 @@
 

 
 
 

 

 

-

-
Table 55. 802-11-wireless setting

-

+

+

+
802-11-wireless setting

+
Wi-Fi Settings.

+
@@ -2892,9 +3098,11 @@
 

 
 
 

 

 

-

-
Table 56. 802-11-wireless-security setting

-

+

+

+
802-11-wireless-security setting

+
Wi-Fi Security Settings.

+
@@ -3037,7 +3245,8 @@
 

 
 
 

 

 

-

+

+

 
Secret flag types:

 

             Each secret property in a setting has an associated flags property
diff --git a/docs/api/html/nm-vpn-dbus-types.html b/docs/api/html/nm-vpn-dbus-types.html
index ce80a5ee..625468a7 100644
--- a/docs/api/html/nm-vpn-dbus-types.html
+++ b/docs/api/html/nm-vpn-dbus-types.html
@@ -5,9 +5,9 @@
 VPN Plugin D-Bus API Types: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -15,9 +15,9 @@
 
-
-
-
+
+
+
 

 

@@ -33,7 +33,7 @@
 
VPN daemon states

 

 

-
Values

+
Values

 
@@ -157,7 +157,7 @@
 
VPN connection states

-
Values

+
Values

 

 
 

 
 
@@ -296,7 +296,7 @@
 
VPN connection state reasons

-
Values

+
Values

 

 
 

 
 
@@ -311,7 +311,7 @@
 

-
-
+
+

 
 

 
 

-
= 0

+
= NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN

 

 		
 
@@ -326,7 +326,7 @@
 

 		
 
-
= 1

+
= NM_ACTIVE_CONNECTION_STATE_REASON_NONE

 

 		
 
@@ -341,7 +341,7 @@
 

 		
 
-
= 2

+
= NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED

 

 		
 
@@ -356,7 +356,7 @@
 

 		
 
-
= 3

+
= NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED

 

 		
 
@@ -371,7 +371,7 @@
 

 		
 
-
= 4

+
= NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED

 

 		
 
@@ -386,7 +386,7 @@
 

 		
 
-
= 5

+
= NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID

 

 		
 
@@ -401,7 +401,7 @@
 

 		
 
-
= 6

+
= NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT

 

 		
 
@@ -416,7 +416,7 @@
 

 		
 
-
= 7

+
= NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT

 

 		
 
@@ -431,7 +431,7 @@
 

 		
 
-
= 8

+
= NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED

 

 		
 
@@ -446,7 +446,7 @@
 

 		
 
-
= 9

+
= NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS

 

 		
 
@@ -461,7 +461,7 @@
 

 		
 
-
= 10

+
= NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED

 

 		
 
@@ -476,7 +476,7 @@
 

 		
 
-
= 11

+
= NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED

 

 		
 
@@ -495,7 +495,7 @@
 
VPN plugin failure reasons

 

 

-
Values

+
Values

 
diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html
index 5a979cdf..63708031 100644
--- a/docs/api/html/nmcli-examples.html
+++ b/docs/api/html/nmcli-examples.html
@@ -5,9 +5,9 @@
 nmcli-examples: NetworkManager Reference Manual
-
-
-
+
+
+
@@ -16,8 +16,8 @@
 
-
-
+
+

 
 

 
 
 
 
 

 Home
 UpPrevNextPrevNext
 

 

 

@@ -33,7 +33,7 @@
 
nmcli  [OPTIONS...]

 

 

-
Description

+
Description

 

       nmcli is a command-line client for NetworkManager. It
       allows controlling NetworkManager and reporting its status. For more information
@@ -46,9 +46,9 @@
     

 

 

-
Examples

+
Examples

 

-
Example 1. Listing available Wi-Fi APs

+
Example 1. Listing available Wi-Fi APs

 

 
$ nmcli device wifi list
 *  SSID               MODE    CHAN  RATE       SIGNAL  BARS  SECURITY
@@ -71,7 +71,7 @@
 

 

 

-
Example 2. Showing general information and properties for a Wi-Fi interface

+
Example 2. Showing general information and properties for a Wi-Fi interface

 

 
$ nmcli -p -f general,wifi-properties device show wlan0
 ===========================================================================
@@ -113,7 +113,7 @@ WIFI-PROPERTIES.ADHOC:    yes
 

 

 

-
Example 3. Listing NetworkManager polkit permissions

+
Example 3. Listing NetworkManager polkit permissions

 

 
$ nmcli general permissions
 PERMISSION                                                VALUE
@@ -146,7 +146,7 @@ org.freedesktop.NetworkManager.reload                     auth

 

 

 

-
Example 4. Listing NetworkManager log level and domains

+
Example 4. Listing NetworkManager log level and domains

 

 
$ nmcli general logging
 LEVEL  DOMAINS
@@ -160,7 +160,7 @@ B,DISPATCH

 

 

 

-
Example 5. Changing NetworkManager logging

+
Example 5. Changing NetworkManager logging

 

 
$ nmcli g log level DEBUG domains CORE,ETHER,IP
 $ nmcli g log level INFO domains DEFAULT

@@ -173,7 +173,7 @@ B,DISPATCH
 

 

 

-
Example 6. Adding a bonding master and two slave connection profiles

+
Example 6. Adding a bonding master and two slave connection profiles

 

 
$ nmcli con add type bond ifname mybond0 mode active-backup
 $ nmcli con add type ethernet ifname eth1 master mybond0
@@ -189,7 +189,7 @@ B,DISPATCH

 

 

 

-
Example 7. Adding a team master and two slave connection profiles

+
Example 7. Adding a team master and two slave connection profiles

 

 
$ nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf
 $ nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1
@@ -217,7 +217,7 @@ B,DISPATCH

 

 

 

-
Example 8. Adding a bridge and two slave profiles

+
Example 8. Adding a bridge and two slave profiles

 

 
$ nmcli con add type bridge con-name TowerBridge ifname TowerBridge
 $ nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge
@@ -236,7 +236,7 @@ B,DISPATCH

 

 

 

-
Example 9. Adding an ethernet connection profile with manual IP configuration

+
Example 9. Adding an ethernet connection profile with manual IP configuration

 

 
$ nmcli con add con-name my-con-em1 ifname em1 type ethernet \
   ip4 192.168.100.100/24 gw4 192.168.100.1 ip4 1.2.3.4 ip6 abbe::cafe
@@ -259,7 +259,27 @@ B,DISPATCH

 

 

 

-
Example 10. Escaping colon characters in tabular mode

+
Example 10. Convenient field values retrieval for scripting

+

+
$ nmcli -g ip4.address connection show my-con-eth0
+192.168.1.12/24

+
$ nmcli -g ip4.address,ip4.dns connection show my-con-eth0
+192.168.1.12/24
+192.168.1.1

+
$ nmcli -g ip4 connection show my-con-eth0
+IP4:192.168.1.12/24:192.168.1.1::192.168.1.1::

+

+        This example shows retrieval of ip4 connection field values via the --get-values
+        option. Multiple comma separated fields can be provided: they will be printed one
+        per line. If a whole section is provided instead of a single field, the name of the
+        section will be printed followed by all the related field values on the same line.
+        See also --terse, --mode, --fields and --escape options in nmcli(1)
+        manual page for more customized output.
+      

+

+

+

+
Example 11. Escaping colon characters in tabular mode

 

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

 

 

 

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

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

 

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

 
Example sessions of interactive connection editor

 

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

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

 

 
$ nmcli connection edit type ethernet
 
@@ -550,7 +570,7 @@ Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully
 

 

 

-
See Also

+
See Also

 

       nmcli(1),
       NetworkManager(8),
diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html
index e293bd71..02d3528b 100644
--- a/docs/api/html/nmcli.html
+++ b/docs/api/html/nmcli.html
@@ -5,9 +5,9 @@
 nmcli: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -16,8 +16,8 @@
 

 Home
 UpPrevNextPrevNext
 

 

 

@@ -121,10 +121,19 @@
           all is used to print all valid field values of the
           command. common is used to print common field values of
           the command.

-
If omitted, default is common. The option is
-          mandatory when --terse is used. In this case, generic values
-          all and common cannot be used. This
-          is to maintain compatibility when new fields are added in the future.

+
If omitted, default is common.

+
+
+
+
  -g  |   --get-values  { field1,field2...  |   all  |   common } 

+
+
This option is used to print values from specific fields. It is basically
+          a shortcut for --mode tabular --terse --fields and is a convenient
+          way to retrieve values for particular fields. The values are printed one per line
+          without headers.

+
If a section is specified instead of a field, the section name will be printed
+          followed by colon separated values of the fields belonging to that section, all on
+          the same line.

 
 
 
@@ -646,6 +655,7 @@
 
  • ip-tunnel
    • 
 
  • macvlan
    • 
 
  • vxlan
    • 
+
  • dummy
    • 
 
    
 
    The most typical uses are described in the Examples section.
    
 
    Aside from the properties and values two special options are accepted:
    
@@ -1201,7 +1211,7 @@
    disambiguate these options from the options of the same name that are valid for
    multiple connection types (such as mtu).
    
 
    
-
    Table 1. Options for all connections
    
+
    Table 1. Options for all connections
    
 
    @@ -1256,7 +1266,7 @@ or id/ to disambiguate it.
    
 
 

 
    
 
    
 
    
-
    Table 2. PPPoE options
    
+
    Table 2. PPPoE options
    
 
    @@ -1283,7 +1293,7 @@ or id/ to disambiguate it.
    
 
 

 
    
 
    
 
    
-
    Table 3. Wired Ethernet options
    
+
    Table 3. Wired Ethernet options
    
 
    @@ -1310,7 +1320,7 @@ or id/ to disambiguate it.
    
 
 

 
    
 
    
 
    
-
    Table 4. Infiniband options
    
+
    Table 4. Infiniband options
    
 
    @@ -1345,7 +1355,7 @@ or id/ to disambiguate it.
    
 
 

 
    
 
    
 
    
-
    Table 5. Wi-Fi options
    
+
    Table 5. Wi-Fi options
    
 
    @@ -1380,7 +1390,7 @@ or id/ to disambiguate it.
    
 
 

 
    
 
    
 
    
-
    Table 6. WiMax options
    
+
    Table 6. WiMax options
    
 
    @@ -1403,7 +1413,7 @@ or id/ to disambiguate it.
    
 
 

 
    
 
    
 
    
-
    Table 7. GSM options
    
+
    Table 7. GSM options
    
 
    @@ -1430,7 +1440,7 @@ or id/ to disambiguate it.
    
 
 

 
    
 
    
 
    
-
    Table 8. CDMA options
    
+
    Table 8. CDMA options
    
 
    @@ -1453,7 +1463,7 @@ or id/ to disambiguate it.
    
 
 

 
    
 
    
 
    
-
    Table 9. Bluetooth options
    
+
    Table 9. Bluetooth options
    
 
    @@ -1484,7 +1494,7 @@ appropriate gsm.* or cdma.*
 
 
    
-
    Table 10. VLAN options
    
+
    Table 10. VLAN options
    
 
    
 
 

    @@ -1519,7 +1529,7 @@ appropriate gsm.* or cdma.*
 
 
    
-
    Table 11. Bonding options
    
+
    Table 11. Bonding options
    
 
    
 
 

    @@ -1549,7 +1559,7 @@ It's equivalent of using the +bond.options 'option=value'<
 
    
 
 

    
 
    
 
    
-
    Table 12. Team options
    
+
    Table 12. Team options
    
 
    @@ -1569,7 +1579,7 @@ It's equivalent of using the +bond.options 'option=value'<
 
    
 
 

    
 
    
 
    
-
    Table 13. Team port options
    
+
    Table 13. Team port options
    
 
    @@ -1589,7 +1599,7 @@ It's equivalent of using the +bond.options 'option=value'<
 
    
 
 

    
 
    
 
    
-
    Table 14. Bridge options
    
+
    Table 14. Bridge options
    
 
    @@ -1648,7 +1658,7 @@ It's equivalent of using the +bond.options 'option=value'<
 
    
 
 

    
 
    
 
    
-
    Table 15. VPN options
    
+
    Table 15. VPN options
    
 
    @@ -1671,7 +1681,7 @@ It's equivalent of using the +bond.options 'option=value'<
 
    
 
 

    
 
    
 
    
-
    Table 16. OLPC Mesh options
    
+
    Table 16. OLPC Mesh options
    
 
    @@ -1698,7 +1708,7 @@ It's equivalent of using the +bond.options 'option=value'<
 
    
 
 

    
 
    
 
    
-
    Table 17. ADSL options
    
+
    Table 17. ADSL options
    
 
    @@ -1729,7 +1739,7 @@ It's equivalent of using the +bond.options 'option=value'<
 
    
 
 

    
 
    
 
    
-
    Table 18. MACVLAN options
    
+
    Table 18. MACVLAN options
    
 
    @@ -1756,7 +1766,7 @@ It's equivalent of using the +bond.options 'option=value'<
 
    
 
 

    
 
    
 
    
-
    Table 19. VxLAN options
    
+
    Table 19. VxLAN options
    
 
    @@ -1799,7 +1809,7 @@ It's equivalent of using the +bond.options 'option=value'<
 
    
 
 

    
 
    
 
    
-
    Table 20. Tun options
    
+
    Table 20. Tun options
    
 
    @@ -1838,7 +1848,7 @@ It's equivalent of using the +bond.options 'option=value'<
 
    
 
 

    
 
    
 
    
-
    Table 21. IP tunneling options
    
+
    Table 21. IP tunneling options
    
 
    @@ -1869,7 +1879,7 @@ It's equivalent of using the +bond.options 'option=value'<
 
    
 
 

    
 
    
 
    
-
    Table 22. IPv4 options
    
+
    Table 22. IPv4 options
    
 
    @@ -1900,7 +1910,7 @@ It's equivalent of using +ipv4.addresses syntax and
 
    
 
 

    
 
    
 
    
-
    Table 23. IPv6 options
    
+
    Table 23. IPv6 options
    
 
    @@ -1931,7 +1941,7 @@ It's equivalent of using +ipv6.addresses syntax and
 
    
 
 

    
 
    
 
    
-
    Table 24. Proxy options
    
+
    Table 24. Proxy options
    
 
    diff --git a/docs/api/html/nmtui.html b/docs/api/html/nmtui.html
index 7a4d5f84..30449050 100644
--- a/docs/api/html/nmtui.html
+++ b/docs/api/html/nmtui.html
@@ -5,9 +5,9 @@
 nmtui: NetworkManager Reference Manual
-
-
-
+
+
+
@@ -16,8 +16,8 @@
 
-
-
+
+
    
 
 

 
 
 
 
 
    
 Home
 UpPrevNextPrevNext
 
    
 
    
 
    
diff --git a/docs/api/html/ref-dbus-access-points.html b/docs/api/html/ref-dbus-access-points.html
new file mode 100644
index 00000000..6b7bb457
--- /dev/null
+++ b/docs/api/html/ref-dbus-access-points.html
@@ -0,0 +1,32 @@
+
+
+
+
+The /org/freedesktop/NetworkManager/AccessPoint/* objects: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+The /org/freedesktop/NetworkManager/AccessPoint/* objects
    
+
    
+org.freedesktop.NetworkManager.AccessPoint — Wi-Fi Access Point
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus-active-connections.html b/docs/api/html/ref-dbus-active-connections.html
new file mode 100644
index 00000000..022a17b4
--- /dev/null
+++ b/docs/api/html/ref-dbus-active-connections.html
@@ -0,0 +1,37 @@
+
+
+
+
+The /org/freedesktop/NetworkManager/ActiveConnection/* objects: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+The /org/freedesktop/NetworkManager/ActiveConnection/* objects
    
+
    
+
    
+org.freedesktop.NetworkManager.Connection.Active — Active Connection
+
    
+
    
+org.freedesktop.NetworkManager.VPN.Connection — Active VPN Connection
+
    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus-agent-manager.html b/docs/api/html/ref-dbus-agent-manager.html
new file mode 100644
index 00000000..1aafd12b
--- /dev/null
+++ b/docs/api/html/ref-dbus-agent-manager.html
@@ -0,0 +1,32 @@
+
+
+
+
+The /org/freedesktop/NetworkManager/AgentManager object: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+The /org/freedesktop/NetworkManager/AgentManager object
    
+
    
+org.freedesktop.NetworkManager.AgentManager — Secret Agent Manager
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus-devices.html b/docs/api/html/ref-dbus-devices.html
new file mode 100644
index 00000000..7e54543e
--- /dev/null
+++ b/docs/api/html/ref-dbus-devices.html
@@ -0,0 +1,100 @@
+
+
+
+
+The /org/freedesktop/NetworkManager/Devices/* objects: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+The /org/freedesktop/NetworkManager/Devices/* objects
    
+
    
+
    
+org.freedesktop.NetworkManager.Device — Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Statistics — Device Statistic Counters
+
    
+
    
+org.freedesktop.NetworkManager.Device.Adsl — ADSL Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Bond — Bonding Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Bridge — Bridging Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Bluetooth — Bluetooth Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Dummy — Dummy Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Wired — Wired Ethernet Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Generic — Unrecognized Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Infiniband — Infiniband Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.IPTunnel — IP Tunneling Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Macsec — MACSec Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Macvlan — MAC VLAN Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Modem — Modem Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.OlpcMesh — OLPC Wireless Mesh Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Team — Teaming Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Tun — Userspace Tunneling Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Veth — Virtual Ethernet Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Vlan — Virtual LAN Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Vxlan — VXLAN Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.Wireless — Wi-Fi Device
+
    
+
    
+org.freedesktop.NetworkManager.Device.WiMax — WiMax Device
+
    
+
    
+org.freedesktop.NetworkManager.PPP — Helper interface for a PPP plugin
+
    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus-dhcp4-configs.html b/docs/api/html/ref-dbus-dhcp4-configs.html
new file mode 100644
index 00000000..d0a04ca1
--- /dev/null
+++ b/docs/api/html/ref-dbus-dhcp4-configs.html
@@ -0,0 +1,32 @@
+
+
+
+
+The /org/freedesktop/NetworkManager/DHCP4Config/* objects: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+The /org/freedesktop/NetworkManager/DHCP4Config/* objects
    
+
    
+org.freedesktop.NetworkManager.DHCP4Config — IPv4 DHCP Client State
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus-dhcp6-configs.html b/docs/api/html/ref-dbus-dhcp6-configs.html
new file mode 100644
index 00000000..d2700a5f
--- /dev/null
+++ b/docs/api/html/ref-dbus-dhcp6-configs.html
@@ -0,0 +1,32 @@
+
+
+
+
+The /org/freedesktop/NetworkManager/DHCP4Config/* objects: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+The /org/freedesktop/NetworkManager/DHCP4Config/* objects
    
+
    
+org.freedesktop.NetworkManager.DHCP6Config — IPv6 DHCP Client State
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus-dns-manager.html b/docs/api/html/ref-dbus-dns-manager.html
new file mode 100644
index 00000000..6d838bac
--- /dev/null
+++ b/docs/api/html/ref-dbus-dns-manager.html
@@ -0,0 +1,32 @@
+
+
+
+
+The /org/freedesktop/NetworkManager/DnsManager object: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+The /org/freedesktop/NetworkManager/DnsManager object
    
+
    
+org.freedesktop.NetworkManager.DnsManager — DNS Configuration State
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus-ip4-configs.html b/docs/api/html/ref-dbus-ip4-configs.html
new file mode 100644
index 00000000..1752bfd6
--- /dev/null
+++ b/docs/api/html/ref-dbus-ip4-configs.html
@@ -0,0 +1,32 @@
+
+
+
+
+The /org/freedesktop/NetworkManager/IP4Config/* objects: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+The /org/freedesktop/NetworkManager/IP4Config/* objects
    
+
    
+org.freedesktop.NetworkManager.IP4Config — IPv4 Configuration Set
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus-ip6-configs.html b/docs/api/html/ref-dbus-ip6-configs.html
new file mode 100644
index 00000000..d5988457
--- /dev/null
+++ b/docs/api/html/ref-dbus-ip6-configs.html
@@ -0,0 +1,32 @@
+
+
+
+
+The /org/freedesktop/NetworkManager/IP6Config/* objects: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+The /org/freedesktop/NetworkManager/IP6Config/* objects
    
+
    
+org.freedesktop.NetworkManager.IP6Config — IPv6 Configuration Set
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus-manager.html b/docs/api/html/ref-dbus-manager.html
new file mode 100644
index 00000000..8a327895
--- /dev/null
+++ b/docs/api/html/ref-dbus-manager.html
@@ -0,0 +1,32 @@
+
+
+
+
+The /org/freedesktop/NetworkManager object: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+The /org/freedesktop/NetworkManager object
    
+
    
+org.freedesktop.NetworkManager — Connection Manager
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus-settings-manager.html b/docs/api/html/ref-dbus-settings-manager.html
new file mode 100644
index 00000000..ce185508
--- /dev/null
+++ b/docs/api/html/ref-dbus-settings-manager.html
@@ -0,0 +1,32 @@
+
+
+
+
+The /org/freedesktop/NetworkManager/Settings object: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+The /org/freedesktop/NetworkManager/Settings object
    
+
    
+org.freedesktop.NetworkManager.Settings — Connection Settings Profile Manager
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus-settings.html b/docs/api/html/ref-dbus-settings.html
new file mode 100644
index 00000000..3bec0d09
--- /dev/null
+++ b/docs/api/html/ref-dbus-settings.html
@@ -0,0 +1,32 @@
+
+
+
+
+The /org/freedesktop/NetworkManager/Settings/* objects: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+The /org/freedesktop/NetworkManager/Settings/* objects
    
+
    
+org.freedesktop.NetworkManager.Settings.Connection — Connection Settings Profile
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html
index ceb81fd4..997c3725 100644
--- a/docs/api/html/ref-settings.html
+++ b/docs/api/html/ref-settings.html
@@ -2,12 +2,12 @@
 
 
 
-Network Configuration Setting Specification: NetworkManager Reference Manual
+Part II. Network Configuration Setting Specification: NetworkManager Reference Manual
 
 
 
-
-
+
+
 
 
 
@@ -16,16 +16,123 @@
 
 Home
 
-Prev
-Next
+Prev
+Next
 
-
    
+
    
 
    
-Network Configuration Setting Specification
    
-
    
-
    Configuration Settings
    
-
    Secret flag types
    
-
    
+Part II. Network Configuration Setting Specification
    
+
    
+
    Table of Contents
    
+
    
+
    Configuration Settings
    
+
    
+
    
+connection — General Connection Profile Settings
+
    
+
    
+802-1x — AIEEE 802.1x Authentication Settings
+
    
+
    
+adsl — ADSL Settings
+
    
+
    
+bluetooth — Bluetooth Settings
+
    
+
    
+bond — Bonding Settings
+
    
+
    
+bridge — Bridging Settings
+
    
+
    
+bridge-port — Bridge Port Settings
+
    
+
    
+cdma — CDMA-based Mobile Broadband Settings
+
    
+
    
+dcb — Data Center Bridging Settings
+
    
+
    
+dummy — Dummy Link Settings
+
    
+
    
+generic — Generic Link Settings
+
    
+
    
+gsm — GSM-based Mobile Broadband Settings
+
    
+
    
+infiniband — Infiniband Settings
+
    
+
    
+ipv4 — IPv4 Settings
+
    
+
    
+ipv6 — IPv6 Settings
+
    
+
    
+ip-tunnel — IP Tunneling Settings
+
    
+
    
+macsec — MACSec Settings
+
    
+
    
+macvlan — MAC VLAN Settings
+
    
+
    
+802-11-olpc-mesh — OLPC Wireless Mesh Settings
+
    
+
    
+ppp — Point-to-Point Protocol Settings
+
    
+
    
+pppoe — PPP-over-Ethernet Settings
+
    
+
    
+proxy — WWW Proxy Settings
+
    
+
    
+serial — Serial Link Settings
+
    
+
    
+team — Teaming Settings
+
    
+
    
+team-port — Team Port Settings
+
    
+
    
+tun — Tunnel Settings
+
    
+
    
+user — General User Profile Settings
+
    
+
    
+vlan — VLAN Settings
+
    
+
    
+vpn — VPN Settings
+
    
+
    
+vxlan — VXLAN Settings
+
    
+
    
+wimax — WiMax Settings
+
    
+
    
+802-3-ethernet — Wired Ethernet Settings
+
    
+
    
+802-11-wireless — Wi-Fi Settings
+
    
+
    
+802-11-wireless-security — Wi-Fi Security Settings
+
    
+
    
+
    Secret flag types
    
+
    
+
    
 
    
       This part documents the properties and value types of each "Setting"
       object that composes the basic unit of NetworkManager configuration,
@@ -33,2652 +140,6 @@
       setting names (like "802-3-ethernet" or "bluetooth") to a dictionary of
       key/value pairs that represents each itself.
     
    
-
    
-
    
-Configuration Settings
    
-
    
-
    Table 81. 802-1x setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    altsubject-matches
    array of string
    []
    		List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed.
    anonymous-identity
    string
    		Anonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.
    ca-cert
    byte array
    		Contains the CA certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
    ca-path
    string
    		UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the "ca-cert" property.
    client-cert
    byte array
    		Contains the client certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte.
    domain-suffix-match
    string
    		Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
    eap
    array of string
    []
    		The allowed EAP method to be used when authenticating to the network with 802.1x.  Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd", and "fast".  Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.
    identity
    string
    		Identity string for EAP authentication methods.  Often the user's user or login name.
    name
    string
    802-1x
    		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".
    pac-file
    string
    		UTF-8 encoded file path containing PAC for EAP-FAST.
    password
    string
    		UTF-8 encoded password used for EAP authentication methods. If both the "password" property and the "password-raw" property are specified, "password" is preferred.
    password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "password" property.
    password-raw
    byte array
    		Password used for EAP authentication methods, given as a byte array to allow passwords in other encodings than UTF-8 to be used. If both the "password" property and the "password-raw" property are specified, "password" is preferred.
    password-raw-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "password-raw" property.
    phase1-fast-provisioning
    string
    		Enables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the "eap" property. Recognized values are "0" (disabled), "1" (allow unauthenticated provisioning), "2" (allow authenticated provisioning), and "3" (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.
    phase1-peaplabel
    string
    		Forces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to "1" to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.
    phase1-peapver
    string
    		Forces which PEAP version is used when PEAP is set as the EAP method in the "eap" property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to "0" or "1" to force that specific PEAP version.
    phase2-altsubject-matches
    array of string
    []
    		List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner "phase 2" authentication. If the list is empty, no verification of the server certificate's altSubjectName is performed.
    phase2-auth
    string
    		Specifies the allowed "phase 2" inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property.  Recognized non-EAP "phase 2" methods are "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
    phase2-autheap
    string
    		Specifies the allowed "phase 2" inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property.  Recognized EAP-based "phase 2" methods are "md5", "mschapv2", "otp", "gtc", and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
    phase2-ca-cert
    byte array
    		Contains the "phase 2" CA certificate if used by the EAP method specified in the "phase2-auth" or "phase2-autheap" properties. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
    phase2-ca-path
    string
    		UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the "phase2-ca-cert" property.
    phase2-client-cert
    byte array
    		Contains the "phase 2" client certificate if used by the EAP method specified in the "phase2-auth" or "phase2-autheap" properties. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
    phase2-domain-suffix-match
    string
    		Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server during the inner "phase 2" authentication.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
    phase2-private-key
    byte array
    		Contains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate.
    phase2-private-key-password
    string
    		The password used to decrypt the "phase 2" private key specified in the "phase2-private-key" property when the private key either uses the path scheme, or is a PKCS#12 format key.
    phase2-private-key-password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "phase2-private-key-password" property.
    phase2-subject-match
    string
    		Substring to be matched against the subject of the certificate presented by the authentication server during the inner "phase 2" authentication. When unset, no verification of the authentication server certificate's subject is performed.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:phase2-domain-suffix-match.
    pin
    string
    		PIN used for EAP authentication methods.
    pin-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "pin" property.
    private-key
    byte array
    		Contains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users.  Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data.
    private-key-password
    string
    		The password used to decrypt the private key specified in the "private-key" property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.
    private-key-password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "private-key-password" property.
    subject-match
    string
    		Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match.
    system-ca-certs
    boolean
    FALSE
    		When TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides "ca-cert" and "phase2-ca-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).
    
-
    
-

    
-
    
-
    Table 82. adsl setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    encapsulation
    string
    		Encapsulation of ADSL connection.  Can be "vcmux" or "llc".
    name
    string
    adsl
    		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".
    password
    string
    		Password used to authenticate with the ADSL service.
    password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "password" property.
    protocol
    string
    		ADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".
    username
    string
    		Username used to authenticate with the ADSL service.
    vci
    uint32
    0
    		VCI of ADSL connection
    vpi
    uint32
    0
    		VPI of ADSL connection
    
-
    
-

    
-
    
-
    Table 83. bluetooth setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    bdaddr
    byte array
    		The Bluetooth address of the device.
    name
    string
    bluetooth
    		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".
    type
    string
    		Either "dun" for Dial-Up Networking connections or "panu" for Personal Area Networking connections to devices supporting the NAP profile.
    
-
    
-

    
-
    
-
    Table 84. bond setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    interface-name
    string
    		Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the bond's interface name.
    name
    string
    bond
    		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".
    options
    dict of string to string
    {'mode': 'balance-rr'}
    		Dictionary of key/value pairs of bonding options.  Both keys and values must be strings. Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
    
-
    
-

    
-
    
-
    Table 85. bridge setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    ageing-time
    uint32
    300
    		The Ethernet MAC address aging time, in seconds.
    forward-delay
    uint32
    15
    		The Spanning Tree Protocol (STP) forwarding delay, in seconds.
    hello-time
    uint32
    2
    		The Spanning Tree Protocol (STP) hello time, in seconds.
    interface-name
    string
    		Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the bridge's interface name.
    mac-address
    byte array
    		If specified, the MAC address of bridge. When creating a new bridge, this MAC address will be set. When matching an existing (outside NetworkManager created) bridge, this MAC address must match.
    max-age
    uint32
    20
    		The Spanning Tree Protocol (STP) maximum message age, in seconds.
    multicast-snooping
    boolean
    TRUE
    		Controls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.
    name
    string
    bridge
    		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".
    priority
    uint32
    32768
    		Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are "better"; the lowest priority bridge will be elected the root bridge.
    stp
    boolean
    TRUE
    		Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
    
-
    
-

    
-
    
-
    Table 86. bridge-port setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    hairpin-mode
    boolean
    FALSE
    		Enables or disabled "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on.
    name
    string
    bridge-port
    		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".
    path-cost
    uint32
    100
    		The Spanning Tree Protocol (STP) port cost for destinations via this port.
    priority
    uint32
    32
    		The Spanning Tree Protocol (STP) priority of this bridge port.
    
-
    
-

    
-
    
-
    Table 87. cdma setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    name
    string
    cdma
    		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".
    number
    string
    		The number to dial to establish the connection to the CDMA-based mobile broadband network, if any.  If not specified, the default number (#777) is used when required.
    password
    string
    		The password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.
    password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "password" property.
    username
    string
    		The username used to authenticate with the network, if required.  Many providers do not require a username, or accept any username.  But if a username is required, it is specified here.
    
-
    
-

    
-
    
-
    Table 88. connection setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    autoconnect
    boolean
    TRUE
    		Whether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.
    autoconnect-priority
    int32
    0
    		The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.
    autoconnect-retries
    int32
    -1
    		The number of times a connection should be tried when autoctivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden).
    autoconnect-slaves
    NMSettingConnectionAutoconnectSlaves (int32)
    		Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.
    gateway-ping-timeout
    uint32
    0
    		If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.
    id
    string
    		A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".
    interface-name
    string
    		The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.
    lldp
    int32
    -1
    		Whether LLDP is enabled for the connection.
    master
    string
    		Interface name of the master device or UUID of the master connection.
    metered
    NMMetered (int32)
    		Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.
    name
    string
    connection
    		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".
    permissions
    array of string
    []
    		An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this list. Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". At this time only the "user" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ":" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.
    read-only
    boolean
    FALSE
    		FALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.
    secondaries
    array of string
    []
    		List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.
    slave-type
    string
    		Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
    stable-id
    string
    		Token to generate stable IDs for the connection. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note that also the interface name of the activating connection and a per-host secret key is included into the address generation so that the same stable-id on different hosts/devices yields different addresses. If the value is unset, an ID unique for the connection is used. Specifing a stable-id allows multiple connections to generate the same addresses. Another use is to generate IDs at runtime via dynamic substitutions. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are "${CONNECTION}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-boot, or every time. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as "$$". For example, set it to "${CONNECTION}/${BOOT}" to create a unique id for this connection that changes with every reboot. Note that two connections only use the same effective id if their stable-id is also identical before performing dynamic substitutions.
    timestamp
    uint64
    0
    		The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).
    type
    string
    		Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).
    uuid
    string
    		A universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").
    zone
    string
    		The trust level of a the connection.  Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.
    
-
    
-

    
-
    
-
    Table 89. dcb setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    app-fcoe-flags
    NMSettingDcbFlags (uint32)
    		Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
    app-fcoe-mode
    string
    "fabric"
    		The FCoE controller mode; either "fabric" (default) or "vn2vn".
    app-fcoe-priority
    int32
    -1
    		The highest User Priority (0 - 7) which FCoE frames should use, or -1 for default priority.  Only used when the "app-fcoe-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
    app-fip-flags
    NMSettingDcbFlags (uint32)
    		Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
    app-fip-priority
    int32
    -1
    		The highest User Priority (0 - 7) which FIP frames should use, or -1 for default priority.  Only used when the "app-fip-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
    app-iscsi-flags
    NMSettingDcbFlags (uint32)
    		Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
    app-iscsi-priority
    int32
    -1
    		The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for default priority. Only used when the "app-iscsi-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
    name
    string
    dcb
    		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".
    priority-bandwidth
    array of uint32
    [0, 0, 0, 0, 0, 0, 0, 0]
    		An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the percentage of bandwidth of the priority's assigned group that the priority may use.  The sum of all percentages for priorities which belong to the same group must total 100 percent.
    priority-flow-control
    array of uint32
    [0, 0, 0, 0, 0, 0, 0, 0]
    		An array of 8 boolean values, where the array index corresponds to the User Priority (0 - 7) and the value indicates whether or not the corresponding priority should transmit priority pause.
    priority-flow-control-flags
    NMSettingDcbFlags (uint32)
    		Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
    priority-group-bandwidth
    array of uint32
    [0, 0, 0, 0, 0, 0, 0, 0]
    		An array of 8 uint values, where the array index corresponds to the Priority Group ID (0 - 7) and the value indicates the percentage of link bandwidth allocated to that group.  Allowed values are 0 - 100, and the sum of all values must total 100 percent.
    priority-group-flags
    NMSettingDcbFlags (uint32)
    		Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
    priority-group-id
    array of uint32
    [0, 0, 0, 0, 0, 0, 0, 0]
    		An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed Priority Group ID values are 0 - 7 or 15 for the unrestricted group.
    priority-strict-bandwidth
    array of uint32
    [0, 0, 0, 0, 0, 0, 0, 0]
    		An array of 8 boolean values, where the array index corresponds to the User Priority (0 - 7) and the value indicates whether or not the priority may use all of the bandwidth allocated to its assigned group.
    priority-traffic-class
    array of uint32
    [0, 0, 0, 0, 0, 0, 0, 0]
    		An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which the priority is mapped.
    
-
    
-

    
-
    
-
    Table 90. generic setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    name
    string
    generic
    		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".
    
-
    
-

    
-
    
-
    Table 91. gsm setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    apn
    string
    		The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan. The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.
    device-id
    string
    		The device unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will only apply to the specified device.
    home-only
    boolean
    FALSE
    		When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.
    name
    string
    gsm
    		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".
    network-id
    string
    		The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.
    number
    string
    		Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.
    password
    string
    		The password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.
    password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "password" property.
    pin
    string
    		If the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.
    pin-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "pin" property.
    sim-id
    string
    		The SIM card unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will apply to any device also allowed by "device-id" which contains a SIM card matching the given identifier.
    sim-operator-id
    string
    		A MCC/MNC string like "310260" or "21601" identifying the specific mobile network operator which this connection applies to.  If given, the connection will apply to any device also allowed by "device-id" and "sim-id" which contains a SIM card provisioined by the given operator.
    username
    string
    		The username used to authenticate with the network, if required.  Many providers do not require a username, or accept any username.  But if a username is required, it is specified here.
    
-
    
-

    
-
    
-
    Table 92. infiniband setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    mac-address
    byte array
    		If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
    mtu
    uint32
    0
    		If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
    name
    string
    infiniband
    		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".
    p-key
    int32
    -1
    		The InfiniBand P_Key to use for this device. A value of -1 means to use the default P_Key (aka "the P_Key at index 0").  Otherwise it is a 16-bit unsigned integer, whose high bit is set if it is a "full membership" P_Key.
    parent
    string
    		The interface name of the parent device of this device. Normally NULL, but if the "p_key" property is set, then you must specify the base device by setting either this property or "mac-address".
    transport-mode
    string
    		The IP-over-InfiniBand transport mode. Either "datagram" or "connected".
    
-
    
-

    
-
    
-
    Table 93. ipv4 setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    address-data
    array of vardict
    		Array of IPv4 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
    addresses
    array of array of uint32
    []
    		Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.
    dad-timeout
    int32
    -1
    		Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds.
    dhcp-client-id
    string
    		A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options.
    dhcp-fqdn
    string
    		If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.
    dhcp-hostname
    string
    		If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
    dhcp-send-hostname
    boolean
    TRUE
    		If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.
    dhcp-timeout
    int32
    0
    		A timeout for a DHCP transaction in seconds.
    dns
    array of uint32
    []
    		Array of IP addresses of DNS servers (as network-byte-order integers)
    dns-options
    array of string
    []
    		Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
    dns-priority
    int32
    0
    		Intra-connection DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. For that, just specify the DNS servers in the desired order. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used.
    dns-search
    array of string
    []
    		Array of DNS search domains.
    gateway
    string
    		The gateway associated with this configuration. This is only meaningful if "addresses" is also set.
    ignore-auto-dns
    boolean
    FALSE
    		When "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.
    ignore-auto-routes
    boolean
    FALSE
    		When "method" is set to "auto" and this property to TRUE, automatically configured routes are ignored and only routes specified in the "routes" property, if any, are used.
    may-fail
    boolean
    TRUE
    		If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.
    method
    string
    		IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
    name
    string
    ipv4
    		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".
    never-default
    boolean
    FALSE
    		If TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.
    route-data
    array of vardict
    		Array of IPv4 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'gateway' entry, containing the gateway IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
    route-metric
    int64
    -1
    		The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is choosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.
    routes
    array of array of uint32
    []
    		Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. If the metric is 0, NM will choose an appropriate default metric for the device. (There is no way to explicitly specify an actual metric of 0 with this property.)
    
-
    
-

    
-
    
-
    Table 94. ipv6 setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    addr-gen-mode
    int32
    1
    		Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection's stable-id and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.
    address-data
    array of vardict
    		Array of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
    addresses
    array of legacy IPv6 address struct (a(ayuay))
    []
    		Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv6 address structures.  Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.
    dad-timeout
    int32
    -1
    		Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds.
    dhcp-hostname
    string
    		If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
    dhcp-send-hostname
    boolean
    TRUE
    		If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.
    dhcp-timeout
    int32
    0
    		A timeout for a DHCP transaction in seconds.
    dns
    array of byte array
    []
    		Array of IP addresses of DNS servers (in network byte order)
    dns-options
    array of string
    []
    		Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
    dns-priority
    int32
    0
    		Intra-connection DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. For that, just specify the DNS servers in the desired order. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used.
    dns-search
    array of string
    []
    		Array of DNS search domains.
    gateway
    string
    		The gateway associated with this configuration. This is only meaningful if "addresses" is also set.
    ignore-auto-dns
    boolean
    FALSE
    		When "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.
    ignore-auto-routes
    boolean
    FALSE
    		When "method" is set to "auto" and this property to TRUE, automatically configured routes are ignored and only routes specified in the "routes" property, if any, are used.
    ip6-privacy
    NMSettingIP6ConfigPrivacy (int32)
    		Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to "-1" (unknown) means fallback to global configuration "ipv6.ip6-privacy". If also global configuration is unspecified or set to "-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr". Note that this setting is distinct from the Stable Privacy addresses that can be enabled with the "addr-gen-mode" property's "stable-privacy" setting as another way of avoiding host tracking with IPv6 addresses.
    may-fail
    boolean
    TRUE
    		If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.
    method
    string
    		IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
    name
    string
    ipv6
    		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".
    never-default
    boolean
    FALSE
    		If TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.
    route-data
    array of vardict
    		Array of IPv6 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'next-hop' entry, containing the next hop IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
    route-metric
    int64
    -1
    		The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is choosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.
    routes
    array of legacy IPv6 route struct (a(ayuayu))
    []
    		Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv6 route structures.  Each IPv6 route structure is composed of an IPv6 address, a prefix length (1 - 128), an IPv6 next hop address (which may be zeroed out if there is no next hop), and a metric. If the metric is 0, NM will choose an appropriate default metric for the device.
    token
    string
    		Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.
    
-
    
-

    
-
    
-
    Table 95. ip-tunnel setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    encapsulation-limit
    uint32
    0
    		How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.
    flow-label
    uint32
    0
    		The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.
    input-key
    string
    		The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
    local
    string
    		The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.
    mode
    uint32
    0
    		The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).
    mtu
    uint32
    0
    		None
    name
    string
    ip-tunnel
    		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".
    output-key
    string
    		The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
    parent
    string
    		If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.
    path-mtu-discovery
    boolean
    TRUE
    		Whether to enable Path MTU Discovery on this tunnel.
    remote
    string
    		The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.
    tos
    uint32
    0
    		The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.
    ttl
    uint32
    0
    		The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.
    
-
    
-

    
-
    
-
    Table 96. macsec setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    encrypt
    boolean
    TRUE
    		Whether the transmitted traffic must be encrypted.
    mka-cak
    string
    		The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.
    mka-cak-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "mka-cak" property.
    mka-ckn
    string
    		The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.
    mode
    int32
    0
    		Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.
    name
    string
    macsec
    		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".
    parent
    string
    		If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
    port
    int32
    1
    		The port component of the SCI (Secure Channel Identifier), between 1 and 65534.
    validation
    int32
    2
    		Specifies the validation mode for incoming frames.
    
-
    
-

    
-
    
-
    Table 97. macvlan setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    mode
    uint32
    0
    		The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.
    name
    string
    macvlan
    		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".
    parent
    string
    		If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
    promiscuous
    boolean
    TRUE
    		Whether the interface should be put in promiscuous mode.
    tap
    boolean
    FALSE
    		Whether the interface should be a MACVTAP.
    
-
    
-

    
-
    
-
    Table 98. 802-11-olpc-mesh setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    channel
    uint32
    0
    		Channel on which the mesh network to join is located.
    dhcp-anycast-address
    byte array
    		Anycast DHCP MAC address used when requesting an IP address via DHCP. The specific anycast address used determines which DHCP server class answers the request.
    name
    string
    802-11-olpc-mesh
    		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".
    ssid
    byte array
    		SSID of the mesh network to join.
    
-
    
-

    
-
    
-
    Table 99. ppp setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    baud
    uint32
    0
    		If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.
    crtscts
    boolean
    FALSE
    		If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.
    lcp-echo-failure
    uint32
    0
    		If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The "lcp-echo-interval" property must also be set to a non-zero value if this property is used.
    lcp-echo-interval
    uint32
    0
    		If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.
    mppe-stateful
    boolean
    FALSE
    		If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.
    mru
    uint32
    0
    		If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.
    mtu
    uint32
    0
    		If non-zero, instruct pppd to send packets no larger than the specified size.
    name
    string
    ppp
    		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".
    no-vj-comp
    boolean
    FALSE
    		If TRUE, Van Jacobsen TCP header compression will not be requested.
    noauth
    boolean
    TRUE
    		If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.
    nobsdcomp
    boolean
    FALSE
    		If TRUE, BSD compression will not be requested.
    nodeflate
    boolean
    FALSE
    		If TRUE, "deflate" compression will not be requested.
    refuse-chap
    boolean
    FALSE
    		If TRUE, the CHAP authentication method will not be used.
    refuse-eap
    boolean
    FALSE
    		If TRUE, the EAP authentication method will not be used.
    refuse-mschap
    boolean
    FALSE
    		If TRUE, the MSCHAP authentication method will not be used.
    refuse-mschapv2
    boolean
    FALSE
    		If TRUE, the MSCHAPv2 authentication method will not be used.
    refuse-pap
    boolean
    FALSE
    		If TRUE, the PAP authentication method will not be used.
    require-mppe
    boolean
    FALSE
    		If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.
    require-mppe-128
    boolean
    FALSE
    		If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the "require-mppe" property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.
    
-
    
-

    
-
    
-
    Table 100. pppoe setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    name
    string
    pppoe
    		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".
    password
    string
    		Password used to authenticate with the PPPoE service.
    password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "password" property.
    service
    string
    		If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified service.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.
    username
    string
    		Username used to authenticate with the PPPoE service.
    
-
    
-

    
-
    
-
    Table 101. proxy setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    browser-only
    boolean
    FALSE
    		Whether the proxy configuration is for browser only.
    method
    int32
    0
    		Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)
    name
    string
    proxy
    		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".
    pac-script
    string
    		PAC script for the connection.
    pac-url
    string
    		PAC URL for obtaining PAC file.
    
-
    
-

    
-
    
-
    Table 102. serial setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    baud
    uint32
    57600
    		Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.
    bits
    uint32
    8
    		Byte-width of the serial communication. The 8 in "8n1" for example.
    name
    string
    serial
    		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".
    parity
    byte
    		The connection parity: 69 (ASCII 'E') for even parity, 111 (ASCII 'o') for odd, 110 (ASCII 'n') for none.
    send-delay
    uint64
    0
    		Time to delay between each byte sent to the modem, in microseconds.
    stopbits
    uint32
    1
    		Number of stop bits for communication on the serial port.  Either 1 or 2. The 1 in "8n1" for example.
    
-
    
-

    
-
    
-
    Table 103. team setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    config
    string
    		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.
    interface-name
    string
    		Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the team's interface name.
    name
    string
    team
    		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".
    
-
    
-

    
-
    
-
    Table 104. team-port setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    config
    string
    		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.
    name
    string
    team-port
    		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".
    
-
    
-

    
-
    
-
    Table 105. tun setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    group
    string
    		The group ID which will own the device. If set to NULL everyone will be able to use the device.
    mode
    uint32
    1
    		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.
    multi-queue
    boolean
    FALSE
    		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.
    name
    string
    tun
    		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".
    owner
    string
    		The user ID which will own the device. If set to NULL everyone will be able to use the device.
    pi
    boolean
    FALSE
    		If TRUE the interface will prepend a 4 byte header describing the physical interface to the packets.
    vnet-hdr
    boolean
    FALSE
    		If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network header.
    
-
    
-

    
-
    
-
    Table 106. vlan setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    egress-priority-map
    array of string
    []
    		For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities.  The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".
    flags
    NMVlanFlags (uint32)
    		One or more flags which control the behavior and features of the VLAN interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of output packet headers), NM_VLAN_FLAG_GVRP (0x2) (use of the GVRP protocol), and NM_VLAN_FLAG_LOOSE_BINDING (0x4) (loose binding of the interface to its master device's operating state). NM_VLAN_FLAG_MVRP (0x8) (use of the MVRP protocol). The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.
    id
    uint32
    0
    		The VLAN identifier that the interface created by this connection should be assigned. The valid range is from 0 to 4094, without the reserved id 4095.
    ingress-priority-map
    array of string
    []
    		For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities.  The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".
    interface-name
    string
    		Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the vlan's interface name.
    name
    string
    vlan
    		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".
    parent
    string
    		If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
    
-
    
-

    
-
    
-
    Table 107. vpn setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    data
    dict of string to string
    {}
    		Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.
    name
    string
    vpn
    		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".
    persistent
    boolean
    FALSE
    		If the VPN service supports persistence, and this property is TRUE, the VPN will attempt to stay connected across link changes and outages, until explicitly disconnected.
    secrets
    dict of string to string
    {}
    		Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.
    service-type
    string
    		D-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.
    timeout
    uint32
    0
    		Timeout for the VPN service to establish the connection. Some services may take quite a long time to connect. Value of 0 means a default timeout, which is 60 seconds (unless overriden by vpn.timeout in configuration file). Values greater than zero mean timeout in seconds.
    user-name
    string
    		If the VPN connection requires a user name for authentication, that name should be provided here.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.
    
-
    
-

    
-
    
-
    Table 108. vxlan setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    ageing
    uint32
    300
    		Specifies the lifetime in seconds of FDB entries learnt by the kernel.
    destination-port
    uint32
    8472
    		Specifies the UDP destination port to communicate to the remote VXLAN tunnel endpoint.
    id
    uint32
    0
    		Specifies the VXLAN Network Identifer (or VXLAN Segment Identifier) to use.
    l2-miss
    boolean
    FALSE
    		Specifies whether netlink LL ADDR miss notifications are generated.
    l3-miss
    boolean
    FALSE
    		Specifies whether netlink IP ADDR miss notifications are generated.
    learning
    boolean
    TRUE
    		Specifies whether unknown source link layer addresses and IP addresses are entered into the VXLAN device forwarding database.
    limit
    uint32
    0
    		Specifies the maximum number of FDB entries. A value of zero means that the kernel will store unlimited entries.
    local
    string
    		If given, specifies the source IP address to use in outgoing packets.
    name
    string
    vxlan
    		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".
    parent
    string
    		If given, specifies the parent interface name or parent connection UUID.
    proxy
    boolean
    FALSE
    		Specifies whether ARP proxy is turned on.
    remote
    string
    		Specifies the unicast destination IP address to use in outgoing packets when the destination link layer address is not known in the VXLAN device forwarding database, or the multicast IP address to join.
    rsc
    boolean
    FALSE
    		Specifies whether route short circuit is turned on.
    source-port-max
    uint32
    0
    		Specifies the maximum UDP source port to communicate to the remote VXLAN tunnel endpoint.
    source-port-min
    uint32
    0
    		Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.
    tos
    uint32
    0
    		Specifies the TOS value to use in outgoing packets.
    ttl
    uint32
    0
    		Specifies the time-to-live value to use in outgoing packets.
    
-
    
-

    
-
    
-
    Table 109. wimax setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    mac-address
    byte array
    		If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1
    name
    string
    wimax
    		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".
    network-name
    string
    		Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1
    
-
    
-

    
-
    
-
    Table 110. 802-3-ethernet setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    assigned-mac-address
    string
    		The new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
    auto-negotiate
    boolean
    FALSE
    		If TRUE, enforce auto-negotiation of port speed and duplex mode.  If FALSE, "speed" and "duplex" properties should be both set or link configuration will be skipped.
    cloned-mac-address
    byte array
    		This D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random". For libnm and nmcli, this field is called "cloned-mac-address".
    duplex
    string
    		Can be specified only when "auto-negotiate" is "off". In that case, statically configures the device to use that specified duplex mode, either "half" or "full". Must be set together with the "speed" property if specified. Before specifying a duplex mode be sure your device supports it.
    generate-mac-address-mask
    string
    		With "cloned-mac-address" setting "random" or "stable", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting "FE:FF:FF:00:00:00" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the "random" or "stable" algorithm. If the value contains one additional MAC address after the mask, this address is used instead of the current MAC address to fill the bits that shall not be randomized. For example, a value of "FE:FF:FF:00:00:00 68:F7:28:00:00:00" will set the OUI of the MAC address to 68:F7:28, while the lower bits are randomized. A value of "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled globally-administered, burned-in MAC address. If the value contains more then one additional MAC addresses, one of them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" will create a fully scrambled MAC address, randomly locally or globally administered.
    mac-address
    byte array
    		If specified, this connection will only apply to the Ethernet device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
    mac-address-blacklist
    array of string
    []
    		If specified, this connection will never apply to the Ethernet device whose permanent MAC address matches an address in the list.  Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).
    mtu
    uint32
    0
    		If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
    name
    string
    802-3-ethernet
    		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".
    port
    string
    		Specific port type to use if multiple the device supports multiple attachment methods.  One of "tp" (Twisted Pair), "aui" (Attachment Unit Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface. If the device supports only one port type, this setting is ignored.
    s390-nettype
    string
    		s390 network device type; one of "qeth", "lcs", or "ctc", representing the different types of virtual network devices available on s390 systems.
    s390-options
    dict of string to string
    {}
    		Dictionary of key/value pairs of s390-specific device options.  Both keys and values must be strings.  Allowed keys include "portno", "layer2", "portname", "protocol", among others.  Key names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
    s390-subchannels
    array of string
    []
    		Identifies specific subchannels that this network device uses for communication with z/VM or s390 host.  Like the "mac-address" property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels.  The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.
    speed
    uint32
    0
    		Can be set to a value grater than zero only when "auto-negotiate" is "off". In that case, statically configures the device to use that specified speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the "duplex" property when non-zero. Before specifying a speed value be sure your device supports it.
    wake-on-lan
    uint32
    1
    		The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).
    wake-on-lan-password
    string
    		If specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address.  If NULL, no password will be required.
    
-
    
-

    
-
    
-
    Table 111. 802-11-wireless setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    assigned-mac-address
    string
    		The new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
    band
    string
    		802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or "bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to the specific band, i.e. if "a" is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.
    bssid
    byte array
    		If specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.
    channel
    uint32
    0
    		Wireless channel to use for the Wi-Fi connection.  The device will only join (or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the "band" property to be set.
    cloned-mac-address
    byte array
    		This D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random". For libnm and nmcli, this field is called "cloned-mac-address".
    generate-mac-address-mask
    string
    		With "cloned-mac-address" setting "random" or "stable", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting "FE:FF:FF:00:00:00" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the "random" or "stable" algorithm. If the value contains one additional MAC address after the mask, this address is used instead of the current MAC address to fill the bits that shall not be randomized. For example, a value of "FE:FF:FF:00:00:00 68:F7:28:00:00:00" will set the OUI of the MAC address to 68:F7:28, while the lower bits are randomized. A value of "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled globally-administered, burned-in MAC address. If the value contains more then one additional MAC addresses, one of them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" will create a fully scrambled MAC address, randomly locally or globally administered.
    hidden
    boolean
    FALSE
    		If TRUE, indicates this network is a non-broadcasting network that hides its SSID.  In this case various workarounds may take place, such as probe-scanning the SSID for more reliable network discovery.  However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution.
    mac-address
    byte array
    		If specified, this connection will only apply to the Wi-Fi device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
    mac-address-blacklist
    array of string
    []
    		A list of permanent MAC addresses of Wi-Fi devices to which this connection should never apply.  Each MAC address should be given in the standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").
    mac-address-randomization
    uint32
    0
    		One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the user has set a global default to randomize and the supplicant supports randomization),  NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (never randomize the MAC address), or NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (always randomize the MAC address). This property is deprecated for 'cloned-mac-address'. Deprecated: 1
    mode
    string
    		Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap".  If blank, infrastructure is assumed.
    mtu
    uint32
    0
    		If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
    name
    string
    802-11-wireless
    		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".
    powersave
    uint32
    0
    		One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the globally configured value). All other values are reserved.
    rate
    uint32
    0
    		If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.
    security
    None
    		This property is deprecated, but can be set to the value '802-11-wireless-security' when a wireless security setting is also present in the connection dictionary, for compatibility with very old NetworkManager daemons.
    seen-bssids
    array of string
    []
    		A list of BSSIDs (each BSSID formatted as a MAC address like "00:11:22:33:44:55") that have been detected as part of the Wi-Fi network.  NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BSSID list of NetworkManager. The changes you make to this property will not be preserved.
    ssid
    byte array
    		SSID of the Wi-Fi network. Must be specified.
    tx-power
    uint32
    0
    		If non-zero, directs the device to use the specified transmit power. Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.
    
-
    
-

    
-
    
-
    Table 112. 802-11-wireless-security setting
    
-
    
------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    





    Key NameValue TypeDefault ValueValue Description
    auth-alg
    string
    		When WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the 802.11 authentication algorithm required by the AP here.  One of "open" for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the "leap-username" and "leap-password" properties must be specified.
    group
    array of string
    []
    		A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of "wep40", "wep104", "tkip", or "ccmp".
    key-mgmt
    string
    		Key management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.
    leap-password
    string
    		The login password for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").
    leap-password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "leap-password" property.
    leap-username
    string
    		The login username for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").
    name
    string
    802-11-wireless-security
    		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".
    pairwise
    array of string
    []
    		A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of "tkip" or "ccmp".
    proto
    array of string
    []
    		List of strings specifying the allowed WPA protocol versions to use. Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.
    psk
    string
    		Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi network.
    psk-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "psk" property.
    wep-key-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "wep-key0", "wep-key1", "wep-key2", and "wep-key3" properties.
    wep-key-type
    NMWepKeyType (uint32)
    		Controls the interpretation of WEP keys.  Allowed values are NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-character hexadecimal string, or a 5- or 13-character ASCII password; or NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as a string and will be hashed using the de-facto MD5 method to derive the actual WEP key.
    wep-key0
    string
    		Index 0 WEP key.  This is the WEP key used in most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
    wep-key1
    string
    		Index 1 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
    wep-key2
    string
    		Index 2 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
    wep-key3
    string
    		Index 3 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
    wep-tx-keyidx
    uint32
    0
    		When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.
    
-
    
-

    
-
    
 
    
 
    
 
    Generated by GTK-Doc V1.25
    
diff --git a/docs/api/html/secret-agents.html b/docs/api/html/secret-agents.html
new file mode 100644
index 00000000..d9e6b9c0
--- /dev/null
+++ b/docs/api/html/secret-agents.html
@@ -0,0 +1,38 @@
+
+
+
+
+Part IV. Secret Agent D-Bus API Reference: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+Part IV. Secret Agent D-Bus API Reference
    
+
    
+
    Table of Contents
    
+
    
+
    Secret agents
    
+
    
+org.freedesktop.NetworkManager.SecretAgent — User Secret Agent
+
    
+
    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/secrets-flags.html b/docs/api/html/secrets-flags.html
index 821d977b..92dc9d79 100644
--- a/docs/api/html/secrets-flags.html
+++ b/docs/api/html/secrets-flags.html
@@ -5,9 +5,9 @@
 Secret flag types: NetworkManager Reference Manual
 
 
-
-
-
+
+
+
 
 
 
@@ -16,11 +16,11 @@
 
 Home
 Up
-Prev
-Next
+Prev
+Next
 
-
    
-
    
+
    
+
    
 Secret flag types
    
 
    
         Each secret property in a setting has an associated "flags" property
diff --git a/docs/api/html/settings-802-11-olpc-mesh.html b/docs/api/html/settings-802-11-olpc-mesh.html
new file mode 100644
index 00000000..a72f0aa5
--- /dev/null
+++ b/docs/api/html/settings-802-11-olpc-mesh.html
@@ -0,0 +1,89 @@
+
+
+
+
+802-11-olpc-mesh: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    802-11-olpc-mesh
    
+
    802-11-olpc-mesh — OLPC Wireless Mesh Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 69. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    channel
    uint32
    0
    		Channel on which the mesh network to join is located.
    dhcp-anycast-address
    byte array
    		Anycast DHCP MAC address used when requesting an IP address via DHCP. The specific anycast address used determines which DHCP server class answers the request.
    name
    string
    802-11-olpc-mesh
    		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".
    ssid
    byte array
    		SSID of the mesh network to join.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-802-11-wireless-security.html b/docs/api/html/settings-802-11-wireless-security.html
new file mode 100644
index 00000000..0031026e
--- /dev/null
+++ b/docs/api/html/settings-802-11-wireless-security.html
@@ -0,0 +1,173 @@
+
+
+
+
+802-11-wireless-security: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    802-11-wireless-security
    
+
    802-11-wireless-security — Wi-Fi Security Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 84. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    auth-alg
    string
    		When WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the 802.11 authentication algorithm required by the AP here.  One of "open" for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the "leap-username" and "leap-password" properties must be specified.
    group
    array of string
    []
    		A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of "wep40", "wep104", "tkip", or "ccmp".
    key-mgmt
    string
    		Key management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.
    leap-password
    string
    		The login password for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").
    leap-password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "leap-password" property.
    leap-username
    string
    		The login username for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").
    name
    string
    802-11-wireless-security
    		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".
    pairwise
    array of string
    []
    		A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of "tkip" or "ccmp".
    proto
    array of string
    []
    		List of strings specifying the allowed WPA protocol versions to use. Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.
    psk
    string
    		Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi network.
    psk-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "psk" property.
    wep-key-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "wep-key0", "wep-key1", "wep-key2", and "wep-key3" properties.
    wep-key-type
    NMWepKeyType (uint32)
    		Controls the interpretation of WEP keys.  Allowed values are NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-character hexadecimal string, or a 5- or 13-character ASCII password; or NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as a string and will be hashed using the de-facto MD5 method to derive the actual WEP key.
    wep-key0
    string
    		Index 0 WEP key.  This is the WEP key used in most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
    wep-key1
    string
    		Index 1 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
    wep-key2
    string
    		Index 2 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
    wep-key3
    string
    		Index 3 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
    wep-tx-keyidx
    uint32
    0
    		When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-802-11-wireless.html b/docs/api/html/settings-802-11-wireless.html
new file mode 100644
index 00000000..917294f9
--- /dev/null
+++ b/docs/api/html/settings-802-11-wireless.html
@@ -0,0 +1,179 @@
+
+
+
+
+802-11-wireless: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    802-11-wireless
    
+
    802-11-wireless — Wi-Fi Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 83. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    assigned-mac-address
    string
    		The new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
    band
    string
    		802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or "bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to the specific band, i.e. if "a" is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.
    bssid
    byte array
    		If specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.
    channel
    uint32
    0
    		Wireless channel to use for the Wi-Fi connection.  The device will only join (or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the "band" property to be set.
    cloned-mac-address
    byte array
    		This D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random". For libnm and nmcli, this field is called "cloned-mac-address".
    generate-mac-address-mask
    string
    		With "cloned-mac-address" setting "random" or "stable", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting "FE:FF:FF:00:00:00" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the "random" or "stable" algorithm. If the value contains one additional MAC address after the mask, this address is used instead of the current MAC address to fill the bits that shall not be randomized. For example, a value of "FE:FF:FF:00:00:00 68:F7:28:00:00:00" will set the OUI of the MAC address to 68:F7:28, while the lower bits are randomized. A value of "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled globally-administered, burned-in MAC address. If the value contains more then one additional MAC addresses, one of them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" will create a fully scrambled MAC address, randomly locally or globally administered.
    hidden
    boolean
    FALSE
    		If TRUE, indicates this network is a non-broadcasting network that hides its SSID.  In this case various workarounds may take place, such as probe-scanning the SSID for more reliable network discovery.  However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution.
    mac-address
    byte array
    		If specified, this connection will only apply to the Wi-Fi device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
    mac-address-blacklist
    array of string
    []
    		A list of permanent MAC addresses of Wi-Fi devices to which this connection should never apply.  Each MAC address should be given in the standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").
    mac-address-randomization
    uint32
    0
    		One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the user has set a global default to randomize and the supplicant supports randomization),  NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (never randomize the MAC address), or NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (always randomize the MAC address). This property is deprecated for 'cloned-mac-address'. Deprecated: 1
    mode
    string
    		Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap".  If blank, infrastructure is assumed.
    mtu
    uint32
    0
    		If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
    name
    string
    802-11-wireless
    		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".
    powersave
    uint32
    0
    		One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the globally configured value). All other values are reserved.
    rate
    uint32
    0
    		If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.
    security
    None
    		This property is deprecated, but can be set to the value '802-11-wireless-security' when a wireless security setting is also present in the connection dictionary, for compatibility with very old NetworkManager daemons.
    seen-bssids
    array of string
    []
    		A list of BSSIDs (each BSSID formatted as a MAC address like "00:11:22:33:44:55") that have been detected as part of the Wi-Fi network.  NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BSSID list of NetworkManager. The changes you make to this property will not be preserved.
    ssid
    byte array
    		SSID of the Wi-Fi network. Must be specified.
    tx-power
    uint32
    0
    		If non-zero, directs the device to use the specified transmit power. Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-802-1x.html b/docs/api/html/settings-802-1x.html
new file mode 100644
index 00000000..3cce8faa
--- /dev/null
+++ b/docs/api/html/settings-802-1x.html
@@ -0,0 +1,335 @@
+
+
+
+
+802-1x: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    802-1x
    
+
    802-1x — AIEEE 802.1x Authentication Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 52. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    altsubject-matches
    array of string
    []
    		List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed.
    anonymous-identity
    string
    		Anonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.
    auth-timeout
    int32
    0
    		A timeout for the authentication. Zero means the global default; if the global default is not set, the authentication timeout is 25 seconds.
    ca-cert
    byte array
    		Contains the CA certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
    ca-cert-password
    string
    		The password used to access the CA certificate stored in "ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.
    ca-cert-password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "ca-cert-password" property.
    ca-path
    string
    		UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the "ca-cert" property.
    client-cert
    byte array
    		Contains the client certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte.
    client-cert-password
    string
    		The password used to access the client certificate stored in "client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.
    client-cert-password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "client-cert-password" property.
    domain-suffix-match
    string
    		Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
    eap
    array of string
    []
    		The allowed EAP method to be used when authenticating to the network with 802.1x.  Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd", and "fast".  Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.
    identity
    string
    		Identity string for EAP authentication methods.  Often the user's user or login name.
    name
    string
    802-1x
    		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".
    pac-file
    string
    		UTF-8 encoded file path containing PAC for EAP-FAST.
    password
    string
    		UTF-8 encoded password used for EAP authentication methods. If both the "password" property and the "password-raw" property are specified, "password" is preferred.
    password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "password" property.
    password-raw
    byte array
    		Password used for EAP authentication methods, given as a byte array to allow passwords in other encodings than UTF-8 to be used. If both the "password" property and the "password-raw" property are specified, "password" is preferred.
    password-raw-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "password-raw" property.
    phase1-auth-flags
    uint32
    0
    		Specifies authentication flags to use in "phase 1" outer authentication using NMSetting8021xAuthFlags options. The invidual TLS versions can be explicitly disabled. If a certain TLS disable flag is not set, it is up to the supplicant to allow or forbid it. The TLS options map to tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more details.
    phase1-fast-provisioning
    string
    		Enables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the "eap" property. Recognized values are "0" (disabled), "1" (allow unauthenticated provisioning), "2" (allow authenticated provisioning), and "3" (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.
    phase1-peaplabel
    string
    		Forces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to "1" to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.
    phase1-peapver
    string
    		Forces which PEAP version is used when PEAP is set as the EAP method in the "eap" property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to "0" or "1" to force that specific PEAP version.
    phase2-altsubject-matches
    array of string
    []
    		List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner "phase 2" authentication. If the list is empty, no verification of the server certificate's altSubjectName is performed.
    phase2-auth
    string
    		Specifies the allowed "phase 2" inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property.  Recognized non-EAP "phase 2" methods are "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
    phase2-autheap
    string
    		Specifies the allowed "phase 2" inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property.  Recognized EAP-based "phase 2" methods are "md5", "mschapv2", "otp", "gtc", and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
    phase2-ca-cert
    byte array
    		Contains the "phase 2" CA certificate if used by the EAP method specified in the "phase2-auth" or "phase2-autheap" properties. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
    phase2-ca-cert-password
    string
    		The password used to access the "phase2" CA certificate stored in "phase2-ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.
    phase2-ca-cert-password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "phase2-ca-cert-password" property.
    phase2-ca-path
    string
    		UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the "phase2-ca-cert" property.
    phase2-client-cert
    byte array
    		Contains the "phase 2" client certificate if used by the EAP method specified in the "phase2-auth" or "phase2-autheap" properties. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
    phase2-client-cert-password
    string
    		The password used to access the "phase2" client certificate stored in "phase2-client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.
    phase2-client-cert-password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "phase2-client-cert-password" property.
    phase2-domain-suffix-match
    string
    		Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server during the inner "phase 2" authentication.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
    phase2-private-key
    byte array
    		Contains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate.
    phase2-private-key-password
    string
    		The password used to decrypt the "phase 2" private key specified in the "phase2-private-key" property when the private key either uses the path scheme, or is a PKCS#12 format key.
    phase2-private-key-password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "phase2-private-key-password" property.
    phase2-subject-match
    string
    		Substring to be matched against the subject of the certificate presented by the authentication server during the inner "phase 2" authentication. When unset, no verification of the authentication server certificate's subject is performed.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:phase2-domain-suffix-match.
    pin
    string
    		PIN used for EAP authentication methods.
    pin-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "pin" property.
    private-key
    byte array
    		Contains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users.  Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data.
    private-key-password
    string
    		The password used to decrypt the private key specified in the "private-key" property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.
    private-key-password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "private-key-password" property.
    subject-match
    string
    		Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match.
    system-ca-certs
    boolean
    FALSE
    		When TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides "ca-cert" and "phase2-ca-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-802-3-ethernet.html b/docs/api/html/settings-802-3-ethernet.html
new file mode 100644
index 00000000..06990061
--- /dev/null
+++ b/docs/api/html/settings-802-3-ethernet.html
@@ -0,0 +1,161 @@
+
+
+
+
+802-3-ethernet: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    802-3-ethernet
    
+
    802-3-ethernet — Wired Ethernet Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 82. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    assigned-mac-address
    string
    		The new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
    auto-negotiate
    boolean
    FALSE
    		If TRUE, enforce auto-negotiation of port speed and duplex mode.  If FALSE, "speed" and "duplex" properties should be both set or link configuration will be skipped.
    cloned-mac-address
    byte array
    		This D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random". For libnm and nmcli, this field is called "cloned-mac-address".
    duplex
    string
    		Can be specified only when "auto-negotiate" is "off". In that case, statically configures the device to use that specified duplex mode, either "half" or "full". Must be set together with the "speed" property if specified. Before specifying a duplex mode be sure your device supports it.
    generate-mac-address-mask
    string
    		With "cloned-mac-address" setting "random" or "stable", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting "FE:FF:FF:00:00:00" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the "random" or "stable" algorithm. If the value contains one additional MAC address after the mask, this address is used instead of the current MAC address to fill the bits that shall not be randomized. For example, a value of "FE:FF:FF:00:00:00 68:F7:28:00:00:00" will set the OUI of the MAC address to 68:F7:28, while the lower bits are randomized. A value of "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled globally-administered, burned-in MAC address. If the value contains more then one additional MAC addresses, one of them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" will create a fully scrambled MAC address, randomly locally or globally administered.
    mac-address
    byte array
    		If specified, this connection will only apply to the Ethernet device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
    mac-address-blacklist
    array of string
    []
    		If specified, this connection will never apply to the Ethernet device whose permanent MAC address matches an address in the list.  Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).
    mtu
    uint32
    0
    		If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
    name
    string
    802-3-ethernet
    		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".
    port
    string
    		Specific port type to use if multiple the device supports multiple attachment methods.  One of "tp" (Twisted Pair), "aui" (Attachment Unit Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface. If the device supports only one port type, this setting is ignored.
    s390-nettype
    string
    		s390 network device type; one of "qeth", "lcs", or "ctc", representing the different types of virtual network devices available on s390 systems.
    s390-options
    dict of string to string
    {}
    		Dictionary of key/value pairs of s390-specific device options.  Both keys and values must be strings.  Allowed keys include "portno", "layer2", "portname", "protocol", among others.  Key names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
    s390-subchannels
    array of string
    []
    		Identifies specific subchannels that this network device uses for communication with z/VM or s390 host.  Like the "mac-address" property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels.  The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.
    speed
    uint32
    0
    		Can be set to a value grater than zero only when "auto-negotiate" is "off". In that case, statically configures the device to use that specified speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the "duplex" property when non-zero. Before specifying a speed value be sure your device supports it.
    wake-on-lan
    uint32
    1
    		The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).
    wake-on-lan-password
    string
    		If specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address.  If NULL, no password will be required.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-adsl.html b/docs/api/html/settings-adsl.html
new file mode 100644
index 00000000..c144b5b5
--- /dev/null
+++ b/docs/api/html/settings-adsl.html
@@ -0,0 +1,113 @@
+
+
+
+
+adsl: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    adsl
    
+
    adsl — ADSL Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 53. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    encapsulation
    string
    		Encapsulation of ADSL connection.  Can be "vcmux" or "llc".
    name
    string
    adsl
    		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".
    password
    string
    		Password used to authenticate with the ADSL service.
    password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "password" property.
    protocol
    string
    		ADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".
    username
    string
    		Username used to authenticate with the ADSL service.
    vci
    uint32
    0
    		VCI of ADSL connection
    vpi
    uint32
    0
    		VPI of ADSL connection
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-bluetooth.html b/docs/api/html/settings-bluetooth.html
new file mode 100644
index 00000000..661b6bac
--- /dev/null
+++ b/docs/api/html/settings-bluetooth.html
@@ -0,0 +1,83 @@
+
+
+
+
+bluetooth: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    bluetooth
    
+
    bluetooth — Bluetooth Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 54. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    bdaddr
    byte array
    		The Bluetooth address of the device.
    name
    string
    bluetooth
    		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".
    type
    string
    		Either "dun" for Dial-Up Networking connections or "panu" for Personal Area Networking connections to devices supporting the NAP profile.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-bond.html b/docs/api/html/settings-bond.html
new file mode 100644
index 00000000..acd5af30
--- /dev/null
+++ b/docs/api/html/settings-bond.html
@@ -0,0 +1,83 @@
+
+
+
+
+bond: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    bond
    
+
    bond — Bonding Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 55. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    interface-name
    string
    		Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the bond's interface name.
    name
    string
    bond
    		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".
    options
    dict of string to string
    {'mode': 'balance-rr'}
    		Dictionary of key/value pairs of bonding options.  Both keys and values must be strings. Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-bridge-port.html b/docs/api/html/settings-bridge-port.html
new file mode 100644
index 00000000..0b7c3aa0
--- /dev/null
+++ b/docs/api/html/settings-bridge-port.html
@@ -0,0 +1,89 @@
+
+
+
+
+bridge-port: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    bridge-port
    
+
    bridge-port — Bridge Port Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 57. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    hairpin-mode
    boolean
    FALSE
    		Enables or disabled "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on.
    name
    string
    bridge-port
    		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".
    path-cost
    uint32
    100
    		The Spanning Tree Protocol (STP) port cost for destinations via this port.
    priority
    uint32
    32
    		The Spanning Tree Protocol (STP) priority of this bridge port.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-bridge.html b/docs/api/html/settings-bridge.html
new file mode 100644
index 00000000..aff78df0
--- /dev/null
+++ b/docs/api/html/settings-bridge.html
@@ -0,0 +1,125 @@
+
+
+
+
+bridge: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    bridge
    
+
    bridge — Bridging Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 56. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    ageing-time
    uint32
    300
    		The Ethernet MAC address aging time, in seconds.
    forward-delay
    uint32
    15
    		The Spanning Tree Protocol (STP) forwarding delay, in seconds.
    hello-time
    uint32
    2
    		The Spanning Tree Protocol (STP) hello time, in seconds.
    interface-name
    string
    		Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the bridge's interface name.
    mac-address
    byte array
    		If specified, the MAC address of bridge. When creating a new bridge, this MAC address will be set. When matching an existing (outside NetworkManager created) bridge, this MAC address must match.
    max-age
    uint32
    20
    		The Spanning Tree Protocol (STP) maximum message age, in seconds.
    multicast-snooping
    boolean
    TRUE
    		Controls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.
    name
    string
    bridge
    		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".
    priority
    uint32
    32768
    		Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are "better"; the lowest priority bridge will be elected the root bridge.
    stp
    boolean
    TRUE
    		Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-cdma.html b/docs/api/html/settings-cdma.html
new file mode 100644
index 00000000..6a47e5fa
--- /dev/null
+++ b/docs/api/html/settings-cdma.html
@@ -0,0 +1,101 @@
+
+
+
+
+cdma: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    cdma
    
+
    cdma — CDMA-based Mobile Broadband Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 58. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    mtu
    uint32
    0
    		If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
    name
    string
    cdma
    		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".
    number
    string
    		The number to dial to establish the connection to the CDMA-based mobile broadband network, if any.  If not specified, the default number (#777) is used when required.
    password
    string
    		The password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.
    password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "password" property.
    username
    string
    		The username used to authenticate with the network, if required.  Many providers do not require a username, or accept any username.  But if a username is required, it is specified here.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-connection.html b/docs/api/html/settings-connection.html
new file mode 100644
index 00000000..4f810113
--- /dev/null
+++ b/docs/api/html/settings-connection.html
@@ -0,0 +1,185 @@
+
+
+
+
+connection: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    connection
    
+
    connection — General Connection Profile Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 51. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    autoconnect
    boolean
    TRUE
    		Whether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.
    autoconnect-priority
    int32
    0
    		The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.
    autoconnect-retries
    int32
    -1
    		The number of times a connection should be tried when autoctivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden).
    autoconnect-slaves
    NMSettingConnectionAutoconnectSlaves (int32)
    		Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.
    gateway-ping-timeout
    uint32
    0
    		If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.
    id
    string
    		A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".
    interface-name
    string
    		The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.
    lldp
    int32
    -1
    		Whether LLDP is enabled for the connection.
    master
    string
    		Interface name of the master device or UUID of the master connection.
    metered
    NMMetered (int32)
    		Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.
    name
    string
    connection
    		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".
    permissions
    array of string
    []
    		An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this list. Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". At this time only the "user" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ":" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.
    read-only
    boolean
    FALSE
    		FALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.
    secondaries
    array of string
    []
    		List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.
    slave-type
    string
    		Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
    stable-id
    string
    		Token to generate stable IDs for the connection. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note that also the interface name of the activating connection and a per-host secret key is included into the address generation so that the same stable-id on different hosts/devices yields different addresses. If the value is unset, an ID unique for the connection is used. Specifing a stable-id allows multiple connections to generate the same addresses. Another use is to generate IDs at runtime via dynamic substitutions. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are "${CONNECTION}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-boot, or every time. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as "$$". For example, set it to "${CONNECTION}/${BOOT}" to create a unique id for this connection that changes with every reboot. Note that two connections only use the same effective id if their stable-id is also identical before performing dynamic substitutions.
    timestamp
    uint64
    0
    		The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).
    type
    string
    		Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).
    uuid
    string
    		A universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").
    zone
    string
    		The trust level of a the connection.  Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-dcb.html b/docs/api/html/settings-dcb.html
new file mode 100644
index 00000000..c512d53f
--- /dev/null
+++ b/docs/api/html/settings-dcb.html
@@ -0,0 +1,161 @@
+
+
+
+
+dcb: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    dcb
    
+
    dcb — Data Center Bridging Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 59. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    app-fcoe-flags
    NMSettingDcbFlags (uint32)
    		Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
    app-fcoe-mode
    string
    "fabric"
    		The FCoE controller mode; either "fabric" (default) or "vn2vn".
    app-fcoe-priority
    int32
    -1
    		The highest User Priority (0 - 7) which FCoE frames should use, or -1 for default priority.  Only used when the "app-fcoe-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
    app-fip-flags
    NMSettingDcbFlags (uint32)
    		Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
    app-fip-priority
    int32
    -1
    		The highest User Priority (0 - 7) which FIP frames should use, or -1 for default priority.  Only used when the "app-fip-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
    app-iscsi-flags
    NMSettingDcbFlags (uint32)
    		Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
    app-iscsi-priority
    int32
    -1
    		The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for default priority. Only used when the "app-iscsi-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
    name
    string
    dcb
    		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".
    priority-bandwidth
    array of uint32
    [0, 0, 0, 0, 0, 0, 0, 0]
    		An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the percentage of bandwidth of the priority's assigned group that the priority may use.  The sum of all percentages for priorities which belong to the same group must total 100 percent.
    priority-flow-control
    array of uint32
    [0, 0, 0, 0, 0, 0, 0, 0]
    		An array of 8 boolean values, where the array index corresponds to the User Priority (0 - 7) and the value indicates whether or not the corresponding priority should transmit priority pause.
    priority-flow-control-flags
    NMSettingDcbFlags (uint32)
    		Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
    priority-group-bandwidth
    array of uint32
    [0, 0, 0, 0, 0, 0, 0, 0]
    		An array of 8 uint values, where the array index corresponds to the Priority Group ID (0 - 7) and the value indicates the percentage of link bandwidth allocated to that group.  Allowed values are 0 - 100, and the sum of all values must total 100 percent.
    priority-group-flags
    NMSettingDcbFlags (uint32)
    		Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
    priority-group-id
    array of uint32
    [0, 0, 0, 0, 0, 0, 0, 0]
    		An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed Priority Group ID values are 0 - 7 or 15 for the unrestricted group.
    priority-strict-bandwidth
    array of uint32
    [0, 0, 0, 0, 0, 0, 0, 0]
    		An array of 8 boolean values, where the array index corresponds to the User Priority (0 - 7) and the value indicates whether or not the priority may use all of the bandwidth allocated to its assigned group.
    priority-traffic-class
    array of uint32
    [0, 0, 0, 0, 0, 0, 0, 0]
    		An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which the priority is mapped.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-dummy.html b/docs/api/html/settings-dummy.html
new file mode 100644
index 00000000..d9f3ec3f
--- /dev/null
+++ b/docs/api/html/settings-dummy.html
@@ -0,0 +1,69 @@
+
+
+
+
+dummy: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    dummy
    
+
    dummy — Dummy Link Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 60. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    name
    string
    dummy
    		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".
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-generic.html b/docs/api/html/settings-generic.html
new file mode 100644
index 00000000..fc8602bb
--- /dev/null
+++ b/docs/api/html/settings-generic.html
@@ -0,0 +1,69 @@
+
+
+
+
+generic: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    generic
    
+
    generic — Generic Link Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 61. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    name
    string
    generic
    		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".
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-gsm.html b/docs/api/html/settings-gsm.html
new file mode 100644
index 00000000..1f262e2b
--- /dev/null
+++ b/docs/api/html/settings-gsm.html
@@ -0,0 +1,149 @@
+
+
+
+
+gsm: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    gsm
    
+
    gsm — GSM-based Mobile Broadband Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 62. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    apn
    string
    		The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan. The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.
    device-id
    string
    		The device unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will only apply to the specified device.
    home-only
    boolean
    FALSE
    		When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.
    mtu
    uint32
    0
    		If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
    name
    string
    gsm
    		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".
    network-id
    string
    		The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.
    number
    string
    		Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.
    password
    string
    		The password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.
    password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "password" property.
    pin
    string
    		If the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.
    pin-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "pin" property.
    sim-id
    string
    		The SIM card unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will apply to any device also allowed by "device-id" which contains a SIM card matching the given identifier.
    sim-operator-id
    string
    		A MCC/MNC string like "310260" or "21601" identifying the specific mobile network operator which this connection applies to.  If given, the connection will apply to any device also allowed by "device-id" and "sim-id" which contains a SIM card provisioined by the given operator.
    username
    string
    		The username used to authenticate with the network, if required.  Many providers do not require a username, or accept any username.  But if a username is required, it is specified here.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-infiniband.html b/docs/api/html/settings-infiniband.html
new file mode 100644
index 00000000..c86b32ad
--- /dev/null
+++ b/docs/api/html/settings-infiniband.html
@@ -0,0 +1,101 @@
+
+
+
+
+infiniband: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    infiniband
    
+
    infiniband — Infiniband Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 63. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    mac-address
    byte array
    		If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
    mtu
    uint32
    0
    		If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
    name
    string
    infiniband
    		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".
    p-key
    int32
    -1
    		The InfiniBand P_Key to use for this device. A value of -1 means to use the default P_Key (aka "the P_Key at index 0").  Otherwise it is a 16-bit unsigned integer, whose high bit is set if it is a "full membership" P_Key.
    parent
    string
    		The interface name of the parent device of this device. Normally NULL, but if the "p_key" property is set, then you must specify the base device by setting either this property or "mac-address".
    transport-mode
    string
    		The IP-over-InfiniBand transport mode. Either "datagram" or "connected".
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-ip-tunnel.html b/docs/api/html/settings-ip-tunnel.html
new file mode 100644
index 00000000..92b97ebf
--- /dev/null
+++ b/docs/api/html/settings-ip-tunnel.html
@@ -0,0 +1,143 @@
+
+
+
+
+ip-tunnel: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    ip-tunnel
    
+
    ip-tunnel — IP Tunneling Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 66. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    encapsulation-limit
    uint32
    0
    		How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.
    flow-label
    uint32
    0
    		The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.
    input-key
    string
    		The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
    local
    string
    		The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.
    mode
    uint32
    0
    		The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).
    mtu
    uint32
    0
    		None
    name
    string
    ip-tunnel
    		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".
    output-key
    string
    		The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
    parent
    string
    		If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.
    path-mtu-discovery
    boolean
    TRUE
    		Whether to enable Path MTU Discovery on this tunnel.
    remote
    string
    		The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.
    tos
    uint32
    0
    		The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.
    ttl
    uint32
    0
    		The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-ipv4.html b/docs/api/html/settings-ipv4.html
new file mode 100644
index 00000000..807555ad
--- /dev/null
+++ b/docs/api/html/settings-ipv4.html
@@ -0,0 +1,197 @@
+
+
+
+
+ipv4: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    ipv4
    
+
    ipv4 — IPv4 Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 64. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    address-data
    array of vardict
    		Array of IPv4 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
    addresses
    array of array of uint32
    []
    		Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.
    dad-timeout
    int32
    -1
    		Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds.
    dhcp-client-id
    string
    		A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options.
    dhcp-fqdn
    string
    		If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.
    dhcp-hostname
    string
    		If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
    dhcp-send-hostname
    boolean
    TRUE
    		If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.
    dhcp-timeout
    int32
    0
    		A timeout for a DHCP transaction in seconds.
    dns
    array of uint32
    []
    		Array of IP addresses of DNS servers (as network-byte-order integers)
    dns-options
    array of string
    []
    		Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
    dns-priority
    int32
    0
    		Intra-connection DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. For that, just specify the DNS servers in the desired order. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used.
    dns-search
    array of string
    []
    		Array of DNS search domains.
    gateway
    string
    		The gateway associated with this configuration. This is only meaningful if "addresses" is also set.
    ignore-auto-dns
    boolean
    FALSE
    		When "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.
    ignore-auto-routes
    boolean
    FALSE
    		When "method" is set to "auto" and this property to TRUE, automatically configured routes are ignored and only routes specified in the "routes" property, if any, are used.
    may-fail
    boolean
    TRUE
    		If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.
    method
    string
    		IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
    name
    string
    ipv4
    		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".
    never-default
    boolean
    FALSE
    		If TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.
    route-data
    array of vardict
    		Array of IPv4 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'gateway' entry, containing the gateway IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
    route-metric
    int64
    -1
    		The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is choosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.
    routes
    array of array of uint32
    []
    		Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. If the metric is 0, NM will choose an appropriate default metric for the device. (There is no way to explicitly specify an actual metric of 0 with this property.)
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-ipv6.html b/docs/api/html/settings-ipv6.html
new file mode 100644
index 00000000..633ff29c
--- /dev/null
+++ b/docs/api/html/settings-ipv6.html
@@ -0,0 +1,203 @@
+
+
+
+
+ipv6: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    ipv6
    
+
    ipv6 — IPv6 Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 65. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    addr-gen-mode
    int32
    1
    		Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection's stable-id and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.
    address-data
    array of vardict
    		Array of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
    addresses
    array of legacy IPv6 address struct (a(ayuay))
    []
    		Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv6 address structures.  Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.
    dad-timeout
    int32
    -1
    		Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds.
    dhcp-hostname
    string
    		If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
    dhcp-send-hostname
    boolean
    TRUE
    		If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.
    dhcp-timeout
    int32
    0
    		A timeout for a DHCP transaction in seconds.
    dns
    array of byte array
    []
    		Array of IP addresses of DNS servers (in network byte order)
    dns-options
    array of string
    []
    		Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
    dns-priority
    int32
    0
    		Intra-connection DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. For that, just specify the DNS servers in the desired order. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used.
    dns-search
    array of string
    []
    		Array of DNS search domains.
    gateway
    string
    		The gateway associated with this configuration. This is only meaningful if "addresses" is also set.
    ignore-auto-dns
    boolean
    FALSE
    		When "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.
    ignore-auto-routes
    boolean
    FALSE
    		When "method" is set to "auto" and this property to TRUE, automatically configured routes are ignored and only routes specified in the "routes" property, if any, are used.
    ip6-privacy
    NMSettingIP6ConfigPrivacy (int32)
    		Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to "-1" (unknown) means fallback to global configuration "ipv6.ip6-privacy". If also global configuration is unspecified or set to "-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr". Note that this setting is distinct from the Stable Privacy addresses that can be enabled with the "addr-gen-mode" property's "stable-privacy" setting as another way of avoiding host tracking with IPv6 addresses.
    may-fail
    boolean
    TRUE
    		If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.
    method
    string
    		IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
    name
    string
    ipv6
    		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".
    never-default
    boolean
    FALSE
    		If TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.
    route-data
    array of vardict
    		Array of IPv6 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'next-hop' entry, containing the next hop IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
    route-metric
    int64
    -1
    		The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is choosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.
    routes
    array of legacy IPv6 route struct (a(ayuayu))
    []
    		Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv6 route structures.  Each IPv6 route structure is composed of an IPv6 address, a prefix length (1 - 128), an IPv6 next hop address (which may be zeroed out if there is no next hop), and a metric. If the metric is 0, NM will choose an appropriate default metric for the device.
    token
    string
    		Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-macsec.html b/docs/api/html/settings-macsec.html
new file mode 100644
index 00000000..ba17d06d
--- /dev/null
+++ b/docs/api/html/settings-macsec.html
@@ -0,0 +1,119 @@
+
+
+
+
+macsec: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    macsec
    
+
    macsec — MACSec Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 67. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    encrypt
    boolean
    TRUE
    		Whether the transmitted traffic must be encrypted.
    mka-cak
    string
    		The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.
    mka-cak-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "mka-cak" property.
    mka-ckn
    string
    		The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.
    mode
    int32
    0
    		Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.
    name
    string
    macsec
    		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".
    parent
    string
    		If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
    port
    int32
    1
    		The port component of the SCI (Secure Channel Identifier), between 1 and 65534.
    validation
    int32
    2
    		Specifies the validation mode for incoming frames.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-macvlan.html b/docs/api/html/settings-macvlan.html
new file mode 100644
index 00000000..e1fc3311
--- /dev/null
+++ b/docs/api/html/settings-macvlan.html
@@ -0,0 +1,95 @@
+
+
+
+
+macvlan: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    macvlan
    
+
    macvlan — MAC VLAN Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 68. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    mode
    uint32
    0
    		The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.
    name
    string
    macvlan
    		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".
    parent
    string
    		If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
    promiscuous
    boolean
    TRUE
    		Whether the interface should be put in promiscuous mode.
    tap
    boolean
    FALSE
    		Whether the interface should be a MACVTAP.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-ppp.html b/docs/api/html/settings-ppp.html
new file mode 100644
index 00000000..7f520cd1
--- /dev/null
+++ b/docs/api/html/settings-ppp.html
@@ -0,0 +1,179 @@
+
+
+
+
+ppp: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    ppp
    
+
    ppp — Point-to-Point Protocol Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 70. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    baud
    uint32
    0
    		If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.
    crtscts
    boolean
    FALSE
    		If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.
    lcp-echo-failure
    uint32
    0
    		If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The "lcp-echo-interval" property must also be set to a non-zero value if this property is used.
    lcp-echo-interval
    uint32
    0
    		If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.
    mppe-stateful
    boolean
    FALSE
    		If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.
    mru
    uint32
    0
    		If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.
    mtu
    uint32
    0
    		If non-zero, instruct pppd to send packets no larger than the specified size.
    name
    string
    ppp
    		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".
    no-vj-comp
    boolean
    FALSE
    		If TRUE, Van Jacobsen TCP header compression will not be requested.
    noauth
    boolean
    TRUE
    		If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.
    nobsdcomp
    boolean
    FALSE
    		If TRUE, BSD compression will not be requested.
    nodeflate
    boolean
    FALSE
    		If TRUE, "deflate" compression will not be requested.
    refuse-chap
    boolean
    FALSE
    		If TRUE, the CHAP authentication method will not be used.
    refuse-eap
    boolean
    FALSE
    		If TRUE, the EAP authentication method will not be used.
    refuse-mschap
    boolean
    FALSE
    		If TRUE, the MSCHAP authentication method will not be used.
    refuse-mschapv2
    boolean
    FALSE
    		If TRUE, the MSCHAPv2 authentication method will not be used.
    refuse-pap
    boolean
    FALSE
    		If TRUE, the PAP authentication method will not be used.
    require-mppe
    boolean
    FALSE
    		If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.
    require-mppe-128
    boolean
    FALSE
    		If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the "require-mppe" property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-pppoe.html b/docs/api/html/settings-pppoe.html
new file mode 100644
index 00000000..7f86c7e5
--- /dev/null
+++ b/docs/api/html/settings-pppoe.html
@@ -0,0 +1,95 @@
+
+
+
+
+pppoe: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    pppoe
    
+
    pppoe — PPP-over-Ethernet Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 71. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    name
    string
    pppoe
    		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".
    password
    string
    		Password used to authenticate with the PPPoE service.
    password-flags
    NMSettingSecretFlags (uint32)
    		Flags indicating how to handle the "password" property.
    service
    string
    		If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified service.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.
    username
    string
    		Username used to authenticate with the PPPoE service.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-proxy.html b/docs/api/html/settings-proxy.html
new file mode 100644
index 00000000..4e34d9b6
--- /dev/null
+++ b/docs/api/html/settings-proxy.html
@@ -0,0 +1,95 @@
+
+
+
+
+proxy: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    proxy
    
+
    proxy — WWW Proxy Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 72. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    browser-only
    boolean
    FALSE
    		Whether the proxy configuration is for browser only.
    method
    int32
    0
    		Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)
    name
    string
    proxy
    		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".
    pac-script
    string
    		PAC script for the connection.
    pac-url
    string
    		PAC URL for obtaining PAC file.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-serial.html b/docs/api/html/settings-serial.html
new file mode 100644
index 00000000..a60aa61b
--- /dev/null
+++ b/docs/api/html/settings-serial.html
@@ -0,0 +1,101 @@
+
+
+
+
+serial: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    serial
    
+
    serial — Serial Link Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 73. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    baud
    uint32
    57600
    		Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.
    bits
    uint32
    8
    		Byte-width of the serial communication. The 8 in "8n1" for example.
    name
    string
    serial
    		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".
    parity
    byte
    		The connection parity: 69 (ASCII 'E') for even parity, 111 (ASCII 'o') for odd, 110 (ASCII 'n') for none.
    send-delay
    uint64
    0
    		Time to delay between each byte sent to the modem, in microseconds.
    stopbits
    uint32
    1
    		Number of stop bits for communication on the serial port.  Either 1 or 2. The 1 in "8n1" for example.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-team-port.html b/docs/api/html/settings-team-port.html
new file mode 100644
index 00000000..96dea572
--- /dev/null
+++ b/docs/api/html/settings-team-port.html
@@ -0,0 +1,77 @@
+
+
+
+
+team-port: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    team-port
    
+
    team-port — Team Port Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 75. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    config
    string
    		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.
    name
    string
    team-port
    		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".
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-team.html b/docs/api/html/settings-team.html
new file mode 100644
index 00000000..4210aa3a
--- /dev/null
+++ b/docs/api/html/settings-team.html
@@ -0,0 +1,83 @@
+
+
+
+
+team: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    team
    
+
    team — Teaming Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 74. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    config
    string
    		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.
    interface-name
    string
    		Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the team's interface name.
    name
    string
    team
    		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".
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-tun.html b/docs/api/html/settings-tun.html
new file mode 100644
index 00000000..3bd464bd
--- /dev/null
+++ b/docs/api/html/settings-tun.html
@@ -0,0 +1,107 @@
+
+
+
+
+tun: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    tun
    
+
    tun — Tunnel Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 76. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    group
    string
    		The group ID which will own the device. If set to NULL everyone will be able to use the device.
    mode
    uint32
    1
    		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.
    multi-queue
    boolean
    FALSE
    		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.
    name
    string
    tun
    		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".
    owner
    string
    		The user ID which will own the device. If set to NULL everyone will be able to use the device.
    pi
    boolean
    FALSE
    		If TRUE the interface will prepend a 4 byte header describing the physical interface to the packets.
    vnet-hdr
    boolean
    FALSE
    		If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network header.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-user.html b/docs/api/html/settings-user.html
new file mode 100644
index 00000000..be82df58
--- /dev/null
+++ b/docs/api/html/settings-user.html
@@ -0,0 +1,77 @@
+
+
+
+
+user: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    user
    
+
    user — General User Profile Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 77. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    data
    dict of string to string
    {}
    		A dictionary of key/value pairs with user data. This data is ignored by NetworkManager and can be used at the users discretion. The keys only support a strict ascii format, but the values can be arbitrary UTF8 strings up to a certain length.
    name
    string
    user
    		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".
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-vlan.html b/docs/api/html/settings-vlan.html
new file mode 100644
index 00000000..51587d7e
--- /dev/null
+++ b/docs/api/html/settings-vlan.html
@@ -0,0 +1,107 @@
+
+
+
+
+vlan: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    vlan
    
+
    vlan — VLAN Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 78. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    egress-priority-map
    array of string
    []
    		For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities.  The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".
    flags
    NMVlanFlags (uint32)
    		One or more flags which control the behavior and features of the VLAN interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of output packet headers), NM_VLAN_FLAG_GVRP (0x2) (use of the GVRP protocol), and NM_VLAN_FLAG_LOOSE_BINDING (0x4) (loose binding of the interface to its master device's operating state). NM_VLAN_FLAG_MVRP (0x8) (use of the MVRP protocol). The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.
    id
    uint32
    0
    		The VLAN identifier that the interface created by this connection should be assigned. The valid range is from 0 to 4094, without the reserved id 4095.
    ingress-priority-map
    array of string
    []
    		For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities.  The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".
    interface-name
    string
    		Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the vlan's interface name.
    name
    string
    vlan
    		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".
    parent
    string
    		If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-vpn.html b/docs/api/html/settings-vpn.html
new file mode 100644
index 00000000..08168850
--- /dev/null
+++ b/docs/api/html/settings-vpn.html
@@ -0,0 +1,107 @@
+
+
+
+
+vpn: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    vpn
    
+
    vpn — VPN Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 79. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    data
    dict of string to string
    {}
    		Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.
    name
    string
    vpn
    		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".
    persistent
    boolean
    FALSE
    		If the VPN service supports persistence, and this property is TRUE, the VPN will attempt to stay connected across link changes and outages, until explicitly disconnected.
    secrets
    dict of string to string
    {}
    		Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.
    service-type
    string
    		D-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.
    timeout
    uint32
    0
    		Timeout for the VPN service to establish the connection. Some services may take quite a long time to connect. Value of 0 means a default timeout, which is 60 seconds (unless overriden by vpn.timeout in configuration file). Values greater than zero mean timeout in seconds.
    user-name
    string
    		If the VPN connection requires a user name for authentication, that name should be provided here.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-vxlan.html b/docs/api/html/settings-vxlan.html
new file mode 100644
index 00000000..1bf640d5
--- /dev/null
+++ b/docs/api/html/settings-vxlan.html
@@ -0,0 +1,167 @@
+
+
+
+
+vxlan: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    vxlan
    
+
    vxlan — VXLAN Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 80. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    ageing
    uint32
    300
    		Specifies the lifetime in seconds of FDB entries learnt by the kernel.
    destination-port
    uint32
    8472
    		Specifies the UDP destination port to communicate to the remote VXLAN tunnel endpoint.
    id
    uint32
    0
    		Specifies the VXLAN Network Identifer (or VXLAN Segment Identifier) to use.
    l2-miss
    boolean
    FALSE
    		Specifies whether netlink LL ADDR miss notifications are generated.
    l3-miss
    boolean
    FALSE
    		Specifies whether netlink IP ADDR miss notifications are generated.
    learning
    boolean
    TRUE
    		Specifies whether unknown source link layer addresses and IP addresses are entered into the VXLAN device forwarding database.
    limit
    uint32
    0
    		Specifies the maximum number of FDB entries. A value of zero means that the kernel will store unlimited entries.
    local
    string
    		If given, specifies the source IP address to use in outgoing packets.
    name
    string
    vxlan
    		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".
    parent
    string
    		If given, specifies the parent interface name or parent connection UUID.
    proxy
    boolean
    FALSE
    		Specifies whether ARP proxy is turned on.
    remote
    string
    		Specifies the unicast destination IP address to use in outgoing packets when the destination link layer address is not known in the VXLAN device forwarding database, or the multicast IP address to join.
    rsc
    boolean
    FALSE
    		Specifies whether route short circuit is turned on.
    source-port-max
    uint32
    0
    		Specifies the maximum UDP source port to communicate to the remote VXLAN tunnel endpoint.
    source-port-min
    uint32
    0
    		Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.
    tos
    uint32
    0
    		Specifies the TOS value to use in outgoing packets.
    ttl
    uint32
    0
    		Specifies the time-to-live value to use in outgoing packets.
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-wimax.html b/docs/api/html/settings-wimax.html
new file mode 100644
index 00000000..b091b5a3
--- /dev/null
+++ b/docs/api/html/settings-wimax.html
@@ -0,0 +1,83 @@
+
+
+
+
+wimax: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    wimax
    
+
    wimax — WiMax Settings
    
+
    
+
    
+
    
+            Properties
+        
    
+
    
+
    Table 81. 
    
+
    
++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    





    Key NameValue TypeDefault ValueValue Description
    mac-address
    byte array
    		If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1
    name
    string
    wimax
    		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".
    network-name
    string
    		Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1
    
+
    
+

    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index ce4086ea..a530df55 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -2,12 +2,12 @@
 
 
 
-D-Bus API Reference: NetworkManager Reference Manual
+Part III. D-Bus API Reference: NetworkManager Reference Manual
 
 
 
-
-
+
+
 
 
 
@@ -16,140 +16,146 @@
 
 Home
 
-Prev
-Next
+Prev
+Next
 
-
    
+
    
 
    
-D-Bus API Reference
    
-
    
-
    Interfaces
    
+Part III. D-Bus API Reference
    
+
    
+
    Table of Contents
    
+
    
+
    The /org/freedesktop/NetworkManager object
    
+
    
+org.freedesktop.NetworkManager — Connection Manager
+
    
+
    The /org/freedesktop/NetworkManager/AgentManager object
    
+
    
+org.freedesktop.NetworkManager.AgentManager — Secret Agent Manager
+
    
+
    The /org/freedesktop/NetworkManager/DnsManager object
    
+
    
+org.freedesktop.NetworkManager.DnsManager — DNS Configuration State
+
    
+
    The /org/freedesktop/NetworkManager/Settings object
    
+
    
+org.freedesktop.NetworkManager.Settings — Connection Settings Profile Manager
+
    
+
    The /org/freedesktop/NetworkManager/Settings/* objects
    
+
    
+org.freedesktop.NetworkManager.Settings.Connection — Connection Settings Profile
+
    
+
    The /org/freedesktop/NetworkManager/Devices/* objects
    
 
    
 
    
-org.freedesktop.NetworkManager
+org.freedesktop.NetworkManager.Device — Device
 
    
 
    
-org.freedesktop.NetworkManager.Settings
+org.freedesktop.NetworkManager.Device.Statistics — Device Statistic Counters
 
    
 
    
-org.freedesktop.NetworkManager.AgentManager
+org.freedesktop.NetworkManager.Device.Adsl — ADSL Device
 
    
 
    
-org.freedesktop.NetworkManager.AccessPoint
+org.freedesktop.NetworkManager.Device.Bond — Bonding Device
 
    
 
    
-org.freedesktop.NetworkManager.PPP
+org.freedesktop.NetworkManager.Device.Bridge — Bridging Device
 
    
 
    
-org.freedesktop.NetworkManager.Settings.Connection
+org.freedesktop.NetworkManager.Device.Bluetooth — Bluetooth Device
 
    
 
    
-org.freedesktop.NetworkManager.VPN.Connection
+org.freedesktop.NetworkManager.Device.Dummy — Dummy Device
 
    
 
    
-org.freedesktop.NetworkManager.Connection.Active
+org.freedesktop.NetworkManager.Device.Wired — Wired Ethernet Device
 
    
 
    
-org.freedesktop.NetworkManager.Device
+org.freedesktop.NetworkManager.Device.Generic — Unrecognized Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.Adsl
+org.freedesktop.NetworkManager.Device.Infiniband — Infiniband Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.Bond
+org.freedesktop.NetworkManager.Device.IPTunnel — IP Tunneling Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.Bridge
+org.freedesktop.NetworkManager.Device.Macsec — MACSec Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.Bluetooth
+org.freedesktop.NetworkManager.Device.Macvlan — MAC VLAN Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.Wired
+org.freedesktop.NetworkManager.Device.Modem — Modem Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.Generic
+org.freedesktop.NetworkManager.Device.OlpcMesh — OLPC Wireless Mesh Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.Infiniband
+org.freedesktop.NetworkManager.Device.Team — Teaming Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.IPTunnel
+org.freedesktop.NetworkManager.Device.Tun — Userspace Tunneling Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.Macsec
+org.freedesktop.NetworkManager.Device.Veth — Virtual Ethernet Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.Macvlan
+org.freedesktop.NetworkManager.Device.Vlan — Virtual LAN Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.Modem
+org.freedesktop.NetworkManager.Device.Vxlan — VXLAN Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.OlpcMesh
+org.freedesktop.NetworkManager.Device.Wireless — Wi-Fi Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.Team
+org.freedesktop.NetworkManager.Device.WiMax — WiMax Device
 
    
 
    
-org.freedesktop.NetworkManager.Device.Tun
-
    
-
    
-org.freedesktop.NetworkManager.Device.Veth
-
    
-
    
-org.freedesktop.NetworkManager.Device.Vlan
-
    
-
    
-org.freedesktop.NetworkManager.Device.Vxlan
-
    
-
    
-org.freedesktop.NetworkManager.Device.Wireless
-
    
-
    
-org.freedesktop.NetworkManager.Device.WiMax
-
    
-
    
-org.freedesktop.NetworkManager.DHCP4Config
-
    
-
    
-org.freedesktop.NetworkManager.DHCP6Config
-
    
-
    
-org.freedesktop.NetworkManager.IP4Config
-
    
-
    
-org.freedesktop.NetworkManager.IP6Config
-
    
-
    
-org.freedesktop.NetworkManager.VPN.Plugin
-
    
-
    
-org.freedesktop.NetworkManager.SecretAgent
-
    
-
    
-org.freedesktop.NetworkManager.Device.Statistics
-
    
-
    
-org.freedesktop.NetworkManager.DnsManager
+org.freedesktop.NetworkManager.PPP — Helper interface for a PPP plugin
 
    
 
    
-
    Types
    
+
    The /org/freedesktop/NetworkManager/ActiveConnection/* objects
    
 
    
 
    
-NetworkManager D-Bus API Types
+org.freedesktop.NetworkManager.Connection.Active — Active Connection
 
    
 
    
-VPN Plugin D-Bus API Types
+org.freedesktop.NetworkManager.VPN.Connection — Active VPN Connection
 
    
 
    
-
    
+
    The /org/freedesktop/NetworkManager/IP4Config/* objects
    
+
    
+org.freedesktop.NetworkManager.IP4Config — IPv4 Configuration Set
+
    
+
    The /org/freedesktop/NetworkManager/IP6Config/* objects
    
+
    
+org.freedesktop.NetworkManager.IP6Config — IPv6 Configuration Set
+
    
+
    The /org/freedesktop/NetworkManager/DHCP4Config/* objects
    
+
    
+org.freedesktop.NetworkManager.DHCP4Config — IPv4 DHCP Client State
+
    
+
    The /org/freedesktop/NetworkManager/DHCP4Config/* objects
    
+
    
+org.freedesktop.NetworkManager.DHCP6Config — IPv6 DHCP Client State
+
    
+
    The /org/freedesktop/NetworkManager/AccessPoint/* objects
    
+
    
+org.freedesktop.NetworkManager.AccessPoint — Wi-Fi Access Point
+
    
+
    Types
    
+
    
+NetworkManager D-Bus API Types
+
    
+
+
    
 
    
       This part documents the D-Bus interface used to access the
       NetworkManager daemon.
     
    
-
    
-Interfaces
    
 
    
 
    
 
    Generated by GTK-Doc V1.25
    
diff --git a/docs/api/html/vpn-plugins.html b/docs/api/html/vpn-plugins.html
new file mode 100644
index 00000000..836fe020
--- /dev/null
+++ b/docs/api/html/vpn-plugins.html
@@ -0,0 +1,42 @@
+
+
+
+
+Part V. VPN Plugin D-Bus API Reference: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+Part V. VPN Plugin D-Bus API Reference
    
+
    
+
    Table of Contents
    
+
    
+
    VPN services
    
+
    
+org.freedesktop.NetworkManager.VPN.Plugin — VPN Service
+
    
+
    Types
    
+
    
+VPN Plugin D-Bus API Types
+
    
+
    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index 45164ce0..dd5f0e47 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -6,7 +6,11 @@
 
   
     NetworkManager Reference Manual
-    Version &version;
+    
+      for NetworkManager &version;
+      The latest version of this documentation can be found on-line at
+      https://developer.gnome.org/NetworkManager/stable/.
+    
 
     
       2012
@@ -14,6 +18,7 @@
       2014
       2015
       2016
+      2017
       The NetworkManager Authors
     
 
@@ -38,78 +43,42 @@
 	
       
     
+
+    
+      
+        This manual is the reference documentation for NetworkManager, the standard
+        Linux network management service. It is intended for system administrators and
+        integrators who need to understand the capabilities of NetworkManager, its
+        configuration options, command line tools and the D-Bus API for programmatic
+        control of the service.
+      
+      
+        The end users NetworkManager should instead refer to respective documentation
+        of their desktop environment of choice.
+      
+      
+        The application developers who prefer not to use the D-Bus API directly can use the
+        libnm library
+        shipped with NetworkManager or its bindings to a higher level language such as
+        Python, Ruby or Vala via GObject introspection.
+      
+    
   
 
-  
+  
     Manual Pages
+    
+    
     
+    
     
-    
-    
     
     
     
-    
-    
-  
-
-  
-    D-Bus API Reference
-
-    
-      This part documents the D-Bus interface used to access the
-      NetworkManager daemon.
-    
-
-    
    
-      Interfaces
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-    
    
-    
    
-      Types
-      
-      
-    
    
-      
+    
+  
 
-  
+  
     Network Configuration Setting Specification
     
       This part documents the properties and value types of each "Setting"
@@ -120,16 +89,16 @@
     
     
       
-	
    
+	
 	  Configuration Settings
 	  
 	    (NetworkManager was built without full introspection support. Setting
 	    documentation is not available.)
 	  
-	
    
+	    
       
         
-    
    
+    
       Secret flag types
       
         Each secret property in a setting has an associated "flags" property
@@ -163,8 +132,141 @@
           
         
       
-    
    
-  
+    
+  
+
+  
+    D-Bus API Reference
+
+    
+      This part documents the D-Bus interface used to access the
+      NetworkManager daemon.
+    
+
+    
+      The <literal>/org/freedesktop/NetworkManager</literal> object
+      
+      
+    
+
+    
+      The <literal>/org/freedesktop/NetworkManager/AgentManager</literal> object
+      
+      
+    
+
+    
+      The <literal>/org/freedesktop/NetworkManager/DnsManager</literal> object
+      
+      
+    
+
+    
+      The <literal>/org/freedesktop/NetworkManager/Settings</literal> object
+      
+      
+    
+
+    
+      The <literal>/org/freedesktop/NetworkManager/Settings/*</literal> objects
+      
+      
+    
+
+    
+      The <literal>/org/freedesktop/NetworkManager/Devices/*</literal> objects
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
+
+    
+      The <literal>/org/freedesktop/NetworkManager/ActiveConnection/*</literal> objects
+      
+      
+      
+    
+
+    
+      The <literal>/org/freedesktop/NetworkManager/IP4Config/*</literal> objects
+      
+      
+    
+
+    
+      The <literal>/org/freedesktop/NetworkManager/IP6Config/*</literal> objects
+      
+      
+    
+
+    
+      The <literal>/org/freedesktop/NetworkManager/DHCP4Config/*</literal> objects
+      
+      
+    
+
+    
+      The <literal>/org/freedesktop/NetworkManager/DHCP4Config/*</literal> objects
+      
+      
+    
+
+    
+      The <literal>/org/freedesktop/NetworkManager/AccessPoint/*</literal> objects
+      
+      
+    
+
+    
+      Types
+      
+    
+  
+
+  
+    Secret Agent D-Bus API Reference
+
+    
+      Secret agents
+      
+      
+    
+  
+
+  
+    VPN Plugin D-Bus API Reference
+
+    
+      VPN services
+      
+      
+    
+    
+      Types
+      
+    
+  
 
   
     Index
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index fcce8c26..704221a3 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -1,402 +1,489 @@
 
-
-
    Configuration Settings
-  802-1x settingKey NameValue TypeDefault ValueValue Description
-    altsubject-matchesarray of string[]List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed.
-    anonymous-identitystringAnonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.
-    ca-certbyte arrayContains the CA certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
-    ca-pathstringUTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the "ca-cert" property.
-    client-certbyte arrayContains the client certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte.
-    domain-suffix-matchstringConstraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
-    eaparray of string[]The allowed EAP method to be used when authenticating to the network with 802.1x.  Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd", and "fast".  Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.
-    identitystringIdentity string for EAP authentication methods.  Often the user's user or login name.
-    namestring802-1xThe 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".
-    pac-filestringUTF-8 encoded file path containing PAC for EAP-FAST.
-    passwordstringUTF-8 encoded password used for EAP authentication methods. If both the "password" property and the "password-raw" property are specified, "password" is preferred.
-    password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property.
-    password-rawbyte arrayPassword used for EAP authentication methods, given as a byte array to allow passwords in other encodings than UTF-8 to be used. If both the "password" property and the "password-raw" property are specified, "password" is preferred.
-    password-raw-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password-raw" property.
-    phase1-fast-provisioningstringEnables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the "eap" property. Recognized values are "0" (disabled), "1" (allow unauthenticated provisioning), "2" (allow authenticated provisioning), and "3" (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.
-    phase1-peaplabelstringForces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to "1" to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.
-    phase1-peapverstringForces which PEAP version is used when PEAP is set as the EAP method in the "eap" property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to "0" or "1" to force that specific PEAP version.
-    phase2-altsubject-matchesarray of string[]List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner "phase 2" authentication. If the list is empty, no verification of the server certificate's altSubjectName is performed.
-    phase2-authstringSpecifies the allowed "phase 2" inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property.  Recognized non-EAP "phase 2" methods are "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
-    phase2-autheapstringSpecifies the allowed "phase 2" inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property.  Recognized EAP-based "phase 2" methods are "md5", "mschapv2", "otp", "gtc", and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
-    phase2-ca-certbyte arrayContains the "phase 2" CA certificate if used by the EAP method specified in the "phase2-auth" or "phase2-autheap" properties. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
-    phase2-ca-pathstringUTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the "phase2-ca-cert" property.
-    phase2-client-certbyte arrayContains the "phase 2" client certificate if used by the EAP method specified in the "phase2-auth" or "phase2-autheap" properties. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
-    phase2-domain-suffix-matchstringConstraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server during the inner "phase 2" authentication.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
-    phase2-private-keybyte arrayContains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate.
-    phase2-private-key-passwordstringThe password used to decrypt the "phase 2" private key specified in the "phase2-private-key" property when the private key either uses the path scheme, or is a PKCS#12 format key.
-    phase2-private-key-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "phase2-private-key-password" property.
-    phase2-subject-matchstringSubstring to be matched against the subject of the certificate presented by the authentication server during the inner "phase 2" authentication. When unset, no verification of the authentication server certificate's subject is performed.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:phase2-domain-suffix-match.
-    pinstringPIN used for EAP authentication methods.
-    pin-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "pin" property.
-    private-keybyte arrayContains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users.  Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data.
-    private-key-passwordstringThe password used to decrypt the private key specified in the "private-key" property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.
-    private-key-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "private-key-password" property.
-    subject-matchstringSubstring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match.
-    system-ca-certsbooleanFALSEWhen TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides "ca-cert" and "phase2-ca-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).
-  
    
-  adsl settingKey NameValue TypeDefault ValueValue Description
-    encapsulationstringEncapsulation of ADSL connection.  Can be "vcmux" or "llc".
-    namestringadslThe 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".
-    passwordstringPassword used to authenticate with the ADSL service.
-    password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property.
-    protocolstringADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".
-    usernamestringUsername used to authenticate with the ADSL service.
-    vciuint320VCI of ADSL connection
-    vpiuint320VPI of ADSL connection
-  
    
-  bluetooth settingKey NameValue TypeDefault ValueValue Description
-    bdaddrbyte arrayThe Bluetooth address of the device.
-    namestringbluetoothThe 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".
-    typestringEither "dun" for Dial-Up Networking connections or "panu" for Personal Area Networking connections to devices supporting the NAP profile.
-  
    
-  bond settingKey NameValue TypeDefault ValueValue Description
-    interface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the bond's interface name.
-    namestringbondThe 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".
-    optionsdict of string to string{'mode': 'balance-rr'}Dictionary of key/value pairs of bonding options.  Both keys and values must be strings. Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
-  
    
-  bridge settingKey NameValue TypeDefault ValueValue Description
-    ageing-timeuint32300The Ethernet MAC address aging time, in seconds.
-    forward-delayuint3215The Spanning Tree Protocol (STP) forwarding delay, in seconds.
-    hello-timeuint322The Spanning Tree Protocol (STP) hello time, in seconds.
-    interface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the bridge's interface name.
-    mac-addressbyte arrayIf specified, the MAC address of bridge. When creating a new bridge, this MAC address will be set. When matching an existing (outside NetworkManager created) bridge, this MAC address must match.
-    max-ageuint3220The Spanning Tree Protocol (STP) maximum message age, in seconds.
-    multicast-snoopingbooleanTRUEControls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.
-    namestringbridgeThe 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".
-    priorityuint3232768Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are "better"; the lowest priority bridge will be elected the root bridge.
-    stpbooleanTRUEControls whether Spanning Tree Protocol (STP) is enabled for this bridge.
-  
    
-  bridge-port settingKey NameValue TypeDefault ValueValue Description
-    hairpin-modebooleanFALSEEnables or disabled "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on.
-    namestringbridge-portThe 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".
-    path-costuint32100The Spanning Tree Protocol (STP) port cost for destinations via this port.
-    priorityuint3232The Spanning Tree Protocol (STP) priority of this bridge port.
-  
    
-  cdma settingKey NameValue TypeDefault ValueValue Description
-    namestringcdmaThe 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".
-    numberstringThe number to dial to establish the connection to the CDMA-based mobile broadband network, if any.  If not specified, the default number (#777) is used when required.
-    passwordstringThe password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.
-    password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property.
-    usernamestringThe username used to authenticate with the network, if required.  Many providers do not require a username, or accept any username.  But if a username is required, it is specified here.
-  
    
-  connection settingKey NameValue TypeDefault ValueValue Description
-    autoconnectbooleanTRUEWhether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.
-    autoconnect-priorityint320The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.
-    autoconnect-retriesint32-1The number of times a connection should be tried when autoctivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden).
-    autoconnect-slavesNMSettingConnectionAutoconnectSlaves (int32)Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.
-    gateway-ping-timeoutuint320If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.
-    idstringA human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".
-    interface-namestringThe name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.
-    lldpint32-1Whether LLDP is enabled for the connection.
-    masterstringInterface name of the master device or UUID of the master connection.
-    meteredNMMetered (int32)Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.
-    namestringconnectionThe 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".
-    permissionsarray of string[]An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this list. Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". At this time only the "user" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ":" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.
-    read-onlybooleanFALSEFALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.
-    secondariesarray of string[]List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.
-    slave-typestringSetting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
-    stable-idstringToken to generate stable IDs for the connection. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note that also the interface name of the activating connection and a per-host secret key is included into the address generation so that the same stable-id on different hosts/devices yields different addresses. If the value is unset, an ID unique for the connection is used. Specifing a stable-id allows multiple connections to generate the same addresses. Another use is to generate IDs at runtime via dynamic substitutions. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are "${CONNECTION}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-boot, or every time. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as "$$". For example, set it to "${CONNECTION}/${BOOT}" to create a unique id for this connection that changes with every reboot. Note that two connections only use the same effective id if their stable-id is also identical before performing dynamic substitutions.
-    timestampuint640The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).
-    typestringBase type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).
-    uuidstringA universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").
-    zonestringThe trust level of a the connection.  Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.
-  
    
-  dcb settingKey NameValue TypeDefault ValueValue Description
-    app-fcoe-flagsNMSettingDcbFlags (uint32)Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
-    app-fcoe-modestring"fabric"The FCoE controller mode; either "fabric" (default) or "vn2vn".
-    app-fcoe-priorityint32-1The highest User Priority (0 - 7) which FCoE frames should use, or -1 for default priority.  Only used when the "app-fcoe-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
-    app-fip-flagsNMSettingDcbFlags (uint32)Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
-    app-fip-priorityint32-1The highest User Priority (0 - 7) which FIP frames should use, or -1 for default priority.  Only used when the "app-fip-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
-    app-iscsi-flagsNMSettingDcbFlags (uint32)Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
-    app-iscsi-priorityint32-1The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for default priority. Only used when the "app-iscsi-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
-    namestringdcbThe 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".
-    priority-bandwidtharray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the percentage of bandwidth of the priority's assigned group that the priority may use.  The sum of all percentages for priorities which belong to the same group must total 100 percent.
-    priority-flow-controlarray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 boolean values, where the array index corresponds to the User Priority (0 - 7) and the value indicates whether or not the corresponding priority should transmit priority pause.
-    priority-flow-control-flagsNMSettingDcbFlags (uint32)Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
-    priority-group-bandwidtharray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 uint values, where the array index corresponds to the Priority Group ID (0 - 7) and the value indicates the percentage of link bandwidth allocated to that group.  Allowed values are 0 - 100, and the sum of all values must total 100 percent.
-    priority-group-flagsNMSettingDcbFlags (uint32)Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
-    priority-group-idarray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed Priority Group ID values are 0 - 7 or 15 for the unrestricted group.
-    priority-strict-bandwidtharray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 boolean values, where the array index corresponds to the User Priority (0 - 7) and the value indicates whether or not the priority may use all of the bandwidth allocated to its assigned group.
-    priority-traffic-classarray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which the priority is mapped.
-  
    
-  generic settingKey NameValue TypeDefault ValueValue Description
-    namestringgenericThe 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".
-  
    
-  gsm settingKey NameValue TypeDefault ValueValue Description
-    apnstringThe GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan. The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.
-    device-idstringThe device unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will only apply to the specified device.
-    home-onlybooleanFALSEWhen TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.
-    namestringgsmThe 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".
-    network-idstringThe Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.
-    numberstringNumber to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.
-    passwordstringThe password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.
-    password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property.
-    pinstringIf the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.
-    pin-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "pin" property.
-    sim-idstringThe SIM card unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will apply to any device also allowed by "device-id" which contains a SIM card matching the given identifier.
-    sim-operator-idstringA MCC/MNC string like "310260" or "21601" identifying the specific mobile network operator which this connection applies to.  If given, the connection will apply to any device also allowed by "device-id" and "sim-id" which contains a SIM card provisioined by the given operator.
-    usernamestringThe username used to authenticate with the network, if required.  Many providers do not require a username, or accept any username.  But if a username is required, it is specified here.
-  
    
-  infiniband settingKey NameValue TypeDefault ValueValue Description
-    mac-addressbyte arrayIf specified, this connection will only apply to the IPoIB device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
-    mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
-    namestringinfinibandThe 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".
-    p-keyint32-1The InfiniBand P_Key to use for this device. A value of -1 means to use the default P_Key (aka "the P_Key at index 0").  Otherwise it is a 16-bit unsigned integer, whose high bit is set if it is a "full membership" P_Key.
-    parentstringThe interface name of the parent device of this device. Normally NULL, but if the "p_key" property is set, then you must specify the base device by setting either this property or "mac-address".
-    transport-modestringThe IP-over-InfiniBand transport mode. Either "datagram" or "connected".
-  
    
-  ipv4 settingKey NameValue TypeDefault ValueValue Description
-    address-dataarray of vardictArray of IPv4 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
-    addressesarray of array of uint32[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.
-    dad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds.
-    dhcp-client-idstringA string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options.
-    dhcp-fqdnstringIf the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.
-    dhcp-hostnamestringIf the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
-    dhcp-send-hostnamebooleanTRUEIf TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.
-    dhcp-timeoutint320A timeout for a DHCP transaction in seconds.
-    dnsarray of uint32[]Array of IP addresses of DNS servers (as network-byte-order integers)
-    dns-optionsarray of string[]Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
-    dns-priorityint320Intra-connection DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. For that, just specify the DNS servers in the desired order. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used.
-    dns-searcharray of string[]Array of DNS search domains.
-    gatewaystringThe gateway associated with this configuration. This is only meaningful if "addresses" is also set.
-    ignore-auto-dnsbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.
-    ignore-auto-routesbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured routes are ignored and only routes specified in the "routes" property, if any, are used.
-    may-failbooleanTRUEIf TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.
-    methodstringIP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
-    namestringipv4The 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".
-    never-defaultbooleanFALSEIf TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.
-    route-dataarray of vardictArray of IPv4 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'gateway' entry, containing the gateway IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
-    route-metricint64-1The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is choosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.
-    routesarray of array of uint32[]Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. If the metric is 0, NM will choose an appropriate default metric for the device. (There is no way to explicitly specify an actual metric of 0 with this property.)
-  
    
-  ipv6 settingKey NameValue TypeDefault ValueValue Description
-    addr-gen-modeint321Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection's stable-id and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.
-    address-dataarray of vardictArray of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
-    addressesarray of legacy IPv6 address struct (a(ayuay))[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv6 address structures.  Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.
-    dad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds.
-    dhcp-hostnamestringIf the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
-    dhcp-send-hostnamebooleanTRUEIf TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.
-    dhcp-timeoutint320A timeout for a DHCP transaction in seconds.
-    dnsarray of byte array[]Array of IP addresses of DNS servers (in network byte order)
-    dns-optionsarray of string[]Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
-    dns-priorityint320Intra-connection DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. For that, just specify the DNS servers in the desired order. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used.
-    dns-searcharray of string[]Array of DNS search domains.
-    gatewaystringThe gateway associated with this configuration. This is only meaningful if "addresses" is also set.
-    ignore-auto-dnsbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.
-    ignore-auto-routesbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured routes are ignored and only routes specified in the "routes" property, if any, are used.
-    ip6-privacyNMSettingIP6ConfigPrivacy (int32)Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to "-1" (unknown) means fallback to global configuration "ipv6.ip6-privacy". If also global configuration is unspecified or set to "-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr". Note that this setting is distinct from the Stable Privacy addresses that can be enabled with the "addr-gen-mode" property's "stable-privacy" setting as another way of avoiding host tracking with IPv6 addresses.
-    may-failbooleanTRUEIf TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.
-    methodstringIP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
-    namestringipv6The 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".
-    never-defaultbooleanFALSEIf TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.
-    route-dataarray of vardictArray of IPv6 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'next-hop' entry, containing the next hop IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
-    route-metricint64-1The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is choosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.
-    routesarray of legacy IPv6 route struct (a(ayuayu))[]Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv6 route structures.  Each IPv6 route structure is composed of an IPv6 address, a prefix length (1 - 128), an IPv6 next hop address (which may be zeroed out if there is no next hop), and a metric. If the metric is 0, NM will choose an appropriate default metric for the device.
-    tokenstringConfigure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.
-  
    
-  ip-tunnel settingKey NameValue TypeDefault ValueValue Description
-    encapsulation-limituint320How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.
-    flow-labeluint320The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.
-    input-keystringThe key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
-    localstringThe local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.
-    modeuint320The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).
-    mtuuint320None
-    namestringip-tunnelThe 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".
-    output-keystringThe key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
-    parentstringIf given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.
-    path-mtu-discoverybooleanTRUEWhether to enable Path MTU Discovery on this tunnel.
-    remotestringThe remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.
-    tosuint320The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.
-    ttluint320The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.
-  
    
-  macsec settingKey NameValue TypeDefault ValueValue Description
-    encryptbooleanTRUEWhether the transmitted traffic must be encrypted.
-    mka-cakstringThe pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.
-    mka-cak-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "mka-cak" property.
-    mka-cknstringThe pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.
-    modeint320Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.
-    namestringmacsecThe 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".
-    parentstringIf given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
-    portint321The port component of the SCI (Secure Channel Identifier), between 1 and 65534.
-    validationint322Specifies the validation mode for incoming frames.
-  
    
-  macvlan settingKey NameValue TypeDefault ValueValue Description
-    modeuint320The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.
-    namestringmacvlanThe 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".
-    parentstringIf given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
-    promiscuousbooleanTRUEWhether the interface should be put in promiscuous mode.
-    tapbooleanFALSEWhether the interface should be a MACVTAP.
-  
    
-  802-11-olpc-mesh settingKey NameValue TypeDefault ValueValue Description
-    channeluint320Channel on which the mesh network to join is located.
-    dhcp-anycast-addressbyte arrayAnycast DHCP MAC address used when requesting an IP address via DHCP. The specific anycast address used determines which DHCP server class answers the request.
-    namestring802-11-olpc-meshThe 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".
-    ssidbyte arraySSID of the mesh network to join.
-  
    
-  ppp settingKey NameValue TypeDefault ValueValue Description
-    bauduint320If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.
-    crtsctsbooleanFALSEIf TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.
-    lcp-echo-failureuint320If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The "lcp-echo-interval" property must also be set to a non-zero value if this property is used.
-    lcp-echo-intervaluint320If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.
-    mppe-statefulbooleanFALSEIf TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.
-    mruuint320If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.
-    mtuuint320If non-zero, instruct pppd to send packets no larger than the specified size.
-    namestringpppThe 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".
-    no-vj-compbooleanFALSEIf TRUE, Van Jacobsen TCP header compression will not be requested.
-    noauthbooleanTRUEIf TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.
-    nobsdcompbooleanFALSEIf TRUE, BSD compression will not be requested.
-    nodeflatebooleanFALSEIf TRUE, "deflate" compression will not be requested.
-    refuse-chapbooleanFALSEIf TRUE, the CHAP authentication method will not be used.
-    refuse-eapbooleanFALSEIf TRUE, the EAP authentication method will not be used.
-    refuse-mschapbooleanFALSEIf TRUE, the MSCHAP authentication method will not be used.
-    refuse-mschapv2booleanFALSEIf TRUE, the MSCHAPv2 authentication method will not be used.
-    refuse-papbooleanFALSEIf TRUE, the PAP authentication method will not be used.
-    require-mppebooleanFALSEIf TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.
-    require-mppe-128booleanFALSEIf TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the "require-mppe" property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.
-  
    
-  pppoe settingKey NameValue TypeDefault ValueValue Description
-    namestringpppoeThe 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".
-    passwordstringPassword used to authenticate with the PPPoE service.
-    password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property.
-    servicestringIf specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified service.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.
-    usernamestringUsername used to authenticate with the PPPoE service.
-  
    
-  proxy settingKey NameValue TypeDefault ValueValue Description
-    browser-onlybooleanFALSEWhether the proxy configuration is for browser only.
-    methodint320Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)
-    namestringproxyThe 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".
-    pac-scriptstringPAC script for the connection.
-    pac-urlstringPAC URL for obtaining PAC file.
-  
    
-  serial settingKey NameValue TypeDefault ValueValue Description
-    bauduint3257600Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.
-    bitsuint328Byte-width of the serial communication. The 8 in "8n1" for example.
-    namestringserialThe 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".
-    paritybyteThe connection parity: 69 (ASCII 'E') for even parity, 111 (ASCII 'o') for odd, 110 (ASCII 'n') for none.
-    send-delayuint640Time to delay between each byte sent to the modem, in microseconds.
-    stopbitsuint321Number of stop bits for communication on the serial port.  Either 1 or 2. The 1 in "8n1" for example.
-  
    
-  team settingKey NameValue TypeDefault ValueValue Description
-    configstringThe JSON configuration for the team network interface.  The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used.  See man teamd.conf for the format details.
-    interface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the team's interface name.
-    namestringteamThe 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".
-  
    
-  team-port settingKey NameValue TypeDefault ValueValue Description
-    configstringThe JSON configuration for the team port. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used. See man teamd.conf for the format details.
-    namestringteam-portThe 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".
-  
    
-  tun settingKey NameValue TypeDefault ValueValue Description
-    groupstringThe group ID which will own the device. If set to NULL everyone will be able to use the device.
-    modeuint321The 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.
-    multi-queuebooleanFALSEIf 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.
-    namestringtunThe 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".
-    ownerstringThe user ID which will own the device. If set to NULL everyone will be able to use the device.
-    pibooleanFALSEIf TRUE the interface will prepend a 4 byte header describing the physical interface to the packets.
-    vnet-hdrbooleanFALSEIf TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network header.
-  
    
-  vlan settingKey NameValue TypeDefault ValueValue Description
-    egress-priority-maparray of string[]For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities.  The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".
-    flagsNMVlanFlags (uint32)One or more flags which control the behavior and features of the VLAN interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of output packet headers), NM_VLAN_FLAG_GVRP (0x2) (use of the GVRP protocol), and NM_VLAN_FLAG_LOOSE_BINDING (0x4) (loose binding of the interface to its master device's operating state). NM_VLAN_FLAG_MVRP (0x8) (use of the MVRP protocol). The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.
-    iduint320The VLAN identifier that the interface created by this connection should be assigned. The valid range is from 0 to 4094, without the reserved id 4095.
-    ingress-priority-maparray of string[]For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities.  The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".
-    interface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the vlan's interface name.
-    namestringvlanThe 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".
-    parentstringIf given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
-  
    
-  vpn settingKey NameValue TypeDefault ValueValue Description
-    datadict of string to string{}Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.
-    namestringvpnThe 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".
-    persistentbooleanFALSEIf the VPN service supports persistence, and this property is TRUE, the VPN will attempt to stay connected across link changes and outages, until explicitly disconnected.
-    secretsdict of string to string{}Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.
-    service-typestringD-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.
-    timeoutuint320Timeout for the VPN service to establish the connection. Some services may take quite a long time to connect. Value of 0 means a default timeout, which is 60 seconds (unless overriden by vpn.timeout in configuration file). Values greater than zero mean timeout in seconds.
-    user-namestringIf the VPN connection requires a user name for authentication, that name should be provided here.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.
-  
    
-  vxlan settingKey NameValue TypeDefault ValueValue Description
-    ageinguint32300Specifies the lifetime in seconds of FDB entries learnt by the kernel.
-    destination-portuint328472Specifies the UDP destination port to communicate to the remote VXLAN tunnel endpoint.
-    iduint320Specifies the VXLAN Network Identifer (or VXLAN Segment Identifier) to use.
-    l2-missbooleanFALSESpecifies whether netlink LL ADDR miss notifications are generated.
-    l3-missbooleanFALSESpecifies whether netlink IP ADDR miss notifications are generated.
-    learningbooleanTRUESpecifies whether unknown source link layer addresses and IP addresses are entered into the VXLAN device forwarding database.
-    limituint320Specifies the maximum number of FDB entries. A value of zero means that the kernel will store unlimited entries.
-    localstringIf given, specifies the source IP address to use in outgoing packets.
-    namestringvxlanThe 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".
-    parentstringIf given, specifies the parent interface name or parent connection UUID.
-    proxybooleanFALSESpecifies whether ARP proxy is turned on.
-    remotestringSpecifies the unicast destination IP address to use in outgoing packets when the destination link layer address is not known in the VXLAN device forwarding database, or the multicast IP address to join.
-    rscbooleanFALSESpecifies whether route short circuit is turned on.
-    source-port-maxuint320Specifies the maximum UDP source port to communicate to the remote VXLAN tunnel endpoint.
-    source-port-minuint320Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.
-    tosuint320Specifies the TOS value to use in outgoing packets.
-    ttluint320Specifies the time-to-live value to use in outgoing packets.
-  
    
-  wimax settingKey NameValue TypeDefault ValueValue Description
-    mac-addressbyte arrayIf specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1
-    namestringwimaxThe 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".
-    network-namestringNetwork Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1
-  
    
-  802-3-ethernet settingKey NameValue TypeDefault ValueValue Description
-    assigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
-    auto-negotiatebooleanFALSEIf TRUE, enforce auto-negotiation of port speed and duplex mode.  If FALSE, "speed" and "duplex" properties should be both set or link configuration will be skipped.
-    cloned-mac-addressbyte arrayThis D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random". For libnm and nmcli, this field is called "cloned-mac-address".
-    duplexstringCan be specified only when "auto-negotiate" is "off". In that case, statically configures the device to use that specified duplex mode, either "half" or "full". Must be set together with the "speed" property if specified. Before specifying a duplex mode be sure your device supports it.
-    generate-mac-address-maskstringWith "cloned-mac-address" setting "random" or "stable", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting "FE:FF:FF:00:00:00" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the "random" or "stable" algorithm. If the value contains one additional MAC address after the mask, this address is used instead of the current MAC address to fill the bits that shall not be randomized. For example, a value of "FE:FF:FF:00:00:00 68:F7:28:00:00:00" will set the OUI of the MAC address to 68:F7:28, while the lower bits are randomized. A value of "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled globally-administered, burned-in MAC address. If the value contains more then one additional MAC addresses, one of them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" will create a fully scrambled MAC address, randomly locally or globally administered.
-    mac-addressbyte arrayIf specified, this connection will only apply to the Ethernet device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
-    mac-address-blacklistarray of string[]If specified, this connection will never apply to the Ethernet device whose permanent MAC address matches an address in the list.  Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).
-    mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
-    namestring802-3-ethernetThe 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".
-    portstringSpecific port type to use if multiple the device supports multiple attachment methods.  One of "tp" (Twisted Pair), "aui" (Attachment Unit Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface. If the device supports only one port type, this setting is ignored.
-    s390-nettypestrings390 network device type; one of "qeth", "lcs", or "ctc", representing the different types of virtual network devices available on s390 systems.
-    s390-optionsdict of string to string{}Dictionary of key/value pairs of s390-specific device options.  Both keys and values must be strings.  Allowed keys include "portno", "layer2", "portname", "protocol", among others.  Key names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
-    s390-subchannelsarray of string[]Identifies specific subchannels that this network device uses for communication with z/VM or s390 host.  Like the "mac-address" property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels.  The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.
-    speeduint320Can be set to a value grater than zero only when "auto-negotiate" is "off". In that case, statically configures the device to use that specified speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the "duplex" property when non-zero. Before specifying a speed value be sure your device supports it.
-    wake-on-lanuint321The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).
-    wake-on-lan-passwordstringIf specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address.  If NULL, no password will be required.
-  
    
-  802-11-wireless settingKey NameValue TypeDefault ValueValue Description
-    assigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
-    bandstring802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or "bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to the specific band, i.e. if "a" is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.
-    bssidbyte arrayIf specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.
-    channeluint320Wireless channel to use for the Wi-Fi connection.  The device will only join (or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the "band" property to be set.
-    cloned-mac-addressbyte arrayThis D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random". For libnm and nmcli, this field is called "cloned-mac-address".
-    generate-mac-address-maskstringWith "cloned-mac-address" setting "random" or "stable", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting "FE:FF:FF:00:00:00" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the "random" or "stable" algorithm. If the value contains one additional MAC address after the mask, this address is used instead of the current MAC address to fill the bits that shall not be randomized. For example, a value of "FE:FF:FF:00:00:00 68:F7:28:00:00:00" will set the OUI of the MAC address to 68:F7:28, while the lower bits are randomized. A value of "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled globally-administered, burned-in MAC address. If the value contains more then one additional MAC addresses, one of them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" will create a fully scrambled MAC address, randomly locally or globally administered.
-    hiddenbooleanFALSEIf TRUE, indicates this network is a non-broadcasting network that hides its SSID.  In this case various workarounds may take place, such as probe-scanning the SSID for more reliable network discovery.  However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution.
-    mac-addressbyte arrayIf specified, this connection will only apply to the Wi-Fi device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
-    mac-address-blacklistarray of string[]A list of permanent MAC addresses of Wi-Fi devices to which this connection should never apply.  Each MAC address should be given in the standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").
-    mac-address-randomizationuint320One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the user has set a global default to randomize and the supplicant supports randomization),  NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (never randomize the MAC address), or NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (always randomize the MAC address). This property is deprecated for 'cloned-mac-address'. Deprecated: 1
-    modestringWi-Fi network mode; one of "infrastructure", "adhoc" or "ap".  If blank, infrastructure is assumed.
-    mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
-    namestring802-11-wirelessThe 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".
-    powersaveuint320One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the globally configured value). All other values are reserved.
-    rateuint320If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.
-    securityNoneThis property is deprecated, but can be set to the value '802-11-wireless-security' when a wireless security setting is also present in the connection dictionary, for compatibility with very old NetworkManager daemons.
-    seen-bssidsarray of string[]A list of BSSIDs (each BSSID formatted as a MAC address like "00:11:22:33:44:55") that have been detected as part of the Wi-Fi network.  NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BSSID list of NetworkManager. The changes you make to this property will not be preserved.
-    ssidbyte arraySSID of the Wi-Fi network. Must be specified.
-    tx-poweruint320If non-zero, directs the device to use the specified transmit power. Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.
-  
    
-  802-11-wireless-security settingKey NameValue TypeDefault ValueValue Description
-    auth-algstringWhen WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the 802.11 authentication algorithm required by the AP here.  One of "open" for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the "leap-username" and "leap-password" properties must be specified.
-    grouparray of string[]A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of "wep40", "wep104", "tkip", or "ccmp".
-    key-mgmtstringKey management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.
-    leap-passwordstringThe login password for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").
-    leap-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "leap-password" property.
-    leap-usernamestringThe login username for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").
-    namestring802-11-wireless-securityThe 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".
-    pairwisearray of string[]A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of "tkip" or "ccmp".
-    protoarray of string[]List of strings specifying the allowed WPA protocol versions to use. Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.
-    pskstringPre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi network.
-    psk-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "psk" property.
-    wep-key-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "wep-key0", "wep-key1", "wep-key2", and "wep-key3" properties.
-    wep-key-typeNMWepKeyType (uint32)Controls the interpretation of WEP keys.  Allowed values are NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-character hexadecimal string, or a 5- or 13-character ASCII password; or NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as a string and will be hashed using the de-facto MD5 method to derive the actual WEP key.
-    wep-key0stringIndex 0 WEP key.  This is the WEP key used in most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
-    wep-key1stringIndex 1 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
-    wep-key2stringIndex 2 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
-    wep-key3stringIndex 3 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
-    wep-tx-keyidxuint320When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.
-  
    
-
    
+
+Configuration Settings
+  connectionGeneral Connection Profile Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    autoconnectautoconnectbooleanTRUEWhether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.
+    autoconnect-priorityautoconnect-priorityint320The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.
+    autoconnect-retriesautoconnect-retriesint32-1The number of times a connection should be tried when autoctivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden).
+    autoconnect-slavesautoconnect-slavesNMSettingConnectionAutoconnectSlaves (int32)Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.
+    gateway-ping-timeoutgateway-ping-timeoutuint320If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.
+    ididstringA human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".
+    interface-nameinterface-namestringThe name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.
+    lldplldpint32-1Whether LLDP is enabled for the connection.
+    mastermasterstringInterface name of the master device or UUID of the master connection.
+    meteredmeteredNMMetered (int32)Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.
+    namenamestringconnectionThe 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".
+    permissionspermissionsarray of string[]An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this list. Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". At this time only the "user" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ":" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.
+    read-onlyread-onlybooleanFALSEFALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.
+    secondariessecondariesarray of string[]List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.
+    slave-typeslave-typestringSetting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
+    stable-idstable-idstringToken to generate stable IDs for the connection. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note that also the interface name of the activating connection and a per-host secret key is included into the address generation so that the same stable-id on different hosts/devices yields different addresses. If the value is unset, an ID unique for the connection is used. Specifing a stable-id allows multiple connections to generate the same addresses. Another use is to generate IDs at runtime via dynamic substitutions. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are "${CONNECTION}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-boot, or every time. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as "$$". For example, set it to "${CONNECTION}/${BOOT}" to create a unique id for this connection that changes with every reboot. Note that two connections only use the same effective id if their stable-id is also identical before performing dynamic substitutions.
+    timestamptimestampuint640The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).
+    typetypestringBase type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).
+    uuiduuidstringA universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").
+    zonezonestringThe trust level of a the connection.  Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.
+  
    
+  802-1xAIEEE 802.1x Authentication Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    altsubject-matchesaltsubject-matchesarray of string[]List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed.
+    anonymous-identityanonymous-identitystringAnonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.
+    auth-timeoutauth-timeoutint320A timeout for the authentication. Zero means the global default; if the global default is not set, the authentication timeout is 25 seconds.
+    ca-certca-certbyte arrayContains the CA certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
+    ca-cert-passwordca-cert-passwordstringThe password used to access the CA certificate stored in "ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.
+    ca-cert-password-flagsca-cert-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "ca-cert-password" property.
+    ca-pathca-pathstringUTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the "ca-cert" property.
+    client-certclient-certbyte arrayContains the client certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte.
+    client-cert-passwordclient-cert-passwordstringThe password used to access the client certificate stored in "client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.
+    client-cert-password-flagsclient-cert-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "client-cert-password" property.
+    domain-suffix-matchdomain-suffix-matchstringConstraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
+    eapeaparray of string[]The allowed EAP method to be used when authenticating to the network with 802.1x.  Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd", and "fast".  Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.
+    identityidentitystringIdentity string for EAP authentication methods.  Often the user's user or login name.
+    namenamestring802-1xThe 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".
+    pac-filepac-filestringUTF-8 encoded file path containing PAC for EAP-FAST.
+    passwordpasswordstringUTF-8 encoded password used for EAP authentication methods. If both the "password" property and the "password-raw" property are specified, "password" is preferred.
+    password-flagspassword-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property.
+    password-rawpassword-rawbyte arrayPassword used for EAP authentication methods, given as a byte array to allow passwords in other encodings than UTF-8 to be used. If both the "password" property and the "password-raw" property are specified, "password" is preferred.
+    password-raw-flagspassword-raw-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password-raw" property.
+    phase1-auth-flagsphase1-auth-flagsuint320Specifies authentication flags to use in "phase 1" outer authentication using NMSetting8021xAuthFlags options. The invidual TLS versions can be explicitly disabled. If a certain TLS disable flag is not set, it is up to the supplicant to allow or forbid it. The TLS options map to tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more details.
+    phase1-fast-provisioningphase1-fast-provisioningstringEnables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the "eap" property. Recognized values are "0" (disabled), "1" (allow unauthenticated provisioning), "2" (allow authenticated provisioning), and "3" (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.
+    phase1-peaplabelphase1-peaplabelstringForces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to "1" to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.
+    phase1-peapverphase1-peapverstringForces which PEAP version is used when PEAP is set as the EAP method in the "eap" property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to "0" or "1" to force that specific PEAP version.
+    phase2-altsubject-matchesphase2-altsubject-matchesarray of string[]List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner "phase 2" authentication. If the list is empty, no verification of the server certificate's altSubjectName is performed.
+    phase2-authphase2-authstringSpecifies the allowed "phase 2" inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property.  Recognized non-EAP "phase 2" methods are "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
+    phase2-autheapphase2-autheapstringSpecifies the allowed "phase 2" inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property.  Recognized EAP-based "phase 2" methods are "md5", "mschapv2", "otp", "gtc", and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
+    phase2-ca-certphase2-ca-certbyte arrayContains the "phase 2" CA certificate if used by the EAP method specified in the "phase2-auth" or "phase2-autheap" properties. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
+    phase2-ca-cert-passwordphase2-ca-cert-passwordstringThe password used to access the "phase2" CA certificate stored in "phase2-ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.
+    phase2-ca-cert-password-flagsphase2-ca-cert-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "phase2-ca-cert-password" property.
+    phase2-ca-pathphase2-ca-pathstringUTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the "phase2-ca-cert" property.
+    phase2-client-certphase2-client-certbyte arrayContains the "phase 2" client certificate if used by the EAP method specified in the "phase2-auth" or "phase2-autheap" properties. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
+    phase2-client-cert-passwordphase2-client-cert-passwordstringThe password used to access the "phase2" client certificate stored in "phase2-client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.
+    phase2-client-cert-password-flagsphase2-client-cert-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "phase2-client-cert-password" property.
+    phase2-domain-suffix-matchphase2-domain-suffix-matchstringConstraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server during the inner "phase 2" authentication.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
+    phase2-private-keyphase2-private-keybyte arrayContains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate.
+    phase2-private-key-passwordphase2-private-key-passwordstringThe password used to decrypt the "phase 2" private key specified in the "phase2-private-key" property when the private key either uses the path scheme, or is a PKCS#12 format key.
+    phase2-private-key-password-flagsphase2-private-key-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "phase2-private-key-password" property.
+    phase2-subject-matchphase2-subject-matchstringSubstring to be matched against the subject of the certificate presented by the authentication server during the inner "phase 2" authentication. When unset, no verification of the authentication server certificate's subject is performed.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:phase2-domain-suffix-match.
+    pinpinstringPIN used for EAP authentication methods.
+    pin-flagspin-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "pin" property.
+    private-keyprivate-keybyte arrayContains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users.  Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data.
+    private-key-passwordprivate-key-passwordstringThe password used to decrypt the private key specified in the "private-key" property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.
+    private-key-password-flagsprivate-key-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "private-key-password" property.
+    subject-matchsubject-matchstringSubstring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match.
+    system-ca-certssystem-ca-certsbooleanFALSEWhen TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides "ca-cert" and "phase2-ca-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).
+  
    
+  adslADSL Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    encapsulationencapsulationstringEncapsulation of ADSL connection.  Can be "vcmux" or "llc".
+    namenamestringadslThe 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".
+    passwordpasswordstringPassword used to authenticate with the ADSL service.
+    password-flagspassword-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property.
+    protocolprotocolstringADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".
+    usernameusernamestringUsername used to authenticate with the ADSL service.
+    vcivciuint320VCI of ADSL connection
+    vpivpiuint320VPI of ADSL connection
+  
    
+  bluetoothBluetooth Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    bdaddrbdaddrbyte arrayThe Bluetooth address of the device.
+    namenamestringbluetoothThe 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".
+    typetypestringEither "dun" for Dial-Up Networking connections or "panu" for Personal Area Networking connections to devices supporting the NAP profile.
+  
    
+  bondBonding Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    interface-nameinterface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the bond's interface name.
+    namenamestringbondThe 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".
+    optionsoptionsdict of string to string{'mode': 'balance-rr'}Dictionary of key/value pairs of bonding options.  Both keys and values must be strings. Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
+  
    
+  bridgeBridging Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    ageing-timeageing-timeuint32300The Ethernet MAC address aging time, in seconds.
+    forward-delayforward-delayuint3215The Spanning Tree Protocol (STP) forwarding delay, in seconds.
+    hello-timehello-timeuint322The Spanning Tree Protocol (STP) hello time, in seconds.
+    interface-nameinterface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the bridge's interface name.
+    mac-addressmac-addressbyte arrayIf specified, the MAC address of bridge. When creating a new bridge, this MAC address will be set. When matching an existing (outside NetworkManager created) bridge, this MAC address must match.
+    max-agemax-ageuint3220The Spanning Tree Protocol (STP) maximum message age, in seconds.
+    multicast-snoopingmulticast-snoopingbooleanTRUEControls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.
+    namenamestringbridgeThe 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".
+    prioritypriorityuint3232768Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are "better"; the lowest priority bridge will be elected the root bridge.
+    stpstpbooleanTRUEControls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+  
    
+  bridge-portBridge Port Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    hairpin-modehairpin-modebooleanFALSEEnables or disabled "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on.
+    namenamestringbridge-portThe 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".
+    path-costpath-costuint32100The Spanning Tree Protocol (STP) port cost for destinations via this port.
+    prioritypriorityuint3232The Spanning Tree Protocol (STP) priority of this bridge port.
+  
    
+  cdmaCDMA-based Mobile Broadband Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    mtumtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
+    namenamestringcdmaThe 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".
+    numbernumberstringThe number to dial to establish the connection to the CDMA-based mobile broadband network, if any.  If not specified, the default number (#777) is used when required.
+    passwordpasswordstringThe password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.
+    password-flagspassword-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property.
+    usernameusernamestringThe username used to authenticate with the network, if required.  Many providers do not require a username, or accept any username.  But if a username is required, it is specified here.
+  
    
+  dcbData Center Bridging Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    app-fcoe-flagsapp-fcoe-flagsNMSettingDcbFlags (uint32)Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
+    app-fcoe-modeapp-fcoe-modestring"fabric"The FCoE controller mode; either "fabric" (default) or "vn2vn".
+    app-fcoe-priorityapp-fcoe-priorityint32-1The highest User Priority (0 - 7) which FCoE frames should use, or -1 for default priority.  Only used when the "app-fcoe-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
+    app-fip-flagsapp-fip-flagsNMSettingDcbFlags (uint32)Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
+    app-fip-priorityapp-fip-priorityint32-1The highest User Priority (0 - 7) which FIP frames should use, or -1 for default priority.  Only used when the "app-fip-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
+    app-iscsi-flagsapp-iscsi-flagsNMSettingDcbFlags (uint32)Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
+    app-iscsi-priorityapp-iscsi-priorityint32-1The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for default priority. Only used when the "app-iscsi-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
+    namenamestringdcbThe 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".
+    priority-bandwidthpriority-bandwidtharray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the percentage of bandwidth of the priority's assigned group that the priority may use.  The sum of all percentages for priorities which belong to the same group must total 100 percent.
+    priority-flow-controlpriority-flow-controlarray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 boolean values, where the array index corresponds to the User Priority (0 - 7) and the value indicates whether or not the corresponding priority should transmit priority pause.
+    priority-flow-control-flagspriority-flow-control-flagsNMSettingDcbFlags (uint32)Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
+    priority-group-bandwidthpriority-group-bandwidtharray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 uint values, where the array index corresponds to the Priority Group ID (0 - 7) and the value indicates the percentage of link bandwidth allocated to that group.  Allowed values are 0 - 100, and the sum of all values must total 100 percent.
+    priority-group-flagspriority-group-flagsNMSettingDcbFlags (uint32)Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
+    priority-group-idpriority-group-idarray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed Priority Group ID values are 0 - 7 or 15 for the unrestricted group.
+    priority-strict-bandwidthpriority-strict-bandwidtharray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 boolean values, where the array index corresponds to the User Priority (0 - 7) and the value indicates whether or not the priority may use all of the bandwidth allocated to its assigned group.
+    priority-traffic-classpriority-traffic-classarray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which the priority is mapped.
+  
    
+  dummyDummy Link Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    namenamestringdummyThe 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".
+  
    
+  genericGeneric Link Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    namenamestringgenericThe 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".
+  
    
+  gsmGSM-based Mobile Broadband Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    apnapnstringThe GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan. The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.
+    device-iddevice-idstringThe device unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will only apply to the specified device.
+    home-onlyhome-onlybooleanFALSEWhen TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.
+    mtumtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
+    namenamestringgsmThe 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".
+    network-idnetwork-idstringThe Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.
+    numbernumberstringNumber to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.
+    passwordpasswordstringThe password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.
+    password-flagspassword-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property.
+    pinpinstringIf the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.
+    pin-flagspin-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "pin" property.
+    sim-idsim-idstringThe SIM card unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will apply to any device also allowed by "device-id" which contains a SIM card matching the given identifier.
+    sim-operator-idsim-operator-idstringA MCC/MNC string like "310260" or "21601" identifying the specific mobile network operator which this connection applies to.  If given, the connection will apply to any device also allowed by "device-id" and "sim-id" which contains a SIM card provisioined by the given operator.
+    usernameusernamestringThe username used to authenticate with the network, if required.  Many providers do not require a username, or accept any username.  But if a username is required, it is specified here.
+  
    
+  infinibandInfiniband Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    mac-addressmac-addressbyte arrayIf specified, this connection will only apply to the IPoIB device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
+    mtumtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
+    namenamestringinfinibandThe 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".
+    p-keyp-keyint32-1The InfiniBand P_Key to use for this device. A value of -1 means to use the default P_Key (aka "the P_Key at index 0").  Otherwise it is a 16-bit unsigned integer, whose high bit is set if it is a "full membership" P_Key.
+    parentparentstringThe interface name of the parent device of this device. Normally NULL, but if the "p_key" property is set, then you must specify the base device by setting either this property or "mac-address".
+    transport-modetransport-modestringThe IP-over-InfiniBand transport mode. Either "datagram" or "connected".
+  
    
+  ipv4IPv4 Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    address-dataaddress-dataarray of vardictArray of IPv4 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
+    addressesaddressesarray of array of uint32[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.
+    dad-timeoutdad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds.
+    dhcp-client-iddhcp-client-idstringA string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options.
+    dhcp-fqdndhcp-fqdnstringIf the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.
+    dhcp-hostnamedhcp-hostnamestringIf the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
+    dhcp-send-hostnamedhcp-send-hostnamebooleanTRUEIf TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.
+    dhcp-timeoutdhcp-timeoutint320A timeout for a DHCP transaction in seconds.
+    dnsdnsarray of uint32[]Array of IP addresses of DNS servers (as network-byte-order integers)
+    dns-optionsdns-optionsarray of string[]Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
+    dns-prioritydns-priorityint320Intra-connection DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. For that, just specify the DNS servers in the desired order. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used.
+    dns-searchdns-searcharray of string[]Array of DNS search domains.
+    gatewaygatewaystringThe gateway associated with this configuration. This is only meaningful if "addresses" is also set.
+    ignore-auto-dnsignore-auto-dnsbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.
+    ignore-auto-routesignore-auto-routesbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured routes are ignored and only routes specified in the "routes" property, if any, are used.
+    may-failmay-failbooleanTRUEIf TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.
+    methodmethodstringIP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
+    namenamestringipv4The 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".
+    never-defaultnever-defaultbooleanFALSEIf TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.
+    route-dataroute-dataarray of vardictArray of IPv4 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'gateway' entry, containing the gateway IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
+    route-metricroute-metricint64-1The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is choosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.
+    routesroutesarray of array of uint32[]Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. If the metric is 0, NM will choose an appropriate default metric for the device. (There is no way to explicitly specify an actual metric of 0 with this property.)
+  
    
+  ipv6IPv6 Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    addr-gen-modeaddr-gen-modeint321Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection's stable-id and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.
+    address-dataaddress-dataarray of vardictArray of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
+    addressesaddressesarray of legacy IPv6 address struct (a(ayuay))[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv6 address structures.  Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.
+    dad-timeoutdad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds.
+    dhcp-hostnamedhcp-hostnamestringIf the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
+    dhcp-send-hostnamedhcp-send-hostnamebooleanTRUEIf TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.
+    dhcp-timeoutdhcp-timeoutint320A timeout for a DHCP transaction in seconds.
+    dnsdnsarray of byte array[]Array of IP addresses of DNS servers (in network byte order)
+    dns-optionsdns-optionsarray of string[]Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
+    dns-prioritydns-priorityint320Intra-connection DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. For that, just specify the DNS servers in the desired order. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used.
+    dns-searchdns-searcharray of string[]Array of DNS search domains.
+    gatewaygatewaystringThe gateway associated with this configuration. This is only meaningful if "addresses" is also set.
+    ignore-auto-dnsignore-auto-dnsbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.
+    ignore-auto-routesignore-auto-routesbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured routes are ignored and only routes specified in the "routes" property, if any, are used.
+    ip6-privacyip6-privacyNMSettingIP6ConfigPrivacy (int32)Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to "-1" (unknown) means fallback to global configuration "ipv6.ip6-privacy". If also global configuration is unspecified or set to "-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr". Note that this setting is distinct from the Stable Privacy addresses that can be enabled with the "addr-gen-mode" property's "stable-privacy" setting as another way of avoiding host tracking with IPv6 addresses.
+    may-failmay-failbooleanTRUEIf TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.
+    methodmethodstringIP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
+    namenamestringipv6The 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".
+    never-defaultnever-defaultbooleanFALSEIf TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.
+    route-dataroute-dataarray of vardictArray of IPv6 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'next-hop' entry, containing the next hop IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
+    route-metricroute-metricint64-1The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is choosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.
+    routesroutesarray of legacy IPv6 route struct (a(ayuayu))[]Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv6 route structures.  Each IPv6 route structure is composed of an IPv6 address, a prefix length (1 - 128), an IPv6 next hop address (which may be zeroed out if there is no next hop), and a metric. If the metric is 0, NM will choose an appropriate default metric for the device.
+    tokentokenstringConfigure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.
+  
    
+  ip-tunnelIP Tunneling Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    encapsulation-limitencapsulation-limituint320How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.
+    flow-labelflow-labeluint320The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.
+    input-keyinput-keystringThe key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
+    locallocalstringThe local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.
+    modemodeuint320The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).
+    mtumtuuint320None
+    namenamestringip-tunnelThe 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".
+    output-keyoutput-keystringThe key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
+    parentparentstringIf given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.
+    path-mtu-discoverypath-mtu-discoverybooleanTRUEWhether to enable Path MTU Discovery on this tunnel.
+    remoteremotestringThe remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.
+    tostosuint320The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.
+    ttlttluint320The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.
+  
    
+  macsecMACSec Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    encryptencryptbooleanTRUEWhether the transmitted traffic must be encrypted.
+    mka-cakmka-cakstringThe pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.
+    mka-cak-flagsmka-cak-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "mka-cak" property.
+    mka-cknmka-cknstringThe pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.
+    modemodeint320Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.
+    namenamestringmacsecThe 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".
+    parentparentstringIf given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
+    portportint321The port component of the SCI (Secure Channel Identifier), between 1 and 65534.
+    validationvalidationint322Specifies the validation mode for incoming frames.
+  
    
+  macvlanMAC VLAN Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    modemodeuint320The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.
+    namenamestringmacvlanThe 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".
+    parentparentstringIf given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
+    promiscuouspromiscuousbooleanTRUEWhether the interface should be put in promiscuous mode.
+    taptapbooleanFALSEWhether the interface should be a MACVTAP.
+  
    
+  802-11-olpc-meshOLPC Wireless Mesh Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    channelchanneluint320Channel on which the mesh network to join is located.
+    dhcp-anycast-addressdhcp-anycast-addressbyte arrayAnycast DHCP MAC address used when requesting an IP address via DHCP. The specific anycast address used determines which DHCP server class answers the request.
+    namenamestring802-11-olpc-meshThe 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".
+    ssidssidbyte arraySSID of the mesh network to join.
+  
    
+  pppPoint-to-Point Protocol Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    baudbauduint320If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.
+    crtsctscrtsctsbooleanFALSEIf TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.
+    lcp-echo-failurelcp-echo-failureuint320If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The "lcp-echo-interval" property must also be set to a non-zero value if this property is used.
+    lcp-echo-intervallcp-echo-intervaluint320If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.
+    mppe-statefulmppe-statefulbooleanFALSEIf TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.
+    mrumruuint320If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.
+    mtumtuuint320If non-zero, instruct pppd to send packets no larger than the specified size.
+    namenamestringpppThe 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".
+    no-vj-compno-vj-compbooleanFALSEIf TRUE, Van Jacobsen TCP header compression will not be requested.
+    noauthnoauthbooleanTRUEIf TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.
+    nobsdcompnobsdcompbooleanFALSEIf TRUE, BSD compression will not be requested.
+    nodeflatenodeflatebooleanFALSEIf TRUE, "deflate" compression will not be requested.
+    refuse-chaprefuse-chapbooleanFALSEIf TRUE, the CHAP authentication method will not be used.
+    refuse-eaprefuse-eapbooleanFALSEIf TRUE, the EAP authentication method will not be used.
+    refuse-mschaprefuse-mschapbooleanFALSEIf TRUE, the MSCHAP authentication method will not be used.
+    refuse-mschapv2refuse-mschapv2booleanFALSEIf TRUE, the MSCHAPv2 authentication method will not be used.
+    refuse-paprefuse-papbooleanFALSEIf TRUE, the PAP authentication method will not be used.
+    require-mpperequire-mppebooleanFALSEIf TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.
+    require-mppe-128require-mppe-128booleanFALSEIf TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the "require-mppe" property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.
+  
    
+  pppoePPP-over-Ethernet Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    namenamestringpppoeThe 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".
+    passwordpasswordstringPassword used to authenticate with the PPPoE service.
+    password-flagspassword-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property.
+    serviceservicestringIf specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified service.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.
+    usernameusernamestringUsername used to authenticate with the PPPoE service.
+  
    
+  proxyWWW Proxy Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    browser-onlybrowser-onlybooleanFALSEWhether the proxy configuration is for browser only.
+    methodmethodint320Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)
+    namenamestringproxyThe 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".
+    pac-scriptpac-scriptstringPAC script for the connection.
+    pac-urlpac-urlstringPAC URL for obtaining PAC file.
+  
    
+  serialSerial Link Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    baudbauduint3257600Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.
+    bitsbitsuint328Byte-width of the serial communication. The 8 in "8n1" for example.
+    namenamestringserialThe 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".
+    parityparitybyteThe connection parity: 69 (ASCII 'E') for even parity, 111 (ASCII 'o') for odd, 110 (ASCII 'n') for none.
+    send-delaysend-delayuint640Time to delay between each byte sent to the modem, in microseconds.
+    stopbitsstopbitsuint321Number of stop bits for communication on the serial port.  Either 1 or 2. The 1 in "8n1" for example.
+  
    
+  teamTeaming Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    configconfigstringThe JSON configuration for the team network interface.  The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used.  See man teamd.conf for the format details.
+    interface-nameinterface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the team's interface name.
+    namenamestringteamThe 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".
+  
    
+  team-portTeam Port Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    configconfigstringThe JSON configuration for the team port. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used. See man teamd.conf for the format details.
+    namenamestringteam-portThe 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".
+  
    
+  tunTunnel Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    groupgroupstringThe group ID which will own the device. If set to NULL everyone will be able to use the device.
+    modemodeuint321The 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.
+    multi-queuemulti-queuebooleanFALSEIf 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.
+    namenamestringtunThe 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".
+    ownerownerstringThe user ID which will own the device. If set to NULL everyone will be able to use the device.
+    pipibooleanFALSEIf TRUE the interface will prepend a 4 byte header describing the physical interface to the packets.
+    vnet-hdrvnet-hdrbooleanFALSEIf TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network header.
+  
    
+  userGeneral User Profile Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    datadatadict of string to string{}A dictionary of key/value pairs with user data. This data is ignored by NetworkManager and can be used at the users discretion. The keys only support a strict ascii format, but the values can be arbitrary UTF8 strings up to a certain length.
+    namenamestringuserThe 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".
+  
    
+  vlanVLAN Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    egress-priority-mapegress-priority-maparray of string[]For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities.  The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".
+    flagsflagsNMVlanFlags (uint32)One or more flags which control the behavior and features of the VLAN interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of output packet headers), NM_VLAN_FLAG_GVRP (0x2) (use of the GVRP protocol), and NM_VLAN_FLAG_LOOSE_BINDING (0x4) (loose binding of the interface to its master device's operating state). NM_VLAN_FLAG_MVRP (0x8) (use of the MVRP protocol). The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.
+    ididuint320The VLAN identifier that the interface created by this connection should be assigned. The valid range is from 0 to 4094, without the reserved id 4095.
+    ingress-priority-mapingress-priority-maparray of string[]For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities.  The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".
+    interface-nameinterface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the vlan's interface name.
+    namenamestringvlanThe 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".
+    parentparentstringIf given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
+  
    
+  vpnVPN Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    datadatadict of string to string{}Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.
+    namenamestringvpnThe 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".
+    persistentpersistentbooleanFALSEIf the VPN service supports persistence, and this property is TRUE, the VPN will attempt to stay connected across link changes and outages, until explicitly disconnected.
+    secretssecretsdict of string to string{}Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.
+    service-typeservice-typestringD-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.
+    timeouttimeoutuint320Timeout for the VPN service to establish the connection. Some services may take quite a long time to connect. Value of 0 means a default timeout, which is 60 seconds (unless overriden by vpn.timeout in configuration file). Values greater than zero mean timeout in seconds.
+    user-nameuser-namestringIf the VPN connection requires a user name for authentication, that name should be provided here.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.
+  
    
+  vxlanVXLAN Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    ageingageinguint32300Specifies the lifetime in seconds of FDB entries learnt by the kernel.
+    destination-portdestination-portuint328472Specifies the UDP destination port to communicate to the remote VXLAN tunnel endpoint.
+    ididuint320Specifies the VXLAN Network Identifer (or VXLAN Segment Identifier) to use.
+    l2-missl2-missbooleanFALSESpecifies whether netlink LL ADDR miss notifications are generated.
+    l3-missl3-missbooleanFALSESpecifies whether netlink IP ADDR miss notifications are generated.
+    learninglearningbooleanTRUESpecifies whether unknown source link layer addresses and IP addresses are entered into the VXLAN device forwarding database.
+    limitlimituint320Specifies the maximum number of FDB entries. A value of zero means that the kernel will store unlimited entries.
+    locallocalstringIf given, specifies the source IP address to use in outgoing packets.
+    namenamestringvxlanThe 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".
+    parentparentstringIf given, specifies the parent interface name or parent connection UUID.
+    proxyproxybooleanFALSESpecifies whether ARP proxy is turned on.
+    remoteremotestringSpecifies the unicast destination IP address to use in outgoing packets when the destination link layer address is not known in the VXLAN device forwarding database, or the multicast IP address to join.
+    rscrscbooleanFALSESpecifies whether route short circuit is turned on.
+    source-port-maxsource-port-maxuint320Specifies the maximum UDP source port to communicate to the remote VXLAN tunnel endpoint.
+    source-port-minsource-port-minuint320Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.
+    tostosuint320Specifies the TOS value to use in outgoing packets.
+    ttlttluint320Specifies the time-to-live value to use in outgoing packets.
+  
    
+  wimaxWiMax Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    mac-addressmac-addressbyte arrayIf specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1
+    namenamestringwimaxThe 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".
+    network-namenetwork-namestringNetwork Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1
+  
    
+  802-3-ethernetWired Ethernet Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    assigned-mac-addressassigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
+    auto-negotiateauto-negotiatebooleanFALSEIf TRUE, enforce auto-negotiation of port speed and duplex mode.  If FALSE, "speed" and "duplex" properties should be both set or link configuration will be skipped.
+    cloned-mac-addresscloned-mac-addressbyte arrayThis D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random". For libnm and nmcli, this field is called "cloned-mac-address".
+    duplexduplexstringCan be specified only when "auto-negotiate" is "off". In that case, statically configures the device to use that specified duplex mode, either "half" or "full". Must be set together with the "speed" property if specified. Before specifying a duplex mode be sure your device supports it.
+    generate-mac-address-maskgenerate-mac-address-maskstringWith "cloned-mac-address" setting "random" or "stable", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting "FE:FF:FF:00:00:00" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the "random" or "stable" algorithm. If the value contains one additional MAC address after the mask, this address is used instead of the current MAC address to fill the bits that shall not be randomized. For example, a value of "FE:FF:FF:00:00:00 68:F7:28:00:00:00" will set the OUI of the MAC address to 68:F7:28, while the lower bits are randomized. A value of "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled globally-administered, burned-in MAC address. If the value contains more then one additional MAC addresses, one of them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" will create a fully scrambled MAC address, randomly locally or globally administered.
+    mac-addressmac-addressbyte arrayIf specified, this connection will only apply to the Ethernet device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
+    mac-address-blacklistmac-address-blacklistarray of string[]If specified, this connection will never apply to the Ethernet device whose permanent MAC address matches an address in the list.  Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).
+    mtumtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
+    namenamestring802-3-ethernetThe 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".
+    portportstringSpecific port type to use if multiple the device supports multiple attachment methods.  One of "tp" (Twisted Pair), "aui" (Attachment Unit Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface. If the device supports only one port type, this setting is ignored.
+    s390-nettypes390-nettypestrings390 network device type; one of "qeth", "lcs", or "ctc", representing the different types of virtual network devices available on s390 systems.
+    s390-optionss390-optionsdict of string to string{}Dictionary of key/value pairs of s390-specific device options.  Both keys and values must be strings.  Allowed keys include "portno", "layer2", "portname", "protocol", among others.  Key names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
+    s390-subchannelss390-subchannelsarray of string[]Identifies specific subchannels that this network device uses for communication with z/VM or s390 host.  Like the "mac-address" property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels.  The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.
+    speedspeeduint320Can be set to a value grater than zero only when "auto-negotiate" is "off". In that case, statically configures the device to use that specified speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the "duplex" property when non-zero. Before specifying a speed value be sure your device supports it.
+    wake-on-lanwake-on-lanuint321The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).
+    wake-on-lan-passwordwake-on-lan-passwordstringIf specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address.  If NULL, no password will be required.
+  
    
+  802-11-wirelessWi-Fi Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    assigned-mac-addressassigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
+    bandbandstring802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or "bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to the specific band, i.e. if "a" is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.
+    bssidbssidbyte arrayIf specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.
+    channelchanneluint320Wireless channel to use for the Wi-Fi connection.  The device will only join (or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the "band" property to be set.
+    cloned-mac-addresscloned-mac-addressbyte arrayThis D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random". For libnm and nmcli, this field is called "cloned-mac-address".
+    generate-mac-address-maskgenerate-mac-address-maskstringWith "cloned-mac-address" setting "random" or "stable", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting "FE:FF:FF:00:00:00" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the "random" or "stable" algorithm. If the value contains one additional MAC address after the mask, this address is used instead of the current MAC address to fill the bits that shall not be randomized. For example, a value of "FE:FF:FF:00:00:00 68:F7:28:00:00:00" will set the OUI of the MAC address to 68:F7:28, while the lower bits are randomized. A value of "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled globally-administered, burned-in MAC address. If the value contains more then one additional MAC addresses, one of them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" will create a fully scrambled MAC address, randomly locally or globally administered.
+    hiddenhiddenbooleanFALSEIf TRUE, indicates this network is a non-broadcasting network that hides its SSID.  In this case various workarounds may take place, such as probe-scanning the SSID for more reliable network discovery.  However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution.
+    mac-addressmac-addressbyte arrayIf specified, this connection will only apply to the Wi-Fi device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
+    mac-address-blacklistmac-address-blacklistarray of string[]A list of permanent MAC addresses of Wi-Fi devices to which this connection should never apply.  Each MAC address should be given in the standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").
+    mac-address-randomizationmac-address-randomizationuint320One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the user has set a global default to randomize and the supplicant supports randomization),  NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (never randomize the MAC address), or NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (always randomize the MAC address). This property is deprecated for 'cloned-mac-address'. Deprecated: 1
+    modemodestringWi-Fi network mode; one of "infrastructure", "adhoc" or "ap".  If blank, infrastructure is assumed.
+    mtumtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
+    namenamestring802-11-wirelessThe 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".
+    powersavepowersaveuint320One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the globally configured value). All other values are reserved.
+    raterateuint320If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.
+    securitysecurityNoneThis property is deprecated, but can be set to the value '802-11-wireless-security' when a wireless security setting is also present in the connection dictionary, for compatibility with very old NetworkManager daemons.
+    seen-bssidsseen-bssidsarray of string[]A list of BSSIDs (each BSSID formatted as a MAC address like "00:11:22:33:44:55") that have been detected as part of the Wi-Fi network.  NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BSSID list of NetworkManager. The changes you make to this property will not be preserved.
+    ssidssidbyte arraySSID of the Wi-Fi network. Must be specified.
+    tx-powertx-poweruint320If non-zero, directs the device to use the specified transmit power. Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.
+  
    
+  802-11-wireless-securityWi-Fi Security Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    auth-algauth-algstringWhen WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the 802.11 authentication algorithm required by the AP here.  One of "open" for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the "leap-username" and "leap-password" properties must be specified.
+    groupgrouparray of string[]A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of "wep40", "wep104", "tkip", or "ccmp".
+    key-mgmtkey-mgmtstringKey management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.
+    leap-passwordleap-passwordstringThe login password for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").
+    leap-password-flagsleap-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "leap-password" property.
+    leap-usernameleap-usernamestringThe login username for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").
+    namenamestring802-11-wireless-securityThe 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".
+    pairwisepairwisearray of string[]A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of "tkip" or "ccmp".
+    protoprotoarray of string[]List of strings specifying the allowed WPA protocol versions to use. Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.
+    pskpskstringPre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi network.
+    psk-flagspsk-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "psk" property.
+    wep-key-flagswep-key-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "wep-key0", "wep-key1", "wep-key2", and "wep-key3" properties.
+    wep-key-typewep-key-typeNMWepKeyType (uint32)Controls the interpretation of WEP keys.  Allowed values are NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-character hexadecimal string, or a 5- or 13-character ASCII password; or NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as a string and will be hashed using the de-facto MD5 method to derive the actual WEP key.
+    wep-key0wep-key0stringIndex 0 WEP key.  This is the WEP key used in most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
+    wep-key1wep-key1stringIndex 1 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
+    wep-key2wep-key2stringIndex 2 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
+    wep-key3wep-key3stringIndex 3 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.
+    wep-tx-keyidxwep-tx-keyidxuint320When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.
+  
    
+    
diff --git a/docs/api/settings-spec.xsl b/docs/api/settings-spec.xsl
index 04feb398..80f27309 100644
--- a/docs/api/settings-spec.xsl
+++ b/docs/api/settings-spec.xsl
@@ -9,37 +9,58 @@
       />
 
   
-    
    
+    
       Configuration Settings
       
-    
    
+    
       
 
   
-    
-      
-	<xsl:value-of select="@name"/> setting
-	
-	  
-	    
-              Key Name
-              Value Type
-              Default Value
-              Value Description
-	    
-	  
-	  
-	    
-	  
-	
-      
    
-        
+    
+      settings-
+      
+        
+        
+      
+      
+        
+            <xsl:attribute name="id">settings-<xsl:value-of select="@name"/>.properties</xsl:attribute>
+            Properties
+        
+        
+          
+            
+              
+                
+                  Key Name
+                  Value Type
+                  Default Value
+                  Value Description
+                
+              
+              
+                
+              
+            
+          
    
+            
+          
+        
       
 
   
     
     
-      
+      
+        
+        
+           settings-
+           
+             
+             
+           
+        
+      
       
       
        (see  for flag values)
diff --git a/docs/api/version.xml b/docs/api/version.xml
index fdd3be6d..27f9cd32 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.6.2
+1.8.0
diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in
index 54963c11..fb0d1367 100644
--- a/docs/libnm-glib/Makefile.in
+++ b/docs/libnm-glib/Makefile.in
@@ -183,6 +183,8 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ELOGIND_INHIBIT_CFLAGS = @ELOGIND_INHIBIT_CFLAGS@
+ELOGIND_INHIBIT_LIBS = @ELOGIND_INHIBIT_LIBS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GENHTML = @GENHTML@
@@ -204,8 +206,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -239,22 +239,25 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_LIBS = @LIBCURL_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
-LIBM = @LIBM@
 LIBNDP_CFLAGS = @LIBNDP_CFLAGS@
 LIBNDP_LIBS = @LIBNDP_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPSL_CFLAGS = @LIBPSL_CFLAGS@
+LIBPSL_LIBS = @LIBPSL_LIBS@
 LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
 LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@
 LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@
 LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@
 LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
+LIBUDEV_LIBS = @LIBUDEV_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOG_DRIVER = @LOG_DRIVER@
diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index 9d407a6b..37428763 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -43,7 +43,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_access_point_new ()
@@ -51,7 +51,7 @@
 
 
 
-NM80211ApFlags
+NM80211ApFlags
 
 
 nm_access_point_get_flags ()
@@ -59,7 +59,7 @@
 
 
 
-NM80211ApSecurityFlags
+NM80211ApSecurityFlags
 
 
 nm_access_point_get_wpa_flags ()
@@ -67,14 +67,14 @@
 
 
 
-NM80211ApSecurityFlags
+NM80211ApSecurityFlags
 
 
 nm_access_point_get_rsn_flags ()
 
 
 
-const GByteArray *
+const GByteArray *
 
 
 nm_access_point_get_ssid ()
@@ -89,7 +89,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_access_point_get_frequency ()
@@ -97,7 +97,7 @@
 
 
 
-NM80211Mode
+NM80211Mode
 
 
 nm_access_point_get_mode ()
@@ -105,7 +105,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_access_point_get_max_bitrate ()
@@ -113,7 +113,7 @@
 
 
 
-guint8
+guint8
 
 
 nm_access_point_get_strength ()
@@ -121,7 +121,7 @@
 
 
 
-gint
+gint
 
 
 nm_access_point_get_last_seen ()
@@ -129,7 +129,7 @@
 
 
 
-GSList *
+GSList *
 
 
 nm_access_point_filter_connections ()
@@ -137,7 +137,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_access_point_connection_valid ()
@@ -164,43 +164,43 @@
 
 
 
-gchar *
+gchar *
 bssid
 Read
 
 
-guint
+guint
 flags
 Read
 
 
-guint
+guint
 frequency
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
-gint
+gint
 last-seen
 Read
 
 
-guint
+guint
 max-bitrate
 Read
 
 
-guint
+guint
 mode
 Read
 
 
-guint
+guint
 rsn-flags
 Read
 
@@ -211,12 +211,12 @@
 Read
 
 
-guchar
+guchar
 strength
 Read
 
 
-guint
+guint
 wpa-flags
 Read
 
@@ -280,7 +280,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMAccessPoint
 
    
@@ -292,8 +292,8 @@
 
    Functions
    
 
    
 
    nm_access_point_new ()
    
-
    GObject *
-nm_access_point_new (DBusGConnection *connection,
+
    GObject *
+nm_access_point_new (DBusGConnection *connection,
                      const char *path);
    
 
    Creates a new NMAccessPoint.
    
 
    
@@ -307,7 +307,7 @@ nm_access_point_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -327,7 +327,7 @@ nm_access_point_new (
 
    nm_access_point_get_flags ()
    
-
    NM80211ApFlags
+
    NM80211ApFlags
 nm_access_point_get_flags (NMAccessPoint *ap);
    
 
    Gets the flags of the access point.
    
 
    
@@ -353,7 +353,7 @@ nm_access_point_get_flags (
 
    nm_access_point_get_wpa_flags ()
    
-
    NM80211ApSecurityFlags
+
    NM80211ApSecurityFlags
 nm_access_point_get_wpa_flags (NMAccessPoint *ap);
    
 
    Gets the WPA (version 1) flags of the access point.
    
 
    
@@ -379,7 +379,7 @@ nm_access_point_get_wpa_flags (
 
    
 
    nm_access_point_get_rsn_flags ()
    
-
    NM80211ApSecurityFlags
+
    NM80211ApSecurityFlags
 nm_access_point_get_rsn_flags (NMAccessPoint *ap);
    
 
    Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access
 point.
    
@@ -406,7 +406,7 @@ point.
    
 
    
 
    
 
    nm_access_point_get_ssid ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_access_point_get_ssid (NMAccessPoint *ap);
    
 
    Gets the SSID of the access point.
    
 
    
@@ -426,7 +426,7 @@ nm_access_point_get_ssid (
 
    Returns
    
-
     the GByteArray containing the SSID. This is the internal copy used by the
+
     the GByteArray containing the SSID. This is the internal copy used by the
 access point, and must not be modified.
    
 
    
 
    
@@ -460,7 +460,7 @@ not be modified or freed.
    
 
    
 
    
 
    nm_access_point_get_frequency ()
    
-
    guint32
+
    guint32
 nm_access_point_get_frequency (NMAccessPoint *ap);
    
 
    Gets the frequency of the access point.
    
 
    
@@ -486,7 +486,7 @@ nm_access_point_get_frequency (
 
    
 
    nm_access_point_get_mode ()
    
-
    NM80211Mode
+
    NM80211Mode
 nm_access_point_get_mode (NMAccessPoint *ap);
    
 
    Gets the mode of the access point.
    
 
    
@@ -512,7 +512,7 @@ nm_access_point_get_mode (
 
    nm_access_point_get_max_bitrate ()
    
-
    guint32
+
    guint32
 nm_access_point_get_max_bitrate (NMAccessPoint *ap);
    
 
    Gets the maximum bit rate of the access point in kbit/s.
    
 
    
@@ -538,7 +538,7 @@ nm_access_point_get_max_bitrate (
 
    
 
    nm_access_point_get_strength ()
    
-
    guint8
+
    guint8
 nm_access_point_get_strength (NMAccessPoint *ap);
    
 
    Gets the current signal strength of the access point.
    
 
    
@@ -564,7 +564,7 @@ nm_access_point_get_strength (
 
    nm_access_point_get_last_seen ()
    
-
    gint
+
    gint
 nm_access_point_get_last_seen (NMAccessPoint *ap);
    
 
    Returns the timestamp (in CLOCK_BOOTTIME seconds) for the last time the
 access point was found in scan results.  A value of -1 means the access
@@ -593,9 +593,9 @@ point has not been found in a scan.
    
 
    
 
    
 
    nm_access_point_filter_connections ()
    
-
    GSList *
+
    GSList *
 nm_access_point_filter_connections (NMAccessPoint *ap,
-                                    const GSList *connections);
    
+                                    const GSList *connections);
    
 
    Filters a given list of connections for a given NMAccessPoint object and
 return connections which may be activated with the access point.  Any
 returned connections will match the ap
@@ -622,7 +622,7 @@ filter that list with this function.
    
 
 
    connections
    
 
     a list of
-NMConnection objects to filter. 
    
+NMConnection objects to filter. 
    
 [element-type NMConnection]
 
 
@@ -631,20 +631,20 @@ filter that list with this function.
    
 
    
 
    Returns
    
 
     a
-list of NMConnection objects that could be activated with the given ap
+list of NMConnection objects that could be activated with the given ap
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
-be freed with g_slist_free() when it is no longer required. 
    
+be freed with g_slist_free() when it is no longer required. 
    
 
    [transfer container][element-type NMConnection]
    
 
    
 
    
 
    
 
    
 
    nm_access_point_connection_valid ()
    
-
    gboolean
+
    gboolean
 nm_access_point_connection_valid (NMAccessPoint *ap,
-                                  NMConnection *connection);
    
+                                  NMConnection *connection);
    
 
    Validates a given connection against a given Wi-Fi access point to ensure that
 the connection may be activated with that AP.  The connection must match the
 ap
@@ -667,7 +667,7 @@ against
    
 
 
 
    connection
    
-
    an NMConnection to validate against ap
+
    an NMConnection to validate against ap
 
    
  
 
@@ -676,8 +676,8 @@ against
    
 
    
 
    
 
    Returns
    
-
     TRUE if the connection may be activated with this Wi-Fi AP,
-FALSE if it cannot be.
    
+
     TRUE if the connection may be activated with this Wi-Fi AP,
+FALSE if it cannot be.
    
 
    
 
    
 
    
@@ -784,7 +784,7 @@ access point and must not be modified.
    
 
    Property Details
    
 
    
 
    The “bssid” property
    
-
      “bssid”                    gchar *
    
+
      “bssid”                    gchar *
    
 
    The BSSID of the access point.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -792,7 +792,7 @@ access point and must not be modified.
    
 
    
 
    
 
    The “flags” property
    
-
      “flags”                    guint
    
+
      “flags”                    guint
    
 
    The flags of the access point.
    
 
    Flags: Read
    
 
    Allowed values: <= 1
    
@@ -801,7 +801,7 @@ access point and must not be modified.
    
 
    
 
    
 
    The “frequency” property
    
-
      “frequency”                guint
    
+
      “frequency”                guint
    
 
    The frequency of the access point.
    
 
    Flags: Read
    
 
    Allowed values: <= 10000
    
@@ -810,7 +810,7 @@ access point and must not be modified.
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware address of the access point.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -818,7 +818,7 @@ access point and must not be modified.
    
 
    
 
    
 
    The “last-seen” property
    
-
      “last-seen”                gint
    
+
      “last-seen”                gint
    
 
    The timestamp (in CLOCK_BOOTTIME seconds) for the last time the
 access point was found in scan results.  A value of -1 means the
 access point has not been found in a scan.
    
@@ -830,7 +830,7 @@ access point has not been found in a scan.
    
 
    
 
    
 
    The “max-bitrate” property
    
-
      “max-bitrate”              guint
    
+
      “max-bitrate”              guint
    
 
    The maximum bit rate of the access point in kbit/s.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -838,7 +838,7 @@ access point has not been found in a scan.
    
 
    
 
    
 
    The “mode” property
    
-
      “mode”                     guint
    
+
      “mode”                     guint
    
 
    The mode of the access point; either "infrastructure" (a central
 coordinator of the wireless network allowing clients to connect) or
 "ad-hoc" (a network with no central controller).
    
@@ -849,7 +849,7 @@ coordinator of the wireless network allowing clients to connect) or
 
    
 
    
 
    The “rsn-flags” property
    
-
      “rsn-flags”                guint
    
+
      “rsn-flags”                guint
    
 
    The RSN flags of the access point.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -864,7 +864,7 @@ coordinator of the wireless network allowing clients to connect) or
 
    
 
    
 
    The “strength” property
    
-
      “strength”                 guchar
    
+
      “strength”                 guchar
    
 
    The current signal strength of the access point.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -872,7 +872,7 @@ coordinator of the wireless network allowing clients to connect) or
 
    
 
    
 
    The “wpa-flags” property
    
-
      “wpa-flags”                guint
    
+
      “wpa-flags”                guint
    
 
    The WPA flags of the access point.
    
 
    Flags: Read
    
 
    Default value: 0
    
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index 7fef6792..27809916 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -43,7 +43,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_active_connection_new ()
@@ -85,7 +85,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_active_connection_get_devices ()
@@ -93,7 +93,7 @@
 
 
 
-NMActiveConnectionState
+NMActiveConnectionState
 
 
 nm_active_connection_get_state ()
@@ -108,7 +108,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_active_connection_get_default ()
@@ -132,7 +132,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_active_connection_get_default6 ()
@@ -156,7 +156,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_active_connection_get_vpn ()
@@ -176,17 +176,17 @@
 
 
 
-gchar *
+gchar *
 connection
 Read
 
 
-gboolean
+gboolean
 default
 Read
 
 
-gboolean
+gboolean
 default6
 Read
 
@@ -210,7 +210,7 @@
 
 
 
-gchar *
+gchar *
 id
 Read
 
@@ -228,35 +228,35 @@
 
 
 
-gchar *
+gchar *
 master
 Read
 
 
 
-gchar *
+gchar *
 specific-object
 Read
 
 
-guint
+guint
 state
 Read
 
 
 
-gchar *
+gchar *
 type
 Read
 
 
 
-gchar *
+gchar *
 uuid
 Read
 
 
-gboolean
+gboolean
 vpn
 Read
 
@@ -336,7 +336,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMActiveConnection
             ╰── NMVPNConnection
@@ -349,8 +349,8 @@
 
    Functions
    
 
    
 
    nm_active_connection_new ()
    
-
    GObject *
-nm_active_connection_new (DBusGConnection *connection,
+
    GObject *
+nm_active_connection_new (DBusGConnection *connection,
                           const char *path);
    
 
    Creates a new NMActiveConnection.
    
 
    
@@ -364,7 +364,7 @@ nm_active_connection_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -386,7 +386,7 @@ nm_active_connection_new (
    nm_active_connection_get_connection ()
    
 
    const char *
 nm_active_connection_get_connection (NMActiveConnection *connection);
    
-
    Gets the NMConnection's DBus object path.  This is often used with
+
    Gets the NMConnection's DBus object path.  This is often used with
 nm_remote_settings_get_connection_by_path() to retrieve the
 NMRemoteConnection object that describes the connection.
    
 
    
@@ -406,7 +406,7 @@ nm_active_connection_get_connection (
 
    
 
    Returns
    
-
     the object path of the NMConnection which this NMActiveConnection
+
     the object path of the NMConnection which this NMActiveConnection
 is an active instance of.  This is the internal string used by the
 connection, and must not be modified.
    
 
    
@@ -416,7 +416,7 @@ connection, and must not be modified.
    
 
    nm_active_connection_get_id ()
    
 
    const char *
 nm_active_connection_get_id (NMActiveConnection *connection);
    
-
    Gets the NMConnection's ID.
    
+
    Gets the NMConnection's ID.
    
 
    
 
    Parameters
    
 
    
@@ -434,7 +434,7 @@ nm_active_connection_get_id (
 
    Returns
    
-
     the ID of the NMConnection that backs the NMActiveConnection.
+
     the ID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.
    
 
 
    Since: 0.9.10
    
@@ -444,7 +444,7 @@ This is the internal string used by the connection, and must not be modified.
    nm_active_connection_get_uuid ()
    
 
    const char *
 nm_active_connection_get_uuid (NMActiveConnection *connection);
    
-
    Gets the NMConnection's UUID.
    
+
    Gets the NMConnection's UUID.
    
 
    
 
    Parameters
    
 
    
@@ -462,7 +462,7 @@ nm_active_connection_get_uuid (
 
    
 
    Returns
    
-
     the UUID of the NMConnection that backs the NMActiveConnection.
+
     the UUID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.
    
 
    
 
@@ -472,7 +472,7 @@ This is the internal string used by the connection, and must not be modified.
    const char *
 nm_active_connection_get_connection_type
                                (NMActiveConnection *connection);
-
    Gets the NMConnection's type.
    
+
    Gets the NMConnection's type.
    
 
    
 
    Parameters
    
 
    
@@ -490,7 +490,7 @@ nm_active_connection_get_connection_type
 
 
    
 
    Returns
    
-
     the type of the NMConnection that backs the NMActiveConnection.
+
     the type of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.
    
 
    
 
    Since: 0.9.10
    
@@ -526,9 +526,9 @@ connection, and must not be modified.
    
 
    
 
    
 
    nm_active_connection_get_devices ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_active_connection_get_devices (NMActiveConnection *connection);
    
-
    Gets the NMDevices used for the active connections.
    
+
    Gets the NMDevices used for the active connections.
    
 
    
 
    Parameters
    
 
    
@@ -546,7 +546,7 @@ nm_active_connection_get_devices (
 
    
 
    Returns
    
-
     the GPtrArray containing NMDevices.
+
     the GPtrArray containing NMDevices.
 This is the internal copy used by the connection, and must not be modified. 
    
 
    [element-type NMDevice]
    
 
    
@@ -554,7 +554,7 @@ This is the internal copy used by the connection, and must not be modified. 
    
 
    
 
    
 
    nm_active_connection_get_state ()
    
-
    NMActiveConnectionState
+
    NMActiveConnectionState
 nm_active_connection_get_state (NMActiveConnection *connection);
    
 
    Gets the active connection's state.
    
 
    
@@ -607,7 +607,7 @@ This is the internal string used by the connection, and must not be modified.
    
 
    
 
    nm_active_connection_get_default ()
    
-
    gboolean
+
    gboolean
 nm_active_connection_get_default (NMActiveConnection *connection);
    
 
    Whether the active connection is the default IPv4 one (that is, is used for
 the default IPv4 route and DNS information).
    
@@ -628,7 +628,7 @@ the default IPv4 route and DNS information).
    
 
    
 
    
 
    Returns
    
-
     TRUE if the active connection is the default IPv4 connection
    
+
     TRUE if the active connection is the default IPv4 connection
    
 
    
 
    
 
    
@@ -654,8 +654,8 @@ nm_active_connection_get_ip4_config (
 
    
 
    Returns
    
-
     the NMIP4Config, or NULL if the
-connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
+
     the NMIP4Config, or NULL if the
+connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 
    
 
    [transfer none]
    
 
    
@@ -685,9 +685,9 @@ nm_active_connection_get_dhcp4_config (
 
    Returns
    
-
     the NMDHCP4Config, or NULL if the
+
     the NMDHCP4Config, or NULL if the
 connection does not use DHCP, or is not in the
-NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 
    
+NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 
    
 
    [transfer none]
    
 
    
 
    Since: 0.9.10
    
@@ -695,7 +695,7 @@ connection does not use DHCP, or is not in the
 
    
 
    
 
    nm_active_connection_get_default6 ()
    
-
    gboolean
+
    gboolean
 nm_active_connection_get_default6 (NMActiveConnection *connection);
    
 
    Whether the active connection is the default IPv6 one (that is, is used for
 the default IPv6 route and DNS information).
    
@@ -716,7 +716,7 @@ the default IPv6 route and DNS information).
    
 
    
 
    
 
    Returns
    
-
     TRUE if the active connection is the default IPv6 connection
    
+
     TRUE if the active connection is the default IPv6 connection
    
 
    
 
 
    
@@ -742,8 +742,8 @@ nm_active_connection_get_ip6_config (
 
    
 
    Returns
    
-
     the NMIP6Config, or NULL if the
-connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
+
     the NMIP6Config, or NULL if the
+connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 
    
 
    [transfer none]
    
 
    
@@ -773,9 +773,9 @@ nm_active_connection_get_dhcp6_config (
 
    Returns
    
-
     the NMDHCP6Config, or NULL if the
+
     the NMDHCP6Config, or NULL if the
 connection does not use DHCPv6, or is not in the
-NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 
    
+NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 
    
 
    [transfer none]
    
 
 
    Since: 0.9.10
    
@@ -783,7 +783,7 @@ connection does not use DHCPv6, or is not in the
 
    
 
    
 
    nm_active_connection_get_vpn ()
    
-
    gboolean
+
    gboolean
 nm_active_connection_get_vpn (NMActiveConnection *connection);
    
 
    Whether the active connection is a VPN connection.
    
 
    
@@ -803,7 +803,7 @@ nm_active_connection_get_vpn (
 
    Returns
    
-
     TRUE if the active connection is a VPN connection
    
+
     TRUE if the active connection is a VPN connection
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -904,7 +904,7 @@ nm_active_connection_get_vpn (
    Property Details
    
 
    
 
    The “connection” property
    
-
      “connection”               gchar *
    
+
      “connection”               gchar *
    
 
    The connection's path of the active connection.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -912,7 +912,7 @@ nm_active_connection_get_vpn (
 
    The “default” property
    
-
      “default”                  gboolean
    
+
      “default”                  gboolean
    
 
    Whether the active connection is the default IPv4 one.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -920,7 +920,7 @@ nm_active_connection_get_vpn (
 
    The “default6” property
    
-
      “default6”                 gboolean
    
+
      “default6”                 gboolean
    
 
    Whether the active connection is the default IPv6 one.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -950,7 +950,7 @@ nm_active_connection_get_vpn (
 
    The “id” property
    
-
      “id”                       gchar *
    
+
      “id”                       gchar *
    
 
    The active connection's ID
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -975,7 +975,7 @@ nm_active_connection_get_vpn (
 
    The “master” property
    
-
      “master”                   gchar *
    
+
      “master”                   gchar *
    
 
    The path of the master device if one exists.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -983,7 +983,7 @@ nm_active_connection_get_vpn (
 
    The “specific-object” property
    
-
      “specific-object”          gchar *
    
+
      “specific-object”          gchar *
    
 
    The specific object's path of the active connection.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -991,7 +991,7 @@ nm_active_connection_get_vpn (
 
    The “state” property
    
-
      “state”                    guint
    
+
      “state”                    guint
    
 
    The state of the active connection.
    
 
    Flags: Read
    
 
    Allowed values: <= 3
    
@@ -1000,7 +1000,7 @@ nm_active_connection_get_vpn (
 
    The “type” property
    
-
      “type”                     gchar *
    
+
      “type”                     gchar *
    
 
    The active connection's type
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -1009,7 +1009,7 @@ nm_active_connection_get_vpn (
 
    The “uuid” property
    
-
      “uuid”                     gchar *
    
+
      “uuid”                     gchar *
    
 
    The active connection's UUID
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -1017,7 +1017,7 @@ nm_active_connection_get_vpn (
 
    The “vpn” property
    
-
      “vpn”                      gboolean
    
+
      “vpn”                      gboolean
    
 
    Whether the active connection is a VPN connection.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index b9b60450..691193aa 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -44,7 +44,7 @@
 
    
-
-
-
-
+
@@ -392,12 +392,12 @@
 
-
+
-
+
@@ -408,48 +408,48 @@
 
-
+
-
+
+gchar *
 
-
+
-
+
-
+
-
+
-
+
-
+
@@ -468,27 +468,27 @@
 
-
+
-
+
-
+
-
+
-
+
    
 
    
 
-GQuark
+GQuark
 
 
 nm_client_error_quark ()
@@ -75,14 +75,14 @@
 
 
    
 
    const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_devices ()
 
 
    
 
    const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_all_devices ()
@@ -146,7 +146,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_client_networking_get_enabled ()
@@ -162,7 +162,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_client_wireless_get_enabled ()
@@ -178,7 +178,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_client_wireless_hardware_get_enabled ()
@@ -186,7 +186,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_client_wwan_get_enabled ()
@@ -202,7 +202,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_client_wwan_hardware_get_enabled ()
@@ -210,7 +210,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_client_wimax_get_enabled ()
@@ -226,7 +226,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_client_wimax_hardware_get_enabled ()
@@ -241,7 +241,7 @@
 
    
 
    
 
-NMState
+NMState
 
 
 nm_client_get_state ()
@@ -249,7 +249,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_client_get_startup ()
@@ -257,14 +257,14 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_client_get_manager_running ()
 
 
    
 
    const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_active_connections ()
@@ -288,7 +288,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_client_get_logging ()
@@ -296,7 +296,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_client_set_logging ()
@@ -304,7 +304,7 @@
 
    
 
    
 
-NMConnectivityState
+NMConnectivityState
 
 
 nm_client_get_connectivity ()
@@ -312,7 +312,7 @@
 
    
 
    
 
-NMConnectivityState
+NMConnectivityState
 
 
 nm_client_check_connectivity ()
@@ -328,7 +328,7 @@
 
    
 
    
 
-NMConnectivityState
+NMConnectivityState
 
 
 nm_client_check_connectivity_finish ()
@@ -381,7 +381,7 @@
 Read
 
    
 
    guintguint
 connectivity
 Read
 
    Read
 
    
 
    gbooleangboolean
 manager-running
 Read
 
    
 
    gbooleangboolean
 networking-enabled
 Read / Write
 
    Read
 
    
 
    gbooleangboolean
 startup
 Read
 
    
 
    guintguint
 state
 Read
 
    
 
    
 
-gchar *version
 Read
 
    
 
    gbooleangboolean
 wimax-enabled
 Read / Write
 
    
 
    gbooleangboolean
 wimax-hardware-enabled
 Read
 
    
 
    gbooleangboolean
 wireless-enabled
 Read / Write
 
    
 
    gbooleangboolean
 wireless-hardware-enabled
 Read
 
    
 
    gbooleangboolean
 wwan-enabled
 Read / Write
 
    
 
    gbooleangboolean
 wwan-hardware-enabled
 Read
 
    
 void
 any-device-addedRun FirstRun First
 
    
 
    
 void
 any-device-removedRun FirstRun First
 
    
 
    
 void
 device-addedRun FirstRun First
 
    
 
    
 void
 device-removedRun FirstRun First
 
    
 
    
 void
 permission-changedRun FirstRun First
 
    
     
 
    
@@ -590,7 +590,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMClient
 
    
@@ -602,7 +602,7 @@
 
    Functions
    
 
    
 
    nm_client_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_client_error_quark (void);
    
 
    Registers an error quark for NMClient if necessary.
    
 
    
@@ -632,9 +632,9 @@ control them.  To access and modify network configuration data, use the
 
    
 
    nm_client_new_async ()
    
 
    void
-nm_client_new_async (GCancellable *cancellable,
-                     GAsyncReadyCallback callback,
-                     gpointer user_data);
    
+nm_client_new_async (GCancellable *cancellable,
+                     GAsyncReadyCallback callback,
+                     gpointer user_data);
    
 
    Creates a new NMClient and begins asynchronously initializing it.
 callback
  will be called when it is done; use
@@ -654,7 +654,7 @@ control them.  To access and modify network configuration data, use the
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
@@ -676,8 +676,8 @@ control them.  To access and modify network configuration data, use the
 
    
 
    nm_client_new_finish ()
    
 
    NMClient *
-nm_client_new_finish (GAsyncResult *result,
-                      GError **error);
    
+nm_client_new_finish (GAsyncResult *result,
+                      GError **error);
    
 
    Gets the result of an nm_client_new_async() call.
    
 
    
 
    Parameters
    
@@ -690,12 +690,12 @@ nm_client_new_finish (
    result
    
-
    a GAsyncResult
    
+
    a GAsyncResult
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -703,13 +703,13 @@ nm_client_new_finish (
 
    Returns
    
-
     a new NMClient, or NULL on error
    
+
     a new NMClient, or NULL on error
    
 
    
 
    
 
    
 
    
 
    nm_client_get_devices ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_client_get_devices (NMClient *client);
    
 
    Gets all the known network devices.  Use nm_device_get_type() or the
 NM_IS_DEVICE_XXXX functions to determine what kind of
@@ -732,8 +732,8 @@ methods such as 
 
    Returns
    
-
     a GPtrArray
-containing all the NMDevices.  The returned array is owned by the
+
     a GPtrArray
+containing all the NMDevices.  The returned array is owned by the
 NMClient object and should not be modified. 
    
 
    [transfer none][element-type NMDevice]
    
 
    
@@ -741,7 +741,7 @@ containing all the 
 
    nm_client_get_all_devices ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_client_get_all_devices (NMClient *client);
    
 
    Gets both real devices and device placeholders (eg, software devices which
 do not currently exist, but could be created automatically by NetworkManager
@@ -768,8 +768,8 @@ use device-specific methods such as 
 
    Returns
    
-
     a GPtrArray
-containing all the NMDevices.  The returned array is owned by the
+
     a GPtrArray
+containing all the NMDevices.  The returned array is owned by the
 NMClient object and should not be modified. 
    
 
    [transfer none][element-type NMDevice]
    
 
    
@@ -807,7 +807,7 @@ nm_client_get_device_by_path (
 
    Returns
    
 
     the NMDevice for the given object_path
-or NULL if none is found. 
    
+or NULL if none is found. 
    
 
    [transfer none]
    
 
    
 
    
@@ -843,7 +843,7 @@ nm_client_get_device_by_iface (
 
    Returns
    
 
     the NMDevice for the given iface
-or NULL if none is found. 
    
+or NULL if none is found. 
    
 
    [transfer none]
    
 
    
 
    
@@ -853,19 +853,19 @@ or void
 (*NMClientActivateFn) (NMClient *client,
                        NMActiveConnection *active_connection,
-                       GError *error,
-                       gpointer user_data);
    
+                       GError *error,
+                       gpointer user_data);
    
 
    
 
    
 
    
 
    nm_client_activate_connection ()
    
 
    void
 nm_client_activate_connection (NMClient *client,
-                               NMConnection *connection,
+                               NMConnection *connection,
                                NMDevice *device,
                                const char *specific_object,
                                NMClientActivateFn callback,
-                               gpointer user_data);
    
+                               gpointer user_data);
    
 
    Starts a connection to a particular network using the configuration settings
 from connection
  and the network device device
@@ -899,7 +899,7 @@ track the activation to its completion.
    
 
 
 
    connection
    
-
     an NMConnection. 
    
+
     an NMConnection. 
    
 [allow-none]
 
 
@@ -911,7 +911,7 @@ track the activation to its completion.
    
 
    specific_object
    
 
     the object path of a connection-type-specific
 object this activation should use. This parameter is currently ignored for
-wired and mobile broadband connections, and the value of NULL should be used
+wired and mobile broadband connections, and the value of NULL should be used
 (ie, no specific object).  For Wi-Fi or WiMAX connections, pass the object
 path of a NMAccessPoint or NMWimaxNsp owned by device
 , which you can
@@ -940,19 +940,19 @@ details of the newly added connection. 
    
 (*NMClientAddActivateFn) (NMClient *client,
                           NMActiveConnection *connection,
                           const char *new_connection_path,
-                          GError *error,
-                          gpointer user_data);
    
+                          GError *error,
+                          gpointer user_data);
    
 
    
 
    
 
    
 
    nm_client_add_and_activate_connection ()
    
 
    void
 nm_client_add_and_activate_connection (NMClient *client,
-                                       NMConnection *partial,
+                                       NMConnection *partial,
                                        NMDevice *device,
                                        const char *specific_object,
                                        NMClientAddActivateFn callback,
-                                       gpointer user_data);
    
+                                       gpointer user_data);
    
 
    Adds a new connection using the given details (if any) as a template,
 automatically filling in missing settings with the capabilities of the
 given device and specific object.  The new connection is then activated.
@@ -977,8 +977,8 @@ track the activation to its completion.
    
 
 
 
    partial
    
-
     an NMConnection to add; the connection may be
-partially filled (or even NULL) and will be completed by NetworkManager
+
     an NMConnection to add; the connection may be
+partially filled (or even NULL) and will be completed by NetworkManager
 using the given device
 and specific_object
 before being added. 
    
@@ -993,7 +993,7 @@ before being added. 
    
 
    specific_object
    
 
     the object path of a connection-type-specific
 object this activation should use. This parameter is currently ignored for
-wired and mobile broadband connections, and the value of NULL should be used
+wired and mobile broadband connections, and the value of NULL should be used
 (ie, no specific object).  For Wi-Fi or WiMAX connections, pass the object
 path of a NMAccessPoint or NMWimaxNsp owned by device
 , which you can
@@ -1048,7 +1048,7 @@ nm_client_deactivate_connection (
 
    
 
    nm_client_networking_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_networking_get_enabled (NMClient *client);
    
 
    Whether networking is enabled or disabled.
    
 
    
@@ -1068,7 +1068,7 @@ nm_client_networking_get_enabled (
 
    
 
    Returns
    
-
     TRUE if networking is enabled, FALSE if networking is disabled
    
+
     TRUE if networking is enabled, FALSE if networking is disabled
    
 
    
 
    
 
    
@@ -1076,7 +1076,7 @@ nm_client_networking_get_enabled (
    nm_client_networking_set_enabled ()
    
 
    void
 nm_client_networking_set_enabled (NMClient *client,
-                                  gboolean enabled);
    
+                                  gboolean enabled);
    
 
    Enables or disables networking.  When networking is disabled, all controlled
 interfaces are disconnected and deactivated.  When networking is enabled,
 all controlled interfaces are available for activation.
    
@@ -1096,7 +1096,7 @@ all controlled interfaces are available for activation.
    
 
 
 
    enabled
    
-
    TRUE to set networking enabled, FALSE to set networking disabled
    
+
    TRUE to set networking enabled, FALSE to set networking disabled
    
  
 
 
@@ -1106,7 +1106,7 @@ all controlled interfaces are available for activation.
    
 
    
 
    
 
    nm_client_wireless_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_wireless_get_enabled (NMClient *client);
    
 
    Determines whether the wireless is enabled.
    
 
    
@@ -1126,7 +1126,7 @@ nm_client_wireless_get_enabled (
 
    
 
    Returns
    
-
     TRUE if wireless is enabled
    
+
     TRUE if wireless is enabled
    
 
    
 
    
 
    
@@ -1134,7 +1134,7 @@ nm_client_wireless_get_enabled (
    nm_client_wireless_set_enabled ()
    
 
    void
 nm_client_wireless_set_enabled (NMClient *client,
-                                gboolean enabled);
    
+                                gboolean enabled);
    
 
    Enables or disables wireless devices.
    
 
    
 
    Parameters
    
@@ -1152,7 +1152,7 @@ nm_client_wireless_set_enabled (
 
 
    enabled
    
-
    TRUE to enable wireless
    
+
    TRUE to enable wireless
    
  
 
 
@@ -1162,7 +1162,7 @@ nm_client_wireless_set_enabled (
 
    
 
    nm_client_wireless_hardware_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_wireless_hardware_get_enabled
                                (NMClient *client);
    
 
    Determines whether the wireless hardware is enabled.
    
@@ -1183,13 +1183,13 @@ nm_client_wireless_hardware_get_enabled
 
    
 
    
 
    Returns
    
-
     TRUE if the wireless hardware is enabled
    
+
     TRUE if the wireless hardware is enabled
    
 
    
 
    
 
    
 
    
 
    nm_client_wwan_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_wwan_get_enabled (NMClient *client);
    
 
    Determines whether WWAN is enabled.
    
 
    
@@ -1209,7 +1209,7 @@ nm_client_wwan_get_enabled (
 
    Returns
    
-
     TRUE if WWAN is enabled
    
+
     TRUE if WWAN is enabled
    
 
    
 
    
 
    
@@ -1217,7 +1217,7 @@ nm_client_wwan_get_enabled (
    nm_client_wwan_set_enabled ()
    
 
    void
 nm_client_wwan_set_enabled (NMClient *client,
-                            gboolean enabled);
    
+                            gboolean enabled);
    
 
    Enables or disables WWAN devices.
    
 
    
 
    Parameters
    
@@ -1235,7 +1235,7 @@ nm_client_wwan_set_enabled (
    enabled
    
-
    TRUE to enable WWAN
    
+
    TRUE to enable WWAN
    
  
 
 
@@ -1245,7 +1245,7 @@ nm_client_wwan_set_enabled (
 
    nm_client_wwan_hardware_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_wwan_hardware_get_enabled (NMClient *client);
    
 
    Determines whether the WWAN hardware is enabled.
    
 
    
@@ -1265,13 +1265,13 @@ nm_client_wwan_hardware_get_enabled (
 
    
 
    Returns
    
-
     TRUE if the WWAN hardware is enabled
    
+
     TRUE if the WWAN hardware is enabled
    
 
    
 
    
 
    
 
    
 
    nm_client_wimax_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_wimax_get_enabled (NMClient *client);
    
 
    Determines whether WiMAX is enabled.
    
 
    
@@ -1291,7 +1291,7 @@ nm_client_wimax_get_enabled (
 
    Returns
    
-
     TRUE if WiMAX is enabled
    
+
     TRUE if WiMAX is enabled
    
 
    
 
    
 
    
@@ -1299,7 +1299,7 @@ nm_client_wimax_get_enabled (
    nm_client_wimax_set_enabled ()
    
 
    void
 nm_client_wimax_set_enabled (NMClient *client,
-                             gboolean enabled);
    
+                             gboolean enabled);
    
 
    Enables or disables WiMAX devices.
    
 
    
 
    Parameters
    
@@ -1317,7 +1317,7 @@ nm_client_wimax_set_enabled (
    enabled
    
-
    TRUE to enable WiMAX
    
+
    TRUE to enable WiMAX
    
  
 
 
@@ -1327,7 +1327,7 @@ nm_client_wimax_set_enabled (
 
    nm_client_wimax_hardware_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_wimax_hardware_get_enabled (NMClient *client);
    
 
    Determines whether the WiMAX hardware is enabled.
    
 
    
@@ -1347,7 +1347,7 @@ nm_client_wimax_hardware_get_enabled (
 
    Returns
    
-
     TRUE if the WiMAX hardware is enabled
    
+
     TRUE if the WiMAX hardware is enabled
    
 
    
 
    
 
    
@@ -1379,7 +1379,7 @@ nm_client_get_version (
 
    nm_client_get_state ()
    
-
    NMState
+
    NMState
 nm_client_get_state (NMClient *client);
    
 
    Gets the current daemon state.
    
 
    
@@ -1399,13 +1399,13 @@ nm_client_get_state (
 
    Returns
    
-
     the current NMState
    
+
     the current NMState
    
 
    
 
    
 
    
 
    
 
    nm_client_get_startup ()
    
-
    gboolean
+
    gboolean
 nm_client_get_startup (NMClient *client);
    
 
    Tests whether the daemon is still in the process of activating
 connections at startup.
    
@@ -1433,7 +1433,7 @@ connections at startup.
    
 
    
 
    
 
    nm_client_get_manager_running ()
    
-
    gboolean
+
    gboolean
 nm_client_get_manager_running (NMClient *client);
    
 
    Determines whether the daemon is running.
    
 
    
@@ -1453,13 +1453,13 @@ nm_client_get_manager_running (
 
    
 
    Returns
    
-
     TRUE if the daemon is running
    
+
     TRUE if the daemon is running
    
 
    
 
    
 
    
 
    
 
    nm_client_get_active_connections ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_client_get_active_connections (NMClient *client);
    
 
    Gets the active connections.
    
 
    
@@ -1479,8 +1479,8 @@ nm_client_get_active_connections (
 
    
 
    Returns
    
-
     a GPtrArray
-containing all the active NMActiveConnections.
+
     a GPtrArray
+containing all the active NMActiveConnections.
 The returned array is owned by the client and should not be modified. 
    
 
    [transfer none][element-type NMActiveConnection]
    
 
    
@@ -1490,7 +1490,7 @@ The returned array is owned by the client and should not be modified. 
    
 
    nm_client_sleep ()
    
 
    void
 nm_client_sleep (NMClient *client,
-                 gboolean sleep_);
    
+                 gboolean sleep_);
    
 
    Deprecated; use nm_client_networking_set_enabled() instead.
    
 
    
 
    Parameters
    
@@ -1508,7 +1508,7 @@ nm_client_sleep (
    sleep_
    
-
    TRUE to put the daemon to sleep
    
+
    TRUE to put the daemon to sleep
    
  
 
 
@@ -1553,11 +1553,11 @@ client can or cannot perform the action the permission represents
    
 
    
 
    
 
    nm_client_get_logging ()
    
-
    gboolean
+
    gboolean
 nm_client_get_logging (NMClient *client,
                        char **level,
                        char **domains,
-                       GError **error);
    
+                       GError **error);
    
 
    Gets NetworkManager current logging level and domains.
    
 
    
 
    Parameters
    
@@ -1586,7 +1586,7 @@ a list of domains separated by ",". 
    
 
 
 
    error
    
-
     return location for a GError, or NULL. 
    
+
     return location for a GError, or NULL. 
    
 [allow-none]
 
 
@@ -1594,18 +1594,18 @@ a list of domains separated by ",". 
    
 
    
 
    
 
    Returns
    
-
     TRUE on success, FALSE otherwise
    
+
     TRUE on success, FALSE otherwise
    
 
    
 
    Since: 0.9.8
    
 
    
 
    
 
    
 
    nm_client_set_logging ()
    
-
    gboolean
+
    gboolean
 nm_client_set_logging (NMClient *client,
                        const char *level,
                        const char *domains,
-                       GError **error);
    
+                       GError **error);
    
 
    Sets NetworkManager logging level and/or domains.
    
 
    
 
    Parameters
    
@@ -1623,18 +1623,18 @@ nm_client_set_logging (
    level
    
-
     logging level to set (NULL or an empty string for no change). 
    
+
     logging level to set (NULL or an empty string for no change). 
    
 [allow-none]
 
 
 
    domains
    
 
     logging domains to set. The string should be a list of log
-domains separated by ",". (NULL or an empty string for no change). 
    
+domains separated by ",". (NULL or an empty string for no change). 
    
 [allow-none]
 
 
 
    error
    
-
     return location for a GError, or NULL. 
    
+
     return location for a GError, or NULL. 
    
 [allow-none]
 
 
@@ -1642,14 +1642,14 @@ domains separated by ",". (
 
    Returns
    
-
     TRUE on success, FALSE otherwise
    
+
     TRUE on success, FALSE otherwise
    
 
    
 
    Since: 0.9.8
    
 
    
 
    
 
    
 
    nm_client_get_connectivity ()
    
-
    NMConnectivityState
+
    NMConnectivityState
 nm_client_get_connectivity (NMClient *client);
    
 
    Gets the current network connectivity state. Contrast
 nm_client_check_connectivity() and
@@ -1679,10 +1679,10 @@ connectivity state first before returning any information.
    
 
    
 
    
 
    nm_client_check_connectivity ()
    
-
    NMConnectivityState
+
    NMConnectivityState
 nm_client_check_connectivity (NMClient *client,
-                              GCancellable *cancellable,
-                              GError **error);
    
+                              GCancellable *cancellable,
+                              GError **error);
    
 
    Updates the network connectivity state and returns the (new)
 current state. Contrast nm_client_get_connectivity(), which returns
 the most recent known state without re-checking.
    
@@ -1704,12 +1704,12 @@ if you do not want to block.
    
 
 
 
    cancellable
    
-
    a GCancellable
    
+
    a GCancellable
    
  
 
 
 
    error
    
-
    return location for a GError
    
+
    return location for a GError
    
  
 
 
@@ -1726,9 +1726,9 @@ if you do not want to block.
    
 
    nm_client_check_connectivity_async ()
    
 
    void
 nm_client_check_connectivity_async (NMClient *client,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data);
    
+                                    GCancellable *cancellable,
+                                    GAsyncReadyCallback callback,
+                                    gpointer user_data);
    
 
    Asynchronously updates the network connectivity state and invokes
 callback
  when complete. Contrast nm_client_get_connectivity(),
@@ -1750,7 +1750,7 @@ re-checking, and 
    cancellable
    
-
    a GCancellable
    
+
    a GCancellable
    
  
 
 
@@ -1772,10 +1772,10 @@ re-checking, and 
 
    nm_client_check_connectivity_finish ()
    
-
    NMConnectivityState
+
    NMConnectivityState
 nm_client_check_connectivity_finish (NMClient *client,
-                                     GAsyncResult *result,
-                                     GError **error);
    
+                                     GAsyncResult *result,
+                                     GError **error);
    
 
    Retrieves the result of an nm_client_check_connectivity_async()
 call.
    
 
    
@@ -1794,12 +1794,12 @@ call.
    
 
 
 
    result
    
-
    the GAsyncResult
    
+
    the GAsyncResult
    
  
 
 
 
    error
    
-
    return location for a GError
    
+
    return location for a GError
    
  
 
 
@@ -1824,7 +1824,7 @@ the default route. If there is a VPN active with the default route,
 then this function returns the active connection that contains the
 route to the VPN endpoint.
    
 
    If there is no default route, or the default route is over a
-non-NetworkManager-recognized device, this will return NULL.
    
+non-NetworkManager-recognized device, this will return NULL.
    
 
    
 
    Parameters
    
 
    
@@ -2250,7 +2250,7 @@ Type: GLib.PtrArray
    
 
    The “connectivity” property
    
-
      “connectivity”             guint
    
+
      “connectivity”             guint
    
 
    The network connectivity state.
    
 
    Flags: Read
    
 
    Allowed values: <= 4
    
@@ -2268,7 +2268,7 @@ Type: GLib.PtrArray
    
 
    
 
    
 
    The “manager-running” property
    
-
      “manager-running”          gboolean
    
+
      “manager-running”          gboolean
    
 
    Whether the daemon is running.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -2276,7 +2276,7 @@ Type: GLib.PtrArray
    
 
    
 
    
 
    The “networking-enabled” property
    
-
      “networking-enabled”       gboolean
    
+
      “networking-enabled”       gboolean
    
 
    Whether networking is enabled.
    
 
    Flags: Read / Write
    
 
    Default value: TRUE
    
@@ -2293,7 +2293,7 @@ see 
 
    
 
    The “startup” property
    
-
      “startup”                  gboolean
    
+
      “startup”                  gboolean
    
 
    Whether the daemon is still starting up.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -2302,7 +2302,7 @@ see 
 
    
 
    The “state” property
    
-
      “state”                    guint
    
+
      “state”                    guint
    
 
    The current daemon state.
    
 
    Flags: Read
    
 
    Allowed values: <= 70
    
@@ -2311,7 +2311,7 @@ see 
 
    
 
    The “version” property
    
-
      “version”                  gchar *
    
+
      “version”                  gchar *
    
 
    The NetworkManager version.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -2319,7 +2319,7 @@ see 
 
    
 
    The “wimax-enabled” property
    
-
      “wimax-enabled”            gboolean
    
+
      “wimax-enabled”            gboolean
    
 
    Whether WiMAX functionality is enabled.
    
 
    Flags: Read / Write
    
 
    Default value: FALSE
    
@@ -2327,7 +2327,7 @@ see 
 
    
 
    The “wimax-hardware-enabled” property
    
-
      “wimax-hardware-enabled”   gboolean
    
+
      “wimax-hardware-enabled”   gboolean
    
 
    Whether the WiMAX hardware is enabled.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -2335,7 +2335,7 @@ see 
 
    
 
    The “wireless-enabled” property
    
-
      “wireless-enabled”         gboolean
    
+
      “wireless-enabled”         gboolean
    
 
    Whether wireless is enabled.
    
 
    Flags: Read / Write
    
 
    Default value: FALSE
    
@@ -2343,7 +2343,7 @@ see 
 
    
 
    The “wireless-hardware-enabled” property
    
-
      “wireless-hardware-enabled” gboolean
    
+
      “wireless-hardware-enabled” gboolean
    
 
    Whether the wireless hardware is enabled.
    
 
    Flags: Read
    
 
    Default value: TRUE
    
@@ -2351,7 +2351,7 @@ see 
 
    
 
    The “wwan-enabled” property
    
-
      “wwan-enabled”             gboolean
    
+
      “wwan-enabled”             gboolean
    
 
    Whether WWAN functionality is enabled.
    
 
    Flags: Read / Write
    
 
    Default value: FALSE
    
@@ -2359,7 +2359,7 @@ see 
 
    
 
    The “wwan-hardware-enabled” property
    
-
      “wwan-hardware-enabled”    gboolean
    
+
      “wwan-hardware-enabled”    gboolean
    
 
    Whether the WWAN hardware is enabled.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -2371,8 +2371,8 @@ see 
    The “any-device-added” signal
    
 
    void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)
    
+               GObject  *device,
+               gpointer  user_data)
 
    Notifies that a NMDevice is added.  This signal is emitted for both
 regular devices and placeholder devices.
    
 
    
@@ -2402,15 +2402,15 @@ regular devices and placeholder devices.
    
 
 
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “any-device-removed” signal
    
 
    void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)
    
+               GObject  *device,
+               gpointer  user_data)
    
 
    Notifies that a NMDevice is removed.  This signal is emitted for both
 regular devices and placeholder devices.
    
 
    
@@ -2440,15 +2440,15 @@ regular devices and placeholder devices.
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “device-added” signal
    
 
    void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)
    
+               GObject  *device,
+               gpointer  user_data)
    
 
    Notifies that a NMDevice is added.  This signal is not emitted for
 placeholder devices.
    
 
    
@@ -2478,15 +2478,15 @@ placeholder devices.
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “device-removed” signal
    
 
    void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)
    
+               GObject  *device,
+               gpointer  user_data)
    
 
    Notifies that a NMDevice is removed.  This signal is not emitted for
 placeholder devices.
    
 
    
@@ -2516,16 +2516,16 @@ placeholder devices.
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “permission-changed” signal
    
 
    void
 user_function (NMClient *client,
-               guint     permission,
-               guint     result,
-               gpointer  user_data)
    
+               guint     permission,
+               guint     result,
+               gpointer  user_data)
    
 
    Notifies that a permission has changed
    
 
    
 
    Parameters
    
@@ -2559,7 +2559,7 @@ user_function (
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html
index 92fdac7b..c8ec4557 100644
--- a/docs/libnm-glib/html/NMDHCP4Config.html
+++ b/docs/libnm-glib/html/NMDHCP4Config.html
@@ -43,7 +43,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_dhcp4_config_new ()
@@ -51,7 +51,7 @@
 
 
 
-GHashTable *
+GHashTable *
 
 
 nm_dhcp4_config_get_options ()
@@ -77,7 +77,7 @@
 
 
 
-GHashTable *
+GHashTable *
 options
 Read
 
@@ -98,7 +98,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDHCP4Config
 
    
@@ -110,8 +110,8 @@
 
    Functions
    
 
    
 
    nm_dhcp4_config_new ()
    
-
    GObject *
-nm_dhcp4_config_new (DBusGConnection *connection,
+
    GObject *
+nm_dhcp4_config_new (DBusGConnection *connection,
                      const char *object_path);
    
 
    Creates a new NMDHCP4Config.
    
 
    
@@ -125,7 +125,7 @@ nm_dhcp4_config_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -145,7 +145,7 @@ nm_dhcp4_config_new (
 
    nm_dhcp4_config_get_options ()
    
-
    GHashTable *
+
    GHashTable *
 nm_dhcp4_config_get_options (NMDHCP4Config *config);
    
 
    Gets all the options contained in the configuration.
    
 
    
@@ -165,7 +165,7 @@ nm_dhcp4_config_get_options (
 
    Returns
    
-
     the GHashTable containing strings for keys and values.
+
     the GHashTable containing strings for keys and values.
 This is the internal copy used by the configuration, and must not be modified. 
    
 
    [transfer none][element-type utf8 GObject.Value]
    
 
    
@@ -218,8 +218,8 @@ configuration, and must not be modified.
    
 
    Property Details
    
 
    
 
    The “options” property
    
-
      “options”                  GHashTable *
    
-
    The GHashTable containing options of the configuration.
    
+
      “options”                  GHashTable *
    
+
    The GHashTable containing options of the configuration.
    
 
    Type: GLib.HashTable(utf8,GObject.Value)
    
 
    Flags: Read
    
 
    
diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html
index 978a2e8a..c9b53d21 100644
--- a/docs/libnm-glib/html/NMDHCP6Config.html
+++ b/docs/libnm-glib/html/NMDHCP6Config.html
@@ -43,7 +43,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_dhcp6_config_new ()
@@ -51,7 +51,7 @@
 
 
 
-GHashTable *
+GHashTable *
 
 
 nm_dhcp6_config_get_options ()
@@ -77,7 +77,7 @@
 
 
 
-GHashTable *
+GHashTable *
 options
 Read
 
@@ -98,7 +98,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDHCP6Config
 
    
@@ -110,8 +110,8 @@
 
    Functions
    
 
    
 
    nm_dhcp6_config_new ()
    
-
    GObject *
-nm_dhcp6_config_new (DBusGConnection *connection,
+
    GObject *
+nm_dhcp6_config_new (DBusGConnection *connection,
                      const char *object_path);
    
 
    Creates a new NMDHCP6Config.
    
 
    
@@ -125,7 +125,7 @@ nm_dhcp6_config_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -145,7 +145,7 @@ nm_dhcp6_config_new (
 
    nm_dhcp6_config_get_options ()
    
-
    GHashTable *
+
    GHashTable *
 nm_dhcp6_config_get_options (NMDHCP6Config *config);
    
 
    Gets all the options contained in the configuration.
    
 
    
@@ -165,7 +165,7 @@ nm_dhcp6_config_get_options (
 
    Returns
    
-
     the GHashTable containing strings for keys and values.
+
     the GHashTable containing strings for keys and values.
 This is the internal copy used by the configuration, and must not be modified. 
    
 
    [transfer none][element-type utf8 GObject.Value]
    
 
    
@@ -218,8 +218,8 @@ configuration, and must not be modified.
    
 
    Property Details
    
 
    
 
    The “options” property
    
-
      “options”                  GHashTable *
    
-
    The GHashTable containing options of the configuration.
    
+
      “options”                  GHashTable *
    
+
    The GHashTable containing options of the configuration.
    
 
    Type: GLib.HashTable(utf8,GObject.Value)
    
 
    Flags: Read
    
 
    
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index 93b7ce9b..45ffe561 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -44,7 +44,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_error_quark ()
@@ -52,7 +52,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_new ()
@@ -74,7 +74,7 @@
 
 
 
-NMDeviceType
+NMDeviceType
 
 
 nm_device_get_device_type ()
@@ -124,7 +124,7 @@
 
 
 
-NMDeviceCapabilities
+NMDeviceCapabilities
 
 
 nm_device_get_capabilities ()
@@ -132,7 +132,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_get_managed ()
@@ -148,7 +148,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_get_autoconnect ()
@@ -164,7 +164,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_get_firmware_missing ()
@@ -204,7 +204,7 @@
 
 
 
-NMDeviceState
+NMDeviceState
 
 
 nm_device_get_state ()
@@ -212,7 +212,7 @@
 
 
 
-NMDeviceState
+NMDeviceState
 
 
 nm_device_get_state_reason ()
@@ -227,7 +227,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_get_available_connections ()
@@ -242,7 +242,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_get_mtu ()
@@ -250,7 +250,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_is_software ()
@@ -258,7 +258,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_is_real ()
@@ -319,7 +319,7 @@
 
 
 
-GSList *
+GSList *
 
 
 nm_device_filter_connections ()
@@ -327,7 +327,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_connection_valid ()
@@ -335,7 +335,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_connection_compatible ()
@@ -343,7 +343,7 @@
 
 
 
-GType
+GType
 
 
 nm_device_get_setting_type ()
@@ -376,7 +376,7 @@
 Read
 
 
-gboolean
+gboolean
 autoconnect
 Read / Write
 
@@ -387,12 +387,12 @@
 Read
 
 
-guint
+guint
 capabilities
 Read
 
 
-guint
+guint
 device-type
 Read
 
@@ -410,36 +410,36 @@
 
 
 
-gchar *
+gchar *
 driver
 Read
 
 
 
-gchar *
+gchar *
 driver-version
 Read
 
 
-gboolean
+gboolean
 firmware-missing
 Read
 
 
 
-gchar *
+gchar *
 firmware-version
 Read
 
 
 
-gchar *
+gchar *
 interface
 Read
 
 
 
-gchar *
+gchar *
 ip-interface
 Read
 
@@ -456,34 +456,34 @@
 Read
 
 
-gboolean
+gboolean
 managed
 Read
 
 
-guint
+guint
 mtu
 Read
 
 
 
-gchar *
+gchar *
 physical-port-id
 Read
 
 
 
-gchar *
+gchar *
 product
 Read
 
 
-gboolean
+gboolean
 real
 Read
 
 
-guint
+guint
 state
 Read
 
@@ -494,13 +494,13 @@
 
 
 
-gchar *
+gchar *
 udi
 Read
 
 
 
-gchar *
+gchar *
 vendor
 Read
 
@@ -518,7 +518,7 @@
 
 void
 state-changed
-Run First
+Run First
 
 
    
 
    
@@ -639,7 +639,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ├── NMDeviceEthernet
@@ -664,7 +664,7 @@
 
    Functions
    
 
    
 
    nm_device_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_error_quark (void);
    
 
    Registers an error quark for NMDevice if necessary.
    
 
    
@@ -676,8 +676,8 @@ nm_device_error_quark (void
 
    
 
    nm_device_new ()
    
-
    GObject *
-nm_device_new (DBusGConnection *connection,
+
    GObject *
+nm_device_new (DBusGConnection *connection,
                const char *path);
    
 
    Creates a new NMDevice.
    
 
    
@@ -691,7 +691,7 @@ nm_device_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -766,7 +766,7 @@ used by the device, and must not be modified.
    
 
    
 
    
 
    nm_device_get_device_type ()
    
-
    NMDeviceType
+
    NMDeviceType
 nm_device_get_device_type (NMDevice *device);
    
 
    Returns the numeric type of the NMDevice, ie Ethernet, Wi-Fi, etc.
    
 
    
@@ -952,7 +952,7 @@ nm_device_get_hw_address (
 
    Returns
    
-
     the current MAC of the device, or NULL.
+
     the current MAC of the device, or NULL.
 This is the internal string used by the device, and must not be modified.
    
 
    
 
    Since: 0.9.10
    
@@ -960,7 +960,7 @@ This is the internal string used by the device, and must not be modified.
    
 
    
 
    
 
    nm_device_get_capabilities ()
    
-
    NMDeviceCapabilities
+
    NMDeviceCapabilities
 nm_device_get_capabilities (NMDevice *device);
    
 
    Gets the device' capabilities.
    
 
    
@@ -986,7 +986,7 @@ nm_device_get_capabilities (
 
    nm_device_get_managed ()
    
-
    gboolean
+
    gboolean
 nm_device_get_managed (NMDevice *device);
    
 
    Whether the NMDevice is managed by NetworkManager.
    
 
    
@@ -1006,7 +1006,7 @@ nm_device_get_managed (
 
    Returns
    
-
     TRUE if the device is managed by NetworkManager
    
+
     TRUE if the device is managed by NetworkManager
    
 
    
 
    
 
    
@@ -1014,7 +1014,7 @@ nm_device_get_managed (
    nm_device_set_managed ()
    
 
    void
 nm_device_set_managed (NMDevice *device,
-                       gboolean managed);
    
+                       gboolean managed);
    
 
    Enables or disables management of  NMDevice by NetworkManager.
    
 
    
 
    Parameters
    
@@ -1032,7 +1032,7 @@ nm_device_set_managed (
    managed
    
-
    TRUE to make the device managed by NetworkManager.
    
+
    TRUE to make the device managed by NetworkManager.
    
  
 
 
@@ -1043,7 +1043,7 @@ nm_device_set_managed (
 
    nm_device_get_autoconnect ()
    
-
    gboolean
+
    gboolean
 nm_device_get_autoconnect (NMDevice *device);
    
 
    Whether the NMDevice can be autoconnected.
    
 
    
@@ -1063,7 +1063,7 @@ nm_device_get_autoconnect (
 
    Returns
    
-
     TRUE if the device is allowed to be autoconnected
    
+
     TRUE if the device is allowed to be autoconnected
    
 
    
 
    
 
    
@@ -1071,7 +1071,7 @@ nm_device_get_autoconnect (
    nm_device_set_autoconnect ()
    
 
    void
 nm_device_set_autoconnect (NMDevice *device,
-                           gboolean autoconnect);
    
+                           gboolean autoconnect);
    
 
    Enables or disables automatic activation of the NMDevice.
    
 
    
 
    Parameters
    
@@ -1089,7 +1089,7 @@ nm_device_set_autoconnect (
    autoconnect
    
-
    TRUE to enable autoconnecting
    
+
    TRUE to enable autoconnecting
    
  
 
 
@@ -1099,7 +1099,7 @@ nm_device_set_autoconnect (
 
    nm_device_get_firmware_missing ()
    
-
    gboolean
+
    gboolean
 nm_device_get_firmware_missing (NMDevice *device);
    
 
    Indicates that firmware required for the device's operation is likely
 to be missing.
    
@@ -1120,7 +1120,7 @@ to be missing.
    
 
    
 
    
 
    Returns
    
-
     TRUE if firmware required for the device's operation is likely
+
     TRUE if firmware required for the device's operation is likely
 to be missing.
    
 
    
 
    
@@ -1150,7 +1150,7 @@ connections.
    
 
    
 
    
 
    Returns
    
-
     the NMIP4Config or NULL if the device is not activated. 
    
+
     the NMIP4Config or NULL if the device is not activated. 
    
 
    [transfer none]
    
 
    
 
    
@@ -1180,7 +1180,7 @@ connections.
    
 
    
 
    
 
    Returns
    
-
     the NMDHCP4Config or NULL if the device is not activated or not
+
     the NMDHCP4Config or NULL if the device is not activated or not
 using DHCP. 
    
 
    [transfer none]
    
 
    
@@ -1211,7 +1211,7 @@ connections.
    
 
    
 
    
 
    Returns
    
-
     the NMIP6Config or NULL if the device is not activated. 
    
+
     the NMIP6Config or NULL if the device is not activated. 
    
 
    [transfer none]
    
 
    
 
    
@@ -1241,7 +1241,7 @@ connections.
    
 
    
 
    
 
    Returns
    
-
     the NMDHCP6Config or NULL if the device is not activated or not
+
     the NMDHCP6Config or NULL if the device is not activated or not
 using DHCP. 
    
 
    [transfer none]
    
 
    
@@ -1249,7 +1249,7 @@ using DHCP. 
    
 
    
 
    
 
    nm_device_get_state ()
    
-
    NMDeviceState
+
    NMDeviceState
 nm_device_get_state (NMDevice *device);
    
 
    Gets the current NMDevice state.
    
 
    
@@ -1275,9 +1275,9 @@ nm_device_get_state (
 
    nm_device_get_state_reason ()
    
-
    NMDeviceState
+
    NMDeviceState
 nm_device_get_state_reason (NMDevice *device,
-                            NMDeviceStateReason *reason);
    
+                            NMDeviceStateReason *reason);
    
 
    Gets the current NMDevice state (return value) and the reason for entering
 the state (reason
  argument).
    
@@ -1297,7 +1297,7 @@ the state (reason
 
 
 
    reason
    
-
     location to store reason (NMDeviceStateReason), or NULL. 
    
+
     location to store reason (NMDeviceStateReason), or NULL. 
    
 [out][allow-none]
 
 
@@ -1331,7 +1331,7 @@ nm_device_get_active_connection (
 
    
 
    Returns
    
-
     the NMActiveConnection or NULL if the device is
+
     the NMActiveConnection or NULL if the device is
 not part of an active connection. 
    
 
    [transfer none]
    
 
    
@@ -1339,9 +1339,9 @@ not part of an active connection. 
    
 
    
 
    
 
    nm_device_get_available_connections ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_device_get_available_connections (NMDevice *device);
    
-
    Gets the NMRemoteConnections currently known to the daemon that could
+
    Gets the NMRemoteConnections currently known to the daemon that could
 be activated on device
 .
    
 
    
@@ -1361,8 +1361,8 @@ be activated on device
 
    
 
    
 
    Returns
    
-
     the GPtrArray
-containing NMRemoteConnections. This is the internal copy used by
+
     the GPtrArray
+containing NMRemoteConnections. This is the internal copy used by
 the connection, and must not be modified. 
    
 
    [element-type NMRemoteConnection]
    
 
    
@@ -1373,9 +1373,9 @@ the connection, and must not be modified. 
    
 
    nm_device_get_physical_port_id ()
    
 
    const char *
 nm_device_get_physical_port_id (NMDevice *device);
    
-
    Gets the physical port ID of the NMDevice. If non-NULL, this is
+
    Gets the physical port ID of the NMDevice. If non-NULL, this is
 an opaque string that can be used to recognize when
-seemingly-unrelated NMDevices are actually just different virtual
+seemingly-unrelated NMDevices are actually just different virtual
 ports on a single physical port. (Eg, NPAR / SR-IOV.)
    
 
    
 
    Parameters
    
@@ -1394,7 +1394,7 @@ ports on a single physical port. (Eg, NPAR / SR-IOV.)
    
 
    
 
    
 
    Returns
    
-
     the physical port ID of the device, or NULL if the port
+
     the physical port ID of the device, or NULL if the port
 ID is unknown. This is the internal string used by the device and
 must not be modified.
    
 
    
@@ -1403,7 +1403,7 @@ must not be modified.
    
 
    
 
    
 
    nm_device_get_mtu ()
    
-
    guint32
+
    guint32
 nm_device_get_mtu (NMDevice *device);
    
 
    Gets the  MTU of the NMDevice.
    
 
    
@@ -1430,7 +1430,7 @@ nm_device_get_mtu (
 
    nm_device_is_software ()
    
-
    gboolean
+
    gboolean
 nm_device_is_software (NMDevice *device);
    
 
    Whether the device is a software device.
    
 
    
@@ -1450,15 +1450,15 @@ nm_device_is_software (
 
    Returns
    
-
     TRUE if device
-is a software device, FALSE if it is a hardware device.
    
+
     TRUE if device
+is a software device, FALSE if it is a hardware device.
    
 
    
 
    Since: 1.0
    
 
    
 
    
 
    
 
    nm_device_is_real ()
    
-
    gboolean
+
    gboolean
 nm_device_is_real (NMDevice *device);
    
 
    
 
    Parameters
    
@@ -1477,7 +1477,7 @@ nm_device_is_real (
 
    Returns
    
-
     TRUE if the device exists, or FALSE if it is a placeholder device
+
     TRUE if the device exists, or FALSE if it is a placeholder device
 that could be automatically created by NetworkManager if one of its
 “available-connections” was activated.
    
 
    
@@ -1611,8 +1611,8 @@ devices in devices
 
    NMDeviceCallbackFn ()
    
 
    void
 (*NMDeviceCallbackFn) (NMDevice *device,
-                       GError *error,
-                       gpointer user_data);
    
+                       GError *error,
+                       gpointer user_data);
    
 
    
 
    
 
    
@@ -1620,7 +1620,7 @@ devices in devices
 
    void
 nm_device_disconnect (NMDevice *device,
                       NMDeviceCallbackFn callback,
-                      gpointer user_data);
    
+                      gpointer user_data);
    
 
    Disconnects the device if currently connected, and prevents the device from
 automatically connecting to networks until the next manual network connection
 request.
    
@@ -1660,7 +1660,7 @@ operation completes. 
    
 
    void
 nm_device_delete (NMDevice *device,
                   NMDeviceCallbackFn callback,
-                  gpointer user_data);
    
+                  gpointer user_data);
    
 
    Deletes the software device. Hardware devices can't be deleted.
    
 
    
 
    Parameters
    
@@ -1696,9 +1696,9 @@ operation completes. 
    
 
    
 
    
 
    nm_device_filter_connections ()
    
-
    GSList *
+
    GSList *
 nm_device_filter_connections (NMDevice *device,
-                              const GSList *connections);
    
+                              const GSList *connections);
    
 
    Filters a given list of connections for a given NMDevice object and return
 connections which may be activated with the device. For example if device
 
@@ -1725,7 +1725,7 @@ incompatible with the device. To get the full list of connections see
 
 
 
    connections
    
-
     a list of NMConnection objects to filter. 
    
+
     a list of NMConnection objects to filter. 
    
 [element-type NMConnection]
 
 
@@ -1734,20 +1734,20 @@ incompatible with the device. To get the full list of connections see
 
    
 
    Returns
    
 
     a
-list of NMConnection objects that could be activated with the given device
+list of NMConnection objects that could be activated with the given device
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
-be freed with g_slist_free() when it is no longer required. 
    
+be freed with g_slist_free() when it is no longer required. 
    
 
    [transfer container][element-type NMConnection]
    
 
    
 
    
 
    
 
    
 
    nm_device_connection_valid ()
    
-
    gboolean
+
    gboolean
 nm_device_connection_valid (NMDevice *device,
-                            NMConnection *connection);
    
+                            NMConnection *connection);
    
 
    Validates a given connection for a given NMDevice object and returns
 whether the connection may be activated with the device. For example if
 device
@@ -1773,7 +1773,7 @@ against
    
 
 
 
    connection
    
-
    an NMConnection to validate against device
+
    an NMConnection to validate against device
 
    
  
 
@@ -1782,17 +1782,17 @@ against
    
 
    
 
    
 
    Returns
    
-
     TRUE if the connection may be activated with this device, FALSE
+
     TRUE if the connection may be activated with this device, FALSE
 if is incompatible with the device's capabilities and characteristics.
    
 
    
 
    
 
    
 
    
 
    nm_device_connection_compatible ()
    
-
    gboolean
+
    gboolean
 nm_device_connection_compatible (NMDevice *device,
-                                 NMConnection *connection,
-                                 GError **error);
    
+                                 NMConnection *connection,
+                                 GError **error);
    
 
    Validates a given connection for a given NMDevice object and returns
 whether the connection may be activated with the device. For example if
 device
@@ -1821,13 +1821,13 @@ against
    
 
 
 
    connection
    
-
    an NMConnection to validate against device
+
    an NMConnection to validate against device
 
    
  
 
 
 
    error
    
-
    return location for a GError, or NULL
    
+
    return location for a GError, or NULL
    
  
 
 
@@ -1835,16 +1835,16 @@ against
    
 
    
 
    
 
    Returns
    
-
     TRUE if the connection may be activated with this device, FALSE
+
     TRUE if the connection may be activated with this device, FALSE
 if is incompatible with the device's capabilities and characteristics.
    
 
    
 
    
 
    
 
    
 
    nm_device_get_setting_type ()
    
-
    GType
+
    GType
 nm_device_get_setting_type (NMDevice *device);
    
-
    Gets the (primary) NMSetting subtype associated with connections
+
    Gets the (primary) NMSetting subtype associated with connections
 that can be used on device
 .
    
 
    
@@ -1865,7 +1865,7 @@ that can be used on device
 
    
 
    Returns
    
 
     device
-'s associated NMSetting type
    
+'s associated NMSetting type
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -1874,8 +1874,8 @@ that can be used on device
 
    NMDeviceDeactivateFn ()
    
 
    void
 (*NMDeviceDeactivateFn) (NMDevice *device,
-                         GError *error,
-                         gpointer user_data);
    
+                         GError *error,
+                         gpointer user_data);
    
 
    NMDeviceDeactivateFn is deprecated and should not be used in newly-written code.
    
 
    
 
    
@@ -2073,7 +2073,7 @@ that can be used on device
 
    
 
    
 
    The “autoconnect” property
    
-
      “autoconnect”              gboolean
    
+
      “autoconnect”              gboolean
    
 
    Whether the device can auto-activate a connection.
    
 
    Flags: Read / Write
    
 
    Default value: TRUE
    
@@ -2089,7 +2089,7 @@ that can be used on device
 
    
 
    
 
    The “capabilities” property
    
-
      “capabilities”             guint
    
+
      “capabilities”             guint
    
 
    The capabilities of the device.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -2097,7 +2097,7 @@ that can be used on device
 
    
 
    
 
    The “device-type” property
    
-
      “device-type”              guint
    
+
      “device-type”              guint
    
 
    The numeric type of the device.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -2119,7 +2119,7 @@ that can be used on device
 
    
 
    
 
    The “driver” property
    
-
      “driver”                   gchar *
    
+
      “driver”                   gchar *
    
 
    The driver of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -2127,7 +2127,7 @@ that can be used on device
 
    
 
    
 
    The “driver-version” property
    
-
      “driver-version”           gchar *
    
+
      “driver-version”           gchar *
    
 
    The version of the device driver.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -2135,8 +2135,8 @@ that can be used on device
 
    
 
    
 
    The “firmware-missing” property
    
-
      “firmware-missing”         gboolean
    
-
    When TRUE indicates the device is likely missing firmware required
+
      “firmware-missing”         gboolean
    
+
    When TRUE indicates the device is likely missing firmware required
 for its operation.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -2144,7 +2144,7 @@ for its operation.
    
 
    
 
    
 
    The “firmware-version” property
    
-
      “firmware-version”         gchar *
    
+
      “firmware-version”         gchar *
    
 
    The firmware version of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -2152,7 +2152,7 @@ for its operation.
    
 
    
 
    
 
    The “interface” property
    
-
      “interface”                gchar *
    
+
      “interface”                gchar *
    
 
    The interface of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -2160,7 +2160,7 @@ for its operation.
    
 
    
 
    
 
    The “ip-interface” property
    
-
      “ip-interface”             gchar *
    
+
      “ip-interface”             gchar *
    
 
    The IP interface of the device which should be used for all IP-related
 operations like addressing and routing.
    
 
    Flags: Read
    
@@ -2183,7 +2183,7 @@ operations like addressing and routing.
    
 
    
 
    
 
    The “managed” property
    
-
      “managed”                  gboolean
    
+
      “managed”                  gboolean
    
 
    Whether the device is managed by NetworkManager.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -2191,7 +2191,7 @@ operations like addressing and routing.
    
 
    
 
    
 
    The “mtu” property
    
-
      “mtu”                      guint
    
+
      “mtu”                      guint
    
 
    The MTU of the device.
    
 
    Flags: Read
    
 
    Default value: 1500
    
@@ -2200,7 +2200,7 @@ operations like addressing and routing.
    
 
    
 
    
 
    The “physical-port-id” property
    
-
      “physical-port-id”         gchar *
    
+
      “physical-port-id”         gchar *
    
 
    The physical port ID of the device. (See
 nm_device_get_physical_port_id().)
    
 
    Flags: Read
    
@@ -2210,7 +2210,7 @@ operations like addressing and routing.
    
 
    
 
    
 
    The “product” property
    
-
      “product”                  gchar *
    
+
      “product”                  gchar *
    
 
    The product string of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -2218,7 +2218,7 @@ operations like addressing and routing.
    
 
    
 
    
 
    The “real” property
    
-
      “real”                     gboolean
    
+
      “real”                     gboolean
    
 
    Whether the device is real or is a placeholder device that could
 be created automatically by NetworkManager if one of its
 “available-connections” was activated.
    
@@ -2229,7 +2229,7 @@ be created automatically by NetworkManager if one of its
 
    
 
    
 
    The “state” property
    
-
      “state”                    guint
    
+
      “state”                    guint
    
 
    The state of the device.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -2244,7 +2244,7 @@ be created automatically by NetworkManager if one of its
 
    
 
    
 
    The “udi” property
    
-
      “udi”                      gchar *
    
+
      “udi”                      gchar *
    
 
    An operating-system specific device hardware identifier; this is not
 unique to a specific hardware device across reboots or hotplugs.  It
 is an opaque string which for some device types (Bluetooth, Modem)
@@ -2257,7 +2257,7 @@ request more information about the device from those services.
    
 
    
 
    
 
    The “vendor” property
    
-
      “vendor”                   gchar *
    
+
      “vendor”                   gchar *
    
 
    The vendor string of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -2269,10 +2269,10 @@ request more information about the device from those services.
    
 
    The “state-changed” signal
    
 
    void
 user_function (NMDevice *device,
-               guint     new_state,
-               guint     old_state,
-               guint     reason,
-               gpointer  user_data)
    
+               guint     new_state,
+               guint     old_state,
+               guint     reason,
+               gpointer  user_data)
    
 
    Notifies the state change of a NMDevice.
    
 
    
 
    Parameters
    
@@ -2311,7 +2311,7 @@ user_function (
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm-glib/html/NMDeviceAdsl.html b/docs/libnm-glib/html/NMDeviceAdsl.html
index d13ad015..0a3f0b15 100644
--- a/docs/libnm-glib/html/NMDeviceAdsl.html
+++ b/docs/libnm-glib/html/NMDeviceAdsl.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_adsl_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_adsl_new ()
@@ -59,7 +59,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_adsl_get_carrier ()
@@ -77,7 +77,7 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
@@ -108,7 +108,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceAdsl
@@ -121,7 +121,7 @@
 
    Functions
    
 
    
 
    nm_device_adsl_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_adsl_error_quark (void);
    
 
    Registers an error quark for NMDeviceAdsl if necessary.
    
 
    
@@ -132,8 +132,8 @@ nm_device_adsl_error_quark (void<
 
    
 
    
 
    nm_device_adsl_new ()
    
-
    GObject *
-nm_device_adsl_new (DBusGConnection *connection,
+
    GObject *
+nm_device_adsl_new (DBusGConnection *connection,
                     const char *path);
    
 
    Creates a new NMDeviceAdsl.
    
 
    
@@ -147,7 +147,7 @@ nm_device_adsl_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -167,7 +167,7 @@ nm_device_adsl_new (
 
    nm_device_adsl_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_adsl_get_carrier (NMDeviceAdsl *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -187,7 +187,7 @@ nm_device_adsl_get_carrier (
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    
 
    
@@ -246,7 +246,7 @@ nm_device_adsl_get_carrier (
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html
index 3e64df33..c4234d64 100644
--- a/docs/libnm-glib/html/NMDeviceBond.html
+++ b/docs/libnm-glib/html/NMDeviceBond.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_bond_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_bond_new ()
@@ -66,14 +66,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_bond_get_carrier ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_bond_get_slaves ()
@@ -92,13 +92,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -144,7 +144,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceBond
@@ -157,7 +157,7 @@
 
    Functions
    
 
    
 
    nm_device_bond_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_bond_error_quark (void);
    
 
    Registers an error quark for NMDeviceBond if necessary.
    
 
    
@@ -168,8 +168,8 @@ nm_device_bond_error_quark (void<
 
    
 
    
 
    nm_device_bond_new ()
    
-
    GObject *
-nm_device_bond_new (DBusGConnection *connection,
+
    GObject *
+nm_device_bond_new (DBusGConnection *connection,
                     const char *path);
    
 
    Creates a new NMDeviceBond.
    
 
    
@@ -183,7 +183,7 @@ nm_device_bond_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -230,7 +230,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_bond_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_bond_get_carrier (NMDeviceBond *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -250,13 +250,13 @@ nm_device_bond_get_carrier (
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    
 
    
 
    
 
    nm_device_bond_get_slaves ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_device_bond_get_slaves (NMDeviceBond *device);
    
 
    Gets the devices currently slaved to device
 .
    
@@ -277,8 +277,8 @@ nm_device_bond_get_slaves (
 
    Returns
    
-
     the GPtrArray containing
-NMDevices that are slaves of device
+
     the GPtrArray containing
+NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 
    
 
    [element-type NMDevice]
    
@@ -360,7 +360,7 @@ copy used by the device, and must not be modified. 
    
 
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -368,7 +368,7 @@ copy used by the device, and must not be modified. 
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html
index 0fa39ecf..00821c1d 100644
--- a/docs/libnm-glib/html/NMDeviceBridge.html
+++ b/docs/libnm-glib/html/NMDeviceBridge.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_bridge_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_bridge_new ()
@@ -66,14 +66,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_bridge_get_carrier ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_bridge_get_slaves ()
@@ -92,13 +92,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -144,7 +144,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceBridge
@@ -157,7 +157,7 @@
 
    Functions
    
 
    
 
    nm_device_bridge_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_bridge_error_quark (void);
    
 
    Registers an error quark for NMDeviceBridge if necessary.
    
 
    
@@ -169,8 +169,8 @@ nm_device_bridge_error_quark (voi
 
    
 
    
 
    nm_device_bridge_new ()
    
-
    GObject *
-nm_device_bridge_new (DBusGConnection *connection,
+
    GObject *
+nm_device_bridge_new (DBusGConnection *connection,
                       const char *path);
    
 
    Creates a new NMDeviceBridge.
    
 
    
@@ -184,7 +184,7 @@ nm_device_bridge_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -233,7 +233,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_bridge_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_bridge_get_carrier (NMDeviceBridge *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -253,14 +253,14 @@ nm_device_bridge_get_carrier (
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    Since: 0.9.8
    
 
    
 
    
 
    
 
    nm_device_bridge_get_slaves ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_device_bridge_get_slaves (NMDeviceBridge *device);
    
 
    Gets the devices currently slaved to device
 .
    
@@ -281,8 +281,8 @@ nm_device_bridge_get_slaves (
 
    Returns
    
-
     the GPtrArray containing
-NMDevices that are slaves of device
+
     the GPtrArray containing
+NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 
    
 
    [element-type NMDevice]
    
@@ -365,7 +365,7 @@ copy used by the device, and must not be modified. 
    
 
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -374,7 +374,7 @@ copy used by the device, and must not be modified. 
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index b88627c6..847313ff 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_bt_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_bt_new ()
@@ -73,7 +73,7 @@
 
 
 
-NMBluetoothCapabilities
+NMBluetoothCapabilities
 
 
 nm_device_bt_get_capabilities ()
@@ -92,19 +92,19 @@
 
 
 
-guint
+guint
 bt-capabilities
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 name
 Read
 
@@ -144,7 +144,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceBt
@@ -157,7 +157,7 @@
 
    Functions
    
 
    
 
    nm_device_bt_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_bt_error_quark (void);
    
 
    Registers an error quark for NMDeviceBt if necessary.
    
 
    
@@ -168,8 +168,8 @@ nm_device_bt_error_quark (void
 
    
 
    nm_device_bt_new ()
    
-
    GObject *
-nm_device_bt_new (DBusGConnection *connection,
+
    GObject *
+nm_device_bt_new (DBusGConnection *connection,
                   const char *path);
    
 
    Creates a new NMDeviceBt.
    
 
    
@@ -183,7 +183,7 @@ nm_device_bt_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -256,7 +256,7 @@ nm_device_bt_get_name (
 
    nm_device_bt_get_capabilities ()
    
-
    NMBluetoothCapabilities
+
    NMBluetoothCapabilities
 nm_device_bt_get_capabilities (NMDeviceBt *device);
    
 
    Returns the Bluetooth device's usable capabilities.
    
 
    
@@ -276,7 +276,7 @@ nm_device_bt_get_capabilities (
 
    
 
    Returns
    
-
     a combination of NMBluetoothCapabilities
    
+
     a combination of NMBluetoothCapabilities
    
 
    
 
    
 
    
@@ -368,15 +368,15 @@ nm_device_bt_get_capabilities (
    Property Details
    
 
    
 
    The “bt-capabilities” property
    
-
      “bt-capabilities”          guint
    
-
    The device's bluetooth capabilities, a combination of NMBluetoothCapabilities.
    
+
      “bt-capabilities”          guint
    
+
    The device's bluetooth capabilities, a combination of NMBluetoothCapabilities.
    
 
    Flags: Read
    
 
    Default value: 0
    
 
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -384,7 +384,7 @@ nm_device_bt_get_capabilities (
 
    
 
    The “name” property
    
-
      “name”                     gchar *
    
+
      “name”                     gchar *
    
 
    The name of the bluetooth device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html
index 9fa020ef..ef7c87e9 100644
--- a/docs/libnm-glib/html/NMDeviceEthernet.html
+++ b/docs/libnm-glib/html/NMDeviceEthernet.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_ethernet_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_ethernet_new ()
@@ -73,7 +73,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_ethernet_get_speed ()
@@ -81,7 +81,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_ethernet_get_carrier ()
@@ -100,24 +100,24 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 perm-hw-address
 Read
 
 
-guint
+guint
 speed
 Read
 
@@ -161,7 +161,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceEthernet
@@ -174,7 +174,7 @@
 
    Functions
    
 
    
 
    nm_device_ethernet_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_ethernet_error_quark (void);
    
 
    Registers an error quark for NMDeviceEthernet if necessary.
    
 
    
@@ -185,8 +185,8 @@ nm_device_ethernet_error_quark (v
 
    
 
    
 
    nm_device_ethernet_new ()
    
-
    GObject *
-nm_device_ethernet_new (DBusGConnection *connection,
+
    GObject *
+nm_device_ethernet_new (DBusGConnection *connection,
                         const char *path);
    
 
    Creates a new NMDeviceEthernet.
    
 
    
@@ -200,7 +200,7 @@ nm_device_ethernet_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -275,7 +275,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_ethernet_get_speed ()
    
-
    guint32
+
    guint32
 nm_device_ethernet_get_speed (NMDeviceEthernet *device);
    
 
    Gets the speed of the NMDeviceEthernet.
    
 
    
@@ -301,7 +301,7 @@ nm_device_ethernet_get_speed (
 
    nm_device_ethernet_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_ethernet_get_carrier (NMDeviceEthernet *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -321,7 +321,7 @@ nm_device_ethernet_get_carrier (
 
    
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    
 
    
@@ -412,7 +412,7 @@ nm_device_ethernet_get_carrier (
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -420,7 +420,7 @@ nm_device_ethernet_get_carrier (
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The active hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -428,7 +428,7 @@ nm_device_ethernet_get_carrier (
 
    
 
    The “perm-hw-address” property
    
-
      “perm-hw-address”          gchar *
    
+
      “perm-hw-address”          gchar *
    
 
    The permanent hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -436,7 +436,7 @@ nm_device_ethernet_get_carrier (
 
    
 
    The “speed” property
    
-
      “speed”                    guint
    
+
      “speed”                    guint
    
 
    The speed of the device.
    
 
    Flags: Read
    
 
    Default value: 0
    
diff --git a/docs/libnm-glib/html/NMDeviceGeneric.html b/docs/libnm-glib/html/NMDeviceGeneric.html
index 3bf60761..eff41bfe 100644
--- a/docs/libnm-glib/html/NMDeviceGeneric.html
+++ b/docs/libnm-glib/html/NMDeviceGeneric.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_generic_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_generic_new ()
@@ -78,13 +78,13 @@
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 type-description
 Read
 
@@ -120,7 +120,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceGeneric
@@ -133,7 +133,7 @@
 
    Functions
    
 
    
 
    nm_device_generic_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_generic_error_quark (void);
    
 
    Registers an error quark for NMDeviceGeneric if necessary.
    
 
    
@@ -145,8 +145,8 @@ nm_device_generic_error_quark (vo
 
    
 
    
 
    nm_device_generic_new ()
    
-
    GObject *
-nm_device_generic_new (DBusGConnection *connection,
+
    GObject *
+nm_device_generic_new (DBusGConnection *connection,
                        const char *path);
    
 
    Creates a new NMDeviceGeneric.
    
 
    
@@ -160,7 +160,7 @@ nm_device_generic_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -268,7 +268,7 @@ device, and must not be modified.
    
 
    Property Details
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -276,8 +276,8 @@ device, and must not be modified.
    
 
    
 
    
 
    The “type-description” property
    
-
      “type-description”         gchar *
    
-
    A description of the specific type of device this is, or NULL
+
      “type-description”         gchar *
    
+
    A description of the specific type of device this is, or NULL
 if not known.
    
 
    Flags: Read
    
 
    Default value: NULL
    
diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html
index 16935937..2ed81002 100644
--- a/docs/libnm-glib/html/NMDeviceInfiniband.html
+++ b/docs/libnm-glib/html/NMDeviceInfiniband.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_infiniband_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_infiniband_new ()
@@ -66,7 +66,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_infiniband_get_carrier ()
@@ -85,13 +85,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -127,7 +127,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceInfiniband
@@ -140,7 +140,7 @@
 
    Functions
    
 
    
 
    nm_device_infiniband_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_infiniband_error_quark (void);
    
 
    Registers an error quark for NMDeviceInfiniband if necessary.
    
 
    
@@ -151,8 +151,8 @@ nm_device_infiniband_error_quark (
 
    
 
    nm_device_infiniband_new ()
    
-
    GObject *
-nm_device_infiniband_new (DBusGConnection *connection,
+
    GObject *
+nm_device_infiniband_new (DBusGConnection *connection,
                           const char *path);
    
 
    Creates a new NMDeviceInfiniband.
    
 
    
@@ -166,7 +166,7 @@ nm_device_infiniband_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -213,7 +213,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_infiniband_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_infiniband_get_carrier (NMDeviceInfiniband *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -233,7 +233,7 @@ nm_device_infiniband_get_carrier (
 
    
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    
 
    
@@ -312,7 +312,7 @@ nm_device_infiniband_get_carrier (
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -320,7 +320,7 @@ nm_device_infiniband_get_carrier (
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index f6f17303..e03d8f20 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_modem_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-NMDeviceModemCapabilities
+NMDeviceModemCapabilities
 
 
 nm_device_modem_get_modem_capabilities ()
@@ -59,7 +59,7 @@
 
 
 
-NMDeviceModemCapabilities
+NMDeviceModemCapabilities
 
 
 nm_device_modem_get_current_capabilities ()
@@ -78,12 +78,12 @@
 
 
 
-guint
+guint
 current-capabilities
 Read
 
 
-guint
+guint
 modem-capabilities
 Read
 
@@ -119,7 +119,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceModem
@@ -132,7 +132,7 @@
 
    Functions
    
 
    
 
    nm_device_modem_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_modem_error_quark (void);
    
 
    Registers an error quark for NMDeviceModem if necessary.
    
 
    
@@ -143,7 +143,7 @@ nm_device_modem_error_quark (void
 
    
 
    
 
    nm_device_modem_get_modem_capabilities ()
    
-
    NMDeviceModemCapabilities
+
    NMDeviceModemCapabilities
 nm_device_modem_get_modem_capabilities
                                (NMDeviceModem *self);
    
 
    Returns a bitfield of the generic access technology families the modem
@@ -172,7 +172,7 @@ may require a firmware reload or reinitialization.
    
 
    
 
    
 
    nm_device_modem_get_current_capabilities ()
    
-
    NMDeviceModemCapabilities
+
    NMDeviceModemCapabilities
 nm_device_modem_get_current_capabilities
                                (NMDeviceModem *self);
    
 
    Returns a bitfield of the generic access technology families the modem
@@ -268,7 +268,7 @@ a firmware reload or other reinitialization
    
 
    Property Details
    
 
    
 
    The “current-capabilities” property
    
-
      “current-capabilities”     guint
    
+
      “current-capabilities”     guint
    
 
    The generic family of access technologies the modem currently supports
 without a firmware reload or reinitialization.
    
 
    Flags: Read
    
@@ -277,7 +277,7 @@ without a firmware reload or reinitialization.
    
 
    
 
    
 
    The “modem-capabilities” property
    
-
      “modem-capabilities”       guint
    
+
      “modem-capabilities”       guint
    
 
    The generic family of access technologies the modem supports.  Not all
 capabilities are available at the same time however; some modems require
 a firmware reload or other reinitialization to switch between eg
diff --git a/docs/libnm-glib/html/NMDeviceOlpcMesh.html b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
index ae2e367a..cb82c33e 100644
--- a/docs/libnm-glib/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_olpc_mesh_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_olpc_mesh_new ()
@@ -74,7 +74,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_olpc_mesh_get_active_channel ()
@@ -93,7 +93,7 @@
 
 
 
-guint
+guint
 active-channel
 Read
 
@@ -105,7 +105,7 @@
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -145,7 +145,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceOlpcMesh
@@ -158,7 +158,7 @@
 
    Functions
    
 
    
 
    nm_device_olpc_mesh_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_olpc_mesh_error_quark (void);
    
 
    Registers an error quark for NMDeviceOlpcMesh if necessary.
    
 
    
@@ -169,8 +169,8 @@ nm_device_olpc_mesh_error_quark (
 
    
 
    
 
    nm_device_olpc_mesh_new ()
    
-
    GObject *
-nm_device_olpc_mesh_new (DBusGConnection *connection,
+
    GObject *
+nm_device_olpc_mesh_new (DBusGConnection *connection,
                          const char *path);
    
 
    Creates a new NMDeviceOlpcMesh.
    
 
    
@@ -184,7 +184,7 @@ nm_device_olpc_mesh_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -251,14 +251,14 @@ nm_device_olpc_mesh_get_companion (
 
    
 
    Returns
    
-
     the companion of the device of NULL. 
    
+
     the companion of the device of NULL. 
    
 
    [transfer none]
    
 
    
 
    
 
    
 
    
 
    nm_device_olpc_mesh_get_active_channel ()
    
-
    guint32
+
    guint32
 nm_device_olpc_mesh_get_active_channel
                                (NMDeviceOlpcMesh *device);
    
 
    Returns the active channel of the NMDeviceOlpcMesh device.
    
@@ -350,7 +350,7 @@ nm_device_olpc_mesh_get_active_channel
 
    Property Details
    
 
    
 
    The “active-channel” property
    
-
      “active-channel”           guint
    
+
      “active-channel”           guint
    
 
    The device's active channel.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -365,7 +365,7 @@ nm_device_olpc_mesh_get_active_channel
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
diff --git a/docs/libnm-glib/html/NMDeviceTeam.html b/docs/libnm-glib/html/NMDeviceTeam.html
index f7464aa5..5ea1fdd2 100644
--- a/docs/libnm-glib/html/NMDeviceTeam.html
+++ b/docs/libnm-glib/html/NMDeviceTeam.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_team_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_team_new ()
@@ -66,14 +66,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_team_get_carrier ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_team_get_slaves ()
@@ -92,13 +92,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -144,7 +144,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceTeam
@@ -157,7 +157,7 @@
 
    Functions
    
 
    
 
    nm_device_team_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_team_error_quark (void);
    
 
    Registers an error quark for NMDeviceTeam if necessary.
    
 
    
@@ -169,8 +169,8 @@ nm_device_team_error_quark (void<
 
    
 
    
 
    nm_device_team_new ()
    
-
    GObject *
-nm_device_team_new (DBusGConnection *connection,
+
    GObject *
+nm_device_team_new (DBusGConnection *connection,
                     const char *path);
    
 
    Creates a new NMDeviceTeam.
    
 
    
@@ -184,7 +184,7 @@ nm_device_team_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -233,7 +233,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_team_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_team_get_carrier (NMDeviceTeam *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -253,14 +253,14 @@ nm_device_team_get_carrier (
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    Since: 0.9.10
    
 
    
 
    
 
    
 
    nm_device_team_get_slaves ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_device_team_get_slaves (NMDeviceTeam *device);
    
 
    Gets the devices currently enslaved to device
 .
    
@@ -281,8 +281,8 @@ nm_device_team_get_slaves (
 
    Returns
    
-
     the GPtrArray containing
-NMDevices that are slaves of device
+
     the GPtrArray containing
+NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 
    
 
    [element-type NMDevice]
    
@@ -364,7 +364,7 @@ copy used by the device, and must not be modified. 
    
 
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -372,7 +372,7 @@ copy used by the device, and must not be modified. 
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
diff --git a/docs/libnm-glib/html/NMDeviceVlan.html b/docs/libnm-glib/html/NMDeviceVlan.html
index 8e5b4c71..72052696 100644
--- a/docs/libnm-glib/html/NMDeviceVlan.html
+++ b/docs/libnm-glib/html/NMDeviceVlan.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_vlan_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_vlan_new ()
@@ -66,7 +66,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vlan_get_carrier ()
@@ -82,7 +82,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vlan_get_vlan_id ()
@@ -101,13 +101,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -118,7 +118,7 @@
 Read
 
 
-guint
+guint
 vlan-id
 Read
 
@@ -162,7 +162,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceVlan
@@ -175,7 +175,7 @@
 
    Functions
    
 
    
 
    nm_device_vlan_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_vlan_error_quark (void);
    
 
    Registers an error quark for NMDeviceVlan if necessary.
    
 
    
@@ -186,8 +186,8 @@ nm_device_vlan_error_quark (void<
 
    
 
    
 
    nm_device_vlan_new ()
    
-
    GObject *
-nm_device_vlan_new (DBusGConnection *connection,
+
    GObject *
+nm_device_vlan_new (DBusGConnection *connection,
                     const char *path);
    
 
    Creates a new NMDeviceVlan.
    
 
    
@@ -201,7 +201,7 @@ nm_device_vlan_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -248,7 +248,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_vlan_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_vlan_get_carrier (NMDeviceVlan *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -268,7 +268,7 @@ nm_device_vlan_get_carrier (
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    
 
    
@@ -301,7 +301,7 @@ nm_device_vlan_get_parent (
 
    nm_device_vlan_get_vlan_id ()
    
-
    guint
+
    guint
 nm_device_vlan_get_vlan_id (NMDeviceVlan *device);
    
 
    
 
    Parameters
    
@@ -418,7 +418,7 @@ nm_device_vlan_get_vlan_id (
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -426,7 +426,7 @@ nm_device_vlan_get_vlan_id (
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -442,7 +442,7 @@ nm_device_vlan_get_vlan_id (
 
    The “vlan-id” property
    
-
      “vlan-id”                  guint
    
+
      “vlan-id”                  guint
    
 
    The device's VLAN ID.
    
 
    Flags: Read
    
 
    Allowed values: <= 4095
    
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index 04f6ee88..0c2e4b02 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -44,7 +44,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_wifi_error_quark ()
@@ -52,7 +52,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_wifi_new ()
@@ -74,7 +74,7 @@
 
 
 
-NM80211Mode
+NM80211Mode
 
 
 nm_device_wifi_get_mode ()
@@ -82,7 +82,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_wifi_get_bitrate ()
@@ -90,7 +90,7 @@
 
 
 
-NMDeviceWifiCapabilities
+NMDeviceWifiCapabilities
 
 
 nm_device_wifi_get_capabilities ()
@@ -113,7 +113,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_wifi_get_access_points ()
@@ -160,29 +160,29 @@
 Read
 
 
-guint
+guint
 bitrate
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
-guint
+guint
 mode
 Read
 
 
 
-gchar *
+gchar *
 perm-hw-address
 Read
 
 
-guint
+guint
 wireless-capabilities
 Read
 
@@ -201,12 +201,12 @@
 
 void
 access-point-added
-Run First
+Run First
 
 
 void
 access-point-removed
-Run First
+Run First
 
 
 
    
@@ -260,7 +260,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceWifi
@@ -273,7 +273,7 @@
 
    Functions
    
 
    
 
    nm_device_wifi_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_wifi_error_quark (void);
    
 
    Registers an error quark for NMDeviceWifi if necessary.
    
 
    
@@ -284,8 +284,8 @@ nm_device_wifi_error_quark (void<
 
    
 
    
 
    nm_device_wifi_new ()
    
-
    GObject *
-nm_device_wifi_new (DBusGConnection *connection,
+
    GObject *
+nm_device_wifi_new (DBusGConnection *connection,
                     const char *path);
    
 
    Creates a new NMDeviceWifi.
    
 
    
@@ -299,7 +299,7 @@ nm_device_wifi_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -374,7 +374,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_wifi_get_mode ()
    
-
    NM80211Mode
+
    NM80211Mode
 nm_device_wifi_get_mode (NMDeviceWifi *device);
    
 
    Gets the NMDeviceWifi mode.
    
 
    
@@ -400,7 +400,7 @@ nm_device_wifi_get_mode (
 
    nm_device_wifi_get_bitrate ()
    
-
    guint32
+
    guint32
 nm_device_wifi_get_bitrate (NMDeviceWifi *device);
    
 
    Gets the bit rate of the NMDeviceWifi in kbit/s.
    
 
    
@@ -426,7 +426,7 @@ nm_device_wifi_get_bitrate (
 
    nm_device_wifi_get_capabilities ()
    
-
    NMDeviceWifiCapabilities
+
    NMDeviceWifiCapabilities
 nm_device_wifi_get_capabilities (NMDeviceWifi *device);
    
 
    Gets the Wi-Fi capabilities of the NMDeviceWifi.
    
 
    
@@ -473,7 +473,7 @@ nm_device_wifi_get_active_access_point
 
    
 
    
 
    Returns
    
-
     the access point or NULL if none is active. 
    
+
     the access point or NULL if none is active. 
    
 
    [transfer none]
    
 
    
 
    
@@ -509,14 +509,14 @@ nm_device_wifi_get_access_point_by_path
 
    
 
    
 
    Returns
    
-
     the access point or NULL if none is found. 
    
+
     the access point or NULL if none is found. 
    
 
    [transfer none]
    
 
    
 
    
 
    
 
    
 
    nm_device_wifi_get_access_points ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_device_wifi_get_access_points (NMDeviceWifi *device);
    
 
    Gets all the scanned access points of the NMDeviceWifi.
    
 
    
@@ -536,8 +536,8 @@ nm_device_wifi_get_access_points (
 
    
 
    Returns
    
-
     a GPtrArray containing all the
-scanned NMAccessPoints.
+
     a GPtrArray containing all the
+scanned NMAccessPoints.
 The returned array is owned by the client and should not be modified. 
    
 
    [element-type NMAccessPoint]
    
 
    
@@ -547,8 +547,8 @@ The returned array is owned by the client and should not be modified. 
    
 
    NMDeviceWifiRequestScanFn ()
    
 
    void
 (*NMDeviceWifiRequestScanFn) (NMDeviceWifi *device,
-                              GError *error,
-                              gpointer user_data);
    
+                              GError *error,
+                              gpointer user_data);
    
 
    
 
    
 
    
@@ -556,7 +556,7 @@ The returned array is owned by the client and should not be modified. 
    
 
    void
 nm_device_wifi_request_scan_simple (NMDeviceWifi *device,
                                     NMDeviceWifiRequestScanFn callback,
-                                    gpointer user_data);
    
+                                    gpointer user_data);
    
 
    Request NM to scan for access points on the NMDeviceWifi. This function only
 instructs NM to perform scanning. Use nm_device_wifi_get_access_points()
 to get available access points.
    
@@ -726,7 +726,7 @@ required by the connection
    
 
    
 
    
 
    The “bitrate” property
    
-
      “bitrate”                  guint
    
+
      “bitrate”                  guint
    
 
    The bit rate of the device in kbit/s.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -734,7 +734,7 @@ required by the connection
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -742,7 +742,7 @@ required by the connection
    
 
    
 
    
 
    The “mode” property
    
-
      “mode”                     guint
    
+
      “mode”                     guint
    
 
    The mode of the device.
    
 
    Flags: Read
    
 
    Allowed values: <= 3
    
@@ -751,7 +751,7 @@ required by the connection
    
 
    
 
    
 
    The “perm-hw-address” property
    
-
      “perm-hw-address”          gchar *
    
+
      “perm-hw-address”          gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -759,7 +759,7 @@ required by the connection
    
 
    
 
    
 
    The “wireless-capabilities” property
    
-
      “wireless-capabilities”    guint
    
+
      “wireless-capabilities”    guint
    
 
    The wireless capabilities of the device.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -771,8 +771,8 @@ required by the connection
    
 
    The “access-point-added” signal
    
 
    void
 user_function (NMDeviceWifi *device,
-               GObject      *ap,
-               gpointer      user_data)
    
+               GObject      *ap,
+               gpointer      user_data)
    
 
    Notifies that a NMAccessPoint is added to the Wi-Fi device.
    
 
    
 
    Parameters
    
@@ -801,15 +801,15 @@ user_function (
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “access-point-removed” signal
    
 
    void
 user_function (NMDeviceWifi *device,
-               GObject      *ap,
-               gpointer      user_data)
    
+               GObject      *ap,
+               gpointer      user_data)
    
 
    Notifies that a NMAccessPoint is removed from the Wi-Fi device.
    
 
    
 
    Parameters
    
@@ -838,7 +838,7 @@ user_function (
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html
index 86270699..06d03477 100644
--- a/docs/libnm-glib/html/NMDeviceWimax.html
+++ b/docs/libnm-glib/html/NMDeviceWimax.html
@@ -44,7 +44,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_wimax_error_quark ()
@@ -52,7 +52,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_wimax_new ()
@@ -82,7 +82,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_wimax_get_nsps ()
@@ -90,7 +90,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_wimax_get_center_frequency ()
@@ -98,7 +98,7 @@
 
 
 
-gint
+gint
 
 
 nm_device_wimax_get_rssi ()
@@ -106,7 +106,7 @@
 
 
 
-gint
+gint
 
 
 nm_device_wimax_get_cinr ()
@@ -114,7 +114,7 @@
 
 
 
-gint
+gint
 
 
 nm_device_wimax_get_tx_power ()
@@ -147,23 +147,23 @@
 
 
 
-gchar *
+gchar *
 bsid
 Read
 
 
-guint
+guint
 center-frequency
 Read
 
 
-gint
+gint
 cinr
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -174,12 +174,12 @@
 Read
 
 
-gint
+gint
 rssi
 Read
 
 
-gint
+gint
 tx-power
 Read
 
@@ -198,12 +198,12 @@
 
 void
 nsp-added
-Run First
+Run First
 
 
 void
 nsp-removed
-Run First
+Run First
 
 
 
    
@@ -261,7 +261,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceWimax
@@ -274,7 +274,7 @@
 
    Functions
    
 
    
 
    nm_device_wimax_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_wimax_error_quark (void);
    
 
    
 
    nm_device_wimax_error_quark has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -289,8 +289,8 @@ nm_device_wimax_error_quark (void
 
    
 
    
 
    nm_device_wimax_new ()
    
-
    GObject *
-nm_device_wimax_new (DBusGConnection *connection,
+
    GObject *
+nm_device_wimax_new (DBusGConnection *connection,
                      const char *path);
    
 
    
 
    nm_device_wimax_new has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -308,7 +308,7 @@ nm_device_wimax_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -383,7 +383,7 @@ nm_device_wimax_get_active_nsp (
 
    
 
    Returns
    
-
     the access point or NULL if none is active. 
    
+
     the access point or NULL if none is active. 
    
 
    [transfer full]
    
 
    
 
    
@@ -422,14 +422,14 @@ nm_device_wimax_get_nsp_by_path (
 
    
 
    Returns
    
-
     the access point or NULL if none is found. 
    
+
     the access point or NULL if none is found. 
    
 
    [transfer none]
    
 
    
 
    
 
    
 
    
 
    nm_device_wimax_get_nsps ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_device_wimax_get_nsps (NMDeviceWimax *wimax);
    
 
    
 
    nm_device_wimax_get_nsps has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -453,8 +453,8 @@ nm_device_wimax_get_nsps (
 
    Returns
    
-
     a GPtrArray containing
-all the scanned NMWimaxNsps.
+
     a GPtrArray containing
+all the scanned NMWimaxNsps.
 The returned array is owned by the client and should not be modified. 
    
 
    [element-type NMWimaxNsp]
    
 
    
@@ -462,7 +462,7 @@ The returned array is owned by the client and should not be modified. 
    
 
    
 
    
 
    nm_device_wimax_get_center_frequency ()
    
-
    guint
+
    guint
 nm_device_wimax_get_center_frequency (NMDeviceWimax *self);
    
 
    
 
    nm_device_wimax_get_center_frequency has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -494,7 +494,7 @@ device is not connected.
    
 
    
 
    
 
    nm_device_wimax_get_rssi ()
    
-
    gint
+
    gint
 nm_device_wimax_get_rssi (NMDeviceWimax *self);
    
 
    
 
    nm_device_wimax_get_rssi has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -527,7 +527,7 @@ device is not connected.
    
 
    
 
    
 
    nm_device_wimax_get_cinr ()
    
-
    gint
+
    gint
 nm_device_wimax_get_cinr (NMDeviceWimax *self);
    
 
    
 
    nm_device_wimax_get_cinr has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -559,7 +559,7 @@ meaning when the device is not connected.
    
 
    
 
    
 
    nm_device_wimax_get_tx_power ()
    
-
    gint
+
    gint
 nm_device_wimax_get_tx_power (NMDeviceWimax *self);
    
 
    
 
    nm_device_wimax_get_tx_power has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -615,7 +615,7 @@ nm_device_wimax_get_bsid (
 
    Returns
    
-
     the ID of the serving Base Station, or NULL
    
+
     the ID of the serving Base Station, or NULL
    
 
    
 
    
 
    
@@ -741,7 +741,7 @@ nm_device_wimax_get_bsid (
 
    The “bsid” property
    
-
      “bsid”                     gchar *
    
+
      “bsid”                     gchar *
    
 
    The ID of the serving base station as received from the network.  Has
 no meaning when the device is not connected.
    
 
    
@@ -754,7 +754,7 @@ no meaning when the device is not connected.
    
 
    
 
    
 
    The “center-frequency” property
    
-
      “center-frequency”         guint
    
+
      “center-frequency”         guint
    
 
    The center frequency (in KHz) of the radio channel the device is using to
 communicate with the network when connected.  Has no meaning when the
 device is not connected.
    
@@ -768,7 +768,7 @@ device is not connected.
    
 
    
 
    
 
    The “cinr” property
    
-
      “cinr”                     gint
    
+
      “cinr”                     gint
    
 
    CINR (Carrier to Interference + Noise Ratio) of the current radio link
 in dB.  CINR is a more accurate measure of radio link quality.  Has no
 meaning when the device is not connected.
    
@@ -782,7 +782,7 @@ meaning when the device is not connected.
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    
 
    NMDeviceWimax:hw-address has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -806,7 +806,7 @@ meaning when the device is not connected.
    
 
    
 
    
 
    The “rssi” property
    
-
      “rssi”                     gint
    
+
      “rssi”                     gint
    
 
    RSSI of the current radio link in dBm.  This value indicates how strong
 the raw received RF signal from the base station is, but does not
 indicate the overall quality of the radio link.  Has no meaning when the
@@ -821,7 +821,7 @@ device is not connected.
    
 
    
 
    
 
    The “tx-power” property
    
-
      “tx-power”                 gint
    
+
      “tx-power”                 gint
    
 
    Average power of the last burst transmitted by the device, in units of
 0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
 -5.5 dBm.  Has no meaning when the device is not connected.
    
@@ -839,8 +839,8 @@ device is not connected.
    
 
    The “nsp-added” signal
    
 
    void
 user_function (NMDeviceWimax *self,
-               GObject       *nsp,
-               gpointer       user_data)
    
+               GObject       *nsp,
+               gpointer       user_data)
    
 
    Notifies that a NMWimaxNsp is added to the wimax device.
    
 
    
 
    NMDeviceWimax::nsp-added has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -873,15 +873,15 @@ user_function (<
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “nsp-removed” signal
    
 
    void
 user_function (NMDeviceWimax *self,
-               GObject       *nsp,
-               gpointer       user_data)
    
+               GObject       *nsp,
+               gpointer       user_data)
    
 
    Notifies that a NMWimaxNsp is removed from the wimax device.
    
 
    
 
    NMDeviceWimax::nsp-removed has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -914,7 +914,7 @@ user_function (<
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index e475e222..32e94e11 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -43,7 +43,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_ip4_config_new ()
@@ -57,42 +57,42 @@
 
 
 
-const GSList *
+const GSList *
 
 
 nm_ip4_config_get_addresses ()
 
 
 
-const GSList *
+const GSList *
 
 
 nm_ip4_config_get_routes ()
 
 
 
-const GArray *
+const GArray *
 
 
 nm_ip4_config_get_nameservers ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_ip4_config_get_domains ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_ip4_config_get_searches ()
 
 
 
-const GArray *
+const GArray *
 
 
 nm_ip4_config_get_wins_servers ()
@@ -111,7 +111,7 @@
 
 
 
-gpointer
+gpointer
 addresses
 Read
 
@@ -123,7 +123,7 @@
 
 
 
-gchar *
+gchar *
 gateway
 Read
 
@@ -134,7 +134,7 @@
 Read
 
 
-gpointer
+gpointer
 routes
 Read
 
@@ -194,7 +194,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMIP4Config
 
    
@@ -206,8 +206,8 @@
 
    Functions
    
 
    
 
    nm_ip4_config_new ()
    
-
    GObject *
-nm_ip4_config_new (DBusGConnection *connection,
+
    GObject *
+nm_ip4_config_new (DBusGConnection *connection,
                    const char *object_path);
    
 
    Creates a new NMIP4Config.
    
 
    
@@ -221,7 +221,7 @@ nm_ip4_config_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -268,7 +268,7 @@ nm_ip4_config_get_gateway (
 
    nm_ip4_config_get_addresses ()
    
-
    const GSList *
+
    const GSList *
 nm_ip4_config_get_addresses (NMIP4Config *config);
    
 
    Gets the IP4 addresses (containing the address, prefix, and gateway).
    
 
    
@@ -288,7 +288,7 @@ nm_ip4_config_get_addresses (
 
    Returns
    
-
     the GSList containing NMIP4Addresses.
+
     the GSList containing NMIP4Addresses.
 This is the internal copy used by the configuration and must not be modified. 
    
 
    [element-type NMIP4Address]
    
 
    
@@ -296,7 +296,7 @@ This is the internal copy used by the configuration and must not be modified. 
 
    
 
    nm_ip4_config_get_routes ()
    
-
    const GSList *
+
    const GSList *
 nm_ip4_config_get_routes (NMIP4Config *config);
    
 
    Gets the routes.
    
 
    
@@ -316,7 +316,7 @@ nm_ip4_config_get_routes (
 
    Returns
    
-
     the GSList containing
+
     the GSList containing
 NMIP4Routes. This is the internal copy used by the configuration,
 and must not be modified. 
    
 
    [element-type NMIP4Route]
    
@@ -325,7 +325,7 @@ and must not be modified. 
    
 
    
 
    
 
    nm_ip4_config_get_nameservers ()
    
-
    const GArray *
+
    const GArray *
 nm_ip4_config_get_nameservers (NMIP4Config *config);
    
 
    Gets the domain name servers (DNS).
    
 
    
@@ -345,7 +345,7 @@ nm_ip4_config_get_nameservers (
 
    
 
    Returns
    
-
     the GArray containing guint32s.
+
     the GArray containing guint32s.
 This is the internal copy used by the configuration and must not be
 modified. 
    
 
    [element-type guint32]
    
@@ -354,7 +354,7 @@ modified. 
    
 
    
 
    
 
    nm_ip4_config_get_domains ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_ip4_config_get_domains (NMIP4Config *config);
    
 
    Gets the domain names.
    
 
    
@@ -374,7 +374,7 @@ nm_ip4_config_get_domains (
 
    Returns
    
-
     the GPtrArray containing domains as strings. This is the
+
     the GPtrArray containing domains as strings. This is the
 internal copy used by the configuration, and must not be modified. 
    
 
    [element-type utf8]
    
 
    
@@ -382,7 +382,7 @@ internal copy used by the configuration, and must not be modified. 
    
 
    
 
    
 
    nm_ip4_config_get_searches ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_ip4_config_get_searches (NMIP4Config *config);
    
 
    Gets the dns searches.
    
 
    
@@ -402,7 +402,7 @@ nm_ip4_config_get_searches (
 
    Returns
    
-
     the GPtrArray containing dns searches as strings. This is the
+
     the GPtrArray containing dns searches as strings. This is the
 internal copy used by the configuration, and must not be modified. 
    
 
    [element-type utf8]
    
 
    
@@ -411,7 +411,7 @@ internal copy used by the configuration, and must not be modified. 
    
 
    
 
    
 
    nm_ip4_config_get_wins_servers ()
    
-
    const GArray *
+
    const GArray *
 nm_ip4_config_get_wins_servers (NMIP4Config *config);
    
 
    Gets the Windows Internet Name Service servers (WINS).
    
 
    
@@ -431,7 +431,7 @@ nm_ip4_config_get_wins_servers (
 
    
 
    Returns
    
-
     the GArray containing guint32s.
+
     the GArray containing guint32s.
 This is the internal copy used by the configuration and must not be
 modified. 
    
 
    [element-type guint32]
    
@@ -486,21 +486,21 @@ modified. 
    
 
    Property Details
    
 
    
 
    The “addresses” property
    
-
      “addresses”                gpointer
    
-
    The GPtrArray containing NMIP4Addresses of the configuration.
    
+
      “addresses”                gpointer
    
+
    The GPtrArray containing NMIP4Addresses of the configuration.
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “domains” property
    
 
      “domains”                  NMStringArray *
    
-
    The GPtrArray containing domain strings of the configuration.
    
+
    The GPtrArray containing domain strings of the configuration.
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “gateway” property
    
-
      “gateway”                  gchar *
    
+
      “gateway”                  gchar *
    
 
    The IP4 gateway address of the configuration as string.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -510,21 +510,21 @@ modified. 
    
 
    
 
    The “nameservers” property
    
 
      “nameservers”              NMUintArray *
    
-
    The GArray containing name servers (guint32s) of the configuration.
    
+
    The GArray containing name servers (guint32s) of the configuration.
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “routes” property
    
-
      “routes”                   gpointer
    
-
    The GPtrArray containing NMSettingIP4Routes of the configuration.
    
+
      “routes”                   gpointer
    
+
    The GPtrArray containing NMSettingIP4Routes of the configuration.
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “searches” property
    
 
      “searches”                 NMStringArray *
    
-
    The GPtrArray containing dns search strings of the configuration.
    
+
    The GPtrArray containing dns search strings of the configuration.
    
 
    Flags: Read
    
 
    Since: 0.9.10
    
 
    
@@ -532,7 +532,7 @@ modified. 
    
 
    
 
    The “wins-servers” property
    
 
      “wins-servers”             NMUintArray *
    
-
    The GArray containing WINS servers (guint32s) of the configuration.
    
+
    The GArray containing WINS servers (guint32s) of the configuration.
    
 
    Flags: Read
    
 
    
 
    
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index fb74f113..251b855e 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -43,7 +43,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_ip6_config_new ()
@@ -57,14 +57,14 @@
 
 
 
-const GSList *
+const GSList *
 
 
 nm_ip6_config_get_addresses ()
 
 
 
-const GSList *
+const GSList *
 
 
 nm_ip6_config_get_routes ()
@@ -72,7 +72,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_ip6_config_get_num_nameservers ()
@@ -86,21 +86,21 @@
 
 
 
-const GSList *
+const GSList *
 
 
 nm_ip6_config_get_nameservers ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_ip6_config_get_domains ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_ip6_config_get_searches ()
@@ -132,7 +132,7 @@
 
 
 
-gchar *
+gchar *
 gateway
 Read
 
@@ -194,7 +194,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMIP6Config
 
    
@@ -206,8 +206,8 @@
 
    Functions
    
 
    
 
    nm_ip6_config_new ()
    
-
    GObject *
-nm_ip6_config_new (DBusGConnection *connection,
+
    GObject *
+nm_ip6_config_new (DBusGConnection *connection,
                    const char *object_path);
    
 
    Creates a new NMIP6Config.
    
 
    
@@ -221,7 +221,7 @@ nm_ip6_config_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -268,7 +268,7 @@ nm_ip6_config_get_gateway (
 
    nm_ip6_config_get_addresses ()
    
-
    const GSList *
+
    const GSList *
 nm_ip6_config_get_addresses (NMIP6Config *config);
    
 
    Gets the IP6 addresses (containing the address, prefix, and gateway).
    
 
    
@@ -288,7 +288,7 @@ nm_ip6_config_get_addresses (
 
    Returns
    
-
     the GSList containing
+
     the GSList containing
 NMIP6Addresses. This is the internal copy used by the configuration
 and must not be modified. 
    
 
    [element-type NMIP6Address]
    
@@ -297,7 +297,7 @@ and must not be modified. 
    
 
    
 
    
 
    nm_ip6_config_get_routes ()
    
-
    const GSList *
+
    const GSList *
 nm_ip6_config_get_routes (NMIP6Config *config);
    
 
    Gets the routes.
    
 
    
@@ -317,7 +317,7 @@ nm_ip6_config_get_routes (
 
    Returns
    
-
     the GSList containing
+
     the GSList containing
 NMIP6Routes. This is the internal copy used by the configuration,
 and must not be modified. 
    
 
    [element-type NMIP6Route]
    
@@ -326,7 +326,7 @@ and must not be modified. 
    
 
    
 
    
 
    nm_ip6_config_get_num_nameservers ()
    
-
    guint32
+
    guint32
 nm_ip6_config_get_num_nameservers (NMIP6Config *config);
    
 
    Gets the number of the domain name servers in the configuration.
    
 
    
@@ -355,7 +355,7 @@ nm_ip6_config_get_num_nameservers (
    nm_ip6_config_get_nameserver ()
    
 
    const struct in6_addr *
 nm_ip6_config_get_nameserver (NMIP6Config *config,
-                              guint32 idx);
    
+                              guint32 idx);
    
 
    Gets the domain name server at index idx
  in the configuration.
    
 
    
@@ -391,7 +391,7 @@ nm_ip6_config_get_nameserver (
 
    nm_ip6_config_get_nameservers ()
    
-
    const GSList *
+
    const GSList *
 nm_ip6_config_get_nameservers (NMIP6Config *config);
    
 
    Gets the domain name servers (DNS).
    
 
    [skip]
    
@@ -412,7 +412,7 @@ nm_ip6_config_get_nameservers (
 
    
 
    Returns
    
-
     a GSList containing elements of type 'struct in6_addr' which
+
     a GSList containing elements of type 'struct in6_addr' which
 contain the addresses of nameservers of the configuration.  This is the
 internal copy used by the configuration and must not be modified.
    
 
    
@@ -420,7 +420,7 @@ internal copy used by the configuration and must not be modified.
    
 
    
 
    
 
    nm_ip6_config_get_domains ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_ip6_config_get_domains (NMIP6Config *config);
    
 
    Gets the domain names.
    
 
    
@@ -440,7 +440,7 @@ nm_ip6_config_get_domains (
 
    Returns
    
-
     the GPtrArray containing domains as strings.
+
     the GPtrArray containing domains as strings.
 This is the internal copy used by the configuration, and must not be modified. 
    
 
    [element-type utf8]
    
 
    
@@ -448,7 +448,7 @@ This is the internal copy used by the configuration, and must not be modified. <
 
    
 
    
 
    nm_ip6_config_get_searches ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_ip6_config_get_searches (NMIP6Config *config);
    
 
    Gets the dns searches.
    
 
    
@@ -468,7 +468,7 @@ nm_ip6_config_get_searches (
 
    Returns
    
-
     the GPtrArray containing dns searches as strings.
+
     the GPtrArray containing dns searches as strings.
 This is the internal copy used by the configuration, and must not be modified. 
    
 
    [element-type utf8]
    
 
    
@@ -518,8 +518,8 @@ This is the internal copy used by the configuration, and must not be modified. <
 
    
 
    The “addresses” property
    
 
      “addresses”                NMIP6AddressObjectArray *
    
-
    The GPtrArray containing the IPv6 addresses;  use
-nm_utils_ip6_addresses_from_gvalue() to return a GSList of
+
    The GPtrArray containing the IPv6 addresses;  use
+nm_utils_ip6_addresses_from_gvalue() to return a GSList of
 NMSettingIP6Address objects that is more usable than the raw data.
    
 
    Flags: Read
    
 
    
@@ -527,13 +527,13 @@ This is the internal copy used by the configuration, and must not be modified. <
 
    
 
    The “domains” property
    
 
      “domains”                  NMStringArray *
    
-
    The GPtrArray containing domain strings of the configuration.
    
+
    The GPtrArray containing domain strings of the configuration.
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “gateway” property
    
-
      “gateway”                  gchar *
    
+
      “gateway”                  gchar *
    
 
    The IPv6 gateway as string
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -543,7 +543,7 @@ This is the internal copy used by the configuration, and must not be modified. <
 
    
 
    The “nameservers” property
    
 
      “nameservers”              NMIP6AddressArray *
    
-
    The GPtrArray containing elements of type 'struct ip6_addr' which
+
    The GPtrArray containing elements of type 'struct ip6_addr' which
 contain the addresses of nameservers of the configuration.
    
 
    Flags: Read
    
 
    
@@ -551,8 +551,8 @@ contain the addresses of nameservers of the configuration.
    
 
    
 
    The “routes” property
    
 
      “routes”                   NMIP6RouteObjectArray *
    
-
    The GPtrArray containing the IPv6 routes;  use
-nm_utils_ip6_routes_from_gvalue() to return a GSList of
+
    The GPtrArray containing the IPv6 routes;  use
+nm_utils_ip6_routes_from_gvalue() to return a GSList of
 NMSettingIP6Address objects that is more usable than the raw data.
    
 
    Flags: Read
    
 
    
@@ -560,7 +560,7 @@ contain the addresses of nameservers of the configuration.
    
 
    
 
    The “searches” property
    
 
      “searches”                 NMStringArray *
    
-
    The GPtrArray containing dns search strings of the configuration.
    
+
    The GPtrArray containing dns search strings of the configuration.
    
 
    Flags: Read
    
 
    Since: 0.9.10
    
 
    
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index 22f20ed9..4432c58d 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -44,7 +44,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_object_error_quark ()
@@ -52,7 +52,7 @@
 
 
 
-DBusGConnection *
+DBusGConnection *
 
 
 nm_object_get_connection ()
@@ -79,13 +79,13 @@
 
 
 
-DBusGConnection *
+DBusGConnection *
 dbus-connection
 Read / Write / Construct Only
 
 
 
-gchar *
+gchar *
 dbus-path
 Read / Write / Construct Only
 
@@ -103,7 +103,7 @@
 
 void
 object-creation-failed
-Run First
+Run First
 
 
    
 
    
@@ -136,7 +136,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ├── NMClient
         ├── NMDevice
@@ -156,7 +156,7 @@
 
    Functions
    
 
    
 
    nm_object_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_object_error_quark (void);
    
 
    Registers an error quark for NMObject if necessary.
    
 
    
@@ -167,7 +167,7 @@ nm_object_error_quark (void
 
    
 
    nm_object_get_connection ()
    
-
    DBusGConnection *
+
    DBusGConnection *
 nm_object_get_connection (NMObject *object);
    
 
    Gets the NMObject's DBusGConnection.
    
 
    
@@ -274,13 +274,13 @@ device, and must not be modified.
    
 
    Property Details
    
 
    
 
    The “dbus-connection” property
    
-
      “dbus-connection”          DBusGConnection *
    
+
      “dbus-connection”          DBusGConnection *
    
 
    Flags: Read / Write / Construct Only
    
 
    
 
    
 
    
 
    The “dbus-path” property
    
-
      “dbus-path”                gchar *
    
+
      “dbus-path”                gchar *
    
 
    Flags: Read / Write / Construct Only
    
 
    Default value: NULL
    
 
    
@@ -291,9 +291,9 @@ device, and must not be modified.
    
 
    The “object-creation-failed” signal
    
 
    void
 user_function (NMObject *master_object,
-               gpointer  error,
-               gpointer  failed_path,
-               gpointer  user_data)
    
+               gpointer  error,
+               gpointer  failed_path,
+               gpointer  user_data)
    
 
    Indicates that an error occured while creating an NMObject object
 during property handling of master_object
 .
    
@@ -331,7 +331,7 @@ during property handling of master_object
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index 77c868c4..5804a1a4 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -44,7 +44,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_remote_connection_error_quark ()
@@ -116,7 +116,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_get_unsaved ()
@@ -136,24 +136,24 @@
 
 
 
-DBusGConnection *
+DBusGConnection *
 bus
 Write / Construct Only
 
 
 
-DBusGConnection *
+DBusGConnection *
 dbus-connection
 Write / Construct Only
 
 
 
-gchar *
+gchar *
 dbus-path
 Write / Construct Only
 
 
-gboolean
+gboolean
 unsaved
 Read
 
@@ -172,17 +172,17 @@
 
 void
 removed
-Run First
+Run First
 
 
 void
 updated
-Run First
+Run First
 
 
 void
 visible
-Run First
+Run First
 
 
 
    
@@ -228,8 +228,8 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
-    ╰── NMConnection
+
        GObject
+    ╰── NMConnection
         ╰── NMRemoteConnection
 
    
 
    
@@ -240,7 +240,7 @@
 
    Functions
    
 
    
 
    nm_remote_connection_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_remote_connection_error_quark (void);
    
 
    Registers an error quark for NMRemoteConnection if necessary.
    
 
    
@@ -253,8 +253,8 @@ nm_remote_connection_error_quark (
    NMRemoteConnectionResultFunc ()
    
 
    void
 (*NMRemoteConnectionResultFunc) (NMRemoteConnection *connection,
-                                 GError *error,
-                                 gpointer user_data);
    
+                                 GError *error,
+                                 gpointer user_data);
    
 
    Called when NetworkManager has finished an asynchronous operation on a
 connection, like commit changes, deleting, saving, etc.
    
 
    
@@ -290,9 +290,9 @@ connection, like commit changes, deleting, saving, etc.
    
 
    NMRemoteConnectionGetSecretsFunc ()
    
 
    void
 (*NMRemoteConnectionGetSecretsFunc) (NMRemoteConnection *connection,
-                                     GHashTable *secrets,
-                                     GError *error,
-                                     gpointer user_data);
    
+                                     GHashTable *secrets,
+                                     GError *error,
+                                     gpointer user_data);
    
 
    Called when NetworkManager returns secrets in response to a request for
 secrets via nm_remote_connection_get_secrets().
    
 
    
@@ -312,7 +312,7 @@ secrets via 
    secrets
    
 
     on success, a hash table of
-hash tables, with each inner hash mapping a setting property to a GValue
+hash tables, with each inner hash mapping a setting property to a GValue
 containing that property's value. 
    
 [element-type utf8 GLib.HashTable]
 
@@ -334,7 +334,7 @@ containing that property's value. 
    
 
    
 
    nm_remote_connection_new ()
    
 
    NMRemoteConnection *
-nm_remote_connection_new (DBusGConnection *bus,
+nm_remote_connection_new (DBusGConnection *bus,
                           const char *path);
    
 
    Creates a new object representing the remote connection.
    
 
    
@@ -361,7 +361,7 @@ nm_remote_connection_new (
 
    Returns
    
-
     the new remote connection object on success, or NULL on failure
    
+
     the new remote connection object on success, or NULL on failure
    
 
    
 
    
 
    
@@ -370,7 +370,7 @@ nm_remote_connection_new (void
 nm_remote_connection_commit_changes (NMRemoteConnection *connection,
                                      NMRemoteConnectionResultFunc callback,
-                                     gpointer user_data);
    
+                                     gpointer user_data);
    
 
    Send any local changes to the settings and properties of this connection to
 NetworkManager, which will immediately save them to disk.
    
 
    
@@ -410,7 +410,7 @@ commit completes. 
    
 nm_remote_connection_commit_changes_unsaved
                                (NMRemoteConnection *connection,
                                 NMRemoteConnectionResultFunc callback,
-                                gpointer user_data);
    
+                                gpointer user_data);
    
 
    Send any local changes to the settings and properties of this connection to
 NetworkManager.  The changes are not saved to disk until either
 nm_remote_connection_save() or nm_remote_connection_commit_changes() is
@@ -452,7 +452,7 @@ commit completes. 
    
 
    void
 nm_remote_connection_save (NMRemoteConnection *connection,
                            NMRemoteConnectionResultFunc callback,
-                           gpointer user_data);
    
+                           gpointer user_data);
    
 
    Saves the connection to disk if the connection has changes that have not yet
 been written to disk, or if the connection has never been saved.
    
 
    
@@ -492,7 +492,7 @@ save completes. 
    
 
    void
 nm_remote_connection_delete (NMRemoteConnection *connection,
                              NMRemoteConnectionResultFunc callback,
-                             gpointer user_data);
    
+                             gpointer user_data);
    
 
    Delete the connection.
    
 
    
 
    Parameters
    
@@ -530,7 +530,7 @@ nm_remote_connection_delete (NMRemoteConnection *connection,
                                   const char *setting_name,
                                   NMRemoteConnectionGetSecretsFunc callback,
-                                  gpointer user_data);
    
+                                  gpointer user_data);
    
 
    Request the connection's secrets.
    
 
    
 
    Parameters
    
@@ -548,13 +548,13 @@ nm_remote_connection_get_secrets (
 
 
    setting_name
    
-
    the NMSetting object name to get secrets for
    
+
    the NMSetting object name to get secrets for
    
  
 
 
 
    callback
    
 
     a function to be called when the update completes;
-must not be NULL. 
    
+must not be NULL. 
    
 [scope async]
 
 
@@ -570,7 +570,7 @@ must not be 
 
    nm_remote_connection_get_unsaved ()
    
-
    gboolean
+
    gboolean
 nm_remote_connection_get_unsaved (NMRemoteConnection *connection);
    
 
    
 
    Parameters
    
@@ -589,8 +589,8 @@ nm_remote_connection_get_unsaved (
 
    
 
    Returns
    
-
     TRUE if the remote connection contains changes that have not
-been saved to disk, FALSE if the connection is the same as its on-disk
+
     TRUE if the remote connection contains changes that have not
+been saved to disk, FALSE if the connection is the same as its on-disk
 representation.
    
 
    
 
    Since: 0.9.10
    
@@ -668,29 +668,29 @@ representation.
    
 
    Property Details
    
 
    
 
    The “bus” property
    
-
      “bus”                      DBusGConnection *
    
-
    The DBusGConnection that the NMRemoteConnection is connected to.
    
+
      “bus”                      DBusGConnection *
    
+
    The DBusGConnection that the NMRemoteConnection is connected to.
    
 
    Flags: Write / Construct Only
    
 
    
 
    
 
    
 
    The “dbus-connection” property
    
-
      “dbus-connection”          DBusGConnection *
    
+
      “dbus-connection”          DBusGConnection *
    
 
    Flags: Write / Construct Only
    
 
    
 
    
 
    
 
    The “dbus-path” property
    
-
      “dbus-path”                gchar *
    
+
      “dbus-path”                gchar *
    
 
    Flags: Write / Construct Only
    
 
    Default value: NULL
    
 
    
 
    
 
    
 
    The “unsaved” property
    
-
      “unsaved”                  gboolean
    
-
    TRUE if the remote connection contains changes that have not been saved
-to disk, FALSE if the connection is the same as its on-disk representation.
    
+
      “unsaved”                  gboolean
    
+
    TRUE if the remote connection contains changes that have not been saved
+to disk, FALSE if the connection is the same as its on-disk representation.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
 
    Since: 0.9.10
    
@@ -702,7 +702,7 @@ to disk, 
    The “removed” signal
    
 
    void
 user_function (NMRemoteConnection *connection,
-               gpointer            user_data)
    
+               gpointer            user_data)
    
 
    This signal is emitted when a connection is either deleted or becomes
 invisible to the current user.
    
 
    
@@ -716,7 +716,7 @@ invisible to the current user.
    
 
 
 
    connection
    
-
    a NMConnection
    
+
    a NMConnection
    
  
 
 
@@ -727,14 +727,14 @@ invisible to the current user.
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “updated” signal
    
 
    void
 user_function (NMRemoteConnection *connection,
-               gpointer            user_data)
    
+               gpointer            user_data)
    
 
    This signal is emitted when a connection changes, and it is
 still visible to the user.
    
 
    
@@ -748,7 +748,7 @@ still visible to the user.
    
 
 
 
    connection
    
-
    a NMConnection
    
+
    a NMConnection
    
  
 
 
@@ -759,16 +759,16 @@ still visible to the user.
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “visible” signal
    
 
    void
 user_function (NMRemoteConnection *nmremoteconnection,
-               gboolean            arg1,
-               gpointer            user_data)
    
-
    Flags: Run First
    
+               gboolean            arg1,
+               gpointer            user_data)
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index fcf007c1..281c3d2e 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -44,7 +44,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_remote_settings_error_quark ()
@@ -100,7 +100,7 @@
 
 
 
-GSList *
+GSList *
 
 
 nm_remote_settings_list_connections ()
@@ -132,7 +132,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_settings_add_connection ()
@@ -140,7 +140,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_settings_add_connection_unsaved ()
@@ -148,7 +148,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_settings_load_connections ()
@@ -156,7 +156,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_settings_reload_connections ()
@@ -164,7 +164,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_settings_save_hostname ()
@@ -184,23 +184,23 @@
 
 
 
-DBusGConnection *
+DBusGConnection *
 bus
 Read / Write / Construct Only
 
 
-gboolean
+gboolean
 can-modify
 Read
 
 
 
-gchar *
+gchar *
 hostname
 Read
 
 
-gboolean
+gboolean
 service-running
 Read
 
@@ -219,12 +219,12 @@
 
 void
 connections-read
-Run First
+Run First
 
 
 void
 new-connection
-Run First
+Run First
 
 
 
    
@@ -274,7 +274,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMRemoteSettings
 
    
 
    
@@ -284,13 +284,13 @@
 which stores network configuration and allows authenticated clients to
 add, delete, and modify that configuration.  The data required to connect
 to a specific network is called a "connection" and encapsulated by the
-NMConnection object.  Once a connection is known to NetworkManager, having
+NMConnection object.  Once a connection is known to NetworkManager, having
 either been added by a user or read from on-disk storage, the
 NMRemoteSettings object creates a NMRemoteConnection object which
 represents this stored connection.  Use the NMRemoteConnection object to
 perform any operations like modification or deletion.
    
 
    To add a new network connection to the NetworkManager settings service, first
-build up a template NMConnection object.  Since this connection is not yet
+build up a template NMConnection object.  Since this connection is not yet
 added to NetworkManager, it is known only to your program and is not yet
 an NMRemoteConnection.  Then ask NMRemoteSettings to add your connection.
 When the connection is added successfully, the supplied callback is called
@@ -366,15 +366,15 @@ the stored object known to NetworkManager.
    
           gpointer user_data)
 {
    if (error)
-       g_print ("Error adding connection: %s", error->message);
+       g_print ("Error adding connection: %s", error->message);
    else {
-       g_print ("Added: %s\n", nm_connection_get_path (NM_CONNECTION (remote)));
+       g_print ("Added: %s\n", nm_connection_get_path (NM_CONNECTION (remote)));
        /* Use 'remote' with nm_remote_connection_commit_changes() to save
         * changes and nm_remote_connection_delete() to delete the connection */
    }
 }
 
-static gboolean
+static gboolean
 add_wired_connection (const char *human_name)
 {
    NMConnection *connection;
@@ -383,35 +383,35 @@ the stored object known to NetworkManager.
    
    char *uuid;
    gboolean success;
 
-   connection = nm_connection_new ();
+   connection = nm_connection_new ();
 
    /* Build up the 'connection' setting */
-   s_con = (NMSettingConnection *) nm_setting_connection_new ();
-   uuid = nm_utils_uuid_generate ();
-   g_object_set (G_OBJECT (s_con),
-                 NM_SETTING_CONNECTION_UUID, uuid,
-                 NM_SETTING_CONNECTION_ID, human_name,
-                 NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
-                 NULL);
-   g_free (uuid);
-   nm_connection_add_setting (connection, NM_SETTING (s_con));
+   s_con = (NMSettingConnection *) nm_setting_connection_new ();
+   uuid = nm_utils_uuid_generate ();
+   g_object_set (G_OBJECT (s_con),
+                 NM_SETTING_CONNECTION_UUID, uuid,
+                 NM_SETTING_CONNECTION_ID, human_name,
+                 NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
+                 NULL);
+   g_free (uuid);
+   nm_connection_add_setting (connection, NM_SETTING (s_con));
 
    /* Add the required 'wired' setting as this is a wired connection */
-   nm_connection_add_setting (connection, nm_setting_wired_new ());
+   nm_connection_add_setting (connection, nm_setting_wired_new ());
 
    /* Add an 'ipv4' setting using AUTO configuration (eg DHCP) */
-   s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
-   g_object_set (G_OBJECT (s_ip4),
-                 NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
-                 NULL);
-   nm_connection_add_setting (connection, NM_SETTING (s_ip4));
+   s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
+   g_object_set (G_OBJECT (s_ip4),
+                 NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
+                 NULL);
+   nm_connection_add_setting (connection, NM_SETTING (s_ip4));
 
    /* Ask NetworkManager to store the connection */
    success = nm_remote_settings_add_connection (settings, connection, added_cb, loop);
 
    /* Release the template connection; the actual stored connection will
     * be returned in added_cb() */
-   g_object_unref (connection);
+   g_object_unref (connection);
 
    /* Let glib event loop run and added_cb() will be called when NetworkManager
     * is done adding the new connection. */
@@ -429,7 +429,7 @@ the stored object known to NetworkManager.
    
 
    Functions
    
 
    
 
    nm_remote_settings_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_remote_settings_error_quark (void);
    
 
    Registers an error quark for NMRemoteSettings if necessary.
    
 
    
@@ -443,8 +443,8 @@ nm_remote_settings_error_quark (v
 
    void
 (*NMRemoteSettingsAddConnectionFunc) (NMRemoteSettings *settings,
                                       NMRemoteConnection *connection,
-                                      GError *error,
-                                      gpointer user_data);
    
+                                      GError *error,
+                                      gpointer user_data);
    
 
    
 
    
 
    
@@ -453,22 +453,22 @@ nm_remote_settings_error_quark (v
 (*NMRemoteSettingsLoadConnectionsFunc)
                                (NMRemoteSettings *settings,
                                 char **failures,
-                                GError *error,
-                                gpointer user_data);
    
+                                GError *error,
+                                gpointer user_data);
    
 
    
 
    
 
    
 
    NMRemoteSettingsSaveHostnameFunc ()
    
 
    void
 (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
-                                     GError *error,
-                                     gpointer user_data);
    
+                                     GError *error,
+                                     gpointer user_data);
    
 
    
 
    
 
    
 
    nm_remote_settings_new ()
    
 
    NMRemoteSettings *
-nm_remote_settings_new (DBusGConnection *bus);
    
+nm_remote_settings_new (DBusGConnection *bus);
    
 
    Creates a new object representing the remote settings service.
    
 
    Note that this will do blocking D-Bus calls to initialize the
 settings object. You can use nm_remote_settings_new_async() if you
@@ -490,17 +490,17 @@ want to avoid that.
    
 
    
 
    
 
    Returns
    
-
     the new remote settings object on success, or NULL on failure
    
+
     the new remote settings object on success, or NULL on failure
    
 
    
 
    
 
    
 
    
 
    nm_remote_settings_new_async ()
    
 
    void
-nm_remote_settings_new_async (DBusGConnection *bus,
-                              GCancellable *cancellable,
-                              GAsyncReadyCallback callback,
-                              gpointer user_data);
    
+nm_remote_settings_new_async (DBusGConnection *bus,
+                              GCancellable *cancellable,
+                              GAsyncReadyCallback callback,
+                              gpointer user_data);
    
 
    Creates a new object representing the remote settings service and
 begins asynchronously initializing it. callback
  will be called
@@ -522,7 +522,7 @@ result.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
@@ -544,8 +544,8 @@ result.
    
 
    
 
    nm_remote_settings_new_finish ()
    
 
    NMRemoteSettings *
-nm_remote_settings_new_finish (GAsyncResult *result,
-                               GError **error);
    
+nm_remote_settings_new_finish (GAsyncResult *result,
+                               GError **error);
    
 
    Gets the result of an nm_remote_settings_new_async() call.
    
 
    
 
    Parameters
    
@@ -558,12 +558,12 @@ nm_remote_settings_new_finish (
    result
    
-
    a GAsyncResult
    
+
    a GAsyncResult
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -571,13 +571,13 @@ nm_remote_settings_new_finish (
 
    Returns
    
-
     a new NMRemoteSettings object, or NULL on error
    
+
     a new NMRemoteSettings object, or NULL on error
    
 
    
 
    
 
    
 
    
 
    nm_remote_settings_list_connections ()
    
-
    GSList *
+
    GSList *
 nm_remote_settings_list_connections (NMRemoteSettings *settings);
    
 
    
 
    Parameters
    
@@ -601,7 +601,7 @@ list containing all connections provided by the remote settings service.
 Each element of the returned list is a NMRemoteConnection instance, which is
 owned by the NMRemoteSettings object and should not be freed by the caller.
 The returned list is, however, owned by the caller and should be freed
-using g_slist_free() when no longer required. 
    
+using g_slist_free() when no longer required. 
    
 
    [transfer container][element-type NMRemoteConnection]
    
 
    
 
    
@@ -638,7 +638,7 @@ nm_remote_settings_get_connection_by_id
 
    
 
    
 
    Returns
    
-
     the remote connection object on success, or NULL if no
+
     the remote connection object on success, or NULL if no
 matching object was found. 
    
 
    [transfer none]
    
 
    
@@ -677,7 +677,7 @@ nm_remote_settings_get_connection_by_path
 
    
 
    
 
    Returns
    
-
     the remote connection object on success, or NULL if the object was
+
     the remote connection object on success, or NULL if the object was
 not known. 
    
 
    [transfer none]
    
 
    
@@ -715,7 +715,7 @@ nm_remote_settings_get_connection_by_uuid
 
    
 
    
 
    Returns
    
-
     the remote connection object on success, or NULL if the object was
+
     the remote connection object on success, or NULL if the object was
 not known. 
    
 
    [transfer none]
    
 
    
@@ -723,11 +723,11 @@ not known. 
    
 
    
 
    
 
    nm_remote_settings_add_connection ()
    
-
    gboolean
+
    gboolean
 nm_remote_settings_add_connection (NMRemoteSettings *settings,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    NMRemoteSettingsAddConnectionFunc callback,
-                                   gpointer user_data);
    
+                                   gpointer user_data);
    
 
    Requests that the remote settings service add the given settings to a new
 connection.  The connection is immediately written to disk.  connection
  is
@@ -776,18 +776,18 @@ added, not the object itself
    
 
    
 
    
 
    Returns
    
-
     TRUE if the request was successful, FALSE if it failed
    
+
     TRUE if the request was successful, FALSE if it failed
    
 
    
 
    
 
    
 
    
 
    nm_remote_settings_add_connection_unsaved ()
    
-
    gboolean
+
    gboolean
 nm_remote_settings_add_connection_unsaved
                                (NMRemoteSettings *settings,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 NMRemoteSettingsAddConnectionFunc callback,
-                                gpointer user_data);
    
+                                gpointer user_data);
    
 
    Requests that the remote settings service add the given settings to a new
 connection.  The connection is not written to disk, which may be done at
 a later time by calling the connection's nm_remote_connection_commit_changes()
@@ -828,29 +828,29 @@ added, not the object itself
    
 
    
 
    
 
    Returns
    
-
     TRUE if the request was successful, FALSE if it failed
    
+
     TRUE if the request was successful, FALSE if it failed
    
 
    
 
    Since: 0.9.10
    
 
    
 
    
 
    
 
    nm_remote_settings_load_connections ()
    
-
    gboolean
+
    gboolean
 nm_remote_settings_load_connections (NMRemoteSettings *settings,
                                      char **filenames,
                                      char ***failures,
-                                     GError **error);
    
+                                     GError **error);
    
 
    Requests that the remote settings service load or reload the given files,
 adding or updating the connections described within.
    
 
    The changes to the indicated files will not yet be reflected in
 settings
 's connections array when the function returns.
    
 
    If all of the indicated files were successfully loaded, the
-function will return TRUE, and failures
- will be set to NULL. If
+function will return TRUE, and failures
+ will be set to NULL. If
 NetworkManager tried to load the files, but some (or all) failed,
 then failures
- will be set to a NULL-terminated array of the
+ will be set to a NULL-terminated array of the
 filenames that failed to load.
    
 
    
 
    Parameters
    
@@ -868,18 +868,18 @@ filenames that failed to load.
    
 
 
 
    filenames
    
-
    NULL-terminated array of filenames to load
    
+
    NULL-terminated array of filenames to load
    
  
 
 
 
    failures
    
-
     on return, a NULL-terminated array of
+
     on return, a NULL-terminated array of
 filenames that failed to load. 
    
 [out][transfer full]
 
 
 
    error
    
-
    return location for GError
    
+
    return location for GError
    
  
 
 
@@ -887,18 +887,18 @@ filenames that failed to load. 
    
 
    
 
    
 
    Returns
    
-
     TRUE if NetworkManager at least tried to load filenames
+
     TRUE if NetworkManager at least tried to load filenames
 ,
-FALSE if an error occurred (eg, permission denied).
    
+FALSE if an error occurred (eg, permission denied).
    
 
    
 
    Since: 0.9.10
    
 
    
 
    
 
    
 
    nm_remote_settings_reload_connections ()
    
-
    gboolean
+
    gboolean
 nm_remote_settings_reload_connections (NMRemoteSettings *settings,
-                                       GError **error);
    
+                                       GError **error);
    
 
    Requests that the remote settings service reload all connection
 files from disk, adding, updating, and removing connections until
 the in-memory state matches the on-disk state.
    
@@ -918,7 +918,7 @@ the in-memory state matches the on-disk state.
    
 
 
 
    error
    
-
    return location for GError
    
+
    return location for GError
    
  
 
 
@@ -926,18 +926,18 @@ the in-memory state matches the on-disk state.
    
 
    
 
    
 
    Returns
    
-
     TRUE on success, FALSE on failure
    
+
     TRUE on success, FALSE on failure
    
 
    
 
    Since: 0.9.10
    
 
    
 
    
 
    
 
    nm_remote_settings_save_hostname ()
    
-
    gboolean
+
    gboolean
 nm_remote_settings_save_hostname (NMRemoteSettings *settings,
                                   const char *hostname,
                                   NMRemoteSettingsSaveHostnameFunc callback,
-                                  gpointer user_data);
    
+                                  gpointer user_data);
    
 
    Requests that the machine's persistent hostname be set to the specified value
 or cleared.
    
 
    
@@ -956,7 +956,7 @@ or cleared.
    
 
 
 
    hostname
    
-
    the new persistent hostname to set, or NULL to clear any existing
+
    the new persistent hostname to set, or NULL to clear any existing
 persistent hostname
    
  
 
@@ -977,7 +977,7 @@ hostname operation completes. 
    
 
    
 
    
 
    Returns
    
-
     TRUE if the request was successful, FALSE if it failed
    
+
     TRUE if the request was successful, FALSE if it failed
    
 
    
 
    
 
    
@@ -1077,23 +1077,23 @@ hostname operation completes. 
    
 
    Property Details
    
 
    
 
    The “bus” property
    
-
      “bus”                      DBusGConnection *
    
-
    The DBusGConnection that the NMRemoteSettings is connected to. Defaults
+
      “bus”                      DBusGConnection *
    
+
    The DBusGConnection that the NMRemoteSettings is connected to. Defaults
 to the system bus if not specified.
    
 
    Flags: Read / Write / Construct Only
    
 
    
 
    
 
    
 
    The “can-modify” property
    
-
      “can-modify”               gboolean
    
-
    If TRUE, adding and modifying connections is supported.
    
+
      “can-modify”               gboolean
    
+
    If TRUE, adding and modifying connections is supported.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “hostname” property
    
-
      “hostname”                 gchar *
    
+
      “hostname”                 gchar *
    
 
    The machine hostname stored in persistent configuration. This can be
 modified by calling nm_remote_settings_save_hostname().
    
 
    Flags: Read
    
@@ -1102,7 +1102,7 @@ modified by calling 
 
    The “service-running” property
    
-
      “service-running”          gboolean
    
+
      “service-running”          gboolean
    
 
    Whether the settings service is running.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -1114,17 +1114,17 @@ modified by calling 
    The “connections-read” signal
    
 
    void
 user_function (NMRemoteSettings *nmremotesettings,
-               gpointer          user_data)
    
-
    Flags: Run First
    
+               gpointer          user_data)
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “new-connection” signal
    
 
    void
 user_function (NMRemoteSettings *nmremotesettings,
-               GObject          *arg1,
-               gpointer          user_data)
    
-
    Flags: Run First
    
+               GObject          *arg1,
+               gpointer          user_data)
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index 3f47d5fd..137eddca 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -44,7 +44,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_secret_agent_error_quark ()
@@ -76,7 +76,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_secret_agent_register ()
@@ -84,7 +84,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_secret_agent_unregister ()
@@ -92,7 +92,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_secret_agent_get_registered ()
@@ -135,7 +135,7 @@
 
 
 
-gboolean
+gboolean
 auto-register
 Read / Write / Construct
 
@@ -146,12 +146,12 @@
 
 
 
-gchar *
+gchar *
 identifier
 Read / Write / Construct Only
 
 
-gboolean
+gboolean
 registered
 Read
 
@@ -169,7 +169,7 @@
 
 void
 registration-result
-Run First
+Run First
 
 
    
 
    
@@ -222,7 +222,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSecretAgent
 
    
 
    
@@ -233,7 +233,7 @@
 
    Functions
    
 
    
 
    nm_secret_agent_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_secret_agent_error_quark (void);
    
 
    
 
    
@@ -241,10 +241,10 @@ nm_secret_agent_error_quark (void
 
    NMSecretAgentGetSecretsFunc ()
    
 
    void
 (*NMSecretAgentGetSecretsFunc) (NMSecretAgent *agent,
-                                NMConnection *connection,
-                                GHashTable *secrets,
-                                GError *error,
-                                gpointer user_data);
    
+                                NMConnection *connection,
+                                GHashTable *secrets,
+                                GError *error,
+                                gpointer user_data);
    
 
    Called as a result of a request by NM to retrieve secrets.  When the
 NMSecretAgent subclass has finished retrieving secrets and is ready to
 return them, or to return an error, this function should be called with
@@ -277,18 +277,18 @@ something like this:
    
 NMSettingWirelessSecurity *s_wsec;
 GHashTable *secrets_hash;
 
-secrets = nm_connection_new ();
-s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
-g_object_set (G_OBJECT (s_wsec),
-              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
-              NULL);
-nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
-secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);
+secrets = nm_connection_new ();
+s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
+g_object_set (G_OBJECT (s_wsec),
+              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
+              NULL);
+nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
+secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);
 
 (call the NMSecretAgentGetSecretsFunc with secrets_hash)
 
-g_object_unref (secrets);
-g_hash_table_unref (secrets_hash);
    
+g_object_unref (secrets);
+g_hash_table_unref (secrets_hash);
    
       
     
   
@@ -313,17 +313,17 @@ something like this:
    
 
    connection
    
 
     the connection for which secrets were requested,
 note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
+g_object_ref()/g_object_unref() if you want to use this object after the callback
 has returned. 
    
 [transfer none]
 
 
 
    secrets
    
-
     the GHashTable containing
-the requested secrets in the same format as an NMConnection hash (as
-created by nm_connection_to_hash() for example).  Each key in secrets
-should be the name of a NMSetting object (like "802-11-wireless-security")
-and each value should be a GHashTable.  The sub-hashes map string:GValue
+
     the GHashTable containing
+the requested secrets in the same format as an NMConnection hash (as
+created by nm_connection_to_hash() for example).  Each key in secrets
+should be the name of a NMSetting object (like "802-11-wireless-security")
+and each value should be a GHashTable.  The sub-hashes map string:GValue
 where the string is the setting property name (like "psk") and the value
 is the secret. 
    
 [element-type utf8 GLib.HashTable]
@@ -347,9 +347,9 @@ is the secret. 
    
 
    NMSecretAgentSaveSecretsFunc ()
    
 
    void
 (*NMSecretAgentSaveSecretsFunc) (NMSecretAgent *agent,
-                                 NMConnection *connection,
-                                 GError *error,
-                                 gpointer user_data);
    
+                                 NMConnection *connection,
+                                 GError *error,
+                                 gpointer user_data);
    
 
    Called as a result of a request by NM to save secrets.  When the
 NMSecretAgent subclass has finished saving the secrets, this function
 should be called.
    
@@ -371,7 +371,7 @@ should be called.
    
 
    connection
    
 
     the connection for which secrets were to be saved,
 note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
+g_object_ref()/g_object_unref() if you want to use this object after the callback
 has returned. 
    
 [transfer none]
 
@@ -394,9 +394,9 @@ has returned. 
    
 
    NMSecretAgentDeleteSecretsFunc ()
    
 
    void
 (*NMSecretAgentDeleteSecretsFunc) (NMSecretAgent *agent,
-                                   NMConnection *connection,
-                                   GError *error,
-                                   gpointer user_data);
    
+                                   NMConnection *connection,
+                                   GError *error,
+                                   gpointer user_data);
    
 
    Called as a result of a request by NM to delete secrets.  When the
 NMSecretAgent subclass has finished deleting the secrets, this function
 should be called.
    
@@ -418,7 +418,7 @@ should be called.
    
 
    connection
    
 
     the connection for which secrets were to be deleted,
 note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
+g_object_ref()/g_object_unref() if you want to use this object after the callback
 has returned. 
    
 [transfer none]
 
@@ -439,7 +439,7 @@ has returned. 
    
 
    
 
    
 
    nm_secret_agent_register ()
    
-
    gboolean
+
    gboolean
 nm_secret_agent_register (NMSecretAgent *self);
    
 
    Registers the NMSecretAgent with the NetworkManager secret manager,
 indicating to NetworkManager that the agent is able to provide and save
@@ -463,15 +463,15 @@ asynchronous operation and its success or failure is indicated via the
 
    
 
    
 
    Returns
    
-
     a new TRUE if registration was successfully requested (this does
-not mean registration itself was successful), FALSE if registration was not
+
     a new TRUE if registration was successfully requested (this does
+not mean registration itself was successful), FALSE if registration was not
 successfully requested.
    
 
    
 
    
 
    
 
    
 
    nm_secret_agent_unregister ()
    
-
    gboolean
+
    gboolean
 nm_secret_agent_unregister (NMSecretAgent *self);
    
 
    Unregisters the NMSecretAgent with the NetworkManager secret manager,
 indicating to NetworkManager that the agent is will no longer provide or
@@ -493,13 +493,13 @@ store secrets on behalf of this user.
    
 
    
 
    
 
    Returns
    
-
     a new TRUE if unregistration was successful, FALSE if it was not.
    
+
     a new TRUE if unregistration was successful, FALSE if it was not.
    
 
    
 
    
 
    
 
    
 
    nm_secret_agent_get_registered ()
    
-
    gboolean
+
    gboolean
 nm_secret_agent_get_registered (NMSecretAgent *self);
    
 
    
 
    Parameters
    
@@ -518,7 +518,7 @@ nm_secret_agent_get_registered (
 
    
 
    Returns
    
-
     a TRUE if the agent is registered, FALSE if it is not.
    
+
     a TRUE if the agent is registered, FALSE if it is not.
    
 
    
 
    
 
    
@@ -526,12 +526,12 @@ nm_secret_agent_get_registered (
    nm_secret_agent_get_secrets ()
    
 
    void
 nm_secret_agent_get_secrets (NMSecretAgent *self,
-                             NMConnection *connection,
+                             NMConnection *connection,
                              const char *setting_name,
                              const char **hints,
                              NMSecretAgentGetSecretsFlags flags,
                              NMSecretAgentGetSecretsFunc callback,
-                             gpointer user_data);
    
+                             gpointer user_data);
    
 
    Asyncronously retrieve secrets belonging to connection
  for the
 setting setting_name
@@ -557,7 +557,7 @@ secrets from the user.
    
 
 
 
    connection
    
-
    the NMConnection for which we're asked secrets
    
+
    the NMConnection for which we're asked secrets
    
  
 
 
@@ -595,9 +595,9 @@ secrets from the user.
    
 
    nm_secret_agent_save_secrets ()
    
 
    void
 nm_secret_agent_save_secrets (NMSecretAgent *self,
-                              NMConnection *connection,
+                              NMConnection *connection,
                               NMSecretAgentSaveSecretsFunc callback,
-                              gpointer user_data);
    
+                              gpointer user_data);
    
 
    Asyncronously ensure that all secrets inside connection
 
 are stored to disk.
    
@@ -618,7 +618,7 @@ are stored to disk.
    
 
 
 
    connection
    
-
    a NMConnection
    
+
    a NMConnection
    
  
 
 
@@ -641,9 +641,9 @@ are stored to disk.
    
 
    nm_secret_agent_delete_secrets ()
    
 
    void
 nm_secret_agent_delete_secrets (NMSecretAgent *self,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 NMSecretAgentDeleteSecretsFunc callback,
-                                gpointer user_data);
    
+                                gpointer user_data);
    
 
    Asynchronously ask the agent to delete all saved secrets belonging to
 connection
 .
    
@@ -664,7 +664,7 @@ nm_secret_agent_delete_secrets (
 
 
    connection
    
-
    a NMConnection
    
+
    a NMConnection
    
  
 
 
@@ -886,7 +886,7 @@ results or carrier changes.
    
 
    Property Details
    
 
    
 
    The “auto-register” property
    
-
      “auto-register”            gboolean
    
+
      “auto-register”            gboolean
    
 
    If TRUE, the agent will attempt to automatically register itself after
 it is created (via an idle handler) and to re-register itself if
 NetworkManager restarts.  If FALSE, the agent does not automatically
@@ -907,7 +907,7 @@ called, which re-enables auto-registration.
    
 
    
 
    
 
    The “identifier” property
    
-
      “identifier”               gchar *
    
+
      “identifier”               gchar *
    
 
    Identifies this agent; only one agent in each user session may use the
 same identifier.  Identifier formatting follows the same rules as
 D-Bus bus names with the exception that the ':' character is not
@@ -921,8 +921,8 @@ of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 
    
 
    
 
    The “registered” property
    
-
      “registered”               gboolean
    
-
    TRUE if the agent is registered with NetworkManager, FALSE if not.
    
+
      “registered”               gboolean
    
+
    TRUE if the agent is registered with NetworkManager, FALSE if not.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
 
    
@@ -933,8 +933,8 @@ of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 
    The “registration-result” signal
    
 
    void
 user_function (NMSecretAgent *agent,
-               gpointer       error,
-               gpointer       user_data)
    
+               gpointer       error,
+               gpointer       user_data)
    
 
    Indicates the result of a registration request; if error
  is NULL the
 request was successful.
    
@@ -965,7 +965,7 @@ request was successful.
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index 52684541..83840f37 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -44,7 +44,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_vpn_connection_new ()
@@ -52,7 +52,7 @@
 
 
 
-NMVPNConnectionState
+NMVPNConnectionState
 
 
 nm_vpn_connection_get_vpn_state ()
@@ -79,12 +79,12 @@
 
 
 
-gchar *
+gchar *
 banner
 Read
 
 
-guint
+guint
 vpn-state
 Read
 
@@ -102,7 +102,7 @@
 
 void
 vpn-state-changed
-Run First
+Run First
 
 
    
 
    
@@ -127,7 +127,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMActiveConnection
             ╰── NMVPNConnection
@@ -140,8 +140,8 @@
 
    Functions
    
 
    
 
    nm_vpn_connection_new ()
    
-
    GObject *
-nm_vpn_connection_new (DBusGConnection *connection,
+
    GObject *
+nm_vpn_connection_new (DBusGConnection *connection,
                        const char *path);
    
 
    Creates a new NMVPNConnection.
    
 
    
@@ -155,7 +155,7 @@ nm_vpn_connection_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -175,7 +175,7 @@ nm_vpn_connection_new (
 
    nm_vpn_connection_get_vpn_state ()
    
-
    NMVPNConnectionState
+
    NMVPNConnectionState
 nm_vpn_connection_get_vpn_state (NMVPNConnection *vpn);
    
 
    Gets the current NMVPNConnection state.
    
 
    
@@ -244,7 +244,7 @@ string used by the connection, and must not be modified.
    
 
    Property Details
    
 
    
 
    The “banner” property
    
-
      “banner”                   gchar *
    
+
      “banner”                   gchar *
    
 
    The VPN login banner of the active VPN connection.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -252,7 +252,7 @@ string used by the connection, and must not be modified.
    
 
    
 
    
 
    The “vpn-state” property
    
-
      “vpn-state”                guint
    
+
      “vpn-state”                guint
    
 
    The VPN state of the active VPN connection.
    
 
    Flags: Read
    
 
    Allowed values: <= 7
    
@@ -265,10 +265,10 @@ string used by the connection, and must not be modified.
    
 
    The “vpn-state-changed” signal
    
 
    void
 user_function (NMVPNConnection *nmvpnconnection,
-               guint            arg1,
-               guint            arg2,
-               gpointer         user_data)
    
-
    Flags: Run First
    
+               guint            arg1,
+               guint            arg2,
+               gpointer         user_data)
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index 15005fb6..06d2f34a 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -43,7 +43,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_wimax_nsp_new ()
@@ -58,7 +58,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_wimax_nsp_get_signal_quality ()
@@ -74,7 +74,7 @@
 
 
 
-GSList *
+GSList *
 
 
 nm_wimax_nsp_filter_connections ()
@@ -82,7 +82,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_wimax_nsp_connection_valid ()
@@ -102,17 +102,17 @@
 
 
 
-gchar *
+gchar *
 name
 Read
 
 
-guint
+guint
 network-type
 Read
 
 
-guint
+guint
 signal-quality
 Read
 
@@ -148,7 +148,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMWimaxNsp
 
    
@@ -160,8 +160,8 @@
 
    Functions
    
 
    
 
    nm_wimax_nsp_new ()
    
-
    GObject *
-nm_wimax_nsp_new (DBusGConnection *connection,
+
    GObject *
+nm_wimax_nsp_new (DBusGConnection *connection,
                   const char *path);
    
 
    Creates a new NMWimaxNsp.
    
 
    
@@ -175,7 +175,7 @@ nm_wimax_nsp_new (
    connection
    
-
    the DBusGConnection
    
+
    the DBusGConnection
    
  
 
 
@@ -221,7 +221,7 @@ nm_wimax_nsp_get_name (
 
    nm_wimax_nsp_get_signal_quality ()
    
-
    guint32
+
    guint32
 nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp);
    
 
    Gets the WPA signal quality of the wimax NSP.
    
 
    
@@ -273,9 +273,9 @@ nm_wimax_nsp_get_network_type (
 
    
 
    nm_wimax_nsp_filter_connections ()
    
-
    GSList *
+
    GSList *
 nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp,
-                                 const GSList *connections);
    
+                                 const GSList *connections);
    
 
    Filters a given list of connections for a given NMWimaxNsp object and
 return connections which may be activated with the access point.  Any
 returned connections will match the nsp
@@ -297,7 +297,7 @@ returned connections will match the nsp
 
 
    connections
    
 
     a list of
-NMConnection objects to filter. 
    
+NMConnection objects to filter. 
    
 [element-type NMConnection]
 
 
@@ -306,20 +306,20 @@ returned connections will match the nsp
 
    
 
    Returns
    
 
     a
-list of NMConnection objects that could be activated with the given nsp
+list of NMConnection objects that could be activated with the given nsp
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
-be freed with g_slist_free() when it is no longer required. 
    
+be freed with g_slist_free() when it is no longer required. 
    
 
    [transfer container][element-type NMConnection]
    
 
    
 
    
 
    
 
    
 
    nm_wimax_nsp_connection_valid ()
    
-
    gboolean
+
    gboolean
 nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp,
-                               NMConnection *connection);
    
+                               NMConnection *connection);
    
 
    Validates a given connection against a given WiMAX NSP to ensure that the
 connection may be activated with that NSP.  The connection must match the
 nsp
@@ -341,7 +341,7 @@ against
    
 
 
 
    connection
    
-
    an NMConnection to validate against nsp
+
    an NMConnection to validate against nsp
 
    
  
 
@@ -350,8 +350,8 @@ against
    
 
    
 
    
 
    Returns
    
-
     TRUE if the connection may be activated with this WiMAX NSP,
-FALSE if it cannot be.
    
+
     TRUE if the connection may be activated with this WiMAX NSP,
+FALSE if it cannot be.
    
 
    
 
    
 
    
@@ -424,7 +424,7 @@ against
    
 
    Property Details
    
 
    
 
    The “name” property
    
-
      “name”                     gchar *
    
+
      “name”                     gchar *
    
 
    The name of the WiMAX NSP.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -432,7 +432,7 @@ against
    
 
    
 
    
 
    The “network-type” property
    
-
      “network-type”             guint
    
+
      “network-type”             guint
    
 
    The network type of the WiMAX NSP.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -440,7 +440,7 @@ against
    
 
    
 
    
 
    The “signal-quality” property
    
-
      “signal-quality”           guint
    
+
      “signal-quality”           guint
    
 
    The signal quality of the WiMAX NSP.
    
 
    Flags: Read
    
 
    Allowed values: <= 100
    
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 1b503f42..7921f6b2 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -15,12 +15,12 @@
 
    
 
    
 
    
-      for libnm-glib 1.6.2
+      for libnm-glib 1.8.0
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm-glib/stable/.
     
    
-
    Copyright © 2012-2013 The NetworkManager Authors
    
+
    Copyright © 2012, 2013, 2014, 2015, 2016, 2017 The NetworkManager Authors
    
 
    
 
    
 	Permission is granted to copy, distribute and/or modify this
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index 016e41ba..e6f04dfa 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -41,7 +41,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_vpn_plugin_error_quark ()
@@ -49,7 +49,7 @@
 
 
 
-DBusGConnection *
+DBusGConnection *
 
 
 nm_vpn_plugin_get_connection ()
@@ -57,7 +57,7 @@
 
 
 
-NMVPNServiceState
+NMVPNServiceState
 
 
 nm_vpn_plugin_get_state ()
@@ -121,7 +121,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_disconnect ()
@@ -160,19 +160,19 @@
 
    Functions
    
 
    
 
    nm_vpn_plugin_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_vpn_plugin_error_quark (void);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_get_connection ()
    
-
    DBusGConnection *
+
    DBusGConnection *
 nm_vpn_plugin_get_connection (NMVPNPlugin *plugin);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_get_state ()
    
-
    NMVPNServiceState
+
    NMVPNServiceState
 nm_vpn_plugin_get_state (NMVPNPlugin *plugin);
    
 
    
 
    
@@ -180,7 +180,7 @@ nm_vpn_plugin_get_state (NMVPNPlu
 
    nm_vpn_plugin_set_state ()
    
 
    void
 nm_vpn_plugin_set_state (NMVPNPlugin *plugin,
-                         NMVPNServiceState state);
    
+                         NMVPNServiceState state);
    
 
    
 
    
 
    
@@ -235,35 +235,35 @@ nm_vpn_plugin_set_login_banner (N
 
    nm_vpn_plugin_failure ()
    
 
    void
 nm_vpn_plugin_failure (NMVPNPlugin *plugin,
-                       NMVPNPluginFailure reason);
    
+                       NMVPNPluginFailure reason);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_set_config ()
    
 
    void
 nm_vpn_plugin_set_config (NMVPNPlugin *plugin,
-                          GHashTable *config);
    
+                          GHashTable *config);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_set_ip4_config ()
    
 
    void
 nm_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin,
-                              GHashTable *ip4_config);
    
+                              GHashTable *ip4_config);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_set_ip6_config ()
    
 
    void
 nm_vpn_plugin_set_ip6_config (NMVPNPlugin *plugin,
-                              GHashTable *ip6_config);
    
+                              GHashTable *ip6_config);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_disconnect ()
    
-
    gboolean
+
    gboolean
 nm_vpn_plugin_disconnect (NMVPNPlugin *plugin,
-                          GError **err);
    
+                          GError **err);
    
 
    
 
    
 
    
diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
index 414c0953..2492c803 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
@@ -65,7 +65,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_vpn_plugin_ui_interface_get_capabilities ()
@@ -73,7 +73,7 @@
 
 
 
-NMConnection *
+NMConnection *
 
 
 nm_vpn_plugin_ui_interface_import ()
@@ -81,7 +81,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_ui_interface_export ()
@@ -97,7 +97,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_ui_interface_delete_connection ()
@@ -105,7 +105,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_vpn_plugin_ui_widget_interface_get_widget ()
@@ -113,7 +113,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_ui_widget_interface_update_connection ()
@@ -121,7 +121,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_ui_widget_interface_save_secrets ()
@@ -249,45 +249,45 @@
 
    
 
    NMVpnPluginUiFactory ()
    
 
    NMVpnPluginUiInterface *
-(*NMVpnPluginUiFactory) (GError **error);
    
+(*NMVpnPluginUiFactory) (GError **error);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_ui_factory ()
    
 
    NMVpnPluginUiInterface *
-nm_vpn_plugin_ui_factory (GError **error);
    
+nm_vpn_plugin_ui_factory (GError **error);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_ui_interface_ui_factory ()
    
 
    NMVpnPluginUiWidgetInterface *
 nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface,
-                                       NMConnection *connection,
-                                       GError **error);
    
+                                       NMConnection *connection,
+                                       GError **error);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_ui_interface_get_capabilities ()
    
-
    guint32
+
    guint32
 nm_vpn_plugin_ui_interface_get_capabilities
                                (NMVpnPluginUiInterface *iface);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_ui_interface_import ()
    
-
    NMConnection *
+
    NMConnection *
 nm_vpn_plugin_ui_interface_import (NMVpnPluginUiInterface *iface,
                                    const char *path,
-                                   GError **error);
    
+                                   GError **error);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_ui_interface_export ()
    
-
    gboolean
+
    gboolean
 nm_vpn_plugin_ui_interface_export (NMVpnPluginUiInterface *iface,
                                    const char *path,
-                                   NMConnection *connection,
-                                   GError **error);
    
+                                   NMConnection *connection,
+                                   GError **error);
    
 
    
 
    
 
    
@@ -295,42 +295,42 @@ nm_vpn_plugin_ui_interface_export (char *
 nm_vpn_plugin_ui_interface_get_suggested_name
                                (NMVpnPluginUiInterface *iface,
-                                NMConnection *connection);
    
+                                NMConnection *connection);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_ui_interface_delete_connection ()
    
-
    gboolean
+
    gboolean
 nm_vpn_plugin_ui_interface_delete_connection
                                (NMVpnPluginUiInterface *iface,
-                                NMConnection *connection,
-                                GError **error);
    
+                                NMConnection *connection,
+                                GError **error);
    
 
    nm_vpn_plugin_ui_interface_delete_connection is deprecated and should not be used in newly-written code.
    
 
    
 
    
 
    
 
    nm_vpn_plugin_ui_widget_interface_get_widget ()
    
-
    GObject *
+
    GObject *
 nm_vpn_plugin_ui_widget_interface_get_widget
                                (NMVpnPluginUiWidgetInterface *iface);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_ui_widget_interface_update_connection ()
    
-
    gboolean
+
    gboolean
 nm_vpn_plugin_ui_widget_interface_update_connection
                                (NMVpnPluginUiWidgetInterface *iface,
-                                NMConnection *connection,
-                                GError **error);
    
+                                NMConnection *connection,
+                                GError **error);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_ui_widget_interface_save_secrets ()
    
-
    gboolean
+
    gboolean
 nm_vpn_plugin_ui_widget_interface_save_secrets
                                (NMVpnPluginUiWidgetInterface *iface,
-                                NMConnection *connection,
-                                GError **error);
    
+                                NMConnection *connection,
+                                GError **error);
    
 
    nm_vpn_plugin_ui_widget_interface_save_secrets is deprecated and should not be used in newly-written code.
    
 
    
 
    
@@ -401,7 +401,7 @@ nm_vpn_plugin_ui_widget_interface_save_secrets
 
    
 
    
 
    enum NMVpnPluginUiInterfaceProp
    
-
    GObject property numbers that plugins should override to provide certain
+
    GObject property numbers that plugins should override to provide certain
 information to UI programs.
    
 
    
 
    Members
    
diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
index 82993a52..0203e158 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
@@ -41,7 +41,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_utils_read_vpn_details ()
@@ -49,7 +49,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_utils_get_secret_flags ()
@@ -65,10 +65,10 @@
 
    Functions
    
 
    
 
    nm_vpn_plugin_utils_read_vpn_details ()
    
-
    gboolean
+
    gboolean
 nm_vpn_plugin_utils_read_vpn_details (int fd,
-                                      GHashTable **out_data,
-                                      GHashTable **out_secrets);
    
+                                      GHashTable **out_data,
+                                      GHashTable **out_secrets);
    
 
    Parses key/value pairs from a file descriptor (normally stdin) passed by
 an applet when the applet calls the authentication dialog of the VPN plugin.
    
 
    
@@ -102,20 +102,20 @@ an applet when the applet calls the authentication dialog of the VPN plugin.
    
 
    
 
    
 
    Returns
    
-
     TRUE if reading values was successful, FALSE if not
    
+
     TRUE if reading values was successful, FALSE if not
    
 
    
 
    
 
    
 
    
 
    nm_vpn_plugin_utils_get_secret_flags ()
    
-
    gboolean
-nm_vpn_plugin_utils_get_secret_flags (GHashTable *data,
+
    gboolean
+nm_vpn_plugin_utils_get_secret_flags (GHashTable *data,
                                       const char *secret_name,
-                                      NMSettingSecretFlags *out_flags);
    
+                                      NMSettingSecretFlags *out_flags);
    
 
    Given a VPN secret key name, attempts to find the corresponding flags data
 item in data
 .  If found, converts the flags data item to
-NMSettingSecretFlags and returns it.
    
+NMSettingSecretFlags and returns it.
    
 
    
 
    Parameters
    
 
    
@@ -146,8 +146,8 @@ item in data
    
 
    Returns
    
-
     TRUE if the flag data item was found and successfully converted
-to flags, FALSE if not
    
+
     TRUE if the flag data item was found and successfully converted
+to flags, FALSE if not
    
 
    
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index b5706550..92099e2d 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -23,7 +23,7 @@
 
    
 Object Hierarchy
    -    GObject
+    GObject
     ├── NMObject
     │   ├── NMClient
     │   ├── NMDevice
@@ -49,7 +49,7 @@
     │   ├── NMDHCP4Config
     │   ╰── NMDHCP6Config
     ├── NMRemoteSettings
-    ├── NMConnection
+    ├── NMConnection
     │   ╰── NMRemoteConnection
     ╰── NMSecretAgent
 
    
diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml
index 798ea5f8..135fcc7f 100644
--- a/docs/libnm-glib/libnm-glib-docs.xml
+++ b/docs/libnm-glib/libnm-glib-docs.xml
@@ -14,7 +14,12 @@
     
-      2012-2013
+      2012
+      2013
+      2014
+      2015
+      2016
+      2017
       The NetworkManager Authors
     
 
diff --git a/docs/libnm-glib/libnm-glib.types b/docs/libnm-glib/libnm-glib.types
index 01ab1ce6..1cb7d406 100644
--- a/docs/libnm-glib/libnm-glib.types
+++ b/docs/libnm-glib/libnm-glib.types
@@ -1,29 +1,29 @@
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include "nm-client.h"
+#include "nm-object.h"
+#include "nm-device.h"
+#include "nm-device-ethernet.h"
+#include "nm-device-wifi.h"
+#include "nm-device-modem.h"
+#include "nm-device-bt.h"
+#include "nm-device-wimax.h"
+#include "nm-device-olpc-mesh.h"
+#include "nm-device-adsl.h"
+#include "nm-device-infiniband.h"
+#include "nm-device-bond.h"
+#include "nm-device-bridge.h"
+#include "nm-device-team.h"
+#include "nm-device-generic.h"
+#include "nm-device-vlan.h"
+#include "nm-access-point.h"
+#include "nm-ip4-config.h"
+#include "nm-ip6-config.h"
+#include "nm-active-connection.h"
+#include "nm-dhcp4-config.h"
+#include "nm-dhcp6-config.h"
+#include "nm-remote-settings.h"
+#include "nm-remote-connection.h"
+#include "nm-secret-agent.h"
+#include "nm-vpn-connection.h"
 
 nm_client_get_type
 nm_object_get_type
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index fdd3be6d..27f9cd32 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.6.2
+1.8.0
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index cb98f164..68980d26 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -183,6 +183,8 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ELOGIND_INHIBIT_CFLAGS = @ELOGIND_INHIBIT_CFLAGS@
+ELOGIND_INHIBIT_LIBS = @ELOGIND_INHIBIT_LIBS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GENHTML = @GENHTML@
@@ -204,8 +206,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -239,22 +239,25 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_LIBS = @LIBCURL_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
-LIBM = @LIBM@
 LIBNDP_CFLAGS = @LIBNDP_CFLAGS@
 LIBNDP_LIBS = @LIBNDP_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPSL_CFLAGS = @LIBPSL_CFLAGS@
+LIBPSL_LIBS = @LIBPSL_LIBS@
 LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
 LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@
 LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@
 LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@
 LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
+LIBUDEV_LIBS = @LIBUDEV_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOG_DRIVER = @LOG_DRIVER@
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 87c720f9..42c5fdd2 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -44,7 +44,7 @@
 
+gchar *
@@ -538,17 +538,17 @@
 
-
+
-
+
-
+
    
 
 
 
 
 
 
     
 
    
 
-GQuark
+GQuark
 
 
 nm_connection_error_quark ()
@@ -116,7 +116,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_connection_replace_settings ()
@@ -124,7 +124,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_connection_replace_settings_from_connection ()
@@ -132,7 +132,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_connection_compare ()
@@ -140,7 +140,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_connection_diff ()
@@ -148,7 +148,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_connection_verify ()
@@ -156,7 +156,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_connection_normalize ()
@@ -187,7 +187,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_connection_update_secrets ()
@@ -224,7 +224,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_connection_is_type ()
@@ -240,7 +240,7 @@
 
    
 
    
 
-GHashTable *
+GHashTable *
 
 
 nm_connection_to_hash ()
@@ -256,7 +256,7 @@
 
    
 
    
 
-GType
+GType
 
 
 nm_connection_lookup_setting_type ()
@@ -264,7 +264,7 @@
 
    
 
    
 
-GType
+GType
 
 
 nm_connection_lookup_setting_type_by_quark ()
@@ -520,7 +520,7 @@
 
 
    
 
-gchar *
 path
 Read / Write / Construct
 
    
 void
 changedRun FirstRun First
 
    
 
    
 void
 secrets-clearedRun FirstRun First
 
    
 
    
 void
 secrets-updatedRun FirstRun First
 
    
     
 
    
@@ -598,9 +598,9 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMConnectionError
-    GObject
+    GObject
     ╰── NMConnection
 
    
 
    
@@ -627,7 +627,7 @@ parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
 
    Functions
    
 
    
 
    nm_connection_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_connection_error_quark (void);
    
 
    Registers an error quark for NMConnection if necessary.
    
 
    
@@ -650,8 +650,8 @@ nm_connection_new (void
 
    nm_connection_new_from_hash ()
    
 
    NMConnection *
-nm_connection_new_from_hash (GHashTable *hash,
-                             GError **error);
    
+nm_connection_new_from_hash (GHashTable *hash,
+                             GError **error);
    
 
    Creates a new NMConnection from a hash table describing the connection.  See
 nm_connection_to_hash() for a description of the expected hash table.
    
 
    
@@ -665,7 +665,7 @@ nm_connection_new_from_hash (
    hash
    
-
     the GHashTable describing
+
     the GHashTable describing
 the connection. 
    
 [element-type utf8 GLib.HashTable]
 
@@ -680,7 +680,7 @@ the connection. 
    
 
    
 
    Returns
    
 
     the new NMConnection object, populated with settings created
-from the values in the hash table, or NULL if the connection failed to
+from the values in the hash table, or NULL if the connection failed to
 validate
    
 
    
 
    
@@ -735,7 +735,7 @@ nm_connection_create_setting (const 
 
    Returns
    
-
     the new setting object, or NULL if the setting name was unknown. 
    
+
     the new setting object, or NULL if the setting name was unknown. 
    
 
    [transfer full]
    
 
    
 
    
@@ -777,8 +777,8 @@ the setting object's reference count.
    
 
    nm_connection_remove_setting ()
    
 
    void
 nm_connection_remove_setting (NMConnection *connection,
-                              GType setting_type);
    
-
    Removes the NMSetting with the given GType from the NMConnection.  This
+                              GType setting_type);
    
+
    Removes the NMSetting with the given GType from the NMConnection.  This
 operation dereferences the NMSetting object.
    
 
    
 
    Parameters
    
@@ -796,7 +796,7 @@ operation dereferences the 
    setting_type
    
-
    the GType of the setting object to remove
    
+
    the GType of the setting object to remove
    
  
 
 
@@ -808,8 +808,8 @@ operation dereferences the 
    nm_connection_get_setting ()
    
 
    NMSetting *
 nm_connection_get_setting (NMConnection *connection,
-                           GType setting_type);
    
-
    Gets the NMSetting with the given GType, if one has been previously added
+                           GType setting_type);
    
+
    Gets the NMSetting with the given GType, if one has been previously added
 to the NMConnection.
    
 
    
 
    Parameters
    
@@ -827,7 +827,7 @@ to the 
 
 
    setting_type
    
-
    the GType of the setting object to return
    
+
    the GType of the setting object to return
    
  
 
 
@@ -835,7 +835,7 @@ to the 
 
    
 
    Returns
    
-
     the NMSetting, or NULL if no setting of that type was previously
+
     the NMSetting, or NULL if no setting of that type was previously
 added to the NMConnection. 
    
 
    [transfer none]
    
 
    
@@ -872,7 +872,7 @@ the 
 
    Returns
    
-
     the NMSetting, or NULL if no setting with that name was previously
+
     the NMSetting, or NULL if no setting with that name was previously
 added to the NMConnection. 
    
 
    [transfer none]
    
 
    
@@ -880,10 +880,10 @@ added to the 
 
    
 
    nm_connection_replace_settings ()
    
-
    gboolean
+
    gboolean
 nm_connection_replace_settings (NMConnection *connection,
-                                GHashTable *new_settings,
-                                GError **error);
    
+                                GHashTable *new_settings,
+                                GError **error);
    
 
    
 
    Parameters
    
 
    
@@ -900,12 +900,12 @@ nm_connection_replace_settings (
 
-
+
-
+
@@ -913,18 +913,18 @@ nm_connection_replace_settings (
 
    
 
    Returns
    
-
     TRUE if the settings were valid and added to the connection, FALSE
+
     TRUE if the settings were valid and added to the connection, FALSE
 if they were not
    
 
    
 
 
    
 
    
 
    nm_connection_replace_settings_from_connection ()
    
-
    gboolean
+
    gboolean
 nm_connection_replace_settings_from_connection
                                (NMConnection *connection,
                                 NMConnection *new_connection,
-                                GError **error);
    
+                                GError **error);
    
 
    Deep-copies the settings of new_conenction
  and replaces the settings of connection
 
@@ -951,7 +951,7 @@ with
    
 
 
    
-
+
@@ -959,9 +959,9 @@ with
    
 
 
    
 
    Returns
    
-
     TRUE if the settings were valid after replacing the connection, FALSE
-if they were not. Regardless of whether TRUE or FALSE is returned, the connection
-is successfully replaced. FALSE only means, that the connection does not verify
+
     TRUE if the settings were valid after replacing the connection, FALSE
+if they were not. Regardless of whether TRUE or FALSE is returned, the connection
+is successfully replaced. FALSE only means, that the connection does not verify
 at the end of the operation.
    
 
    
 
    Since: 0.9.10
    
@@ -969,7 +969,7 @@ at the end of the operation.
    
 
    
 
    
 
    nm_connection_compare ()
    
-
    gboolean
+
    gboolean
 nm_connection_compare (NMConnection *a,
                        NMConnection *b,
                        NMSettingCompareFlags flags);
    
@@ -1005,17 +1005,17 @@ each flag's behavior.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the comparison succeeds, FALSE if it does not
    
+
     TRUE if the comparison succeeds, FALSE if it does not
    
 
    
 
 
    
 
    
 
    nm_connection_diff ()
    
-
    gboolean
+
    gboolean
 nm_connection_diff (NMConnection *a,
                     NMConnection *b,
                     NMSettingCompareFlags flags,
-                    GHashTable **out_settings);
    
+                    GHashTable **out_settings);
    
 
    Compares two NMConnection objects for similarity, with comparison behavior
 modified by a set of flags.  See nm_setting_compare() for a description of
 each flag's behavior.  If the connections differ, settings and keys within
@@ -1059,16 +1059,16 @@ differ mapped to one or more of 
 
    Returns
    
-
     TRUE if the connections contain the same values, FALSE if they do
+
     TRUE if the connections contain the same values, FALSE if they do
 not
    
 
    
 
 
    
 
    
 
    nm_connection_verify ()
    
-
    gboolean
+
    gboolean
 nm_connection_verify (NMConnection *connection,
-                      GError **error);
    
+                      GError **error);
    
 
    Validates the connection and all its settings.  Each setting's properties
 have allowed values, and some values are dependent on other values.  For
 example, if a Wi-Fi connection is security enabled, the NMSettingWireless
@@ -1076,7 +1076,7 @@ setting object's 'security' property must contain the setting name of the
 NMSettingWirelessSecurity object, which must also be present in the
 connection for the connection to be valid.  As another example, the
 NMSettingWired object's 'mac-address' property must be a validly formatted
-MAC address.  The returned GError contains information about which
+MAC address.  The returned GError contains information about which
 setting and which property failed validation, and how it failed validation.
    
 
    
 
    Parameters
    
@@ -1094,7 +1094,7 @@ setting and which property failed validation, and how it failed validation.
    
 
 
    
-
+
@@ -1102,22 +1102,22 @@ setting and which property failed validation, and how it failed validation.
    
 
 
    
 
    Returns
    
-
     TRUE if the connection is valid, FALSE if it is not
    
+
     TRUE if the connection is valid, FALSE if it is not
    
 
    
 
 
    
 
    
 
    nm_connection_normalize ()
    
-
    gboolean
+
    gboolean
 nm_connection_normalize (NMConnection *connection,
-                         GHashTable *parameters,
-                         gboolean *modified,
-                         GError **error);
    
+                         GHashTable *parameters,
+                         gboolean *modified,
+                         GError **error);
    
 
    Does some basic normalization and fixup of well known inconsistencies
 and deprecated fields. If the connection was modified in any way,
 the output parameter modified
- is set TRUE.
    
-
    Finally the connection will be verified and TRUE returns if the connection
+ is set TRUE.
    
+
    Finally the connection will be verified and TRUE returns if the connection
 is valid. As this function only performs some specific normalization steps
 it cannot repair all connections. If the connection has errors that
 cannot be normalized, the connection will not be modified.
    
@@ -1137,10 +1137,10 @@ cannot be normalized, the connection will not be modified.
    
 
 
    
-
@@ -1151,7 +1151,7 @@ The values are opaque and depend on the parameter name. 
    
 
     
-
@@ -1160,7 +1160,7 @@ why the connection is invalid, if the function returns an error.
    
 
 
    
 
    Returns
    
-
     TRUE if the connection is valid, FALSE if it is not
    
+
     TRUE if the connection is valid, FALSE if it is not
    
 
    
 
    Since: 1.0
    
 
@@ -1169,7 +1169,7 @@ why the connection is invalid, if the function returns an error.
    
 
    nm_connection_need_secrets ()
    
 
    const char *
 nm_connection_need_secrets (NMConnection *connection,
-                            GPtrArray **hints);
    
+                            GPtrArray **hints);
 
    Returns the name of the first setting object in the connection which would
 need secrets to make a successful connection.  The returned hints are only
 intended as a guide to what secrets may be required, because in some
@@ -1191,10 +1191,10 @@ secrets are needed.
    
 
     
-
@@ -1237,7 +1237,7 @@ keeping secret data in memory when not needed.
    
 nm_connection_clear_secrets_with_flags
                                (NMConnection *connection,
                                 NMSettingClearSecretsWithFlagsFn func,
-                                gpointer user_data);
+                                gpointer user_data);
 
    Clears and frees secrets determined by func
 .
    
 
    
@@ -1273,16 +1273,16 @@ specific secret should be cleared or not. 
    
 
    
 
    
 
    nm_connection_update_secrets ()
    
-
    gboolean
+
    gboolean
 nm_connection_update_secrets (NMConnection *connection,
                               const char *setting_name,
-                              GHashTable *secrets,
-                              GError **error);
    
+                              GHashTable *secrets,
+                              GError **error);
    
 
    Update the specified setting's secrets, given a hash table of secrets
 intended for that setting (deserialized from D-Bus for example).  Will also
 extract the given setting's secrets hash if given a hash of hashes, as would
 be returned from nm_connection_to_hash().  If setting_name
- is NULL, expects
+ is NULL, expects
 a fully serialized NMConnection as returned by nm_connection_to_hash() and
 will update all secrets from all settings contained in secrets
 .
    
@@ -1307,14 +1307,14 @@ will update all secrets from all settings contained in 
 
    
-
-
+
@@ -1322,7 +1322,7 @@ string:
 
    Returns
    
-
     TRUE if the secrets were successfully updated, FALSE if the update
+
     TRUE if the secrets were successfully updated, FALSE if the update
 failed (tried to update secrets for a setting that doesn't exist, etc)
    
 
 
@@ -1394,7 +1394,7 @@ nm_connection_get_virtual_iface_name (NULL.
    
+connection types, this function will return NULL.
    
 
    
 
    Parameters
    
 
    
 
    new_settings
     a GHashTable of settings. 
     a GHashTable of settings. 
    		
 [element-type utf8 GLib.HashTable]
 
    
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
 
    
 
    parameters
     a GHashTable with
+
     a GHashTable with
 normalization parameters to allow customization of the normalization by providing
 specific arguments. Unknown arguments will be ignored and the default will be
-used. The keys must be strings, hashed by g_str_hash() and g_str_equal() functions.
+used. The keys must be strings, hashed by g_str_hash() and g_str_equal() functions.
 The values are opaque and depend on the parameter name. 
    		
 [allow-none][element-type utf8 gpointer]
 
    
 
    error
    location to store error, or NULL. Contains the reason,
+
    location to store error, or NULL. Contains the reason,
 why the connection is invalid, if the function returns an error.
    		
  
 
    
 
    hints
      the address of a pointer to a GPtrArray, initialized to NULL, which on
-return points to an allocated GPtrArray containing the property names of
+
      the address of a pointer to a GPtrArray, initialized to NULL, which on
+return points to an allocated GPtrArray containing the property names of
 secrets of the NMSetting which may be required; the caller owns the array
-and must free the array itself with g_ptr_array_free(), but not free its
+and must free the array itself with g_ptr_array_free(), but not free its
 elements. 
    		
 [out][element-type utf8][allow-none][transfer container]
 
    
 
    secrets
     a GHashTable mapping
-string:GValue of setting property names and secrets of the given setting_name
+
     a GHashTable mapping
+string:GValue of setting property names and secrets of the given setting_name
 . 
    		
 [element-type utf8 GObject.Value]
 
    
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
 
    
@@ -1412,7 +1412,7 @@ connection types, this function will return 
 
    Returns
    
-
     Name of the kernel interface or NULL
    
+
     Name of the kernel interface or NULL
    
 
 
 
    
@@ -1421,7 +1421,7 @@ connection types, this function will return const char *
 nm_connection_get_interface_name (NMConnection *connection);
 
    Returns the interface name as stored in NMSettingConnection:interface_name.
-If the connection contains no NMSettingConnection, it will return NULL.
    
+If the connection contains no NMSettingConnection, it will return NULL.
    
 
    For hardware devices and software devices created outside of NetworkManager,
 this name is used to match the device. for software devices created by
 NetworkManager, this is the name of the created interface.
    
@@ -1442,14 +1442,14 @@ NetworkManager, this is the name of the created interface.
    
 
 
    
 
    Returns
    
-
     Name of the kernel interface or NULL
    
+
     Name of the kernel interface or NULL
    
 
    
 
    Since: 1.0
    
 
 
    
 
    
 
    nm_connection_is_type ()
    
-
    gboolean
+
    gboolean
 nm_connection_is_type (NMConnection *connection,
                        const char *type);
    
 
    A convenience function to check if the given connection
@@ -1482,8 +1482,8 @@ property of the connection and matches that against 
 
    
 
    
 
    Returns
    
-
     TRUE if the connection is of the given type
-, FALSE if not
    
+
     TRUE if the connection is of the given type
+, FALSE if not
    
 
    
 
 
    
@@ -1492,7 +1492,7 @@ property of the connection and matches that against 
 
    void
 nm_connection_for_each_setting_value (NMConnection *connection,
                                       NMSettingValueIterFn func,
-                                      gpointer user_data);
    
+                                      gpointer user_data);
 
    Iterates over the properties of each NMSetting object in the NMConnection,
 calling the supplied user function for each property.
    
 
    
@@ -1527,14 +1527,14 @@ at each invocation
    
 
    
 
    
 
    nm_connection_to_hash ()
    
-
    GHashTable *
+
    GHashTable *
 nm_connection_to_hash (NMConnection *connection,
                        NMSettingHashFlags flags);
    
-
    Converts the NMConnection into a GHashTable describing the connection,
+
    Converts the NMConnection into a GHashTable describing the connection,
 suitable for marshalling over D-Bus or serializing.  The hash table mapping
-is string:GHashTable with each element in the returned hash representing
+is string:GHashTable with each element in the returned hash representing
 a NMSetting object.  The keys are setting object names, and the values
-are GHashTables mapping string:GValue, each of which represents the
+are GHashTables mapping string:GValue, each of which represents the
 properties of the NMSetting object.
    
 
    
 
    Parameters
    
@@ -1561,9 +1561,9 @@ properties of the 
 
    Returns
    
 
     a new
-GHashTable describing the connection, its settings, and each setting's
+GHashTable describing the connection, its settings, and each setting's
 properties.  The caller owns the hash table and must unref the hash table
-with g_hash_table_unref() when it is no longer needed. 
    
+with g_hash_table_unref() when it is no longer needed. 
    
 
    [transfer full][element-type utf8 GLib.HashTable]
    
 
    
 
    
@@ -1594,9 +1594,9 @@ output format is not guaranteed to be stable and may change at any time.
    
 
    
 
    
 
    nm_connection_lookup_setting_type ()
    
-
    GType
+
    GType
 nm_connection_lookup_setting_type (const char *name);
    
-
    Returns the GType of the setting's class for a given setting name.
    
+
    Returns the GType of the setting's class for a given setting name.
    
 
    
 
    Parameters
    
 
    
@@ -1614,16 +1614,16 @@ nm_connection_lookup_setting_type (const 
 
    
 
    Returns
    
-
     the GType of the setting's class
    
+
     the GType of the setting's class
    
 
    
 
 
    
 
    
 
    nm_connection_lookup_setting_type_by_quark ()
    
-
    GType
+
    GType
 nm_connection_lookup_setting_type_by_quark
-                               (GQuark error_quark);
    
-
    Returns the GType of the setting's class for a given setting error quark.
+                               (GQuark error_quark);
    
+
    Returns the GType of the setting's class for a given setting error quark.
 Useful for figuring out which setting a returned error is for.
    
 
    
 
    Parameters
    
@@ -1642,7 +1642,7 @@ Useful for figuring out which setting a returned error is for.
    
 
    
 
    
 
    Returns
    
-
     the GType of the setting's class
    
+
     the GType of the setting's class
    
 
    
 
    
 
    
@@ -1730,7 +1730,7 @@ nm_connection_get_connection_type (char *
 nm_connection_get_virtual_device_description
                                (NMConnection *connection);
-
    Returns the name that nm_device_disambiguate_names() would
+
    Returns the name that nm_device_disambiguate_names() would
 return for the virtual device that would be created for connection
 .
 Eg, "VLAN (eth1.1)".
    
@@ -1753,7 +1753,7 @@ Eg, "VLAN (eth1.1)".
    
 
    Returns
    
 
     the name of connection
 's device,
-or NULL if connection
+or NULL if connection
 is not a virtual connection type. 
    
 
    [transfer full]
    
 
@@ -1782,7 +1782,7 @@ nm_connection_get_setting_802_1x (
 
    
 
    Returns
    
-
     an NMSetting8021x if the connection contains one, otherwise NULL. 
    
+
     an NMSetting8021x if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -1809,7 +1809,7 @@ nm_connection_get_setting_bluetooth (
 
    
 
    Returns
    
-
     an NMSettingBluetooth if the connection contains one, otherwise NULL. 
    
+
     an NMSettingBluetooth if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -1836,7 +1836,7 @@ nm_connection_get_setting_bond (
 
    
 
    Returns
    
-
     an NMSettingBond if the connection contains one, otherwise NULL. 
    
+
     an NMSettingBond if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -1863,7 +1863,7 @@ nm_connection_get_setting_team (
 
    
 
    Returns
    
-
     an NMSettingTeam if the connection contains one, otherwise NULL. 
    
+
     an NMSettingTeam if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
    Since: 0.9.10
    
@@ -1891,7 +1891,7 @@ nm_connection_get_setting_team_port (
 
    
 
    Returns
    
-
     an NMSettingTeamPort if the connection contains one, otherwise NULL. 
    
+
     an NMSettingTeamPort if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
    Since: 0.9.10
    
@@ -1919,7 +1919,7 @@ nm_connection_get_setting_bridge (
 
    
 
    Returns
    
-
     an NMSettingBridge if the connection contains one, otherwise NULL. 
    
+
     an NMSettingBridge if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -1946,7 +1946,7 @@ nm_connection_get_setting_bridge_port (
 
    Returns
    
-
     an NMSettingBridgePort if the connection contains one, otherwise NULL. 
    
+
     an NMSettingBridgePort if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
 
@@ -1973,7 +1973,7 @@ nm_connection_get_setting_cdma (
 
    
 
    Returns
    
-
     an NMSettingCdma if the connection contains one, otherwise NULL. 
    
+
     an NMSettingCdma if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2000,7 +2000,7 @@ nm_connection_get_setting_connection (
 
    Returns
    
-
     an NMSettingConnection if the connection contains one, otherwise NULL. 
    
+
     an NMSettingConnection if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
 
@@ -2083,7 +2083,7 @@ nm_connection_get_setting_gsm (
 
    
 
    Returns
    
-
     an NMSettingGsm if the connection contains one, otherwise NULL. 
    
+
     an NMSettingGsm if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2110,7 +2110,7 @@ nm_connection_get_setting_infiniband (
 
    Returns
    
-
     an NMSettingInfiniband if the connection contains one, otherwise NULL. 
    
+
     an NMSettingInfiniband if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
 
@@ -2137,7 +2137,7 @@ nm_connection_get_setting_ip4_config (
 
    Returns
    
-
     an NMSettingIP4Config if the connection contains one, otherwise NULL. 
    
+
     an NMSettingIP4Config if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
 
@@ -2164,7 +2164,7 @@ nm_connection_get_setting_ip6_config (
 
    Returns
    
-
     an NMSettingIP6Config if the connection contains one, otherwise NULL. 
    
+
     an NMSettingIP6Config if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
 
@@ -2191,7 +2191,7 @@ nm_connection_get_setting_olpc_mesh (
 
    
 
    Returns
    
-
     an NMSettingOlpcMesh if the connection contains one, otherwise NULL. 
    
+
     an NMSettingOlpcMesh if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2218,7 +2218,7 @@ nm_connection_get_setting_ppp (
 
    
 
    Returns
    
-
     an NMSettingPPP if the connection contains one, otherwise NULL. 
    
+
     an NMSettingPPP if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2245,7 +2245,7 @@ nm_connection_get_setting_pppoe (
 
    
 
    Returns
    
-
     an NMSettingPPPOE if the connection contains one, otherwise NULL. 
    
+
     an NMSettingPPPOE if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2272,7 +2272,7 @@ nm_connection_get_setting_serial (
 
    
 
    Returns
    
-
     an NMSettingSerial if the connection contains one, otherwise NULL. 
    
+
     an NMSettingSerial if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2299,7 +2299,7 @@ nm_connection_get_setting_vpn (
 
    
 
    Returns
    
-
     an NMSettingVPN if the connection contains one, otherwise NULL. 
    
+
     an NMSettingVPN if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2326,7 +2326,7 @@ nm_connection_get_setting_wimax (
 
    
 
    Returns
    
-
     an NMSettingWimax if the connection contains one, otherwise NULL. 
    
+
     an NMSettingWimax if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2353,7 +2353,7 @@ nm_connection_get_setting_adsl (
 
    
 
    Returns
    
-
     an NMSettingAdsl if the connection contains one, otherwise NULL. 
    
+
     an NMSettingAdsl if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2380,7 +2380,7 @@ nm_connection_get_setting_wired (
 
    
 
    Returns
    
-
     an NMSettingWired if the connection contains one, otherwise NULL. 
    
+
     an NMSettingWired if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2407,7 +2407,7 @@ nm_connection_get_setting_wireless (
 
    
 
    Returns
    
-
     an NMSettingWireless if the connection contains one, otherwise NULL. 
    
+
     an NMSettingWireless if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2435,7 +2435,7 @@ nm_connection_get_setting_wireless_security
 
 
    
 
    Returns
    
-
     an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. 
    
+
     an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2462,7 +2462,7 @@ nm_connection_get_setting_vlan (
 
    
 
    Returns
    
-
     an NMSettingVlan if the connection contains one, otherwise NULL. 
    
+
     an NMSettingVlan if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2575,7 +2575,7 @@ It should only be accessed through the functions described below.
    
 
    Property Details
    
 
    
 
    The “path” property
    
-
      “path”                     gchar *
    
+
      “path”                     gchar *
    
 
    The connection's D-Bus path, used only by the calling process as a record
 of the D-Bus path of the connection as provided by a settings service.
    
 
    Flags: Read / Write / Construct
    
@@ -2588,7 +2588,7 @@ of the D-Bus path of the connection as provided by a settings service.
    
 
    The “changed” signal
    
 
    void
 user_function (NMConnection *connection,
-               gpointer      user_data)
    
+               gpointer      user_data)
 
    The ::changed signal is emitted when any property of any property
 (including secrets) of any setting of the connection is modified,
 or when settings are added or removed.
    
@@ -2614,7 +2614,7 @@ or when settings are added or removed.
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    Since: 0.9.10
    
 
    
 
    
@@ -2622,7 +2622,7 @@ or when settings are added or removed.
    
 
    The “secrets-cleared” signal
    
 
    void
 user_function (NMConnection *connection,
-               gpointer      user_data)
    
+               gpointer      user_data)
    
 
    The ::secrets-cleared signal is emitted when the secrets of a connection
 are cleared.
    
 
    
@@ -2647,15 +2647,15 @@ are cleared.
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “secrets-updated” signal
    
 
    void
 user_function (NMConnection *connection,
-               gchar        *setting_name,
-               gpointer      user_data)
    
+               gchar        *setting_name,
+               gpointer      user_data)
    
 
    The ::secrets-updated signal is emitted when the secrets of a setting
 have been changed.
    
 
    
@@ -2686,7 +2686,7 @@ updated
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 83f1691a..d94a9962 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_setting_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-gboolean
+gboolean
 
 
 (*NMSettingClearSecretsWithFlagsFn) ()
@@ -67,7 +67,7 @@
 
 
 
-GHashTable *
+GHashTable *
 
 
 nm_setting_to_hash ()
@@ -98,7 +98,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_verify ()
@@ -106,7 +106,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_compare ()
@@ -114,7 +114,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_diff ()
@@ -154,7 +154,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_setting_need_secrets ()
@@ -162,7 +162,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_update_secrets ()
@@ -170,7 +170,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_get_secret_flags ()
@@ -178,7 +178,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_set_secret_flags ()
@@ -204,7 +204,7 @@
 
 
 
-gchar *
+gchar *
 name
 Read / Write
 
@@ -271,13 +271,13 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMSettingCompareFlags
     ├── NMSettingDiffResult
     ├── NMSettingError
     ├── NMSettingHashFlags
     ╰── NMSettingSecretFlags
-    GObject
+    GObject
     ╰── NMSetting
         ├── NMSetting8021x
         ├── NMSettingAdsl
@@ -325,7 +325,7 @@ of properties and allowed values.
    
 
    Functions
    
 
    
 
    nm_setting_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_error_quark (void);
    
 
    Registers an error quark for NMSetting if necessary.
    
 
    
@@ -336,11 +336,11 @@ nm_setting_error_quark (void
 
    
 
    NMSettingClearSecretsWithFlagsFn ()
    
-
    gboolean
+
    gboolean
 (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
                                      const char *secret,
                                      NMSettingSecretFlags flags,
-                                     gpointer user_data);
    
+                                     gpointer user_data);
    
 
    
 
    Parameters
    
 
    
@@ -375,7 +375,7 @@ nm_setting_error_quark (void
 
    
 
    Returns
    
-
     TRUE to clear the secret, FALSE to not clear the secret
    
+
     TRUE to clear the secret, FALSE to not clear the secret
    
 
    
 
 
    
@@ -384,9 +384,9 @@ nm_setting_error_quark (voidvoid
 (*NMSettingValueIterFn) (NMSetting *setting,
                          const char *key,
-                         const GValue *value,
-                         GParamFlags flags,
-                         gpointer user_data);
+                         const GValue *value,
+                         GParamFlags flags,
+                         gpointer user_data);
 
    
 
    Parameters
    
 
    
@@ -429,10 +429,10 @@ nm_setting_error_quark (void
 
    
 
    nm_setting_to_hash ()
    
-
    GHashTable *
+
    GHashTable *
 nm_setting_to_hash (NMSetting *setting,
                     NMSettingHashFlags flags);
    
-
    Converts the NMSetting into a GHashTable mapping each setting property
+
    Converts the NMSetting into a GHashTable mapping each setting property
 name to a GValue describing that property, suitable for marshalling over
 D-Bus or serializing.  The mapping is string to GValue.
    
 
    
@@ -459,7 +459,7 @@ D-Bus or serializing.  The mapping is string to GValue.
    
 
    
 
    
 
    Returns
    
-
     a new GHashTable
+
     a new GHashTable
 describing the setting's properties. 
    
 
    [transfer full][element-type utf8 GObject.Value]
    
 
    
@@ -468,8 +468,8 @@ describing the setting's properties. 
    
 
    
 
    nm_setting_new_from_hash ()
    
 
    NMSetting *
-nm_setting_new_from_hash (GType setting_type,
-                          GHashTable *hash);
    
+nm_setting_new_from_hash (GType setting_type,
+                          GHashTable *hash);
    
 
    Creates a new NMSetting object and populates that object with the properties
 contained in the hash table, using each hash key as the property to set,
 and each hash value as the value to set that property to.  Setting properties
@@ -492,7 +492,7 @@ property names and value types.
    
 
 
    
-
@@ -502,7 +502,7 @@ string to GValue mapping of properties that apply to the setting. 
    
 
    
 
    Returns
    
 
     a new NMSetting object populated with the properties from the
-hash table, or NULL on failure
    
+hash table, or NULL on failure
    
 
    
 
 
    
@@ -563,14 +563,14 @@ like 'ppp' or 'wireless' or 'wired'.
    
 
    
 
    
 
    nm_setting_verify ()
    
-
    gboolean
+
    gboolean
 nm_setting_verify (NMSetting *setting,
-                   GSList *all_settings,
-                   GError **error);
    
+                   GSList *all_settings,
+                   GError **error);
    
 
    Validates the setting.  Each setting's properties have allowed values, and
 some are dependent on other values (hence the need for all_settings
 ).  The
-returned GError contains information about which property of the setting
+returned GError contains information about which property of the setting
 failed validation, and in what way that property failed validation.
    
 
    
 
    Parameters
    
@@ -588,14 +588,14 @@ failed validation, and in what way that property failed validation.
    
 
 
    
-
-
+
@@ -603,13 +603,13 @@ came. 
    
 
 
    
 
    Returns
    
-
     TRUE if the setting is valid, FALSE if it is not
    
+
     TRUE if the setting is valid, FALSE if it is not
    
 
    
 
 
    
 
    
 
    nm_setting_compare ()
    
-
    gboolean
+
    gboolean
 nm_setting_compare (NMSetting *a,
                     NMSetting *b,
                     NMSettingCompareFlags flags);
    
@@ -645,18 +645,18 @@ for a description of each flag's behavior.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the comparison succeeds, FALSE if it does not
    
+
     TRUE if the comparison succeeds, FALSE if it does not
    
 
    
 
 
    
 
    
 
    nm_setting_diff ()
    
-
    gboolean
+
    gboolean
 nm_setting_diff (NMSetting *a,
                  NMSetting *b,
                  NMSettingCompareFlags flags,
-                 gboolean invert_results,
-                 GHashTable **results);
    
+                 gboolean invert_results,
+                 GHashTable **results);
    
 
    Compares two NMSetting objects for similarity, with comparison behavior
 modified by a set of flags.  See the documentation for NMSettingCompareFlags
 for a description of each flag's behavior.  If the settings differ, the keys
@@ -690,7 +690,7 @@ one or more 
    invert_results
    
 
    
+be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.
    
     
@@ -707,7 +707,7 @@ in and the settings differ, a new one is created and returned. 
    
 
 
    
 
    Returns
    
-
     TRUE if the settings contain the same values, FALSE if they do not
    
+
     TRUE if the settings contain the same values, FALSE if they do not
    
 
    
 
 
    
@@ -716,7 +716,7 @@ in and the settings differ, a new one is created and returned. 
    
 
    void
 nm_setting_enumerate_values (NMSetting *setting,
                              NMSettingValueIterFn func,
-                             gpointer user_data);
    
+                             gpointer user_data);
 
    Iterates over each property of the NMSetting object, calling the supplied
 user function for each property.
    
 
    
@@ -775,7 +775,7 @@ output format is not guaranteed to be stable and may change at any time.
    
 
    Returns
    
 
     an allocated string containing a textual representation of the
 setting's properties and values (including secrets!), which the caller should
-free with g_free()
    
+free with g_free()
    
 
    
 
 
    
@@ -808,7 +808,7 @@ leakage of information.
    
 
    void
 nm_setting_clear_secrets_with_flags (NMSetting *setting,
                                      NMSettingClearSecretsWithFlagsFn func,
-                                     gpointer user_data);
    
+                                     gpointer user_data);
 
    Clears and frees secrets determined by func
 .
    
 
    
@@ -844,7 +844,7 @@ specific secret should be cleared or not. 
    
 
    
 
    
 
    nm_setting_need_secrets ()
    
-
    GPtrArray *
+
    GPtrArray *
 nm_setting_need_secrets (NMSetting *setting);
    
 
    Returns an array of property names for each secret which may be required
 to make a successful connection.  The returned hints are only intended as a
@@ -867,9 +867,9 @@ is no way to conclusively determine exactly which secrets are needed.
    
 
    
 
    
 
    Returns
    
-
     a GPtrArray containing
+
     a GPtrArray containing
 the property names of secrets of the NMSetting which may be required; the
-caller owns the array and must free it with g_ptr_array_free(), but must not
+caller owns the array and must free it with g_ptr_array_free(), but must not
 free the elements. 
    
 
    [transfer container][element-type utf8]
    
 
    
@@ -877,10 +877,10 @@ free the elements. 
    
 
    
 
    
 
    nm_setting_update_secrets ()
    
-
    gboolean
+
    gboolean
 nm_setting_update_secrets (NMSetting *setting,
-                           GHashTable *secrets,
-                           GError **error);
    
+                           GHashTable *secrets,
+                           GError **error);
    
 
    Update the setting's secrets, given a hash table of secrets intended for that
 setting (deserialized from D-Bus for example).
    
 
    
@@ -899,13 +899,13 @@ setting (deserialized from D-Bus for example).
    
 
    
-
+
-
+
@@ -913,18 +913,18 @@ string to 
 
    Returns
    
-
     TRUE if the secrets were successfully updated, FALSE on failure to
+
     TRUE if the secrets were successfully updated, FALSE on failure to
 update one or more of the secrets.
    
 
 
 
    
 
    
 
    nm_setting_get_secret_flags ()
    
-
    gboolean
+
    gboolean
 nm_setting_get_secret_flags (NMSetting *setting,
                              const char *secret_name,
                              NMSettingSecretFlags *out_flags,
-                             GError **error);
    
+                             GError **error);
    
 
    For a given secret, retrieves the NMSettingSecretFlags describing how to
 handle that secret.
    
 
    
@@ -953,7 +953,7 @@ handle that secret.
    
 
 
    
-
+
@@ -961,18 +961,18 @@ handle that secret.
    
 
 
    
 
    Returns
    
-
     TRUE on success (if the given secret name was a valid property of
-this setting, and if that property is secret), FALSE if not
    
+
     TRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not
    
 
    
 
 
    
 
    
 
    nm_setting_set_secret_flags ()
    
-
    gboolean
+
    gboolean
 nm_setting_set_secret_flags (NMSetting *setting,
                              const char *secret_name,
                              NMSettingSecretFlags flags,
-                             GError **error);
    
+                             GError **error);
    
 
    For a given secret, stores the NMSettingSecretFlags describing how to
 handle that secret.
    
 
    
@@ -1001,7 +1001,7 @@ handle that secret.
    
 
 
    
-
+
@@ -1009,8 +1009,8 @@ handle that secret.
    
 
 
    
 
    Returns
    
-
     TRUE on success (if the given secret name was a valid property of
-this setting, and if that property is secret), FALSE if not
    
+
     TRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not
    
 
    
 
 
    
@@ -1037,7 +1037,7 @@ needs to use if specified in the settings.
    
 
 
    
 
    Returns
    
-
     Name of the virtual interface or NULL if the setting does not
+
     Name of the virtual interface or NULL if the setting does not
 support this feature
    
 
    
 
@@ -1389,7 +1389,7 @@ if you specify NM_SETTING_COMPARE_FLAG_DIFF_RESULT_W
 
    Property Details
    
 
    
 
    The “name” property
    
-
      “name”                     gchar *
    
+
      “name”                     gchar *
    
 
    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".
    
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index b829d5a4..215f4756 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -43,7 +43,7 @@
 
    
-
-
-
-
-
-
-
+gchar *
 
@@ -593,7 +593,7 @@
 
 
+gchar *
 
@@ -611,24 +611,24 @@
 
 
+gchar *
 
+gchar *
 
+gchar *
 
-
+
@@ -639,25 +639,25 @@
 
-
+
+gchar *
 
+gchar *
 
+gchar *
 
@@ -669,13 +669,13 @@
 
 
+gchar *
 
+gchar *
 
@@ -687,7 +687,7 @@
 
 
+gchar *
 
@@ -705,29 +705,29 @@
 
 
+gchar *
 
-
+
+gchar *
 
+gchar *
 
-
+
@@ -739,23 +739,23 @@
 
 
+gchar *
 
-
+
+gchar *
 
-
+
@@ -923,11 +923,11 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMSetting8021xCKFormat
     ├── NMSetting8021xCKScheme
     ╰── NMSetting8021xError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSetting8021x
 
    
@@ -962,7 +962,7 @@ following books.
    
 
    Functions
    
 
    
 
    nm_setting_802_1x_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_802_1x_error_quark (void);
    
 
    Registers an error quark for NMSetting8021x if necessary.
    
 
    
@@ -984,7 +984,7 @@ nm_setting_802_1x_new (void
 
    
 
    nm_setting_802_1x_get_num_eap_methods ()
    
-
    guint32
+
    guint32
 nm_setting_802_1x_get_num_eap_methods (NMSetting8021x *setting);
    
 
    Returns the number of eap methods allowed for use when connecting to the
 network.  Generally only one EAP method is used.  Use the functions
@@ -1016,7 +1016,7 @@ allowed EAP methods.
    
 
    nm_setting_802_1x_get_eap_method ()
    
 
    const char *
 nm_setting_802_1x_get_eap_method (NMSetting8021x *setting,
-                                  guint32 i);
    
+                                  guint32 i);
    
 
    Returns the name of the allowed EAP method at index i
 .
    
 
    
@@ -1050,7 +1050,7 @@ nm_setting_802_1x_get_eap_method (
 
    
 
    nm_setting_802_1x_add_eap_method ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_add_eap_method (NMSetting8021x *setting,
                                   const char *eap);
    
 
    Adds an allowed EAP method.  The setting is not valid until at least one
@@ -1080,7 +1080,7 @@ allowed EAP methods.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the EAP method was successfully added, FALSE if it was
+
     TRUE if the EAP method was successfully added, FALSE if it was
 not a valid method or if it was already allowed.
    
 
    
 
    
@@ -1089,7 +1089,7 @@ not a valid method or if it was already allowed.
    
 
    nm_setting_802_1x_remove_eap_method ()
    
 
    void
 nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
-                                     guint32 i);
    
+                                     guint32 i);
    
 
    Removes the allowed EAP method at the specified index.
    
 
    
 
    Parameters
    
@@ -1117,7 +1117,7 @@ nm_setting_802_1x_remove_eap_method (
 
    
 
    nm_setting_802_1x_remove_eap_method_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_remove_eap_method_by_value
                                (NMSetting8021x *setting,
                                 const char *eap);
    
@@ -1147,7 +1147,7 @@ nm_setting_802_1x_remove_eap_method_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the EAP method was founs and removed, FALSE if it was not.
    
+
     TRUE if the EAP method was founs and removed, FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -1259,12 +1259,12 @@ nm_setting_802_1x_get_pac_file (
 
    
 
    nm_setting_802_1x_get_system_ca_certs ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_get_system_ca_certs (NMSetting8021x *setting);
    
 
    Sets the “system-ca-certs” property. The
 “ca-path” and “phase2-ca-path”
 properties are ignored if the “system-ca-certs” property is
-TRUE, in which case a system-wide CA certificate directory specified at
+TRUE, in which case a system-wide CA certificate directory specified at
 compile time (using the --system-ca-path configure option) is used in place
 of these properties.
    
 
    
@@ -1284,7 +1284,7 @@ of these properties.
    
 
    
 
    
 
    Returns
    
-
     TRUE if a system CA certificate path should be used, FALSE if not
    
+
     TRUE if a system CA certificate path should be used, FALSE if not
    
 
    
 
    
 
    
@@ -1378,7 +1378,7 @@ if 
 
    nm_setting_802_1x_get_ca_cert_blob ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_802_1x_get_ca_cert_blob (NMSetting8021x *setting);
    
 
    Returns the CA certificate blob if the CA certificate is stored using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
@@ -1440,12 +1440,12 @@ of the network cannot be confirmed by the client.
    
 
    
 
    
 
    nm_setting_802_1x_set_ca_cert ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_set_ca_cert (NMSetting8021x *setting,
                                const char *cert_path,
                                NMSetting8021xCKScheme scheme,
                                NMSetting8021xCKFormat *out_format,
-                               GError **error);
    
+                               GError **error);
    
 
    Reads a certificate from disk and sets the “ca-cert” property
 with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
 scheme, or with the path to the certificate file if using the
@@ -1470,7 +1470,7 @@ scheme, or with the path to the certificate file if using the
 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate
 file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
 clears the CA certificate.
    
 
    
@@ -1494,7 +1494,7 @@ clears the CA certificate.
    
 
 
    
 
    Returns
    
-
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
 
    
@@ -1521,14 +1521,14 @@ nm_setting_802_1x_get_subject_match (
    Returns
    
 
     the “subject-match” property. This is the
 substring to be matched against the subject of the authentication
-server certificate, or NULL no subject verification is to be
+server certificate, or NULL no subject verification is to be
 performed.
    
 
 
 
    
 
    
 
    nm_setting_802_1x_get_num_altsubject_matches ()
    
-
    guint32
+
    guint32
 nm_setting_802_1x_get_num_altsubject_matches
                                (NMSetting8021x *setting);
    
 
    Returns the number of entries in the
@@ -1559,7 +1559,7 @@ nm_setting_802_1x_get_num_altsubject_matches
 
    const char *
 nm_setting_802_1x_get_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    Returns the altSubjectName match at index i
 .
    
 
    
@@ -1593,7 +1593,7 @@ nm_setting_802_1x_get_altsubject_match
 
    
 
    
 
    nm_setting_802_1x_add_altsubject_match ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_add_altsubject_match
                                (NMSetting8021x *setting,
                                 const char *altsubject_match);
    
@@ -1624,8 +1624,8 @@ server is not verified.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the alternative subject name match was
-successfully added, FALSE if it was already allowed.
    
+
     TRUE if the alternative subject name match was
+successfully added, FALSE if it was already allowed.
    
 
    
 
    
 
    
@@ -1634,7 +1634,7 @@ successfully added, void
 nm_setting_802_1x_remove_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);
+                                guint32 i);
 
    Removes the allowed altSubjectName at the specified index.
    
 
    
 
    Parameters
    
@@ -1662,7 +1662,7 @@ nm_setting_802_1x_remove_altsubject_match
 
    
 
    
 
    nm_setting_802_1x_remove_altsubject_match_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_remove_altsubject_match_by_value
                                (NMSetting8021x *setting,
                                 const char *altsubject_match);
    
@@ -1692,8 +1692,8 @@ nm_setting_802_1x_remove_altsubject_match_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the alternative subject name match was found and removed,
-FALSE if it was not.
    
+
     TRUE if the alternative subject name match was found and removed,
+FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -1752,7 +1752,7 @@ if 
 
    nm_setting_802_1x_get_client_cert_blob ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_802_1x_get_client_cert_blob
                                (NMSetting8021x *setting);
    
 
    Client certificates are used to identify the connecting client to the network
@@ -1810,12 +1810,12 @@ authentication method.
    
 
    
 
    
 
    nm_setting_802_1x_set_client_cert ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_set_client_cert (NMSetting8021x *setting,
                                    const char *cert_path,
                                    NMSetting8021xCKScheme scheme,
                                    NMSetting8021xCKFormat *out_format,
-                                   GError **error);
    
+                                   GError **error);
    
 
    Reads a certificate from disk and sets the “client-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
@@ -1843,7 +1843,7 @@ authentication method.
    
 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client
 certificate file (PEM, DER, or PKCS#12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
 any scheme
 clears the client certificate.
    
 
    
@@ -1868,7 +1868,7 @@ clears the client certificate.
    
 
 
    
 
    Returns
    
-
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
 
    
@@ -1895,7 +1895,7 @@ nm_setting_802_1x_get_phase1_peapver (
    Returns
    
 
     the "phase 1" PEAP version to be used when authenticating with
 EAP-PEAP as contained in the “phase1-peapver” property.  Valid
-values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
    
+values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
    
 
 
 
    
@@ -1923,7 +1923,7 @@ nm_setting_802_1x_get_phase1_peaplabel
 
    Returns
    
 
     whether the "phase 1" PEAP label is new-style or old-style, to be
 used when authenticating with EAP-PEAP, as contained in the
-“phase1-peaplabel” property.  Valid values are NULL (unset),
+“phase1-peaplabel” property.  Valid values are NULL (unset),
 "0" (use old-style label), and "1" (use new-style label).  See the
 wpa_supplicant documentation for more details.
    
 
@@ -2041,7 +2041,7 @@ use 
 
    nm_setting_802_1x_get_phase2_ca_cert_blob ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_802_1x_get_phase2_ca_cert_blob
                                (NMSetting8021x *setting);
    
 
    Returns the "phase 2" CA certificate blob if the CA certificate is stored
@@ -2105,12 +2105,12 @@ of the network cannot be confirmed by the client.
    
 
    
 
    
 
    nm_setting_802_1x_set_phase2_ca_cert ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_set_phase2_ca_cert (NMSetting8021x *setting,
                                       const char *cert_path,
                                       NMSetting8021xCKScheme scheme,
                                       NMSetting8021xCKFormat *out_format,
-                                      GError **error);
    
+                                      GError **error);
    
 
    Reads a certificate from disk and sets the “phase2-ca-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
@@ -2135,7 +2135,7 @@ file if using the NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
 certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
 clears the "phase2" CA certificate.
    
 
    
@@ -2159,7 +2159,7 @@ clears the "phase2" CA certificate.
    
 
 
    
 
    Returns
    
-
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
 
    
@@ -2187,14 +2187,14 @@ nm_setting_802_1x_get_phase2_subject_match
 
    Returns
    
 
     the “phase2-subject-match” property. This is
 the substring to be matched against the subject of the "phase 2"
-authentication server certificate, or NULL no subject verification
+authentication server certificate, or NULL no subject verification
 is to be performed.
    
 
 
 
    
 
    
 
    nm_setting_802_1x_get_num_phase2_altsubject_matches ()
    
-
    guint32
+
    guint32
 nm_setting_802_1x_get_num_phase2_altsubject_matches
                                (NMSetting8021x *setting);
    
 
    Returns the number of entries in the
@@ -2225,7 +2225,7 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 
    const char *
 nm_setting_802_1x_get_phase2_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    Returns the "phase 2" altSubjectName match at index i
 .
    
 
    
@@ -2259,7 +2259,7 @@ nm_setting_802_1x_get_phase2_altsubject_match
 
    
 
    
 
    nm_setting_802_1x_add_phase2_altsubject_match ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_add_phase2_altsubject_match
                                (NMSetting8021x *setting,
                                 const char *phase2_altsubject_match);
    
@@ -2291,8 +2291,8 @@ connection
    
 
    
 
    
 
    Returns
    
-
     TRUE if the "phase 2" alternative subject name match was
-successfully added, FALSE if it was already allowed.
    
+
     TRUE if the "phase 2" alternative subject name match was
+successfully added, FALSE if it was already allowed.
    
 
    
 
    
 
    
@@ -2301,7 +2301,7 @@ successfully added, void
 nm_setting_802_1x_remove_phase2_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);
+                                guint32 i);
 
    Removes the allowed "phase 2" altSubjectName at the specified index.
    
 
    
 
    Parameters
    
@@ -2329,7 +2329,7 @@ nm_setting_802_1x_remove_phase2_altsubject_match
 
    
 
    
 
    nm_setting_802_1x_remove_phase2_altsubject_match_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_remove_phase2_altsubject_match_by_value
                                (NMSetting8021x *setting,
                                 const char *phase2_altsubject_match);
    
@@ -2359,8 +2359,8 @@ nm_setting_802_1x_remove_phase2_altsubject_match_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the alternative subject name match for "phase 2" was found and removed,
-FALSE if it was not.
    
+
     TRUE if the alternative subject name match for "phase 2" was found and removed,
+FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -2421,7 +2421,7 @@ returned scheme is 
 
    nm_setting_802_1x_get_phase2_client_cert_blob ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_802_1x_get_phase2_client_cert_blob
                                (NMSetting8021x *setting);
    
 
    Client certificates are used to identify the connecting client to the network
@@ -2479,13 +2479,13 @@ authentication method.
    
 
    
 
    
 
    nm_setting_802_1x_set_phase2_client_cert ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_set_phase2_client_cert
                                (NMSetting8021x *setting,
                                 const char *cert_path,
                                 NMSetting8021xCKScheme scheme,
                                 NMSetting8021xCKFormat *out_format,
-                                GError **error);
    
+                                GError **error);
    
 
    Reads a certificate from disk and sets the “phase2-client-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
@@ -2513,7 +2513,7 @@ authentication method.
    
 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
 certificate file (PEM, DER, or PKCS#12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
 any scheme
 clears the "phase2" client certificate.
    
 
    
@@ -2538,7 +2538,7 @@ clears the "phase2" client certificate.
    
 
 
    
 
    Returns
    
-
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
 
    
@@ -2595,7 +2595,7 @@ nm_setting_802_1x_get_password_flags (
 
    nm_setting_802_1x_get_password_raw ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_802_1x_get_password_raw (NMSetting8021x *setting);
    
 
    
 
    Parameters
    
@@ -2732,7 +2732,7 @@ nm_setting_802_1x_get_private_key_scheme
 
    
 
    
 
    nm_setting_802_1x_get_private_key_blob ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_802_1x_get_private_key_blob
                                (NMSetting8021x *setting);
    
 
    Private keys are used to authenticate the connecting client to the network
@@ -2793,13 +2793,13 @@ authentication method.
    
 
    
 
    
 
    nm_setting_802_1x_set_private_key ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_set_private_key (NMSetting8021x *setting,
                                    const char *key_path,
                                    const char *password,
                                    NMSetting8021xCKScheme scheme,
                                    NMSetting8021xCKFormat *out_format,
-                                   GError **error);
    
+                                   GError **error);
    
 
    Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
@@ -2813,7 +2813,7 @@ verify that password
  is correct, and if it is, updates the
 “private-key-password” property with the given password
 .  If
-the decryption is unsuccessful, FALSE is returned, error
+the decryption is unsuccessful, FALSE is returned, error
  is set, and no
 internal data is changed.  If no password
  is given, the private key is
@@ -2843,13 +2843,13 @@ key password to prevent unauthorized access to unencrypted private key data.
    
 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
 NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
 (PEM, DER, or PKCS#12 format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
 clears the private key.
    
 
    
-
@@ -2874,7 +2874,7 @@ an error is returned.
    
 
 
    
 
    Returns
    
-
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
 
    
@@ -2993,7 +2993,7 @@ scheme is 
 
    nm_setting_802_1x_get_phase2_private_key_blob ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_802_1x_get_phase2_private_key_blob
                                (NMSetting8021x *setting);
    
 
    Private keys are used to authenticate the connecting client to the network
@@ -3054,14 +3054,14 @@ authentication method.
    
 
    
 
    
 
    nm_setting_802_1x_set_phase2_private_key ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_set_phase2_private_key
                                (NMSetting8021x *setting,
                                 const char *key_path,
                                 const char *password,
                                 NMSetting8021xCKScheme scheme,
                                 NMSetting8021xCKFormat *out_format,
-                                GError **error);
    
+                                GError **error);
    
 
    Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
@@ -3075,7 +3075,7 @@ verify that password
  is correct, and if it is, updates the
 “phase2-private-key-password” property with the given
 password
-.  If the decryption is unsuccessful, FALSE is returned, error
+.  If the decryption is unsuccessful, FALSE is returned, error
  is
 set, and no internal data is changed.  If no password
  is given, the private
@@ -3105,14 +3105,14 @@ key password to prevent unauthorized access to unencrypted private key data.
    
 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
 NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private
 key file (PEM, DER, or PKCS#12 format).  The path must be UTF-8 encoded;
-use g_filename_to_utf8() to convert if needed.  Passing NULL with any
+use g_filename_to_utf8() to convert if needed.  Passing NULL with any
 scheme
 clears the private key.
    
 
    
-
@@ -3137,7 +3137,7 @@ an error is returned.
    
 
 
    
 
    Returns
    
-
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
 
    
@@ -3571,7 +3571,7 @@ no verification of the server certificate's altSubjectName is performed.
    
 
    
 
    
 
    The “anonymous-identity” property
    
-
      “anonymous-identity”       gchar *
    
+
      “anonymous-identity”       gchar *
    
 
    Anonymous identity string for EAP authentication methods.  Used as the
 unencrypted identity with EAP types that support different tunneled
 identity like EAP-TTLS.
    
@@ -3599,7 +3599,7 @@ but this allows man-in-the-middle attacks and is NOT recommended.
    
 
    
 
    
 
    The “ca-path” property
    
-
      “ca-path”                  gchar *
    
+
      “ca-path”                  gchar *
    
 
    UTF-8 encoded path to a directory containing PEM or DER formatted
 certificates to be added to the verification chain in addition to the
 certificate specified in the “ca-cert” property.
    
@@ -3636,7 +3636,7 @@ allowed combinations.
    
 
    
 
    
 
    The “identity” property
    
-
      “identity”                 gchar *
    
+
      “identity”                 gchar *
    
 
    Identity string for EAP authentication methods.  Often the user's user or
 login name.
    
 
    Flags: Read / Write
    
@@ -3645,7 +3645,7 @@ login name.
    
 
    
 
    
 
    The “pac-file” property
    
-
      “pac-file”                 gchar *
    
+
      “pac-file”                 gchar *
    
 
    UTF-8 encoded file path containing PAC for EAP-FAST.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -3653,7 +3653,7 @@ login name.
    
 
    
 
    
 
    The “password” property
    
-
      “password”                 gchar *
    
+
      “password”                 gchar *
    
 
    UTF-8 encoded password used for EAP authentication methods. If both the
 “password” property and the “password-raw”
 property are specified, “password” is preferred.
    
@@ -3663,7 +3663,7 @@ property are specified, 
 
    The “password-flags” property
    
-
      “password-flags”           guint
    
+
      “password-flags”           guint
    
 
    Flags indicating how to handle the “password” property.
    
 
    Flags: Read / Write
    
 
    Allowed values: <= 7
    
@@ -3682,7 +3682,7 @@ property are specified, 
 
    The “password-raw-flags” property
    
-
      “password-raw-flags”       guint
    
+
      “password-raw-flags”       guint
    
 
    Flags indicating how to handle the “password-raw” property.
    
 
    Flags: Read / Write
    
 
    Allowed values: <= 7
    
@@ -3691,7 +3691,7 @@ property are specified, 
 
    The “phase1-fast-provisioning” property
    
-
      “phase1-fast-provisioning” gchar *
    
+
      “phase1-fast-provisioning” gchar *
    
 
    Enables or disables in-line provisioning of EAP-FAST credentials when
 FAST is specified as the EAP method in the “eap” property.
 Recognized values are "0" (disabled), "1" (allow unauthenticated
@@ -3704,7 +3704,7 @@ wpa_supplicant documentation for more details.
    
 
    
 
    
 
    The “phase1-peaplabel” property
    
-
      “phase1-peaplabel”         gchar *
    
+
      “phase1-peaplabel”         gchar *
    
 
    Forces use of the new PEAP label during key derivation.  Some RADIUS
 servers may require forcing the new PEAP label to interoperate with
 PEAPv1.  Set to "1" to force use of the new PEAP label.  See the
@@ -3715,7 +3715,7 @@ wpa_supplicant documentation for more details.
    
 
    
 
    
 
    The “phase1-peapver” property
    
-
      “phase1-peapver”           gchar *
    
+
      “phase1-peapver”           gchar *
    
 
    Forces which PEAP version is used when PEAP is set as the EAP method in
 the “eap” property.  When unset, the version reported by
 the server will be used.  Sometimes when using older RADIUS servers, it
@@ -3738,7 +3738,7 @@ server certificate's altSubjectName is performed.
    
 
    
 
    
 
    The “phase2-auth” property
    
-
      “phase2-auth”              gchar *
    
+
      “phase2-auth”              gchar *
    
 
    Specifies the allowed "phase 2" inner non-EAP authentication methods when
 an EAP method that uses an inner TLS tunnel is specified in the
 “eap” property.  Recognized non-EAP "phase 2" methods are
@@ -3751,7 +3751,7 @@ authentication; see the wpa_supplicant documentation for more details.
    
 
    
 
    
 
    The “phase2-autheap” property
    
-
      “phase2-autheap”           gchar *
    
+
      “phase2-autheap”           gchar *
    
 
    Specifies the allowed "phase 2" inner EAP-based authentication methods
 when an EAP method that uses an inner TLS tunnel is specified in the
 “eap” property.  Recognized EAP-based "phase 2" methods are
@@ -3783,7 +3783,7 @@ but this allows man-in-the-middle attacks and is NOT recommended.
    
 
    
 
    
 
    The “phase2-ca-path” property
    
-
      “phase2-ca-path”           gchar *
    
+
      “phase2-ca-path”           gchar *
    
 
    UTF-8 encoded path to a directory containing PEM or DER formatted
 certificates to be added to the verification chain in addition to the
 certificate specified in the “phase2-ca-cert” property.
    
@@ -3827,7 +3827,7 @@ the blob scheme, this property should be set to the PKCS#12 data and the
 password used to decrypt the PKCS#12 certificate and key. When using
 PKCS#12 files and the path scheme, this property should be set to the
 full UTF-8 encoded path of the key, prefixed with the string "file://"
-and and ending with a terminating NUL byte, and as with the blob scheme
+and ending with a terminating NUL byte, and as with the blob scheme
 the “phase2-private-key-password” property must be set to
 the password used to decode the PKCS#12 private key and certificate.
    
 
    Setting this property directly is discouraged; use the
@@ -3837,7 +3837,7 @@ the password used to decode the PKCS#12 private key and certificate.
    
 
    
 
    
 
    The “phase2-private-key-password” property
    
-
      “phase2-private-key-password” gchar *
    
+
      “phase2-private-key-password” gchar *
    
 
    The password used to decrypt the "phase 2" private key specified in the
 “phase2-private-key” property when the private key either
 uses the path scheme, or is a PKCS#12 format key.  Setting this property
@@ -3850,7 +3850,7 @@ private key by the 
 
    The “phase2-private-key-password-flags” property
    
-
      “phase2-private-key-password-flags” guint
    
+
      “phase2-private-key-password-flags” guint
    
 
    Flags indicating how to handle the
 “phase2-private-key-password” property.
    
 
    Flags: Read / Write
    
@@ -3860,7 +3860,7 @@ private key by the 
 
    The “phase2-subject-match” property
    
-
      “phase2-subject-match”     gchar *
    
+
      “phase2-subject-match”     gchar *
    
 
    Substring to be matched against the subject of the certificate presented
 by the authentication server during the inner "phase 2"
 authentication. When unset, no verification of the authentication server
@@ -3871,7 +3871,7 @@ certificate's subject is performed.
    
 
    
 
    
 
    The “pin” property
    
-
      “pin”                      gchar *
    
+
      “pin”                      gchar *
    
 
    PIN used for EAP authentication methods.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -3879,7 +3879,7 @@ certificate's subject is performed.
    
 
    
 
    
 
    The “pin-flags” property
    
-
      “pin-flags”                guint
    
+
      “pin-flags”                guint
    
 
    Flags indicating how to handle the “pin” property.
    
 
    Flags: Read / Write
    
 
    Allowed values: <= 7
    
@@ -3901,7 +3901,7 @@ the blob scheme, this property should be set to the PKCS#12 data and the
 “private-key-password” property must be set to password
 used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files
 and the path scheme, this property should be set to the full UTF-8
-encoded path of the key, prefixed with the string "file://" and and
+encoded path of the key, prefixed with the string "file://" and
 ending with a terminating NUL byte, and as with the blob scheme the
 "private-key-password" property must be set to the password used to
 decode the PKCS#12 private key and certificate.
    
@@ -3917,7 +3917,7 @@ private key data.
    
 
    
 
    
 
    The “private-key-password” property
    
-
      “private-key-password”     gchar *
    
+
      “private-key-password”     gchar *
    
 
    The password used to decrypt the private key specified in the
 “private-key” property when the private key either uses the
 path scheme, or if the private key is a PKCS#12 format key.  Setting this
@@ -3930,7 +3930,7 @@ the private key by the 
 
    The “private-key-password-flags” property
    
-
      “private-key-password-flags” guint
    
+
      “private-key-password-flags” guint
    
 
    Flags indicating how to handle the “private-key-password”
 property.
    
 
    Flags: Read / Write
    
@@ -3940,7 +3940,7 @@ property.
    
 
    
 
    
 
    The “subject-match” property
    
-
      “subject-match”            gchar *
    
+
      “subject-match”            gchar *
    
 
    Substring to be matched against the subject of the certificate presented
 by the authentication server. When unset, no verification of the
 authentication server certificate's subject is performed.
    
@@ -3950,8 +3950,8 @@ authentication server certificate's subject is performed.
    
 
    
 
    
 
    The “system-ca-certs” property
    
-
      “system-ca-certs”          gboolean
    
-
    When TRUE, overrides the “ca-path” and
+
      “system-ca-certs”          gboolean
    
+
    When TRUE, overrides the “ca-path” and
 “phase2-ca-path” properties using the system CA directory
 specified at configure time with the --system-ca-path switch.  The
 certificates in this directory are added to the verification chain in
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
index c17fc2c3..06fc602a 100644
--- a/docs/libnm-util/html/NMSettingAdsl.html
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -43,7 +43,7 @@
 
    
+gchar *
 
+gchar *
 
-
+
+gchar *
 
+gchar *
 
-
+
-
+
@@ -236,9 +236,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingAdslError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingAdsl
 
    
@@ -257,7 +257,7 @@ properties of ADSL connections.
    
 
    Functions
    
 
    
 
    nm_setting_adsl_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_adsl_error_quark (void);
    
 
    Registers an error quark for NMSettingAdsl if necessary.
    
 
    
@@ -379,7 +379,7 @@ nm_setting_adsl_get_encapsulation (
 
    
 
    nm_setting_adsl_get_vpi ()
    
-
    guint32
+
    guint32
 nm_setting_adsl_get_vpi (NMSettingAdsl *setting);
    
 
    
 
    Parameters
    
@@ -404,7 +404,7 @@ nm_setting_adsl_get_vpi (
 
    nm_setting_adsl_get_vci ()
    
-
    guint32
+
    guint32
 nm_setting_adsl_get_vci (NMSettingAdsl *setting);
    
 
    
 
    Parameters
    
@@ -580,7 +580,7 @@ required
    
 
    Property Details
    
 
    
 
    The “encapsulation” property
    
-
      “encapsulation”            gchar *
    
+
      “encapsulation”            gchar *
    
 
    Encapsulation of ADSL connection.  Can be "vcmux" or "llc".
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -588,7 +588,7 @@ required
    
 
    
 
    
 
    The “password” property
    
-
      “password”                 gchar *
    
+
      “password”                 gchar *
    
 
    Password used to authenticate with the ADSL service.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -596,7 +596,7 @@ required
    
 
    
 
    
 
    The “password-flags” property
    
-
      “password-flags”           guint
    
+
      “password-flags”           guint
    
 
    Flags indicating how to handle the “password” property.
    
 
    Flags: Read / Write
    
 
    Allowed values: <= 7
    
@@ -605,7 +605,7 @@ required
    
 
    
 
    
 
    The “protocol” property
    
-
      “protocol”                 gchar *
    
+
      “protocol”                 gchar *
    
 
    ADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -613,7 +613,7 @@ required
    
 
    
 
    
 
    The “username” property
    
-
      “username”                 gchar *
    
+
      “username”                 gchar *
    
 
    Username used to authenticate with the ADSL service.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -621,7 +621,7 @@ required
    
 
    
 
    
 
    The “vci” property
    
-
      “vci”                      guint
    
+
      “vci”                      guint
    
 
    VCI of ADSL connection
    
 
    Flags: Read / Write
    
 
    Allowed values: <= 65536
    
@@ -630,7 +630,7 @@ required
    
 
    
 
    
 
    The “vpi” property
    
-
      “vpi”                      guint
    
+
      “vpi”                      guint
    
 
    VPI of ADSL connection
    
 
    Flags: Read / Write
    
 
    Allowed values: <= 65536
    
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index c01c919e..948d0534 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -43,7 +43,7 @@
 
    
-
+gchar *
 
@@ -139,9 +139,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingBluetoothError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingBluetooth
 
    
@@ -162,7 +162,7 @@ Point (NAP) profiles.
    
 
    Functions
    
 
    
 
    nm_setting_bluetooth_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_bluetooth_error_quark (void);
    
 
    Registers an error quark for NMSettingBluetooth if necessary.
    
 
    
@@ -185,7 +185,7 @@ nm_setting_bluetooth_new (void
 
    
 
    nm_setting_bluetooth_get_bdaddr ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_bluetooth_get_bdaddr (NMSettingBluetooth *setting);
    
 
    Gets the Bluetooth address of the remote device which this setting
 describes a connection to.
    
@@ -339,7 +339,7 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.
    
 
    
 
    
 
    The “type” property
    
-
      “type”                     gchar *
    
+
      “type”                     gchar *
    
 
    Either "dun" for Dial-Up Networking connections or "panu" for Personal
 Area Networking connections to devices supporting the NAP profile.
    
 
    Flags: Read / Write
    
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index 33693844..359a56d7 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -43,7 +43,7 @@
 
    
+gchar *
 
@@ -244,9 +244,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingBondError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingBond
 
    
@@ -265,7 +265,7 @@ necessary for bond connections.
    
 
    Functions
    
 
    
 
    nm_setting_bond_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_bond_error_quark (void);
    
 
    Registers an error quark for NMSettingBond if necessary.
    
 
    
@@ -313,7 +313,7 @@ nm_setting_bond_get_interface_name (
 
    
 
    nm_setting_bond_get_num_options ()
    
-
    guint32
+
    guint32
 nm_setting_bond_get_num_options (NMSettingBond *setting);
    
 
    Returns the number of options that should be set for this bond when it
 is activated. This can be used to retrieve each option individually
@@ -341,9 +341,9 @@ using 
 
    
 
    nm_setting_bond_get_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_bond_get_option (NMSettingBond *setting,
-                            guint32 idx,
+                            guint32 idx,
                             const char **out_name,
                             const char **out_value);
    
 
    Given an index, return the value of the bonding option at that index.  Indexes
@@ -388,8 +388,8 @@ option; this value is owned by the setting and should not be modified. 
    
 
    
 
    
 
    Returns
    
-
     TRUE on success if the index was valid and an option was found,
-FALSE if the index was invalid (ie, greater than the number of options
+
     TRUE on success if the index was valid and an option was found,
+FALSE if the index was invalid (ie, greater than the number of options
 currently held by the setting)
    
 
    
 
    
@@ -426,14 +426,14 @@ nm_setting_bond_get_option_by_name (
 
    
 
    Returns
    
-
     the value, or NULL if the key/value pair was never added to the
+
     the value, or NULL if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified
    
 
    
 
    
 
    
 
    
 
    nm_setting_bond_add_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_bond_add_option (NMSettingBond *setting,
                             const char *name,
                             const char *value);
    
@@ -472,14 +472,14 @@ that conflict with each other.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the option was valid and was added to the internal option
-list, FALSE if it was not.
    
+
     TRUE if the option was valid and was added to the internal option
+list, FALSE if it was not.
    
 
    
 
    
 
    
 
    
 
    nm_setting_bond_remove_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_bond_remove_option (NMSettingBond *setting,
                                const char *name);
    
 
    Remove the bonding option referenced by name
@@ -509,14 +509,14 @@ list.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the option was found and removed from the internal option
-list, FALSE if it was not.
    
+
     TRUE if the option was found and removed from the internal option
+list, FALSE if it was not.
    
 
    
 
    
 
    
 
    
 
    nm_setting_bond_validate_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_bond_validate_option (const char *name,
                                  const char *value);
    
 
    Checks whether name
@@ -524,7 +524,7 @@ nm_setting_bond_validate_option (const name
 . If value
- is NULL, the function only validates the option name.
    
+ is NULL, the function only validates the option name.
    
 
    
 
    Parameters
    
 
    
 
    hash
     the GHashTable containing a
+
     the GHashTable containing a
 string to GValue mapping of properties that apply to the setting. 
    		
 [element-type utf8 GObject.Value]
 
    
 
    all_settings
     a GSList of all settings
+
     a GSList of all settings
 in the connection from which setting
 came. 
    		
 [element-type NMSetting]
 
    
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
 
    this parameter is used internally by libnm-util and should
-be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.
    		 
 
    
 
    
 
    
 
    secrets
     a GHashTable mapping
-string to GValue of setting property names and secrets. 
     a GHashTable mapping
+string to GValue of setting property names and secrets. 
    		
 [element-type utf8 GObject.Value]
 
    
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
     
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_802_1x_error_quark ()
@@ -59,7 +59,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_802_1x_get_num_eap_methods ()
@@ -74,7 +74,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_add_eap_method ()
@@ -90,7 +90,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_remove_eap_method_by_value ()
@@ -127,7 +127,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_get_system_ca_certs ()
@@ -156,7 +156,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_ca_cert_blob ()
@@ -171,7 +171,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_ca_cert ()
@@ -186,7 +186,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_802_1x_get_num_altsubject_matches ()
@@ -201,7 +201,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_add_altsubject_match ()
@@ -217,7 +217,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_remove_altsubject_match_by_value ()
@@ -240,7 +240,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_client_cert_blob ()
@@ -255,7 +255,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_client_cert ()
@@ -305,7 +305,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_phase2_ca_cert_blob ()
@@ -320,7 +320,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_phase2_ca_cert ()
@@ -335,7 +335,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_802_1x_get_num_phase2_altsubject_matches ()
@@ -350,7 +350,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_add_phase2_altsubject_match ()
@@ -366,7 +366,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_remove_phase2_altsubject_match_by_value ()
@@ -389,7 +389,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_phase2_client_cert_blob ()
@@ -404,7 +404,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_phase2_client_cert ()
@@ -426,7 +426,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_password_raw ()
@@ -464,7 +464,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_private_key_blob ()
@@ -479,7 +479,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_private_key ()
@@ -517,7 +517,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_phase2_private_key_blob ()
@@ -532,7 +532,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_phase2_private_key ()
@@ -581,7 +581,7 @@
 
    
 
    
 
-gchar *anonymous-identity
 Read / Write
 
    
 
-gchar *ca-path
 Read / Write
 
    
 
-gchar *identity
 Read / Write
 
    
 
    
 
-gchar *pac-file
 Read / Write
 
    
 
    
 
-gchar *password
 Read / Write
 
    
 
    guintguint
 password-flags
 Read / Write
 
    Read / Write
 
    
 
    guintguint
 password-raw-flags
 Read / Write
 
    
 
    
 
-gchar *phase1-fast-provisioning
 Read / Write
 
    
 
    
 
-gchar *phase1-peaplabel
 Read / Write
 
    
 
    
 
-gchar *phase1-peapver
 Read / Write
 
    
 
-gchar *phase2-auth
 Read / Write
 
    
 
    
 
-gchar *phase2-autheap
 Read / Write
 
    
 
-gchar *phase2-ca-path
 Read / Write
 
    
 
-gchar *phase2-private-key-password
 Read / Write
 
    
 
    guintguint
 phase2-private-key-password-flags
 Read / Write
 
    
 
    
 
-gchar *phase2-subject-match
 Read / Write
 
    
 
    
 
-gchar *pin
 Read / Write
 
    
 
    guintguint
 pin-flags
 Read / Write
 
    
 
-gchar *private-key-password
 Read / Write
 
    
 
    guintguint
 private-key-password-flags
 Read / Write
 
    
 
    
 
-gchar *subject-match
 Read / Write
 
    
 
    gbooleangboolean
 system-ca-certs
 Read / Write / Construct
 
     
 
      
 
      
 
    
 
    
 
    password
    password used to decrypt the private key, or NULL if the password
+
    password used to decrypt the private key, or NULL if the password
 is unknown.  If the password is given but fails to decrypt the private key,
 an error is returned.
    		
   
 
    
 
    
 
    password
    password used to decrypt the private key, or NULL if the password
+
    password used to decrypt the private key, or NULL if the password
 is unknown.  If the password is given but fails to decrypt the private key,
 an error is returned.
    		
  
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_adsl_error_quark ()
@@ -87,7 +87,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_adsl_get_vpi ()
@@ -95,7 +95,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_adsl_get_vci ()
@@ -123,40 +123,40 @@
 
    
 
    
 
-gchar *encapsulation
 Read / Write
 
    
 
    
 
-gchar *password
 Read / Write
 
    
 
    guintguint
 password-flags
 Read / Write
 
    
 
    
 
-gchar *protocol
 Read / Write
 
    
 
    
 
-gchar *username
 Read / Write
 
    
 
    guintguint
 vci
 Read / Write
 
    
 
    guintguint
 vpi
 Read / Write
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_bluetooth_error_quark ()
@@ -58,7 +58,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_bluetooth_get_bdaddr ()
@@ -91,7 +91,7 @@
 
    
 
    
 
-gchar *type
 Read / Write
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_bond_error_quark ()
@@ -66,7 +66,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_bond_get_num_options ()
@@ -74,7 +74,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_bond_get_option ()
@@ -89,7 +89,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_bond_add_option ()
@@ -97,7 +97,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_bond_remove_option ()
@@ -105,7 +105,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_bond_validate_option ()
@@ -139,7 +139,7 @@
 
    
 
    
 
-gchar *interface-name
 Read / Write
 
    
@@ -549,10 +549,10 @@ the name
 
 
    
 
    Returns
    
-
     TRUE, if the value
+
     TRUE, if the value
 is valid for the given name.
 If the name
-is not a valid option, FALSE will be returned.
    
+is not a valid option, FALSE will be returned.
    
 
    
 
    Since: 0.9.10
    
 
@@ -579,7 +579,7 @@ nm_setting_bond_get_valid_options (
 
    
 
    Returns
    
-
     a NULL-terminated array of strings of valid bond options. 
    
+
     a NULL-terminated array of strings of valid bond options. 
    
 
    [transfer none]
    
 
    
 
@@ -790,7 +790,7 @@ required
    
 
    Property Details
    
 
    
 
    The “interface-name” property
    
-
      “interface-name”           gchar *
    
+
      “interface-name”           gchar *
    
 
    The name of the virtual in-kernel bonding network interface
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
index 592436ac..e0b471a9 100644
--- a/docs/libnm-util/html/NMSettingBridge.html
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -43,7 +43,7 @@
 
    
-
-
+
-
+
-
+
+gchar *
 
@@ -159,17 +159,17 @@
 
-
+
-
+
-
+
@@ -233,9 +233,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingBridgeError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingBridge
 
    
@@ -254,7 +254,7 @@ necessary for bridging connections.
    
 
    Functions
    
 
    
 
    nm_setting_bridge_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_bridge_error_quark (void);
    
 
    Registers an error quark for NMSettingBridge if necessary.
    
 
    
@@ -305,7 +305,7 @@ nm_setting_bridge_get_interface_name (
 
    nm_setting_bridge_get_mac_address ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_bridge_get_mac_address (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -331,7 +331,7 @@ nm_setting_bridge_get_mac_address (
 
    
 
    nm_setting_bridge_get_stp ()
    
-
    gboolean
+
    gboolean
 nm_setting_bridge_get_stp (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -357,7 +357,7 @@ nm_setting_bridge_get_stp (
 
    nm_setting_bridge_get_priority ()
    
-
    guint16
+
    guint16
 nm_setting_bridge_get_priority (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -383,7 +383,7 @@ nm_setting_bridge_get_priority (
 
    
 
    nm_setting_bridge_get_forward_delay ()
    
-
    guint16
+
    guint16
 nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -409,7 +409,7 @@ nm_setting_bridge_get_forward_delay (
 
    
 
    nm_setting_bridge_get_hello_time ()
    
-
    guint16
+
    guint16
 nm_setting_bridge_get_hello_time (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -435,7 +435,7 @@ nm_setting_bridge_get_hello_time (
 
    
 
    nm_setting_bridge_get_max_age ()
    
-
    guint16
+
    guint16
 nm_setting_bridge_get_max_age (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -461,7 +461,7 @@ nm_setting_bridge_get_max_age (
 
    
 
    nm_setting_bridge_get_ageing_time ()
    
-
    guint32
+
    guint32
 nm_setting_bridge_get_ageing_time (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -590,7 +590,7 @@ required
    
 
    Property Details
    
 
    
 
    The “ageing-time” property
    
-
      “ageing-time”              guint
    
+
      “ageing-time”              guint
    
 
    The Ethernet MAC address aging time, in seconds.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: <= 1000000
    
@@ -600,7 +600,7 @@ required
    
 
    
 
    
 
    The “forward-delay” property
    
-
      “forward-delay”            guint
    
+
      “forward-delay”            guint
    
 
    The Spanning Tree Protocol (STP) forwarding delay, in seconds.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: <= 30
    
@@ -610,7 +610,7 @@ required
    
 
    
 
    
 
    The “hello-time” property
    
-
      “hello-time”               guint
    
+
      “hello-time”               guint
    
 
    The Spanning Tree Protocol (STP) hello time, in seconds.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: <= 10
    
@@ -620,7 +620,7 @@ required
    
 
    
 
    
 
    The “interface-name” property
    
-
      “interface-name”           gchar *
    
+
      “interface-name”           gchar *
    
 
    The name of the virtual in-kernel bridging network interface
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -639,7 +639,7 @@ NetworkManager created) bridge, this MAC address must match.
    
 
    
 
    
 
    The “max-age” property
    
-
      “max-age”                  guint
    
+
      “max-age”                  guint
    
 
    The Spanning Tree Protocol (STP) maximum message age, in seconds.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: <= 40
    
@@ -649,7 +649,7 @@ NetworkManager created) bridge, this MAC address must match.
    
 
    
 
    
 
    The “priority” property
    
-
      “priority”                 guint
    
+
      “priority”                 guint
    
 
    Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower
 values are "better"; the lowest priority bridge will be elected the root
 bridge.
    
@@ -661,7 +661,7 @@ bridge.
    
 
    
 
    
 
    The “stp” property
    
-
      “stp”                      gboolean
    
+
      “stp”                      gboolean
    
 
    Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: TRUE
    
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
index a4ec94e7..7292ad8e 100644
--- a/docs/libnm-util/html/NMSettingBridgePort.html
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -43,7 +43,7 @@
 
    
-
+
-
+
-
+
@@ -148,9 +148,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingBridgePortError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingBridgePort
 
    
@@ -169,7 +169,7 @@ optional properties that apply to bridge ports.
    
 
    Functions
    
 
    
 
    nm_setting_bridge_port_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_bridge_port_error_quark (void);
    
 
    Registers an error quark for NMSettingBridgePort if necessary.
    
 
    
@@ -194,7 +194,7 @@ nm_setting_bridge_port_new (void<
 
    
 
    
 
    nm_setting_bridge_port_get_priority ()
    
-
    guint16
+
    guint16
 nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);
    
 
    
 
    Parameters
    
@@ -220,7 +220,7 @@ nm_setting_bridge_port_get_priority (
 
    
 
    nm_setting_bridge_port_get_path_cost ()
    
-
    guint16
+
    guint16
 nm_setting_bridge_port_get_path_cost (NMSettingBridgePort *setting);
    
 
    
 
    Parameters
    
@@ -246,7 +246,7 @@ nm_setting_bridge_port_get_path_cost (
 
    nm_setting_bridge_port_get_hairpin_mode ()
    
-
    gboolean
+
    gboolean
 nm_setting_bridge_port_get_hairpin_mode
                                (NMSettingBridgePort *setting);
    
 
    
@@ -346,7 +346,7 @@ is required
    
 
    Property Details
    
 
    
 
    The “hairpin-mode” property
    
-
      “hairpin-mode”             gboolean
    
+
      “hairpin-mode”             gboolean
    
 
    Enables or disabled "hairpin mode" for the port, which allows frames to
 be sent back out through the port the frame was received on.
    
 
    Flags: Read / Write
    
@@ -356,7 +356,7 @@ be sent back out through the port the frame was received on.
    
 
    
 
    
 
    The “path-cost” property
    
-
      “path-cost”                guint
    
+
      “path-cost”                guint
    
 
    The Spanning Tree Protocol (STP) port cost for destinations via this
 port.
    
 
    Flags: Read / Write / Construct
    
@@ -367,7 +367,7 @@ port.
    
 
    
 
    
 
    The “priority” property
    
-
      “priority”                 guint
    
+
      “priority”                 guint
    
 
    The Spanning Tree Protocol (STP) priority of this bridge port.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: <= 63
    
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index 53ef98aa..d3e38325 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -43,7 +43,7 @@
 
    
+gchar *
 
+gchar *
 
-
+
+gchar *
 
@@ -165,9 +165,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingCdmaError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingCdma
 
    
@@ -187,7 +187,7 @@ networks, including those using CDMA2000/EVDO technology.
    
 
    Functions
    
 
    
 
    nm_setting_cdma_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_cdma_error_quark (void);
    
 
    Registers an error quark for NMSettingCdma if necessary.
    
 
    
@@ -395,7 +395,7 @@ is missing in the connection
    
 
    Property Details
    
 
    
 
    The “number” property
    
-
      “number”                   gchar *
    
+
      “number”                   gchar *
    
 
    The number to dial to establish the connection to the CDMA-based mobile
 broadband network, if any.  If not specified, the default number (777)
 is used when required.
    
@@ -405,7 +405,7 @@ is used when required.
    
 
    
 
    
 
    The “password” property
    
-
      “password”                 gchar *
    
+
      “password”                 gchar *
    
 
    The password used to authenticate with the network, if required.  Many
 providers do not require a password, or accept any password.  But if a
 password is required, it is specified here.
    
@@ -415,7 +415,7 @@ password is required, it is specified here.
    
 
    
 
    
 
    The “password-flags” property
    
-
      “password-flags”           guint
    
+
      “password-flags”           guint
    
 
    Flags indicating how to handle the “password” property.
    
 
    Flags: Read / Write
    
 
    Allowed values: <= 7
    
@@ -424,7 +424,7 @@ password is required, it is specified here.
    
 
    
 
    
 
    The “username” property
    
-
      “username”                 gchar *
    
+
      “username”                 gchar *
    
 
    The username used to authenticate with the network, if required.  Many
 providers do not require a username, or accept any username.  But if a
 username is required, it is specified here.
    
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index 3756cc10..37346503 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -43,7 +43,7 @@
 
    
-
+
-
+
+gchar *
 
+gchar *
 
+gchar *
 
@@ -280,7 +280,7 @@
 
-
+
@@ -292,30 +292,30 @@
 
 
+gchar *
 
-
+
+gchar *
 
+gchar *
 
+gchar *
 
@@ -403,9 +403,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingConnectionError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingConnection
 
    
@@ -426,7 +426,7 @@ a 
    Functions
    
 
    
 
    nm_setting_connection_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_connection_error_quark (void);
    
 
    Registers an error quark for NMSettingConnection if necessary.
    
 
    
@@ -555,7 +555,7 @@ nm_setting_connection_get_connection_type
 
    
 
    
 
    nm_setting_connection_get_autoconnect ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_get_autoconnect (NMSettingConnection *setting);
    
 
    Returns the “autoconnect” property of the connection.
    
 
    
@@ -581,7 +581,7 @@ nm_setting_connection_get_autoconnect (
 
    nm_setting_connection_get_timestamp ()
    
-
    guint64
+
    guint64
 nm_setting_connection_get_timestamp (NMSettingConnection *setting);
    
 
    Returns the “timestamp” property of the connection.
    
 
    
@@ -607,7 +607,7 @@ nm_setting_connection_get_timestamp (
 
    
 
    nm_setting_connection_get_read_only ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_get_read_only (NMSettingConnection *setting);
    
 
    Returns the “read-only” property of the connection.
    
 
    
@@ -627,16 +627,16 @@ nm_setting_connection_get_read_only (
 
    
 
    Returns
    
-
     TRUE if the connection is read-only, FALSE if it is not
    
+
     TRUE if the connection is read-only, FALSE if it is not
    
 
    
 
    
 
    
 
    
 
    nm_setting_connection_get_num_permissions ()
    
-
    guint32
+
    guint32
 nm_setting_connection_get_num_permissions
                                (NMSettingConnection *setting);
    
-
    Returns the number of entires in the “permissions”
+
    Returns the number of entries in the “permissions”
 property of this setting.
    
 
    
 
    Parameters
    
@@ -655,15 +655,15 @@ property of this setting.
    
 
    
 
    
 
    Returns
    
-
     the number of permissions entires
    
+
     the number of permissions entries
    
 
    
 
    
 
    
 
    
 
    nm_setting_connection_get_permission ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_get_permission (NMSettingConnection *setting,
-                                      guint32 idx,
+                                      guint32 idx,
                                       const char **out_ptype,
                                       const char **out_pitem,
                                       const char **out_detail);
    
@@ -702,7 +702,7 @@ of this setting.
    
 
 
    
-
+
@@ -710,7 +710,7 @@ of this setting.
    
 
 
    
 
    Returns
    
-
     TRUE if a permission was returned, FALSE if idx
+
     TRUE if a permission was returned, FALSE if idx
 was invalid
    
 
    
 
@@ -743,7 +743,7 @@ nm_setting_connection_get_zone (
 
    
 
    nm_setting_connection_permissions_user_allowed ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_permissions_user_allowed
                                (NMSettingConnection *setting,
                                 const char *uname);
    
@@ -772,14 +772,14 @@ nm_setting_connection_permissions_user_allowed
 
    
 
    
 
    Returns
    
-
     TRUE if the requested user is allowed to view this connection,
-FALSE if the given user is not allowed to view this connection
    
+
     TRUE if the requested user is allowed to view this connection,
+FALSE if the given user is not allowed to view this connection
    
 
    
 
 
    
 
    
 
    nm_setting_connection_add_permission ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_add_permission (NMSettingConnection *setting,
                                       const char *ptype,
                                       const char *pitem,
@@ -815,7 +815,7 @@ the "user" permission type is supported, and pitem
 
    
-
+
@@ -823,8 +823,8 @@ the "user" permission type is supported, and pitem
 
    
 
    Returns
    
-
     TRUE if the permission was unique and was successfully added to the
-list, FALSE if ptype
+
     TRUE if the permission was unique and was successfully added to the
+list, FALSE if ptype
 or pitem
 was invalid or it the permission was already
 present in the list
    
@@ -836,7 +836,7 @@ present in the list
    
 
    void
 nm_setting_connection_remove_permission
                                (NMSettingConnection *setting,
-                                guint32 idx);
    
+                                guint32 idx);
 
    Removes the permission at index idx
  from the connection.
    
 
    
@@ -865,7 +865,7 @@ nm_setting_connection_remove_permission
 
    
 
    
 
    nm_setting_connection_remove_permission_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_remove_permission_by_value
                                (NMSettingConnection *setting,
                                 const char *ptype,
@@ -902,7 +902,7 @@ be a username. See 
    detail
    
-
    
+
@@ -910,7 +910,7 @@ be a username. See 
 
    Returns
    
-
     TRUE if the permission was found and removed; FALSE if it was not.
    
+
     TRUE if the permission was found and removed; FALSE if it was not.
    
 
 
    Since: 0.9.10
    
 
@@ -944,7 +944,7 @@ connection.
    
 
    
 
    
 
    nm_setting_connection_is_slave_type ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_is_slave_type (NMSettingConnection *setting,
                                      const char *type);
    
 
    
@@ -973,7 +973,7 @@ against setting
 
    
 
    
 
    Returns
    
-
     TRUE if connection is of the given slave type
+
     TRUE if connection is of the given slave type
 
    
 
    
 
    
@@ -1006,7 +1006,7 @@ nm_setting_connection_get_slave_type (
 
    nm_setting_connection_get_num_secondaries ()
    
-
    guint32
+
    guint32
 nm_setting_connection_get_num_secondaries
                                (NMSettingConnection *setting);
    
 
    
@@ -1035,7 +1035,7 @@ nm_setting_connection_get_num_secondaries
 
    nm_setting_connection_get_secondary ()
    
 
    const char *
 nm_setting_connection_get_secondary (NMSettingConnection *setting,
-                                     guint32 idx);
    
+                                     guint32 idx);
    
 
    
 
    Parameters
    
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_bridge_error_quark ()
@@ -65,7 +65,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_bridge_get_mac_address ()
@@ -73,7 +73,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_bridge_get_stp ()
@@ -81,7 +81,7 @@
 
    
 
    
 
-guint16
+guint16
 
 
 nm_setting_bridge_get_priority ()
@@ -89,7 +89,7 @@
 
    
 
    
 
-guint16
+guint16
 
 
 nm_setting_bridge_get_forward_delay ()
@@ -97,7 +97,7 @@
 
    
 
    
 
-guint16
+guint16
 
 
 nm_setting_bridge_get_hello_time ()
@@ -105,7 +105,7 @@
 
    
 
    
 
-guint16
+guint16
 
 
 nm_setting_bridge_get_max_age ()
@@ -113,7 +113,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_bridge_get_ageing_time ()
@@ -132,23 +132,23 @@
 
 
    
 
    guintguint
 ageing-time
 Read / Write / Construct
 
    
 
    guintguint
 forward-delay
 Read / Write / Construct
 
    
 
    guintguint
 hello-time
 Read / Write / Construct
 
    
 
    
 
-gchar *interface-name
 Read / Write
 
    Read / Write
 
    
 
    guintguint
 max-age
 Read / Write / Construct
 
    
 
    guintguint
 priority
 Read / Write / Construct
 
    
 
    gbooleangboolean
 stp
 Read / Write / Construct
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_bridge_port_error_quark ()
@@ -59,7 +59,7 @@
 
    
 
    
 
-guint16
+guint16
 
 
 nm_setting_bridge_port_get_priority ()
@@ -67,7 +67,7 @@
 
    
 
    
 
-guint16
+guint16
 
 
 nm_setting_bridge_port_get_path_cost ()
@@ -75,7 +75,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_bridge_port_get_hairpin_mode ()
@@ -94,17 +94,17 @@
 
 
    
 
    gbooleangboolean
 hairpin-mode
 Read / Write
 
    
 
    guintguint
 path-cost
 Read / Write / Construct
 
    
 
    guintguint
 priority
 Read / Write / Construct
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_cdma_error_quark ()
@@ -100,24 +100,24 @@
 
    
 
    
 
-gchar *number
 Read / Write
 
    
 
    
 
-gchar *password
 Read / Write
 
    
 
    guintguint
 password-flags
 Read / Write
 
    
 
    
 
-gchar *username
 Read / Write
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_connection_error_quark ()
@@ -87,7 +87,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_connection_get_autoconnect ()
@@ -95,7 +95,7 @@
 
    
 
    
 
-guint64
+guint64
 
 
 nm_setting_connection_get_timestamp ()
@@ -103,7 +103,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_connection_get_read_only ()
@@ -111,7 +111,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_connection_get_num_permissions ()
@@ -119,7 +119,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_connection_get_permission ()
@@ -134,7 +134,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_connection_permissions_user_allowed ()
@@ -142,7 +142,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_connection_add_permission ()
@@ -158,7 +158,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_connection_remove_permission_by_value ()
@@ -173,7 +173,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_connection_is_slave_type ()
@@ -188,7 +188,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_connection_get_num_secondaries ()
@@ -203,7 +203,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_connection_add_secondary ()
@@ -219,7 +219,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_connection_remove_secondary_by_value ()
@@ -227,7 +227,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_connection_get_gateway_ping_timeout ()
@@ -246,30 +246,30 @@
 
 
    
 
    gbooleangboolean
 autoconnect
 Read / Write / Construct
 
    
 
    guintguint
 gateway-ping-timeout
 Read / Write / Construct
 
    
 
    
 
-gchar *id
 Read / Write
 
    
 
    
 
-gchar *interface-name
 Read / Write
 
    
 
    
 
-gchar *master
 Read / Write
 
    Read / Write
 
    
 
    gbooleangboolean
 read-only
 Read / Write / Construct
 
    
 
-gchar *slave-type
 Read / Write
 
    
 
    guint64guint64
 timestamp
 Read / Write / Construct
 
    
 
    
 
-gchar *type
 Read / Write
 
    
 
    
 
-gchar *uuid
 Read / Write
 
    
 
    
 
-gchar *zone
 Read / Write / Construct
 
    
 
    out_detail
    on return, the permission detail (at this time, always NULL)
    on return, the permission detail (at this time, always NULL)
    		
  
 
    
 
    
 
    detail
     unused at this time; must be NULL. 
     unused at this time; must be NULL. 
    		
 [allow-none]
 
    
 
     unused at this time; must be NULL. 
     unused at this time; must be NULL. 
    		
 [allow-none]
 
    
 
    
@@ -1068,7 +1068,7 @@ nm_setting_connection_get_secondary (
 
    
 
    nm_setting_connection_add_secondary ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_add_secondary (NMSettingConnection *setting,
                                      const char *sec_uuid);
    
 
    Adds a new secondary connetion UUID to the setting.
    
@@ -1096,7 +1096,7 @@ nm_setting_connection_add_secondary (
 
    
 
    Returns
    
-
     TRUE if the secondary connection UUID was added; FALSE if the UUID
+
     TRUE if the secondary connection UUID was added; FALSE if the UUID
 was already present
    
 
    
 
    Since: 0.9.8
    
@@ -1107,7 +1107,7 @@ was already present
    
 
    void
 nm_setting_connection_remove_secondary
                                (NMSettingConnection *setting,
-                                guint32 idx);
    
+                                guint32 idx);
    
 
    Removes the secondary coonnection UUID at index idx
 .
    
 
    
@@ -1137,7 +1137,7 @@ nm_setting_connection_remove_secondary
 
    
 
    
 
    nm_setting_connection_remove_secondary_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_remove_secondary_by_value
                                (NMSettingConnection *setting,
                                 const char *sec_uuid);
    
@@ -1167,14 +1167,14 @@ nm_setting_connection_remove_secondary_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the secondary connection UUID was found and removed; FALSE if it was not.
    
+
     TRUE if the secondary connection UUID was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
 
    
 
    
 
    nm_setting_connection_get_gateway_ping_timeout ()
    
-
    guint32
+
    guint32
 nm_setting_connection_get_gateway_ping_timeout
                                (NMSettingConnection *setting);
    
 
    
@@ -1361,10 +1361,10 @@ It should only be accessed through the functions described below.
    
 
    Property Details
    
 
    
 
    The “autoconnect” property
    
-
      “autoconnect”              gboolean
    
+
      “autoconnect”              gboolean
    
 
    Whether or not the connection should be automatically connected by
 NetworkManager when the resources for the connection are available.
-TRUE to automatically activate the connection, FALSE to require manual
+TRUE to automatically activate the connection, FALSE to require manual
 intervention to activate the connection.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: TRUE
    
@@ -1372,7 +1372,7 @@ intervention to activate the connection.
    
 
    
 
    
 
    The “gateway-ping-timeout” property
    
-
      “gateway-ping-timeout”     guint
    
+
      “gateway-ping-timeout”     guint
    
 
    If greater than zero, delay success of IP addressing until either the
 timeout is reached, or an IP gateway replies to a ping.
    
 
    Flags: Read / Write / Construct
    
@@ -1383,7 +1383,7 @@ timeout is reached, or an IP gateway replies to a ping.
    
 
    
 
    
 
    The “id” property
    
-
      “id”                       gchar *
    
+
      “id”                       gchar *
    
 
    A human readable unique identifier for the connection, like "Work Wi-Fi"
 or "T-Mobile 3G".
    
 
    Flags: Read / Write
    
@@ -1392,7 +1392,7 @@ or "T-Mobile 3G".
    
 
    
 
    
 
    The “interface-name” property
    
-
      “interface-name”           gchar *
    
+
      “interface-name”           gchar *
    
 
    The name of the network interface this connection is bound to. If not
 set, then the connection can be attached to any interface of the
 appropriate type (subject to restrictions imposed by other settings).
    
@@ -1409,7 +1409,7 @@ connection may be applied to the wrong interface.
    
 
    
 
    
 
    The “master” property
    
-
      “master”                   gchar *
    
+
      “master”                   gchar *
    
 
    Interface name of the master device or UUID of the master connection.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -1419,7 +1419,7 @@ connection may be applied to the wrong interface.
    
 
    The “permissions” property
    
 
      “permissions”              GSList_gchararray_ *
    
 
    An array of strings defining what access a given user has to this
-connection.  If this is NULL or empty, all users are allowed to access
+connection.  If this is NULL or empty, all users are allowed to access
 this connection.  Otherwise a user is allowed to access this connection
 if and only if they are in this list. Each entry is of the form
 "[type]:[id]:[reserved]"; for example, "user:dcbw:blah".
    
@@ -1433,9 +1433,9 @@ use.  All of [type], [id], and [reserved] must be valid UTF-8.
    
 
    
 
    
 
    The “read-only” property
    
-
      “read-only”                gboolean
    
-
    FALSE if the connection can be modified using the provided settings
-service's D-Bus interface with the right privileges, or TRUE if the
+
      “read-only”                gboolean
    
+
    FALSE if the connection can be modified using the provided settings
+service's D-Bus interface with the right privileges, or TRUE if the
 connection is read-only and cannot be modified.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
@@ -1453,9 +1453,9 @@ supported.
    
 
    
 
    
 
    The “slave-type” property
    
-
      “slave-type”               gchar *
    
+
      “slave-type”               gchar *
    
 
    Setting name of the device type of this slave's master connection (eg,
-NM_SETTING_BOND_SETTING_NAME), or NULL if this connection is not a
+NM_SETTING_BOND_SETTING_NAME), or NULL if this connection is not a
 slave.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -1463,7 +1463,7 @@ slave.
    
 
    
 
    
 
    The “timestamp” property
    
-
      “timestamp”                guint64
    
+
      “timestamp”                guint64
    
 
    The time, in seconds since the Unix Epoch, that the connection was last
 _successfully_ fully activated.
    
 
    NetworkManager updates the connection timestamp periodically when the
@@ -1476,7 +1476,7 @@ property will not be preserved).
    
 
    
 
    
 
    The “type” property
    
-
      “type”                     gchar *
    
+
      “type”                     gchar *
    
 
    Base type of the connection. For hardware-dependent connections, should
 contain the setting name of the hardware-type specific setting (ie,
 "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for
@@ -1488,7 +1488,7 @@ the setting name of that setting type (ie, "vpn" or "bridge", etc).
    
 
    
 
    
 
    The “uuid” property
    
-
      “uuid”                     gchar *
    
+
      “uuid”                     gchar *
    
 
    A universally unique identifier for the connection, for example generated
 with libuuid.  It should be assigned when the connection is created, and
 never changed as long as the connection still applies to the same
@@ -1506,9 +1506,9 @@ be generated by 
 
    The “zone” property
    
-
      “zone”                     gchar *
    
+
      “zone”                     gchar *
    
 
    The trust level of a the connection.  Free form case-insensitive string
-(for example "Home", "Work", "Public").  NULL or unspecified zone means
+(for example "Home", "Work", "Public").  NULL or unspecified zone means
 the connection will be placed in the default zone as defined by the
 firewall.
    
 
    Flags: Read / Write / Construct
    
diff --git a/docs/libnm-util/html/NMSettingDcb.html b/docs/libnm-util/html/NMSettingDcb.html
index 321a6329..0a012698 100644
--- a/docs/libnm-util/html/NMSettingDcb.html
+++ b/docs/libnm-util/html/NMSettingDcb.html
@@ -43,7 +43,7 @@
 
    
-
+
+gchar *
 
-
+
-
+
-
+
-
+
-
+
@@ -285,7 +285,7 @@
 
-
+
@@ -296,7 +296,7 @@
 
-
+
@@ -418,10 +418,10 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMSettingDcbError
     ╰── NMSettingDcbFlags
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingDcb
 
    
@@ -443,7 +443,7 @@ of storage technologies like Fibre Channel over Ethernet (FCoE) and iSCSI.
    
 
    Functions
    
 
    
 
    nm_setting_dcb_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_dcb_error_quark (void);
    
 
    Registers an error quark for NMSettingDcb if necessary.
    
 
    
@@ -494,7 +494,7 @@ nm_setting_dcb_get_app_fcoe_flags (
 
    
 
    nm_setting_dcb_get_app_fcoe_priority ()
    
-
    gint
+
    gint
 nm_setting_dcb_get_app_fcoe_priority (NMSettingDcb *setting);
    
 
    
 
    Parameters
    
@@ -572,7 +572,7 @@ nm_setting_dcb_get_app_iscsi_flags (
 
    
 
    nm_setting_dcb_get_app_iscsi_priority ()
    
-
    gint
+
    gint
 nm_setting_dcb_get_app_iscsi_priority (NMSettingDcb *setting);
    
 
    
 
    Parameters
    
@@ -624,7 +624,7 @@ nm_setting_dcb_get_app_fip_flags (
 
    
 
    nm_setting_dcb_get_app_fip_priority ()
    
-
    gint
+
    gint
 nm_setting_dcb_get_app_fip_priority (NMSettingDcb *setting);
    
 
    
 
    Parameters
    
@@ -677,10 +677,10 @@ nm_setting_dcb_get_priority_flow_control_flags
 
    
 
    
 
    nm_setting_dcb_get_priority_flow_control ()
    
-
    gboolean
+
    gboolean
 nm_setting_dcb_get_priority_flow_control
                                (NMSettingDcb *setting,
-                                guint user_priority);
    
+                                guint user_priority);
    
 
    
 
    Parameters
    
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_dcb_error_quark ()
@@ -67,7 +67,7 @@
 
    
 
    
 
-gint
+gint
 
 
 nm_setting_dcb_get_app_fcoe_priority ()
@@ -90,7 +90,7 @@
 
    
 
    
 
-gint
+gint
 
 
 nm_setting_dcb_get_app_iscsi_priority ()
@@ -106,7 +106,7 @@
 
    
 
    
 
-gint
+gint
 
 
 nm_setting_dcb_get_app_fip_priority ()
@@ -122,7 +122,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_dcb_get_priority_flow_control ()
@@ -146,7 +146,7 @@
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_group_id ()
@@ -162,7 +162,7 @@
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_group_bandwidth ()
@@ -178,7 +178,7 @@
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_bandwidth ()
@@ -194,7 +194,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_dcb_get_priority_strict_bandwidth ()
@@ -210,7 +210,7 @@
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_traffic_class ()
@@ -237,38 +237,38 @@
 
 
    
 
    guintguint
 app-fcoe-flags
 Read / Write
 
    
 
    
 
-gchar *app-fcoe-mode
 Read / Write / Construct
 
    
 
    gintgint
 app-fcoe-priority
 Read / Write / Construct
 
    
 
    guintguint
 app-fip-flags
 Read / Write
 
    
 
    gintgint
 app-fip-priority
 Read / Write / Construct
 
    
 
    guintguint
 app-iscsi-flags
 Read / Write
 
    
 
    gintgint
 app-iscsi-priority
 Read / Write / Construct
 
    Read / Write
 
    
 
    guintguint
 priority-flow-control-flags
 Read / Write
 
    Read / Write
 
    
 
    guintguint
 priority-group-flags
 Read / Write
 
    
@@ -705,9 +705,9 @@ nm_setting_dcb_get_priority_flow_control
 
 
    
 
    Returns
    
-
     TRUE if flow control is enabled for the given user_priority
+
     TRUE if flow control is enabled for the given user_priority
 ,
-FALSE if not enabled
    
+FALSE if not enabled
    
 
    
 
    Since: 0.9.10
    
 
@@ -717,8 +717,8 @@ nm_setting_dcb_get_priority_flow_control
 
    void
 nm_setting_dcb_set_priority_flow_control
                                (NMSettingDcb *setting,
-                                guint user_priority,
-                                gboolean enabled);
    
+                                guint user_priority,
+                                gboolean enabled);
 
    These values are only valid when “priority-flow-control” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
@@ -742,7 +742,7 @@ the 
 
    
-
+
@@ -780,9 +780,9 @@ nm_setting_dcb_get_priority_group_flags
 
    
 
    
 
    nm_setting_dcb_get_priority_group_id ()
    
-
    guint
+
    guint
 nm_setting_dcb_get_priority_group_id (NMSettingDcb *setting,
-                                      guint user_priority);
    
+                                      guint user_priority);
    
 
    
 
    Parameters
    
 
    
 
    enabled
    TRUE to enable flow control for this priority, FALSE to disable it
    TRUE to enable flow control for this priority, FALSE to disable it
    		
  
 
    
 
    
@@ -819,8 +819,8 @@ only valid when 
    nm_setting_dcb_set_priority_group_id ()
    
 
    void
 nm_setting_dcb_set_priority_group_id (NMSettingDcb *setting,
-                                      guint user_priority,
-                                      guint group_id);
    
+                                      guint user_priority,
+                                      guint group_id);
 
    These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
@@ -857,10 +857,10 @@ unrestricted group.
    
 
    
 
    
 
    nm_setting_dcb_get_priority_group_bandwidth ()
    
-
    guint
+
    guint
 nm_setting_dcb_get_priority_group_bandwidth
                                (NMSettingDcb *setting,
-                                guint group_id);
    
+                                guint group_id);
    
 
    
 
    Parameters
    
 
    
@@ -898,8 +898,8 @@ only valid when void
 nm_setting_dcb_set_priority_group_bandwidth
                                (NMSettingDcb *setting,
-                                guint group_id,
-                                guint bandwidth_percent);
+                                guint group_id,
+                                guint bandwidth_percent);
 
    These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
@@ -935,9 +935,9 @@ to
    
 
    
 
    
 
    nm_setting_dcb_get_priority_bandwidth ()
    
-
    guint
+
    guint
 nm_setting_dcb_get_priority_bandwidth (NMSettingDcb *setting,
-                                       guint user_priority);
    
+                                       guint user_priority);
    
 
    
 
    Parameters
    
 
    
@@ -974,8 +974,8 @@ These values are only valid when 
    nm_setting_dcb_set_priority_bandwidth ()
    
 
    void
 nm_setting_dcb_set_priority_bandwidth (NMSettingDcb *setting,
-                                       guint user_priority,
-                                       guint bandwidth_percent);
    
+                                       guint user_priority,
+                                       guint bandwidth_percent);
 
    These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
@@ -1012,10 +1012,10 @@ allowed to use within its priority group
    
 
    
 
    
 
    nm_setting_dcb_get_priority_strict_bandwidth ()
    
-
    gboolean
+
    gboolean
 nm_setting_dcb_get_priority_strict_bandwidth
                                (NMSettingDcb *setting,
-                                guint user_priority);
    
+                                guint user_priority);
    
 
    
 
    Parameters
    
 
    
@@ -1040,9 +1040,9 @@ nm_setting_dcb_get_priority_strict_bandwidth
 
 
    
 
    Returns
    
-
     TRUE if user_priority
+
     TRUE if user_priority
 may use all of the bandwidth allocated to its
-assigned group, or FALSE if not. These values are only valid when
+assigned group, or FALSE if not. These values are only valid when
 “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
 
    Since: 0.9.10
    
@@ -1053,8 +1053,8 @@ assigned group, or void
 nm_setting_dcb_set_priority_strict_bandwidth
                                (NMSettingDcb *setting,
-                                guint user_priority,
-                                gboolean strict);
+                                guint user_priority,
+                                gboolean strict);
 
    These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
@@ -1078,9 +1078,9 @@ the 
 
    
-
+its priority group, or FALSE if not
    
     
@@ -1091,10 +1091,10 @@ its priority group, or 
 
    nm_setting_dcb_get_priority_traffic_class ()
    
-
    guint
+
    guint
 nm_setting_dcb_get_priority_traffic_class
                                (NMSettingDcb *setting,
-                                guint user_priority);
    
+                                guint user_priority);
    
 
    
 
    Parameters
    
 
    
 
    strict
    TRUE to allow user_priority
+
    TRUE to allow user_priority
 to use all the bandwidth allocated to
-its priority group, or FALSE if not
    		 
 
    
 
    
@@ -1132,8 +1132,8 @@ valid when void
 nm_setting_dcb_set_priority_traffic_class
                                (NMSettingDcb *setting,
-                                guint user_priority,
-                                guint traffic_class);
+                                guint user_priority,
+                                guint traffic_class);
 
 
 
    
@@ -1345,7 +1345,7 @@ peer configuration advertisements
    
 
    Property Details
    
 
    
 
    The “app-fcoe-flags” property
    
-
      “app-fcoe-flags”           guint
    
+
      “app-fcoe-flags”           guint
    
 
    Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may
 be any combination of NM_SETTING_DCB_FLAG_ENABLE,
 NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.
    
@@ -1357,7 +1357,7 @@ be any combination of 
 
    The “app-fcoe-mode” property
    
-
      “app-fcoe-mode”            gchar *
    
+
      “app-fcoe-mode”            gchar *
    
 
    The FCoE controller mode; either NM_SETTING_DCB_FCOE_MODE_FABRIC
 (default) or NM_SETTING_DCB_FCOE_MODE_VN2VN.
    
 
    Flags: Read / Write / Construct
    
@@ -1367,7 +1367,7 @@ be any combination of 
 
    The “app-fcoe-priority” property
    
-
      “app-fcoe-priority”        gint
    
+
      “app-fcoe-priority”        gint
    
 
    The highest User Priority (0 - 7) which FCoE frames should use, or -1 for
 default priority.  Only used when the “app-fcoe-flags”
 property includes the NM_SETTING_DCB_FLAG_ENABLE flag.
    
@@ -1379,7 +1379,7 @@ property includes the 
 
    The “app-fip-flags” property
    
-
      “app-fip-flags”            guint
    
+
      “app-fip-flags”            guint
    
 
    Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may
 be any combination of NM_SETTING_DCB_FLAG_ENABLE,
 NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.
    
@@ -1391,7 +1391,7 @@ be any combination of 
 
    The “app-fip-priority” property
    
-
      “app-fip-priority”         gint
    
+
      “app-fip-priority”         gint
    
 
    The highest User Priority (0 - 7) which FIP frames should use, or -1 for
 default priority.  Only used when the “app-fip-flags”
 property includes the NM_SETTING_DCB_FLAG_ENABLE flag.
    
@@ -1403,7 +1403,7 @@ property includes the 
 
    The “app-iscsi-flags” property
    
-
      “app-iscsi-flags”          guint
    
+
      “app-iscsi-flags”          guint
    
 
    Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags
 may be any combination of NM_SETTING_DCB_FLAG_ENABLE,
 NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.
    
@@ -1415,7 +1415,7 @@ may be any combination of 
 
    The “app-iscsi-priority” property
    
-
      “app-iscsi-priority”       gint
    
+
      “app-iscsi-priority”       gint
    
 
    The highest User Priority (0 - 7) which iSCSI frames should use, or -1
 for default priority. Only used when the “app-iscsi-flags”
 property includes the NM_SETTING_DCB_FLAG_ENABLE flag.
    
@@ -1450,7 +1450,7 @@ transmit pause) and 1 (transmit pause).
    
 
    
 
    
 
    The “priority-flow-control-flags” property
    
-
      “priority-flow-control-flags” guint
    
+
      “priority-flow-control-flags” guint
    
 
    Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC).
 Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE,
 NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.
    
@@ -1473,7 +1473,7 @@ sum of all values must total 100 percent.
    
 
    
 
    
 
    The “priority-group-flags” property
    
-
      “priority-group-flags”     guint
    
+
      “priority-group-flags”     guint
    
 
    Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be
 any combination of NM_SETTING_DCB_FLAG_ENABLE,
 NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.
    
diff --git a/docs/libnm-util/html/NMSettingGeneric.html b/docs/libnm-util/html/NMSettingGeneric.html
index 56fa81cf..5421d662 100644
--- a/docs/libnm-util/html/NMSettingGeneric.html
+++ b/docs/libnm-util/html/NMSettingGeneric.html
@@ -42,7 +42,7 @@
 
    
-
+
+gchar *
 
-
+
+gchar *
 
-
+
+gchar *
 
+gchar *
 
-
+
+gchar *
 
-
+
+gchar *
 
@@ -296,11 +296,11 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMSettingGsmError
     ├── NMSettingGsmNetworkBand
     ╰── NMSettingGsmNetworkType
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingGsm
 
    
@@ -320,7 +320,7 @@ networks, including those using GPRS/EDGE and UMTS/HSPA technology.
    
 
    Functions
    
 
    
 
    nm_setting_gsm_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_gsm_error_quark (void);
    
 
    Registers an error quark for NMSettingGsm if necessary.
    
 
    
@@ -492,7 +492,7 @@ nm_setting_gsm_get_pin (
 
    nm_setting_gsm_get_home_only ()
    
-
    gboolean
+
    gboolean
 nm_setting_gsm_get_home_only (NMSettingGsm *setting);
    
 
    
 
    Parameters
    
@@ -596,7 +596,7 @@ nm_setting_gsm_get_network_type (
 
    
 
    nm_setting_gsm_get_allowed_bands ()
    
-
    guint32
+
    guint32
 nm_setting_gsm_get_allowed_bands (NMSettingGsm *setting);
    
 
    
 
    nm_setting_gsm_get_allowed_bands has been deprecated since version 0.9.10 and should not be used in newly-written code.
    
@@ -968,7 +968,7 @@ as the allowed frequency bands (
    Property Details
    
 
    
 
    The “allowed-bands” property
    
-
      “allowed-bands”            guint
    
+
      “allowed-bands”            guint
    
 
    Bitfield of allowed frequency bands.  Note that not all devices allow
 frequency band control.  Permitted values are those specified by
 NMSettingGsmNetworkBand.
    
@@ -984,7 +984,7 @@ talking to ModemManager directly.
    
 
    
 
    
 
    The “apn” property
    
-
      “apn”                      gchar *
    
+
      “apn”                      gchar *
    
 
    The GPRS Access Point Name specifying the APN used when establishing a
 data session with the GSM-based network.  The APN often determines how
 the user will be billed for their network usage and whether the user has
@@ -998,8 +998,8 @@ The APN may only be composed of the characters a-z, 0-9, ., and - per GSM
 
    
 
    
 
    The “home-only” property
    
-
      “home-only”                gboolean
    
-
    When TRUE, only connections to the home network will be allowed.
+
      “home-only”                gboolean
    
+
    When TRUE, only connections to the home network will be allowed.
 Connections to roaming networks will not be made.
    
 
    Flags: Read / Write
    
 
    Default value: FALSE
    
@@ -1007,7 +1007,7 @@ Connections to roaming networks will not be made.
    
 
    
 
    
 
    The “network-id” property
    
-
      “network-id”               gchar *
    
+
      “network-id”               gchar *
    
 
    The Network ID (GSM LAI format, ie MCC-MNC) to force specific network
 registration.  If the Network ID is specified, NetworkManager will
 attempt to force the device to register only on the specified network.
@@ -1019,7 +1019,7 @@ roaming control of the device is not otherwise possible.
    
 
    
 
    
 
    The “network-type” property
    
-
      “network-type”             gint
    
+
      “network-type”             gint
    
 
    Network preference to force the device to only use specific network
 technologies. The permitted values are NM_SETTING_GSM_NETWORK_TYPE_ANY,
 NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA,
@@ -1041,7 +1041,7 @@ by talking to ModemManager directly.
    
 
    
 
    
 
    The “number” property
    
-
      “number”                   gchar *
    
+
      “number”                   gchar *
    
 
    Number to dial when establishing a PPP data session with the GSM-based
 mobile broadband network.  Many modems do not require PPP for connections
 to the mobile network and thus this property should be left blank, which
@@ -1052,7 +1052,7 @@ allows NetworkManager to select the appropriate settings automatically.
    
 
    
 
    
 
    The “password” property
    
-
      “password”                 gchar *
    
+
      “password”                 gchar *
    
 
    The password used to authenticate with the network, if required.  Many
 providers do not require a password, or accept any password.  But if a
 password is required, it is specified here.
    
@@ -1062,7 +1062,7 @@ password is required, it is specified here.
    
 
    
 
    
 
    The “password-flags” property
    
-
      “password-flags”           guint
    
+
      “password-flags”           guint
    
 
    Flags indicating how to handle the “password” property.
    
 
    Flags: Read / Write
    
 
    Allowed values: <= 7
    
@@ -1071,7 +1071,7 @@ password is required, it is specified here.
    
 
    
 
    
 
    The “pin” property
    
-
      “pin”                      gchar *
    
+
      “pin”                      gchar *
    
 
    If the SIM is locked with a PIN it must be unlocked before any other
 operations are requested.  Specify the PIN here to allow operation of the
 device.
    
@@ -1081,7 +1081,7 @@ device.
    
 
    
 
    
 
    The “pin-flags” property
    
-
      “pin-flags”                guint
    
+
      “pin-flags”                guint
    
 
    Flags indicating how to handle the “pin” property.
    
 
    Flags: Read / Write
    
 
    Allowed values: <= 7
    
@@ -1090,7 +1090,7 @@ device.
    
 
    
 
    
 
    The “username” property
    
-
      “username”                 gchar *
    
+
      “username”                 gchar *
    
 
    The username used to authenticate with the network, if required.  Many
 providers do not require a username, or accept any username.  But if a
 username is required, it is specified here.
    
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index 3f85d818..3aadc277 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -43,7 +43,7 @@
 
    
+gchar *
 
+gchar *
 
-
+
-
+
@@ -570,33 +570,33 @@
 
-
+
-
+
-
+
+gchar *
 
-
+
-
+
@@ -710,12 +710,12 @@
 
 
    
 
    Object Hierarchy
    
-
        GBoxed
+
        GBoxed
     ├── NMIP4Address
     ╰── NMIP4Route
-    GEnum
+    GEnum
     ╰── NMSettingIP4ConfigError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingIP4Config
 
    
@@ -734,7 +734,7 @@ properties related to IPv4 addressing, routing, and Domain Name Service
    
 
    Functions
    
 
    
 
    nm_setting_ip4_config_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_ip4_config_error_quark (void);
    
 
    Registers an error quark for NMSettingIP4Config if necessary.
    
 
    
@@ -829,7 +829,7 @@ reaches zero, the object will be destroyed.
    
 
    
 
    
 
    nm_ip4_address_compare ()
    
-
    gboolean
+
    gboolean
 nm_ip4_address_compare (NMIP4Address *address,
                         NMIP4Address *other);
    
 
    Determines if two NMIP4Address objects contain the same values.
    
@@ -858,13 +858,13 @@ to.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the objects contain the same values, FALSE if they do not.
    
+
     TRUE if the objects contain the same values, FALSE if they do not.
    
 
    
 
    
 
    
 
    
 
    nm_ip4_address_get_address ()
    
-
    guint32
+
    guint32
 nm_ip4_address_get_address (NMIP4Address *address);
    
 
    Gets the IPv4 address property of this address object.
    
 
    
@@ -892,7 +892,7 @@ nm_ip4_address_get_address (
    nm_ip4_address_set_address ()
    
 
    void
 nm_ip4_address_set_address (NMIP4Address *address,
-                            guint32 addr);
    
+                            guint32 addr);
    
 
    Sets the IPv4 address property of this object.
    
 
    
 
    Parameters
    
@@ -920,7 +920,7 @@ nm_ip4_address_set_address (
 
    nm_ip4_address_get_prefix ()
    
-
    guint32
+
    guint32
 nm_ip4_address_get_prefix (NMIP4Address *address);
    
 
    Gets the IPv4 address prefix (ie "24" or "30" etc) property of this address
 object.
    
@@ -949,7 +949,7 @@ object.
    
 
    nm_ip4_address_set_prefix ()
    
 
    void
 nm_ip4_address_set_prefix (NMIP4Address *address,
-                           guint32 prefix);
    
+                           guint32 prefix);
    
 
    Sets the IPv4 address prefix.
    
 
    
 
    Parameters
    
@@ -977,7 +977,7 @@ nm_ip4_address_set_prefix (
 
    nm_ip4_address_get_gateway ()
    
-
    guint32
+
    guint32
 nm_ip4_address_get_gateway (NMIP4Address *address);
    
 
    Gets the IPv4 default gateway property of this address object.
    
 
    
@@ -1005,7 +1005,7 @@ nm_ip4_address_get_gateway (
    nm_ip4_address_set_gateway ()
    
 
    void
 nm_ip4_address_set_gateway (NMIP4Address *address,
-                            guint32 gateway);
    
+                            guint32 gateway);
    
 
    Sets the IPv4 default gateway property of this address object.
    
 
    
 
    Parameters
    
@@ -1117,7 +1117,7 @@ reaches zero, the object will be destroyed.
    
 
    
 
    
 
    nm_ip4_route_compare ()
    
-
    gboolean
+
    gboolean
 nm_ip4_route_compare (NMIP4Route *route,
                       NMIP4Route *other);
    
 
    Determines if two NMIP4Route objects contain the same values.
    
@@ -1146,13 +1146,13 @@ to.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the objects contain the same values, FALSE if they do not.
    
+
     TRUE if the objects contain the same values, FALSE if they do not.
    
 
    
 
    
 
    
 
    
 
    nm_ip4_route_get_dest ()
    
-
    guint32
+
    guint32
 nm_ip4_route_get_dest (NMIP4Route *route);
    
 
    Gets the IPv4 destination address property of this route object.
    
 
    
@@ -1180,7 +1180,7 @@ nm_ip4_route_get_dest (
    nm_ip4_route_set_dest ()
    
 
    void
 nm_ip4_route_set_dest (NMIP4Route *route,
-                       guint32 dest);
    
+                       guint32 dest);
    
 
    Sets the IPv4 destination address property of this route object.
    
 
    
 
    Parameters
    
@@ -1208,7 +1208,7 @@ nm_ip4_route_set_dest (
 
    nm_ip4_route_get_prefix ()
    
-
    guint32
+
    guint32
 nm_ip4_route_get_prefix (NMIP4Route *route);
    
 
    Gets the IPv4 prefix (ie "24" or "30" etc) of this route.
    
 
    
@@ -1236,7 +1236,7 @@ nm_ip4_route_get_prefix (
    nm_ip4_route_set_prefix ()
    
 
    void
 nm_ip4_route_set_prefix (NMIP4Route *route,
-                         guint32 prefix);
    
+                         guint32 prefix);
    
 
    Sets the IPv4 prefix of this route.
    
 
    
 
    Parameters
    
@@ -1264,7 +1264,7 @@ nm_ip4_route_set_prefix (
 
    nm_ip4_route_get_next_hop ()
    
-
    guint32
+
    guint32
 nm_ip4_route_get_next_hop (NMIP4Route *route);
    
 
    Gets the IPv4 address of the next hop of this route.
    
 
    
@@ -1292,7 +1292,7 @@ nm_ip4_route_get_next_hop (
    nm_ip4_route_set_next_hop ()
    
 
    void
 nm_ip4_route_set_next_hop (NMIP4Route *route,
-                           guint32 next_hop);
    
+                           guint32 next_hop);
    
 
    Sets the IPv4 address of the next hop of this route.
    
 
    
 
    Parameters
    
@@ -1320,7 +1320,7 @@ nm_ip4_route_set_next_hop (
 
    nm_ip4_route_get_metric ()
    
-
    guint32
+
    guint32
 nm_ip4_route_get_metric (NMIP4Route *route);
    
 
    Gets the route metric property of this route object; lower values indicate
 "better" or more preferred routes.
    
@@ -1349,7 +1349,7 @@ nm_ip4_route_get_metric (
    nm_ip4_route_set_metric ()
    
 
    void
 nm_ip4_route_set_metric (NMIP4Route *route,
-                         guint32 metric);
    
+                         guint32 metric);
    
 
    Sets the route metric property of this route object; lower values indicate
 "better" or more preferred routes.
    
 
    
@@ -1415,7 +1415,7 @@ nm_setting_ip4_config_get_method (
 
    
 
    nm_setting_ip4_config_get_num_dns ()
    
-
    guint32
+
    guint32
 nm_setting_ip4_config_get_num_dns (NMSettingIP4Config *setting);
    
 
    
 
    Parameters
    
@@ -1440,9 +1440,9 @@ nm_setting_ip4_config_get_num_dns (
 
    
 
    nm_setting_ip4_config_get_dns ()
    
-
    guint32
+
    guint32
 nm_setting_ip4_config_get_dns (NMSettingIP4Config *setting,
-                               guint32 i);
    
+                               guint32 i);
    
 
    
 
    Parameters
    
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_generic_error_quark ()
@@ -84,9 +84,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingGenericError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingGeneric
 
    
@@ -108,7 +108,7 @@ the "connection type" setting on 
    Functions
    
 
    
 
    nm_setting_generic_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_generic_error_quark (void);
    
 
    Registers an error quark for NMSettingGeneric if necessary.
    
 
    
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index b1631ac2..0f3e89f0 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -43,7 +43,7 @@
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_gsm_error_quark ()
@@ -101,7 +101,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_gsm_get_home_only ()
@@ -133,7 +133,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_gsm_get_allowed_bands ()
@@ -152,63 +152,63 @@
 
 
    
 
    guintguint
 allowed-bands
 Read / Write / Construct
 
    
 
    
 
-gchar *apn
 Read / Write
 
    
 
    gbooleangboolean
 home-only
 Read / Write
 
    
 
    
 
-gchar *network-id
 Read / Write
 
    
 
    gintgint
 network-type
 Read / Write / Construct
 
    
 
    
 
-gchar *number
 Read / Write
 
    
 
    
 
-gchar *password
 Read / Write
 
    
 
    guintguint
 password-flags
 Read / Write
 
    
 
    
 
-gchar *pin
 Read / Write
 
    
 
    guintguint
 pin-flags
 Read / Write
 
    
 
    
 
-gchar *username
 Read / Write
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_ip4_config_error_quark ()
@@ -83,7 +83,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_ip4_address_compare ()
@@ -91,7 +91,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_ip4_address_get_address ()
@@ -107,7 +107,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_ip4_address_get_prefix ()
@@ -123,7 +123,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_ip4_address_get_gateway ()
@@ -171,7 +171,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_ip4_route_compare ()
@@ -179,7 +179,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_ip4_route_get_dest ()
@@ -195,7 +195,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_ip4_route_get_prefix ()
@@ -211,7 +211,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_ip4_route_get_next_hop ()
@@ -227,7 +227,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_ip4_route_get_metric ()
@@ -258,7 +258,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ip4_config_get_num_dns ()
@@ -266,7 +266,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ip4_config_get_dns ()
@@ -274,7 +274,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_add_dns ()
@@ -290,7 +290,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_remove_dns_by_value ()
@@ -306,7 +306,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ip4_config_get_num_dns_searches ()
@@ -321,7 +321,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_add_dns_search ()
@@ -337,7 +337,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_remove_dns_search_by_value ()
@@ -353,7 +353,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ip4_config_get_num_addresses ()
@@ -369,7 +369,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_add_address ()
@@ -385,7 +385,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_remove_address_by_value ()
@@ -401,7 +401,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ip4_config_get_num_routes ()
@@ -417,7 +417,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_add_route ()
@@ -433,7 +433,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_remove_route_by_value ()
@@ -449,7 +449,7 @@
 
    
 
    
 
-gint64
+gint64
 
 
 nm_setting_ip4_config_get_route_metric ()
@@ -457,7 +457,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_get_ignore_auto_routes ()
@@ -465,7 +465,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_get_ignore_auto_dns ()
@@ -480,7 +480,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_get_dhcp_send_hostname ()
@@ -503,7 +503,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_get_never_default ()
@@ -511,7 +511,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_get_may_fail ()
@@ -537,23 +537,23 @@
 
    
 
    
 
-gchar *dhcp-client-id
 Read / Write
 
    
 
    
 
-gchar *dhcp-hostname
 Read / Write
 
    
 
    gbooleangboolean
 dhcp-send-hostname
 Read / Write / Construct
 
    
 
    guintguint
 dhcp-timeout
 Read / Write
 
    Read / Write
 
    
 
    gbooleangboolean
 ignore-auto-dns
 Read / Write / Construct
 
    
 
    gbooleangboolean
 ignore-auto-routes
 Read / Write / Construct
 
    
 
    gbooleangboolean
 may-fail
 Read / Write / Construct
 
    
 
    
 
-gchar *method
 Read / Write
 
    
 
    gbooleangboolean
 never-default
 Read / Write / Construct
 
    
 
    gint64gint64
 route-metric
 Read / Write / Construct
 
    
@@ -1475,9 +1475,9 @@ nm_setting_ip4_config_get_dns (
 
    
 
    nm_setting_ip4_config_add_dns ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_add_dns (NMSettingIP4Config *setting,
-                               guint32 dns);
    
+                               guint32 dns);
    
 
    Adds a new DNS server to the setting.
    
 
    
 
    Parameters
    
@@ -1503,7 +1503,7 @@ nm_setting_ip4_config_add_dns (
 
    
 
    Returns
    
-
     TRUE if the DNS server was added; FALSE if the server was already
+
     TRUE if the DNS server was added; FALSE if the server was already
 known
    
 
    
 
    
@@ -1512,7 +1512,7 @@ known
    
 
    nm_setting_ip4_config_remove_dns ()
    
 
    void
 nm_setting_ip4_config_remove_dns (NMSettingIP4Config *setting,
-                                  guint32 i);
    
+                                  guint32 i);
 
    Removes the DNS server at index i
 .
    
 
    
@@ -1541,10 +1541,10 @@ nm_setting_ip4_config_remove_dns (
 
    
 
    nm_setting_ip4_config_remove_dns_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_remove_dns_by_value
                                (NMSettingIP4Config *setting,
-                                guint32 dns);
    
+                                guint32 dns);
    
 
    Removes the DNS server dns
 .
    
 
    
@@ -1571,7 +1571,7 @@ nm_setting_ip4_config_remove_dns_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the DNS server was found and removed; FALSE if it was not.
+
     TRUE if the DNS server was found and removed; FALSE if it was not.
 domain was already known
    
 
    
 
    Since: 0.9.10
    
@@ -1601,7 +1601,7 @@ nm_setting_ip4_config_clear_dns (
 
    
 
    nm_setting_ip4_config_get_num_dns_searches ()
    
-
    guint32
+
    guint32
 nm_setting_ip4_config_get_num_dns_searches
                                (NMSettingIP4Config *setting);
    
 
    
@@ -1629,7 +1629,7 @@ nm_setting_ip4_config_get_num_dns_searches
 
    nm_setting_ip4_config_get_dns_search ()
    
 
    const char *
 nm_setting_ip4_config_get_dns_search (NMSettingIP4Config *setting,
-                                      guint32 i);
    
+                                      guint32 i);
    
 
    
 
    Parameters
    
 
    
@@ -1661,7 +1661,7 @@ nm_setting_ip4_config_get_dns_search (
 
    nm_setting_ip4_config_add_dns_search ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_add_dns_search (NMSettingIP4Config *setting,
                                       const char *dns_search);
    
 
    Adds a new DNS search domain to the setting.
    
@@ -1689,7 +1689,7 @@ nm_setting_ip4_config_add_dns_search (
 
    Returns
    
-
     TRUE if the DNS search domain was added; FALSE if the search
+
     TRUE if the DNS search domain was added; FALSE if the search
 domain was already known
    
 
 
@@ -1699,7 +1699,7 @@ domain was already known
    
 
    void
 nm_setting_ip4_config_remove_dns_search
                                (NMSettingIP4Config *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    Removes the DNS search domain at index i
 .
    
 
    
@@ -1728,7 +1728,7 @@ nm_setting_ip4_config_remove_dns_search
 
    
 
    
 
    nm_setting_ip4_config_remove_dns_search_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_remove_dns_search_by_value
                                (NMSettingIP4Config *setting,
                                 const char *dns_search);
    
@@ -1758,7 +1758,7 @@ nm_setting_ip4_config_remove_dns_search_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the DNS search domain was found and removed; FALSE if it was not.
    
+
     TRUE if the DNS search domain was found and removed; FALSE if it was not.
    
 
    Since 0.9.10
    
 
    
 
    
@@ -1788,7 +1788,7 @@ nm_setting_ip4_config_clear_dns_searches
 
    
 
    
 
    nm_setting_ip4_config_get_num_addresses ()
    
-
    guint32
+
    guint32
 nm_setting_ip4_config_get_num_addresses
                                (NMSettingIP4Config *setting);
    
 
    
@@ -1816,7 +1816,7 @@ nm_setting_ip4_config_get_num_addresses
 
    nm_setting_ip4_config_get_address ()
    
 
    NMIP4Address *
 nm_setting_ip4_config_get_address (NMSettingIP4Config *setting,
-                                   guint32 i);
    
+                                   guint32 i);
    
 
    
 
    Parameters
    
 
    
@@ -1848,7 +1848,7 @@ nm_setting_ip4_config_get_address (
 
    
 
    nm_setting_ip4_config_add_address ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_add_address (NMSettingIP4Config *setting,
                                    NMIP4Address *address);
    
 
    Adds a new IPv4 address and associated information to the setting.  The
@@ -1877,7 +1877,7 @@ given address is duplicated internally and is not changed by this function.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the address was added; FALSE if the address was already
+
     TRUE if the address was added; FALSE if the address was already
 known.
    
 
    
 
@@ -1886,7 +1886,7 @@ known.
    
 
    nm_setting_ip4_config_remove_address ()
    
 
    void
 nm_setting_ip4_config_remove_address (NMSettingIP4Config *setting,
-                                      guint32 i);
    
+                                      guint32 i);
 
    Removes the address at index i
 .
    
 
    
@@ -1915,7 +1915,7 @@ nm_setting_ip4_config_remove_address (
 
    nm_setting_ip4_config_remove_address_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_remove_address_by_value
                                (NMSettingIP4Config *setting,
                                 NMIP4Address *address);
    
@@ -1945,7 +1945,7 @@ nm_setting_ip4_config_remove_address_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the address was found and removed; FALSE if it was not.
    
+
     TRUE if the address was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
@@ -1974,7 +1974,7 @@ nm_setting_ip4_config_clear_addresses (
 
    nm_setting_ip4_config_get_num_routes ()
    
-
    guint32
+
    guint32
 nm_setting_ip4_config_get_num_routes (NMSettingIP4Config *setting);
    
 
    
 
    Parameters
    
@@ -2001,7 +2001,7 @@ nm_setting_ip4_config_get_num_routes (
    nm_setting_ip4_config_get_route ()
    
 
    NMIP4Route *
 nm_setting_ip4_config_get_route (NMSettingIP4Config *setting,
-                                 guint32 i);
    
+                                 guint32 i);
    
 
    
 
    Parameters
    
 
    
@@ -2033,7 +2033,7 @@ nm_setting_ip4_config_get_route (
 
    
 
    nm_setting_ip4_config_add_route ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_add_route (NMSettingIP4Config *setting,
                                  NMIP4Route *route);
    
 
    Adds a new IPv4 route and associated information to the setting.  The
@@ -2062,7 +2062,7 @@ given route is duplicated internally and is not changed by this function.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the route was added; FALSE if the route was already known.
    
+
     TRUE if the route was added; FALSE if the route was already known.
    
 
    
 
 
    
@@ -2070,7 +2070,7 @@ given route is duplicated internally and is not changed by this function.
    
 
    nm_setting_ip4_config_remove_route ()
    
 
    void
 nm_setting_ip4_config_remove_route (NMSettingIP4Config *setting,
-                                    guint32 i);
    
+                                    guint32 i);
 
    Removes the route at index i
 .
    
 
    
@@ -2099,7 +2099,7 @@ nm_setting_ip4_config_remove_route (
 
    
 
    nm_setting_ip4_config_remove_route_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_remove_route_by_value
                                (NMSettingIP4Config *setting,
                                 NMIP4Route *route);
    
@@ -2129,7 +2129,7 @@ nm_setting_ip4_config_remove_route_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the route was found and removed; FALSE if it was not.
    
+
     TRUE if the route was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -2158,7 +2158,7 @@ nm_setting_ip4_config_clear_routes (
 
    
 
    nm_setting_ip4_config_get_route_metric ()
    
-
    gint64
+
    gint64
 nm_setting_ip4_config_get_route_metric
                                (NMSettingIP4Config *setting);
    
 
    Returns the value contained in the “route-metric”
@@ -2188,7 +2188,7 @@ specify a metric. See 
 
    nm_setting_ip4_config_get_ignore_auto_routes ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_get_ignore_auto_routes
                                (NMSettingIP4Config *setting);
    
 
    Returns the value contained in the “ignore-auto-routes”
@@ -2210,14 +2210,14 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if automatically configured (ie via DHCP) routes should be
+
     TRUE if automatically configured (ie via DHCP) routes should be
 ignored.
    
 
    
 
 
    
 
    
 
    nm_setting_ip4_config_get_ignore_auto_dns ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_get_ignore_auto_dns
                                (NMSettingIP4Config *setting);
    
 
    Returns the value contained in the “ignore-auto-dns”
@@ -2239,7 +2239,7 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if automatically configured (ie via DHCP) DNS information
+
     TRUE if automatically configured (ie via DHCP) DNS information
 should be ignored.
    
 
    
 
@@ -2275,7 +2275,7 @@ addresses via DHCP.
    
 
    
 
    
 
    nm_setting_ip4_config_get_dhcp_send_hostname ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_get_dhcp_send_hostname
                                (NMSettingIP4Config *setting);
    
 
    Returns the value contained in the “dhcp-send-hostname”
@@ -2297,7 +2297,7 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if NetworkManager should send the machine hostname to the
+
     TRUE if NetworkManager should send the machine hostname to the
 DHCP server when requesting addresses to allow the server to automatically
 update DNS information for this machine.
    
 
    
@@ -2362,7 +2362,7 @@ fails or zero for "default".
    
 
    
 
    
 
    nm_setting_ip4_config_get_never_default ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_get_never_default
                                (NMSettingIP4Config *setting);
    
 
    Returns the value contained in the “never-default”
@@ -2384,14 +2384,14 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if this connection should never be the default connection
+
     TRUE if this connection should never be the default connection
 for IPv4 addressing
    
 
    
 
 
    
 
    
 
    nm_setting_ip4_config_get_may_fail ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip4_config_get_may_fail (NMSettingIP4Config *setting);
    
 
    Returns the value contained in the “may-fail”
 property.
    
@@ -2412,7 +2412,7 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if this connection doesn't require IPv4 addressing to complete
+
     TRUE if this connection doesn't require IPv4 addressing to complete
 for the connection to succeed.
    
 
    
 
@@ -2623,7 +2623,7 @@ either automatic or disabled with these methods.
    
 
    
 
    
 
    The “dhcp-client-id” property
    
-
      “dhcp-client-id”           gchar *
    
+
      “dhcp-client-id”           gchar *
    
 
    A string sent to the DHCP server to identify the local machine which the
 DHCP server may use to customize the DHCP lease and options.
    
 
    Flags: Read / Write
    
@@ -2632,8 +2632,8 @@ DHCP server may use to customize the DHCP lease and options.
    
 
    
 
    
 
    The “dhcp-hostname” property
    
-
      “dhcp-hostname”            gchar *
    
-
    If the “dhcp-send-hostname” property is TRUE, then the
+
      “dhcp-hostname”            gchar *
    
+
    If the “dhcp-send-hostname” property is TRUE, then the
 specified name will be sent to the DHCP server when acquiring a lease.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -2641,19 +2641,19 @@ specified name will be sent to the DHCP server when acquiring a lease.
    
 
    
 
    
 
    The “dhcp-send-hostname” property
    
-
      “dhcp-send-hostname”       gboolean
    
-
    If TRUE, a hostname is sent to the DHCP server when acquiring a lease.
+
      “dhcp-send-hostname”       gboolean
    
+
    If TRUE, a hostname is sent to the DHCP server when acquiring a lease.
 Some DHCP servers use this hostname to update DNS databases, essentially
 providing a static hostname for the computer.  If the
 “dhcp-hostname” property is empty and this property is
-TRUE, the current persistent hostname of the computer is sent.
    
+TRUE, the current persistent hostname of the computer is sent.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: TRUE
    
 
    
 
    
 
    
 
    The “dhcp-timeout” property
    
-
      “dhcp-timeout”             guint
    
+
      “dhcp-timeout”             guint
    
 
    Number of seconds after which the unfinished DHCP transaction fails
 or zero for default.
    
 
    Flags: Read / Write
    
@@ -2685,8 +2685,8 @@ are used as the only search domains for this connection.
    
 
    
 
    
 
    The “ignore-auto-dns” property
    
-
      “ignore-auto-dns”          gboolean
    
-
    When the method is set to "auto" and this property to TRUE,
+
      “ignore-auto-dns”          gboolean
    
+
    When the method is set to "auto" and this property to TRUE,
 automatically configured nameservers and search domains are ignored and
 only nameservers and search domains specified in the
 “dns” and “dns-search” properties, if
@@ -2697,8 +2697,8 @@ any, are used.
    
 
    
 
    
 
    The “ignore-auto-routes” property
    
-
      “ignore-auto-routes”       gboolean
    
-
    When the method is set to "auto" and this property to TRUE,
+
      “ignore-auto-routes”       gboolean
    
+
    When the method is set to "auto" and this property to TRUE,
 automatically configured routes are ignored and only routes specified in
 the “routes” property, if any, are used.
    
 
    Flags: Read / Write / Construct
    
@@ -2707,11 +2707,11 @@ the 
 
    
 
    The “may-fail” property
    
-
      “may-fail”                 gboolean
    
-
    If TRUE, allow overall network configuration to proceed even if IPv4
+
      “may-fail”                 gboolean
    
+
    If TRUE, allow overall network configuration to proceed even if IPv4
 configuration times out.  Note that at least one IP configuration must
 succeed or overall network configuration will still fail.  For example,
-in IPv6-only networks, setting this property to TRUE allows the overall
+in IPv6-only networks, setting this property to TRUE allows the overall
 network configuration to succeed if IPv4 configuration fails but IPv6
 configuration completes successfully.
    
 
    Flags: Read / Write / Construct
    
@@ -2720,7 +2720,7 @@ configuration completes successfully.
    
 
    
 
    
 
    The “method” property
    
-
      “method”                   gchar *
    
+
      “method”                   gchar *
    
 
    IPv4 configuration method.  If "auto" is specified then the appropriate
 automatic method (DHCP, PPP, etc) is used for the interface and most
 other properties can be left unset.  If "link-local" is specified, then a
@@ -2739,8 +2739,8 @@ This property must be set.
    
 
    
 
    
 
    The “never-default” property
    
-
      “never-default”            gboolean
    
-
    If TRUE, this connection will never be the default IPv4 connection,
+
      “never-default”            gboolean
    
+
    If TRUE, this connection will never be the default IPv4 connection,
 meaning it will never be assigned the default route by NetworkManager.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
@@ -2748,7 +2748,7 @@ meaning it will never be assigned the default route by NetworkManager.
    
 
    
 
    
 
    The “route-metric” property
    
-
      “route-metric”             gint64
    
+
      “route-metric”             gint64
    
 
    The default metric for routes that don't explicitly specify a metric.
 The default value -1 means that the metric is choosen automatically
 based on the device type.
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index db0f3129..04a3f664 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -43,7 +43,7 @@
 
    
+gchar *
 
@@ -533,38 +533,38 @@
 
-
+
-
+
-
+
-
+
+gchar *
 
-
+
-
+
@@ -677,13 +677,13 @@
 
 
    
 
    Object Hierarchy
    
-
        GBoxed
+
        GBoxed
     ├── NMIP6Address
     ╰── NMIP6Route
-    GEnum
+    GEnum
     ├── NMSettingIP6ConfigError
     ╰── NMSettingIP6ConfigPrivacy
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingIP6Config
 
    
@@ -702,7 +702,7 @@ properties related to IPv6 addressing, routing, and Domain Name Service
    
 
    Functions
    
 
    
 
    nm_setting_ip6_config_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_ip6_config_error_quark (void);
    
 
    Registers an error quark for NMSettingIP6Config if necessary.
    
 
    
@@ -797,7 +797,7 @@ reaches zero, the object will be destroyed.
    
 
    
 
    
 
    nm_ip6_address_compare ()
    
-
    gboolean
+
    gboolean
 nm_ip6_address_compare (NMIP6Address *address,
                         NMIP6Address *other);
    
 
    Determines if two NMIP6Address objects contain the same values.
    
@@ -826,7 +826,7 @@ to.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the objects contain the same values, FALSE if they do not.
    
+
     TRUE if the objects contain the same values, FALSE if they do not.
    
 
    
 
    
 
    
@@ -889,7 +889,7 @@ nm_ip6_address_set_address (
 
    nm_ip6_address_get_prefix ()
    
-
    guint32
+
    guint32
 nm_ip6_address_get_prefix (NMIP6Address *address);
    
 
    Gets the IPv6 address prefix property of this address object.
    
 
    
@@ -917,7 +917,7 @@ nm_ip6_address_get_prefix (
    nm_ip6_address_set_prefix ()
    
 
    void
 nm_ip6_address_set_prefix (NMIP6Address *address,
-                           guint32 prefix);
    
+                           guint32 prefix);
    
 
    Sets the IPv6 address prefix.
    
 
    
 
    Parameters
    
@@ -1086,7 +1086,7 @@ reaches zero, the object will be destroyed.
    
 
    
 
    
 
    nm_ip6_route_compare ()
    
-
    gboolean
+
    gboolean
 nm_ip6_route_compare (NMIP6Route *route,
                       NMIP6Route *other);
    
 
    Determines if two NMIP6Route objects contain the same values.
    
@@ -1115,7 +1115,7 @@ to.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the objects contain the same values, FALSE if they do not.
    
+
     TRUE if the objects contain the same values, FALSE if they do not.
    
 
    
 
    
 
    
@@ -1178,7 +1178,7 @@ nm_ip6_route_set_dest (
 
    nm_ip6_route_get_prefix ()
    
-
    guint32
+
    guint32
 nm_ip6_route_get_prefix (NMIP6Route *route);
    
 
    Gets the IPv6 prefix (ie "32" or "64" etc) of this route.
    
 
    
@@ -1206,7 +1206,7 @@ nm_ip6_route_get_prefix (
    nm_ip6_route_set_prefix ()
    
 
    void
 nm_ip6_route_set_prefix (NMIP6Route *route,
-                         guint32 prefix);
    
+                         guint32 prefix);
    
 
    Sets the IPv6 prefix of this route.
    
 
    
 
    Parameters
    
@@ -1291,7 +1291,7 @@ nm_ip6_route_set_next_hop (
 
    nm_ip6_route_get_metric ()
    
-
    guint32
+
    guint32
 nm_ip6_route_get_metric (NMIP6Route *route);
    
 
    Gets the route metric property of this route object; lower values indicate
 "better" or more preferred routes.
    
@@ -1320,7 +1320,7 @@ nm_ip6_route_get_metric (
    nm_ip6_route_set_metric ()
    
 
    void
 nm_ip6_route_set_metric (NMIP6Route *route,
-                         guint32 metric);
    
+                         guint32 metric);
    
 
    Sets the route metric property of this route object; lower values indicate
 "better" or more preferred routes.
    
 
    
@@ -1386,7 +1386,7 @@ nm_setting_ip6_config_get_method (
 
    
 
    nm_setting_ip6_config_get_num_dns ()
    
-
    guint32
+
    guint32
 nm_setting_ip6_config_get_num_dns (NMSettingIP6Config *setting);
    
 
    
 
    Parameters
    
@@ -1413,7 +1413,7 @@ nm_setting_ip6_config_get_num_dns (
    nm_setting_ip6_config_get_dns ()
    
 
    const struct in6_addr *
 nm_setting_ip6_config_get_dns (NMSettingIP6Config *setting,
-                               guint32 i);
    
+                               guint32 i);
    
 
    
 
    Parameters
    
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_ip6_config_error_quark ()
@@ -83,7 +83,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_ip6_address_compare ()
@@ -106,7 +106,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_ip6_address_get_prefix ()
@@ -169,7 +169,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_ip6_route_compare ()
@@ -192,7 +192,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_ip6_route_get_prefix ()
@@ -223,7 +223,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_ip6_route_get_metric ()
@@ -254,7 +254,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ip6_config_get_num_dns ()
@@ -269,7 +269,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_add_dns ()
@@ -285,7 +285,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_remove_dns_by_value ()
@@ -301,7 +301,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ip6_config_get_num_dns_searches ()
@@ -316,7 +316,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_add_dns_search ()
@@ -332,7 +332,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_remove_dns_search_by_value ()
@@ -348,7 +348,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ip6_config_get_num_addresses ()
@@ -364,7 +364,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_add_address ()
@@ -380,7 +380,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_remove_address_by_value ()
@@ -396,7 +396,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ip6_config_get_num_routes ()
@@ -412,7 +412,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_add_route ()
@@ -428,7 +428,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_remove_route_by_value ()
@@ -444,7 +444,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_get_ignore_auto_routes ()
@@ -452,7 +452,7 @@
 
    
 
    
 
-gint64
+gint64
 
 
 nm_setting_ip6_config_get_route_metric ()
@@ -460,7 +460,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_get_ignore_auto_dns ()
@@ -475,7 +475,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_get_never_default ()
@@ -483,7 +483,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_get_may_fail ()
@@ -516,7 +516,7 @@
 
    
 
    
 
-gchar *dhcp-hostname
 Read / Write
 
    Read / Write
 
    
 
    gbooleangboolean
 ignore-auto-dns
 Read / Write / Construct
 
    
 
    gbooleangboolean
 ignore-auto-routes
 Read / Write / Construct
 
    
 
    gintgint
 ip6-privacy
 Read / Write / Construct
 
    
 
    gbooleangboolean
 may-fail
 Read / Write / Construct
 
    
 
    
 
-gchar *method
 Read / Write
 
    
 
    gbooleangboolean
 never-default
 Read / Write / Construct
 
    
 
    gint64gint64
 route-metric
 Read / Write / Construct
 
    
@@ -1446,7 +1446,7 @@ nm_setting_ip6_config_get_dns (
 
    
 
    nm_setting_ip6_config_add_dns ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip6_config_add_dns (NMSettingIP6Config *setting,
                                const struct in6_addr *dns);
    
 
    Adds a new DNS server to the setting.
    
@@ -1474,7 +1474,7 @@ nm_setting_ip6_config_add_dns (
 
    
 
    Returns
    
-
     TRUE if the DNS server was added; FALSE if the server was already
+
     TRUE if the DNS server was added; FALSE if the server was already
 known
    
 
    
 
    
@@ -1483,7 +1483,7 @@ known
    
 
    nm_setting_ip6_config_remove_dns ()
    
 
    void
 nm_setting_ip6_config_remove_dns (NMSettingIP6Config *setting,
-                                  guint32 i);
    
+                                  guint32 i);
 
    Removes the DNS server at index i
 .
    
 
    
@@ -1512,7 +1512,7 @@ nm_setting_ip6_config_remove_dns (
 
    
 
    nm_setting_ip6_config_remove_dns_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip6_config_remove_dns_by_value
                                (NMSettingIP6Config *setting,
                                 const struct in6_addr *dns);
    
@@ -1542,7 +1542,7 @@ nm_setting_ip6_config_remove_dns_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the DNS server was found and removed; FALSE if it was not.
    
+
     TRUE if the DNS server was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -1571,7 +1571,7 @@ nm_setting_ip6_config_clear_dns (
 
    
 
    nm_setting_ip6_config_get_num_dns_searches ()
    
-
    guint32
+
    guint32
 nm_setting_ip6_config_get_num_dns_searches
                                (NMSettingIP6Config *setting);
    
 
    
@@ -1599,7 +1599,7 @@ nm_setting_ip6_config_get_num_dns_searches
 
    nm_setting_ip6_config_get_dns_search ()
    
 
    const char *
 nm_setting_ip6_config_get_dns_search (NMSettingIP6Config *setting,
-                                      guint32 i);
    
+                                      guint32 i);
    
 
    
 
    Parameters
    
 
    
@@ -1631,7 +1631,7 @@ nm_setting_ip6_config_get_dns_search (
 
    nm_setting_ip6_config_add_dns_search ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip6_config_add_dns_search (NMSettingIP6Config *setting,
                                       const char *dns_search);
    
 
    Adds a new DNS search domain to the setting.
    
@@ -1659,7 +1659,7 @@ nm_setting_ip6_config_add_dns_search (
 
    Returns
    
-
     TRUE if the DNS search domain was added; FALSE if the search
+
     TRUE if the DNS search domain was added; FALSE if the search
 domain was already known
    
 
 
@@ -1669,7 +1669,7 @@ domain was already known
    
 
    void
 nm_setting_ip6_config_remove_dns_search
                                (NMSettingIP6Config *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    Removes the DNS search domain at index i
 .
    
 
    
@@ -1698,7 +1698,7 @@ nm_setting_ip6_config_remove_dns_search
 
    
 
    
 
    nm_setting_ip6_config_remove_dns_search_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip6_config_remove_dns_search_by_value
                                (NMSettingIP6Config *setting,
                                 const char *dns_search);
    
@@ -1728,7 +1728,7 @@ nm_setting_ip6_config_remove_dns_search_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the DNS search domain was found and removed; FALSE if it was not.
    
+
     TRUE if the DNS search domain was found and removed; FALSE if it was not.
    
 
    Since 0.9.10
    
 
    
 
    
@@ -1758,7 +1758,7 @@ nm_setting_ip6_config_clear_dns_searches
 
    
 
    
 
    nm_setting_ip6_config_get_num_addresses ()
    
-
    guint32
+
    guint32
 nm_setting_ip6_config_get_num_addresses
                                (NMSettingIP6Config *setting);
    
 
    
@@ -1786,7 +1786,7 @@ nm_setting_ip6_config_get_num_addresses
 
    nm_setting_ip6_config_get_address ()
    
 
    NMIP6Address *
 nm_setting_ip6_config_get_address (NMSettingIP6Config *setting,
-                                   guint32 i);
    
+                                   guint32 i);
    
 
    
 
    Parameters
    
 
    
@@ -1818,7 +1818,7 @@ nm_setting_ip6_config_get_address (
 
    
 
    nm_setting_ip6_config_add_address ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip6_config_add_address (NMSettingIP6Config *setting,
                                    NMIP6Address *address);
    
 
    Adds a new IPv6 address and associated information to the setting.  The
@@ -1847,7 +1847,7 @@ given address is duplicated internally and is not changed by this function.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the address was added; FALSE if the address was already
+
     TRUE if the address was added; FALSE if the address was already
 known.
    
 
    
 
@@ -1856,7 +1856,7 @@ known.
    
 
    nm_setting_ip6_config_remove_address ()
    
 
    void
 nm_setting_ip6_config_remove_address (NMSettingIP6Config *setting,
-                                      guint32 i);
    
+                                      guint32 i);
 
    Removes the address at index i
 .
    
 
    
@@ -1885,7 +1885,7 @@ nm_setting_ip6_config_remove_address (
 
    nm_setting_ip6_config_remove_address_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip6_config_remove_address_by_value
                                (NMSettingIP6Config *setting,
                                 NMIP6Address *address);
    
@@ -1915,7 +1915,7 @@ nm_setting_ip6_config_remove_address_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the address was found and removed; FALSE if it was not.
    
+
     TRUE if the address was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
@@ -1944,7 +1944,7 @@ nm_setting_ip6_config_clear_addresses (
 
    nm_setting_ip6_config_get_num_routes ()
    
-
    guint32
+
    guint32
 nm_setting_ip6_config_get_num_routes (NMSettingIP6Config *setting);
    
 
    
 
    Parameters
    
@@ -1971,7 +1971,7 @@ nm_setting_ip6_config_get_num_routes (
    nm_setting_ip6_config_get_route ()
    
 
    NMIP6Route *
 nm_setting_ip6_config_get_route (NMSettingIP6Config *setting,
-                                 guint32 i);
    
+                                 guint32 i);
    
 
    
 
    Parameters
    
 
    
@@ -2003,7 +2003,7 @@ nm_setting_ip6_config_get_route (
 
    
 
    nm_setting_ip6_config_add_route ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip6_config_add_route (NMSettingIP6Config *setting,
                                  NMIP6Route *route);
    
 
    Adds a new IPv6 route and associated information to the setting.  The
@@ -2032,7 +2032,7 @@ given route is duplicated internally and is not changed by this function.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the route was added; FALSE if the route was already known.
    
+
     TRUE if the route was added; FALSE if the route was already known.
    
 
    
 
 
    
@@ -2040,7 +2040,7 @@ given route is duplicated internally and is not changed by this function.
    
 
    nm_setting_ip6_config_remove_route ()
    
 
    void
 nm_setting_ip6_config_remove_route (NMSettingIP6Config *setting,
-                                    guint32 i);
    
+                                    guint32 i);
 
    Removes the route at index i
 .
    
 
    
@@ -2069,7 +2069,7 @@ nm_setting_ip6_config_remove_route (
 
    
 
    nm_setting_ip6_config_remove_route_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip6_config_remove_route_by_value
                                (NMSettingIP6Config *setting,
                                 NMIP6Route *route);
    
@@ -2099,7 +2099,7 @@ nm_setting_ip6_config_remove_route_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the route was found and removed; FALSE if it was not.
    
+
     TRUE if the route was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -2128,7 +2128,7 @@ nm_setting_ip6_config_clear_routes (
 
    
 
    nm_setting_ip6_config_get_ignore_auto_routes ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip6_config_get_ignore_auto_routes
                                (NMSettingIP6Config *setting);
    
 
    Returns the value contained in the “ignore-auto-routes”
@@ -2150,14 +2150,14 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if automatically configured (ie via DHCP) routes should be
+
     TRUE if automatically configured (ie via DHCP) routes should be
 ignored.
    
 
    
 
 
    
 
    
 
    nm_setting_ip6_config_get_route_metric ()
    
-
    gint64
+
    gint64
 nm_setting_ip6_config_get_route_metric
                                (NMSettingIP6Config *setting);
    
 
    Returns the value contained in the “route-metric”
@@ -2187,7 +2187,7 @@ specify a metric. See 
 
    nm_setting_ip6_config_get_ignore_auto_dns ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip6_config_get_ignore_auto_dns
                                (NMSettingIP6Config *setting);
    
 
    Returns the value contained in the “ignore-auto-dns”
@@ -2209,7 +2209,7 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if automatically configured (ie via DHCP or router
+
     TRUE if automatically configured (ie via DHCP or router
 advertisements) DNS information should be ignored.
    
 
    
 
@@ -2245,7 +2245,7 @@ property.
    
 
    
 
    
 
    nm_setting_ip6_config_get_never_default ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip6_config_get_never_default
                                (NMSettingIP6Config *setting);
    
 
    Returns the value contained in the “never-default”
@@ -2267,14 +2267,14 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if this connection should never be the default connection
+
     TRUE if this connection should never be the default connection
 for IPv6 addressing
    
 
    
 
 
    
 
    
 
    nm_setting_ip6_config_get_may_fail ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip6_config_get_may_fail (NMSettingIP6Config *setting);
    
 
    Returns the value contained in the “may-fail”
 property.
    
@@ -2295,7 +2295,7 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if this connection doesn't require IPv6 addressing to complete
+
     TRUE if this connection doesn't require IPv6 addressing to complete
 for the connection to succeed.
    
 
    
 
@@ -2581,7 +2581,7 @@ assigned an address with these methods.
    
 
    
 
    
 
    The “dhcp-hostname” property
    
-
      “dhcp-hostname”            gchar *
    
+
      “dhcp-hostname”            gchar *
    
 
    The specified name will be sent to the DHCP server when acquiring a
 lease.
    
 
    Flags: Read / Write
    
@@ -2615,9 +2615,9 @@ the only search domains for this connection.
    
 
    
 
    
 
    The “ignore-auto-dns” property
    
-
      “ignore-auto-dns”          gboolean
    
+
      “ignore-auto-dns”          gboolean
    
 
    When the method is set to "auto" or "dhcp" and this property is set to
-TRUE, automatically configured nameservers and search domains are
+TRUE, automatically configured nameservers and search domains are
 ignored and only nameservers and search domains specified in the
 “dns” and “dns-search” properties, if
 any, are used.
    
@@ -2627,9 +2627,9 @@ any, are used.
    
 
    
 
    
 
    The “ignore-auto-routes” property
    
-
      “ignore-auto-routes”       gboolean
    
+
      “ignore-auto-routes”       gboolean
    
 
    When the method is set to "auto" or "dhcp" and this property is set to
-TRUE, automatically configured routes are ignored and only routes
+TRUE, automatically configured routes are ignored and only routes
 specified in the “routes” property, if any, are used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
@@ -2637,7 +2637,7 @@ specified in the 
 
    The “ip6-privacy” property
    
-
      “ip6-privacy”              gint
    
+
      “ip6-privacy”              gint
    
 
    Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If
 enabled, it makes the kernel generate a temporary IPv6 address in
 addition to the public one generated from MAC address via modified
@@ -2652,11 +2652,11 @@ addresses).
    
 
    
 
    
 
    The “may-fail” property
    
-
      “may-fail”                 gboolean
    
-
    If TRUE, allow overall network configuration to proceed even if IPv6
+
      “may-fail”                 gboolean
    
+
    If TRUE, allow overall network configuration to proceed even if IPv6
 configuration times out.  Note that at least one IP configuration must
 succeed or overall network configuration will still fail.  For example,
-in IPv4-only networks, setting this property to TRUE allows the overall
+in IPv4-only networks, setting this property to TRUE allows the overall
 network configuration to succeed if IPv6 configuration fails but IPv4
 configuration completes successfully.
    
 
    Flags: Read / Write / Construct
    
@@ -2665,7 +2665,7 @@ configuration completes successfully.
    
 
    
 
    
 
    The “method” property
    
-
      “method”                   gchar *
    
+
      “method”                   gchar *
    
 
    IPv6 configuration method.  If "auto" is specified then the appropriate
 automatic method (PPP, router advertisement, etc) is used for the device
 and most other properties can be left unset.  To force the use of DHCP
@@ -2682,8 +2682,8 @@ yet supported.
    
 
    
 
    
 
    The “never-default” property
    
-
      “never-default”            gboolean
    
-
    If TRUE, this connection will never be the default IPv6 connection,
+
      “never-default”            gboolean
    
+
    If TRUE, this connection will never be the default IPv6 connection,
 meaning it will never be assigned the default IPv6 route by
 NetworkManager.
    
 
    Flags: Read / Write / Construct
    
@@ -2692,7 +2692,7 @@ NetworkManager.
    
 
    
 
    
 
    The “route-metric” property
    
-
      “route-metric”             gint64
    
+
      “route-metric”             gint64
    
 
    The default metric for routes that don't explicitly specify a metric.
 The default value -1 means that the metric is choosen automatically
 based on the device type.
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index 2908ce69..fc84c52d 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -43,7 +43,7 @@
 
    
-
-
+
-
+
+gchar *
 
+gchar *
 
@@ -182,9 +182,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingInfinibandError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingInfiniband
 
    
@@ -203,7 +203,7 @@ necessary for connection to IP-over-InfiniBand networks.
    
 
    Functions
    
 
    
 
    nm_setting_infiniband_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_infiniband_error_quark (void);
    
 
    Registers an error quark for NMSettingInfiniband if necessary.
    
 
    
@@ -226,7 +226,7 @@ nm_setting_infiniband_new (void
 
    
 
    nm_setting_infiniband_get_mac_address ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_infiniband_get_mac_address (NMSettingInfiniband *setting);
    
 
    
 
    Parameters
    
@@ -251,7 +251,7 @@ nm_setting_infiniband_get_mac_address (
 
    nm_setting_infiniband_get_mtu ()
    
-
    guint32
+
    guint32
 nm_setting_infiniband_get_mtu (NMSettingInfiniband *setting);
    
 
    
 
    Parameters
    
@@ -451,7 +451,7 @@ address of the device (i.e. MAC spoofing).
    
 
    
 
    
 
    The “mtu” property
    
-
      “mtu”                      guint
    
+
      “mtu”                      guint
    
 
    If non-zero, only transmit packets of the specified size or smaller,
 breaking larger packets up into multiple frames.
    
 
    Flags: Read / Write / Construct
    
@@ -460,7 +460,7 @@ breaking larger packets up into multiple frames.
    
 
    
 
    
 
    The “p-key” property
    
-
      “p-key”                    gint
    
+
      “p-key”                    gint
    
 
    The InfiniBand P_Key to use for this device. A value of -1 means to use
 the default P_Key (aka "the P_Key at index 0").  Otherwise it is a 16-bit
 unsigned integer, whose high bit is set if it is a "full membership"
@@ -472,8 +472,8 @@ P_Key.
    
 
    
 
    
 
    The “parent” property
    
-
      “parent”                   gchar *
    
-
    The interface name of the parent device of this device. Normally NULL,
+
      “parent”                   gchar *
    
+
    The interface name of the parent device of this device. Normally NULL,
 but if the “p_key” property is set, then you must
 specify the base device by setting either this property or
 “mac-address”.
    
@@ -483,7 +483,7 @@ specify the base device by setting either this property or
 
    
 
    
 
    The “transport-mode” property
    
-
      “transport-mode”           gchar *
    
+
      “transport-mode”           gchar *
    
 
    The IP-over-InfiniBand transport mode. Either "datagram" or
 "connected".
    
 
    Flags: Read / Write / Construct
    
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index c6801497..71eb9299 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -43,7 +43,7 @@
 
    
-
-
-
+
@@ -148,9 +148,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingOlpcMeshError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingOlpcMesh
 
    
@@ -162,7 +162,7 @@
 
    Functions
    
 
    
 
    nm_setting_olpc_mesh_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_olpc_mesh_error_quark (void);
    
 
    
 
    
@@ -179,19 +179,19 @@ nm_setting_olpc_mesh_new (void    
 
    
 
    nm_setting_olpc_mesh_get_ssid ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_olpc_mesh_get_ssid (NMSettingOlpcMesh *setting);
    
 
    
 
    
 
    
 
    nm_setting_olpc_mesh_get_channel ()
    
-
    guint32
+
    guint32
 nm_setting_olpc_mesh_get_channel (NMSettingOlpcMesh *setting);
    
 
    
 
    
 
    
 
    nm_setting_olpc_mesh_get_dhcp_anycast_address ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_olpc_mesh_get_dhcp_anycast_address
                                (NMSettingOlpcMesh *setting);
    
 
    
@@ -270,7 +270,7 @@ required
    
 
    Property Details
    
 
    
 
    The “channel” property
    
-
      “channel”                  guint
    
+
      “channel”                  guint
    
 
    Channel on which the mesh network to join is located.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: 0
    
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index 624bf0be..4993688b 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -44,7 +44,7 @@ that require PPP to deliver IP capability
    
 
    
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -404,9 +404,9 @@ that require PPP to deliver IP capability
    
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingPPPError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingPPP
 
    
@@ -426,7 +426,7 @@ cable and DSL modems and some mobile broadband devices.
    
 
    Functions
    
 
    
 
    nm_setting_ppp_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_ppp_error_quark (void);
    
 
    Registers an error quark for NMSettingPPP if necessary.
    
 
    
@@ -449,7 +449,7 @@ nm_setting_ppp_new (void
 
    
 
    nm_setting_ppp_get_noauth ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_noauth (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -474,7 +474,7 @@ nm_setting_ppp_get_noauth (
 
    nm_setting_ppp_get_refuse_eap ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_refuse_eap (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -499,7 +499,7 @@ nm_setting_ppp_get_refuse_eap (
 
    
 
    nm_setting_ppp_get_refuse_pap ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_refuse_pap (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -524,7 +524,7 @@ nm_setting_ppp_get_refuse_pap (
 
    
 
    nm_setting_ppp_get_refuse_chap ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_refuse_chap (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -549,7 +549,7 @@ nm_setting_ppp_get_refuse_chap (
 
    
 
    nm_setting_ppp_get_refuse_mschap ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_refuse_mschap (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -574,7 +574,7 @@ nm_setting_ppp_get_refuse_mschap (
 
    
 
    nm_setting_ppp_get_refuse_mschapv2 ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_refuse_mschapv2 (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -599,7 +599,7 @@ nm_setting_ppp_get_refuse_mschapv2 (
 
    
 
    nm_setting_ppp_get_nobsdcomp ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_nobsdcomp (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -624,7 +624,7 @@ nm_setting_ppp_get_nobsdcomp (
 
    nm_setting_ppp_get_nodeflate ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_nodeflate (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -649,7 +649,7 @@ nm_setting_ppp_get_nodeflate (
 
    nm_setting_ppp_get_no_vj_comp ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_no_vj_comp (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -674,7 +674,7 @@ nm_setting_ppp_get_no_vj_comp (
 
    
 
    nm_setting_ppp_get_require_mppe ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_require_mppe (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -699,7 +699,7 @@ nm_setting_ppp_get_require_mppe (
 
    
 
    nm_setting_ppp_get_require_mppe_128 ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -724,7 +724,7 @@ nm_setting_ppp_get_require_mppe_128 (
 
    
 
    nm_setting_ppp_get_mppe_stateful ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_mppe_stateful (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -749,7 +749,7 @@ nm_setting_ppp_get_mppe_stateful (
 
    
 
    nm_setting_ppp_get_crtscts ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_crtscts (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -774,7 +774,7 @@ nm_setting_ppp_get_crtscts (
 
    nm_setting_ppp_get_baud ()
    
-
    guint32
+
    guint32
 nm_setting_ppp_get_baud (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -799,7 +799,7 @@ nm_setting_ppp_get_baud (
 
    nm_setting_ppp_get_mru ()
    
-
    guint32
+
    guint32
 nm_setting_ppp_get_mru (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -824,7 +824,7 @@ nm_setting_ppp_get_mru (
 
    nm_setting_ppp_get_mtu ()
    
-
    guint32
+
    guint32
 nm_setting_ppp_get_mtu (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -849,7 +849,7 @@ nm_setting_ppp_get_mtu (
 
    nm_setting_ppp_get_lcp_echo_failure ()
    
-
    guint32
+
    guint32
 nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -874,7 +874,7 @@ nm_setting_ppp_get_lcp_echo_failure (
 
    
 
    nm_setting_ppp_get_lcp_echo_interval ()
    
-
    guint32
+
    guint32
 nm_setting_ppp_get_lcp_echo_interval (NMSettingPPP *setting);
    
 
    
 
    Parameters
    
@@ -1069,7 +1069,7 @@ with other setting configuration parameters
    
 
    Property Details
    
 
    
 
    The “baud” property
    
-
      “baud”                     guint
    
+
      “baud”                     guint
    
 
    If non-zero, instruct pppd to set the serial port to the specified
 baudrate.  This value should normally be left as 0 to automatically
 choose the speed.
    
@@ -1079,17 +1079,17 @@ choose the speed.
    
 
    
 
    
 
    The “crtscts” property
    
-
      “crtscts”                  gboolean
    
-
    If TRUE, specify that pppd should set the serial port to use hardware
+
      “crtscts”                  gboolean
    
+
    If TRUE, specify that pppd should set the serial port to use hardware
 flow control with RTS and CTS signals.  This value should normally be set
-to FALSE.
    
+to FALSE.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “lcp-echo-failure” property
    
-
      “lcp-echo-failure”         guint
    
+
      “lcp-echo-failure”         guint
    
 
    If non-zero, instruct pppd to presume the connection to the peer has
 failed if the specified number of LCP echo-requests go unanswered by the
 peer.  The "lcp-echo-interval" property must also be set to a non-zero
@@ -1100,7 +1100,7 @@ value if this property is used.
    
 
    
 
    
 
    The “lcp-echo-interval” property
    
-
      “lcp-echo-interval”        guint
    
+
      “lcp-echo-interval”        guint
    
 
    If non-zero, instruct pppd to send an LCP echo-request frame to the peer
 every n seconds (where n is the specified value).  Note that some PPP
 peers will respond to echo requests and some will not, and it is not
@@ -1111,8 +1111,8 @@ possible to autodetect this.
    
 
    
 
    
 
    The “mppe-stateful” property
    
-
      “mppe-stateful”            gboolean
    
-
    If TRUE, stateful MPPE is used.  See pppd documentation for more
+
      “mppe-stateful”            gboolean
    
+
    If TRUE, stateful MPPE is used.  See pppd documentation for more
 information on stateful MPPE.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
@@ -1120,7 +1120,7 @@ information on stateful MPPE.
    
 
    
 
    
 
    The “mru” property
    
-
      “mru”                      guint
    
+
      “mru”                      guint
    
 
    If non-zero, instruct pppd to request that the peer send packets no
 larger than the specified size.  If non-zero, the MRU should be between
 128 and 16384.
    
@@ -1131,7 +1131,7 @@ larger than the specified size.  If non-zero, the MRU should be between
 
    
 
    
 
    The “mtu” property
    
-
      “mtu”                      guint
    
+
      “mtu”                      guint
    
 
    If non-zero, instruct pppd to send packets no larger than the specified
 size.
    
 
    Flags: Read / Write / Construct
    
@@ -1140,82 +1140,82 @@ size.
    
 
    
 
    
 
    The “no-vj-comp” property
    
-
      “no-vj-comp”               gboolean
    
-
    If TRUE, Van Jacobsen TCP header compression will not be requested.
    
+
      “no-vj-comp”               gboolean
    
+
    If TRUE, Van Jacobsen TCP header compression will not be requested.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “noauth” property
    
-
      “noauth”                   gboolean
    
-
    If TRUE, do not require the other side (usually the PPP server) to
-authenticate itself to the client.  If FALSE, require authentication
-from the remote side.  In almost all cases, this should be TRUE.
    
+
      “noauth”                   gboolean
    
+
    If TRUE, do not require the other side (usually the PPP server) to
+authenticate itself to the client.  If FALSE, require authentication
+from the remote side.  In almost all cases, this should be TRUE.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: TRUE
    
 
    
 
    
 
    
 
    The “nobsdcomp” property
    
-
      “nobsdcomp”                gboolean
    
-
    If TRUE, BSD compression will not be requested.
    
+
      “nobsdcomp”                gboolean
    
+
    If TRUE, BSD compression will not be requested.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “nodeflate” property
    
-
      “nodeflate”                gboolean
    
-
    If TRUE, "deflate" compression will not be requested.
    
+
      “nodeflate”                gboolean
    
+
    If TRUE, "deflate" compression will not be requested.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “refuse-chap” property
    
-
      “refuse-chap”              gboolean
    
-
    If TRUE, the CHAP authentication method will not be used.
    
+
      “refuse-chap”              gboolean
    
+
    If TRUE, the CHAP authentication method will not be used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “refuse-eap” property
    
-
      “refuse-eap”               gboolean
    
-
    If TRUE, the EAP authentication method will not be used.
    
+
      “refuse-eap”               gboolean
    
+
    If TRUE, the EAP authentication method will not be used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “refuse-mschap” property
    
-
      “refuse-mschap”            gboolean
    
-
    If TRUE, the MSCHAP authentication method will not be used.
    
+
      “refuse-mschap”            gboolean
    
+
    If TRUE, the MSCHAP authentication method will not be used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “refuse-mschapv2” property
    
-
      “refuse-mschapv2”          gboolean
    
-
    If TRUE, the MSCHAPv2 authentication method will not be used.
    
+
      “refuse-mschapv2”          gboolean
    
+
    If TRUE, the MSCHAPv2 authentication method will not be used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “refuse-pap” property
    
-
      “refuse-pap”               gboolean
    
-
    If TRUE, the PAP authentication method will not be used.
    
+
      “refuse-pap”               gboolean
    
+
    If TRUE, the PAP authentication method will not be used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “require-mppe” property
    
-
      “require-mppe”             gboolean
    
-
    If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
+
      “require-mppe”             gboolean
    
+
    If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
 the PPP session.  If either 64-bit or 128-bit MPPE is not available the
 session will fail.  Note that MPPE is not used on mobile broadband
 connections.
    
@@ -1225,10 +1225,10 @@ connections.
    
 
    
 
    
 
    The “require-mppe-128” property
    
-
      “require-mppe-128”         gboolean
    
-
    If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
+
      “require-mppe-128”         gboolean
    
+
    If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
 required for the PPP session, and the "require-mppe" property must also
-be set to TRUE.  If 128-bit MPPE is not available the session will fail.
    
+be set to TRUE.  If 128-bit MPPE is not available the session will fail.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index 36247334..38e5907e 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -43,7 +43,7 @@
 
    
+gchar *
 
-
+
+gchar *
 
+gchar *
 
@@ -165,9 +165,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingPPPOEError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingPPPOE
 
    
@@ -187,7 +187,7 @@ to provide IP transport, for example cable or DSL modems.
    
 
    Functions
    
 
    
 
    nm_setting_pppoe_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_pppoe_error_quark (void);
    
 
    Registers an error quark for NMSettingPPPOE if necessary.
    
 
    
@@ -396,7 +396,7 @@ did not contain a required PPP setting for PPP related options
    
 
    Property Details
    
 
    
 
    The “password” property
    
-
      “password”                 gchar *
    
+
      “password”                 gchar *
    
 
    Password used to authenticate with the PPPoE service.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -404,7 +404,7 @@ did not contain a required PPP setting for PPP related options
    
 
    
 
    
 
    The “password-flags” property
    
-
      “password-flags”           guint
    
+
      “password-flags”           guint
    
 
    Flags indicating how to handle the “password” property.
    
 
    Flags: Read / Write
    
 
    Allowed values: <= 7
    
@@ -413,7 +413,7 @@ did not contain a required PPP setting for PPP related options
    
 
    
 
    
 
    The “service” property
    
-
      “service”                  gchar *
    
+
      “service”                  gchar *
    
 
    If specified, instruct PPPoE to only initiate sessions with access
 concentrators that provide the specified service.  For most providers,
 this should be left blank.  It is only required if there are multiple
@@ -424,7 +424,7 @@ access concentrators or a specific service is known to be required.
    
 
    
 
    
 
    The “username” property
    
-
      “username”                 gchar *
    
+
      “username”                 gchar *
    
 
    Username used to authenticate with the PPPoE service.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 49c2478f..746d6a35 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -44,7 +44,7 @@ serial communications
    
 
    
-
+
-
+
-
+
-
+
-
+
@@ -183,9 +183,9 @@ serial communications
    
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingSerialError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingSerial
 
    
@@ -205,7 +205,7 @@ such as mobile broadband or analog telephone connections.
    
 
    Functions
    
 
    
 
    nm_setting_serial_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_serial_error_quark (void);
    
 
    Registers an error quark for NMSettingSerial if necessary.
    
 
    
@@ -228,7 +228,7 @@ nm_setting_serial_new (void
 
    
 
    nm_setting_serial_get_baud ()
    
-
    guint
+
    guint
 nm_setting_serial_get_baud (NMSettingSerial *setting);
    
 
    
 
    Parameters
    
@@ -253,7 +253,7 @@ nm_setting_serial_get_baud (
 
    nm_setting_serial_get_bits ()
    
-
    guint
+
    guint
 nm_setting_serial_get_bits (NMSettingSerial *setting);
    
 
    
 
    Parameters
    
@@ -303,7 +303,7 @@ nm_setting_serial_get_parity (
 
    nm_setting_serial_get_stopbits ()
    
-
    guint
+
    guint
 nm_setting_serial_get_stopbits (NMSettingSerial *setting);
    
 
    
 
    Parameters
    
@@ -328,7 +328,7 @@ nm_setting_serial_get_stopbits (
 
    
 
    nm_setting_serial_get_send_delay ()
    
-
    guint64
+
    guint64
 nm_setting_serial_get_send_delay (NMSettingSerial *setting);
    
 
    
 
    Parameters
    
@@ -445,7 +445,7 @@ setting requires the connection to contain an 
    Property Details
    
 
    
 
    The “baud” property
    
-
      “baud”                     guint
    
+
      “baud”                     guint
    
 
    Speed to use for communication over the serial port.  Note that this
 value usually has no effect for mobile broadband modems as they generally
 ignore speed settings and use the highest available speed.
    
@@ -455,7 +455,7 @@ ignore speed settings and use the highest available speed.
    
 
    
 
    
 
    The “bits” property
    
-
      “bits”                     guint
    
+
      “bits”                     guint
    
 
    Byte-width of the serial communication. The 8 in "8n1" for example.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: [5,8]
    
@@ -464,7 +464,7 @@ ignore speed settings and use the highest available speed.
    
 
    
 
    
 
    The “parity” property
    
-
      “parity”                   gchar
    
+
      “parity”                   gchar
    
 
    Parity setting of the serial port.  Either 'E' for even parity, 'o' for
 odd parity, or 'n' for no parity.
    
 
    Flags: Read / Write / Construct
    
@@ -474,7 +474,7 @@ odd parity, or 'n' for no parity.
    
 
    
 
    
 
    The “send-delay” property
    
-
      “send-delay”               guint64
    
+
      “send-delay”               guint64
    
 
    Time to delay between each byte sent to the modem, in microseconds.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: 0
    
@@ -482,7 +482,7 @@ odd parity, or 'n' for no parity.
    
 
    
 
    
 
    The “stopbits” property
    
-
      “stopbits”                 guint
    
+
      “stopbits”                 guint
    
 
    Number of stop bits for communication on the serial port.  Either 1 or 2.
 The 1 in "8n1" for example.
    
 
    Flags: Read / Write / Construct
    
diff --git a/docs/libnm-util/html/NMSettingTeam.html b/docs/libnm-util/html/NMSettingTeam.html
index 55eed3f2..4f973bae 100644
--- a/docs/libnm-util/html/NMSettingTeam.html
+++ b/docs/libnm-util/html/NMSettingTeam.html
@@ -43,7 +43,7 @@
 
    
+gchar *
 
+gchar *
 
@@ -131,9 +131,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingTeamError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingTeam
 
    
@@ -152,7 +152,7 @@ necessary for team connections.
    
 
    Functions
    
 
    
 
    nm_setting_team_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_team_error_quark (void);
    
 
    Registers an error quark for NMSettingTeam if necessary.
    
 
    
@@ -295,7 +295,7 @@ required
    
 
    Property Details
    
 
    
 
    The “config” property
    
-
      “config”                   gchar *
    
+
      “config”                   gchar *
    
 
    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
@@ -306,7 +306,7 @@ configuration is used.  See man teamd.conf for the format details.
    
 
    
 
    
 
    The “interface-name” property
    
-
      “interface-name”           gchar *
    
+
      “interface-name”           gchar *
    
 
    The name of the virtual in-kernel team network interface
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
diff --git a/docs/libnm-util/html/NMSettingTeamPort.html b/docs/libnm-util/html/NMSettingTeamPort.html
index 9cb09b1c..32c10836 100644
--- a/docs/libnm-util/html/NMSettingTeamPort.html
+++ b/docs/libnm-util/html/NMSettingTeamPort.html
@@ -43,7 +43,7 @@
 
    
+gchar *
 
@@ -112,9 +112,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingTeamPortError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingTeamPort
 
    
@@ -133,7 +133,7 @@ optional properties that apply to team ports.
    
 
    Functions
    
 
    
 
    nm_setting_team_port_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_team_port_error_quark (void);
    
 
    Registers an error quark for NMSettingTeamPort if necessary.
    
 
    
@@ -244,7 +244,7 @@ is required
    
 
    Property Details
    
 
    
 
    The “config” property
    
-
      “config”                   gchar *
    
+
      “config”                   gchar *
    
 
    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
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index 0bdf127b..e3ba97ca 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -43,7 +43,7 @@
 
    
-
+
@@ -194,13 +194,13 @@
 
 
+gchar *
 
+gchar *
 
@@ -256,9 +256,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingVpnError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingVPN
 
    
@@ -282,7 +282,7 @@ properties.
    
 
    Functions
    
 
    
 
    nm_setting_vpn_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_vpn_error_quark (void);
    
 
    Registers an error quark for NMSettingVPN if necessary.
    
 
    
@@ -296,7 +296,7 @@ nm_setting_vpn_error_quark (void<
 
    void
 (*NMVPNIterFunc) (const char *key,
                   const char *value,
-                  gpointer user_data);
    
+                  gpointer user_data);
    
 
    
 
    Parameters
    
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_infiniband_error_quark ()
@@ -58,7 +58,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_infiniband_get_mac_address ()
@@ -66,7 +66,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_infiniband_get_mtu ()
@@ -113,24 +113,24 @@
 Read / Write
 
    
 
    guintguint
 mtu
 Read / Write / Construct
 
    
 
    gintgint
 p-key
 Read / Write / Construct
 
    
 
    
 
-gchar *parent
 Read / Write / Construct
 
    
 
    
 
-gchar *transport-mode
 Read / Write / Construct
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_olpc_mesh_error_quark ()
@@ -58,7 +58,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_olpc_mesh_get_ssid ()
@@ -66,14 +66,14 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_olpc_mesh_get_channel ()
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_olpc_mesh_get_dhcp_anycast_address ()
@@ -92,7 +92,7 @@
 
 
    
 
    guintguint
 channel
 Read / Write / Construct
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_ppp_error_quark ()
@@ -60,7 +60,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_noauth ()
@@ -68,7 +68,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_eap ()
@@ -76,7 +76,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_pap ()
@@ -84,7 +84,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_chap ()
@@ -92,7 +92,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_mschap ()
@@ -100,7 +100,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_mschapv2 ()
@@ -108,7 +108,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_nobsdcomp ()
@@ -116,7 +116,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_nodeflate ()
@@ -124,7 +124,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_no_vj_comp ()
@@ -132,7 +132,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_require_mppe ()
@@ -140,7 +140,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_require_mppe_128 ()
@@ -148,7 +148,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_mppe_stateful ()
@@ -156,7 +156,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_crtscts ()
@@ -164,7 +164,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ppp_get_baud ()
@@ -172,7 +172,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ppp_get_mru ()
@@ -180,7 +180,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ppp_get_mtu ()
@@ -188,7 +188,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ppp_get_lcp_echo_failure ()
@@ -196,7 +196,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_ppp_get_lcp_echo_interval ()
@@ -215,92 +215,92 @@ that require PPP to deliver IP capability
    
 
 
    
 
    guintguint
 baud
 Read / Write / Construct
 
    
 
    gbooleangboolean
 crtscts
 Read / Write / Construct
 
    
 
    guintguint
 lcp-echo-failure
 Read / Write / Construct
 
    
 
    guintguint
 lcp-echo-interval
 Read / Write / Construct
 
    
 
    gbooleangboolean
 mppe-stateful
 Read / Write / Construct
 
    
 
    guintguint
 mru
 Read / Write / Construct
 
    
 
    guintguint
 mtu
 Read / Write / Construct
 
    
 
    gbooleangboolean
 no-vj-comp
 Read / Write / Construct
 
    
 
    gbooleangboolean
 noauth
 Read / Write / Construct
 
    
 
    gbooleangboolean
 nobsdcomp
 Read / Write / Construct
 
    
 
    gbooleangboolean
 nodeflate
 Read / Write / Construct
 
    
 
    gbooleangboolean
 refuse-chap
 Read / Write / Construct
 
    
 
    gbooleangboolean
 refuse-eap
 Read / Write / Construct
 
    
 
    gbooleangboolean
 refuse-mschap
 Read / Write / Construct
 
    
 
    gbooleangboolean
 refuse-mschapv2
 Read / Write / Construct
 
    
 
    gbooleangboolean
 refuse-pap
 Read / Write / Construct
 
    
 
    gbooleangboolean
 require-mppe
 Read / Write / Construct
 
    
 
    gbooleangboolean
 require-mppe-128
 Read / Write / Construct
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_pppoe_error_quark ()
@@ -100,24 +100,24 @@
 
    
 
    
 
-gchar *password
 Read / Write
 
    
 
    guintguint
 password-flags
 Read / Write
 
    
 
    
 
-gchar *service
 Read / Write
 
    
 
    
 
-gchar *username
 Read / Write
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_serial_error_quark ()
@@ -60,7 +60,7 @@ serial communications
    
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_serial_get_baud ()
@@ -68,7 +68,7 @@ serial communications
    
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_serial_get_bits ()
@@ -84,7 +84,7 @@ serial communications
    
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_serial_get_stopbits ()
@@ -92,7 +92,7 @@ serial communications
    
 
    
 
    
 
-guint64
+guint64
 
 
 nm_setting_serial_get_send_delay ()
@@ -111,27 +111,27 @@ serial communications
    
 
 
    
 
    guintguint
 baud
 Read / Write / Construct
 
    
 
    guintguint
 bits
 Read / Write / Construct
 
    
 
    gchargchar
 parity
 Read / Write / Construct
 
    
 
    guint64guint64
 send-delay
 Read / Write / Construct
 
    
 
    guintguint
 stopbits
 Read / Write / Construct
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_team_error_quark ()
@@ -85,13 +85,13 @@
 
    
 
    
 
-gchar *config
 Read / Write
 
    
 
    
 
-gchar *interface-name
 Read / Write
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_team_port_error_quark ()
@@ -77,7 +77,7 @@
 
 
    
 
-gchar *config
 Read / Write
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_vpn_error_quark ()
@@ -81,7 +81,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vpn_get_persistent ()
@@ -89,7 +89,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_vpn_get_num_data_items ()
@@ -112,7 +112,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vpn_remove_data_item ()
@@ -128,7 +128,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_vpn_get_num_secrets ()
@@ -151,7 +151,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vpn_remove_secret ()
@@ -183,7 +183,7 @@
 Read / Write
 
    
 
    gbooleangboolean
 persistent
 Read / Write
 
    
 
-gchar *service-type
 Read / Write
 
    
 
    
 
-gchar *user-name
 Read / Write
 
    
@@ -393,7 +393,7 @@ nm_setting_vpn_get_user_name (
 
    nm_setting_vpn_get_persistent ()
    
-
    gboolean
+
    gboolean
 nm_setting_vpn_get_persistent (NMSettingVPN *setting);
    
 
    
 
    Parameters
    
@@ -418,7 +418,7 @@ nm_setting_vpn_get_persistent (
 
    
 
    nm_setting_vpn_get_num_data_items ()
    
-
    guint32
+
    guint32
 nm_setting_vpn_get_num_data_items (NMSettingVPN *setting);
    
 
    Gets number of key/value pairs of VPN configuration data.
    
 
    
@@ -521,7 +521,7 @@ by 
 
    nm_setting_vpn_remove_data_item ()
    
-
    gboolean
+
    gboolean
 nm_setting_vpn_remove_data_item (NMSettingVPN *setting,
                                  const char *key);
    
 
    Deletes a key/value relationship previously established by
@@ -550,8 +550,8 @@ nm_setting_vpn_remove_data_item (
 
    
 
    Returns
    
-
     TRUE if the data item was found and removed from the internal list,
-FALSE if it was not.
    
+
     TRUE if the data item was found and removed from the internal list,
+FALSE if it was not.
    
 
    
 
    
 
    
@@ -560,7 +560,7 @@ nm_setting_vpn_remove_data_item (void
 nm_setting_vpn_foreach_data_item (NMSettingVPN *setting,
                                   NMVPNIterFunc func,
-                                  gpointer user_data);
    
+                                  gpointer user_data);
    
 
    Iterates all data items stored in this setting.  It is safe to add, remove,
 and modify data items inside func
 , though any additions or removals made
@@ -597,7 +597,7 @@ during iteration will not be part of the iteration.
    
 
    
 
    
 
    nm_setting_vpn_get_num_secrets ()
    
-
    guint32
+
    guint32
 nm_setting_vpn_get_num_secrets (NMSettingVPN *setting);
    
 
    Gets number of VPN plugin specific secrets in the setting.
    
 
    
@@ -699,7 +699,7 @@ by 
 
    nm_setting_vpn_remove_secret ()
    
-
    gboolean
+
    gboolean
 nm_setting_vpn_remove_secret (NMSettingVPN *setting,
                               const char *key);
    
 
    Deletes a key/value relationship previously established by
@@ -728,8 +728,8 @@ nm_setting_vpn_remove_secret (
 
    Returns
    
-
     TRUE if the secret was found and removed from the internal list,
-FALSE if it was not.
    
+
     TRUE if the secret was found and removed from the internal list,
+FALSE if it was not.
    
 
    
 
    
 
    
@@ -738,7 +738,7 @@ nm_setting_vpn_remove_secret (void
 nm_setting_vpn_foreach_secret (NMSettingVPN *setting,
                                NMVPNIterFunc func,
-                               gpointer user_data);
+                               gpointer user_data);
 
    Iterates all secrets stored in this setting.  It is safe to add, remove,
 and modify secrets inside func
 , though any additions or removals made during
@@ -873,8 +873,8 @@ values must be strings.
    
 
    
 
    
 
    The “persistent” property
    
-
      “persistent”               gboolean
    
-
    If the VPN service supports persistence, and this property is TRUE,
+
      “persistent”               gboolean
    
+
    If the VPN service supports persistence, and this property is TRUE,
 the VPN will attempt to stay connected across link changes and outages,
 until explicitly disconnected.
    
 
    Flags: Read / Write
    
@@ -891,7 +891,7 @@ passwords or private keys.  Both keys and values must be strings.
    
 
    
 
    
 
    The “service-type” property
    
-
      “service-type”             gchar *
    
+
      “service-type”             gchar *
    
 
    D-Bus service name of the VPN plugin that this setting uses to connect to
 its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc
 plugin.
    
@@ -901,7 +901,7 @@ plugin.
    
 
    
 
    
 
    The “user-name” property
    
-
      “user-name”                gchar *
    
+
      “user-name”                gchar *
    
 
    If the VPN connection requires a user name for authentication, that name
 should be provided here.  If the connection is available to more than one
 user, and the VPN requires each user to supply a different name, then
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index 0defe286..810780ba 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -43,7 +43,7 @@
 
    
-
+
-
+
@@ -187,13 +187,13 @@
 
 
+gchar *
 
+gchar *
 
@@ -261,11 +261,11 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMSettingVlanError
     ├── NMVlanFlags
     ╰── NMVlanPriorityMap
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingVlan
 
    
@@ -284,7 +284,7 @@ necessary for connection to VLAN interfaces.
    
 
    Functions
    
 
    
 
    nm_setting_vlan_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_vlan_error_quark (void);
    
 
    Registers an error quark for NMSettingVlan if necessary.
    
 
    
@@ -357,7 +357,7 @@ nm_setting_vlan_get_parent (
 
    nm_setting_vlan_get_id ()
    
-
    guint32
+
    guint32
 nm_setting_vlan_get_id (NMSettingVlan *setting);
    
 
    
 
    Parameters
    
@@ -382,7 +382,7 @@ nm_setting_vlan_get_id (
 
    nm_setting_vlan_get_flags ()
    
-
    guint32
+
    guint32
 nm_setting_vlan_get_flags (NMSettingVlan *setting);
    
 
    
 
    Parameters
    
@@ -407,10 +407,10 @@ nm_setting_vlan_get_flags (
 
    nm_setting_vlan_get_num_priorities ()
    
-
    gint32
+
    gint32
 nm_setting_vlan_get_num_priorities (NMSettingVlan *setting,
                                     NMVlanPriorityMap map);
    
-
    Returns the number of entires in the
+
    Returns the number of entries in the
 “ingress_priority_map” or “egress_priority_map”
 properties of this setting.
    
 
    
@@ -443,12 +443,12 @@ properties of this setting.
    
 
    
 
    
 
    nm_setting_vlan_get_priority ()
    
-
    gboolean
+
    gboolean
 nm_setting_vlan_get_priority (NMSettingVlan *setting,
                               NMVlanPriorityMap map,
-                              guint32 idx,
-                              guint32 *out_from,
-                              guint32 *out_to);
    
+                              guint32 idx,
+                              guint32 *out_from,
+                              guint32 *out_to);
    
 
    Retrieve one of the entries of the “ingress_priority_map”
 or “egress_priority_map” properties of this setting.
    
 
    
@@ -490,17 +490,17 @@ or 
 
    
 
    Returns
    
-
     TRUE if a priority map was returned, FALSE if error
    
+
     TRUE if a priority map was returned, FALSE if error
    
 
    
 
    
 
    
 
    
 
    nm_setting_vlan_add_priority ()
    
-
    gboolean
+
    gboolean
 nm_setting_vlan_add_priority (NMSettingVlan *setting,
                               NMVlanPriorityMap map,
-                              guint32 from,
-                              guint32 to);
    
+                              guint32 from,
+                              guint32 to);
    
 
    Adds a priority mapping to the “ingress_priority_map” or
 “egress_priority_map” properties of the setting. If from
  is
@@ -553,8 +553,8 @@ to
    
 
    
 
    
 
    Returns
    
-
     TRUE if the new priority mapping was successfully added to the
-list, FALSE if error
    
+
     TRUE if the new priority mapping was successfully added to the
+list, FALSE if error
    
 
    
 
    
 
    
@@ -563,7 +563,7 @@ list, void
 nm_setting_vlan_remove_priority (NMSettingVlan *setting,
                                  NMVlanPriorityMap map,
-                                 guint32 idx);
    
+                                 guint32 idx);
    
 
    Removes the priority map at index idx
  from the
 “ingress_priority_map” or “egress_priority_map”
@@ -599,12 +599,12 @@ properties.
    
 
    
 
    
 
    nm_setting_vlan_remove_priority_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_vlan_remove_priority_by_value
                                (NMSettingVlan *setting,
                                 NMVlanPriorityMap map,
-                                guint32 from,
-                                guint32 to);
    
+                                guint32 from,
+                                guint32 to);
    
 
    Removes the priority map form
 :to
  from the “ingress_priority_map”
@@ -647,14 +647,14 @@ to
    
 
    
 
    
 
    Returns
    
-
     TRUE if the priority mapping was found and removed; FALSE if it was not.
    
+
     TRUE if the priority mapping was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
 
    
 
    
 
    nm_setting_vlan_remove_priority_str_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_vlan_remove_priority_str_by_value
                                (NMSettingVlan *setting,
                                 NMVlanPriorityMap map,
@@ -693,7 +693,7 @@ properties.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the priority mapping was found and removed; FALSE if it was not.
    
+
     TRUE if the priority mapping was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -703,7 +703,7 @@ properties.
    
 
    void
 nm_setting_vlan_clear_priorities (NMSettingVlan *setting,
                                   NMVlanPriorityMap map);
    
-
    Clear all the entires from “ingress_priority_map” or
+
    Clear all the entries from “ingress_priority_map” or
 “egress_priority_map” properties.
    
 
    
 
    Parameters
    
@@ -731,7 +731,7 @@ nm_setting_vlan_clear_priorities (
 
    
 
    nm_setting_vlan_add_priority_str ()
    
-
    gboolean
+
    gboolean
 nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
                                   NMVlanPriorityMap map,
                                   const char *str);
    
@@ -767,8 +767,8 @@ the Linux SKB priorities to 802.1p priorities.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the entry was successfully added to the list, or it
-overwrote the old value, FALSE if error
    
+
     TRUE if the entry was successfully added to the list, or it
+overwrote the old value, FALSE if error
    
 
    
 
    
 
    
@@ -968,7 +968,7 @@ both "from" and "to" are unsigned integers, ie "7:3".
    
 
    
 
    
 
    The “flags” property
    
-
      “flags”                    guint
    
+
      “flags”                    guint
    
 
    One or more flags which control the behavior and features of the VLAN
 interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (reordering of
 output packet headers), NM_VLAN_FLAG_GVRP (use of the GVRP protocol),
@@ -981,7 +981,7 @@ protocol).
    
 
    
 
    
 
    The “id” property
    
-
      “id”                       guint
    
+
      “id”                       guint
    
 
    The VLAN identifier that the interface created by this connection should
 be assigned.
    
 
    Flags: Read / Write / Construct
    
@@ -1000,7 +1000,7 @@ SKB priorities.  The mapping is given in the format "from:to" where both
 
    
 
    
 
    The “interface-name” property
    
-
      “interface-name”           gchar *
    
+
      “interface-name”           gchar *
    
 
    If given, specifies the kernel name of the VLAN interface. If not given,
 a default name will be constructed from the interface described by the
 parent interface and the “id” property, eg "eth2.1". The
@@ -1012,7 +1012,7 @@ the 
 
    
 
    The “parent” property
    
-
      “parent”                   gchar *
    
+
      “parent”                   gchar *
    
 
    If given, specifies the parent interface name or parent connection UUID
 from which this VLAN interface should be created.  If this property is
 not specified, the connection must contain an NMSettingWired setting
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index e6a6fe6f..7c686a34 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -43,7 +43,7 @@
 
    
-
+gchar *
 
@@ -131,9 +131,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingWimaxError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWimax
 
    
@@ -155,7 +155,7 @@ connections cannot be activated.
    
 
    Functions
    
 
    
 
    nm_setting_wimax_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_wimax_error_quark (void);
    
 
    
 
    nm_setting_wimax_error_quark has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -216,7 +216,7 @@ specific WiMAX network this setting describes a connection to.
    
 
    
 
    
 
    nm_setting_wimax_get_mac_address ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_wimax_get_mac_address (NMSettingWimax *setting);
    
 
    
 
    nm_setting_wimax_get_mac_address has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -326,7 +326,7 @@ device (known as MAC spoofing).
    
 
    
 
    
 
    The “network-name” property
    
-
      “network-name”             gchar *
    
+
      “network-name”             gchar *
    
 
    Network Service Provider (NSP) name of the WiMAX network this connection
 should use.
    
 
    
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index 99565408..befb2c70 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -43,7 +43,7 @@
 
    
-
-
-
-
-
+
@@ -248,7 +248,7 @@
 
 
+gchar *
 
@@ -265,19 +265,19 @@
 
-
+
+gchar *
 
+gchar *
 
@@ -293,7 +293,7 @@
 
-
+
@@ -369,9 +369,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingWiredError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWired
 
    
@@ -390,7 +390,7 @@ necessary for connection to Ethernet networks.
    
 
    Functions
    
 
    
 
    nm_setting_wired_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_wired_error_quark (void);
    
 
    Registers an error quark for NMSettingWired if necessary.
    
 
    
@@ -438,7 +438,7 @@ nm_setting_wired_get_port (
 
    nm_setting_wired_get_speed ()
    
-
    guint32
+
    guint32
 nm_setting_wired_get_speed (NMSettingWired *setting);
    
 
    
 
    Parameters
    
@@ -488,7 +488,7 @@ nm_setting_wired_get_duplex (
 
    nm_setting_wired_get_auto_negotiate ()
    
-
    gboolean
+
    gboolean
 nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);
    
 
    
 
    Parameters
    
@@ -513,7 +513,7 @@ nm_setting_wired_get_auto_negotiate (
 
    
 
    nm_setting_wired_get_mac_address ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_wired_get_mac_address (NMSettingWired *setting);
    
 
    
 
    Parameters
    
@@ -538,7 +538,7 @@ nm_setting_wired_get_mac_address (
 
    
 
    nm_setting_wired_get_cloned_mac_address ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_wired_get_cloned_mac_address
                                (NMSettingWired *setting);
    
 
    
@@ -564,7 +564,7 @@ nm_setting_wired_get_cloned_mac_address
 
    
 
    
 
    nm_setting_wired_get_mac_address_blacklist ()
    
-
    const GSList *
+
    const GSList *
 nm_setting_wired_get_mac_address_blacklist
                                (NMSettingWired *setting);
    
 
    
@@ -592,7 +592,7 @@ property of the setting. 
    
 
    
 
    
 
    nm_setting_wired_get_num_mac_blacklist_items ()
    
-
    guint32
+
    guint32
 nm_setting_wired_get_num_mac_blacklist_items
                                (NMSettingWired *setting);
    
 
    
@@ -622,7 +622,7 @@ nm_setting_wired_get_num_mac_blacklist_items
 
    const char *
 nm_setting_wired_get_mac_blacklist_item
                                (NMSettingWired *setting,
-                                guint32 idx);
    
+                                guint32 idx);
    
 
    
 
    Parameters
    
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_vlan_error_quark ()
@@ -73,7 +73,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_vlan_get_id ()
@@ -81,7 +81,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_vlan_get_flags ()
@@ -89,7 +89,7 @@
 
    
 
    
 
-gint32
+gint32
 
 
 nm_setting_vlan_get_num_priorities ()
@@ -97,7 +97,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vlan_get_priority ()
@@ -105,7 +105,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vlan_add_priority ()
@@ -121,7 +121,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vlan_remove_priority_by_value ()
@@ -129,7 +129,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vlan_remove_priority_str_by_value ()
@@ -145,7 +145,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vlan_add_priority_str ()
@@ -170,12 +170,12 @@
 Read / Write
 
    
 
    guintguint
 flags
 Read / Write / Construct
 
    
 
    guintguint
 id
 Read / Write / Construct
 
    
 
-gchar *interface-name
 Read / Write / Construct
 
    
 
    
 
-gchar *parent
 Read / Write / Construct
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_wimax_error_quark ()
@@ -65,7 +65,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_wimax_get_mac_address ()
@@ -91,7 +91,7 @@
 
    
 
    
 
-gchar *network-name
 Read / Write
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_wired_error_quark ()
@@ -66,7 +66,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wired_get_speed ()
@@ -81,28 +81,28 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wired_get_auto_negotiate ()
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_wired_get_mac_address ()
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_wired_get_cloned_mac_address ()
 
 
    
 
    const GSList *
+const GSList *
 
 
 nm_setting_wired_get_mac_address_blacklist ()
@@ -110,7 +110,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wired_get_num_mac_blacklist_items ()
@@ -125,7 +125,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wired_add_mac_blacklist_item ()
@@ -141,7 +141,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wired_remove_mac_blacklist_item_by_value ()
@@ -157,14 +157,14 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wired_get_mtu ()
 
 
    
 
    const GPtrArray *
+const GPtrArray *
 
 
 nm_setting_wired_get_s390_subchannels ()
@@ -179,7 +179,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wired_get_num_s390_options ()
@@ -187,7 +187,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wired_get_s390_option ()
@@ -202,7 +202,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wired_add_s390_option ()
@@ -210,7 +210,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wired_remove_s390_option ()
@@ -236,7 +236,7 @@
 
 
    
 
    gbooleangboolean
 auto-negotiate
 Read / Write / Construct
 
    
 
-gchar *duplex
 Read / Write
 
    Read / Write
 
    
 
    guintguint
 mtu
 Read / Write / Construct
 
    
 
    
 
-gchar *port
 Read / Write
 
    
 
    
 
-gchar *s390-nettype
 Read / Write
 
    Read / Write
 
    
 
    guintguint
 speed
 Read / Write / Construct
 
    
@@ -656,7 +656,7 @@ at index idx
 
    
 
    
 
    nm_setting_wired_add_mac_blacklist_item ()
    
-
    gboolean
+
    gboolean
 nm_setting_wired_add_mac_blacklist_item
                                (NMSettingWired *setting,
                                 const char *mac);
    
@@ -685,7 +685,7 @@ nm_setting_wired_add_mac_blacklist_item
 
    
 
    
 
    Returns
    
-
     TRUE if the MAC address was added; FALSE if the MAC address
+
     TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present
    
 
    
 
    Since: 0.9.10
    
@@ -696,7 +696,7 @@ is invalid or was already present
    
 
    void
 nm_setting_wired_remove_mac_blacklist_item
                                (NMSettingWired *setting,
-                                guint32 idx);
    
+                                guint32 idx);
 
    Removes the MAC address at index idx
  from the blacklist.
    
 
    
@@ -726,7 +726,7 @@ nm_setting_wired_remove_mac_blacklist_item
 
    
 
    
 
    nm_setting_wired_remove_mac_blacklist_item_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_wired_remove_mac_blacklist_item_by_value
                                (NMSettingWired *setting,
                                 const char *mac);
    
@@ -757,7 +757,7 @@ the blacklist
    
 
    
 
    
 
    Returns
    
-
     TRUE if the MAC address was found and removed; FALSE if it was not.
    
+
     TRUE if the MAC address was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -788,7 +788,7 @@ nm_setting_wired_clear_mac_blacklist_items
 
    
 
    
 
    nm_setting_wired_get_mtu ()
    
-
    guint32
+
    guint32
 nm_setting_wired_get_mtu (NMSettingWired *setting);
    
 
    
 
    Parameters
    
@@ -813,7 +813,7 @@ nm_setting_wired_get_mtu (
 
    nm_setting_wired_get_s390_subchannels ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_setting_wired_get_s390_subchannels (NMSettingWired *setting);
    
 
    Return the list of s390 subchannels that identify the device that this
 connection is applicable to.  The connection should only be used in
@@ -835,7 +835,7 @@ conjunction with that device.
    
 
    
 
    
 
    Returns
    
-
     GPtrArray of strings, each specifying one
+
     GPtrArray of strings, each specifying one
 subchannel the s390 device uses to communicate to the host. 
    
 
    [element-type utf8]
    
 
    
@@ -870,7 +870,7 @@ of 'qeth', 'lcs', or 'ctc'.
    
 
    
 
    
 
    nm_setting_wired_get_num_s390_options ()
    
-
    guint32
+
    guint32
 nm_setting_wired_get_num_s390_options (NMSettingWired *setting);
    
 
    Returns the number of s390-specific options that should be set for this
 device when it is activated.  This can be used to retrieve each s390
@@ -898,9 +898,9 @@ option individually using 
 
    nm_setting_wired_get_s390_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_wired_get_s390_option (NMSettingWired *setting,
-                                  guint32 idx,
+                                  guint32 idx,
                                   const char **out_key,
                                   const char **out_value);
    
 
    Given an index, return the value of the s390 option at that index.  indexes
@@ -945,8 +945,8 @@ option; this value is owned by the setting and should not be modified. 
    
 
    
 
    
 
    Returns
    
-
     TRUE on success if the index was valid and an option was found,
-FALSE if the index was invalid (ie, greater than the number of options
+
     TRUE on success if the index was valid and an option was found,
+FALSE if the index was invalid (ie, greater than the number of options
 currently held by the setting)
    
 
    
 
    
@@ -984,14 +984,14 @@ nm_setting_wired_get_s390_option_by_key
 
 
    
 
    Returns
    
-
     the value, or NULL if the key/value pair was never added to the
+
     the value, or NULL if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified
    
 
    
 
 
    
 
    
 
    nm_setting_wired_add_s390_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_wired_add_s390_option (NMSettingWired *setting,
                                   const char *key,
                                   const char *value);
    
@@ -1028,14 +1028,14 @@ may already exist.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the option was valid and was added to the internal option
-list, FALSE if it was not.
    
+
     TRUE if the option was valid and was added to the internal option
+list, FALSE if it was not.
    
 
    
 
 
    
 
    
 
    nm_setting_wired_remove_s390_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_wired_remove_s390_option (NMSettingWired *setting,
                                      const char *key);
    
 
    Remove the s390-specific option referenced by key
@@ -1065,8 +1065,8 @@ list.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the option was found and removed from the internal option
-list, FALSE if it was not.
    
+
     TRUE if the option was found and removed from the internal option
+list, FALSE if it was not.
    
 
    
 
 
    
@@ -1093,7 +1093,7 @@ nm_setting_wired_get_valid_s390_options
 
 
    
 
    Returns
    
-
     a NULL-terminated array of strings of valid s390 options. 
    
+
     a NULL-terminated array of strings of valid s390 options. 
    
 
    [transfer none]
    
 
    
 
    Since: 0.9.10
    
@@ -1221,9 +1221,9 @@ required
    
 
    Property Details
    
 
    
 
    The “auto-negotiate” property
    
-
      “auto-negotiate”           gboolean
    
-
    If TRUE, allow auto-negotiation of port speed and duplex mode.  If
-FALSE, do not allow auto-negotiation, in which case the "speed" and
+
      “auto-negotiate”           gboolean
    
+
    If TRUE, allow auto-negotiation of port speed and duplex mode.  If
+FALSE, do not allow auto-negotiation, in which case the "speed" and
 "duplex" properties should be set.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: TRUE
    
@@ -1239,7 +1239,7 @@ permanent MAC address.  This is known as MAC cloning or spoofing.
    
 
    
 
    
 
    The “duplex” property
    
-
      “duplex”                   gchar *
    
+
      “duplex”                   gchar *
    
 
    If specified, request that the device only use the specified duplex mode.
 Either "half" or "full".
    
 
    Flags: Read / Write
    
@@ -1267,7 +1267,7 @@ address is in the standard hex-digits-and-colons notation
 
    
 
    
 
    The “mtu” property
    
-
      “mtu”                      guint
    
+
      “mtu”                      guint
    
 
    If non-zero, only transmit packets of the specified size or smaller,
 breaking larger packets up into multiple Ethernet frames.
    
 
    Flags: Read / Write / Construct
    
@@ -1276,7 +1276,7 @@ breaking larger packets up into multiple Ethernet frames.
    
 
    
 
    
 
    The “port” property
    
-
      “port”                     gchar *
    
+
      “port”                     gchar *
    
 
    Specific port type to use if multiple the device supports multiple
 attachment methods.  One of "tp" (Twisted Pair), "aui" (Attachment Unit
 Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface.
@@ -1287,7 +1287,7 @@ If the device supports only one port type, this setting is ignored.
    
 
    
 
    
 
    The “s390-nettype” property
    
-
      “s390-nettype”             gchar *
    
+
      “s390-nettype”             gchar *
    
 
    s390 network device type; one of "qeth", "lcs", or "ctc", representing
 the different types of virtual network devices available on s390 systems.
    
 
    Flags: Read / Write
    
@@ -1319,7 +1319,7 @@ period (.) character.
    
 
    
 
    
 
    The “speed” property
    
-
      “speed”                    guint
    
+
      “speed”                    guint
    
 
    If non-zero, request that the device use only the specified speed.  In
 Mbit/s, ie 100 == 100Mbit/s.
    
 
    Flags: Read / Write / Construct
    
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 1ea004af..0e01497f 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -43,7 +43,7 @@
 
    
-
-
-
-
-
+gchar *
 
@@ -264,7 +264,7 @@
 
-
+
@@ -275,7 +275,7 @@
 
-
+
@@ -293,28 +293,28 @@
 
 
+gchar *
 
-
+
-
+
-
+
+gchar *
 
@@ -331,7 +331,7 @@
 
-
+
@@ -435,9 +435,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingWirelessError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWireless
 
    
@@ -456,7 +456,7 @@ necessary for connection to 802.11 Wi-Fi networks.
    
 
    Functions
    
 
    
 
    nm_setting_wireless_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_wireless_error_quark (void);
    
 
    Registers an error quark for NMSettingWireless if necessary.
    
 
    
@@ -479,7 +479,7 @@ nm_setting_wireless_new (void
 
    
 
    nm_setting_wireless_get_ssid ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_wireless_get_ssid (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -554,7 +554,7 @@ nm_setting_wireless_get_band (
 
    nm_setting_wireless_get_channel ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_channel (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -579,7 +579,7 @@ nm_setting_wireless_get_channel (
 
    
 
    nm_setting_wireless_get_bssid ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_wireless_get_bssid (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -604,7 +604,7 @@ nm_setting_wireless_get_bssid (
 
    
 
    nm_setting_wireless_get_rate ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_rate (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -629,7 +629,7 @@ nm_setting_wireless_get_rate (
 
    nm_setting_wireless_get_tx_power ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_tx_power (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -654,7 +654,7 @@ nm_setting_wireless_get_tx_power (
 
    
 
    nm_setting_wireless_get_mac_address ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_wireless_get_mac_address (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -679,7 +679,7 @@ nm_setting_wireless_get_mac_address (
 
    
 
    nm_setting_wireless_get_cloned_mac_address ()
    
-
    const GByteArray *
+
    const GByteArray *
 nm_setting_wireless_get_cloned_mac_address
                                (NMSettingWireless *setting);
    
 
    
@@ -705,7 +705,7 @@ nm_setting_wireless_get_cloned_mac_address
 
    
 
    
 
    nm_setting_wireless_get_mac_address_blacklist ()
    
-
    const GSList *
+
    const GSList *
 nm_setting_wireless_get_mac_address_blacklist
                                (NMSettingWireless *setting);
    
 
    
@@ -733,7 +733,7 @@ nm_setting_wireless_get_mac_address_blacklist
 
    
 
    
 
    nm_setting_wireless_get_num_mac_blacklist_items ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_num_mac_blacklist_items
                                (NMSettingWireless *setting);
    
 
    
@@ -763,7 +763,7 @@ nm_setting_wireless_get_num_mac_blacklist_items
 
    const char *
 nm_setting_wireless_get_mac_blacklist_item
                                (NMSettingWireless *setting,
-                                guint32 idx);
    
+                                guint32 idx);
    
 
    
 
    Parameters
    
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_wireless_error_quark ()
@@ -58,7 +58,7 @@
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_wireless_get_ssid ()
@@ -80,14 +80,14 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_channel ()
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_wireless_get_bssid ()
@@ -95,7 +95,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_rate ()
@@ -103,28 +103,28 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_tx_power ()
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_wireless_get_mac_address ()
 
 
    
 
    const GByteArray *
+const GByteArray *
 
 
 nm_setting_wireless_get_cloned_mac_address ()
 
 
    
 
    const GSList *
+const GSList *
 
 
 nm_setting_wireless_get_mac_address_blacklist ()
@@ -132,7 +132,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_num_mac_blacklist_items ()
@@ -147,7 +147,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_add_mac_blacklist_item ()
@@ -163,7 +163,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_remove_mac_blacklist_item_by_value ()
@@ -179,7 +179,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_mtu ()
@@ -187,7 +187,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_get_hidden ()
@@ -195,7 +195,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_powersave ()
@@ -203,7 +203,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_add_seen_bssid ()
@@ -211,7 +211,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_num_seen_bssids ()
@@ -226,7 +226,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_ap_security_compatible ()
@@ -253,7 +253,7 @@
 
    
 
    
 
-gchar *band
 Read / Write
 
    Read / Write
 
    
 
    guintguint
 channel
 Read / Write / Construct
 
    Read / Write
 
    
 
    gbooleangboolean
 hidden
 Read / Write
 
    
 
-gchar *mode
 Read / Write
 
    
 
    guintguint
 mtu
 Read / Write / Construct
 
    
 
    guintguint
 powersave
 Read / Write
 
    
 
    guintguint
 rate
 Read / Write / Construct
 
    
 
    
 
-gchar *security
 Read / Write
 
    Read / Write
 
    
 
    guintguint
 tx-power
 Read / Write / Construct
 
    
@@ -797,7 +797,7 @@ at index idx
 
    
 
    
 
    nm_setting_wireless_add_mac_blacklist_item ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_add_mac_blacklist_item
                                (NMSettingWireless *setting,
                                 const char *mac);
    
@@ -826,7 +826,7 @@ nm_setting_wireless_add_mac_blacklist_item
 
    
 
    
 
    Returns
    
-
     TRUE if the MAC address was added; FALSE if the MAC address
+
     TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present
    
 
    
 
    Since: 0.9.10
    
@@ -837,7 +837,7 @@ is invalid or was already present
    
 
    void
 nm_setting_wireless_remove_mac_blacklist_item
                                (NMSettingWireless *setting,
-                                guint32 idx);
    
+                                guint32 idx);
 
    Removes the MAC address at index idx
  from the blacklist.
    
 
    
@@ -867,7 +867,7 @@ nm_setting_wireless_remove_mac_blacklist_item
 
    
 
    
 
    nm_setting_wireless_remove_mac_blacklist_item_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_remove_mac_blacklist_item_by_value
                                (NMSettingWireless *setting,
                                 const char *mac);
    
@@ -898,7 +898,7 @@ the blacklist
    
 
    
 
    
 
    Returns
    
-
     TRUE if the MAC address was found and removed; FALSE if it was not.
    
+
     TRUE if the MAC address was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -929,7 +929,7 @@ nm_setting_wireless_clear_mac_blacklist_items
 
    
 
    
 
    nm_setting_wireless_get_mtu ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_mtu (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -954,7 +954,7 @@ nm_setting_wireless_get_mtu (
 
    nm_setting_wireless_get_hidden ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_get_hidden (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -979,7 +979,7 @@ nm_setting_wireless_get_hidden (
 
    
 
    nm_setting_wireless_get_powersave ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_powersave (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -1005,7 +1005,7 @@ nm_setting_wireless_get_powersave (
 
    
 
    nm_setting_wireless_add_seen_bssid ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting,
                                     const char *bssid);
    
 
    Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
@@ -1036,14 +1036,14 @@ not be preserved.
    
 
    
 
    
 
    Returns
    
-
     TRUE if bssid
-was already known, FALSE if not
    
+
     TRUE if bssid
+was already known, FALSE if not
    
 
    
 
    
 
    
 
    
 
    nm_setting_wireless_get_num_seen_bssids ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_num_seen_bssids
                                (NMSettingWireless *setting);
    
 
    
@@ -1071,7 +1071,7 @@ nm_setting_wireless_get_num_seen_bssids
 
    nm_setting_wireless_get_seen_bssid ()
    
 
    const char *
 nm_setting_wireless_get_seen_bssid (NMSettingWireless *setting,
-                                    guint32 i);
    
+                                    guint32 i);
    
 
    
 
    Parameters
    
 
    
@@ -1103,7 +1103,7 @@ nm_setting_wireless_get_seen_bssid (
 
    
 
    nm_setting_wireless_ap_security_compatible ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_ap_security_compatible
                                (NMSettingWireless *s_wireless,
                                 NMSettingWirelessSecurity *s_wireless_sec,
@@ -1133,7 +1133,7 @@ compatible with which access points.
    
 
 
    
-
+
@@ -1163,8 +1163,8 @@ capabilities
    
 
 
    
 
    Returns
    
-
     TRUE if the given settings are compatible with the access point's
-security flags and mode, FALSE if they are not.
    
+
     TRUE if the given settings are compatible with the access point's
+security flags and mode, FALSE if they are not.
    
 
    
 
 
    
@@ -1384,7 +1384,7 @@ for this connection.
    
 
    Property Details
    
 
    
 
    The “band” property
    
-
      “band”                     gchar *
    
+
      “band”                     gchar *
    
 
    802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or
 "bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network
 to the specific band, i.e. if "a" is specified, the device will not
@@ -1407,7 +1407,7 @@ creating an Ad-Hoc network and is unlikely to in the future.
    
 
    
 
    
 
    The “channel” property
    
-
      “channel”                  guint
    
+
      “channel”                  guint
    
 
    Wireless channel to use for the Wi-Fi connection.  The device will only
 join (or create for Ad-Hoc networks) a Wi-Fi network on the specified
 channel.  Because channel numbers overlap between bands, this property
@@ -1426,8 +1426,8 @@ of its permanent MAC address.  This is known as MAC cloning or spoofing.
    
 
    
 
    
 
    The “hidden” property
    
-
      “hidden”                   gboolean
    
-
    If TRUE, indicates this network is a non-broadcasting network that hides
+
      “hidden”                   gboolean
    
+
    If TRUE, indicates this network is a non-broadcasting network that hides
 its SSID.  In this case various workarounds may take place, such as
 probe-scanning the SSID for more reliable network discovery.  However,
 these workarounds expose inherent insecurities with hidden SSID networks,
@@ -1456,7 +1456,7 @@ standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").
    
 
    
 
    
 
    The “mode” property
    
-
      “mode”                     gchar *
    
+
      “mode”                     gchar *
    
 
    Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap".  If blank,
 infrastructure is assumed.
    
 
    Flags: Read / Write
    
@@ -1465,7 +1465,7 @@ infrastructure is assumed.
    
 
    
 
    
 
    The “mtu” property
    
-
      “mtu”                      guint
    
+
      “mtu”                      guint
    
 
    If non-zero, only transmit packets of the specified size or smaller,
 breaking larger packets up into multiple Ethernet frames.
    
 
    Flags: Read / Write / Construct
    
@@ -1474,9 +1474,9 @@ breaking larger packets up into multiple Ethernet frames.
    
 
    
 
    
 
    The “powersave” property
    
-
      “powersave”                guint
    
-
    If set to FALSE, Wi-Fi power saving behavior is disabled.  If set to
-TRUE, Wi-Fi power saving behavior is enabled.  All other values are
+
      “powersave”                guint
    
+
    If set to FALSE, Wi-Fi power saving behavior is disabled.  If set to
+TRUE, Wi-Fi power saving behavior is enabled.  All other values are
 reserved.  Note that even though only boolean values are allowed, the
 property type is an unsigned integer to allow for future expansion.
    
 
    Flags: Read / Write
    
@@ -1486,7 +1486,7 @@ property type is an unsigned integer to allow for future expansion.
    
 
    
 
    
 
    The “rate” property
    
-
      “rate”                     guint
    
+
      “rate”                     guint
    
 
    If non-zero, directs the device to only use the specified bitrate for
 communication with the access point.  Units are in Kb/s, ie 5500 = 5.5
 Mbit/s.  This property is highly driver dependent and not all devices
@@ -1497,7 +1497,7 @@ support setting a static bitrate.
    
 
    
 
    
 
    The “security” property
    
-
      “security”                 gchar *
    
+
      “security”                 gchar *
    
 
    If the wireless connection has any security restrictions, like 802.1x,
 WEP, or WPA, set this property to
 NM_SETTING_WIRELESS_SECURITY_SETTING_NAME and ensure the connection
@@ -1533,7 +1533,7 @@ preserved.
    
 
    
 
    
 
    The “tx-power” property
    
-
      “tx-power”                 guint
    
+
      “tx-power”                 guint
    
 
    If non-zero, directs the device to use the specified transmit power.
 Units are dBm.  This property is highly driver dependent and not all
 devices support setting a static transmit power.
    
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index a6374d28..fcdb9a82 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -44,7 +44,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
+gchar *
 
@@ -315,24 +315,24 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
     
+gchar *
 
+gchar *
 
-
+
+gchar *
 
@@ -350,51 +350,51 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
     
+gchar *
 
-
+
-
+
-
+
+gchar *
 
+gchar *
 
+gchar *
 
+gchar *
 
-
+
@@ -498,10 +498,10 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMSettingWirelessSecurityError
     ╰── NMWepKeyType
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWirelessSecurity
 
    
@@ -530,7 +530,7 @@ of how Wi-Fi security works, you may want to get copies of the following books.<
 
    Functions
    
 
    
 
    nm_setting_wireless_security_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_setting_wireless_security_error_quark
                                (void);
    
 
    Registers an error quark for NMSettingWired if necessary.
    
@@ -580,7 +580,7 @@ nm_setting_wireless_security_get_key_mgmt
 
    
 
    
 
    nm_setting_wireless_security_get_num_protos ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_security_get_num_protos
                                (NMSettingWirelessSecurity *setting);
    
 
    
@@ -610,7 +610,7 @@ connecting to secure Wi-Fi networks
    
 
    const char *
 nm_setting_wireless_security_get_proto
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    
 
    Parameters
    
 
    
 
    s_wireless_sec
    a NMSettingWirelessSecurity or NULL
    a NMSettingWirelessSecurity or NULL
    		
  
 
    
 
    
 
    
 
-GQuark
+GQuark
 
 
 nm_setting_wireless_security_error_quark ()
@@ -67,7 +67,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_num_protos ()
@@ -82,7 +82,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_add_proto ()
@@ -98,7 +98,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_remove_proto_by_value ()
@@ -114,7 +114,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_num_pairwise ()
@@ -129,7 +129,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_add_pairwise ()
@@ -145,7 +145,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_remove_pairwise_by_value ()
@@ -161,7 +161,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_num_groups ()
@@ -176,7 +176,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_add_group ()
@@ -192,7 +192,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_remove_group_by_value ()
@@ -260,7 +260,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_wep_tx_keyidx ()
@@ -303,7 +303,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gchar *auth-alg
 Read / Write
 
    
 
-gchar *key-mgmt
 Read / Write
 
    
 
    
 
-gchar *leap-password
 Read / Write
 
    
 
    guintguint
 leap-password-flags
 Read / Write
 
    
 
    
 
-gchar *leap-username
 Read / Write
 
    
 
-gchar *psk
 Read / Write
 
    
 
    guintguint
 psk-flags
 Read / Write
 
    
 
    guintguint
 wep-key-flags
 Read / Write
 
    
 
    guintguint
 wep-key-type
 Read / Write / Construct
 
    
 
    
 
-gchar *wep-key0
 Read / Write
 
    
 
    
 
-gchar *wep-key1
 Read / Write
 
    
 
    
 
-gchar *wep-key2
 Read / Write
 
    
 
    
 
-gchar *wep-key3
 Read / Write
 
    
 
    guintguint
 wep-tx-keyidx
 Read / Write / Construct
 
    
@@ -642,7 +642,7 @@ nm_setting_wireless_security_get_proto
 
    
 
    
 
    nm_setting_wireless_security_add_proto ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_security_add_proto
                                (NMSettingWirelessSecurity *setting,
                                 const char *proto);
    
@@ -676,8 +676,8 @@ with the access point.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the protocol was new and and was added to the allowed
-protocol list, or FALSE if it was already in the list
    
+
     TRUE if the protocol was new and was added to the allowed
+protocol list, or FALSE if it was already in the list
    
 
    
 
 
    
@@ -686,7 +686,7 @@ protocol list, or void
 nm_setting_wireless_security_remove_proto
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
+                                guint32 i);
 
    Removes a protocol from the allowed protocol list.
    
 
    
 
    Parameters
    
@@ -714,7 +714,7 @@ nm_setting_wireless_security_remove_proto
 
    
 
    
 
    nm_setting_wireless_security_remove_proto_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_security_remove_proto_by_value
                                (NMSettingWirelessSecurity *setting,
                                 const char *proto);
    
@@ -743,7 +743,7 @@ nm_setting_wireless_security_remove_proto_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the protocol was found and removed; FALSE it it was not.
    
+
     TRUE if the protocol was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -774,7 +774,7 @@ specified then all protocols are allowed.
    
 
    
 
    
 
    nm_setting_wireless_security_get_num_pairwise ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_security_get_num_pairwise
                                (NMSettingWirelessSecurity *setting);
    
 
    
@@ -803,7 +803,7 @@ nm_setting_wireless_security_get_num_pairwise
 
    const char *
 nm_setting_wireless_security_get_pairwise
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    Returns the allowed pairwise encryption algorithm from allowed algorithm
 list.
    
 
    
@@ -837,7 +837,7 @@ list.
    
 
    
 
    
 
    nm_setting_wireless_security_add_pairwise ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_security_add_pairwise
                                (NMSettingWirelessSecurity *setting,
                                 const char *pairwise);
    
@@ -869,7 +869,7 @@ compatible with this connection.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the algorithm was added to the list, FALSE if it was
+
     TRUE if the algorithm was added to the list, FALSE if it was
 already in the list
    
 
    
 
    
@@ -879,7 +879,7 @@ already in the list
    
 
    void
 nm_setting_wireless_security_remove_pairwise
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
    
+                                guint32 i);
 
    Removes an encryption algorithm from the allowed pairwise encryption
 algorithm list.
    
 
    
@@ -908,7 +908,7 @@ algorithm list.
    
 
    
 
    
 
    nm_setting_wireless_security_remove_pairwise_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_security_remove_pairwise_by_value
                                (NMSettingWirelessSecurity *setting,
                                 const char *pairwise);
    
@@ -938,7 +938,7 @@ algorithm list.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the encryption algorith was found and removed; FALSE it it was not.
    
+
     TRUE if the encryption algorith was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -969,7 +969,7 @@ specified then all pairwise encryption algorithms are allowed.
    
 
    
 
    
 
    nm_setting_wireless_security_get_num_groups ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_security_get_num_groups
                                (NMSettingWirelessSecurity *setting);
    
 
    
@@ -998,7 +998,7 @@ nm_setting_wireless_security_get_num_groups
 
    const char *
 nm_setting_wireless_security_get_group
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    Returns the allowed groupwise encryption algorithm from allowed algorithm
 list.
    
 
    
@@ -1032,7 +1032,7 @@ list.
    
 
    
 
    
 
    nm_setting_wireless_security_add_group ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_security_add_group
                                (NMSettingWirelessSecurity *setting,
                                 const char *group);
    
@@ -1065,7 +1065,7 @@ compatible with this connection.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the algorithm was added to the list, FALSE if it was
+
     TRUE if the algorithm was added to the list, FALSE if it was
 already in the list
    
 
    
 
    
@@ -1075,7 +1075,7 @@ already in the list
    
 
    void
 nm_setting_wireless_security_remove_group
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
    
+                                guint32 i);
 
    Removes an encryption algorithm from the allowed groupwise encryption
 algorithm list.
    
 
    
@@ -1104,7 +1104,7 @@ algorithm list.
    
 
    
 
    
 
    nm_setting_wireless_security_remove_group_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_security_remove_group_by_value
                                (NMSettingWirelessSecurity *setting,
                                 const char *group);
    
@@ -1135,7 +1135,7 @@ algorithm list.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the algorithm was found and removed; FALSE it it was not.
    
+
     TRUE if the algorithm was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -1300,7 +1300,7 @@ nm_setting_wireless_security_get_leap_password_flags
 
    const char *
 nm_setting_wireless_security_get_wep_key
                                (NMSettingWirelessSecurity *setting,
-                                guint32 idx);
    
+                                guint32 idx);
 
    
 
    Parameters
    
 
    
@@ -1334,7 +1334,7 @@ nm_setting_wireless_security_get_wep_key
 
    void
 nm_setting_wireless_security_set_wep_key
                                (NMSettingWirelessSecurity *setting,
-                                guint32 idx,
+                                guint32 idx,
                                 const char *key);
    
 
    Sets a WEP key in the given index.
    
 
    
@@ -1370,7 +1370,7 @@ property.
    
 
    
 
    
 
    nm_setting_wireless_security_get_wep_tx_keyidx ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_security_get_wep_tx_keyidx
                                (NMSettingWirelessSecurity *setting);
    
 
    
@@ -1722,7 +1722,7 @@ the actual WEP key using the MD5 hash algorithm.
    
 
    Property Details
    
 
    
 
    The “auth-alg” property
    
-
      “auth-alg”                 gchar *
    
+
      “auth-alg”                 gchar *
    
 
    When WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the
 802.11 authentication algorithm required by the AP here.  One of "open"
 for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP.  When
@@ -1744,7 +1744,7 @@ list element may be one of "wep40", "wep104", "tkip", or "ccmp".
    
 
    
 
    
 
    The “key-mgmt” property
    
-
      “key-mgmt”                 gchar *
    
+
      “key-mgmt”                 gchar *
    
 
    Key management used for the connection.  One of "none" (WEP), "ieee8021x"
 (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure
 WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for
@@ -1755,7 +1755,7 @@ any Wi-Fi connection that uses security.
    
 
    
 
    
 
    The “leap-password” property
    
-
      “leap-password”            gchar *
    
+
      “leap-password”            gchar *
    
 
    The login password for legacy LEAP connections (ie, key-mgmt =
 "ieee8021x" and auth-alg = "leap").
    
 
    Flags: Read / Write
    
@@ -1764,7 +1764,7 @@ any Wi-Fi connection that uses security.
    
 
    
 
    
 
    The “leap-password-flags” property
    
-
      “leap-password-flags”      guint
    
+
      “leap-password-flags”      guint
    
 
    Flags indicating how to handle the
 “leap-password” property.
    
 
    Flags: Read / Write
    
@@ -1774,7 +1774,7 @@ any Wi-Fi connection that uses security.
    
 
    
 
    
 
    The “leap-username” property
    
-
      “leap-username”            gchar *
    
+
      “leap-username”            gchar *
    
 
    The login username for legacy LEAP connections (ie, key-mgmt =
 "ieee8021x" and auth-alg = "leap").
    
 
    Flags: Read / Write
    
@@ -1802,7 +1802,7 @@ not specified, both WPA and RSN connections are allowed.
    
 
    
 
    
 
    The “psk” property
    
-
      “psk”                      gchar *
    
+
      “psk”                      gchar *
    
 
    Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it
 must contain only hexadecimal characters and is interpreted as a
 hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII
@@ -1815,7 +1815,7 @@ connecting to the Wi-Fi network.
    
 
    
 
    
 
    The “psk-flags” property
    
-
      “psk-flags”                guint
    
+
      “psk-flags”                guint
    
 
    Flags indicating how to handle the “psk”
 property.
    
 
    Flags: Read / Write
    
@@ -1825,7 +1825,7 @@ property.
    
 
    
 
    
 
    The “wep-key-flags” property
    
-
      “wep-key-flags”            guint
    
+
      “wep-key-flags”            guint
    
 
    Flags indicating how to handle the “wep-key0”,
 “wep-key1”, “wep-key2”,
 and “wep-key3” properties.
    
@@ -1836,7 +1836,7 @@ and 
 
    The “wep-key-type” property
    
-
      “wep-key-type”             guint
    
+
      “wep-key-type”             guint
    
 
    Controls the interpretation of WEP keys.  Allowed values are
 NM_WEP_KEY_TYPE_KEY, in which case the key is either a 10- or
 26-character hexadecimal string, or a 5- or 13-character ASCII password;
@@ -1850,7 +1850,7 @@ the actual WEP key.
    
 
    
 
    
 
    The “wep-key0” property
    
-
      “wep-key0”                 gchar *
    
+
      “wep-key0”                 gchar *
    
 
    Index 0 WEP key.  This is the WEP key used in most networks.  See the
 "wep-key-type" property for a description of how this key is interpreted.
    
 
    Flags: Read / Write
    
@@ -1859,7 +1859,7 @@ the actual WEP key.
    
 
    
 
    
 
    The “wep-key1” property
    
-
      “wep-key1”                 gchar *
    
+
      “wep-key1”                 gchar *
    
 
    Index 1 WEP key.  This WEP index is not used by most networks.  See the
 "wep-key-type" property for a description of how this key is interpreted.
    
 
    Flags: Read / Write
    
@@ -1868,7 +1868,7 @@ the actual WEP key.
    
 
    
 
    
 
    The “wep-key2” property
    
-
      “wep-key2”                 gchar *
    
+
      “wep-key2”                 gchar *
    
 
    Index 2 WEP key.  This WEP index is not used by most networks.  See the
 "wep-key-type" property for a description of how this key is interpreted.
    
 
    Flags: Read / Write
    
@@ -1877,7 +1877,7 @@ the actual WEP key.
    
 
    
 
    
 
    The “wep-key3” property
    
-
      “wep-key3”                 gchar *
    
+
      “wep-key3”                 gchar *
    
 
    Index 3 WEP key.  This WEP index is not used by most networks.  See the
 "wep-key-type" property for a description of how this key is interpreted.
    
 
    Flags: Read / Write
    
@@ -1886,7 +1886,7 @@ the actual WEP key.
    
 
    
 
    
 
    The “wep-tx-keyidx” property
    
-
      “wep-tx-keyidx”            guint
    
+
      “wep-tx-keyidx”            guint
    
 
    When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key
 index is used by the AP, put that WEP key index here.  Valid values are 0
 (default key) through 3.  Note that some consumer access points (like the
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 1146fbe7..3d8c605f 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -701,43 +701,43 @@ DBUS_TYPE_NM_IP_ROUTES, macro in nm-dbus-glib-types
 
    
 
    G
    
 
    
-g_value_array_append, macro in nm-gvaluearray-compat
+g_value_array_append, macro in nm-gvaluearray-compat
 
    
 
    
 
    
-g_value_array_copy, macro in nm-gvaluearray-compat
+g_value_array_copy, macro in nm-gvaluearray-compat
 
    
 
    
 
    
-g_value_array_free, function in nm-gvaluearray-compat
+g_value_array_free, function in nm-gvaluearray-compat
 
    
 
    
 
    
-g_value_array_get_nth, macro in nm-gvaluearray-compat
+g_value_array_get_nth, macro in nm-gvaluearray-compat
 
    
 
    
 
    
-g_value_array_insert, macro in nm-gvaluearray-compat
+g_value_array_insert, macro in nm-gvaluearray-compat
 
    
 
    
 
    
-g_value_array_new, macro in nm-gvaluearray-compat
+g_value_array_new, macro in nm-gvaluearray-compat
 
    
 
    
 
    
-g_value_array_prepend, macro in nm-gvaluearray-compat
+g_value_array_prepend, macro in nm-gvaluearray-compat
 
    
 
    
 
    
-g_value_array_remove, macro in nm-gvaluearray-compat
+g_value_array_remove, macro in nm-gvaluearray-compat
 
    
 
    
 
    
-g_value_array_sort, macro in nm-gvaluearray-compat
+g_value_array_sort, macro in nm-gvaluearray-compat
 
    
 
    
 
    
-g_value_array_sort_with_data, macro in nm-gvaluearray-compat
+g_value_array_sort_with_data, macro in nm-gvaluearray-compat
 
    
 
    
 
    I
    
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 63ca1c2f..1a185db1 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,12 +15,12 @@
 
    
 
    
 
    
-      for libnm-util 1.6.2
+      for libnm-util 1.8.0
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm-util/stable/.
     
    
-
    Copyright © 2012 The NetworkManager Authors
    
+
    Copyright © 2012, 2013, 2014, 2015, 2016, 2017 The NetworkManager Authors
    
 
    
 
    
 	Permission is granted to copy, distribute and/or modify this
diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html
index c77e9c8e..fc5ae118 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManager.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManager.html
@@ -644,7 +644,7 @@
 
    
 
    enum NMDeviceType
    
 
    NMDeviceType values indicate the type of hardware represented by
-an NMDevice.
    
+an NMDevice.
    
 
    
 
    Members
    
 
    
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 7af0b0a1..6dd68fd8 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -42,7 +42,7 @@
 
-
+
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_init ()
@@ -58,7 +58,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_is_empty_ssid ()
@@ -73,7 +73,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_same_ssid ()
@@ -89,7 +89,7 @@
 
    
 
    
 
-GHashTable *
+GHashTable *
 
 
 nm_utils_gvalue_hash_dup ()
@@ -105,7 +105,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_security_valid ()
@@ -113,7 +113,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_ap_mode_security_valid ()
@@ -121,7 +121,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_wep_key_valid ()
@@ -129,7 +129,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_wpa_psk_valid ()
@@ -137,7 +137,7 @@
 
    
 
    
 
-GSList *
+GSList *
 
 
 nm_utils_ip4_addresses_from_gvalue ()
@@ -153,7 +153,7 @@
 
    
 
    
 
-GSList *
+GSList *
 
 
 nm_utils_ip4_routes_from_gvalue ()
@@ -169,7 +169,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_utils_ip4_netmask_to_prefix ()
@@ -177,7 +177,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_utils_ip4_prefix_to_netmask ()
@@ -185,7 +185,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_utils_ip4_get_default_prefix ()
@@ -193,7 +193,7 @@
 
    
 
    
 
-GSList *
+GSList *
 
 
 nm_utils_ip6_addresses_from_gvalue ()
@@ -209,7 +209,7 @@
 
    
 
    
 
-GSList *
+GSList *
 
 
 nm_utils_ip6_routes_from_gvalue ()
@@ -225,7 +225,7 @@
 
    
 
    
 
-GSList *
+GSList *
 
 
 nm_utils_ip6_dns_from_gvalue ()
@@ -257,7 +257,7 @@
 
    
 
    
 
-GByteArray *
+GByteArray *
 
 
 nm_utils_rsa_key_encrypt ()
@@ -265,7 +265,7 @@
 
    
 
    
 
-GByteArray *
+GByteArray *
 
 
 nm_utils_rsa_key_encrypt_aes ()
@@ -273,7 +273,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_file_is_pkcs12 ()
@@ -281,7 +281,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 (*NMUtilsFileSearchInPathsPredicate) ()
@@ -296,7 +296,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_utils_wifi_freq_to_channel ()
@@ -304,7 +304,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_utils_wifi_channel_to_freq ()
@@ -312,7 +312,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_utils_wifi_find_next_channel ()
@@ -320,7 +320,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_wifi_is_channel_valid ()
@@ -352,7 +352,7 @@
 
    
 
    
 
-GByteArray *
+GByteArray *
 
 
 nm_utils_hwaddr_atoba ()
@@ -360,7 +360,7 @@
 
    
 
    
 
-guint8 *
+guint8 *
 
 
 nm_utils_hwaddr_aton ()
@@ -376,7 +376,7 @@
 
    
 
    
 
-guint8 *
+guint8 *
 
 
 nm_utils_hwaddr_aton_len ()
@@ -384,7 +384,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_hwaddr_valid ()
@@ -416,7 +416,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_iface_valid_name ()
@@ -424,7 +424,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_is_uuid ()
@@ -446,7 +446,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_utils_check_virtual_device_compatibility ()
@@ -480,7 +480,7 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMUtilsSecurityType
 
    
 
    
@@ -498,8 +498,8 @@ access points and devices, among other things.
    
 
    Functions
    
 
    
 
    nm_utils_init ()
    
-
    gboolean
-nm_utils_init (GError **error);
    
+
    gboolean
+nm_utils_init (GError **error);
    
 
    Initializes libnm-util; should be called when starting any program that
 uses libnm-util.  This function can be called more than once.
    
 
    
@@ -512,14 +512,14 @@ uses libnm-util.  This function can be called more than once.
    
 
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
 
    
 
    
 
    
 
    Returns
    
-
     TRUE if the initialization was successful, FALSE on failure.
    
+
     TRUE if the initialization was successful, FALSE on failure.
    
 
    
 
    
 
    
@@ -533,8 +533,8 @@ does not have any effect, and does not ever need to be called.
    
 
    
 
    
 
    nm_utils_is_empty_ssid ()
    
-
    gboolean
-nm_utils_is_empty_ssid (const guint8 *ssid,
+
    gboolean
+nm_utils_is_empty_ssid (const guint8 *ssid,
                         int len);
    
 
    Different manufacturers use different mechanisms for not broadcasting the
 AP's SSID.  This function attempts to detect blank/empty SSIDs using a
@@ -564,15 +564,15 @@ number of known SSID-cloaking methods.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the SSID is "empty", FALSE if it is not
    
+
     TRUE if the SSID is "empty", FALSE if it is not
    
 
    
 
    
 
    
 
    
 
    nm_utils_escape_ssid ()
    
 
    const char *
-nm_utils_escape_ssid (const guint8 *ssid,
-                      guint32 len);
    
+nm_utils_escape_ssid (const guint8 *ssid,
+                      guint32 len);
    
 
    This function does a quick printable character conversion of the SSID, simply
 replacing embedded NULLs and non-printable characters with the hexadecimal
 representation of that character.  Intended for debugging only, should not
@@ -609,10 +609,10 @@ and will be overwritten by subsequent calls to this function
    
 
    
 
    
 
    nm_utils_same_ssid ()
    
-
    gboolean
-nm_utils_same_ssid (const GByteArray *ssid1,
-                    const GByteArray *ssid2,
-                    gboolean ignore_trailing_null);
    
+
    gboolean
+nm_utils_same_ssid (const GByteArray *ssid1,
+                    const GByteArray *ssid2,
+                    gboolean ignore_trailing_null);
    
 
    Earlier versions of the Linux kernel added a NULL byte to the end of the
 SSID to enable easy printing of the SSID on the console or in a terminal,
 but this behavior was problematic (SSIDs are simply byte arrays, not strings)
@@ -640,7 +640,7 @@ NULLs, even though that is functionally pointless.
    
 
 
 
    ignore_trailing_null
    
-
    TRUE to ignore one trailing NULL byte
    
+
    TRUE to ignore one trailing NULL byte
    
  
 
 
@@ -648,14 +648,14 @@ NULLs, even though that is functionally pointless.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the SSIDs are the same, FALSE if they are not
    
+
     TRUE if the SSIDs are the same, FALSE if they are not
    
 
    
 
    
 
    
 
    
 
    nm_utils_ssid_to_utf8 ()
    
 
    char *
-nm_utils_ssid_to_utf8 (const GByteArray *ssid);
    
+nm_utils_ssid_to_utf8 (const GByteArray *ssid);
    
 
    Wi-Fi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
 contain embedded NULLs and other unprintable characters.  Often it is
 useful to print the SSID out for debugging purposes, but that should be the
@@ -693,17 +693,17 @@ _only_.
    
 
    
 
    Returns
    
 
     an allocated string containing a UTF-8
-representation of the SSID, which must be freed by the caller using g_free().
-Returns NULL on errors. 
    
+representation of the SSID, which must be freed by the caller using g_free().
+Returns NULL on errors. 
    
 
    [transfer full]
    
 
    
 
    
 
    
 
    
 
    nm_utils_gvalue_hash_dup ()
    
-
    GHashTable *
-nm_utils_gvalue_hash_dup (GHashTable *hash);
    
-
    Utility function to duplicate a hash table of GValues.
    
+
    GHashTable *
+nm_utils_gvalue_hash_dup (GHashTable *hash);
    
+
    Utility function to duplicate a hash table of GValues.
    
 
    
 
    Parameters
    
 
    
@@ -714,15 +714,15 @@ nm_utils_gvalue_hash_dup (
    hash
    
-    
+
    a GHashTable mapping string:GValue
    a GHashTable mapping string:GValue
    		
  
 
    
 
    
 
    
 
    
 
    Returns
    
-
     a newly allocated duplicated GHashTable, caller must free the
-returned hash with g_hash_table_unref() or g_hash_table_destroy(). 
    
+
     a newly allocated duplicated GHashTable, caller must free the
+returned hash with g_hash_table_unref() or g_hash_table_destroy(). 
    
 
    [transfer container][element-type utf8 GObject.Value]
    
 
    
 
    
@@ -730,13 +730,13 @@ returned hash with 
 
    nm_utils_slist_free ()
    
 
    void
-nm_utils_slist_free (GSList *list,
-                     GDestroyNotify elem_destroy_fn);
    
+nm_utils_slist_free (GSList *list,
+                     GDestroyNotify elem_destroy_fn);
    
 
    
 
    nm_utils_slist_free is deprecated and should not be used in newly-written code.
    
-
    use g_slist_free_full().
    
+
    use g_slist_free_full().
    
 
    
-
    Utility function to free a GSList.
    
+
    Utility function to free a GSList.
    
 
    [skip]
    
 
    
 
    Parameters
    
@@ -749,7 +749,7 @@ nm_utils_slist_free (
    list
    
-
    a GSList
    
+
    a GSList
    
  
 
 
@@ -765,11 +765,11 @@ nm_utils_slist_free (
 
    nm_utils_security_valid ()
    
-
    gboolean
+
    gboolean
 nm_utils_security_valid (NMUtilsSecurityType type,
                          NMDeviceWifiCapabilities wifi_caps,
-                         gboolean have_ap,
-                         gboolean adhoc,
+                         gboolean have_ap,
+                         gboolean adhoc,
                          NM80211ApFlags ap_flags,
                          NM80211ApSecurityFlags ap_wpa,
                          NM80211ApSecurityFlags ap_rsn);
    
@@ -834,15 +834,15 @@ e.g. (
 
    Returns
    
-
     TRUE if the device capabilities and AP capabilties intersect and are
+
     TRUE if the device capabilities and AP capabilties intersect and are
 compatible with the desired type
-, FALSE if they are not
    
+, FALSE if they are not
    
 
    
 
    
 
    
 
    
 
    nm_utils_ap_mode_security_valid ()
    
-
    gboolean
+
    gboolean
 nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
                                  NMDeviceWifiCapabilities wifi_caps);
    
 
    Given a set of device capabilities, and a desired security type to check
@@ -874,16 +874,16 @@ e.g. 
 
    
 
    Returns
    
-
     TRUE if the device capabilities are compatible with the desired
+
     TRUE if the device capabilities are compatible with the desired
 type
-, FALSE if they are not.
    
+, FALSE if they are not.
    
 
    
 
    Since: 0.9.8
    
 
    
 
    
 
    
 
    nm_utils_wep_key_valid ()
    
-
    gboolean
+
    gboolean
 nm_utils_wep_key_valid (const char *key,
                         NMWepKeyType wep_type);
    
 
    Checks if key
@@ -912,15 +912,15 @@ nm_utils_wep_key_valid (const cha
 
    
 
    
 
    Returns
    
-
     TRUE if key
-is a WEP key, FALSE if not
    
+
     TRUE if key
+is a WEP key, FALSE if not
    
 
    
 
    Since: 0.9.8
    
 
    
 
    
 
    
 
    nm_utils_wpa_psk_valid ()
    
-
    gboolean
+
    gboolean
 nm_utils_wpa_psk_valid (const char *psk);
    
 
    Checks if psk
  is a valid WPA PSK
    
@@ -941,20 +941,20 @@ nm_utils_wpa_psk_valid (const cha
 
    
 
    
 
    Returns
    
-
     TRUE if psk
-is a WPA PSK, FALSE if not
    
+
     TRUE if psk
+is a WPA PSK, FALSE if not
    
 
    
 
    Since: 0.9.8
    
 
    
 
    
 
    
 
    nm_utils_ip4_addresses_from_gvalue ()
    
-
    GSList *
-nm_utils_ip4_addresses_from_gvalue (const GValue *value);
    
-
    Utility function to convert a GPtrArray of GArrays of guint32s representing
+
    GSList *
+nm_utils_ip4_addresses_from_gvalue (const GValue *value);
    
+
    Utility function to convert a GPtrArray of GArrays of guint32s representing
 a list of NetworkManager IPv4 addresses (which is a tuple of address, gateway,
-and prefix) into a GSList of NMIP4Address objects.  The specific format of
-this serialization is not guaranteed to be stable and the GArray may be
+and prefix) into a GSList of NMIP4Address objects.  The specific format of
+this serialization is not guaranteed to be stable and the GArray may be
 extended in the future.
    
 
    
 
    Parameters
    
@@ -966,14 +966,14 @@ extended in the future.
    
 
 
 
    value
    
-
    GValue containing a GPtrArray of GArrays of guint32s
    
+
    GValue containing a GPtrArray of GArrays of guint32s
    
  
 
 
    
 
    
 
    
 
    Returns
    
-
     a newly allocated GSList of NMIP4Address objects. 
    
+
     a newly allocated GSList of NMIP4Address objects. 
    
 
    [transfer full][element-type NMIP4Address]
    
 
    
 
    
@@ -981,10 +981,10 @@ extended in the future.
    
 
    
 
    nm_utils_ip4_addresses_to_gvalue ()
    
 
    void
-nm_utils_ip4_addresses_to_gvalue (GSList *list,
-                                  GValue *value);
    
-
    Utility function to convert a GSList of NMIP4Address objects into a
-GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
+nm_utils_ip4_addresses_to_gvalue (GSList *list,
+                                  GValue *value);
    
+
    Utility function to convert a GSList of NMIP4Address objects into a
+GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 addresses (which is a tuple of address, gateway, and prefix).   The specific
 format of this serialization is not guaranteed to be stable and may be
 extended in the future.
    
@@ -1004,9 +1004,9 @@ extended in the future.
    
 
 
 
    value
    
-
    a pointer to a GValue into which to place the converted addresses,
+
    a pointer to a GValue into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
    
+g_value_unset().
    
  
 
 
@@ -1016,11 +1016,11 @@ which should be unset by the caller (when no longer needed) with
 
    
 
    
 
    nm_utils_ip4_routes_from_gvalue ()
    
-
    GSList *
-nm_utils_ip4_routes_from_gvalue (const GValue *value);
    
-
    Utility function to convert a GPtrArray of GArrays of guint32s representing
+
    GSList *
+nm_utils_ip4_routes_from_gvalue (const GValue *value);
    
+
    Utility function to convert a GPtrArray of GArrays of guint32s representing
 a list of NetworkManager IPv4 routes (which is a tuple of route, next hop,
-prefix, and metric) into a GSList of NMIP4Route objects.  The specific
+prefix, and metric) into a GSList of NMIP4Route objects.  The specific
 format of this serialization is not guaranteed to be stable and may be
 extended in the future.
    
 
    
@@ -1033,14 +1033,14 @@ extended in the future.
    
 
 
 
    value
    
-
    GValue containing a GPtrArray of GArrays of guint32s
    
+
    GValue containing a GPtrArray of GArrays of guint32s
    
  
 
 
    
 
    
 
    
 
    Returns
    
-
     a newly allocated GSList of NMIP4Route objects. 
    
+
     a newly allocated GSList of NMIP4Route objects. 
    
 
    [transfer full][element-type NMIP4Route]
    
 
    
 
    
@@ -1048,10 +1048,10 @@ extended in the future.
    
 
    
 
    nm_utils_ip4_routes_to_gvalue ()
    
 
    void
-nm_utils_ip4_routes_to_gvalue (GSList *list,
-                               GValue *value);
    
-
    Utility function to convert a GSList of NMIP4Route objects into a
-GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
+nm_utils_ip4_routes_to_gvalue (GSList *list,
+                               GValue *value);
+
    Utility function to convert a GSList of NMIP4Route objects into a
+GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 routes (which is a tuple of route, next hop, prefix, and metric).   The
 specific format of this serialization is not guaranteed to be stable and may
 be extended in the future.
    
@@ -1071,9 +1071,9 @@ be extended in the future.
    
 
 
 
    value
    
-
    a pointer to a GValue into which to place the converted routes,
+
    a pointer to a GValue into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
    
+g_value_unset().
    
  
 
 
@@ -1083,8 +1083,8 @@ which should be unset by the caller (when no longer needed) with
 
    
 
    
 
    nm_utils_ip4_netmask_to_prefix ()
    
-
    guint32
-nm_utils_ip4_netmask_to_prefix (guint32 netmask);
    
+
    guint32
+nm_utils_ip4_netmask_to_prefix (guint32 netmask);
    
 
    
 
    Parameters
    
 
    
@@ -1108,8 +1108,8 @@ nm_utils_ip4_netmask_to_prefix (
 
    nm_utils_ip4_prefix_to_netmask ()
    
-
    guint32
-nm_utils_ip4_prefix_to_netmask (guint32 prefix);
    
+
    guint32
+nm_utils_ip4_prefix_to_netmask (guint32 prefix);
    
 
    
 
    Parameters
    
 
    
@@ -1133,8 +1133,8 @@ nm_utils_ip4_prefix_to_netmask (
 
    nm_utils_ip4_get_default_prefix ()
    
-
    guint32
-nm_utils_ip4_get_default_prefix (guint32 ip);
    
+
    guint32
+nm_utils_ip4_get_default_prefix (guint32 ip);
    
 
    When the Internet was originally set up, various ranges of IP addresses were
 segmented into three network classes: A, B, and C.  This function will return
 a prefix that is associated with the IP address specified defining where it
@@ -1162,12 +1162,12 @@ falls in the predefined classes.
    
 
    
 
    
 
    nm_utils_ip6_addresses_from_gvalue ()
    
-
    GSList *
-nm_utils_ip6_addresses_from_gvalue (const GValue *value);
    
-
    Utility function to convert a GPtrArray of GValueArrays of (GArray of guchars) and guint32
+
    GSList *
+nm_utils_ip6_addresses_from_gvalue (const GValue *value);
    
+
    Utility function to convert a GPtrArray of GValueArrays of (GArray of guchars) and guint32
 representing a list of NetworkManager IPv6 addresses (which is a tuple of address,
-prefix, and gateway), into a GSList of NMIP6Address objects.  The specific format of
-this serialization is not guaranteed to be stable and the GValueArray may be
+prefix, and gateway), into a GSList of NMIP6Address objects.  The specific format of
+this serialization is not guaranteed to be stable and the GValueArray may be
 extended in the future.
    
 
    
 
    Parameters
    
@@ -1179,14 +1179,14 @@ extended in the future.
    
 
 
    
-
+
    
 
    value
    gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
    gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
    		
  
 
    
 
    
 
    
 
    
 
    Returns
    
-
     a newly allocated GSList of NMIP6Address objects. 
    
+
     a newly allocated GSList of NMIP6Address objects. 
    
 
    [transfer full][element-type NMIP6Address]
    
 
    
 
    
@@ -1194,10 +1194,10 @@ extended in the future.
    
 
    
 
    nm_utils_ip6_addresses_to_gvalue ()
    
 
    void
-nm_utils_ip6_addresses_to_gvalue (GSList *list,
-                                  GValue *value);
    
-
    Utility function to convert a GSList of NMIP6Address objects into a
-GPtrArray of GValueArrays representing a list of NetworkManager IPv6 addresses
+nm_utils_ip6_addresses_to_gvalue (GSList *list,
+                                  GValue *value);
+
    Utility function to convert a GSList of NMIP6Address objects into a
+GPtrArray of GValueArrays representing a list of NetworkManager IPv6 addresses
 (which is a tuple of address, prefix, and gateway). The specific format of
 this serialization is not guaranteed to be stable and may be extended in the
 future.
    
@@ -1217,9 +1217,9 @@ future.
    
 
 
 
    value
    
-
    a pointer to a GValue into which to place the converted addresses,
+
    a pointer to a GValue into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
    
+g_value_unset().
    
  
 
 
@@ -1229,12 +1229,12 @@ which should be unset by the caller (when no longer needed) with
 
    
 
    
 
    nm_utils_ip6_routes_from_gvalue ()
    
-
    GSList *
-nm_utils_ip6_routes_from_gvalue (const GValue *value);
    
-
    Utility function GPtrArray of GValueArrays of (GArray of guchars), guint32,
-(GArray of guchars), and guint32 representing a list of NetworkManager IPv6
+
    GSList *
+nm_utils_ip6_routes_from_gvalue (const GValue *value);
    
+
    Utility function GPtrArray of GValueArrays of (GArray of guchars), guint32,
+(GArray of guchars), and guint32 representing a list of NetworkManager IPv6
 routes (which is a tuple of destination, prefix, next hop, and metric)
-into a GSList of NMIP6Route objects.  The specific format of this serialization
+into a GSList of NMIP6Route objects.  The specific format of this serialization
 is not guaranteed to be stable and may be extended in the future.
    
 
    
 
    Parameters
    
@@ -1246,15 +1246,15 @@ is not guaranteed to be stable and may be extended in the future.
    
 
 
 
    value
    
-
    GValue containing a GPtrArray of GValueArrays of (GArray of guchars), guint32,
-(GArray of guchars), and guint32
    
+
    GValue containing a GPtrArray of GValueArrays of (GArray of guchars), guint32,
+(GArray of guchars), and guint32
    
  
 
 
    
 
    
 
    
 
    Returns
    
-
     a newly allocated GSList of NMIP6Route objects. 
    
+
     a newly allocated GSList of NMIP6Route objects. 
    
 
    [transfer full][element-type NMIP6Route]
    
 
    
 
    
@@ -1262,10 +1262,10 @@ is not guaranteed to be stable and may be extended in the future.
    
 
    
 
    nm_utils_ip6_routes_to_gvalue ()
    
 
    void
-nm_utils_ip6_routes_to_gvalue (GSList *list,
-                               GValue *value);
    
-
    Utility function to convert a GSList of NMIP6Route objects into a GPtrArray of
-GValueArrays of (GArray of guchars), guint32, (GArray of guchars), and guint32
+nm_utils_ip6_routes_to_gvalue (GSList *list,
+                               GValue *value);
+
    Utility function to convert a GSList of NMIP6Route objects into a GPtrArray of
+GValueArrays of (GArray of guchars), guint32, (GArray of guchars), and guint32
 representing a list of NetworkManager IPv6 routes (which is a tuple of destination,
 prefix, next hop, and metric).  The specific format of this serialization is not
 guaranteed to be stable and may be extended in the future.
    
@@ -1285,9 +1285,9 @@ guaranteed to be stable and may be extended in the future.
    
 
 
 
    value
    
-
    a pointer to a GValue into which to place the converted routes,
+
    a pointer to a GValue into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
    
+g_value_unset().
    
  
 
 
@@ -1297,10 +1297,10 @@ which should be unset by the caller (when no longer needed) with
 
    
 
    
 
    nm_utils_ip6_dns_from_gvalue ()
    
-
    GSList *
-nm_utils_ip6_dns_from_gvalue (const GValue *value);
    
-
    Converts a GValue containing a GPtrArray of IP6 DNS, represented as
-GByteArrays into a GSList of struct in6_addrs.
    
+
    GSList *
+nm_utils_ip6_dns_from_gvalue (const GValue *value);
    
+
    Converts a GValue containing a GPtrArray of IP6 DNS, represented as
+GByteArrays into a GSList of struct in6_addrs.
    
 
    [skip]
    
 
    
 
    Parameters
    
@@ -1312,24 +1312,24 @@ nm_utils_ip6_dns_from_gvalue (const 
    value
    
-
    a GValue
    
+
    a GValue
    
  
 
 
    
 
    
 
    
 
    Returns
    
-
     a GSList of IP6 addresses.
    
+
     a GSList of IP6 addresses.
    
 
    
 
    
 
    
 
    
 
    nm_utils_ip6_dns_to_gvalue ()
    
 
    void
-nm_utils_ip6_dns_to_gvalue (GSList *list,
-                            GValue *value);
    
-
    Utility function to convert a GSList of struct
-in6_addr structs into a GPtrArray of GByteArrays
+nm_utils_ip6_dns_to_gvalue (GSList *list,
+                            GValue *value);
+
    Utility function to convert a GSList of struct
+in6_addr structs into a GPtrArray of GByteArrays
 representing each server's IPv6 addresses in network byte order.
 The specific format of this serialization is not guaranteed to be
 stable and may be extended in the future.
    
@@ -1350,9 +1350,9 @@ stable and may be extended in the future.
    
 
 
 
    value
    
-
    a pointer to a GValue into which to place the converted DNS server
+
    a pointer to a GValue into which to place the converted DNS server
 addresses, which should be unset by the caller (when no longer needed) with
-g_value_unset().
    
+g_value_unset().
    
  
 
 
@@ -1367,7 +1367,7 @@ nm_utils_uuid_generate (void
 
    Returns
    
 
     a newly allocated UUID suitable for use as the NMSettingConnection
-object's “id”: property.  Should be freed with g_free()
    
+object's “id”: property.  Should be freed with g_free()
    
 
    
 
    
 
    
@@ -1401,11 +1401,11 @@ object's 
 
    
 
    nm_utils_rsa_key_encrypt ()
    
-
    GByteArray *
-nm_utils_rsa_key_encrypt (const GByteArray *data,
+
    GByteArray *
+nm_utils_rsa_key_encrypt (const GByteArray *data,
                           const char *in_password,
                           char **out_password,
-                          GError **error);
    
+                          GError **error);
    
 
    Encrypts the given RSA private key data with the given password (or generates
 a password if no password was given) and converts the data to PEM format
 suitable for writing to a file. It uses Triple DES cipher for the encryption.
    
@@ -1431,7 +1431,7 @@ suitable for writing to a file. It uses Triple DES cipher for the encryption.
    
 
    out_password
    
 
     if in_password
-was NULL, a random password will be generated
+was NULL, a random password will be generated
 and returned in this argument. 
    
 [out][allow-none]
 
@@ -1453,11 +1453,11 @@ certificate/private key file. 
    
 
    
 
    
 
    nm_utils_rsa_key_encrypt_aes ()
    
-
    GByteArray *
-nm_utils_rsa_key_encrypt_aes (const GByteArray *data,
+
    GByteArray *
+nm_utils_rsa_key_encrypt_aes (const GByteArray *data,
                               const char *in_password,
                               char **out_password,
-                              GError **error);
    
+                              GError **error);
    
 
    Encrypts the given RSA private key data with the given password (or generates
 a password if no password was given) and converts the data to PEM format
 suitable for writing to a file.  It uses AES cipher for the encryption.
    
@@ -1483,7 +1483,7 @@ suitable for writing to a file.  It uses AES cipher for the encryption.
    
 
 
    out_password
    
 
     if in_password
-was NULL, a random password will be generated
+was NULL, a random password will be generated
 and returned in this argument. 
    
 [out][allow-none]
 
@@ -1505,7 +1505,7 @@ certificate/private key file. 
    
 
    
 
    
 
    nm_utils_file_is_pkcs12 ()
    
-
    gboolean
+
    gboolean
 nm_utils_file_is_pkcs12 (const char *filename);
    
 
    Utility function to find out if the filename
  is in PKCS#12 format.
    
@@ -1526,15 +1526,15 @@ nm_utils_file_is_pkcs12 (const ch
 
    
 
    
 
    Returns
    
-
     TRUE if the file is PKCS#12, FALSE if it is not
    
+
     TRUE if the file is PKCS#12, FALSE if it is not
    
 
    
 
    
 
    
 
    
 
    NMUtilsFileSearchInPathsPredicate ()
    
-
    gboolean
+
    gboolean
 (*NMUtilsFileSearchInPathsPredicate) (const char *filename,
-                                      gpointer user_data);
    
+                                      gpointer user_data);
    
 
    
 
    
 
    
@@ -1543,10 +1543,10 @@ nm_utils_file_is_pkcs12 (const ch
 nm_utils_file_search_in_paths (const char *progname,
                                const char *try_first,
                                const char *const *paths,
-                               GFileTest file_test_flags,
+                               GFileTest file_test_flags,
                                NMUtilsFileSearchInPathsPredicate predicate,
-                               gpointer user_data,
-                               GError **error);
+                               gpointer user_data,
+                               GError **error);
 
    Searches for a progname
  file in a list of search paths
 .
    
@@ -1573,16 +1573,16 @@ It is silently ignored if it is empty or not an absolute path. 
    
 
 
 
    paths
    
-
     a NULL terminated list of search paths.
-Can be empty or NULL, in which case only try_first
+
     a NULL terminated list of search paths.
+Can be empty or NULL, in which case only try_first
 is checked. 
    
 [allow-none]
 
 
 
    file_test_flags
    
-
    the flags passed to g_file_test() when searching
+
    the flags passed to g_file_test() when searching
 for progname
-. Set it to 0 to skip the g_file_test().
    
+. Set it to 0 to skip the g_file_test().
    
  
 
 
@@ -1603,7 +1603,7 @@ function. 
    
 
 
 
    error
    
-
     on failure, set a "not found" error G_IO_ERROR G_IO_ERROR_NOT_FOUND. 
    
+
     on failure, set a "not found" error G_IO_ERROR G_IO_ERROR_NOT_FOUND. 
    
 [allow-none]
 
 
@@ -1611,7 +1611,7 @@ function. 
    
 
    
 
    
 
    Returns
    
-
     the full path to the helper, if found, or NULL if not found.
+
     the full path to the helper, if found, or NULL if not found.
 The returned string is not owned by the caller, but later
 invocations of the function might overwrite it. 
    
 
    [transfer none]
    
@@ -1620,8 +1620,8 @@ invocations of the function might overwrite it. 
    
 
    
 
    
 
    nm_utils_wifi_freq_to_channel ()
    
-
    guint32
-nm_utils_wifi_freq_to_channel (guint32 freq);
    
+
    guint32
+nm_utils_wifi_freq_to_channel (guint32 freq);
    
 
    Utility function to translate a Wi-Fi frequency to its corresponding channel.
    
 
    
 
    Parameters
    
@@ -1646,8 +1646,8 @@ nm_utils_wifi_freq_to_channel (
 
    nm_utils_wifi_channel_to_freq ()
    
-
    guint32
-nm_utils_wifi_channel_to_freq (guint32 channel,
+
    guint32
+nm_utils_wifi_channel_to_freq (guint32 channel,
                                const char *band);
    
 
    Utility function to translate a Wi-Fi channel to its corresponding frequency.
    
 
    
@@ -1682,8 +1682,8 @@ is invalid
    
 
    
 
    
 
    nm_utils_wifi_find_next_channel ()
    
-
    guint32
-nm_utils_wifi_find_next_channel (guint32 channel,
+
    guint32
+nm_utils_wifi_find_next_channel (guint32 channel,
                                  int direction,
                                  char *band);
    
 
    Utility function to find out next/previous Wi-Fi channel for a channel.
    
@@ -1722,8 +1722,8 @@ nm_utils_wifi_find_next_channel (
 
    nm_utils_wifi_is_channel_valid ()
    
-
    gboolean
-nm_utils_wifi_is_channel_valid (guint32 channel,
+
    gboolean
+nm_utils_wifi_is_channel_valid (guint32 channel,
                                 const char *band);
    
 
    Utility function to verify Wi-Fi channel validity.
    
 
    
@@ -1750,7 +1750,7 @@ nm_utils_wifi_is_channel_valid (
 
    Returns
    
-
     TRUE or FALSE
    
+
     TRUE or FALSE
    
 
    
 
    
 
    
@@ -1823,7 +1823,7 @@ a length; but you can just use 
 
    nm_utils_hwaddr_ntoa ()
    
 
    char *
-nm_utils_hwaddr_ntoa (gconstpointer addr,
+nm_utils_hwaddr_ntoa (gconstpointer addr,
                       int type);
    
 
    Converts addr
  to textual form.
    
@@ -1862,12 +1862,12 @@ a type.
    
 
    
 
    
 
    nm_utils_hwaddr_atoba ()
    
-
    GByteArray *
+
    GByteArray *
 nm_utils_hwaddr_atoba (const char *asc,
                        int type);
    
 
    Parses asc
- and converts it to binary form in a GByteArray. See
-nm_utils_hwaddr_aton() if you don't want a GByteArray.
    
+ and converts it to binary form in a GByteArray. See
+nm_utils_hwaddr_aton() if you don't want a GByteArray.
    
 
    
 
    Parameters
    
 
    
@@ -1893,7 +1893,7 @@ nm_utils_hwaddr_atoba (const char
 
 
    
 
    Returns
    
-
     a new GByteArray, or NULL if asc
+
     a new GByteArray, or NULL if asc
 couldn't
 be parsed. 
    
 
    [transfer full]
    
@@ -1902,15 +1902,15 @@ be parsed. 
    
 
    
 
    
 
    nm_utils_hwaddr_aton ()
    
-
    guint8 *
+
    guint8 *
 nm_utils_hwaddr_aton (const char *asc,
                       int type,
-                      gpointer buffer);
    
+                      gpointer buffer);
    
 
    Parses asc
  and converts it to binary form in buffer
 . See
 nm_utils_hwaddr_atoba() if you'd rather have the result in a
-GByteArray.
    
+GByteArray.
    
 
    See also nm_utils_hwaddr_aton_len(), which takes an output length
 instead of a type.
    
 
    
@@ -1944,7 +1944,7 @@ instead of a type.
    
 
    
 
    Returns
    
 
     buffer
-, or NULL if asc
+, or NULL if asc
 couldn't be parsed
    
 
    
 
    
@@ -1952,8 +1952,8 @@ couldn't be parsed
    
 
    
 
    nm_utils_hwaddr_ntoa_len ()
    
 
    char *
-nm_utils_hwaddr_ntoa_len (gconstpointer addr,
-                          gsize length);
    
+nm_utils_hwaddr_ntoa_len (gconstpointer addr,
+                          gsize length);
 
    Converts addr
  to textual form.
    
 
    
@@ -1990,10 +1990,10 @@ nm_utils_hwaddr_ntoa_len (
 
    nm_utils_hwaddr_aton_len ()
    
-
    guint8 *
+
    guint8 *
 nm_utils_hwaddr_aton_len (const char *asc,
-                          gpointer buffer,
-                          gsize length);
    
+                          gpointer buffer,
+                          gsize length);
    
 
    Parses asc
  and converts it to binary form in buffer
 .
@@ -2030,7 +2030,7 @@ the size of the buffer in bytes.
    
 
    
 
    Returns
    
 
     buffer
-, or NULL if asc
+, or NULL if asc
 couldn't be parsed
 or would be shorter or longer than length
 .
    
@@ -2040,7 +2040,7 @@ or would be shorter or longer than length
 
    
 
    nm_utils_hwaddr_valid ()
    
-
    gboolean
+
    gboolean
 nm_utils_hwaddr_valid (const char *asc);
    
 
    Parses asc
  to see if it is a valid hardware address of some type.
    
@@ -2061,9 +2061,9 @@ nm_utils_hwaddr_valid (const char
 
    
 
    
 
    Returns
    
-
     TRUE if asc
+
     TRUE if asc
 appears to be a valid hardware address
-of some type, FALSE if not.
    
+of some type, FALSE if not.
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -2178,7 +2178,7 @@ string (it has to be even)
    
 
    
 
    
 
    Returns
    
-
     a array of bytes, or NULL on error. 
    
+
     a array of bytes, or NULL on error. 
    
 
    [transfer full]
    
 
    
 
    Since: 0.9.10
    
@@ -2186,7 +2186,7 @@ string (it has to be even)
    
 
    
 
    
 
    nm_utils_iface_valid_name ()
    
-
    gboolean
+
    gboolean
 nm_utils_iface_valid_name (const char *name);
    
 
    This function is a 1:1 copy of the kernel's interface validation
 function in net/core/dev.c.
    
@@ -2207,14 +2207,14 @@ function in net/core/dev.c.
    
 
    
 
    
 
    Returns
    
-
     TRUE if interface name is valid, otherwise FALSE is returned.
    
+
     TRUE if interface name is valid, otherwise FALSE is returned.
    
 
    
 
    Since: 0.9.8
    
 
    
 
    
 
    
 
    nm_utils_is_uuid ()
    
-
    gboolean
+
    gboolean
 nm_utils_is_uuid (const char *str);
    
 
    Checks if str
  is a UUID
    
@@ -2235,8 +2235,8 @@ nm_utils_is_uuid (const char
 
    
 
    Returns
    
-
     TRUE if str
-is a UUID, FALSE if not
    
+
     TRUE if str
+is a UUID, FALSE if not
    
 
    
 
    Since: 0.9.8
    
 
    
@@ -2266,7 +2266,7 @@ nm_utils_inet4_ntop (in_addr_t
    dst
    
 
    Returns
    
 
     the input buffer dst
 , or a pointer to an
-internal, static buffer. NULL is not allowed as in6addr
+internal, static buffer. NULL is not allowed as in6addr
 ,
 otherwise, this function cannot fail.
    
 
@@ -2339,10 +2339,10 @@ otherwise, this function cannot fail.
    
 
    
 
    
 
    nm_utils_check_virtual_device_compatibility ()
    
-
    gboolean
+
    gboolean
 nm_utils_check_virtual_device_compatibility
-                               (GType virtual_type,
-                                GType other_type);
    
+                               (GType virtual_type,
+                                GType other_type);
    
 
    Determines if a connection of type virtual_type
  can (in the
 general case) work with connections of type other_type
@@ -2356,7 +2356,7 @@ general case) work with connections of type other_ty
 then this checks if other_type
  is a valid type for a slave of that
 master.
    
-
    Note that even if this returns TRUE it is not guaranteed that
+
    Note that even if this returns TRUE it is not guaranteed that
 every connection of type other_type
  is
 compatible with virtual_type
@@ -2388,7 +2388,7 @@ underlying device driver.
    
 
    
 
    
 
    Returns
    
-
     TRUE or FALSE
    
+
     TRUE or FALSE
    
 
    
 
    Since: 0.9.10
    
 
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index 42cb9b18..e62953e6 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -23,7 +23,7 @@
 
    
 Object Hierarchy
    
 
    -    GObject
+    GObject
     ├── NMSetting
     │   ├── NMSetting8021x
     │   ├── NMSettingAdsl
@@ -52,7 +52,7 @@
     │   ├── NMSettingWirelessSecurity
     │   ╰── NMSettingVPN
     ╰── NMConnection
-    GEnum
+    GEnum
     ├── NMConnectionError
     ├── NMSetting8021xCKFormat
     ├── NMSetting8021xCKScheme
@@ -95,7 +95,7 @@
     ├── NMVlanFlags
     ├── NMVlanPriorityMap
     ╰── NMWepKeyType
-    GBoxed
+    GBoxed
     ├── NMIP4Address
     ├── NMIP4Route
     ├── NMIP6Address
diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml
index 9ec760eb..6cc56e99 100644
--- a/docs/libnm-util/libnm-util-docs.sgml
+++ b/docs/libnm-util/libnm-util-docs.sgml
@@ -16,6 +16,11 @@
 
     
       2012
+      2013
+      2014
+      2015
+      2016
+      2017
       The NetworkManager Authors
     
 
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index fdd3be6d..27f9cd32 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.6.2
+1.8.0
diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in
index 4ca7d570..4a105a44 100644
--- a/docs/libnm/Makefile.in
+++ b/docs/libnm/Makefile.in
@@ -183,6 +183,8 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ELOGIND_INHIBIT_CFLAGS = @ELOGIND_INHIBIT_CFLAGS@
+ELOGIND_INHIBIT_LIBS = @ELOGIND_INHIBIT_LIBS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GENHTML = @GENHTML@
@@ -204,8 +206,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -239,22 +239,25 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_LIBS = @LIBCURL_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
-LIBM = @LIBM@
 LIBNDP_CFLAGS = @LIBNDP_CFLAGS@
 LIBNDP_LIBS = @LIBNDP_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPSL_CFLAGS = @LIBPSL_CFLAGS@
+LIBPSL_LIBS = @LIBPSL_LIBS@
 LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
 LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@
 LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@
 LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@
 LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
+LIBUDEV_LIBS = @LIBUDEV_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOG_DRIVER = @LOG_DRIVER@
diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html
index 1937bd13..3152772c 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -68,7 +68,7 @@
 
    
+gchar *
 
@@ -161,23 +161,23 @@
 
-
+
+gchar *
 
-
+
-
+
@@ -193,12 +193,12 @@
 
 
+GBytes *
 
-
+
@@ -271,7 +271,7 @@
 
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMAccessPoint
 
    
@@ -280,7 +280,7 @@
 
    Implemented Interfaces
    
 
    
 NMAccessPoint implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -368,7 +368,7 @@ point.
    
 
    
 
    
 
    nm_access_point_get_ssid ()
    
-
    GBytes *
+
    GBytes *
 nm_access_point_get_ssid (NMAccessPoint *ap);
    
 
    Gets the SSID of the access point.
    
 
    
@@ -388,7 +388,7 @@ nm_access_point_get_ssid (
 
    Returns
    
-
     the GBytes containing the SSID, or NULL if the
+
     the GBytes containing the SSID, or NULL if the
 SSID is unknown. 
    
 
    [transfer none]
    
 
    
@@ -423,7 +423,7 @@ not be modified or freed.
    
 
    
 
    
 
    nm_access_point_get_frequency ()
    
-
    guint32
+
    guint32
 nm_access_point_get_frequency (NMAccessPoint *ap);
    
 
    Gets the frequency of the access point.
    
 
    
@@ -475,7 +475,7 @@ nm_access_point_get_mode (
 
    nm_access_point_get_max_bitrate ()
    
-
    guint32
+
    guint32
 nm_access_point_get_max_bitrate (NMAccessPoint *ap);
    
 
    Gets the maximum bit rate of the access point in kbit/s.
    
 
    
@@ -501,7 +501,7 @@ nm_access_point_get_max_bitrate (
 
    
 
    nm_access_point_get_strength ()
    
-
    guint8
+
    guint8
 nm_access_point_get_strength (NMAccessPoint *ap);
    
 
    Gets the current signal strength of the access point.
    
 
    
@@ -527,7 +527,7 @@ nm_access_point_get_strength (
 
    nm_access_point_get_last_seen ()
    
-
    gint
+
    gint
 nm_access_point_get_last_seen (NMAccessPoint *ap);
    
 
    Returns the timestamp (in CLOCK_BOOTTIME seconds) for the last time the
 access point was found in scan results.  A value of -1 means the access
@@ -556,9 +556,9 @@ point has not been found in a scan.
    
 
    
 
    
 
    nm_access_point_filter_connections ()
    
-
    GPtrArray *
+
    GPtrArray *
 nm_access_point_filter_connections (NMAccessPoint *ap,
-                                    const GPtrArray *connections);
    
+                                    const GPtrArray *connections);
    
 
    Filters a given array of connections for a given NMAccessPoint object and
 returns connections which may be activated with the access point.  Any
 returned connections will match the ap
@@ -584,7 +584,7 @@ with this function.
    
 
 
    
-
@@ -594,16 +594,16 @@ filter. 
    
 
    
 
    Returns
    
 
     an array of
-NMConnections that could be activated with the given ap
+NMConnections that could be activated with the given ap
 .  The array should
-be freed with g_ptr_array_unref() when it is no longer required. 
    
+be freed with g_ptr_array_unref() when it is no longer required. 
    
 
    [transfer container][element-type NMConnection]
    
 
    
 
 
    
 
    
 
    nm_access_point_connection_valid ()
    
-
    gboolean
+
    gboolean
 nm_access_point_connection_valid (NMAccessPoint *ap,
                                   NMConnection *connection);
    
 
    Validates a given connection against a given Wi-Fi access point to ensure that
@@ -637,8 +637,8 @@ against
    
 
    
 
    
 
    Returns
    
-
     TRUE if the connection may be activated with this Wi-Fi AP,
-FALSE if it cannot be.
    
+
     TRUE if the connection may be activated with this Wi-Fi AP,
+FALSE if it cannot be.
    
 
    
 
 
@@ -719,7 +719,7 @@ against
    
 
    Property Details
    
 
    
 
    The “bssid” property
    
-
      “bssid”                    gchar *
    
+
      “bssid”                    gchar *
    
 
    The BSSID of the access point.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -734,7 +734,7 @@ against
    
 
    
 
    
 
    The “frequency” property
    
-
      “frequency”                guint
    
+
      “frequency”                guint
    
 
    The frequency of the access point.
    
 
    Flags: Read
    
 
    Allowed values: <= 10000
    
@@ -743,7 +743,7 @@ against
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    Alias for “bssid”.
    
 
    
 
    NMAccessPoint:hw-address has been deprecated since version 1.0 and should not be used in newly-written code.
    
@@ -755,7 +755,7 @@ against
    
 
    
 
    
 
    The “last-seen” property
    
-
      “last-seen”                gint
    
+
      “last-seen”                gint
    
 
    The timestamp (in CLOCK_BOOTTIME seconds) for the last time the
 access point was found in scan results.  A value of -1 means the
 access point has not been found in a scan.
    
@@ -767,7 +767,7 @@ access point has not been found in a scan.
    
 
    
 
    
 
    The “max-bitrate” property
    
-
      “max-bitrate”              guint
    
+
      “max-bitrate”              guint
    
 
    The maximum bit rate of the access point in kbit/s.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -792,14 +792,14 @@ coordinator of the wireless network allowing clients to connect) or
 
    
 
    
 
    The “ssid” property
    
-
      “ssid”                     GBytes *
    
-
    The SSID of the access point, or NULL if it is not known.
    
+
      “ssid”                     GBytes *
    
+
    The SSID of the access point, or NULL if it is not known.
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “strength” property
    
-
      “strength”                 guchar
    
+
      “strength”                 guchar
    
 
    The current signal strength of the access point.
    
 
    Flags: Read
    
 
    Default value: 0
    
diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index 2b6b4153..8bc4c66f 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -18,7 +18,8 @@
                   Description  | 
                   Object Hierarchy  | 
                   Implemented Interfaces  | 
-                  Properties
+                  Properties  | 
+                  Signals
 
 
    
@@ -79,7 +80,7 @@
 
 
-
+
+
+
+
-
+
-
+
+GPtrArray *
 
@@ -205,7 +214,7 @@
 
 
+gchar *
 
@@ -229,7 +238,7 @@
 
 
+gchar *
 
@@ -240,18 +249,18 @@
 
 
+gchar *
 
+gchar *
 
-
+
@@ -259,6 +268,21 @@
 
    the destination buffer, it must contain at least
 INET_ADDRSTRLEN or NM_UTILS_INET_ADDRSTRLEN
-characters. If set to NULL, it will return a pointer to an internal, static
+characters. If set to NULL, it will return a pointer to an internal, static
 buffer (shared with nm_utils_inet6_ntop()).  Beware, that the internal
 buffer will be overwritten with ever new call of nm_utils_inet4_ntop() or
 nm_utils_inet6_ntop() that does not provied it's own dst
@@ -2313,7 +2313,7 @@ nm_utils_inet6_ntop (const struct
 
    dst
    		
 
    the destination buffer, it must contain at least
 INET6_ADDRSTRLEN or NM_UTILS_INET_ADDRSTRLEN
-characters. If set to NULL, it will return a pointer to an internal, static
+characters. If set to NULL, it will return a pointer to an internal, static
 buffer (shared with nm_utils_inet4_ntop()).  Beware, that the internal
 buffer will be overwritten with ever new call of nm_utils_inet4_ntop() or
 nm_utils_inet6_ntop() that does not provied it's own dst
@@ -2330,7 +2330,7 @@ buffer to avoid these issues.
    		
 
    
 
    
 
-GBytes *
+GBytes *
 
 
 nm_access_point_get_ssid ()
@@ -83,7 +83,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_access_point_get_frequency ()
@@ -99,7 +99,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_access_point_get_max_bitrate ()
@@ -107,7 +107,7 @@
 
    
 
    
 
-guint8
+guint8
 
 
 nm_access_point_get_strength ()
@@ -115,7 +115,7 @@
 
    
 
    
 
-gint
+gint
 
 
 nm_access_point_get_last_seen ()
@@ -123,7 +123,7 @@
 
    
 
    
 
-GPtrArray *
+GPtrArray *
 
 
 nm_access_point_filter_connections ()
@@ -131,7 +131,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_access_point_connection_valid ()
@@ -151,7 +151,7 @@
 
    
 
    
 
-gchar *bssid
 Read
 
    Read
 
    
 
    guintguint
 frequency
 Read
 
    
 
    
 
-gchar *hw-address
 Read
 
    
 
    gintgint
 last-seen
 Read
 
    
 
    guintguint
 max-bitrate
 Read
 
    
 
-GBytes *ssid
 Read
 
    
 
    gucharguchar
 strength
 Read
 
    
 
    connections
     an array of NMConnections to
+
     an array of NMConnections to
 filter. 
    		
 [element-type NMConnection]
 
    Home
 Up
    
 
    const GPtrArray *
+const GPtrArray *
 
 
 nm_active_connection_get_devices ()
@@ -95,6 +96,14 @@
 
    
 
    
 
+NMActiveConnectionStateReason
+
+nm_active_connection_get_state_reason ()
+
    
 NMDevice *
 
 
@@ -103,7 +112,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_active_connection_get_default ()
@@ -127,7 +136,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_active_connection_get_default6 ()
@@ -151,7 +160,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_active_connection_get_vpn ()
@@ -176,18 +185,18 @@
 Read
 
    
 
    gbooleangboolean
 default
 Read
 
    
 
    gbooleangboolean
 default6
 Read
 
    
 
    
 
-GPtrArray *devices
 Read
 
    
 
-gchar *id
 Read
 
    
 
-gchar *specific-object-path
 Read
 
    
 
-gchar *type
 Read
 
    
 
    
 
-gchar *uuid
 Read
 
    
 
    gbooleangboolean
 vpn
 Read
 
    
 
    
 
    
+
    Signals
    
+
    
+++++
+
+
+
+
+
+
    




    voidstate-changedRun First
    
+
    
+
    
 
    Types and Values
    
 
    @@ -335,7 +359,7 @@
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMActiveConnection
             ╰── NMVpnConnection
@@ -345,7 +369,7 @@
 
    Implemented Interfaces
    
 
    
 NMActiveConnection implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    Description
    
@@ -499,7 +523,7 @@ by the connection, and must not be modified.
    
 
    
 
    
 
    nm_active_connection_get_devices ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_active_connection_get_devices (NMActiveConnection *connection);
    
 
    Gets the NMDevices used for the active connections.
    
 
    
@@ -519,7 +543,7 @@ nm_active_connection_get_devices (
 
    
 
    Returns
    
-
     the GPtrArray containing NMDevices.
+
     the GPtrArray containing NMDevices.
 This is the internal copy used by the connection, and must not be modified. 
    
 
    [element-type NMDevice]
    
 
    
@@ -552,6 +576,33 @@ nm_active_connection_get_state (
 
    
 
    
+
    nm_active_connection_get_state_reason ()
    
+
    NMActiveConnectionStateReason
+nm_active_connection_get_state_reason (NMActiveConnection *connection);
    
+
    Gets the reason for active connection's state.
    
+
    
+
    Parameters
    
+
    
 

 
 
    
+++++
+
+
+
+
+
+
    




    connection
    a NMActiveConnection
    		 
    
+
    
+
    
+
    Returns
    
+
     the reason
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    nm_active_connection_get_master ()
    
 
    NMDevice *
 nm_active_connection_get_master (NMActiveConnection *connection);
    
@@ -580,7 +631,7 @@ nm_active_connection_get_master (
 
    
 
    nm_active_connection_get_default ()
    
-
    gboolean
+
    gboolean
 nm_active_connection_get_default (NMActiveConnection *connection);
    
 
    Whether the active connection is the default IPv4 one (that is, is used for
 the default IPv4 route and DNS information).
    
@@ -601,7 +652,7 @@ the default IPv4 route and DNS information).
    
 
    
 
    
 
    Returns
    
-
     TRUE if the active connection is the default IPv4 connection
    
+
     TRUE if the active connection is the default IPv4 connection
    
 
    
 
    
 
    
@@ -627,7 +678,7 @@ nm_active_connection_get_ip4_config (
 
    
 
    Returns
    
-
     the IPv4 NMIPConfig, or NULL if the connection is
+
     the IPv4 NMIPConfig, or NULL if the connection is
 not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 
    
 
    [transfer none]
    
 
    
@@ -656,7 +707,7 @@ nm_active_connection_get_dhcp4_config (
 
    Returns
    
-
     the IPv4 NMDhcpConfig, or NULL if the connection
+
     the IPv4 NMDhcpConfig, or NULL if the connection
 does not use DHCP, or is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 
    
 
    [transfer none]
    
@@ -665,7 +716,7 @@ state. 
    
 
    
 
    
 
    nm_active_connection_get_default6 ()
    
-
    gboolean
+
    gboolean
 nm_active_connection_get_default6 (NMActiveConnection *connection);
    
 
    Whether the active connection is the default IPv6 one (that is, is used for
 the default IPv6 route and DNS information).
    
@@ -686,7 +737,7 @@ the default IPv6 route and DNS information).
    
 
    
 
    
 
    Returns
    
-
     TRUE if the active connection is the default IPv6 connection
    
+
     TRUE if the active connection is the default IPv6 connection
    
 
    
 
    
 
    
@@ -712,7 +763,7 @@ nm_active_connection_get_ip6_config (
 
    
 
    Returns
    
-
     the IPv6 NMIPConfig, or NULL if the connection is
+
     the IPv6 NMIPConfig, or NULL if the connection is
 not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 
    
 
    [transfer none]
    
 
    
@@ -741,7 +792,7 @@ nm_active_connection_get_dhcp6_config (
 
    Returns
    
-
     the IPv6 NMDhcpConfig, or NULL if the connection
+
     the IPv6 NMDhcpConfig, or NULL if the connection
 does not use DHCPv6, or is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 
    
 
    [transfer none]
    
@@ -750,7 +801,7 @@ state. 
    
 
    
 
    
 
    nm_active_connection_get_vpn ()
    
-
    gboolean
+
    gboolean
 nm_active_connection_get_vpn (NMActiveConnection *connection);
    
 
    Whether the active connection is a VPN connection.
    
 
    
@@ -770,7 +821,7 @@ nm_active_connection_get_vpn (
 
    Returns
    
-
     TRUE if the active connection is a VPN connection
    
+
     TRUE if the active connection is a VPN connection
    
 
    
 
    
 
    
@@ -882,7 +933,7 @@ nm_active_connection_get_vpn (
 
    The “default” property
    
-
      “default”                  gboolean
    
+
      “default”                  gboolean
    
 
    Whether the active connection is the default IPv4 one.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -890,7 +941,7 @@ nm_active_connection_get_vpn (
 
    The “default6” property
    
-
      “default6”                 gboolean
    
+
      “default6”                 gboolean
    
 
    Whether the active connection is the default IPv6 one.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -898,7 +949,7 @@ nm_active_connection_get_vpn (
 
    The “devices” property
    
-
      “devices”                  GPtrArray *
    
+
      “devices”                  GPtrArray *
    
 
    The devices of the active connection.
    
 
    Element-type: NMDevice
    
 
    Flags: Read
    
@@ -920,7 +971,7 @@ nm_active_connection_get_vpn (
 
    The “id” property
    
-
      “id”                       gchar *
    
+
      “id”                       gchar *
    
 
    The active connection's ID
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -949,7 +1000,7 @@ nm_active_connection_get_vpn (
 
    The “specific-object-path” property
    
-
      “specific-object-path”     gchar *
    
+
      “specific-object-path”     gchar *
    
 
    The path to the "specific object" of the active connection; see
 nm_active_connection_get_specific_object_path() for more details.
    
 
    Flags: Read
    
@@ -966,7 +1017,7 @@ nm_active_connection_get_vpn (
 
    The “type” property
    
-
      “type”                     gchar *
    
+
      “type”                     gchar *
    
 
    The active connection's type
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -974,7 +1025,7 @@ nm_active_connection_get_vpn (
 
    The “uuid” property
    
-
      “uuid”                     gchar *
    
+
      “uuid”                     gchar *
    
 
    The active connection's UUID
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -982,12 +1033,24 @@ nm_active_connection_get_vpn (
 
    The “vpn” property
    
-
      “vpn”                      gboolean
    
+
      “vpn”                      gboolean
    
 
    Whether the active connection is a VPN connection.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
 
    
 
    
+
    
+
    Signal Details
    
+
    
+
    The “state-changed” signal
    
+
    void
+user_function (NMActiveConnection *nmactiveconnection,
+               guint               arg1,
+               guint               arg2,
+               gpointer            user_data)
    
+
    Flags: Run First
    
+
    
+
    
 
    
 
    
 
    Generated by GTK-Doc V1.25
    
diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index 52988eb4..5d8b8de6 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -45,7 +45,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_client_error_quark ()
@@ -90,7 +90,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_dns_entry_get_vpn ()
@@ -137,7 +137,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_get_startup ()
@@ -145,7 +145,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_get_nm_running ()
@@ -153,7 +153,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_networking_get_enabled ()
@@ -161,7 +161,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_networking_set_enabled ()
@@ -169,7 +169,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_wireless_get_enabled ()
@@ -185,7 +185,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_wireless_hardware_get_enabled ()
@@ -193,7 +193,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_wwan_get_enabled ()
@@ -209,7 +209,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_wwan_hardware_get_enabled ()
@@ -217,7 +217,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_wimax_get_enabled ()
@@ -233,7 +233,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_wimax_hardware_get_enabled ()
@@ -241,7 +241,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_get_logging ()
@@ -249,7 +249,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_set_logging ()
@@ -297,7 +297,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_save_hostname ()
@@ -313,21 +313,21 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_save_hostname_finish ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_devices ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_all_devices ()
@@ -350,7 +350,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_active_connections ()
@@ -406,7 +406,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_deactivate_connection ()
@@ -422,14 +422,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_deactivate_connection_finish ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_connections ()
@@ -477,7 +477,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_load_connections ()
@@ -493,7 +493,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_load_connections_finish ()
@@ -501,7 +501,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_reload_connections ()
@@ -517,7 +517,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_client_reload_connections_finish ()
@@ -538,7 +538,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_dns_configuration ()
@@ -564,24 +564,24 @@
 
 
 
-GPtrArray *
+GPtrArray *
 active-connections
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 all-devices
 Read
 
 
-gboolean
+gboolean
 can-modify
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 connections
 Read
 
@@ -592,46 +592,46 @@
 
 
 
-GPtrArray *
+GPtrArray *
 devices
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 dns-configuration
 Read
 
 
 
-gchar *
+gchar *
 dns-mode
 Read
 
 
 
-gchar *
+gchar *
 dns-rc-manager
 Read
 
 
 
-gchar *
+gchar *
 hostname
 Read
 
 
-guint
+guint
 metered
 Read
 
 
-gboolean
+gboolean
 networking-enabled
 Read / Write
 
 
-gboolean
+gboolean
 nm-running
 Read
 
@@ -642,7 +642,7 @@
 Read
 
 
-gboolean
+gboolean
 startup
 Read
 
@@ -653,37 +653,37 @@
 
 
 
-gchar *
+gchar *
 version
 Read
 
 
-gboolean
+gboolean
 wimax-enabled
 Read / Write
 
 
-gboolean
+gboolean
 wimax-hardware-enabled
 Read
 
 
-gboolean
+gboolean
 wireless-enabled
 Read / Write
 
 
-gboolean
+gboolean
 wireless-hardware-enabled
 Read
 
 
-gboolean
+gboolean
 wwan-enabled
 Read / Write
 
 
-gboolean
+gboolean
 wwan-hardware-enabled
 Read
 
@@ -702,47 +702,47 @@
 
 void
 active-connection-added
-Run First
+Run First
 
 
 void
 active-connection-removed
-Run First
+Run First
 
 
 void
 any-device-added
-Run First
+Run First
 
 
 void
 any-device-removed
-Run First
+Run First
 
 
 void
 connection-added
-Run First
+Run First
 
 
 void
 connection-removed
-Run First
+Run First
 
 
 void
 device-added
-Run First
+Run First
 
 
 void
 device-removed
-Run First
+Run First
 
 
 void
 permission-changed
-Run First
+Run First
 
 
 
    
@@ -912,13 +912,13 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GBoxed
+
        GBoxed
     ╰── NMDnsEntry
-    GEnum
+    GEnum
     ├── NMClientError
     ├── NMClientPermission
     ╰── NMClientPermissionResult
-    GObject
+    GObject
     ╰── NMClient
 
    
 
    
@@ -926,7 +926,7 @@
 
    Implemented Interfaces
    
 
    
 NMClient implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
 
    
 
    Description
    
@@ -935,7 +935,7 @@ NMClient implements
 
    Functions
    
 
    
 
    nm_client_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_client_error_quark (void);
    
 
    Registers an error quark for NMClient if necessary.
    
 
    
@@ -1081,7 +1081,7 @@ nm_dns_entry_get_priority (
 
    nm_dns_entry_get_vpn ()
    
-
    gboolean
+
    gboolean
 nm_dns_entry_get_vpn (NMDnsEntry *entry);
    
 
    Gets whether the entry refers to VPN name servers.
    
 
    
@@ -1101,7 +1101,7 @@ nm_dns_entry_get_vpn (
 
    Returns
    
-
     TRUE if the entry refers to VPN name servers
    
+
     TRUE if the entry refers to VPN name servers
    
 
    
 
    Since: 1.6
    
 
    
@@ -1109,8 +1109,8 @@ nm_dns_entry_get_vpn (
 
    nm_client_new ()
    
 
    NMClient *
-nm_client_new (GCancellable *cancellable,
-               GError **error);
    
+nm_client_new (GCancellable *cancellable,
+               GError **error);
    
 
    Creates a new NMClient.
    
 
    Note that this will do blocking D-Bus calls to initialize the
 client. You can use nm_client_new_async() if you want to avoid
@@ -1126,12 +1126,12 @@ that.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -1146,9 +1146,9 @@ that.
    
 
    
 
    nm_client_new_async ()
    
 
    void
-nm_client_new_async (GCancellable *cancellable,
-                     GAsyncReadyCallback callback,
-                     gpointer user_data);
    
+nm_client_new_async (GCancellable *cancellable,
+                     GAsyncReadyCallback callback,
+                     gpointer user_data);
 
    Creates a new NMClient and begins asynchronously initializing it.
 callback
  will be called when it is done; use
@@ -1165,7 +1165,7 @@ the callback can be invoked with two first parameters as NULL.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
@@ -1187,8 +1187,8 @@ the callback can be invoked with two first parameters as NULL.
    
 
    
 
    nm_client_new_finish ()
    
 
    NMClient *
-nm_client_new_finish (GAsyncResult *result,
-                      GError **error);
    
+nm_client_new_finish (GAsyncResult *result,
+                      GError **error);
 
    Gets the result of an nm_client_new_async() call.
    
 
    
 
    Parameters
    
@@ -1201,12 +1201,12 @@ nm_client_new_finish (
    result
    
-
    a GAsyncResult
    
+
    a GAsyncResult
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -1214,7 +1214,7 @@ nm_client_new_finish (
 
    Returns
    
-
     a new NMClient, or NULL on error
    
+
     a new NMClient, or NULL on error
    
 
    
 
    
 
    
@@ -1240,7 +1240,7 @@ nm_client_get_version (
 
    Returns
    
-
     string with the version (or NULL if NetworkManager is not running)
    
+
     string with the version (or NULL if NetworkManager is not running)
    
 
    
 
    
 
    
@@ -1272,7 +1272,7 @@ nm_client_get_state (
 
    nm_client_get_startup ()
    
-
    gboolean
+
    gboolean
 nm_client_get_startup (NMClient *client);
    
 
    Tests whether the daemon is still in the process of activating
 connections at startup.
    
@@ -1299,7 +1299,7 @@ connections at startup.
    
 
    
 
    
 
    nm_client_get_nm_running ()
    
-
    gboolean
+
    gboolean
 nm_client_get_nm_running (NMClient *client);
    
 
    Determines whether the daemon is running.
    
 
    
@@ -1319,13 +1319,13 @@ nm_client_get_nm_running (
 
    Returns
    
-
     TRUE if the daemon is running
    
+
     TRUE if the daemon is running
    
 
    
 
    
 
    
 
    
 
    nm_client_networking_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_networking_get_enabled (NMClient *client);
    
 
    Whether networking is enabled or disabled.
    
 
    
@@ -1345,16 +1345,16 @@ nm_client_networking_get_enabled (
 
    
 
    Returns
    
-
     TRUE if networking is enabled, FALSE if networking is disabled
    
+
     TRUE if networking is enabled, FALSE if networking is disabled
    
 
    
 
    
 
    
 
    
 
    nm_client_networking_set_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_networking_set_enabled (NMClient *client,
-                                  gboolean enabled,
-                                  GError **error);
    
+                                  gboolean enabled,
+                                  GError **error);
    
 
    Enables or disables networking.  When networking is disabled, all controlled
 interfaces are disconnected and deactivated.  When networking is enabled,
 all controlled interfaces are available for activation.
    
@@ -1374,12 +1374,12 @@ all controlled interfaces are available for activation.
    
 
 
 
    enabled
    
-
    TRUE to set networking enabled, FALSE to set networking disabled
    
+
    TRUE to set networking enabled, FALSE to set networking disabled
    
  
 
 
 
    error
    
-
     return location for a GError, or NULL. 
    
+
     return location for a GError, or NULL. 
    
 [allow-none]
 
 
@@ -1387,13 +1387,13 @@ all controlled interfaces are available for activation.
    
 
    
 
    
 
    Returns
    
-
     TRUE on success, FALSE otherwise
    
+
     TRUE on success, FALSE otherwise
    
 
    
 
    
 
    
 
    
 
    nm_client_wireless_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_wireless_get_enabled (NMClient *client);
    
 
    Determines whether the wireless is enabled.
    
 
    
@@ -1413,7 +1413,7 @@ nm_client_wireless_get_enabled (
 
    
 
    Returns
    
-
     TRUE if wireless is enabled
    
+
     TRUE if wireless is enabled
    
 
    
 
    
 
    
@@ -1421,7 +1421,7 @@ nm_client_wireless_get_enabled (
    nm_client_wireless_set_enabled ()
    
 
    void
 nm_client_wireless_set_enabled (NMClient *client,
-                                gboolean enabled);
    
+                                gboolean enabled);
    
 
    Enables or disables wireless devices.
    
 
    
 
    Parameters
    
@@ -1439,7 +1439,7 @@ nm_client_wireless_set_enabled (
 
 
    enabled
    
-
    TRUE to enable wireless
    
+
    TRUE to enable wireless
    
  
 
 
@@ -1449,7 +1449,7 @@ nm_client_wireless_set_enabled (
 
    
 
    nm_client_wireless_hardware_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_wireless_hardware_get_enabled
                                (NMClient *client);
    
 
    Determines whether the wireless hardware is enabled.
    
@@ -1470,13 +1470,13 @@ nm_client_wireless_hardware_get_enabled
 
    
 
    
 
    Returns
    
-
     TRUE if the wireless hardware is enabled
    
+
     TRUE if the wireless hardware is enabled
    
 
    
 
    
 
    
 
    
 
    nm_client_wwan_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_wwan_get_enabled (NMClient *client);
    
 
    Determines whether WWAN is enabled.
    
 
    
@@ -1496,7 +1496,7 @@ nm_client_wwan_get_enabled (
 
    Returns
    
-
     TRUE if WWAN is enabled
    
+
     TRUE if WWAN is enabled
    
 
    
 
    
 
    
@@ -1504,7 +1504,7 @@ nm_client_wwan_get_enabled (
    nm_client_wwan_set_enabled ()
    
 
    void
 nm_client_wwan_set_enabled (NMClient *client,
-                            gboolean enabled);
    
+                            gboolean enabled);
    
 
    Enables or disables WWAN devices.
    
 
    
 
    Parameters
    
@@ -1522,7 +1522,7 @@ nm_client_wwan_set_enabled (
    enabled
    
-
    TRUE to enable WWAN
    
+
    TRUE to enable WWAN
    
  
 
 
@@ -1532,7 +1532,7 @@ nm_client_wwan_set_enabled (
 
    nm_client_wwan_hardware_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_wwan_hardware_get_enabled (NMClient *client);
    
 
    Determines whether the WWAN hardware is enabled.
    
 
    
@@ -1552,13 +1552,13 @@ nm_client_wwan_hardware_get_enabled (
 
    
 
    Returns
    
-
     TRUE if the WWAN hardware is enabled
    
+
     TRUE if the WWAN hardware is enabled
    
 
    
 
    
 
    
 
    
 
    nm_client_wimax_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_wimax_get_enabled (NMClient *client);
    
 
    Determines whether WiMAX is enabled.
    
 
    
@@ -1578,7 +1578,7 @@ nm_client_wimax_get_enabled (
 
    Returns
    
-
     TRUE if WiMAX is enabled
    
+
     TRUE if WiMAX is enabled
    
 
    
 
    
 
    
@@ -1586,7 +1586,7 @@ nm_client_wimax_get_enabled (
    nm_client_wimax_set_enabled ()
    
 
    void
 nm_client_wimax_set_enabled (NMClient *client,
-                             gboolean enabled);
    
+                             gboolean enabled);
    
 
    Enables or disables WiMAX devices.
    
 
    
 
    Parameters
    
@@ -1604,7 +1604,7 @@ nm_client_wimax_set_enabled (
    enabled
    
-
    TRUE to enable WiMAX
    
+
    TRUE to enable WiMAX
    
  
 
 
@@ -1614,7 +1614,7 @@ nm_client_wimax_set_enabled (
 
    nm_client_wimax_hardware_get_enabled ()
    
-
    gboolean
+
    gboolean
 nm_client_wimax_hardware_get_enabled (NMClient *client);
    
 
    Determines whether the WiMAX hardware is enabled.
    
 
    
@@ -1634,17 +1634,17 @@ nm_client_wimax_hardware_get_enabled (
 
    Returns
    
-
     TRUE if the WiMAX hardware is enabled
    
+
     TRUE if the WiMAX hardware is enabled
    
 
    
 
    
 
    
 
    
 
    nm_client_get_logging ()
    
-
    gboolean
+
    gboolean
 nm_client_get_logging (NMClient *client,
                        char **level,
                        char **domains,
-                       GError **error);
    
+                       GError **error);
    
 
    Gets NetworkManager current logging level and domains.
    
 
    
 
    Parameters
    
@@ -1673,7 +1673,7 @@ a list of domains separated by ",". 
    
 
 
 
    error
    
-
     return location for a GError, or NULL. 
    
+
     return location for a GError, or NULL. 
    
 [allow-none]
 
 
@@ -1681,17 +1681,17 @@ a list of domains separated by ",". 
    
 
    
 
    
 
    Returns
    
-
     TRUE on success, FALSE otherwise
    
+
     TRUE on success, FALSE otherwise
    
 
    
 
    
 
    
 
    
 
    nm_client_set_logging ()
    
-
    gboolean
+
    gboolean
 nm_client_set_logging (NMClient *client,
                        const char *level,
                        const char *domains,
-                       GError **error);
    
+                       GError **error);
    
 
    Sets NetworkManager logging level and/or domains.
    
 
    
 
    Parameters
    
@@ -1709,18 +1709,18 @@ nm_client_set_logging (
    level
    
-
     logging level to set (NULL or an empty string for no change). 
    
+
     logging level to set (NULL or an empty string for no change). 
    
 [allow-none]
 
 
 
    domains
    
 
     logging domains to set. The string should be a list of log
-domains separated by ",". (NULL or an empty string for no change). 
    
+domains separated by ",". (NULL or an empty string for no change). 
    
 [allow-none]
 
 
 
    error
    
-
     return location for a GError, or NULL. 
    
+
     return location for a GError, or NULL. 
    
 [allow-none]
 
 
@@ -1728,7 +1728,7 @@ domains separated by ",". (
 
    Returns
    
-
     TRUE on success, FALSE otherwise
    
+
     TRUE on success, FALSE otherwise
    
 
    
 
    
 
    
@@ -1800,8 +1800,8 @@ connectivity state first before returning any information.
    
 
    nm_client_check_connectivity ()
    
 
    NMConnectivityState
 nm_client_check_connectivity (NMClient *client,
-                              GCancellable *cancellable,
-                              GError **error);
    
+                              GCancellable *cancellable,
+                              GError **error);
 
    Updates the network connectivity state and returns the (new)
 current state. Contrast nm_client_get_connectivity(), which returns
 the most recent known state without re-checking.
    
@@ -1823,12 +1823,12 @@ if you do not want to block.
    
 
 
 
    cancellable
    
-
    a GCancellable
    
+
    a GCancellable
    
  
 
 
 
    error
    
-
    return location for a GError
    
+
    return location for a GError
    
  
 
 
@@ -1844,9 +1844,9 @@ if you do not want to block.
    
 
    nm_client_check_connectivity_async ()
    
 
    void
 nm_client_check_connectivity_async (NMClient *client,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data);
    
+                                    GCancellable *cancellable,
+                                    GAsyncReadyCallback callback,
+                                    gpointer user_data);
 
    Asynchronously updates the network connectivity state and invokes
 callback
  when complete. Contrast nm_client_get_connectivity(),
@@ -1868,7 +1868,7 @@ re-checking, and 
    cancellable
    
-
    a GCancellable
    
+
    a GCancellable
    
  
 
 
@@ -1891,8 +1891,8 @@ re-checking, and 
    nm_client_check_connectivity_finish ()
    
 
    NMConnectivityState
 nm_client_check_connectivity_finish (NMClient *client,
-                                     GAsyncResult *result,
-                                     GError **error);
    
+                                     GAsyncResult *result,
+                                     GError **error);
 
    Retrieves the result of an nm_client_check_connectivity_async()
 call.
    
 
    
@@ -1911,12 +1911,12 @@ call.
    
 
 
 
    result
    
-
    the GAsyncResult
    
+
    the GAsyncResult
    
  
 
 
 
    error
    
-
    return location for a GError
    
+
    return location for a GError
    
  
 
 
@@ -1930,11 +1930,11 @@ call.
    
 
    
 
    
 
    nm_client_save_hostname ()
    
-
    gboolean
+
    gboolean
 nm_client_save_hostname (NMClient *client,
                          const char *hostname,
-                         GCancellable *cancellable,
-                         GError **error);
    
+                         GCancellable *cancellable,
+                         GError **error);
    
 
    Requests that the machine's persistent hostname be set to the specified value
 or cleared.
    
 
    
@@ -1953,18 +1953,18 @@ or cleared.
    
 
 
 
    hostname
    
-
     the new persistent hostname to set, or NULL to
+
     the new persistent hostname to set, or NULL to
 clear any existing persistent hostname. 
    
 [allow-none]
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
 
    error
    
-
    return location for GError
    
+
    return location for GError
    
  
 
 
@@ -1972,7 +1972,7 @@ clear any existing persistent hostname. 
    
 
    
 
    
 
    Returns
    
-
     TRUE if the request was successful, FALSE if it failed
    
+
     TRUE if the request was successful, FALSE if it failed
    
 
    
 
    
 
    
@@ -1981,9 +1981,9 @@ clear any existing persistent hostname. 
    
 
    void
 nm_client_save_hostname_async (NMClient *client,
                                const char *hostname,
-                               GCancellable *cancellable,
-                               GAsyncReadyCallback callback,
-                               gpointer user_data);
    
+                               GCancellable *cancellable,
+                               GAsyncReadyCallback callback,
+                               gpointer user_data);
 
    Requests that the machine's persistent hostname be set to the specified value
 or cleared.
    
 
    
@@ -2002,13 +2002,13 @@ or cleared.
    
 
 
 
    hostname
    
-
     the new persistent hostname to set, or NULL to
+
     the new persistent hostname to set, or NULL to
 clear any existing persistent hostname. 
    
 [allow-none]
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
@@ -2029,10 +2029,10 @@ clear any existing persistent hostname. 
    
 
    
 
    
 
    nm_client_save_hostname_finish ()
    
-
    gboolean
+
    gboolean
 nm_client_save_hostname_finish (NMClient *client,
-                                GAsyncResult *result,
-                                GError **error);
    
+                                GAsyncResult *result,
+                                GError **error);
    
 
    Gets the result of an nm_client_save_hostname_async() call.
    
 
    
 
    Parameters
    
@@ -2050,12 +2050,12 @@ nm_client_save_hostname_finish (
 
 
    result
    
-
    the result passed to the GAsyncReadyCallback
    
+
    the result passed to the GAsyncReadyCallback
    
  
 
 
 
    error
    
-
    return location for GError
    
+
    return location for GError
    
  
 
 
@@ -2063,13 +2063,13 @@ nm_client_save_hostname_finish (
 
    
 
    Returns
    
-
     TRUE if the request was successful, FALSE if it failed
    
+
     TRUE if the request was successful, FALSE if it failed
    
 
    
 
    
 
    
 
    
 
    nm_client_get_devices ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_client_get_devices (NMClient *client);
    
 
    Gets all the known network devices.  Use nm_device_get_type() or the
 NM_IS_DEVICE_XXXX functions to determine what kind of
@@ -2092,7 +2092,7 @@ methods such as 
 
    Returns
    
-
     a GPtrArray
+
     a GPtrArray
 containing all the NMDevices.  The returned array is owned by the
 NMClient object and should not be modified. 
    
 
    [transfer none][element-type NMDevice]
    
@@ -2101,7 +2101,7 @@ containing all the NM
 
    
 
    
 
    nm_client_get_all_devices ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_client_get_all_devices (NMClient *client);
    
 
    Gets both real devices and device placeholders (eg, software devices which
 do not currently exist, but could be created automatically by NetworkManager
@@ -2128,7 +2128,7 @@ use device-specific methods such as 
 
    Returns
    
-
     a GPtrArray
+
     a GPtrArray
 containing all the NMDevices.  The returned array is owned by the
 NMClient object and should not be modified. 
    
 
    [transfer none][element-type NMDevice]
    
@@ -2167,7 +2167,7 @@ nm_client_get_device_by_path (
 
    Returns
    
 
     the NMDevice for the given object_path
-or NULL if none is found. 
    
+or NULL if none is found. 
    
 
    [transfer none]
    
 
    
 
    
@@ -2203,14 +2203,14 @@ nm_client_get_device_by_iface (
 
    Returns
    
 
     the NMDevice for the given iface
-or NULL if none is found. 
    
+or NULL if none is found. 
    
 
    [transfer none]
    
 
    
 
    
 
    
 
    
 
    nm_client_get_active_connections ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_client_get_active_connections (NMClient *client);
    
 
    Gets the active connections.
    
 
    
@@ -2230,7 +2230,7 @@ nm_client_get_active_connections (
 
    
 
    Returns
    
-
     a GPtrArray
+
     a GPtrArray
 containing all the active NMActiveConnections.
 The returned array is owned by the client and should not be modified. 
    
 
    [transfer none][element-type NMActiveConnection]
    
@@ -2249,7 +2249,7 @@ the default route. If there is a VPN active with the default route,
 then this function returns the active connection that contains the
 route to the VPN endpoint.
    
 
    If there is no default route, or the default route is over a
-non-NetworkManager-recognized device, this will return NULL.
    
+non-NetworkManager-recognized device, this will return NULL.
    
 
    
 
    Parameters
    
 
    
@@ -2310,9 +2310,9 @@ nm_client_activate_connection_async (NMConnection *connection,
                                      NMDevice *device,
                                      const char *specific_object,
-                                     GCancellable *cancellable,
-                                     GAsyncReadyCallback callback,
-                                     gpointer user_data);
+                                     GCancellable *cancellable,
+                                     GAsyncReadyCallback callback,
+                                     gpointer user_data);
 
    Asynchronously starts a connection to a particular network using the
 configuration settings from connection
  and the network device device
@@ -2359,7 +2359,7 @@ track the activation to its completion.
    
     
-
+
@@ -2392,8 +2392,8 @@ details of the newly added connection. 
    
 
    nm_client_activate_connection_finish ()
    
 
    NMActiveConnection *
 nm_client_activate_connection_finish (NMClient *client,
-                                      GAsyncResult *result,
-                                      GError **error);
    
+                                      GAsyncResult *result,
+                                      GError **error);
 
    Gets the result of a call to nm_client_activate_connection_async().
    
 
    
 
    Parameters
    
@@ -2411,12 +2411,12 @@ nm_client_activate_connection_finish (
    result
    
-
    
+
-
+
@@ -2424,7 +2424,7 @@ nm_client_activate_connection_finish (
 
    Returns
    
-
     the new NMActiveConnection on success, NULL on
+
     the new NMActiveConnection on success, NULL on
 failure, in which case error
 will be set. 
    
 
    [transfer full]
    
@@ -2439,9 +2439,9 @@ nm_client_add_and_activate_connection_async
                                 NMConnection *partial,
                                 NMDevice *device,
                                 const char *specific_object,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);
 
    Adds a new connection using the given details (if any) as a template,
 automatically filling in missing settings with the capabilities of the given
 device and specific object.  The new connection is then asynchronously
@@ -2468,7 +2468,7 @@ track the activation to its completion.
    
     
@@ -2483,7 +2483,7 @@ before being added. 
    
     
-
+
@@ -2517,8 +2517,8 @@ details of the newly added connection. 
    
 
    NMActiveConnection *
 nm_client_add_and_activate_connection_finish
                                (NMClient *client,
-                                GAsyncResult *result,
-                                GError **error);
    
+                                GAsyncResult *result,
+                                GError **error);
 
    Gets the result of a call to nm_client_add_and_activate_connection_async().
    
 
    You can call nm_active_connection_get_connection() on the returned
 NMActiveConnection to find the path of the created NMConnection.
    
@@ -2538,12 +2538,12 @@ nm_client_add_and_activate_connection_finish
     
-
+
-
+
@@ -2551,7 +2551,7 @@ nm_client_add_and_activate_connection_finish
 
 
    
 
    Returns
    
-
     the new NMActiveConnection on success, NULL on
+
     the new NMActiveConnection on success, NULL on
 failure, in which case error
 will be set. 
    
 
    [transfer full]
    
@@ -2560,11 +2560,11 @@ will be set. 
    
 
    
 
    
 
    nm_client_deactivate_connection ()
    
-
    gboolean
+
    gboolean
 nm_client_deactivate_connection (NMClient *client,
                                  NMActiveConnection *active,
-                                 GCancellable *cancellable,
-                                 GError **error);
    
+                                 GCancellable *cancellable,
+                                 GError **error);
    
 
    Deactivates an active NMActiveConnection.
    
 
    
 
    Parameters
    
@@ -2587,12 +2587,12 @@ nm_client_deactivate_connection (
 
    
-
+
-
+
@@ -2609,9 +2609,9 @@ nm_client_deactivate_connection (void
 nm_client_deactivate_connection_async (NMClient *client,
                                        NMActiveConnection *active,
-                                       GCancellable *cancellable,
-                                       GAsyncReadyCallback callback,
-                                       gpointer user_data);
+                                       GCancellable *cancellable,
+                                       GAsyncReadyCallback callback,
+                                       gpointer user_data);
 
    Asynchronously deactivates an active NMActiveConnection.
    
 
    
 
    Parameters
    
@@ -2634,7 +2634,7 @@ nm_client_deactivate_connection_async (
    cancellable
    
-
    
+
@@ -2655,11 +2655,11 @@ nm_client_deactivate_connection_async (
 
    nm_client_deactivate_connection_finish ()
    
-
    gboolean
+
    gboolean
 nm_client_deactivate_connection_finish
                                (NMClient *client,
-                                GAsyncResult *result,
-                                GError **error);
    
+                                GAsyncResult *result,
+                                GError **error);
    
 
    Gets the result of a call to nm_client_deactivate_connection_async().
    
 
    
 
    Parameters
    
@@ -2677,12 +2677,12 @@ nm_client_deactivate_connection_finish
 
    
-
+
-
+
@@ -2696,7 +2696,7 @@ nm_client_deactivate_connection_finish
 
    
 
    
 
    nm_client_get_connections ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_client_get_connections (NMClient *client);
    
 
    
 
    Parameters
    
@@ -2755,7 +2755,7 @@ nm_client_get_connection_by_id (
 
    
 
    Returns
    
-
     the remote connection object on success, or NULL if no
+
     the remote connection object on success, or NULL if no
 matching object was found.
    
 
    The connection is as received from D-Bus and might not validate according
 to nm_connection_verify(). 
    
@@ -2794,7 +2794,7 @@ nm_client_get_connection_by_path (
 
    
 
    Returns
    
-
     the remote connection object on success, or NULL if the object was
+
     the remote connection object on success, or NULL if the object was
 not known
    
 
    The connection is as received from D-Bus and might not validate according
 to nm_connection_verify(). 
    
@@ -2833,7 +2833,7 @@ nm_client_get_connection_by_uuid (
 
    
 
    Returns
    
-
     the remote connection object on success, or NULL if the object was
+
     the remote connection object on success, or NULL if the object was
 not known
    
 
    The connection is as received from D-Bus and might not validate according
 to nm_connection_verify(). 
    
@@ -2846,13 +2846,13 @@ to void
 nm_client_add_connection_async (NMClient *client,
                                 NMConnection *connection,
-                                gboolean save_to_disk,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
    
+                                gboolean save_to_disk,
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);
 
    Requests that the remote settings service add the given settings to a new
 connection.  If save_to_disk
- is TRUE, the connection is immediately written
+ is TRUE, the connection is immediately written
 to disk; otherwise it is initially only stored in memory, but may be saved
 later by calling the connection's nm_remote_connection_commit_changes()
 method.
    
@@ -2894,7 +2894,7 @@ added, not the object itself
    
 
 
    
-
+
@@ -2917,8 +2917,8 @@ added, not the object itself
    
 
    nm_client_add_connection_finish ()
    
 
    NMRemoteConnection *
 nm_client_add_connection_finish (NMClient *client,
-                                 GAsyncResult *result,
-                                 GError **error);
    
+                                 GAsyncResult *result,
+                                 GError **error);
 
    Gets the result of a call to nm_client_add_connection_async().
    
 
    
 
    Parameters
    
@@ -2936,12 +2936,12 @@ nm_client_add_connection_finish (
 
    
-
+
-
+
@@ -2949,7 +2949,7 @@ nm_client_add_connection_finish (
 
    
 
    Returns
    
-
     the new NMRemoteConnection on success, NULL on
+
     the new NMRemoteConnection on success, NULL on
 failure, in which case error
 will be set. 
    
 
    [transfer full]
    
@@ -2958,23 +2958,23 @@ will be set. 
    
 
    
 
    
 
    nm_client_load_connections ()
    
-
    gboolean
+
    gboolean
 nm_client_load_connections (NMClient *client,
                             char **filenames,
                             char ***failures,
-                            GCancellable *cancellable,
-                            GError **error);
    
+                            GCancellable *cancellable,
+                            GError **error);
    
 
    Requests that the remote settings service load or reload the given files,
 adding or updating the connections described within.
    
 
    The changes to the indicated files will not yet be reflected in
 client
 's connections array when the function returns.
    
 
    If all of the indicated files were successfully loaded, the
-function will return TRUE, and failures
- will be set to NULL. If
+function will return TRUE, and failures
+ will be set to NULL. If
 NetworkManager tried to load the files, but some (or all) failed,
 then failures
- will be set to a NULL-terminated array of the
+ will be set to a NULL-terminated array of the
 filenames that failed to load.
    
 
    
 
    Parameters
    
@@ -2992,23 +2992,23 @@ filenames that failed to load.
    
 
 
    
-
+
-
-
+
-
+
@@ -3016,9 +3016,9 @@ filenames that failed to load. 
    
 
 
    
 
    Returns
    
-
     TRUE if NetworkManager at least tried to load filenames
+
     TRUE if NetworkManager at least tried to load filenames
 ,
-FALSE if an error occurred (eg, permission denied).
    
+FALSE if an error occurred (eg, permission denied).
    
 
    
 
 
    
@@ -3027,9 +3027,9 @@ filenames that failed to load. 
    
 
    void
 nm_client_load_connections_async (NMClient *client,
                                   char **filenames,
-                                  GCancellable *cancellable,
-                                  GAsyncReadyCallback callback,
-                                  gpointer user_data);
    
+                                  GCancellable *cancellable,
+                                  GAsyncReadyCallback callback,
+                                  gpointer user_data);
 
    Requests that the remote settings service asynchronously load or reload the
 given files, adding or updating the connections described within.
    
 
    See nm_client_load_connections() for more details.
    
@@ -3049,12 +3049,12 @@ given files, adding or updating the connections described within.
    
 
     
-
+
-
+
@@ -3075,11 +3075,11 @@ given files, adding or updating the connections described within.
    
 
    
 
    
 
    nm_client_load_connections_finish ()
    
-
    gboolean
+
    gboolean
 nm_client_load_connections_finish (NMClient *client,
                                    char ***failures,
-                                   GAsyncResult *result,
-                                   GError **error);
    
+                                   GAsyncResult *result,
+                                   GError **error);
    
 
    Gets the result of an nm_client_load_connections_async() call.
    
 
    See nm_client_load_connections() for more details.
    
 
    
@@ -3099,17 +3099,17 @@ nm_client_load_connections_finish (
 
    
+NULL-terminated array of filenames that failed to load. 
    
     
-
+
-
+
@@ -3117,18 +3117,18 @@ nm_client_load_connections_finish (
 
    
 
    Returns
    
-
     TRUE if NetworkManager at least tried to load filenames
+
     TRUE if NetworkManager at least tried to load filenames
 ,
-FALSE if an error occurred (eg, permission denied).
    
+FALSE if an error occurred (eg, permission denied).
    
 
    
 
 
    
 
    
 
    nm_client_reload_connections ()
    
-
    gboolean
+
    gboolean
 nm_client_reload_connections (NMClient *client,
-                              GCancellable *cancellable,
-                              GError **error);
    
+                              GCancellable *cancellable,
+                              GError **error);
    
 
    Requests that the remote settings service reload all connection
 files from disk, adding, updating, and removing connections until
 the in-memory state matches the on-disk state.
    
@@ -3148,12 +3148,12 @@ the in-memory state matches the on-disk state.
    
 
 
    
-
+
-
+
@@ -3161,7 +3161,7 @@ the in-memory state matches the on-disk state.
    
 
 
    
 
    Returns
    
-
     TRUE on success, FALSE on failure
    
+
     TRUE on success, FALSE on failure
    
 
    
 
 
    
@@ -3169,9 +3169,9 @@ the in-memory state matches the on-disk state.
    
 
    nm_client_reload_connections_async ()
    
 
    void
 nm_client_reload_connections_async (NMClient *client,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data);
    
+                                    GCancellable *cancellable,
+                                    GAsyncReadyCallback callback,
+                                    gpointer user_data);
 
    Requests that the remote settings service begin reloading all connection
 files from disk, adding, updating, and removing connections until the
 in-memory state matches the on-disk state.
    
@@ -3191,7 +3191,7 @@ in-memory state matches the on-disk state.
    
 
     
-
+
@@ -3212,10 +3212,10 @@ in-memory state matches the on-disk state.
    
 
    
 
    
 
    nm_client_reload_connections_finish ()
    
-
    gboolean
+
    gboolean
 nm_client_reload_connections_finish (NMClient *client,
-                                     GAsyncResult *result,
-                                     GError **error);
    
+                                     GAsyncResult *result,
+                                     GError **error);
    
 
    Gets the result of an nm_client_reload_connections_async() call.
    
 
    
 
    Parameters
    
@@ -3233,12 +3233,12 @@ nm_client_reload_connections_finish (
 
    
-
+
-
+
@@ -3246,7 +3246,7 @@ nm_client_reload_connections_finish (
 
    
 
    Returns
    
-
     TRUE on success, FALSE on failure
    
+
     TRUE on success, FALSE on failure
    
 
    
 
 
    
@@ -3272,7 +3272,7 @@ nm_client_get_dns_mode (
 
    Returns
    
-
     the DNS processing mode, or NULL in case the
+
     the DNS processing mode, or NULL in case the
 value is not available.
    
 
 
    Since: 1.6
    
@@ -3300,7 +3300,7 @@ nm_client_get_dns_rc_manager (
 
    Returns
    
-
     the resolv.conf manager or NULL in case the
+
     the resolv.conf manager or NULL in case the
 value is not available.
    
 
 
    Since: 1.6
    
@@ -3308,7 +3308,7 @@ value is not available.
    
 
    
 
    
 
    nm_client_get_dns_configuration ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_client_get_dns_configuration (NMClient *client);
    
 
    Gets the current DNS configuration
    
 
    
@@ -3328,8 +3328,8 @@ nm_client_get_dns_configuration (
 
    
 
    Returns
    
-
     a GPtrArray
-containing NMDnsEntry elements or NULL in case the value is not
+
     a GPtrArray
+containing NMDnsEntry elements or NULL in case the value is not
 available.  The returned array is owned by the NMClient object
 and should not be modified. 
    
 
    [transfer none][element-type NMDnsEntry]
    
@@ -3802,7 +3802,7 @@ likely to become the new 
 
    The “active-connections” property
    
-
      “active-connections”       GPtrArray *
    
+
      “active-connections”       GPtrArray *
    
 
    The active connections.
    
 
    Element-type: NMActiveConnection
    
 
    Flags: Read
    
@@ -3810,7 +3810,7 @@ likely to become the new 
 
    The “all-devices” property
    
-
      “all-devices”              GPtrArray *
    
+
      “all-devices”              GPtrArray *
    
 
    List of both real devices and device placeholders.
    
 
    Element-type: NMDevice
    
 
    Flags: Read
    
@@ -3819,15 +3819,15 @@ likely to become the new 
 
    The “can-modify” property
    
-
      “can-modify”               gboolean
    
-
    If TRUE, adding and modifying connections is supported.
    
+
      “can-modify”               gboolean
    
+
    If TRUE, adding and modifying connections is supported.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “connections” property
    
-
      “connections”              GPtrArray *
    
+
      “connections”              GPtrArray *
    
 
    The list of configured connections that are available to the user. (Note
 that this differs from the underlying D-Bus property, which may also
 contain the object paths of connections that the user does not have
@@ -3846,7 +3846,7 @@ permission to read the details of.)
    
 
    
 
    
 
    The “devices” property
    
-
      “devices”                  GPtrArray *
    
+
      “devices”                  GPtrArray *
    
 
    List of real network devices.  Does not include placeholder devices.
    
 
    Element-type: NMDevice
    
 
    Flags: Read
    
@@ -3854,7 +3854,7 @@ permission to read the details of.)
    
 
    
 
    
 
    The “dns-configuration” property
    
-
      “dns-configuration”        GPtrArray *
    
+
      “dns-configuration”        GPtrArray *
    
 
    The current DNS configuration represented as an array of
 dictionaries.  Each dictionary has the "nameservers",
 "priority" keys and, optionally, "interface" and "vpn".
@@ -3868,7 +3868,7 @@ configuration was obtained from a VPN connection.
    
 
    
 
    
 
    The “dns-mode” property
    
-
      “dns-mode”                 gchar *
    
+
      “dns-mode”                 gchar *
    
 
    The current DNS processing mode.
    
 
    Flags: Read
    
 
    Default value: ""
    
@@ -3877,7 +3877,7 @@ configuration was obtained from a VPN connection.
    
 
    
 
    
 
    The “dns-rc-manager” property
    
-
      “dns-rc-manager”           gchar *
    
+
      “dns-rc-manager”           gchar *
    
 
    The current resolv.conf management mode.
    
 
    Flags: Read
    
 
    Default value: ""
    
@@ -3886,7 +3886,7 @@ configuration was obtained from a VPN connection.
    
 
    
 
    
 
    The “hostname” property
    
-
      “hostname”                 gchar *
    
+
      “hostname”                 gchar *
    
 
    The machine hostname stored in persistent configuration. This can be
 modified by calling nm_client_save_hostname().
    
 
    Flags: Read
    
@@ -3895,7 +3895,7 @@ modified by calling 
 
    
 
    The “metered” property
    
-
      “metered”                  guint
    
+
      “metered”                  guint
    
 
    Whether the connectivity is metered.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -3904,7 +3904,7 @@ modified by calling 
 
    
 
    The “networking-enabled” property
    
-
      “networking-enabled”       gboolean
    
+
      “networking-enabled”       gboolean
    
 
    Whether networking is enabled.
    
 
    Flags: Read / Write
    
 
    Default value: TRUE
    
@@ -3912,7 +3912,7 @@ modified by calling 
 
    
 
    The “nm-running” property
    
-
      “nm-running”               gboolean
    
+
      “nm-running”               gboolean
    
 
    Whether the daemon is running.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -3928,7 +3928,7 @@ see 
 
    
 
    The “startup” property
    
-
      “startup”                  gboolean
    
+
      “startup”                  gboolean
    
 
    Whether the daemon is still starting up.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -3944,7 +3944,7 @@ see 
 
    
 
    The “version” property
    
-
      “version”                  gchar *
    
+
      “version”                  gchar *
    
 
    The NetworkManager version.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -3952,7 +3952,7 @@ see 
 
    
 
    The “wimax-enabled” property
    
-
      “wimax-enabled”            gboolean
    
+
      “wimax-enabled”            gboolean
    
 
    Whether WiMAX functionality is enabled.
    
 
    Flags: Read / Write
    
 
    Default value: FALSE
    
@@ -3960,7 +3960,7 @@ see 
 
    
 
    The “wimax-hardware-enabled” property
    
-
      “wimax-hardware-enabled”   gboolean
    
+
      “wimax-hardware-enabled”   gboolean
    
 
    Whether the WiMAX hardware is enabled.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -3968,7 +3968,7 @@ see 
 
    
 
    The “wireless-enabled” property
    
-
      “wireless-enabled”         gboolean
    
+
      “wireless-enabled”         gboolean
    
 
    Whether wireless is enabled.
    
 
    Flags: Read / Write
    
 
    Default value: FALSE
    
@@ -3976,7 +3976,7 @@ see 
 
    
 
    The “wireless-hardware-enabled” property
    
-
      “wireless-hardware-enabled” gboolean
    
+
      “wireless-hardware-enabled” gboolean
    
 
    Whether the wireless hardware is enabled.
    
 
    Flags: Read
    
 
    Default value: TRUE
    
@@ -3984,7 +3984,7 @@ see 
 
    
 
    The “wwan-enabled” property
    
-
      “wwan-enabled”             gboolean
    
+
      “wwan-enabled”             gboolean
    
 
    Whether WWAN functionality is enabled.
    
 
    Flags: Read / Write
    
 
    Default value: FALSE
    
@@ -3992,7 +3992,7 @@ see 
 
    
 
    The “wwan-hardware-enabled” property
    
-
      “wwan-hardware-enabled”    gboolean
    
+
      “wwan-hardware-enabled”    gboolean
    
 
    Whether the WWAN hardware is enabled.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -4005,7 +4005,7 @@ see void
 user_function (NMClient           *client,
                NMActiveConnection *active_connection,
-               gpointer            user_data)
    
+               gpointer            user_data)
 
    Notifies that a NMActiveConnection has been added.
    
 
    
 
    Parameters
    
@@ -4034,7 +4034,7 @@ user_function (
 
    specific_object
    		
 
     the object path of a connection-type-specific
 object this activation should use. This parameter is currently ignored for
-wired and mobile broadband connections, and the value of NULL should be used
+wired and mobile broadband connections, and the value of NULL should be used
 (ie, no specific object).  For Wi-Fi or WiMAX connections, pass the object
 path of a NMAccessPoint or NMWimaxNsp owned by device
 , which you can
@@ -2369,7 +2369,7 @@ details of the newly added connection. 
    		
 
    
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    the result passed to the GAsyncReadyCallback
    the result passed to the GAsyncReadyCallback
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
 
    
 
    partial
    		
 
     an NMConnection to add; the connection may be
-partially filled (or even NULL) and will be completed by NetworkManager
+partially filled (or even NULL) and will be completed by NetworkManager
 using the given device
 and specific_object
 before being added. 
    specific_object
    		
 
     the object path of a connection-type-specific
 object this activation should use. This parameter is currently ignored for
-wired and mobile broadband connections, and the value of NULL should be used
+wired and mobile broadband connections, and the value of NULL should be used
 (ie, no specific object).  For Wi-Fi or WiMAX connections, pass the object
 path of a NMAccessPoint or NMWimaxNsp owned by device
 , which you can
@@ -2493,7 +2493,7 @@ details of the newly added connection. 
    		
 
    
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    
 
    result
    the result passed to the GAsyncReadyCallback
    the result passed to the GAsyncReadyCallback
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
 
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    
 
    result
    the result passed to the GAsyncReadyCallback
    the result passed to the GAsyncReadyCallback
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    result
    the result passed to the GAsyncReadyCallback
    the result passed to the GAsyncReadyCallback
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
 
    
 
    filenames
     NULL-terminated array of filenames to load. 
     NULL-terminated array of filenames to load. 
    		
 [array zero-terminated=1]
 
    
 
    
 
    failures
     on return, a NULL-terminated array of
+
     on return, a NULL-terminated array of
 filenames that failed to load. 
    		
 [out][transfer full]
 
    
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    error
    return location for GError
    return location for GError
    		
  
 
    
 
    
 
    filenames
     NULL-terminated array of filenames to load. 
     NULL-terminated array of filenames to load. 
    		
 [array zero-terminated=1]
 
    
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    failures
    		
 
     on return, a
-NULL-terminated array of filenames that failed to load. 
    		[out][transfer full][array zero-terminated=1]
 
    
 
    
 
    result
    the result passed to the GAsyncReadyCallback
    the result passed to the GAsyncReadyCallback
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    error
    return location for GError
    return location for GError
    		
  
 
    
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    result
    the result passed to the GAsyncReadyCallback
    the result passed to the GAsyncReadyCallback
    		
  
 
    
 
    
 
    error
    return location for GError
    return location for GError
    		
  
 
    
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
@@ -4042,7 +4042,7 @@ user_function (void
 user_function (NMClient           *client,
                NMActiveConnection *active_connection,
-               gpointer            user_data)
    
+               gpointer            user_data)
 
    Notifies that a NMActiveConnection has been removed.
    
 
    
 
    Parameters
    
@@ -4071,15 +4071,15 @@ user_function (
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “any-device-added” signal
    
 
    void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)
    
+               GObject  *device,
+               gpointer  user_data)
 
    Notifies that a NMDevice is added.  This signal is emitted for both
 regular devices and placeholder devices.
    
 
    
@@ -4109,15 +4109,15 @@ regular devices and placeholder devices.
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “any-device-removed” signal
    
 
    void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)
    
+               GObject  *device,
+               gpointer  user_data)
 
    Notifies that a NMDevice is removed.  This signal is emitted for both
 regular devices and placeholder devices.
    
 
    
@@ -4147,7 +4147,7 @@ regular devices and placeholder devices.
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
@@ -4155,7 +4155,7 @@ regular devices and placeholder devices.
    
 
    void
 user_function (NMClient           *client,
                NMRemoteConnection *connection,
-               gpointer            user_data)
    
+               gpointer            user_data)
 
    Notifies that a NMConnection has been added.
    
 
    
 
    Parameters
    
@@ -4184,7 +4184,7 @@ user_function (
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
 
    
 
    
@@ -4192,7 +4192,7 @@ user_function (void
 user_function (NMClient           *client,
                NMRemoteConnection *connection,
-               gpointer            user_data)
+               gpointer            user_data)
 
    Notifies that a NMConnection has been removed.
    
 
    
 
    Parameters
    
@@ -4221,15 +4221,15 @@ user_function (
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
 
    
 
    
 
    The “device-added” signal
    
 
    void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)
    
+               GObject  *device,
+               gpointer  user_data)
 
    Notifies that a NMDevice is added.  This signal is not emitted for
 placeholder devices.
    
 
    
@@ -4259,15 +4259,15 @@ placeholder devices.
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
 
    
 
    
 
    The “device-removed” signal
    
 
    void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)
    
+               GObject  *device,
+               gpointer  user_data)
 
    Notifies that a NMDevice is removed.  This signal is not emitted for
 placeholder devices.
    
 
    
@@ -4297,16 +4297,16 @@ placeholder devices.
    
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
 
    
 
    
 
    The “permission-changed” signal
    
 
    void
 user_function (NMClient *client,
-               guint     permission,
-               guint     result,
-               gpointer  user_data)
    
+               guint     permission,
+               guint     result,
+               gpointer  user_data)
 
    Notifies that a permission has changed
    
 
    
 
    Parameters
    
@@ -4340,7 +4340,7 @@ user_function (
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
 
 
diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html
index f2645b05..55947dda 100644
--- a/docs/libnm/html/NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -74,7 +74,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_connection_to_dbus ()
@@ -82,7 +82,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_replace_settings ()
@@ -106,7 +106,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_compare ()
@@ -114,7 +114,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_diff ()
@@ -122,7 +122,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_verify ()
@@ -130,7 +130,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_verify_secrets ()
@@ -138,7 +138,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_normalize ()
@@ -169,7 +169,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_update_secrets ()
@@ -199,7 +199,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_is_type ()
@@ -244,7 +244,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_is_virtual ()
@@ -340,6 +340,14 @@
 
 
 
+NMSettingDummy *
+
+
+nm_connection_get_setting_dummy ()
+
+
+
+
 NMSettingGeneric *
 
 
@@ -388,7 +396,7 @@
 
 
 
-NMSettingMacsec *
+NMSettingMacsec *
 
 
 nm_connection_get_setting_macsec ()
@@ -558,7 +566,7 @@
 
 
    
 
    Object Hierarchy
    
-
        GFlags
+
        GFlags
     ╰── NMConnectionSerializationFlags
 
    
 
    
@@ -615,8 +623,8 @@ the setting object's reference count.
    
 
    nm_connection_remove_setting ()
    
 
    void
 nm_connection_remove_setting (NMConnection *connection,
-                              GType setting_type);
    
-
    Removes the NMSetting with the given GType from the NMConnection.  This
+                              GType setting_type);
+
    Removes the NMSetting with the given GType from the NMConnection.  This
 operation dereferences the NMSetting object.
    
 
    
 
    Parameters
    
@@ -634,7 +642,7 @@ operation dereferences the 
    setting_type
    
-
    the GType of the setting object to remove
    
+
    the GType of the setting object to remove
    
  
 
 
@@ -646,8 +654,8 @@ operation dereferences the 
    nm_connection_get_setting ()
    
 
    NMSetting *
 nm_connection_get_setting (NMConnection *connection,
-                           GType setting_type);
    
-
    Gets the NMSetting with the given GType, if one has been previously added
+                           GType setting_type);
+
    Gets the NMSetting with the given GType, if one has been previously added
 to the NMConnection.
    
 
    
 
    Parameters
    
@@ -665,7 +673,7 @@ to the 
 
 
    setting_type
    
-
    the GType of the setting object to return
    
+
    the GType of the setting object to return
    
  
 
 
@@ -673,7 +681,7 @@ to the 
 
    
 
    Returns
    
-
     the NMSetting, or NULL if no setting of that type was previously
+
     the NMSetting, or NULL if no setting of that type was previously
 added to the NMConnection. 
    
 
    [transfer none]
    
 
    
@@ -710,7 +718,7 @@ the 
 
    Returns
    
-
     the NMSetting, or NULL if no setting with that name was previously
+
     the NMSetting, or NULL if no setting with that name was previously
 added to the NMConnection. 
    
 
    [transfer none]
    
 
    
@@ -718,10 +726,10 @@ added to the 
 
    
 
    nm_connection_to_dbus ()
    
-
    GVariant *
+
    GVariant *
 nm_connection_to_dbus (NMConnection *connection,
                        NMConnectionSerializationFlags flags);
    
-
    Converts the NMConnection into a GVariant of type
+
    Converts the NMConnection into a GVariant of type
 NM_VARIANT_TYPE_CONNECTION describing the connection, suitable for
 marshalling over D-Bus or otherwise serializing.
    
 
    
@@ -748,7 +756,7 @@ marshalling over D-Bus or otherwise serializing.
    
 
    
 
    
 
    Returns
    
-
     a new floating GVariant describing the connection,
+
     a new floating GVariant describing the connection,
 its settings, and each setting's properties. 
    
 
    [transfer none]
    
 
    
@@ -756,10 +764,10 @@ its settings, and each setting's properties. 
    
 
    
 
    
 
    nm_connection_replace_settings ()
    
-
    gboolean
+
    gboolean
 nm_connection_replace_settings (NMConnection *connection,
-                                GVariant *new_settings,
-                                GError **error);
    
+                                GVariant *new_settings,
+                                GError **error);
    
 
    Replaces connection
 's settings with new_settings
  (which must be
@@ -781,12 +789,12 @@ need to result in a connection that passes 
    new_settings
    
-
    a GVariant of type NM_VARIANT_TYPE_CONNECTION, with the new settings
    
+
    a GVariant of type NM_VARIANT_TYPE_CONNECTION, with the new settings
    
  
 
 
 
    error
    
-
    location to store error, or NULL
    
+
    location to store error, or NULL
    
  
 
 
@@ -794,7 +802,7 @@ need to result in a connection that passes 
 
    Returns
    
-
     TRUE if connection was updated, FALSE if new_settings
+
     TRUE if connection was updated, FALSE if new_settings
 could not
 be deserialized (in which case connection
 will be unchanged).
    
@@ -861,7 +869,7 @@ nm_connection_clear_settings (
 
    nm_connection_compare ()
    
-
    gboolean
+
    gboolean
 nm_connection_compare (NMConnection *a,
                        NMConnection *b,
                        NMSettingCompareFlags flags);
    
@@ -897,17 +905,17 @@ each flag's behavior.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the comparison succeeds, FALSE if it does not
    
+
     TRUE if the comparison succeeds, FALSE if it does not
    
 
    
 
    
 
    
 
    
 
    nm_connection_diff ()
    
-
    gboolean
+
    gboolean
 nm_connection_diff (NMConnection *a,
                     NMConnection *b,
                     NMSettingCompareFlags flags,
-                    GHashTable **out_settings);
    
+                    GHashTable **out_settings);
    
 
    Compares two NMConnection objects for similarity, with comparison behavior
 modified by a set of flags.  See nm_setting_compare() for a description of
 each flag's behavior.  If the connections differ, settings and keys within
@@ -951,16 +959,16 @@ differ mapped to one or more of 
 
    Returns
    
-
     TRUE if the connections contain the same values, FALSE if they do
+
     TRUE if the connections contain the same values, FALSE if they do
 not
    
 
    
 
    
 
    
 
    
 
    nm_connection_verify ()
    
-
    gboolean
+
    gboolean
 nm_connection_verify (NMConnection *connection,
-                      GError **error);
    
+                      GError **error);
    
 
    Validates the connection and all its settings.  Each setting's properties
 have allowed values, and some values are dependent on other values.  For
 example, if a Wi-Fi connection is security enabled, the NMSettingWireless
@@ -968,7 +976,7 @@ setting object's 'security' property must contain the setting name of the
 NMSettingWirelessSecurity object, which must also be present in the
 connection for the connection to be valid.  As another example, the
 NMSettingWired object's 'mac-address' property must be a validly formatted
-MAC address.  The returned GError contains information about which
+MAC address.  The returned GError contains information about which
 setting and which property failed validation, and how it failed validation.
    
 
    
 
    Parameters
    
@@ -986,7 +994,7 @@ setting and which property failed validation, and how it failed validation.
    
 
 
 
    error
    
-
    location to store error, or NULL
    
+
    location to store error, or NULL
    
  
 
 
@@ -994,15 +1002,15 @@ setting and which property failed validation, and how it failed validation.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the connection is valid, FALSE if it is not
    
+
     TRUE if the connection is valid, FALSE if it is not
    
 
    
 
    
 
    
 
    
 
    nm_connection_verify_secrets ()
    
-
    gboolean
+
    gboolean
 nm_connection_verify_secrets (NMConnection *connection,
-                              GError **error);
    
+                              GError **error);
    
 
    Verifies the secrets in the connection.
    
 
    
 
    Parameters
    
@@ -1020,7 +1028,7 @@ nm_connection_verify_secrets (
    error
    
-
    location to store error, or NULL
    
+
    location to store error, or NULL
    
  
 
 
@@ -1028,23 +1036,23 @@ nm_connection_verify_secrets (
 
    Returns
    
-
     TRUE if the secrets are valid, FALSE if they are not
    
+
     TRUE if the secrets are valid, FALSE if they are not
    
 
    
 
    Since: 1.2
    
 
    
 
    
 
    
 
    nm_connection_normalize ()
    
-
    gboolean
+
    gboolean
 nm_connection_normalize (NMConnection *connection,
-                         GHashTable *parameters,
-                         gboolean *modified,
-                         GError **error);
    
+                         GHashTable *parameters,
+                         gboolean *modified,
+                         GError **error);
    
 
    Does some basic normalization and fixup of well known inconsistencies
 and deprecated fields. If the connection was modified in any way,
 the output parameter modified
- is set TRUE.
    
-
    Finally the connection will be verified and TRUE returns if the connection
+ is set TRUE.
    
+
    Finally the connection will be verified and TRUE returns if the connection
 is valid. As this function only performs some specific normalization steps
 it cannot repair all connections. If the connection has errors that
 cannot be normalized, the connection will not be modified.
    
@@ -1064,10 +1072,10 @@ cannot be normalized, the connection will not be modified.
    
 
 
 
    parameters
    
-
     a GHashTable with
+
     a GHashTable with
 normalization parameters to allow customization of the normalization by providing
 specific arguments. Unknown arguments will be ignored and the default will be
-used. The keys must be strings, hashed by g_str_hash() and g_str_equal() functions.
+used. The keys must be strings, hashed by g_str_hash() and g_str_equal() functions.
 The values are opaque and depend on the parameter name. 
    
 [allow-none][element-type utf8 gpointer]
 
@@ -1078,7 +1086,7 @@ The values are opaque and depend on the parameter name. 
    
 
 
 
    error
    
-
    location to store error, or NULL. Contains the reason,
+
    location to store error, or NULL. Contains the reason,
 why the connection is invalid, if the function returns an error.
    
  
 
@@ -1087,7 +1095,7 @@ why the connection is invalid, if the function returns an error.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the connection is valid, FALSE if it is not
    
+
     TRUE if the connection is valid, FALSE if it is not
    
 
    
 
 
    
@@ -1095,7 +1103,7 @@ why the connection is invalid, if the function returns an error.
    
 
    nm_connection_need_secrets ()
    
 
    const char *
 nm_connection_need_secrets (NMConnection *connection,
-                            GPtrArray **hints);
    
+                            GPtrArray **hints);
 
    Returns the name of the first setting object in the connection which would
 need secrets to make a successful connection.  The returned hints are only
 intended as a guide to what secrets may be required, because in some
@@ -1117,10 +1125,10 @@ secrets are needed.
    
 
 
 
    hints
    
-
      the address of a pointer to a GPtrArray, initialized to NULL, which on
-return points to an allocated GPtrArray containing the property names of
+
      the address of a pointer to a GPtrArray, initialized to NULL, which on
+return points to an allocated GPtrArray containing the property names of
 secrets of the NMSetting which may be required; the caller owns the array
-and must free the array itself with g_ptr_array_free(), but not free its
+and must free the array itself with g_ptr_array_free(), but not free its
 elements. 
    
 [out][element-type utf8][allow-none][transfer container]
 
@@ -1163,7 +1171,7 @@ keeping secret data in memory when not needed.
    
 nm_connection_clear_secrets_with_flags
                                (NMConnection *connection,
                                 NMSettingClearSecretsWithFlagsFn func,
-                                gpointer user_data);
+                                gpointer user_data);
 
    Clears and frees secrets determined by func
 .
    
 
    
@@ -1199,16 +1207,16 @@ specific secret should be cleared or not. 
    
 
    
 
    
 
    nm_connection_update_secrets ()
    
-
    gboolean
+
    gboolean
 nm_connection_update_secrets (NMConnection *connection,
                               const char *setting_name,
-                              GVariant *secrets,
-                              GError **error);
    
+                              GVariant *secrets,
+                              GError **error);
    
 
    Update the specified setting's secrets, given a dictionary of secrets
 intended for that setting (deserialized from D-Bus for example).  Will also
 extract the given setting's secrets hash if given a connection dictionary.
 If setting_name
- is NULL, expects a fully serialized NMConnection as
+ is NULL, expects a fully serialized NMConnection as
 returned by nm_connection_to_dbus() and will update all secrets from all
 settings contained in secrets
 .
    
@@ -1233,13 +1241,13 @@ settings contained in secrets
 
 
 
    secrets
    
-
    a GVariant of secrets, of type NM_VARIANT_TYPE_CONNECTION
+
    a GVariant of secrets, of type NM_VARIANT_TYPE_CONNECTION
 or NM_VARIANT_TYPE_SETTING
    
  
 
 
 
    error
    
-
    location to store error, or NULL
    
+
    location to store error, or NULL
    
  
 
 
@@ -1247,7 +1255,7 @@ or 
 
    Returns
    
-
     TRUE if the secrets were successfully updated, FALSE if the update
+
     TRUE if the secrets were successfully updated, FALSE if the update
 failed (tried to update secrets for a setting that doesn't exist, etc)
    
 
    
 
    
@@ -1258,7 +1266,7 @@ failed (tried to update secrets for a setting that doesn't exist, etc)
    
 nm_connection_set_path (NMConnection *connection,
                         const char *path);
 
    Sets the D-Bus path of the connection.  This property is not serialized, and
-is only for the reference of the caller.  Sets the “path”
+is only for the reference of the caller.  Sets the “path”
 property.
    
 
    
 
    Parameters
    
@@ -1317,7 +1325,7 @@ nm_connection_get_path (const char *
 nm_connection_get_interface_name (NMConnection *connection);
 
    Returns the interface name as stored in NMSettingConnection:interface_name.
-If the connection contains no NMSettingConnection, it will return NULL.
    
+If the connection contains no NMSettingConnection, it will return NULL.
    
 
    For hardware devices and software devices created outside of NetworkManager,
 this name is used to match the device. for software devices created by
 NetworkManager, this is the name of the created interface.
    
@@ -1338,13 +1346,13 @@ NetworkManager, this is the name of the created interface.
    
 
    
 
    
 
    Returns
    
-
     Name of the kernel interface or NULL
    
+
     Name of the kernel interface or NULL
    
 
    
 
 
    
 
    
 
    nm_connection_is_type ()
    
-
    gboolean
+
    gboolean
 nm_connection_is_type (NMConnection *connection,
                        const char *type);
    
 
    A convenience function to check if the given connection
@@ -1377,8 +1385,8 @@ property of the connection and matches that against 
 
    
 
    
 
    Returns
    
-
     TRUE if the connection is of the given type
-, FALSE if not
    
+
     TRUE if the connection is of the given type
+, FALSE if not
    
 
    
 
 
    
@@ -1387,7 +1395,7 @@ property of the connection and matches that against 
 
    void
 nm_connection_for_each_setting_value (NMConnection *connection,
                                       NMSettingValueIterFn func,
-                                      gpointer user_data);
    
+                                      gpointer user_data);
 
    Iterates over the properties of each NMSetting object in the NMConnection,
 calling the supplied user function for each property.
    
 
    
@@ -1524,7 +1532,7 @@ nm_connection_get_connection_type (
 
    
 
    nm_connection_is_virtual ()
    
-
    gboolean
+
    gboolean
 nm_connection_is_virtual (NMConnection *connection);
    
 
    Checks if connection
  refers to a virtual device (and thus can potentially be
@@ -1579,7 +1587,7 @@ Eg, "VLAN (eth1.1)".
    
 
    Returns
    
 
     the name of connection
 's device,
-or NULL if connection
+or NULL if connection
 is not a virtual connection type. 
    
 
    [transfer full]
    
 
    
@@ -1607,7 +1615,7 @@ nm_connection_get_setting_802_1x (
 
    
 
    Returns
    
-
     an NMSetting8021x if the connection contains one, otherwise NULL. 
    
+
     an NMSetting8021x if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
    
@@ -1634,7 +1642,7 @@ nm_connection_get_setting_bluetooth (
 
    
 
    Returns
    
-
     an NMSettingBluetooth if the connection contains one, otherwise NULL. 
    
+
     an NMSettingBluetooth if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -1661,7 +1669,7 @@ nm_connection_get_setting_bond (
 
    
 
    Returns
    
-
     an NMSettingBond if the connection contains one, otherwise NULL. 
    
+
     an NMSettingBond if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -1688,7 +1696,7 @@ nm_connection_get_setting_team (
 
    
 
    Returns
    
-
     an NMSettingTeam if the connection contains one, otherwise NULL. 
    
+
     an NMSettingTeam if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -1715,7 +1723,7 @@ nm_connection_get_setting_team_port (
 
    
 
    Returns
    
-
     an NMSettingTeamPort if the connection contains one, otherwise NULL. 
    
+
     an NMSettingTeamPort if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -1742,7 +1750,7 @@ nm_connection_get_setting_bridge (
 
    
 
    Returns
    
-
     an NMSettingBridge if the connection contains one, otherwise NULL. 
    
+
     an NMSettingBridge if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -1769,7 +1777,7 @@ nm_connection_get_setting_bridge_port (
 
    Returns
    
-
     an NMSettingBridgePort if the connection contains one, otherwise NULL. 
    
+
     an NMSettingBridgePort if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
 
@@ -1796,7 +1804,7 @@ nm_connection_get_setting_cdma (
 
    
 
    Returns
    
-
     an NMSettingCdma if the connection contains one, otherwise NULL. 
    
+
     an NMSettingCdma if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -1823,7 +1831,7 @@ nm_connection_get_setting_connection (
 
    Returns
    
-
     an NMSettingConnection if the connection contains one, otherwise NULL. 
    
+
     an NMSettingConnection if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
 
@@ -1856,6 +1864,34 @@ nm_connection_get_setting_dcb (
 
    
 
    
+
    nm_connection_get_setting_dummy ()
    
+
    NMSettingDummy *
+nm_connection_get_setting_dummy (NMConnection *connection);
    
+
    A shortcut to return any NMSettingDummy the connection might contain.
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    connection
    the NMConnection
    		 
    
+
    
+
    
+
    Returns
    
+
     an NMSettingDummy if the connection contains one, otherwise NULL. 
    
+
    [transfer none]
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    nm_connection_get_setting_generic ()
    
 
    NMSettingGeneric *
 nm_connection_get_setting_generic (NMConnection *connection);
    
@@ -1904,7 +1940,7 @@ nm_connection_get_setting_gsm (
 
    
 
    Returns
    
-
     an NMSettingGsm if the connection contains one, otherwise NULL. 
    
+
     an NMSettingGsm if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
    
@@ -1931,7 +1967,7 @@ nm_connection_get_setting_infiniband (
 
    Returns
    
-
     an NMSettingInfiniband if the connection contains one, otherwise NULL. 
    
+
     an NMSettingInfiniband if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
 
@@ -1958,7 +1994,7 @@ nm_connection_get_setting_ip_tunnel (
 
    
 
    Returns
    
-
     an NMSettingIPTunnel if the connection contains one, otherwise NULL. 
    
+
     an NMSettingIPTunnel if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
    Since: 1.2
    
@@ -1990,7 +2026,7 @@ majority of IPv4-setting-related methods are on that type, not
 
    
 
    Returns
    
 
     an NMSettingIP4Config if the
-connection contains one, otherwise NULL. 
    
+connection contains one, otherwise NULL. 
    
 
    [type NMSettingIP4Config][transfer none]
    
 
    
 
@@ -2021,16 +2057,16 @@ majority of IPv6-setting-related methods are on that type, not
 
    
 
    Returns
    
 
     an NMSettingIP6Config if the
-connection contains one, otherwise NULL. 
    
+connection contains one, otherwise NULL. 
    
 
    [type NMSettingIP6Config][transfer none]
    
 
    
 
 
    
 
    
 
    nm_connection_get_setting_macsec ()
    
-
    NMSettingMacsec *
+
    NMSettingMacsec *
 nm_connection_get_setting_macsec (NMConnection *connection);
    
-
    A shortcut to return any NMSettingMacsec the connection might contain.
    
+
    A shortcut to return any NMSettingMacsec the connection might contain.
    
 
    
 
    Parameters
    
 
    
@@ -2048,7 +2084,7 @@ nm_connection_get_setting_macsec (
 
    
 
    Returns
    
-
     an NMSettingMacsec if the connection contains one, otherwise NULL. 
    
+
     an NMSettingMacsec if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
    Since: 1.6
    
@@ -2076,7 +2112,7 @@ nm_connection_get_setting_macvlan (
 
    
 
    Returns
    
-
     an NMSettingMacvlan if the connection contains one, otherwise NULL. 
    
+
     an NMSettingMacvlan if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
    Since: 1.2
    
@@ -2104,7 +2140,7 @@ nm_connection_get_setting_olpc_mesh (
 
    
 
    Returns
    
-
     an NMSettingOlpcMesh if the connection contains one, otherwise NULL. 
    
+
     an NMSettingOlpcMesh if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2131,7 +2167,7 @@ nm_connection_get_setting_ppp (
 
    
 
    Returns
    
-
     an NMSettingPpp if the connection contains one, otherwise NULL. 
    
+
     an NMSettingPpp if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2158,7 +2194,7 @@ nm_connection_get_setting_pppoe (
 
    
 
    Returns
    
-
     an NMSettingPppoe if the connection contains one, otherwise NULL. 
    
+
     an NMSettingPppoe if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2185,7 +2221,7 @@ nm_connection_get_setting_proxy (
 
    
 
    Returns
    
-
     an NMSettingProxy if the connection contains one, otherwise NULL. 
    
+
     an NMSettingProxy if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
    Since: 1.6
    
@@ -2213,7 +2249,7 @@ nm_connection_get_setting_serial (
 
    
 
    Returns
    
-
     an NMSettingSerial if the connection contains one, otherwise NULL. 
    
+
     an NMSettingSerial if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2240,7 +2276,7 @@ nm_connection_get_setting_tun (
 
    
 
    Returns
    
-
     an NMSettingTun if the connection contains one, otherwise NULL. 
    
+
     an NMSettingTun if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
    Since: 1.2
    
@@ -2268,7 +2304,7 @@ nm_connection_get_setting_vpn (
 
    
 
    Returns
    
-
     an NMSettingVpn if the connection contains one, otherwise NULL. 
    
+
     an NMSettingVpn if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2295,7 +2331,7 @@ nm_connection_get_setting_wimax (
 
    
 
    Returns
    
-
     an NMSettingWimax if the connection contains one, otherwise NULL. 
    
+
     an NMSettingWimax if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2322,7 +2358,7 @@ nm_connection_get_setting_adsl (
 
    
 
    Returns
    
-
     an NMSettingAdsl if the connection contains one, otherwise NULL. 
    
+
     an NMSettingAdsl if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2349,7 +2385,7 @@ nm_connection_get_setting_wired (
 
    
 
    Returns
    
-
     an NMSettingWired if the connection contains one, otherwise NULL. 
    
+
     an NMSettingWired if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2376,7 +2412,7 @@ nm_connection_get_setting_wireless (
 
    
 
    Returns
    
-
     an NMSettingWireless if the connection contains one, otherwise NULL. 
    
+
     an NMSettingWireless if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2404,7 +2440,7 @@ nm_connection_get_setting_wireless_security
 
 
    
 
    Returns
    
-
     an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. 
    
+
     an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2431,7 +2467,7 @@ nm_connection_get_setting_vlan (
 
    
 
    Returns
    
-
     an NMSettingVlan if the connection contains one, otherwise NULL. 
    
+
     an NMSettingVlan if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
@@ -2458,7 +2494,7 @@ nm_connection_get_setting_vxlan (
 
    
 
    Returns
    
-
     an NMSettingVxlan if the connection contains one, otherwise NULL. 
    
+
     an NMSettingVxlan if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
 
    Since: 1.2
    
@@ -2512,7 +2548,7 @@ nm_connection_get_setting_vxlan (
     
-
+
@@ -2540,8 +2576,8 @@ nm_connection_get_setting_vxlan (
    NM_VARIANT_TYPE_SETTING
    
 
    #define NM_VARIANT_TYPE_SETTING G_VARIANT_TYPE_VARDICT
 
    
-
    GVariantType for a dictionary mapping from property names to values. This is
-an alias for G_VARIANT_TYPE_VARDICT, and is the type of each element of
+
    GVariantType for a dictionary mapping from property names to values. This is
+an alias for G_VARIANT_TYPE_VARDICT, and is the type of each element of
 an NM_VARIANT_TYPE_CONNECTION dictionary.
    
 
 
    
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index eaf6288c..8730309c 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -117,7 +117,7 @@
 
     
-
-
-
+
+GPtrArray *
 
@@ -538,36 +538,36 @@
 
 
+gchar *
 
+gchar *
 
-
+
+gchar *
 
+gchar *
 
+gchar *
 
@@ -585,44 +585,44 @@
 
 
+GPtrArray *
 
-
+
-
+
-
+
-
+
+gchar *
 
+gchar *
 
-
+
@@ -632,19 +632,19 @@
 
-
+
+gchar *
 
+gchar *
 
@@ -662,7 +662,7 @@
 
-
+
    
 
    GTypeInterface parent;
    GTypeInterface parent;
    		
 
    the parent interace struct
    		
  
 
    
 
-gboolean
+gboolean
 
 
 nm_device_get_managed ()
@@ -133,7 +133,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_get_autoconnect ()
@@ -149,7 +149,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_get_firmware_missing ()
@@ -157,7 +157,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_get_nm_plugin_missing ()
@@ -220,7 +220,7 @@
 
 
    
 
    const GPtrArray *
+const GPtrArray *
 
 
 nm_device_get_available_connections ()
@@ -235,7 +235,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_device_get_mtu ()
@@ -243,7 +243,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_is_real ()
@@ -251,7 +251,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_is_software ()
@@ -288,7 +288,7 @@
 
    
 
    
 
-GPtrArray *
+GPtrArray *
 
 
 nm_device_get_lldp_neighbors ()
@@ -304,7 +304,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_reapply ()
@@ -320,7 +320,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_reapply_finish ()
@@ -352,7 +352,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_disconnect ()
@@ -368,7 +368,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_disconnect_finish ()
@@ -376,7 +376,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_delete ()
@@ -392,7 +392,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_delete_finish ()
@@ -400,7 +400,7 @@
 
    
 
    
 
-GPtrArray *
+GPtrArray *
 
 
 nm_device_filter_connections ()
@@ -408,7 +408,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_connection_valid ()
@@ -416,7 +416,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_device_connection_compatible ()
@@ -424,7 +424,7 @@
 
    
 
    
 
-GType
+GType
 
 
 nm_device_get_setting_type ()
@@ -464,7 +464,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_lldp_neighbor_get_attr_string_value ()
@@ -472,14 +472,14 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_lldp_neighbor_get_attr_uint_value ()
 
 
    
 
    const GVariantType *
+const GVariantType *
 
 
 nm_lldp_neighbor_get_attr_type ()
@@ -504,13 +504,13 @@
 Read
 
    
 
    gbooleangboolean
 autoconnect
 Read / Write
 
    
 
    
 
-GPtrArray *available-connections
 Read
 
    
 
-gchar *driver
 Read
 
    
 
    
 
-gchar *driver-version
 Read
 
    
 
    gbooleangboolean
 firmware-missing
 Read
 
    
 
    
 
-gchar *firmware-version
 Read
 
    
 
    
 
-gchar *interface
 Read
 
    
 
    
 
-gchar *ip-interface
 Read
 
    
 
-GPtrArray *lldp-neighbors
 Read
 
    
 
    gbooleangboolean
 managed
 Read
 
    
 
    guintguint
 metered
 Read
 
    
 
    guintguint
 mtu
 Read
 
    
 
    gbooleangboolean
 nm-plugin-missing
 Read
 
    
 
    
 
-gchar *physical-port-id
 Read
 
    
 
    
 
-gchar *product
 Read
 
    
 
    gbooleangboolean
 real
 Read
 
    Read
 
    
 
    guintguint
 state-reason
 Read
 
    
 
    
 
-gchar *udi
 Read
 
    
 
    
 
-gchar *vendor
 Read
 
    
 void
 state-changedRun FirstRun First
 
    
 
    
 
    
@@ -791,20 +791,21 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GBoxed
+
        GBoxed
     ╰── NMLldpNeighbor
-    GObject
+    GObject
     ╰── NMObject
         ╰── NMDevice
             ├── NMDeviceAdsl
             ├── NMDeviceBond
             ├── NMDeviceBridge
             ├── NMDeviceBt
+            ├── NMDeviceDummy
             ├── NMDeviceEthernet
             ├── NMDeviceGeneric
             ├── NMDeviceInfiniband
             ├── NMDeviceIPTunnel
-            ├── NMDeviceMacsec
+            ├── NMDeviceMacsec
             ├── NMDeviceMacvlan
             ├── NMDeviceModem
             ├── NMDeviceOlpcMesh
@@ -820,7 +821,7 @@
 
    Implemented Interfaces
    
 
    
 NMDevice implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -1069,7 +1070,7 @@ nm_device_get_hw_address (
 
    Returns
    
-
     the current MAC of the device, or NULL.
+
     the current MAC of the device, or NULL.
 This is the internal string used by the device, and must not be modified.
    
 
    
 
@@ -1102,7 +1103,7 @@ nm_device_get_capabilities (
 
    nm_device_get_managed ()
    
-
    gboolean
+
    gboolean
 nm_device_get_managed (NMDevice *device);
    
 
    Whether the NMDevice is managed by NetworkManager.
    
 
    
@@ -1122,7 +1123,7 @@ nm_device_get_managed (
 
    Returns
    
-
     TRUE if the device is managed by NetworkManager
    
+
     TRUE if the device is managed by NetworkManager
    
 
    
 
 
    
@@ -1130,7 +1131,7 @@ nm_device_get_managed (
    nm_device_set_managed ()
    
 
    void
 nm_device_set_managed (NMDevice *device,
-                       gboolean managed);
    
+                       gboolean managed);
    
 
    Enables or disables management of  NMDevice by NetworkManager.
    
 
    
 
    Parameters
    
@@ -1148,7 +1149,7 @@ nm_device_set_managed (
    managed
    
-
    TRUE to make the device managed by NetworkManager.
    
+
    TRUE to make the device managed by NetworkManager.
    
  
 
 
@@ -1159,7 +1160,7 @@ nm_device_set_managed (
 
    nm_device_get_autoconnect ()
    
-
    gboolean
+
    gboolean
 nm_device_get_autoconnect (NMDevice *device);
    
 
    Whether the NMDevice can be autoconnected.
    
 
    
@@ -1179,7 +1180,7 @@ nm_device_get_autoconnect (
 
    Returns
    
-
     TRUE if the device is allowed to be autoconnected
    
+
     TRUE if the device is allowed to be autoconnected
    
 
    
 
    
 
    
@@ -1187,7 +1188,7 @@ nm_device_get_autoconnect (
    nm_device_set_autoconnect ()
    
 
    void
 nm_device_set_autoconnect (NMDevice *device,
-                           gboolean autoconnect);
    
+                           gboolean autoconnect);
 
    Enables or disables automatic activation of the NMDevice.
    
 
    
 
    Parameters
    
@@ -1205,7 +1206,7 @@ nm_device_set_autoconnect (
    autoconnect
    
-
    TRUE to enable autoconnecting
    
+
    TRUE to enable autoconnecting
    
  
 
 
@@ -1215,7 +1216,7 @@ nm_device_set_autoconnect (
 
    nm_device_get_firmware_missing ()
    
-
    gboolean
+
    gboolean
 nm_device_get_firmware_missing (NMDevice *device);
    
 
    Indicates that firmware required for the device's operation is likely
 to be missing.
    
@@ -1236,14 +1237,14 @@ to be missing.
    
 
    
 
    
 
    Returns
    
-
     TRUE if firmware required for the device's operation is likely
+
     TRUE if firmware required for the device's operation is likely
 to be missing.
    
 
    
 
 
    
 
    
 
    nm_device_get_nm_plugin_missing ()
    
-
    gboolean
+
    gboolean
 nm_device_get_nm_plugin_missing (NMDevice *device);
    
 
    Indicates that the NetworkManager plugin for the device is not installed.
    
 
    
@@ -1263,7 +1264,7 @@ nm_device_get_nm_plugin_missing (
 
    
 
    Returns
    
-
     TRUE if the device plugin not installed.
    
+
     TRUE if the device plugin not installed.
    
 
    
 
    Since: 1.2
    
 
    
@@ -1292,7 +1293,7 @@ works with VPN connections.
    
 
    
 
    
 
    Returns
    
-
     the IPv4 NMIPConfig, or NULL if the device is not
+
     the IPv4 NMIPConfig, or NULL if the device is not
 activated. 
    
 
    [transfer none]
    
 
    
@@ -1322,7 +1323,7 @@ works with VPN connections.
    
 
 
    
 
    Returns
    
-
     the IPv4 NMDhcpConfig, or NULL if the device is
+
     the IPv4 NMDhcpConfig, or NULL if the device is
 not activated or not using DHCP. 
    
 
    [transfer none]
    
 
    
@@ -1352,7 +1353,7 @@ works with VPN connections.
    
 
 
    
 
    Returns
    
-
     the IPv6 NMIPConfig or NULL if the device is not activated. 
    
+
     the IPv6 NMIPConfig or NULL if the device is not activated. 
    
 
    [transfer none]
    
 
    
 
@@ -1381,7 +1382,7 @@ works with VPN connections.
    
 
 
    
 
    Returns
    
-
     the IPv6 NMDhcpConfig, or NULL if the device is
+
     the IPv6 NMDhcpConfig, or NULL if the device is
 not activated or not using DHCPv6. 
    
 
    [transfer none]
    
 
    
@@ -1461,7 +1462,7 @@ nm_device_get_active_connection (
 
    
 
    Returns
    
-
     the NMActiveConnection or NULL if the device is
+
     the NMActiveConnection or NULL if the device is
 not part of an active connection. 
    
 
    [transfer none]
    
 
    
@@ -1469,7 +1470,7 @@ not part of an active connection. 
    
 
    
 
    
 
    nm_device_get_available_connections ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_device_get_available_connections (NMDevice *device);
    
 
    Gets the NMRemoteConnections currently known to the daemon that could
 be activated on device
@@ -1491,7 +1492,7 @@ be activated on device
 
    
 
    
 
    Returns
    
-
     the GPtrArray
+
     the GPtrArray
 containing NMRemoteConnections. This is the internal copy used by
 the connection, and must not be modified. 
    
 
    [element-type NMRemoteConnection]
    
@@ -1502,7 +1503,7 @@ the connection, and must not be modified. 
    
 
    nm_device_get_physical_port_id ()
    
 
    const char *
 nm_device_get_physical_port_id (NMDevice *device);
    
-
    Gets the physical port ID of the NMDevice. If non-NULL, this is
+
    Gets the physical port ID of the NMDevice. If non-NULL, this is
 an opaque string that can be used to recognize when
 seemingly-unrelated NMDevices are actually just different virtual
 ports on a single physical port. (Eg, NPAR / SR-IOV.)
    
@@ -1523,7 +1524,7 @@ ports on a single physical port. (Eg, NPAR / SR-IOV.)
    
 
    
 
    
 
    Returns
    
-
     the physical port ID of the device, or NULL if the port
+
     the physical port ID of the device, or NULL if the port
 ID is unknown. This is the internal string used by the device and
 must not be modified.
    
 
    
@@ -1531,7 +1532,7 @@ must not be modified.
    
 
    
 
    
 
    nm_device_get_mtu ()
    
-
    guint32
+
    guint32
 nm_device_get_mtu (NMDevice *device);
    
 
    Gets the  MTU of the NMDevice.
    
 
    
@@ -1557,7 +1558,7 @@ nm_device_get_mtu (
 
    nm_device_is_real ()
    
-
    gboolean
+
    gboolean
 nm_device_is_real (NMDevice *device);
    
 
    
 
    Parameters
    
@@ -1576,7 +1577,7 @@ nm_device_is_real (
 
    Returns
    
-
     TRUE if the device exists, or FALSE if it is a placeholder device
+
     TRUE if the device exists, or FALSE if it is a placeholder device
 that could be automatically created by NetworkManager if one of its
 “available-connections” was activated.
    
 
    
@@ -1585,7 +1586,7 @@ that could be automatically created by NetworkManager if one of its
 
    
 
    
 
    nm_device_is_software ()
    
-
    gboolean
+
    gboolean
 nm_device_is_software (NMDevice *device);
    
 
    Whether the device is a software device.
    
 
    
@@ -1605,8 +1606,8 @@ nm_device_is_software (
 
    Returns
    
-
     TRUE if device
-is a software device, FALSE if it is a hardware device.
    
+
     TRUE if device
+is a software device, FALSE if it is a hardware device.
    
 
    
 
    
 
    
@@ -1722,7 +1723,7 @@ nm_device_get_metered (
 
    nm_device_get_lldp_neighbors ()
    
-
    GPtrArray *
+
    GPtrArray *
 nm_device_get_lldp_neighbors (NMDevice *device);
    
 
    Gets the list of neighbors discovered through LLDP.
    
 
    
@@ -1742,7 +1743,7 @@ nm_device_get_lldp_neighbors (
 
    Returns
    
-
     the GPtrArray
+
     the GPtrArray
 containing NMLldpNeighbors. This is the internal copy used by the
 device and must not be modified. The library never modifies the returned
 array and thus it is safe for callers to reference and keep using it. 
    
@@ -1791,13 +1792,13 @@ devices in devices
 
    
 
    
 
    nm_device_reapply ()
    
-
    gboolean
+
    gboolean
 nm_device_reapply (NMDevice *device,
                    NMConnection *connection,
-                   guint64 version_id,
-                   guint32 flags,
-                   GCancellable *cancellable,
-                   GError **error);
    
+                   guint64 version_id,
+                   guint32 flags,
+                   GCancellable *cancellable,
+                   GError **error);
    
 
    Attempts to update device with changes to the currently active connection
 made since it was last applied.
    
 
    
@@ -1816,7 +1817,7 @@ made since it was last applied.
    
 
 
 
    connection
    
-
    the NMConnection to replace the applied settings with or NULL to reuse existing
    
+
    the NMConnection to replace the applied settings with or NULL to reuse existing
    
  
 
 
@@ -1833,12 +1834,12 @@ catch concurrent accesses.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -1846,7 +1847,7 @@ catch concurrent accesses.
    
 
    
 
    
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
 
    Since: 1.2
    
@@ -1857,11 +1858,11 @@ will be set.
    
 
    void
 nm_device_reapply_async (NMDevice *device,
                          NMConnection *connection,
-                         guint64 version_id,
-                         guint32 flags,
-                         GCancellable *cancellable,
-                         GAsyncReadyCallback callback,
-                         gpointer user_data);
    
+                         guint64 version_id,
+                         guint32 flags,
+                         GCancellable *cancellable,
+                         GAsyncReadyCallback callback,
+                         gpointer user_data);
    
 
    Asynchronously begins an attempt to update device with changes to the
 currently active connection made since it was last applied.
    
 
    
@@ -1880,7 +1881,7 @@ currently active connection made since it was last applied.
    
 
 
 
    connection
    
-
    the NMConnection to replace the applied settings with or NULL to reuse existing
    
+
    the NMConnection to replace the applied settings with or NULL to reuse existing
    
  
 
 
@@ -1897,7 +1898,7 @@ catch concurrent accesses.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
@@ -1919,10 +1920,10 @@ catch concurrent accesses.
    
 
    
 
    
 
    nm_device_reapply_finish ()
    
-
    gboolean
+
    gboolean
 nm_device_reapply_finish (NMDevice *device,
-                          GAsyncResult *result,
-                          GError **error);
    
+                          GAsyncResult *result,
+                          GError **error);
    
 
    Gets the result of a call to nm_device_reapply_async().
    
 
    
 
    Parameters
    
@@ -1940,12 +1941,12 @@ nm_device_reapply_finish (
    result
    
-
    the result passed to the GAsyncReadyCallback
    
+
    the result passed to the GAsyncReadyCallback
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -1953,7 +1954,7 @@ nm_device_reapply_finish (
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
 
    Since: 1.2
    
@@ -1963,10 +1964,10 @@ will be set.
    
 
    nm_device_get_applied_connection ()
    
 
    NMConnection *
 nm_device_get_applied_connection (NMDevice *device,
-                                  guint32 flags,
-                                  guint64 *version_id,
-                                  GCancellable *cancellable,
-                                  GError **error);
    
+                                  guint32 flags,
+                                  guint64 *version_id,
+                                  GCancellable *cancellable,
+                                  GError **error);
    
 
    Fetch the currently applied connection on the device.
    
 
    
 
    Parameters
    
@@ -1995,12 +1996,12 @@ the applied connection. 
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -2009,7 +2010,7 @@ the applied connection. 
    
 
    
 
    Returns
    
 
     a NMConnection with the currently applied settings
-or NULL on error.
    
+or NULL on error.
    
 
    The connection is as received from D-Bus and might not validate according
 to nm_connection_verify(). 
    
 
    [transfer full]
    
@@ -2022,10 +2023,10 @@ to void
 nm_device_get_applied_connection_async
                                (NMDevice *device,
-                                guint32 flags,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
    
+                                guint32 flags,
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);
 
    Asynchronously begins an get the a currently applied connection.
    
 
    
 
    Parameters
    
@@ -2048,7 +2049,7 @@ nm_device_get_applied_connection_async
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
@@ -2073,9 +2074,9 @@ nm_device_get_applied_connection_async
 
    NMConnection *
 nm_device_get_applied_connection_finish
                                (NMDevice *device,
-                                GAsyncResult *result,
-                                guint64 *version_id,
-                                GError **error);
    
+                                GAsyncResult *result,
+                                guint64 *version_id,
+                                GError **error);
 
    Gets the result of a call to nm_device_get_applied_connection_async().
    
 
    
 
    Parameters
    
@@ -2093,7 +2094,7 @@ nm_device_get_applied_connection_finish
 
 
 
    result
    
-
    the result passed to the GAsyncReadyCallback
    
+
    the result passed to the GAsyncReadyCallback
    
  
 
 
@@ -2104,7 +2105,7 @@ connection. 
    
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -2112,7 +2113,7 @@ connection. 
    
 
    
 
    
 
    Returns
    
-
     a currently applied NMConnection or NULL in case
+
     a currently applied NMConnection or NULL in case
 of error.
    
 
    The connection is as received from D-Bus and might not validate according
 to nm_connection_verify(). 
    
@@ -2123,10 +2124,10 @@ to 
 
    nm_device_disconnect ()
    
-
    gboolean
+
    gboolean
 nm_device_disconnect (NMDevice *device,
-                      GCancellable *cancellable,
-                      GError **error);
    
+                      GCancellable *cancellable,
+                      GError **error);
    
 
    Disconnects the device if currently connected, and prevents the device from
 automatically connecting to networks until the next manual network connection
 request.
    
@@ -2146,12 +2147,12 @@ request.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -2159,7 +2160,7 @@ request.
    
 
    
 
    
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
 
    
@@ -2168,9 +2169,9 @@ will be set.
    
 
    nm_device_disconnect_async ()
    
 
    void
 nm_device_disconnect_async (NMDevice *device,
-                            GCancellable *cancellable,
-                            GAsyncReadyCallback callback,
-                            gpointer user_data);
    
+                            GCancellable *cancellable,
+                            GAsyncReadyCallback callback,
+                            gpointer user_data);
 
    Asynchronously begins disconnecting the device if currently connected, and
 prevents the device from automatically connecting to networks until the next
 manual network connection request.
    
@@ -2190,7 +2191,7 @@ manual network connection request.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
@@ -2211,10 +2212,10 @@ manual network connection request.
    
 
    
 
    
 
    nm_device_disconnect_finish ()
    
-
    gboolean
+
    gboolean
 nm_device_disconnect_finish (NMDevice *device,
-                             GAsyncResult *result,
-                             GError **error);
    
+                             GAsyncResult *result,
+                             GError **error);
    
 
    Gets the result of a call to nm_device_disconnect_async().
    
 
    
 
    Parameters
    
@@ -2232,12 +2233,12 @@ nm_device_disconnect_finish (
    result
    
-
    the result passed to the GAsyncReadyCallback
    
+
    the result passed to the GAsyncReadyCallback
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -2245,17 +2246,17 @@ nm_device_disconnect_finish (
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
 
    
 
    
 
    
 
    nm_device_delete ()
    
-
    gboolean
+
    gboolean
 nm_device_delete (NMDevice *device,
-                  GCancellable *cancellable,
-                  GError **error);
    
+                  GCancellable *cancellable,
+                  GError **error);
    
 
    Deletes the software device. Hardware devices can't be deleted.
    
 
    
 
    Parameters
    
@@ -2273,12 +2274,12 @@ nm_device_delete (
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -2286,7 +2287,7 @@ nm_device_delete (
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
 
    
@@ -2295,9 +2296,9 @@ will be set.
    
 
    nm_device_delete_async ()
    
 
    void
 nm_device_delete_async (NMDevice *device,
-                        GCancellable *cancellable,
-                        GAsyncReadyCallback callback,
-                        gpointer user_data);
    
+                        GCancellable *cancellable,
+                        GAsyncReadyCallback callback,
+                        gpointer user_data);
 
    Asynchronously begins deleteing the software device. Hardware devices can't
 be deleted.
    
 
    
@@ -2316,7 +2317,7 @@ be deleted.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
@@ -2337,10 +2338,10 @@ be deleted.
    
 
    
 
    
 
    nm_device_delete_finish ()
    
-
    gboolean
+
    gboolean
 nm_device_delete_finish (NMDevice *device,
-                         GAsyncResult *result,
-                         GError **error);
    
+                         GAsyncResult *result,
+                         GError **error);
    
 
    Gets the result of a call to nm_device_delete_async().
    
 
    
 
    Parameters
    
@@ -2358,12 +2359,12 @@ nm_device_delete_finish (
    result
    
-
    the result passed to the GAsyncReadyCallback
    
+
    the result passed to the GAsyncReadyCallback
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -2371,16 +2372,16 @@ nm_device_delete_finish (
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
 
    
 
    
 
    
 
    nm_device_filter_connections ()
    
-
    GPtrArray *
+
    GPtrArray *
 nm_device_filter_connections (NMDevice *device,
-                              const GPtrArray *connections);
    
+                              const GPtrArray *connections);
    
 
    Filters a given array of connections for a given NMDevice object and returns
 connections which may be activated with the device. For example if device
 
@@ -2407,7 +2408,7 @@ incompatible with the device. To get the full list of connections see
 
 
 
    connections
    
-
     an array of NMConnections to filter. 
    
+
     an array of NMConnections to filter. 
    
 [element-type NMConnection]
 
 
@@ -2416,16 +2417,16 @@ incompatible with the device. To get the full list of connections see
 
    
 
    Returns
    
 
     an array of
-NMConnections that could be activated with the given device
+NMConnections that could be activated with the given device
 .  The array
-should be freed with g_ptr_array_unref() when it is no longer required. 
    
+should be freed with g_ptr_array_unref() when it is no longer required. 
    
 
    [transfer container][element-type NMConnection]
    
 
    
 
    
 
    
 
    
 
    nm_device_connection_valid ()
    
-
    gboolean
+
    gboolean
 nm_device_connection_valid (NMDevice *device,
                             NMConnection *connection);
    
 
    Validates a given connection for a given NMDevice object and returns
@@ -2462,17 +2463,17 @@ against
    
 
    
 
    
 
    Returns
    
-
     TRUE if the connection may be activated with this device, FALSE
+
     TRUE if the connection may be activated with this device, FALSE
 if is incompatible with the device's capabilities and characteristics.
    
 
    
 
    
 
    
 
    
 
    nm_device_connection_compatible ()
    
-
    gboolean
+
    gboolean
 nm_device_connection_compatible (NMDevice *device,
                                  NMConnection *connection,
-                                 GError **error);
    
+                                 GError **error);
    
 
    Validates a given connection for a given NMDevice object and returns
 whether the connection may be activated with the device. For example if
 device
@@ -2507,7 +2508,7 @@ against
    
 
 
 
    error
    
-
    return location for a GError, or NULL
    
+
    return location for a GError, or NULL
    
  
 
 
@@ -2515,14 +2516,14 @@ against
    
 
    
 
    
 
    Returns
    
-
     TRUE if the connection may be activated with this device, FALSE
+
     TRUE if the connection may be activated with this device, FALSE
 if is incompatible with the device's capabilities and characteristics.
    
 
    
 
    
 
    
 
    
 
    nm_device_get_setting_type ()
    
-
    GType
+
    GType
 nm_device_get_setting_type (NMDevice *device);
    
 
    Gets the (primary) NMSetting subtype associated with connections
 that can be used on device
@@ -2632,7 +2633,7 @@ nm_lldp_neighbor_get_attr_names (
 
    
 
    Returns
    
-
     a NULL-terminated array of attribute names. 
    
+
     a NULL-terminated array of attribute names. 
    
 
    [transfer full]
    
 
    
 
    Since: 1.2
    
@@ -2640,7 +2641,7 @@ nm_lldp_neighbor_get_attr_names (
 
    
 
    nm_lldp_neighbor_get_attr_string_value ()
    
-
    gboolean
+
    gboolean
 nm_lldp_neighbor_get_attr_string_value
                                (NMLldpNeighbor *neighbor,
                                 char *name,
@@ -2677,18 +2678,18 @@ nm_lldp_neighbor_get_attr_string_value
 
    
 
    
 
    Returns
    
-
     TRUE if a string attribute with name name
-was found, FALSE otherwise
    
+
     TRUE if a string attribute with name name
+was found, FALSE otherwise
    
 
    
 
    Since: 1.2
    
 
    
 
    
 
    
 
    nm_lldp_neighbor_get_attr_uint_value ()
    
-
    gboolean
+
    gboolean
 nm_lldp_neighbor_get_attr_uint_value (NMLldpNeighbor *neighbor,
                                       char *name,
-                                      guint *out_value);
    
+                                      guint *out_value);
    
 
    Gets the uint value of attribute with name name
  on neighbor
 
    
@@ -2721,15 +2722,15 @@ nm_lldp_neighbor_get_attr_uint_value (
 
    Returns
    
-
     TRUE if a uint attribute with name name
-was found, FALSE otherwise
    
+
     TRUE if a uint attribute with name name
+was found, FALSE otherwise
    
 
    
 
    Since: 1.2
    
 
 
    
 
    
 
    nm_lldp_neighbor_get_attr_type ()
    
-
    const GVariantType *
+
    const GVariantType *
 nm_lldp_neighbor_get_attr_type (NMLldpNeighbor *neighbor,
                                 char *name);
    
 
    Get the type of an attribute.
    
@@ -2757,7 +2758,7 @@ nm_lldp_neighbor_get_attr_type (
 
    
 
    Returns
    
-
     the GVariantType of the attribute with name name
+
     the GVariantType of the attribute with name name
 
    
 
    
 
    Since: 1.2
    
@@ -2943,7 +2944,7 @@ nm_lldp_neighbor_get_attr_type (
 
    
 
    The “autoconnect” property
    
-
      “autoconnect”              gboolean
    
+
      “autoconnect”              gboolean
    
 
    Whether the device can auto-activate a connection.
    
 
    Flags: Read / Write
    
 
    Default value: TRUE
    
@@ -2951,7 +2952,7 @@ nm_lldp_neighbor_get_attr_type (
 
    
 
    The “available-connections” property
    
-
      “available-connections”    GPtrArray *
    
+
      “available-connections”    GPtrArray *
    
 
    The available connections of the device
    
 
    Element-type: NMRemoteConnection
    
 
    Flags: Read
    
@@ -2988,7 +2989,7 @@ nm_lldp_neighbor_get_attr_type (
 
    
 
    The “driver” property
    
-
      “driver”                   gchar *
    
+
      “driver”                   gchar *
    
 
    The driver of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -2996,7 +2997,7 @@ nm_lldp_neighbor_get_attr_type (
 
    
 
    The “driver-version” property
    
-
      “driver-version”           gchar *
    
+
      “driver-version”           gchar *
    
 
    The version of the device driver.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -3004,8 +3005,8 @@ nm_lldp_neighbor_get_attr_type (
 
    
 
    The “firmware-missing” property
    
-
      “firmware-missing”         gboolean
    
-
    When TRUE indicates the device is likely missing firmware required
+
      “firmware-missing”         gboolean
    
+
    When TRUE indicates the device is likely missing firmware required
 for its operation.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -3013,7 +3014,7 @@ for its operation.
    
 
    
 
    
 
    The “firmware-version” property
    
-
      “firmware-version”         gchar *
    
+
      “firmware-version”         gchar *
    
 
    The firmware version of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -3021,7 +3022,7 @@ for its operation.
    
 
    
 
    
 
    The “interface” property
    
-
      “interface”                gchar *
    
+
      “interface”                gchar *
    
 
    The interface of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -3029,7 +3030,7 @@ for its operation.
    
 
    
 
    
 
    The “ip-interface” property
    
-
      “ip-interface”             gchar *
    
+
      “ip-interface”             gchar *
    
 
    The IP interface of the device which should be used for all IP-related
 operations like addressing and routing.
    
 
    Flags: Read
    
@@ -3052,14 +3053,14 @@ operations like addressing and routing.
    
 
    
 
    
 
    The “lldp-neighbors” property
    
-
      “lldp-neighbors”           GPtrArray *
    
+
      “lldp-neighbors”           GPtrArray *
    
 
    The LLDP neighbors.
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “managed” property
    
-
      “managed”                  gboolean
    
+
      “managed”                  gboolean
    
 
    Whether the device is managed by NetworkManager.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -3067,7 +3068,7 @@ operations like addressing and routing.
    
 
    
 
    
 
    The “metered” property
    
-
      “metered”                  guint
    
+
      “metered”                  guint
    
 
    Whether the device is metered.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -3076,7 +3077,7 @@ operations like addressing and routing.
    
 
    
 
    
 
    The “mtu” property
    
-
      “mtu”                      guint
    
+
      “mtu”                      guint
    
 
    The MTU of the device.
    
 
    Flags: Read
    
 
    Default value: 1500
    
@@ -3084,8 +3085,8 @@ operations like addressing and routing.
    
 
    
 
    
 
    The “nm-plugin-missing” property
    
-
      “nm-plugin-missing”        gboolean
    
-
    When TRUE indicates that the NetworkManager plugin for the device
+
      “nm-plugin-missing”        gboolean
    
+
    When TRUE indicates that the NetworkManager plugin for the device
 is not installed.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -3094,7 +3095,7 @@ is not installed.
    
 
    
 
    
 
    The “physical-port-id” property
    
-
      “physical-port-id”         gchar *
    
+
      “physical-port-id”         gchar *
    
 
    The physical port ID of the device. (See
 nm_device_get_physical_port_id().)
    
 
    Flags: Read
    
@@ -3103,7 +3104,7 @@ is not installed.
    
 
    
 
    
 
    The “product” property
    
-
      “product”                  gchar *
    
+
      “product”                  gchar *
    
 
    The product string of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -3111,7 +3112,7 @@ is not installed.
    
 
    
 
    
 
    The “real” property
    
-
      “real”                     gboolean
    
+
      “real”                     gboolean
    
 
    Whether the device is real or is a placeholder device that could
 be created automatically by NetworkManager if one of its
 “available-connections” was activated.
    
@@ -3130,7 +3131,7 @@ be created automatically by NetworkManager if one of its
 
    
 
    
 
    The “state-reason” property
    
-
      “state-reason”             guint
    
+
      “state-reason”             guint
    
 
    The reason for the device state.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -3138,7 +3139,7 @@ be created automatically by NetworkManager if one of its
 
    
 
    
 
    The “udi” property
    
-
      “udi”                      gchar *
    
+
      “udi”                      gchar *
    
 
    An operating-system specific device hardware identifier; this is not
 unique to a specific hardware device across reboots or hotplugs.  It
 is an opaque string which for some device types (Bluetooth, Modem)
@@ -3151,7 +3152,7 @@ request more information about the device from those services.
    
 
    
 
    
 
    The “vendor” property
    
-
      “vendor”                   gchar *
    
+
      “vendor”                   gchar *
    
 
    The vendor string of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -3163,10 +3164,10 @@ request more information about the device from those services.
    
 
    The “state-changed” signal
    
 
    void
 user_function (NMDevice *device,
-               guint     new_state,
-               guint     old_state,
-               guint     reason,
-               gpointer  user_data)
    
+               guint     new_state,
+               guint     old_state,
+               guint     reason,
+               gpointer  user_data)
    
 
    Notifies the state change of a NMDevice.
    
 
    
 
    Parameters
    
@@ -3205,7 +3206,7 @@ user_function (
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
 
 
diff --git a/docs/libnm/html/NMDeviceAdsl.html b/docs/libnm/html/NMDeviceAdsl.html
index 2a158f31..cb06cd98 100644
--- a/docs/libnm/html/NMDeviceAdsl.html
+++ b/docs/libnm/html/NMDeviceAdsl.html
@@ -43,7 +43,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_adsl_get_carrier ()
@@ -60,7 +60,7 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
@@ -87,7 +87,7 @@
 
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceAdsl
@@ -97,7 +97,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceAdsl implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -106,7 +106,7 @@ NMDeviceAdsl implements
 
    Functions
    
 
    
 
    nm_device_adsl_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_adsl_get_carrier (NMDeviceAdsl *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -126,7 +126,7 @@ nm_device_adsl_get_carrier (
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    
 
    
@@ -147,7 +147,7 @@ nm_device_adsl_get_carrier (
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html
index fdd703ad..5d90a4b9 100644
--- a/docs/libnm/html/NMDeviceBond.html
+++ b/docs/libnm/html/NMDeviceBond.html
@@ -51,14 +51,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_bond_get_carrier ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_bond_get_slaves ()
@@ -77,19 +77,19 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 slaves
 Read
 
@@ -125,7 +125,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceBond
@@ -135,7 +135,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceBond implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -171,7 +171,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_bond_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_bond_get_carrier (NMDeviceBond *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -191,13 +191,13 @@ nm_device_bond_get_carrier (
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    
 
    
 
    
 
    nm_device_bond_get_slaves ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_device_bond_get_slaves (NMDeviceBond *device);
    
 
    Gets the devices currently slaved to device
 .
    
@@ -218,7 +218,7 @@ nm_device_bond_get_slaves (
 
    Returns
    
-
     the GPtrArray containing
+
     the GPtrArray containing
 NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 
    
@@ -255,7 +255,7 @@ copy used by the device, and must not be modified. 
    
 
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -263,7 +263,7 @@ copy used by the device, and must not be modified. 
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -271,7 +271,7 @@ copy used by the device, and must not be modified. 
    
 
    
 
    
 
    The “slaves” property
    
-
      “slaves”                   GPtrArray *
    
+
      “slaves”                   GPtrArray *
    
 
    The devices slaved to the bond device.
    
 
    Element-type: NMDevice
    
 
    Flags: Read
    
diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html
index f566d8f0..0f50f3e4 100644
--- a/docs/libnm/html/NMDeviceBridge.html
+++ b/docs/libnm/html/NMDeviceBridge.html
@@ -51,14 +51,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_bridge_get_carrier ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_bridge_get_slaves ()
@@ -77,19 +77,19 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 slaves
 Read
 
@@ -125,7 +125,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceBridge
@@ -135,7 +135,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceBridge implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -171,7 +171,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_bridge_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_bridge_get_carrier (NMDeviceBridge *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -191,13 +191,13 @@ nm_device_bridge_get_carrier (
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    
 
    
 
    
 
    nm_device_bridge_get_slaves ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_device_bridge_get_slaves (NMDeviceBridge *device);
    
 
    Gets the devices currently slaved to device
 .
    
@@ -218,7 +218,7 @@ nm_device_bridge_get_slaves (
 
    Returns
    
-
     the GPtrArray containing
+
     the GPtrArray containing
 NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 
    
@@ -255,7 +255,7 @@ copy used by the device, and must not be modified. 
    
 
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -263,7 +263,7 @@ copy used by the device, and must not be modified. 
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -271,7 +271,7 @@ copy used by the device, and must not be modified. 
    
 
    
 
    
 
    The “slaves” property
    
-
      “slaves”                   GPtrArray *
    
+
      “slaves”                   GPtrArray *
    
 
    The devices slaved to the bridge device.
    
 
    Element-type: NMDevice
    
 
    Flags: Read
    
diff --git a/docs/libnm/html/NMDeviceBt.html b/docs/libnm/html/NMDeviceBt.html
index 7f7ca146..eea42deb 100644
--- a/docs/libnm/html/NMDeviceBt.html
+++ b/docs/libnm/html/NMDeviceBt.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -23,7 +23,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 
    
 
    
@@ -83,13 +83,13 @@
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 name
 Read
 
@@ -125,7 +125,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceBt
@@ -135,7 +135,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceBt implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -257,7 +257,7 @@ nm_device_bt_get_capabilities (
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -265,7 +265,7 @@ nm_device_bt_get_capabilities (
 
    
 
    The “name” property
    
-
      “name”                     gchar *
    
+
      “name”                     gchar *
    
 
    The name of the bluetooth device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
diff --git a/docs/libnm/html/NMDeviceDummy.html b/docs/libnm/html/NMDeviceDummy.html
new file mode 100644
index 00000000..5dc3564f
--- /dev/null
+++ b/docs/libnm/html/NMDeviceDummy.html
@@ -0,0 +1,81 @@
+
+
+
+
+NMDeviceDummy: libnm Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    NMDeviceDummy
    
+
    NMDeviceDummy
    
+
    
+
    
+
    Types and Values
    
+
    
++++
+
+
+
+
+
    



     NMDeviceDummy
    
+
    
+
    
+
    Object Hierarchy
    
+
        GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceDummy
+
    
+
    
+
    
+
    Implemented Interfaces
    
+
    
+NMDeviceDummy implements
+ GInitable and  GAsyncInitable.
    
+
    
+
    
+
    Description
    
+
    
+
    
+
    Functions
    
+
    
+
    
+
    
+
    Types and Values
    
+
    
+
    NMDeviceDummy
    
+
    typedef struct _NMDeviceDummy NMDeviceDummy;
    
+
    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceEthernet.html b/docs/libnm/html/NMDeviceEthernet.html
index c2d79716..49748d81 100644
--- a/docs/libnm/html/NMDeviceEthernet.html
+++ b/docs/libnm/html/NMDeviceEthernet.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 
    
@@ -58,7 +58,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_ethernet_get_speed ()
@@ -66,7 +66,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_ethernet_get_carrier ()
@@ -92,29 +92,29 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 perm-hw-address
 Read
 
 
-GStrv
+GStrv
 s390-subchannels
 Read
 
 
-guint
+guint
 speed
 Read
 
@@ -158,7 +158,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceEthernet
@@ -168,7 +168,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceEthernet implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -232,7 +232,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_ethernet_get_speed ()
    
-
    guint32
+
    guint32
 nm_device_ethernet_get_speed (NMDeviceEthernet *device);
    
 
    Gets the speed of the NMDeviceEthernet.
    
 
    
@@ -258,7 +258,7 @@ nm_device_ethernet_get_speed (
 
    nm_device_ethernet_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_ethernet_get_carrier (NMDeviceEthernet *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -278,7 +278,7 @@ nm_device_ethernet_get_carrier (
 
    
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    
 
    
@@ -353,7 +353,7 @@ one subchannel the s390 device uses to communicate to the host. 
    
 
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -361,7 +361,7 @@ one subchannel the s390 device uses to communicate to the host. 
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The active hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -369,7 +369,7 @@ one subchannel the s390 device uses to communicate to the host. 
    
 
    
 
    
 
    The “perm-hw-address” property
    
-
      “perm-hw-address”          gchar *
    
+
      “perm-hw-address”          gchar *
    
 
    The permanent hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -377,7 +377,7 @@ one subchannel the s390 device uses to communicate to the host. 
    
 
    
 
    
 
    The “s390-subchannels” property
    
-
      “s390-subchannels”         GStrv
    
+
      “s390-subchannels”         GStrv
    
 
    Identifies subchannels of this network device used for
 communication with z/VM or s390 host.
    
 
    Flags: Read
    
@@ -386,7 +386,7 @@ communication with z/VM or s390 host.
    
 
    
 
    
 
    The “speed” property
    
-
      “speed”                    guint
    
+
      “speed”                    guint
    
 
    The speed of the device.
    
 
    Flags: Read
    
 
    Default value: 0
    
diff --git a/docs/libnm/html/NMDeviceGeneric.html b/docs/libnm/html/NMDeviceGeneric.html
index 9af61252..6dd192b9 100644
--- a/docs/libnm/html/NMDeviceGeneric.html
+++ b/docs/libnm/html/NMDeviceGeneric.html
@@ -61,13 +61,13 @@
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 type-description
 Read
 
@@ -99,7 +99,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceGeneric
@@ -109,7 +109,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceGeneric implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -166,7 +166,7 @@ device, and must not be modified.
    
 
    Property Details
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -174,8 +174,8 @@ device, and must not be modified.
    
 
    
 
    
 
    The “type-description” property
    
-
      “type-description”         gchar *
    
-
    A description of the specific type of device this is, or NULL
+
      “type-description”         gchar *
    
+
    A description of the specific type of device this is, or NULL
 if not known.
    
 
    Flags: Read
    
 
    Default value: NULL
    
diff --git a/docs/libnm/html/NMDeviceIPTunnel.html b/docs/libnm/html/NMDeviceIPTunnel.html
index e0afef32..d65a58ec 100644
--- a/docs/libnm/html/NMDeviceIPTunnel.html
+++ b/docs/libnm/html/NMDeviceIPTunnel.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -23,7 +23,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 
    
 
    
@@ -74,7 +74,7 @@
 
 
 
-guint8
+guint8
 
 
 nm_device_ip_tunnel_get_ttl ()
@@ -82,7 +82,7 @@
 
 
 
-guint8
+guint8
 
 
 nm_device_ip_tunnel_get_tos ()
@@ -90,7 +90,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_ip_tunnel_get_path_mtu_discovery ()
@@ -112,7 +112,7 @@
 
 
 
-guint8
+guint8
 
 
 nm_device_ip_tunnel_get_encapsulation_limit ()
@@ -120,7 +120,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_ip_tunnel_get_flow_label ()
@@ -139,35 +139,35 @@
 
 
 
-guchar
+guchar
 encapsulation-limit
 Read
 
 
-guint
+guint
 flow-label
 Read
 
 
 
-gchar *
+gchar *
 input-key
 Read
 
 
 
-gchar *
+gchar *
 local
 Read
 
 
-guint
+guint
 mode
 Read
 
 
 
-gchar *
+gchar *
 output-key
 Read
 
@@ -178,23 +178,23 @@
 Read
 
 
-gboolean
+gboolean
 path-mtu-discovery
 Read
 
 
 
-gchar *
+gchar *
 remote
 Read
 
 
-guchar
+guchar
 tos
 Read
 
 
-guchar
+guchar
 ttl
 Read
 
@@ -262,7 +262,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceIPTunnel
@@ -272,7 +272,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceIPTunnel implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -386,7 +386,7 @@ nm_device_ip_tunnel_get_remote (
 
    
 
    nm_device_ip_tunnel_get_ttl ()
    
-
    guint8
+
    guint8
 nm_device_ip_tunnel_get_ttl (NMDeviceIPTunnel *device);
    
 
    
 
    Parameters
    
@@ -412,7 +412,7 @@ nm_device_ip_tunnel_get_ttl (
 
    nm_device_ip_tunnel_get_tos ()
    
-
    guint8
+
    guint8
 nm_device_ip_tunnel_get_tos (NMDeviceIPTunnel *device);
    
 
    
 
    Parameters
    
@@ -439,7 +439,7 @@ to tunneled packets.
    
 
    
 
    
 
    nm_device_ip_tunnel_get_path_mtu_discovery ()
    
-
    gboolean
+
    gboolean
 nm_device_ip_tunnel_get_path_mtu_discovery
                                (NMDeviceIPTunnel *device);
    
 
    
@@ -518,7 +518,7 @@ nm_device_ip_tunnel_get_output_key (
 
    
 
    nm_device_ip_tunnel_get_encapsulation_limit ()
    
-
    guint8
+
    guint8
 nm_device_ip_tunnel_get_encapsulation_limit
                                (NMDeviceIPTunnel *device);
    
 
    
@@ -545,7 +545,7 @@ nm_device_ip_tunnel_get_encapsulation_limit
 
    
 
    
 
    nm_device_ip_tunnel_get_flow_label ()
    
-
    guint
+
    guint
 nm_device_ip_tunnel_get_flow_label (NMDeviceIPTunnel *device);
    
 
    
 
    Parameters
    
@@ -646,7 +646,7 @@ nm_device_ip_tunnel_get_flow_label (
    Property Details
    
 
    
 
    The “encapsulation-limit” property
    
-
      “encapsulation-limit”      guchar
    
+
      “encapsulation-limit”      guchar
    
 
    How many additional levels of encapsulation are permitted to
 be prepended to packets. This property applies only to IPv6
 tunnels.
    
@@ -657,7 +657,7 @@ tunnels.
    
 
    
 
    
 
    The “flow-label” property
    
-
      “flow-label”               guint
    
+
      “flow-label”               guint
    
 
    The flow label to assign to tunnel packets. This property
 applies only to IPv6 tunnels.
    
 
    Flags: Read
    
@@ -668,7 +668,7 @@ applies only to IPv6 tunnels.
    
 
    
 
    
 
    The “input-key” property
    
-
      “input-key”                gchar *
    
+
      “input-key”                gchar *
    
 
    The key used for tunneled input packets, if applicable.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -677,7 +677,7 @@ applies only to IPv6 tunnels.
    
 
    
 
    
 
    The “local” property
    
-
      “local”                    gchar *
    
+
      “local”                    gchar *
    
 
    The local endpoint of the tunnel.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -686,7 +686,7 @@ applies only to IPv6 tunnels.
    
 
    
 
    
 
    The “mode” property
    
-
      “mode”                     guint
    
+
      “mode”                     guint
    
 
    The tunneling mode of the device.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -695,7 +695,7 @@ applies only to IPv6 tunnels.
    
 
    
 
    
 
    The “output-key” property
    
-
      “output-key”               gchar *
    
+
      “output-key”               gchar *
    
 
    The key used for tunneled output packets, if applicable.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -712,7 +712,7 @@ applies only to IPv6 tunnels.
    
 
    
 
    
 
    The “path-mtu-discovery” property
    
-
      “path-mtu-discovery”       gboolean
    
+
      “path-mtu-discovery”       gboolean
    
 
    Whether path MTU discovery is enabled on this tunnel.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -721,7 +721,7 @@ applies only to IPv6 tunnels.
    
 
    
 
    
 
    The “remote” property
    
-
      “remote”                   gchar *
    
+
      “remote”                   gchar *
    
 
    The remote endpoint of the tunnel.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -730,7 +730,7 @@ applies only to IPv6 tunnels.
    
 
    
 
    
 
    The “tos” property
    
-
      “tos”                      guchar
    
+
      “tos”                      guchar
    
 
    The type of service (IPv4) or traffic class (IPv6) assigned to
 tunneled packets.
    
 
    Flags: Read
    
@@ -740,7 +740,7 @@ tunneled packets.
    
 
    
 
    
 
    The “ttl” property
    
-
      “ttl”                      guchar
    
+
      “ttl”                      guchar
    
 
    The TTL assigned to tunneled packets. 0 is a special value
  meaning that packets inherit the TTL value
    
 
    Flags: Read
    
diff --git a/docs/libnm/html/NMDeviceInfiniband.html b/docs/libnm/html/NMDeviceInfiniband.html
index 9818369c..dd716c44 100644
--- a/docs/libnm/html/NMDeviceInfiniband.html
+++ b/docs/libnm/html/NMDeviceInfiniband.html
@@ -51,7 +51,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_infiniband_get_carrier ()
@@ -70,13 +70,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -108,7 +108,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceInfiniband
@@ -118,7 +118,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceInfiniband implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -154,7 +154,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_infiniband_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_infiniband_get_carrier (NMDeviceInfiniband *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -174,7 +174,7 @@ nm_device_infiniband_get_carrier (
 
    
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    
 
    
@@ -201,7 +201,7 @@ nm_device_infiniband_get_carrier (
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -209,7 +209,7 @@ nm_device_infiniband_get_carrier (
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
diff --git a/docs/libnm/html/NMDeviceMacsec.html b/docs/libnm/html/NMDeviceMacsec.html
new file mode 100644
index 00000000..4e5b63d4
--- /dev/null
+++ b/docs/libnm/html/NMDeviceMacsec.html
@@ -0,0 +1,944 @@
+
+
+
+
+NMDeviceMacsec: libnm Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    NMDeviceMacsec
    
+
    NMDeviceMacsec
    
+
    
+
    
+
    Functions
    
+
    
++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    



    
+NMDevice *
+
+nm_device_macsec_get_parent ()
+
    const char *
+
+nm_device_macsec_get_hw_address ()
+
    
+guint64
+
+nm_device_macsec_get_sci ()
+
    
+guint8
+
+nm_device_macsec_get_icv_length ()
+
    
+guint64
+
+nm_device_macsec_get_cipher_suite ()
+
    
+guint
+
+nm_device_macsec_get_window ()
+
    
+guint8
+
+nm_device_macsec_get_encoding_sa ()
+
    const char *
+
+nm_device_macsec_get_validation ()
+
    
+gboolean
+
+nm_device_macsec_get_encrypt ()
+
    
+gboolean
+
+nm_device_macsec_get_protect ()
+
    
+gboolean
+
+nm_device_macsec_get_include_sci ()
+
    
+gboolean
+
+nm_device_macsec_get_es ()
+
    
+gboolean
+
+nm_device_macsec_get_scb ()
+
    
+gboolean
+
+nm_device_macsec_get_replay_protect ()
+
    
+
    
+
    
+
    Properties
    
+
    
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    




    guint64cipher-suiteRead
    gucharencoding-saRead
    gbooleanencryptRead
    gbooleanesRead
    
+gchar *hw-addressRead
    gucharicv-lengthRead
    gbooleaninclude-sciRead
    
+NMDevice *parentRead
    gbooleanprotectRead
    gbooleanreplay-protectRead
    gbooleanscbRead
    guint64sciRead
    
+gchar *validationRead
    guintwindowRead
    
+
    
+
    
+
    Types and Values
    
+
    
++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    



    #defineNM_DEVICE_MACSEC_PARENT
    #defineNM_DEVICE_MACSEC_HW_ADDRESS
    #defineNM_DEVICE_MACSEC_SCI
    #defineNM_DEVICE_MACSEC_ICV_LENGTH
    #defineNM_DEVICE_MACSEC_CIPHER_SUITE
    #defineNM_DEVICE_MACSEC_WINDOW
    #defineNM_DEVICE_MACSEC_ENCODING_SA
    #defineNM_DEVICE_MACSEC_VALIDATION
    #defineNM_DEVICE_MACSEC_ENCRYPT
    #defineNM_DEVICE_MACSEC_PROTECT
    #defineNM_DEVICE_MACSEC_INCLUDE_SCI
    #defineNM_DEVICE_MACSEC_ES
    #defineNM_DEVICE_MACSEC_SCB
    #defineNM_DEVICE_MACSEC_REPLAY_PROTECT
     NMDeviceMacsec
    
+
    
+
    
+
    Object Hierarchy
    
+
        GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceMacsec
+
    
+
    
+
    
+
    Implemented Interfaces
    
+
    
+NMDeviceMacsec implements
+ GInitable and  GAsyncInitable.
    
+
    
+
    
+
    Description
    
+
    
+
    
+
    Functions
    
+
    
+
    nm_device_macsec_get_parent ()
    
+
    NMDevice *
+nm_device_macsec_get_parent (NMDeviceMacsec *device);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the device's parent device. 
    
+
    [transfer none]
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_hw_address ()
    
+
    const char *
+nm_device_macsec_get_hw_address (NMDeviceMacsec *device);
    
+
    Gets the hardware (MAC) address of the NMDeviceMacsec
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the hardware address. This is the internal string used by the
+device, and must not be modified.
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_sci ()
    
+
    guint64
+nm_device_macsec_get_sci (NMDeviceMacsec *device);
    
+
    Gets the Secure Channel Identifier in use
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the SCI
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_icv_length ()
    
+
    guint8
+nm_device_macsec_get_icv_length (NMDeviceMacsec *device);
    
+
    Gets the length of ICV (Integrity Check Value)
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the length of ICV
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_cipher_suite ()
    
+
    guint64
+nm_device_macsec_get_cipher_suite (NMDeviceMacsec *device);
    
+
    Gets the set of cryptographic algorithms in use
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the set of cryptographic algorithms in use
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_window ()
    
+
    guint
+nm_device_macsec_get_window (NMDeviceMacsec *device);
    
+
    Gets the size of the replay window
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     size of the replay window
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_encoding_sa ()
    
+
    guint8
+nm_device_macsec_get_encoding_sa (NMDeviceMacsec *device);
    
+
    Gets the value of the Association Number (0..3) for the Security
+Association in use.
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the current Security Association
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_validation ()
    
+
    const char *
+nm_device_macsec_get_validation (NMDeviceMacsec *device);
    
+
    Gets the validation mode for incoming packets (strict, check,
+disabled)
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the validation mode
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_encrypt ()
    
+
    gboolean
+nm_device_macsec_get_encrypt (NMDeviceMacsec *device);
    
+
    Gets whether encryption of transmitted frames is enabled
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     whether encryption is enabled
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_protect ()
    
+
    gboolean
+nm_device_macsec_get_protect (NMDeviceMacsec *device);
    
+
    Gets whether protection of transmitted frames is enabled
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     whether protection is enabled
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_include_sci ()
    
+
    gboolean
+nm_device_macsec_get_include_sci (NMDeviceMacsec *device);
    
+
    Gets whether the SCI is always included in SecTAG for transmitted
+frames
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     whether the SCI is always included
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_es ()
    
+
    gboolean
+nm_device_macsec_get_es (NMDeviceMacsec *device);
    
+
    Gets whether the ES (End station) bit is enabled in SecTAG for
+transmitted frames
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     whether the ES (End station) bit is enabled
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_scb ()
    
+
    gboolean
+nm_device_macsec_get_scb (NMDeviceMacsec *device);
    
+
    Gets whether the SCB (Single Copy Broadcast) bit is enabled in
+SecTAG for transmitted frames
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     whether the SCB (Single Copy Broadcast) bit is enabled
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_device_macsec_get_replay_protect ()
    
+
    gboolean
+nm_device_macsec_get_replay_protect (NMDeviceMacsec *device);
    
+
    Gets whether replay protection is enabled
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     whether replay protection is enabled
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    Types and Values
    
+
    
+
    NM_DEVICE_MACSEC_PARENT
    
+
    #define NM_DEVICE_MACSEC_PARENT          "parent"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_HW_ADDRESS
    
+
    #define NM_DEVICE_MACSEC_HW_ADDRESS      "hw-address"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_SCI
    
+
    #define NM_DEVICE_MACSEC_SCI             "sci"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_ICV_LENGTH
    
+
    #define NM_DEVICE_MACSEC_ICV_LENGTH      "icv-length"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_CIPHER_SUITE
    
+
    #define NM_DEVICE_MACSEC_CIPHER_SUITE    "cipher-suite"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_WINDOW
    
+
    #define NM_DEVICE_MACSEC_WINDOW          "window"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_ENCODING_SA
    
+
    #define NM_DEVICE_MACSEC_ENCODING_SA     "encoding-sa"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_VALIDATION
    
+
    #define NM_DEVICE_MACSEC_VALIDATION      "validation"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_ENCRYPT
    
+
    #define NM_DEVICE_MACSEC_ENCRYPT         "encrypt"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_PROTECT
    
+
    #define NM_DEVICE_MACSEC_PROTECT         "protect"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_INCLUDE_SCI
    
+
    #define NM_DEVICE_MACSEC_INCLUDE_SCI     "include-sci"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_ES
    
+
    #define NM_DEVICE_MACSEC_ES              "es"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_SCB
    
+
    #define NM_DEVICE_MACSEC_SCB             "scb"
+
    
+
    
+
    
+
    
+
    NM_DEVICE_MACSEC_REPLAY_PROTECT
    
+
    #define NM_DEVICE_MACSEC_REPLAY_PROTECT  "replay-protect"
+
    
+
    
+
    
+
    
+
    NMDeviceMacsec
    
+
    typedef struct _NMDeviceMacsec NMDeviceMacsec;
    
+
    
+
    
+
    
+
    Property Details
    
+
    
+
    The “cipher-suite” property
    
+
      “cipher-suite”             guint64
    
+
    The set of cryptographic algorithms in use.
    
+
    Flags: Read
    
+
    Default value: 0
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “encoding-sa” property
    
+
      “encoding-sa”              guchar
    
+
    The value of the Association Number (0..3) for the Security
+Association in use.
    
+
    Flags: Read
    
+
    Default value: 0
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “encrypt” property
    
+
      “encrypt”                  gboolean
    
+
    Whether encryption of transmitted frames is enabled.
    
+
    Flags: Read
    
+
    Default value: FALSE
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “es” property
    
+
      “es”                       gboolean
    
+
    Whether the ES (End station) bit is enabled in SecTAG for
+transmitted frames.
    
+
    Flags: Read
    
+
    Default value: FALSE
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “hw-address” property
    
+
      “hw-address”               gchar *
    
+
    The hardware (MAC) address of the device.
    
+
    Flags: Read
    
+
    Default value: NULL
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “icv-length” property
    
+
      “icv-length”               guchar
    
+
    The length of ICV (Integrity Check Value).
    
+
    Flags: Read
    
+
    Default value: 0
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “include-sci” property
    
+
      “include-sci”              gboolean
    
+
    Whether the SCI is always included in SecTAG for transmitted
+frames.
    
+
    Flags: Read
    
+
    Default value: FALSE
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “parent” property
    
+
      “parent”                   NMDevice *
    
+
    The devices's parent device.
    
+
    Flags: Read
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “protect” property
    
+
      “protect”                  gboolean
    
+
    Whether protection of transmitted frames is enabled.
    
+
    Flags: Read
    
+
    Default value: FALSE
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “replay-protect” property
    
+
      “replay-protect”           gboolean
    
+
    Whether replay protection is enabled.
    
+
    Flags: Read
    
+
    Default value: FALSE
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “scb” property
    
+
      “scb”                      gboolean
    
+
    Whether the SCB (Single Copy Broadcast) bit is enabled in
+SecTAG for transmitted frames.
    
+
    Flags: Read
    
+
    Default value: FALSE
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “sci” property
    
+
      “sci”                      guint64
    
+
    The Secure Channel Identifier in use.
    
+
    Flags: Read
    
+
    Default value: 0
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “validation” property
    
+
      “validation”               gchar *
    
+
    The validation mode for incoming packets (strict, check,
+disabled).
    
+
    Flags: Read
    
+
    Default value: NULL
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “window” property
    
+
      “window”                   guint
    
+
    The size of the replay window.
    
+
    Flags: Read
    
+
    Default value: 0
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceMacvlan.html b/docs/libnm/html/NMDeviceMacvlan.html
index 953cb812..4ce9994a 100644
--- a/docs/libnm/html/NMDeviceMacvlan.html
+++ b/docs/libnm/html/NMDeviceMacvlan.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 
    
@@ -59,7 +59,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_macvlan_get_no_promisc ()
@@ -67,7 +67,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_macvlan_get_tap ()
@@ -94,18 +94,18 @@
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 mode
 Read
 
 
-gboolean
+gboolean
 no-promisc
 Read
 
@@ -116,7 +116,7 @@
 Read
 
 
-gboolean
+gboolean
 tap
 Read
 
@@ -160,7 +160,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceMacvlan
@@ -170,7 +170,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceMacvlan implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -234,7 +234,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_macvlan_get_no_promisc ()
    
-
    gboolean
+
    gboolean
 nm_device_macvlan_get_no_promisc (NMDeviceMacvlan *device);
    
 
    Gets the no-promiscuous flag of the device.
    
 
    
@@ -261,7 +261,7 @@ nm_device_macvlan_get_no_promisc (
 
    
 
    nm_device_macvlan_get_tap ()
    
-
    gboolean
+
    gboolean
 nm_device_macvlan_get_tap (NMDeviceMacvlan *device);
    
 
    Gets the device type (MACVLAN or MACVTAP).
    
 
    
@@ -281,7 +281,7 @@ nm_device_macvlan_get_tap (
 
    Returns
    
-
     TRUE if the device is a MACVTAP, FALSE if it is a MACVLAN.
    
+
     TRUE if the device is a MACVTAP, FALSE if it is a MACVLAN.
    
 
    
 
    Since: 1.2
    
 
    
@@ -355,7 +355,7 @@ device, and must not be modified.
    
 
    Property Details
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -364,7 +364,7 @@ device, and must not be modified.
    
 
    
 
    
 
    The “mode” property
    
-
      “mode”                     gchar *
    
+
      “mode”                     gchar *
    
 
    The MACVLAN mode.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -373,7 +373,7 @@ device, and must not be modified.
    
 
    
 
    
 
    The “no-promisc” property
    
-
      “no-promisc”               gboolean
    
+
      “no-promisc”               gboolean
    
 
    Whether the device has the no-promiscuos flag.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -390,7 +390,7 @@ device, and must not be modified.
    
 
    
 
    
 
    The “tap” property
    
-
      “tap”                      gboolean
    
+
      “tap”                      gboolean
    
 
    Whether the device is a MACVTAP.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
diff --git a/docs/libnm/html/NMDeviceModem.html b/docs/libnm/html/NMDeviceModem.html
index 58a2c30e..5d177f3c 100644
--- a/docs/libnm/html/NMDeviceModem.html
+++ b/docs/libnm/html/NMDeviceModem.html
@@ -108,7 +108,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceModem
@@ -118,7 +118,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceModem implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
diff --git a/docs/libnm/html/NMDeviceOlpcMesh.html b/docs/libnm/html/NMDeviceOlpcMesh.html
index e7ead454..a6fab1c9 100644
--- a/docs/libnm/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm/html/NMDeviceOlpcMesh.html
@@ -59,7 +59,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_olpc_mesh_get_active_channel ()
@@ -78,7 +78,7 @@
 
 
 
-guint
+guint
 active-channel
 Read
 
@@ -90,7 +90,7 @@
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -126,7 +126,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceOlpcMesh
@@ -136,7 +136,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceOlpcMesh implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -192,14 +192,14 @@ nm_device_olpc_mesh_get_companion (
 
    
 
    Returns
    
-
     the companion of the device of NULL. 
    
+
     the companion of the device of NULL. 
    
 
    [transfer none]
    
 
    
 
    
 
    
 
    
 
    nm_device_olpc_mesh_get_active_channel ()
    
-
    guint32
+
    guint32
 nm_device_olpc_mesh_get_active_channel
                                (NMDeviceOlpcMesh *device);
    
 
    Returns the active channel of the NMDeviceOlpcMesh device.
    
@@ -253,7 +253,7 @@ nm_device_olpc_mesh_get_active_channel
 
    Property Details
    
 
    
 
    The “active-channel” property
    
-
      “active-channel”           guint
    
+
      “active-channel”           guint
    
 
    The device's active channel.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -268,7 +268,7 @@ nm_device_olpc_mesh_get_active_channel
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html
index 933ee7af..526d3a99 100644
--- a/docs/libnm/html/NMDeviceTeam.html
+++ b/docs/libnm/html/NMDeviceTeam.html
@@ -51,14 +51,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_team_get_carrier ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_team_get_slaves ()
@@ -84,25 +84,25 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 config
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 slaves
 Read
 
@@ -142,7 +142,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceTeam
@@ -152,7 +152,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceTeam implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -188,7 +188,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_team_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_team_get_carrier (NMDeviceTeam *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -208,13 +208,13 @@ nm_device_team_get_carrier (
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    
 
    
 
    
 
    nm_device_team_get_slaves ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_device_team_get_slaves (NMDeviceTeam *device);
    
 
    Gets the devices currently enslaved to device
 .
    
@@ -235,7 +235,7 @@ nm_device_team_get_slaves (
 
    Returns
    
-
     the GPtrArray containing
+
     the GPtrArray containing
 NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 
    
@@ -306,7 +306,7 @@ device, and must not be modified.
    
 
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -314,7 +314,7 @@ device, and must not be modified.
    
 
    
 
    
 
    The “config” property
    
-
      “config”                   gchar *
    
+
      “config”                   gchar *
    
 
    The current JSON configuration of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -323,7 +323,7 @@ device, and must not be modified.
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -331,7 +331,7 @@ device, and must not be modified.
    
 
    
 
    
 
    The “slaves” property
    
-
      “slaves”                   GPtrArray *
    
+
      “slaves”                   GPtrArray *
    
 
    The devices enslaved to the team device.
    
 
    Element-type: NMDevice
    
 
    Flags: Read
    
diff --git a/docs/libnm/html/NMDeviceTun.html b/docs/libnm/html/NMDeviceTun.html
index a492d0da..1dc0d6aa 100644
--- a/docs/libnm/html/NMDeviceTun.html
+++ b/docs/libnm/html/NMDeviceTun.html
@@ -58,7 +58,7 @@
 
 
 
-gint64
+gint64
 
 
 nm_device_tun_get_owner ()
@@ -66,7 +66,7 @@
 
 
 
-gint64
+gint64
 
 
 nm_device_tun_get_group ()
@@ -74,7 +74,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_tun_get_no_pi ()
@@ -82,7 +82,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_tun_get_vnet_hdr ()
@@ -90,7 +90,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_tun_get_multi_queue ()
@@ -109,39 +109,39 @@
 
 
 
-gint64
+gint64
 group
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 mode
 Read
 
 
-gboolean
+gboolean
 multi-queue
 Read
 
 
-gboolean
+gboolean
 no-pi
 Read
 
 
-gint64
+gint64
 owner
 Read
 
 
-gboolean
+gboolean
 vnet-hdr
 Read
 
@@ -193,7 +193,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceTun
@@ -203,7 +203,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceTun implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -267,7 +267,7 @@ nm_device_tun_get_mode (
 
    nm_device_tun_get_owner ()
    
-
    gint64
+
    gint64
 nm_device_tun_get_owner (NMDeviceTun *device);
    
 
    Gets the tunnel owner.
    
 
    
@@ -294,7 +294,7 @@ nm_device_tun_get_owner (
 
    nm_device_tun_get_group ()
    
-
    gint64
+
    gint64
 nm_device_tun_get_group (NMDeviceTun *device);
    
 
    Gets the tunnel group.
    
 
    
@@ -321,13 +321,13 @@ nm_device_tun_get_group (
 
    nm_device_tun_get_no_pi ()
    
-
    gboolean
+
    gboolean
 nm_device_tun_get_no_pi (NMDeviceTun *device);
    
 
    
 
    
 
    
 
    nm_device_tun_get_vnet_hdr ()
    
-
    gboolean
+
    gboolean
 nm_device_tun_get_vnet_hdr (NMDeviceTun *device);
    
 
    Returns whether the NMDeviceTun has the IFF_VNET_HDR flag.
    
 
    
@@ -347,14 +347,14 @@ nm_device_tun_get_vnet_hdr (
 
    Returns
    
-
     TRUE if the device has the flag, FALSE otherwise
    
+
     TRUE if the device has the flag, FALSE otherwise
    
 
    
 
    Since: 1.2
    
 
    
 
    
 
    
 
    nm_device_tun_get_multi_queue ()
    
-
    gboolean
+
    gboolean
 nm_device_tun_get_multi_queue (NMDeviceTun *device);
    
 
    Returns whether the NMDeviceTun has the IFF_MULTI_QUEUE flag.
    
 
    
@@ -374,7 +374,7 @@ nm_device_tun_get_multi_queue (
 
    
 
    Returns
    
-
     TRUE if the device doesn't have the flag, FALSE otherwise
    
+
     TRUE if the device doesn't have the flag, FALSE otherwise
    
 
    
 
    Since: 1.2
    
 
    
@@ -432,7 +432,7 @@ nm_device_tun_get_multi_queue (
    Property Details
    
 
    
 
    The “group” property
    
-
      “group”                    gint64
    
+
      “group”                    gint64
    
 
    The gid of the tunnel group, or -1 if it has no owner.
    
 
    Flags: Read
    
 
    Allowed values: [-1,4294967295]
    
@@ -442,7 +442,7 @@ nm_device_tun_get_multi_queue (
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -451,7 +451,7 @@ nm_device_tun_get_multi_queue (
 
    
 
    The “mode” property
    
-
      “mode”                     gchar *
    
+
      “mode”                     gchar *
    
 
    The tunnel mode, either "tun" or "tap".
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -460,7 +460,7 @@ nm_device_tun_get_multi_queue (
 
    
 
    The “multi-queue” property
    
-
      “multi-queue”              gboolean
    
+
      “multi-queue”              gboolean
    
 
    The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to
 the tap device multiple times, for multiple send/receive
 queues.
    
@@ -471,7 +471,7 @@ queues.
    
 
    
 
    
 
    The “no-pi” property
    
-
      “no-pi”                    gboolean
    
+
      “no-pi”                    gboolean
    
 
    The tunnel's "TUN_NO_PI" flag; true if no protocol info is
 prepended to the tunnel packets.
    
 
    Flags: Read
    
@@ -481,7 +481,7 @@ prepended to the tunnel packets.
    
 
    
 
    
 
    The “owner” property
    
-
      “owner”                    gint64
    
+
      “owner”                    gint64
    
 
    The uid of the tunnel owner, or -1 if it has no owner.
    
 
    Flags: Read
    
 
    Allowed values: [-1,4294967295]
    
@@ -491,7 +491,7 @@ prepended to the tunnel packets.
    
 
    
 
    
 
    The “vnet-hdr” property
    
-
      “vnet-hdr”                 gboolean
    
+
      “vnet-hdr”                 gboolean
    
 
    The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets
 include a virtio network header.
    
 
    Flags: Read
    
diff --git a/docs/libnm/html/NMDeviceVlan.html b/docs/libnm/html/NMDeviceVlan.html
index 02a3d527..16df6ea6 100644
--- a/docs/libnm/html/NMDeviceVlan.html
+++ b/docs/libnm/html/NMDeviceVlan.html
@@ -51,7 +51,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vlan_get_carrier ()
@@ -67,7 +67,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vlan_get_vlan_id ()
@@ -86,13 +86,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -103,7 +103,7 @@
 Read
 
 
-guint
+guint
 vlan-id
 Read
 
@@ -143,7 +143,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceVlan
@@ -153,7 +153,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceVlan implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -189,7 +189,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_vlan_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_vlan_get_carrier (NMDeviceVlan *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -209,7 +209,7 @@ nm_device_vlan_get_carrier (
 
    Returns
    
-
     TRUE if the device has carrier
    
+
     TRUE if the device has carrier
    
 
    
 
    
 
    
@@ -241,7 +241,7 @@ nm_device_vlan_get_parent (
 
    nm_device_vlan_get_vlan_id ()
    
-
    guint
+
    guint
 nm_device_vlan_get_vlan_id (NMDeviceVlan *device);
    
 
    
 
    Parameters
    
@@ -299,7 +299,7 @@ nm_device_vlan_get_vlan_id (
    Property Details
    
 
    
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -307,7 +307,7 @@ nm_device_vlan_get_vlan_id (
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -322,7 +322,7 @@ nm_device_vlan_get_vlan_id (
 
    The “vlan-id” property
    
-
      “vlan-id”                  guint
    
+
      “vlan-id”                  guint
    
 
    The device's VLAN ID.
    
 
    Flags: Read
    
 
    Allowed values: <= 4095
    
diff --git a/docs/libnm/html/NMDeviceVxlan.html b/docs/libnm/html/NMDeviceVxlan.html
index 44cbb345..ba0fd39b 100644
--- a/docs/libnm/html/NMDeviceVxlan.html
+++ b/docs/libnm/html/NMDeviceVxlan.html
@@ -51,7 +51,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vxlan_get_carrier ()
@@ -67,7 +67,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_id ()
@@ -89,7 +89,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_src_port_min ()
@@ -97,7 +97,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_src_port_max ()
@@ -105,7 +105,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_dst_port ()
@@ -113,7 +113,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vxlan_get_learning ()
@@ -121,7 +121,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_ageing ()
@@ -129,7 +129,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_tos ()
@@ -137,7 +137,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_ttl ()
@@ -145,7 +145,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_limit ()
@@ -153,7 +153,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vxlan_get_proxy ()
@@ -161,7 +161,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vxlan_get_rsc ()
@@ -169,7 +169,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vxlan_get_l2miss ()
@@ -177,7 +177,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vxlan_get_l3miss ()
@@ -196,60 +196,60 @@
 
 
 
-guint
+guint
 ageing
 Read
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
-guint
+guint
 dst-port
 Read
 
 
 
-gchar *
+gchar *
 group
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
-guint
+guint
 id
 Read
 
 
-gboolean
+gboolean
 l2miss
 Read
 
 
-gboolean
+gboolean
 l3miss
 Read
 
 
-gboolean
+gboolean
 learning
 Read
 
 
-guint
+guint
 limit
 Read
 
 
 
-gchar *
+gchar *
 local
 Read
 
@@ -260,32 +260,32 @@
 Read
 
 
-gboolean
+gboolean
 proxy
 Read
 
 
-gboolean
+gboolean
 rsc
 Read
 
 
-guint
+guint
 src-port-max
 Read
 
 
-guint
+guint
 src-port-min
 Read
 
 
-guchar
+guchar
 tos
 Read
 
 
-guchar
+guchar
 ttl
 Read
 
@@ -381,7 +381,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceVxlan
@@ -391,7 +391,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceVxlan implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -428,7 +428,7 @@ device, and must not be modified.
    
 
    
 
    
 
    nm_device_vxlan_get_carrier ()
    
-
    gboolean
+
    gboolean
 nm_device_vxlan_get_carrier (NMDeviceVxlan *device);
    
 
    Whether the device has carrier.
    
 
    
@@ -448,7 +448,7 @@ nm_device_vxlan_get_carrier (
 
    Returns
    
-
     TRUE if the device has carrier.
    
+
     TRUE if the device has carrier.
    
 
    
 
    Since: 1.2
    
 
    
@@ -482,7 +482,7 @@ nm_device_vxlan_get_parent (
 
    nm_device_vxlan_get_id ()
    
-
    guint
+
    guint
 nm_device_vxlan_get_id (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -561,7 +561,7 @@ nm_device_vxlan_get_local (
 
    nm_device_vxlan_get_src_port_min ()
    
-
    guint
+
    guint
 nm_device_vxlan_get_src_port_min (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -587,7 +587,7 @@ nm_device_vxlan_get_src_port_min (
 
    
 
    nm_device_vxlan_get_src_port_max ()
    
-
    guint
+
    guint
 nm_device_vxlan_get_src_port_max (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -613,7 +613,7 @@ nm_device_vxlan_get_src_port_max (
 
    
 
    nm_device_vxlan_get_dst_port ()
    
-
    guint
+
    guint
 nm_device_vxlan_get_dst_port (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -639,7 +639,7 @@ nm_device_vxlan_get_dst_port (
 
    nm_device_vxlan_get_learning ()
    
-
    gboolean
+
    gboolean
 nm_device_vxlan_get_learning (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -665,7 +665,7 @@ nm_device_vxlan_get_learning (
 
    nm_device_vxlan_get_ageing ()
    
-
    guint
+
    guint
 nm_device_vxlan_get_ageing (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -691,7 +691,7 @@ nm_device_vxlan_get_ageing (
 
    nm_device_vxlan_get_tos ()
    
-
    guint
+
    guint
 nm_device_vxlan_get_tos (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -717,7 +717,7 @@ nm_device_vxlan_get_tos (
 
    nm_device_vxlan_get_ttl ()
    
-
    guint
+
    guint
 nm_device_vxlan_get_ttl (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -743,7 +743,7 @@ nm_device_vxlan_get_ttl (
 
    nm_device_vxlan_get_limit ()
    
-
    guint
+
    guint
 nm_device_vxlan_get_limit (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -770,7 +770,7 @@ forwarding table
    
 
    
 
    
 
    nm_device_vxlan_get_proxy ()
    
-
    gboolean
+
    gboolean
 nm_device_vxlan_get_proxy (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -796,7 +796,7 @@ nm_device_vxlan_get_proxy (
 
    nm_device_vxlan_get_rsc ()
    
-
    gboolean
+
    gboolean
 nm_device_vxlan_get_rsc (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -822,7 +822,7 @@ nm_device_vxlan_get_rsc (
 
    nm_device_vxlan_get_l2miss ()
    
-
    gboolean
+
    gboolean
 nm_device_vxlan_get_l2miss (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -848,7 +848,7 @@ nm_device_vxlan_get_l2miss (
 
    nm_device_vxlan_get_l3miss ()
    
-
    gboolean
+
    gboolean
 nm_device_vxlan_get_l3miss (NMDeviceVxlan *device);
    
 
    
 
    Parameters
    
@@ -991,7 +991,7 @@ nm_device_vxlan_get_l3miss (
    Property Details
    
 
    
 
    The “ageing” property
    
-
      “ageing”                   guint
    
+
      “ageing”                   guint
    
 
    The lifetime in seconds of FDB entries learnt by the kernel.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -1000,7 +1000,7 @@ nm_device_vxlan_get_l3miss (
 
    The “carrier” property
    
-
      “carrier”                  gboolean
    
+
      “carrier”                  gboolean
    
 
    Whether the device has carrier.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -1009,7 +1009,7 @@ nm_device_vxlan_get_l3miss (
 
    The “dst-port” property
    
-
      “dst-port”                 guint
    
+
      “dst-port”                 guint
    
 
    The UDP destination port used to communicate with the remote VXLAN tunnel
 endpoint.
    
 
    Flags: Read
    
@@ -1020,7 +1020,7 @@ endpoint.
    
 
    
 
    
 
    The “group” property
    
-
      “group”                    gchar *
    
+
      “group”                    gchar *
    
 
    The unicast destination IP address used in outgoing packets when the
 destination link layer address is not known in the VXLAN device
 forwarding database or the multicast IP address joined.
    
@@ -1031,7 +1031,7 @@ forwarding database or the multicast IP address joined.
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -1040,7 +1040,7 @@ forwarding database or the multicast IP address joined.
    
 
    
 
    
 
    The “id” property
    
-
      “id”                       guint
    
+
      “id”                       guint
    
 
    The device's VXLAN ID.
    
 
    Flags: Read
    
 
    Allowed values: <= 16777215
    
@@ -1050,7 +1050,7 @@ forwarding database or the multicast IP address joined.
    
 
    
 
    
 
    The “l2miss” property
    
-
      “l2miss”                   gboolean
    
+
      “l2miss”                   gboolean
    
 
    Whether netlink LL ADDR miss notifications are generated.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -1059,7 +1059,7 @@ forwarding database or the multicast IP address joined.
    
 
    
 
    
 
    The “l3miss” property
    
-
      “l3miss”                   gboolean
    
+
      “l3miss”                   gboolean
    
 
    Whether netlink IP ADDR miss notifications are generated.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -1068,7 +1068,7 @@ forwarding database or the multicast IP address joined.
    
 
    
 
    
 
    The “learning” property
    
-
      “learning”                 gboolean
    
+
      “learning”                 gboolean
    
 
    Whether unknown source link layer addresses and IP addresses are entered
 into the VXLAN device forwarding database.
    
 
    Flags: Read
    
@@ -1078,7 +1078,7 @@ into the VXLAN device forwarding database.
    
 
    
 
    
 
    The “limit” property
    
-
      “limit”                    guint
    
+
      “limit”                    guint
    
 
    The maximum number of entries that can be added to the forwarding table.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -1087,7 +1087,7 @@ into the VXLAN device forwarding database.
    
 
    
 
    
 
    The “local” property
    
-
      “local”                    gchar *
    
+
      “local”                    gchar *
    
 
    The source IP address to use in outgoing packets.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -1104,7 +1104,7 @@ into the VXLAN device forwarding database.
    
 
    
 
    
 
    The “proxy” property
    
-
      “proxy”                    gboolean
    
+
      “proxy”                    gboolean
    
 
    Whether ARP proxy is turned on.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -1113,7 +1113,7 @@ into the VXLAN device forwarding database.
    
 
    
 
    
 
    The “rsc” property
    
-
      “rsc”                      gboolean
    
+
      “rsc”                      gboolean
    
 
    Whether route short circuit is turned on.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
@@ -1122,7 +1122,7 @@ into the VXLAN device forwarding database.
    
 
    
 
    
 
    The “src-port-max” property
    
-
      “src-port-max”             guint
    
+
      “src-port-max”             guint
    
 
    The maximum UDP source port used to communicate with the remote VXLAN
 tunnel endpoint.
    
 
    Flags: Read
    
@@ -1133,7 +1133,7 @@ tunnel endpoint.
    
 
    
 
    
 
    The “src-port-min” property
    
-
      “src-port-min”             guint
    
+
      “src-port-min”             guint
    
 
    The minimum UDP source port used to communicate with the remote VXLAN
 tunnel endpoint.
    
 
    Flags: Read
    
@@ -1144,7 +1144,7 @@ tunnel endpoint.
    
 
    
 
    
 
    The “tos” property
    
-
      “tos”                      guchar
    
+
      “tos”                      guchar
    
 
    The TOS value to use in outgoing packets.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -1153,7 +1153,7 @@ tunnel endpoint.
    
 
    
 
    
 
    The “ttl” property
    
-
      “ttl”                      guchar
    
+
      “ttl”                      guchar
    
 
    The time-to-live value to use in outgoing packets.
    
 
    Flags: Read
    
 
    Default value: 0
    
diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html
index 50756399..bf2938d6 100644
--- a/docs/libnm/html/NMDeviceWifi.html
+++ b/docs/libnm/html/NMDeviceWifi.html
@@ -67,7 +67,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_wifi_get_bitrate ()
@@ -98,7 +98,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_wifi_get_access_points ()
@@ -106,7 +106,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_wifi_request_scan ()
@@ -114,7 +114,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_wifi_request_scan_options ()
@@ -138,7 +138,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_wifi_request_scan_finish ()
@@ -158,7 +158,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 access-points
 Read
 
@@ -169,13 +169,13 @@
 Read
 
 
-guint
+guint
 bitrate
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -186,7 +186,7 @@
 
 
 
-gchar *
+gchar *
 perm-hw-address
 Read
 
@@ -210,12 +210,12 @@
 
 void
 access-point-added
-Run First
+Run First
 
 
 void
 access-point-removed
-Run First
+Run First
 
 
 
    
@@ -265,7 +265,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceWifi
@@ -275,7 +275,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceWifi implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -365,7 +365,7 @@ nm_device_wifi_get_mode (
 
    nm_device_wifi_get_bitrate ()
    
-
    guint32
+
    guint32
 nm_device_wifi_get_bitrate (NMDeviceWifi *device);
    
 
    Gets the bit rate of the NMDeviceWifi in kbit/s.
    
 
    
@@ -438,7 +438,7 @@ nm_device_wifi_get_active_access_point
 
    
 
    
 
    Returns
    
-
     the access point or NULL if none is active. 
    
+
     the access point or NULL if none is active. 
    
 
    [transfer none]
    
 
    
 
    
@@ -474,14 +474,14 @@ nm_device_wifi_get_access_point_by_path
 
    
 
    
 
    Returns
    
-
     the access point or NULL if none is found. 
    
+
     the access point or NULL if none is found. 
    
 
    [transfer none]
    
 
    
 
    
 
    
 
    
 
    nm_device_wifi_get_access_points ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_device_wifi_get_access_points (NMDeviceWifi *device);
    
 
    Gets all the scanned access points of the NMDeviceWifi.
    
 
    
@@ -501,7 +501,7 @@ nm_device_wifi_get_access_points (
 
    
 
    Returns
    
-
     a GPtrArray containing all the
+
     a GPtrArray containing all the
 scanned NMAccessPoints.
 The returned array is owned by the client and should not be modified. 
    
 
    [element-type NMAccessPoint]
    
@@ -510,10 +510,10 @@ The returned array is owned by the client and should not be modified. 
    
 
    
 
    
 
    nm_device_wifi_request_scan ()
    
-
    gboolean
+
    gboolean
 nm_device_wifi_request_scan (NMDeviceWifi *device,
-                             GCancellable *cancellable,
-                             GError **error);
    
+                             GCancellable *cancellable,
+                             GError **error);
    
 
    Request NM to scan for access points on device
 . Note that the function
 returns immediately after requesting the scan, and it may take some time
@@ -534,12 +534,12 @@ after that for the scan to complete.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -547,7 +547,7 @@ after that for the scan to complete.
    
 
    
 
    
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be
 set.
    
 
    
@@ -555,11 +555,11 @@ set.
    
 
    
 
    
 
    nm_device_wifi_request_scan_options ()
    
-
    gboolean
+
    gboolean
 nm_device_wifi_request_scan_options (NMDeviceWifi *device,
-                                     GVariant *options,
-                                     GCancellable *cancellable,
-                                     GError **error);
    
+                                     GVariant *options,
+                                     GCancellable *cancellable,
+                                     GError **error);
    
 
    Request NM to scan for access points on device
 . Note that the function
 returns immediately after requesting the scan, and it may take some time
@@ -586,17 +586,17 @@ D-Bus call. Valid otions inside the dictionary are:
 
 
 
    options
    
-
    dictionary with options for RequestScan(), or NULL
    
+
    dictionary with options for RequestScan(), or NULL
    
  
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -604,7 +604,7 @@ D-Bus call. Valid otions inside the dictionary are:
 
    
 
    
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be
 set.
    
 
    
@@ -615,9 +615,9 @@ set.
    
 
    nm_device_wifi_request_scan_async ()
    
 
    void
 nm_device_wifi_request_scan_async (NMDeviceWifi *device,
-                                   GCancellable *cancellable,
-                                   GAsyncReadyCallback callback,
-                                   gpointer user_data);
    
+                                   GCancellable *cancellable,
+                                   GAsyncReadyCallback callback,
+                                   gpointer user_data);
    
 
    Request NM to scan for access points on device
 . Note that callback
  will be
@@ -639,7 +639,7 @@ that for the scan to complete.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
@@ -663,10 +663,10 @@ that for the scan to complete.
    
 
    void
 nm_device_wifi_request_scan_options_async
                                (NMDeviceWifi *device,
-                                GVariant *options,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
    
+                                GVariant *options,
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);
    
 
    Request NM to scan for access points on device
 . Note that callback
  will be
@@ -694,12 +694,12 @@ D-Bus call. Valid otions inside the dictionary are:
 
 
 
    options
    
-
    dictionary with options for RequestScan(), or NULL
    
+
    dictionary with options for RequestScan(), or NULL
    
  
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
@@ -721,10 +721,10 @@ D-Bus call. Valid otions inside the dictionary are:
 
    
 
    
 
    nm_device_wifi_request_scan_finish ()
    
-
    gboolean
+
    gboolean
 nm_device_wifi_request_scan_finish (NMDeviceWifi *device,
-                                    GAsyncResult *result,
-                                    GError **error);
    
+                                    GAsyncResult *result,
+                                    GError **error);
    
 
    Gets the result of a call to nm_device_wifi_request_scan_async().
    
 
    
 
    Parameters
    
@@ -742,12 +742,12 @@ nm_device_wifi_request_scan_finish (
 
 
    result
    
-
    the result passed to the GAsyncReadyCallback
    
+
    the result passed to the GAsyncReadyCallback
    
  
 
 
 
    error
    
-
    location for a GError, or NULL
    
+
    location for a GError, or NULL
    
  
 
 
@@ -755,7 +755,7 @@ nm_device_wifi_request_scan_finish (
 
    
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be
 set.
    
 
    
@@ -814,7 +814,7 @@ set.
    
 
    Property Details
    
 
    
 
    The “access-points” property
    
-
      “access-points”            GPtrArray *
    
+
      “access-points”            GPtrArray *
    
 
    List of all Wi-Fi access points the device can see.
    
 
    Element-type: NMAccessPoint
    
 
    Flags: Read
    
@@ -829,7 +829,7 @@ set.
    
 
    
 
    
 
    The “bitrate” property
    
-
      “bitrate”                  guint
    
+
      “bitrate”                  guint
    
 
    The bit rate of the device in kbit/s.
    
 
    Flags: Read
    
 
    Default value: 0
    
@@ -837,7 +837,7 @@ set.
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -853,7 +853,7 @@ set.
    
 
    
 
    
 
    The “perm-hw-address” property
    
-
      “perm-hw-address”          gchar *
    
+
      “perm-hw-address”          gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -872,8 +872,8 @@ set.
    
 
    The “access-point-added” signal
    
 
    void
 user_function (NMDeviceWifi *device,
-               GObject      *ap,
-               gpointer      user_data)
    
+               GObject      *ap,
+               gpointer      user_data)
    
 
    Notifies that a NMAccessPoint is added to the Wi-Fi device.
    
 
    
 
    Parameters
    
@@ -902,15 +902,15 @@ user_function (
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “access-point-removed” signal
    
 
    void
 user_function (NMDeviceWifi *device,
-               GObject      *ap,
-               gpointer      user_data)
    
+               GObject      *ap,
+               gpointer      user_data)
    
 
    Notifies that a NMAccessPoint is removed from the Wi-Fi device.
    
 
    
 
    Parameters
    
@@ -939,7 +939,7 @@ user_function (
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm/html/NMDeviceWimax.html b/docs/libnm/html/NMDeviceWimax.html
index f5db4d6f..40be52ec 100644
--- a/docs/libnm/html/NMDeviceWimax.html
+++ b/docs/libnm/html/NMDeviceWimax.html
@@ -67,7 +67,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_wimax_get_nsps ()
@@ -75,7 +75,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_wimax_get_center_frequency ()
@@ -83,7 +83,7 @@
 
 
 
-gint
+gint
 
 
 nm_device_wimax_get_rssi ()
@@ -91,7 +91,7 @@
 
 
 
-gint
+gint
 
 
 nm_device_wimax_get_cinr ()
@@ -99,7 +99,7 @@
 
 
 
-gint
+gint
 
 
 nm_device_wimax_get_tx_power ()
@@ -132,39 +132,39 @@
 
 
 
-gchar *
+gchar *
 bsid
 Read
 
 
-guint
+guint
 center-frequency
 Read
 
 
-gint
+gint
 cinr
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 nsps
 Read
 
 
-gint
+gint
 rssi
 Read
 
 
-gint
+gint
 tx-power
 Read
 
@@ -183,12 +183,12 @@
 
 void
 nsp-added
-Run First
+Run First
 
 
 void
 nsp-removed
-Run First
+Run First
 
 
 
    
@@ -242,7 +242,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceWimax
@@ -252,7 +252,7 @@
 
    Implemented Interfaces
    
 
    
 NMDeviceWimax implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -316,7 +316,7 @@ nm_device_wimax_get_active_nsp (
 
    
 
    Returns
    
-
     the access point or NULL if none is active. 
    
+
     the access point or NULL if none is active. 
    
 
    [transfer full]
    
 
    
 
    
@@ -355,14 +355,14 @@ nm_device_wimax_get_nsp_by_path (
 
    
 
    Returns
    
-
     the access point or NULL if none is found. 
    
+
     the access point or NULL if none is found. 
    
 
    [transfer none]
    
 
    
 
    
 
    
 
    
 
    nm_device_wimax_get_nsps ()
    
-
    const GPtrArray *
+
    const GPtrArray *
 nm_device_wimax_get_nsps (NMDeviceWimax *wimax);
    
 
    
 
    nm_device_wimax_get_nsps has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -386,7 +386,7 @@ nm_device_wimax_get_nsps (
 
    Returns
    
-
     a GPtrArray containing
+
     a GPtrArray containing
 all the scanned NMWimaxNsps.
 The returned array is owned by the client and should not be modified. 
    
 
    [element-type NMWimaxNsp]
    
@@ -395,7 +395,7 @@ The returned array is owned by the client and should not be modified. 
    
 
    
 
    
 
    nm_device_wimax_get_center_frequency ()
    
-
    guint
+
    guint
 nm_device_wimax_get_center_frequency (NMDeviceWimax *self);
    
 
    
 
    nm_device_wimax_get_center_frequency has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -427,7 +427,7 @@ device is not connected.
    
 
    
 
    
 
    nm_device_wimax_get_rssi ()
    
-
    gint
+
    gint
 nm_device_wimax_get_rssi (NMDeviceWimax *self);
    
 
    
 
    nm_device_wimax_get_rssi has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -460,7 +460,7 @@ device is not connected.
    
 
    
 
    
 
    nm_device_wimax_get_cinr ()
    
-
    gint
+
    gint
 nm_device_wimax_get_cinr (NMDeviceWimax *self);
    
 
    
 
    nm_device_wimax_get_cinr has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -492,7 +492,7 @@ meaning when the device is not connected.
    
 
    
 
    
 
    nm_device_wimax_get_tx_power ()
    
-
    gint
+
    gint
 nm_device_wimax_get_tx_power (NMDeviceWimax *self);
    
 
    
 
    nm_device_wimax_get_tx_power has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -548,7 +548,7 @@ nm_device_wimax_get_bsid (
 
    Returns
    
-
     the ID of the serving Base Station, or NULL
    
+
     the ID of the serving Base Station, or NULL
    
 
    
 
    
 
    
@@ -622,7 +622,7 @@ nm_device_wimax_get_bsid (
 
    The “bsid” property
    
-
      “bsid”                     gchar *
    
+
      “bsid”                     gchar *
    
 
    The ID of the serving base station as received from the network.  Has
 no meaning when the device is not connected.
    
 
    
@@ -635,7 +635,7 @@ no meaning when the device is not connected.
    
 
    
 
    
 
    The “center-frequency” property
    
-
      “center-frequency”         guint
    
+
      “center-frequency”         guint
    
 
    The center frequency (in KHz) of the radio channel the device is using to
 communicate with the network when connected.  Has no meaning when the
 device is not connected.
    
@@ -649,7 +649,7 @@ device is not connected.
    
 
    
 
    
 
    The “cinr” property
    
-
      “cinr”                     gint
    
+
      “cinr”                     gint
    
 
    CINR (Carrier to Interference + Noise Ratio) of the current radio link
 in dB.  CINR is a more accurate measure of radio link quality.  Has no
 meaning when the device is not connected.
    
@@ -663,7 +663,7 @@ meaning when the device is not connected.
    
 
    
 
    
 
    The “hw-address” property
    
-
      “hw-address”               gchar *
    
+
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
 
    
 
    NMDeviceWimax:hw-address has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -675,7 +675,7 @@ meaning when the device is not connected.
    
 
    
 
    
 
    The “nsps” property
    
-
      “nsps”                     GPtrArray *
    
+
      “nsps”                     GPtrArray *
    
 
    List of all WiMAX Network Service Providers the device can see.
    
 
    Element-type: NMWimaxNsp
    
 
    Flags: Read
    
@@ -683,7 +683,7 @@ meaning when the device is not connected.
    
 
    
 
    
 
    The “rssi” property
    
-
      “rssi”                     gint
    
+
      “rssi”                     gint
    
 
    RSSI of the current radio link in dBm.  This value indicates how strong
 the raw received RF signal from the base station is, but does not
 indicate the overall quality of the radio link.  Has no meaning when the
@@ -698,7 +698,7 @@ device is not connected.
    
 
    
 
    
 
    The “tx-power” property
    
-
      “tx-power”                 gint
    
+
      “tx-power”                 gint
    
 
    Average power of the last burst transmitted by the device, in units of
 0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
 -5.5 dBm.  Has no meaning when the device is not connected.
    
@@ -716,8 +716,8 @@ device is not connected.
    
 
    The “nsp-added” signal
    
 
    void
 user_function (NMDeviceWimax *self,
-               GObject       *nsp,
-               gpointer       user_data)
    
+               GObject       *nsp,
+               gpointer       user_data)
    
 
    Notifies that a NMWimaxNsp is added to the wimax device.
    
 
    
 
    NMDeviceWimax::nsp-added has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -750,15 +750,15 @@ user_function (<
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
 
    The “nsp-removed” signal
    
 
    void
 user_function (NMDeviceWimax *self,
-               GObject       *nsp,
-               gpointer       user_data)
    
+               GObject       *nsp,
+               gpointer       user_data)
    
 
    Notifies that a NMWimaxNsp is removed from the wimax device.
    
 
    
 
    NMDeviceWimax::nsp-removed has been deprecated since version 1.2 and should not be used in newly-written code.
    
@@ -791,7 +791,7 @@ user_function (<
 
 
    
 
    
-
    Flags: Run First
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm/html/NMDhcpConfig.html b/docs/libnm/html/NMDhcpConfig.html
index fa29023a..e358d689 100644
--- a/docs/libnm/html/NMDhcpConfig.html
+++ b/docs/libnm/html/NMDhcpConfig.html
@@ -52,7 +52,7 @@
 
 
 
-GHashTable *
+GHashTable *
 
 
 nm_dhcp_config_get_options ()
@@ -78,13 +78,13 @@
 
 
 
-gint
+gint
 family
 Read
 
 
 
-GHashTable *
+GHashTable *
 options
 Read
 
@@ -116,7 +116,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMDhcpConfig
 
    
@@ -125,7 +125,7 @@
 
    Implemented Interfaces
    
 
    
 NMDhcpConfig implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -161,7 +161,7 @@ nm_dhcp_config_get_family (
 
    nm_dhcp_config_get_options ()
    
-
    GHashTable *
+
    GHashTable *
 nm_dhcp_config_get_options (NMDhcpConfig *config);
    
 
    Gets all the options contained in the configuration.
    
 
    
@@ -181,7 +181,7 @@ nm_dhcp_config_get_options (
 
    Returns
    
-
     the GHashTable containing
+
     the GHashTable containing
 strings for keys and values.  This is the internal copy used by the
 configuration, and must not be modified. 
    
 
    [transfer none][element-type utf8 utf8]
    
@@ -246,7 +246,7 @@ configuration, and must not be modified.
    
 
    Property Details
    
 
    
 
    The “family” property
    
-
      “family”                   gint
    
+
      “family”                   gint
    
 
    The IP address family of the configuration; either
 AF_INET or AF_INET6.
    
 
    Flags: Read
    
@@ -256,8 +256,8 @@ configuration, and must not be modified.
    
 
    
 
    
 
    The “options” property
    
-
      “options”                  GHashTable *
    
-
    The GHashTable containing options of the configuration.
    
+
      “options”                  GHashTable *
    
+
    The GHashTable containing options of the configuration.
    
 
    Type: GLib.HashTable(utf8,utf8)
    
 
    Flags: Read
    
 
    
diff --git a/docs/libnm/html/NMIPConfig.html b/docs/libnm/html/NMIPConfig.html
index b567f724..3d43bc21 100644
--- a/docs/libnm/html/NMIPConfig.html
+++ b/docs/libnm/html/NMIPConfig.html
@@ -59,7 +59,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_ip_config_get_addresses ()
@@ -67,7 +67,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_ip_config_get_routes ()
@@ -115,44 +115,44 @@
 
 
 
-GPtrArray *
+GPtrArray *
 addresses
 Read
 
 
-GStrv
+GStrv
 domains
 Read
 
 
-gint
+gint
 family
 Read
 
 
 
-gchar *
+gchar *
 gateway
 Read
 
 
-GStrv
+GStrv
 nameservers
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 routes
 Read
 
 
-GStrv
+GStrv
 searches
 Read
 
 
-GStrv
+GStrv
 wins-servers
 Read
 
@@ -208,7 +208,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMIPConfig
 
    
@@ -217,7 +217,7 @@
 
    Implemented Interfaces
    
 
    
 NMIPConfig implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -280,7 +280,7 @@ nm_ip_config_get_gateway (
 
    nm_ip_config_get_addresses ()
    
-
    GPtrArray *
+
    GPtrArray *
 nm_ip_config_get_addresses (NMIPConfig *config);
    
 
    Gets the IP addresses (containing the address, prefix, and gateway).
    
 
    
@@ -300,7 +300,7 @@ nm_ip_config_get_addresses (
 
    Returns
    
-
     the GPtrArray
+
     the GPtrArray
 containing NMIPAddresses.  This is the internal copy used by the
 configuration and must not be modified. The library never modifies the
 returned array and thus it is safe for callers to reference and keep using it. 
    
@@ -310,7 +310,7 @@ returned array and thus it is safe for callers to reference and keep using it. <
 
    
 
    
 
    nm_ip_config_get_routes ()
    
-
    GPtrArray *
+
    GPtrArray *
 nm_ip_config_get_routes (NMIPConfig *config);
    
 
    Gets the routes.
    
 
    
@@ -330,7 +330,7 @@ nm_ip_config_get_routes (
 
    Returns
    
-
     the GPtrArray containing
+
     the GPtrArray containing
 NMIPRoutes. This is the internal copy used by the configuration, and must
 not be modified. The library never modifies the returned array and thus it is
 safe for callers to reference and keep using it. 
    
@@ -388,7 +388,7 @@ nm_ip_config_get_domains (
 
    Returns
    
 
     the array of domains.
-(This is never NULL, though it may be 0-length). 
    
+(This is never NULL, though it may be 0-length). 
    
 
    [transfer none]
    
 
    
 
    
@@ -416,7 +416,7 @@ nm_ip_config_get_searches (
 
    Returns
    
 
     the array of DNS search strings.
-(This is never NULL, though it may be 0-length). 
    
+(This is never NULL, though it may be 0-length). 
    
 
    [transfer none]
    
 
    
 
    
@@ -444,7 +444,7 @@ nm_ip_config_get_wins_servers (
 
    Returns
    
 
     the arry of WINS server IP address strings.
-(This is never NULL, though it may be 0-length.). 
    
+(This is never NULL, though it may be 0-length.). 
    
 
    [transfer none]
    
 
    
 
    
@@ -508,21 +508,21 @@ nm_ip_config_get_wins_servers (
    Property Details
    
 
    
 
    The “addresses” property
    
-
      “addresses”                GPtrArray *
    
-
    A GPtrArray containing the addresses (NMIPAddress) of the configuration.
    
+
      “addresses”                GPtrArray *
    
+
    A GPtrArray containing the addresses (NMIPAddress) of the configuration.
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “domains” property
    
-
      “domains”                  GStrv
    
+
      “domains”                  GStrv
    
 
    The array containing domain strings of the configuration.
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “family” property
    
-
      “family”                   gint
    
+
      “family”                   gint
    
 
    The IP address family of the configuration; either
 AF_INET or AF_INET6.
    
 
    Flags: Read
    
@@ -532,7 +532,7 @@ nm_ip_config_get_wins_servers (
 
    
 
    The “gateway” property
    
-
      “gateway”                  gchar *
    
+
      “gateway”                  gchar *
    
 
    The IP gateway address of the configuration as string.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -540,28 +540,28 @@ nm_ip_config_get_wins_servers (
 
    
 
    The “nameservers” property
    
-
      “nameservers”              GStrv
    
+
      “nameservers”              GStrv
    
 
    The array containing name server IP addresses of the configuration.
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “routes” property
    
-
      “routes”                   GPtrArray *
    
-
    A GPtrArray containing the routes (NMIPRoute) of the configuration.
    
+
      “routes”                   GPtrArray *
    
+
    A GPtrArray containing the routes (NMIPRoute) of the configuration.
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “searches” property
    
-
      “searches”                 GStrv
    
+
      “searches”                 GStrv
    
 
    The array containing DNS search strings of the configuration.
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “wins-servers” property
    
-
      “wins-servers”             GStrv
    
+
      “wins-servers”             GStrv
    
 
    The array containing WINS server IP addresses of the configuration.
 (This will always be empty for IPv6 configurations.)
    
 
    Flags: Read
    
diff --git a/docs/libnm/html/NMObject.html b/docs/libnm/html/NMObject.html
index d22190aa..853dbeb7 100644
--- a/docs/libnm/html/NMObject.html
+++ b/docs/libnm/html/NMObject.html
@@ -61,25 +61,25 @@
 
 
 
-GDBusConnection *
+GDBusConnection *
 dbus-connection
 Read
 
 
 
-GDBusObject *
+GDBusObject *
 dbus-object
 Read / Write / Construct Only
 
 
 
-GDBusObjectManager *
+GDBusObjectManager *
 dbus-object-manager
 Read / Write / Construct Only
 
 
 
-gchar *
+gchar *
 path
 Read
 
@@ -115,7 +115,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ├── NMAccessPoint
         ├── NMActiveConnection
@@ -130,7 +130,7 @@
 
    Implemented Interfaces
    
 
    
 NMObject implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -193,31 +193,31 @@ object, and must not be modified.
    
 
    Property Details
    
 
    
 
    The “dbus-connection” property
    
-
      “dbus-connection”          GDBusConnection *
    
-
    The GDBusConnection of the object.
    
+
      “dbus-connection”          GDBusConnection *
    
+
    The GDBusConnection of the object.
    
 
    [skip]
    
 
    Flags: Read
    
 
    
 
    
 
    
 
    The “dbus-object” property
    
-
      “dbus-object”              GDBusObject *
    
-
    The GDBusObject of the object.
    
+
      “dbus-object”              GDBusObject *
    
+
    The GDBusObject of the object.
    
 
    [skip]
    
 
    Flags: Read / Write / Construct Only
    
 
    
 
    
 
    
 
    The “dbus-object-manager” property
    
-
      “dbus-object-manager”      GDBusObjectManager *
    
-
    The GDBusObjectManager of the object.
    
+
      “dbus-object-manager”      GDBusObjectManager *
    
+
    The GDBusObjectManager of the object.
    
 
    [skip]
    
 
    Flags: Read / Write / Construct Only
    
 
    
 
    
 
    
 
    The “path” property
    
-
      “path”                     gchar *
    
+
      “path”                     gchar *
    
 
    The D-Bus object path.
    
 
    [skip]
    
 
    Flags: Read
    
diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html
index e0545b25..7441b6c3 100644
--- a/docs/libnm/html/NMRemoteConnection.html
+++ b/docs/libnm/html/NMRemoteConnection.html
@@ -44,7 +44,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_commit_changes ()
@@ -60,7 +60,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_commit_changes_finish ()
@@ -68,7 +68,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_save ()
@@ -84,7 +84,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_save_finish ()
@@ -92,7 +92,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_delete ()
@@ -108,7 +108,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_delete_finish ()
@@ -116,7 +116,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_remote_connection_get_secrets ()
@@ -132,7 +132,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_remote_connection_get_secrets_finish ()
@@ -140,7 +140,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_get_unsaved ()
@@ -148,7 +148,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_get_visible ()
@@ -167,12 +167,12 @@
 
 
 
-gboolean
+gboolean
 unsaved
 Read
 
 
-gboolean
+gboolean
 visible
 Read
 
@@ -212,7 +212,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMRemoteConnection
 
    
@@ -221,7 +221,7 @@
 
    Implemented Interfaces
    
 
    
 NMRemoteConnection implements
- GInitable,  GAsyncInitable and  NMConnection.
    
+ GInitable,  GAsyncInitable and  NMConnection.
    
 
    
 
    
 
    Description
    
@@ -230,16 +230,16 @@ NMRemoteConnection implements
 
    Functions
    
 
    
 
    nm_remote_connection_commit_changes ()
    
-
    gboolean
+
    gboolean
 nm_remote_connection_commit_changes (NMRemoteConnection *connection,
-                                     gboolean save_to_disk,
-                                     GCancellable *cancellable,
-                                     GError **error);
    
+                                     gboolean save_to_disk,
+                                     GCancellable *cancellable,
+                                     GError **error);
    
 
    Send any local changes to the settings and properties of connection
  to
 NetworkManager. If save_to_disk
- is TRUE, the updated connection will be saved to
-disk; if FALSE, then only the in-memory representation will be changed.
    
+ is TRUE, the updated connection will be saved to
+disk; if FALSE, then only the in-memory representation will be changed.
    
 
    
 
    Parameters
    
 
    
@@ -261,12 +261,12 @@ disk; if 
    cancellable
    
-    
+
-
+
@@ -274,7 +274,7 @@ disk; if 
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be set.
    
@@ -284,15 +284,15 @@ will be set.
    void
 nm_remote_connection_commit_changes_async
                                (NMRemoteConnection *connection,
-                                gboolean save_to_disk,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
    
+                                gboolean save_to_disk,
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);
    Asynchronously sends any local changes to the settings and properties of
 connection
  to NetworkManager. If save
- is TRUE, the updated connection will
-be saved to disk; if FALSE, then only the in-memory representation will be
+ is TRUE, the updated connection will
+be saved to disk; if FALSE, then only the in-memory representation will be
 changed.
    
 
    Parameters
    
@@ -315,7 +315,7 @@ changed.
    
 
 
    
-
+
@@ -336,11 +336,11 @@ changed.
    
 
    nm_remote_connection_commit_changes_finish ()
    
-
    gboolean
+
    gboolean
 nm_remote_connection_commit_changes_finish
                                (NMRemoteConnection *connection,
-                                GAsyncResult *result,
-                                GError **error);
    
+                                GAsyncResult *result,
+                                GError **error);
    
 
    Gets the result of a call to nm_remote_connection_commit_changes_async().
    
 
    
 
    Parameters
    
@@ -358,12 +358,12 @@ nm_remote_connection_commit_changes_finish
 
    
-
+
-
+
@@ -371,17 +371,17 @@ nm_remote_connection_commit_changes_finish
 
    
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
 
    nm_remote_connection_save ()
    
-
    gboolean
+
    gboolean
 nm_remote_connection_save (NMRemoteConnection *connection,
-                           GCancellable *cancellable,
-                           GError **error);
    
+                           GCancellable *cancellable,
+                           GError **error);
    
 
    Saves the connection to disk if the connection has changes that have not yet
 been written to disk, or if the connection has never been saved.
    
 
    
@@ -400,12 +400,12 @@ been written to disk, or if the connection has never been saved.
    
 
 
    
-
+
-
+
@@ -413,7 +413,7 @@ been written to disk, or if the connection has never been saved.
    
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
@@ -422,9 +422,9 @@ will be set.
    nm_remote_connection_save_async ()
    void
 nm_remote_connection_save_async (NMRemoteConnection *connection,
-                                 GCancellable *cancellable,
-                                 GAsyncReadyCallback callback,
-                                 gpointer user_data);
    
+                                 GCancellable *cancellable,
+                                 GAsyncReadyCallback callback,
+                                 gpointer user_data);
    Saves the connection to disk if the connection has changes that have not yet
 been written to disk, or if the connection has never been saved.
    
@@ -443,7 +443,7 @@ been written to disk, or if the connection has never been saved.
    
 
 
    
-
+
@@ -464,10 +464,10 @@ been written to disk, or if the connection has never been saved.
    
 
    nm_remote_connection_save_finish ()
    
-
    gboolean
+
    gboolean
 nm_remote_connection_save_finish (NMRemoteConnection *connection,
-                                  GAsyncResult *result,
-                                  GError **error);
    
+                                  GAsyncResult *result,
+                                  GError **error);
    
 
    Gets the result of a call to nm_remote_connection_save_async().
    
 
    
 
    Parameters
    
@@ -485,12 +485,12 @@ nm_remote_connection_save_finish (
 
    
-
+
-
+
@@ -498,17 +498,17 @@ nm_remote_connection_save_finish (
 
    
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
 
 
    
 
    
 
    nm_remote_connection_delete ()
    
-
    gboolean
+
    gboolean
 nm_remote_connection_delete (NMRemoteConnection *connection,
-                             GCancellable *cancellable,
-                             GError **error);
    
+                             GCancellable *cancellable,
+                             GError **error);
    
 
    Deletes the connection.
    
 
    
 
    Parameters
    
@@ -526,12 +526,12 @@ nm_remote_connection_delete (
    cancellable
    
-
    
+
-
+
@@ -539,7 +539,7 @@ nm_remote_connection_delete (
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
 
@@ -548,9 +548,9 @@ will be set.
    
 
    nm_remote_connection_delete_async ()
    
 
    void
 nm_remote_connection_delete_async (NMRemoteConnection *connection,
-                                   GCancellable *cancellable,
-                                   GAsyncReadyCallback callback,
-                                   gpointer user_data);
    
+                                   GCancellable *cancellable,
+                                   GAsyncReadyCallback callback,
+                                   gpointer user_data);
 
    Asynchronously deletes the connection.
    
 
    
 
    Parameters
    
@@ -568,7 +568,7 @@ nm_remote_connection_delete_async (
 
    
-
+
@@ -589,10 +589,10 @@ nm_remote_connection_delete_async (
 
    
 
    nm_remote_connection_delete_finish ()
    
-
    gboolean
+
    gboolean
 nm_remote_connection_delete_finish (NMRemoteConnection *connection,
-                                    GAsyncResult *result,
-                                    GError **error);
    
+                                    GAsyncResult *result,
+                                    GError **error);
    
 
    Gets the result of a call to nm_remote_connection_delete_async().
    
 
    
 
    Parameters
    
@@ -610,12 +610,12 @@ nm_remote_connection_delete_finish (
 
    
-
+
-
+
@@ -623,18 +623,18 @@ nm_remote_connection_delete_finish (
 
    
 
    Returns
    
-
     TRUE on success, FALSE on error, in which case error
+
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
 
 
    
 
    
 
    nm_remote_connection_get_secrets ()
    
-
    GVariant *
+
    GVariant *
 nm_remote_connection_get_secrets (NMRemoteConnection *connection,
                                   const char *setting_name,
-                                  GCancellable *cancellable,
-                                  GError **error);
    
+                                  GCancellable *cancellable,
+                                  GError **error);
    
 
    Request the connection's secrets. Note that this is a blocking D-Bus call,
 not a simple property accessor.
    
 
    
@@ -658,12 +658,12 @@ not a simple property accessor.
    
 
 
    
-
+
-
+
@@ -671,9 +671,9 @@ not a simple property accessor.
    
 
 
    
 
    Returns
    
-
     a GVariant of type NM_VARIANT_TYPE_CONNECTION containing
+
     a GVariant of type NM_VARIANT_TYPE_CONNECTION containing
 connection
-'s secrets, or NULL on error.
    
+'s secrets, or NULL on error.
    
 
    
 
 
    
@@ -683,9 +683,9 @@ not a simple property accessor.
    
 nm_remote_connection_get_secrets_async
                                (NMRemoteConnection *connection,
                                 const char *setting_name,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);
 
    Asynchronously requests the connection's secrets.
    
 
    
 
    Parameters
    
@@ -708,7 +708,7 @@ nm_remote_connection_get_secrets_async
 
 
    
-
+
@@ -729,11 +729,11 @@ nm_remote_connection_get_secrets_async
 
    
 
    
 
    nm_remote_connection_get_secrets_finish ()
    
-
    GVariant *
+
    GVariant *
 nm_remote_connection_get_secrets_finish
                                (NMRemoteConnection *connection,
-                                GAsyncResult *result,
-                                GError **error);
    
+                                GAsyncResult *result,
+                                GError **error);
    
 
    Gets the result of a call to nm_remote_connection_get_secrets_async().
    
 
    
 
    Parameters
    
@@ -751,12 +751,12 @@ nm_remote_connection_get_secrets_finish
 
    
-
+
-
+
@@ -764,16 +764,16 @@ nm_remote_connection_get_secrets_finish
 
 
    
 
    Returns
    
-
     a GVariant of type NM_VARIANT_TYPE_CONNECTION
+
     a GVariant of type NM_VARIANT_TYPE_CONNECTION
 containing connection
-'s secrets, or NULL on error. 
    
+'s secrets, or NULL on error. 
    
 
    [transfer full]
    
 
    
 
 
    
 
    
 
    nm_remote_connection_get_unsaved ()
    
-
    gboolean
+
    gboolean
 nm_remote_connection_get_unsaved (NMRemoteConnection *connection);
    
 
    
 
    Parameters
    
@@ -792,15 +792,15 @@ nm_remote_connection_get_unsaved (
 
    
 
    Returns
    
-
     TRUE if the remote connection contains changes that have not
-been saved to disk, FALSE if the connection is the same as its on-disk
+
     TRUE if the remote connection contains changes that have not
+been saved to disk, FALSE if the connection is the same as its on-disk
 representation.
    
 
    
 
    
 
    
 
    
 
    nm_remote_connection_get_visible ()
    
-
    gboolean
+
    gboolean
 nm_remote_connection_get_visible (NMRemoteConnection *connection);
    
 
    Checks if the connection is visible to the current user.  If the
 connection is not visible then it is essentially useless; it will
@@ -827,8 +827,8 @@ reference to it.)
    
 
    
 
    
 
    Returns
    
-
     TRUE if the remote connection is visible to the current
-user, FALSE if not.
    
+
     TRUE if the remote connection is visible to the current
+user, FALSE if not.
    
 
    
 
    
 
@@ -867,17 +867,17 @@ user, 
    Property Details
    
 
    
 
    The “unsaved” property
    
-
      “unsaved”                  gboolean
    
-
    TRUE if the remote connection contains changes that have not been saved
-to disk, FALSE if the connection is the same as its on-disk representation.
    
+
      “unsaved”                  gboolean
    
+
    TRUE if the remote connection contains changes that have not been saved
+to disk, FALSE if the connection is the same as its on-disk representation.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “visible” property
    
-
      “visible”                  gboolean
    
-
    TRUE if the remote connection is visible to the current user, FALSE if
+
      “visible”                  gboolean
    
+
    TRUE if the remote connection is visible to the current user, FALSE if
 not.  If the connection is not visible then it is essentially useless; it
 will not contain any settings, and operations such as
 nm_remote_connection_save() and nm_remote_connection_delete() will always
diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html
index feeef9c1..65cb389a 100644
--- a/docs/libnm/html/NMSecretAgentOld.html
+++ b/docs/libnm/html/NMSecretAgentOld.html
@@ -68,7 +68,7 @@
 
 
    
-
+
@@ -170,12 +170,12 @@
 
 
+gchar *
 
-
+
@@ -215,7 +215,7 @@
 
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSecretAgentOld
 
    
 
    
@@ -223,7 +223,7 @@
 
    Implemented Interfaces
    
 
    
 NMSecretAgentOld implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
 
    
 
    Description
    
@@ -235,9 +235,9 @@ NMSecretAgentOld implements
 
    void
 (*NMSecretAgentOldGetSecretsFunc) (NMSecretAgentOld *agent,
                                    NMConnection *connection,
-                                   GVariant *secrets,
-                                   GError *error,
-                                   gpointer user_data);
    
+                                   GVariant *secrets,
+                                   GError *error,
+                                   gpointer user_data);
 
    Called as a result of a request by NM to retrieve secrets.  When the
 NMSecretAgentOld subclass has finished retrieving secrets and is ready to
 return them, or to return an error, this function should be called with
@@ -272,16 +272,16 @@ something like this:
    
 
 secrets = nm_simple_connection_new ();
 s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
-g_object_set (G_OBJECT (s_wsec),
+g_object_set (G_OBJECT (s_wsec),
               NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
-              NULL);
+              NULL);
 nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
 secrets_dict = nm_connection_to_dbus (secrets, NM_CONNECTION_SERIALIZE_ALL);
 
 (call the NMSecretAgentOldGetSecretsFunc with secrets_dict)
 
-g_object_unref (secrets);
-g_variant_unref (secrets_dict);
+g_object_unref (secrets);
+g_variant_unref (secrets_dict);
       
     
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
     
 
 
 
 
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
 
    
 
    
 
    result
    the result passed to the GAsyncReadyCallback
    the result passed to the GAsyncReadyCallback
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
     
 
 
 
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
     
 
 
 
 
 
 
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
 
    
 
    result
    the result passed to the GAsyncReadyCallback
    the result passed to the GAsyncReadyCallback
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
 
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    result
    the result passed to the GAsyncReadyCallback
    the result passed to the GAsyncReadyCallback
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
 
    
 
    cancellable
    a GCancellable, or NULL
    a GCancellable, or NULL
    		
  
 
    
 
    
 
    
 
    result
    the result passed to the GAsyncReadyCallback
    the result passed to the GAsyncReadyCallback
    		
  
 
    
 
    
 
    error
    location for a GError, or NULL
    location for a GError, or NULL
    		
  
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_secret_agent_old_register ()
@@ -84,7 +84,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_secret_agent_old_register_finish ()
@@ -92,7 +92,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_secret_agent_old_unregister ()
@@ -108,7 +108,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_secret_agent_old_unregister_finish ()
@@ -116,7 +116,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_secret_agent_old_get_registered ()
@@ -159,7 +159,7 @@
 
 
    
 
    gbooleangboolean
 auto-register
 Read / Write / Construct
 
    
 
-gchar *identifier
 Read / Write / Construct Only
 
    
 
    gbooleangboolean
 registered
 Read
 
    
   
    
@@ -306,13 +306,13 @@ something like this:
    
 
    connection
    
 
     the connection for which secrets were requested,
 note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
+g_object_ref()/g_object_unref() if you want to use this object after the callback
 has returned. 
    
 [transfer none]
 
 
 
    secrets
    
-
    the GVariant of type NM_VARIANT_TYPE_CONNECTION containing the requested
+
    the GVariant of type NM_VARIANT_TYPE_CONNECTION containing the requested
 secrets (as created by nm_connection_to_dbus() for example).  Each key in secrets
 should be the name of a NMSetting object (like "802-11-wireless-security")
 and each value should be an NM_VARIANT_TYPE_SETTING variant.  The sub-dicts
@@ -340,8 +340,8 @@ and the value is the secret
    
 
    void
 (*NMSecretAgentOldSaveSecretsFunc) (NMSecretAgentOld *agent,
                                     NMConnection *connection,
-                                    GError *error,
-                                    gpointer user_data);
    
+                                    GError *error,
+                                    gpointer user_data);
    
 
    Called as a result of a request by NM to save secrets.  When the
 NMSecretAgentOld subclass has finished saving the secrets, this function
 should be called.
    
@@ -363,7 +363,7 @@ should be called.
    
 
    connection
    
 
     the connection for which secrets were to be saved,
 note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
+g_object_ref()/g_object_unref() if you want to use this object after the callback
 has returned. 
    
 [transfer none]
 
@@ -387,8 +387,8 @@ has returned. 
    
 
    void
 (*NMSecretAgentOldDeleteSecretsFunc) (NMSecretAgentOld *agent,
                                       NMConnection *connection,
-                                      GError *error,
-                                      gpointer user_data);
    
+                                      GError *error,
+                                      gpointer user_data);
    
 
    Called as a result of a request by NM to delete secrets.  When the
 NMSecretAgentOld subclass has finished deleting the secrets, this function
 should be called.
    
@@ -410,7 +410,7 @@ should be called.
    
 
    connection
    
 
     the connection for which secrets were to be deleted,
 note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
+g_object_ref()/g_object_unref() if you want to use this object after the callback
 has returned. 
    
 [transfer none]
 
@@ -431,10 +431,10 @@ has returned. 
    
 
    
 
    
 
    nm_secret_agent_old_register ()
    
-
    gboolean
+
    gboolean
 nm_secret_agent_old_register (NMSecretAgentOld *self,
-                              GCancellable *cancellable,
-                              GError **error);
    
+                              GCancellable *cancellable,
+                              GError **error);
    
 
    Registers the NMSecretAgentOld with the NetworkManager secret manager,
 indicating to NetworkManager that the agent is able to provide and save
 secrets for connections on behalf of its user.
    
@@ -456,12 +456,12 @@ registered, or in the process of registering.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
 
    error
    
-
    return location for a GError, or NULL
    
+
    return location for a GError, or NULL
    
  
 
 
@@ -469,7 +469,7 @@ registered, or in the process of registering.
    
 
    
 
    
 
    Returns
    
-
     TRUE if registration was successful, FALSE on error.
    
+
     TRUE if registration was successful, FALSE on error.
    
 
    
 
    
 
    
@@ -477,9 +477,9 @@ registered, or in the process of registering.
    
 
    nm_secret_agent_old_register_async ()
    
 
    void
 nm_secret_agent_old_register_async (NMSecretAgentOld *self,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data);
    
+                                    GCancellable *cancellable,
+                                    GAsyncReadyCallback callback,
+                                    gpointer user_data);
    
 
    Asynchronously registers the NMSecretAgentOld with the NetworkManager secret
 manager, indicating to NetworkManager that the agent is able to provide and
 save secrets for connections on behalf of its user.
    
@@ -501,7 +501,7 @@ registered, or in the process of registering.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
@@ -522,10 +522,10 @@ registered, or in the process of registering.
    
 
    
 
    
 
    nm_secret_agent_old_register_finish ()
    
-
    gboolean
+
    gboolean
 nm_secret_agent_old_register_finish (NMSecretAgentOld *self,
-                                     GAsyncResult *result,
-                                     GError **error);
    
+                                     GAsyncResult *result,
+                                     GError **error);
    
 
    Gets the result of a call to nm_secret_agent_old_register_async().
    
 
    
 
    Parameters
    
@@ -543,12 +543,12 @@ nm_secret_agent_old_register_finish (
 
 
    result
    
-
    the result passed to the GAsyncReadyCallback
    
+
    the result passed to the GAsyncReadyCallback
    
  
 
 
 
    error
    
-
    return location for a GError, or NULL
    
+
    return location for a GError, or NULL
    
  
 
 
@@ -556,16 +556,16 @@ nm_secret_agent_old_register_finish (
 
    
 
    Returns
    
-
     TRUE if registration was successful, FALSE on error.
    
+
     TRUE if registration was successful, FALSE on error.
    
 
    
 
    
 
    
 
    
 
    nm_secret_agent_old_unregister ()
    
-
    gboolean
+
    gboolean
 nm_secret_agent_old_unregister (NMSecretAgentOld *self,
-                                GCancellable *cancellable,
-                                GError **error);
    
+                                GCancellable *cancellable,
+                                GError **error);
    
 
    Unregisters the NMSecretAgentOld with the NetworkManager secret manager,
 indicating to NetworkManager that the agent will no longer provide or
 store secrets on behalf of this user.
    
@@ -585,12 +585,12 @@ store secrets on behalf of this user.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
 
    error
    
-
    return location for a GError, or NULL
    
+
    return location for a GError, or NULL
    
  
 
 
@@ -598,7 +598,7 @@ store secrets on behalf of this user.
    
 
    
 
    
 
    Returns
    
-
     TRUE if unregistration was successful, FALSE on error
    
+
     TRUE if unregistration was successful, FALSE on error
    
 
    
 
    
 
    
@@ -606,9 +606,9 @@ store secrets on behalf of this user.
    
 
    nm_secret_agent_old_unregister_async ()
    
 
    void
 nm_secret_agent_old_unregister_async (NMSecretAgentOld *self,
-                                      GCancellable *cancellable,
-                                      GAsyncReadyCallback callback,
-                                      gpointer user_data);
    
+                                      GCancellable *cancellable,
+                                      GAsyncReadyCallback callback,
+                                      gpointer user_data);
    
 
    Asynchronously unregisters the NMSecretAgentOld with the NetworkManager secret
 manager, indicating to NetworkManager that the agent will no longer provide
 or store secrets on behalf of this user.
    
@@ -628,7 +628,7 @@ or store secrets on behalf of this user.
    
 
 
 
    cancellable
    
-
    a GCancellable, or NULL
    
+
    a GCancellable, or NULL
    
  
 
 
@@ -649,10 +649,10 @@ or store secrets on behalf of this user.
    
 
    
 
    
 
    nm_secret_agent_old_unregister_finish ()
    
-
    gboolean
+
    gboolean
 nm_secret_agent_old_unregister_finish (NMSecretAgentOld *self,
-                                       GAsyncResult *result,
-                                       GError **error);
    
+                                       GAsyncResult *result,
+                                       GError **error);
    
 
    Gets the result of a call to nm_secret_agent_old_unregister_async().
    
 
    
 
    Parameters
    
@@ -670,12 +670,12 @@ nm_secret_agent_old_unregister_finish (
    result
    
-
    the result passed to the GAsyncReadyCallback
    
+
    the result passed to the GAsyncReadyCallback
    
  
 
 
 
    error
    
-
    return location for a GError, or NULL
    
+
    return location for a GError, or NULL
    
  
 
 
@@ -683,13 +683,13 @@ nm_secret_agent_old_unregister_finish (
 
    Returns
    
-
     TRUE if unregistration was successful, FALSE on error.
    
+
     TRUE if unregistration was successful, FALSE on error.
    
 
    
 
    
 
    
 
    
 
    nm_secret_agent_old_get_registered ()
    
-
    gboolean
+
    gboolean
 nm_secret_agent_old_get_registered (NMSecretAgentOld *self);
    
 
    
 
    Parameters
    
@@ -708,7 +708,7 @@ nm_secret_agent_old_get_registered (
 
    
 
    Returns
    
-
     a TRUE if the agent is registered, FALSE if it is not.
    
+
     a TRUE if the agent is registered, FALSE if it is not.
    
 
    
 
    
 
    
@@ -721,7 +721,7 @@ nm_secret_agent_old_get_secrets (const char **hints,
                                  NMSecretAgentGetSecretsFlags flags,
                                  NMSecretAgentOldGetSecretsFunc callback,
-                                 gpointer user_data);
    
+                                 gpointer user_data);
    
 
    Asynchronously retrieves secrets belonging to connection
  for the
 setting setting_name
@@ -787,7 +787,7 @@ secrets from the user.
    
 nm_secret_agent_old_save_secrets (NMSecretAgentOld *self,
                                   NMConnection *connection,
                                   NMSecretAgentOldSaveSecretsFunc callback,
-                                  gpointer user_data);
    
+                                  gpointer user_data);
    
 
    Asynchronously ensures that all secrets inside connection
  are stored to
 disk.
    
@@ -833,7 +833,7 @@ disk.
    
 nm_secret_agent_old_delete_secrets (NMSecretAgentOld *self,
                                     NMConnection *connection,
                                     NMSecretAgentOldDeleteSecretsFunc callback,
-                                    gpointer user_data);
    
+                                    gpointer user_data);
    
 
    Asynchronously asks the agent to delete all saved secrets belonging to
 connection
 .
    
@@ -908,15 +908,15 @@ nm_secret_agent_old_delete_secrets (
    Property Details
    
 
    
 
    The “auto-register” property
    
-
      “auto-register”            gboolean
    
-
    If TRUE (the default), the agent will always be registered when
+
      “auto-register”            gboolean
    
+
    If TRUE (the default), the agent will always be registered when
 NetworkManager is running; if NetworkManager exits and restarts, the
 agent will re-register itself automatically.
    
-
    In particular, if this property is TRUE at construct time, then the
+
    In particular, if this property is TRUE at construct time, then the
 agent will register itself with NetworkManager during
 construction/initialization, and initialization will fail with an error
 if the agent is unable to register itself.
    
-
    If the property is FALSE, the agent will not automatically register with
+
    If the property is FALSE, the agent will not automatically register with
 NetworkManager, and nm_secret_agent_old_register() or
 nm_secret_agent_old_register_async() must be called to register it.
    
 
    Calling nm_secret_agent_old_unregister() will suppress auto-registration
@@ -936,7 +936,7 @@ you expect it to be unregistered.
    
 
    
 
    
 
    The “identifier” property
    
-
      “identifier”               gchar *
    
+
      “identifier”               gchar *
    
 
    Identifies this agent; only one agent in each user session may use the
 same identifier.  Identifier formatting follows the same rules as
 D-Bus bus names with the exception that the ':' character is not
@@ -950,8 +950,8 @@ of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 
    
 
    
 
    The “registered” property
    
-
      “registered”               gboolean
    
-
    TRUE if the agent is registered with NetworkManager, FALSE if not.
    
+
      “registered”               gboolean
    
+
    TRUE if the agent is registered with NetworkManager, FALSE if not.
    
 
    Flags: Read
    
 
    Default value: FALSE
    
 
    
diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index f2e9a755..66b934f0 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -43,7 +43,7 @@
 
 
 
-gboolean
+gboolean
 
 
 (*NMSettingClearSecretsWithFlagsFn) ()
@@ -59,7 +59,7 @@
 
 
 
-GType
+GType
 
 
 nm_setting_lookup_type ()
@@ -82,7 +82,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_verify ()
@@ -90,7 +90,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_verify_secrets ()
@@ -98,7 +98,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_compare ()
@@ -106,7 +106,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_diff ()
@@ -130,7 +130,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_get_secret_flags ()
@@ -138,14 +138,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_set_secret_flags ()
 
 
 
-const GVariantType *
+const GVariantType *
 
 
 nm_setting_get_dbus_property_type ()
@@ -164,7 +164,7 @@
 
 
 
-gchar *
+gchar *
 name
 Read
 
@@ -219,13 +219,13 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMSettingCompareFlags
     ├── NMSettingDiffResult
     ╰── NMSettingMacRandomization
-    GFlags
+    GFlags
     ╰── NMSettingSecretFlags
-    GObject
+    GObject
     ╰── NMSetting
         ├── NMSetting8021x
         ├── NMSettingAdsl
@@ -236,12 +236,13 @@
         ├── NMSettingCdma
         ├── NMSettingConnection
         ├── NMSettingDcb
+        ├── NMSettingDummy
         ├── NMSettingGeneric
         ├── NMSettingGsm
         ├── NMSettingInfiniband
         ├── NMSettingIPTunnel
         ├── NMSettingIPConfig
-        ├── NMSettingMacsec
+        ├── NMSettingMacsec
         ├── NMSettingMacvlan
         ├── NMSettingOlpcMesh
         ├── NMSettingPpp
@@ -251,6 +252,7 @@
         ├── NMSettingTeamPort
         ├── NMSettingTeam
         ├── NMSettingTun
+        ├── NMSettingUser
         ├── NMSettingVlan
         ├── NMSettingVpn
         ├── NMSettingVxlan
@@ -273,11 +275,11 @@ of properties and allowed values.
    
 
    Functions
    
 
    
 
    NMSettingClearSecretsWithFlagsFn ()
    
-
    gboolean
+
    gboolean
 (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
                                      const char *secret,
                                      NMSettingSecretFlags flags,
-                                     gpointer user_data);
    
+                                     gpointer user_data);
    
 
    
 
    Parameters
    
 
    
@@ -312,7 +314,7 @@ of properties and allowed values.
    
 
    Returns
    
-
     TRUE to clear the secret, FALSE to not clear the secret
    
+
     TRUE to clear the secret, FALSE to not clear the secret
    
 
    
@@ -321,9 +323,9 @@ of properties and allowed values.
    void
 (*NMSettingValueIterFn) (NMSetting *setting,
                          const char *key,
-                         const GValue *value,
-                         GParamFlags flags,
-                         gpointer user_data);
    
+                         const GValue *value,
+                         GParamFlags flags,
+                         gpointer user_data);
    
 
    Parameters
    
 
    
 
 
 
 
 
 
    
@@ -366,9 +368,9 @@ of properties and allowed values.
    
 
    nm_setting_lookup_type ()
    
-
    GType
+
    GType
 nm_setting_lookup_type (const char *name);
    
-
    Returns the GType of the setting's class for a given setting name.
    
+
    Returns the GType of the setting's class for a given setting name.
    
 
    
 
    Parameters
    
 
    
 
 
    
@@ -386,7 +388,7 @@ nm_setting_lookup_type (const cha
 
 
    
 
    Returns
    
-
     the GType of the setting's class, or G_TYPE_INVALID if
+
     the GType of the setting's class, or G_TYPE_INVALID if
 name
 is not recognized.
    
 
    
@@ -449,14 +451,14 @@ like 'ppp' or 'wireless' or 'wired'.
    
 
    
 
    
 
    nm_setting_verify ()
    
-
    gboolean
+
    gboolean
 nm_setting_verify (NMSetting *setting,
                    NMConnection *connection,
-                   GError **error);
    
+                   GError **error);
    
 
    Validates the setting.  Each setting's properties have allowed values, and
 some are dependent on other values (hence the need for connection
 ).  The
-returned GError contains information about which property of the setting
+returned GError contains information about which property of the setting
 failed validation, and in what way that property failed validation.
    
 
    
 
    Parameters
    
@@ -476,13 +478,13 @@ failed validation, and in what way that property failed validation.
    
 
    
-
+
@@ -490,18 +492,18 @@ is being verified in isolation. 
    
 
 
    
 
    Returns
    
-
     TRUE if the setting is valid, FALSE if it is not
    
+
     TRUE if the setting is valid, FALSE if it is not
    
 
    
 
 
    
 
    
 
    nm_setting_verify_secrets ()
    
-
    gboolean
+
    gboolean
 nm_setting_verify_secrets (NMSetting *setting,
                            NMConnection *connection,
-                           GError **error);
    
+                           GError **error);
    
 
    Verifies the secrets in the setting.
-The returned GError contains information about which secret of the setting
+The returned GError contains information about which secret of the setting
 failed validation, and in what way that secret failed validation.
 The secret validation is done separately from main setting validation, because
 in some cases connection failure is not desired just for the secrets.
    
@@ -523,13 +525,13 @@ in some cases connection failure is not desired just for the secrets.
    
 
    
-
+
@@ -537,14 +539,14 @@ is being verified in isolation. 
    
 
 
    
 
    Returns
    
-
     TRUE if the setting secrets are valid, FALSE if they are not
    
+
     TRUE if the setting secrets are valid, FALSE if they are not
    
 
    
 
    Since: 1.2
    
 
 
    
 
    
 
    nm_setting_compare ()
    
-
    gboolean
+
    gboolean
 nm_setting_compare (NMSetting *a,
                     NMSetting *b,
                     NMSettingCompareFlags flags);
    
@@ -580,18 +582,18 @@ for a description of each flag's behavior.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the comparison succeeds, FALSE if it does not
    
+
     TRUE if the comparison succeeds, FALSE if it does not
    
 
    
 
 
    
 
    
 
    nm_setting_diff ()
    
-
    gboolean
+
    gboolean
 nm_setting_diff (NMSetting *a,
                  NMSetting *b,
                  NMSettingCompareFlags flags,
-                 gboolean invert_results,
-                 GHashTable **results);
    
+                 gboolean invert_results,
+                 GHashTable **results);
    
 
    Compares two NMSetting objects for similarity, with comparison behavior
 modified by a set of flags.  See the documentation for NMSettingCompareFlags
 for a description of each flag's behavior.  If the settings differ, the keys
@@ -625,7 +627,7 @@ one or more 
    invert_results
    
 
    
+be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.
    
     
@@ -642,7 +644,7 @@ in and the settings differ, a new one is created and returned. 
    
 
 
    
 
    Returns
    
-
     TRUE if the settings contain the same values, FALSE if they do not
    
+
     TRUE if the settings contain the same values, FALSE if they do not
    
 
    
 
 
    
@@ -651,7 +653,7 @@ in and the settings differ, a new one is created and returned. 
    
 
    void
 nm_setting_enumerate_values (NMSetting *setting,
                              NMSettingValueIterFn func,
-                             gpointer user_data);
    
+                             gpointer user_data);
 
    Iterates over each property of the NMSetting object, calling the supplied
 user function for each property.
    
 
    
@@ -710,17 +712,17 @@ output format is not guaranteed to be stable and may change at any time.
    
 
    Returns
    
 
     an allocated string containing a textual representation of the
 setting's properties and values (including secrets!), which the caller should
-free with g_free()
    
+free with g_free()
    
 
    
 
 
    
 
    
 
    nm_setting_get_secret_flags ()
    
-
    gboolean
+
    gboolean
 nm_setting_get_secret_flags (NMSetting *setting,
                              const char *secret_name,
                              NMSettingSecretFlags *out_flags,
-                             GError **error);
    
+                             GError **error);
    
 
    For a given secret, retrieves the NMSettingSecretFlags describing how to
 handle that secret.
    
 
    
@@ -749,7 +751,7 @@ handle that secret.
    
 
    
-
+
@@ -757,18 +759,18 @@ handle that secret.
    
 
 
    
 
    Returns
    
-
     TRUE on success (if the given secret name was a valid property of
-this setting, and if that property is secret), FALSE if not
    
+
     TRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not
    
 
    
 
 
    
 
    
 
    nm_setting_set_secret_flags ()
    
-
    gboolean
+
    gboolean
 nm_setting_set_secret_flags (NMSetting *setting,
                              const char *secret_name,
                              NMSettingSecretFlags flags,
-                             GError **error);
    
+                             GError **error);
    
 
    For a given secret, stores the NMSettingSecretFlags describing how to
 handle that secret.
    
 
    
@@ -797,7 +799,7 @@ handle that secret.
    
 
 
    
-
+
@@ -805,19 +807,19 @@ handle that secret.
    
 
 
    
 
    Returns
    
-
     TRUE on success (if the given secret name was a valid property of
-this setting, and if that property is secret), FALSE if not
    
+
     TRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not
    
 
    
 
 
    
 
    
 
    nm_setting_get_dbus_property_type ()
    
-
    const GVariantType *
+
    const GVariantType *
 nm_setting_get_dbus_property_type (NMSetting *setting,
                                    const char *property_name);
    
 
    Gets the D-Bus marshalling type of a property. property_name
  is a D-Bus
-property name, which may not necessarily be a GObject property.
    
+property name, which may not necessarily be a GObject property.
    
 
    
 
    Parameters
    
 
    connection
    		
 
     the NMConnection that setting
 came from, or
-NULL if setting
+NULL if setting
 is being verified in isolation. 
    		
 [allow-none]
 
    
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
 
    connection
    		
 
     the NMConnection that setting
 came from, or
-NULL if setting
+NULL if setting
 is being verified in isolation. 
    		
 [allow-none]
 
    
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
 
    this parameter is used internally by libnm and should
-be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.
    		 
 
    
 
    
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
 
    
 
    error
    location to store error, or NULL
    location to store error, or NULL
    		
  
 
    
 
    
@@ -1142,7 +1144,7 @@ if you specify NM_SETTING_COMPARE_FLAG_DIFF_RESULT_W
 
    Property Details
    
 
    
 
    The “name” property
    
-
      “name”                     gchar *
    
+
      “name”                     gchar *
    
 
    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".
    
diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html
index 85407d80..b88fe242 100644
--- a/docs/libnm/html/NMSetting8021x.html
+++ b/docs/libnm/html/NMSetting8021x.html
@@ -59,7 +59,7 @@
 
 
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -329,7 +359,7 @@
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -473,7 +533,7 @@
 
 
+
+
+
+
+
+
+
+
    
 
-guint32
+guint32
 
 
 nm_setting_802_1x_get_num_eap_methods ()
@@ -74,7 +74,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_add_eap_method ()
@@ -90,7 +90,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_remove_eap_method_by_value ()
@@ -127,7 +127,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_get_system_ca_certs ()
@@ -157,7 +157,7 @@
 
    
 
    
 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_ca_cert_blob ()
@@ -179,7 +179,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_ca_cert ()
@@ -189,12 +189,27 @@
 const char *
 
 
+nm_setting_802_1x_get_ca_cert_password ()
+
    
+NMSettingSecretFlags
+
+nm_setting_802_1x_get_ca_cert_password_flags ()
+
    const char *
+
 nm_setting_802_1x_get_subject_match ()
 
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_802_1x_get_num_altsubject_matches ()
@@ -209,7 +224,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_add_altsubject_match ()
@@ -225,7 +240,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_remove_altsubject_match_by_value ()
@@ -256,7 +271,7 @@
 
    
 
    
 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_client_cert_blob ()
@@ -278,7 +293,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_client_cert ()
@@ -288,6 +303,21 @@
 const char *
 
 
+nm_setting_802_1x_get_client_cert_password ()
+
    
+NMSettingSecretFlags
+
+nm_setting_802_1x_get_client_cert_password_flags ()
+
    const char *
+
 nm_setting_802_1x_get_phase1_peapver ()
 
 
    
 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_phase2_ca_cert_blob ()
@@ -351,7 +381,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_phase2_ca_cert ()
@@ -361,12 +391,27 @@
 const char *
 
 
+nm_setting_802_1x_get_phase2_ca_cert_password ()
+
    
+NMSettingSecretFlags
+
+nm_setting_802_1x_get_phase2_ca_cert_password_flags ()
+
    const char *
+
 nm_setting_802_1x_get_phase2_subject_match ()
 
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_802_1x_get_num_phase2_altsubject_matches ()
@@ -381,7 +426,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_add_phase2_altsubject_match ()
@@ -397,7 +442,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_remove_phase2_altsubject_match_by_value ()
@@ -428,7 +473,7 @@
 
    
 
    
 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_phase2_client_cert_blob ()
@@ -450,7 +495,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_phase2_client_cert ()
@@ -460,6 +505,21 @@
 const char *
 
 
+nm_setting_802_1x_get_phase2_client_cert_password ()
+
    
+NMSettingSecretFlags
+
+nm_setting_802_1x_get_phase2_client_cert_password_flags ()
+
    const char *
+
 nm_setting_802_1x_get_password ()
 
 
    
 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_password_raw ()
@@ -512,7 +572,7 @@
 
    
 
    
 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_private_key_blob ()
@@ -534,7 +594,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_private_key ()
@@ -573,7 +633,7 @@
 
    
 
    
 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_phase2_private_key_blob ()
@@ -595,7 +655,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_phase2_private_key ()
@@ -624,6 +684,22 @@
 nm_setting_802_1x_get_phase2_private_key_format ()
 
 
    
+NMSetting8021xAuthFlags
+
+nm_setting_802_1x_get_phase1_auth_flags ()
+
    
+gint
+
+nm_setting_802_1x_get_auth_timeout ()
+
    
     
 
    
 
    
@@ -637,60 +713,87 @@
 
 
 
-GStrv
+GStrv
 altsubject-matches
 Read / Write
 
 
 
-gchar *
+gchar *
 anonymous-identity
 Read / Write
 
 
+gint
+auth-timeout
+Read / Write
+
+
 
-GBytes *
+GBytes *
 ca-cert
 Read / Write
 
 
 
-gchar *
+gchar *
+ca-cert-password
+Read / Write
+
+
+NMSettingSecretFlags
+ca-cert-password-flags
+Read / Write
+
+
+
+gchar *
 ca-path
 Read / Write
 
 
 
-GBytes *
+GBytes *
 client-cert
 Read / Write
 
 
 
-gchar *
+gchar *
+client-cert-password
+Read / Write
+
+
+NMSettingSecretFlags
+client-cert-password-flags
+Read / Write
+
+
+
+gchar *
 domain-suffix-match
 Read / Write
 
 
-GStrv
+GStrv
 eap
 Read / Write
 
 
 
-gchar *
+gchar *
 identity
 Read / Write
 
 
 
-gchar *
+gchar *
 pac-file
 Read / Write
 
 
 
-gchar *
+gchar *
 password
 Read / Write
 
@@ -701,7 +804,7 @@
 
 
 
-GBytes *
+GBytes *
 password-raw
 Read / Write
 
@@ -711,73 +814,100 @@
 Read / Write
 
 
+guint
+phase1-auth-flags
+Read / Write / Construct
+
+
 
-gchar *
+gchar *
 phase1-fast-provisioning
 Read / Write
 
 
 
-gchar *
+gchar *
 phase1-peaplabel
 Read / Write
 
 
 
-gchar *
+gchar *
 phase1-peapver
 Read / Write
 
 
-GStrv
+GStrv
 phase2-altsubject-matches
 Read / Write
 
 
 
-gchar *
+gchar *
 phase2-auth
 Read / Write
 
 
 
-gchar *
+gchar *
 phase2-autheap
 Read / Write
 
 
 
-GBytes *
+GBytes *
 phase2-ca-cert
 Read / Write
 
 
 
-gchar *
+gchar *
+phase2-ca-cert-password
+Read / Write
+
+
+NMSettingSecretFlags
+phase2-ca-cert-password-flags
+Read / Write
+
+
+
+gchar *
 phase2-ca-path
 Read / Write
 
 
 
-GBytes *
+GBytes *
 phase2-client-cert
 Read / Write
 
 
 
-gchar *
+gchar *
+phase2-client-cert-password
+Read / Write
+
+
+NMSettingSecretFlags
+phase2-client-cert-password-flags
+Read / Write
+
+
+
+gchar *
 phase2-domain-suffix-match
 Read / Write
 
 
 
-GBytes *
+GBytes *
 phase2-private-key
 Read / Write
 
 
 
-gchar *
+gchar *
 phase2-private-key-password
 Read / Write
 
@@ -788,13 +918,13 @@
 
 
 
-gchar *
+gchar *
 phase2-subject-match
 Read / Write
 
 
 
-gchar *
+gchar *
 pin
 Read / Write
 
@@ -805,13 +935,13 @@
 
 
 
-GBytes *
+GBytes *
 private-key
 Read / Write
 
 
 
-gchar *
+gchar *
 private-key-password
 Read / Write
 
@@ -822,12 +952,12 @@
 
 
 
-gchar *
+gchar *
 subject-match
 Read / Write
 
 
-gboolean
+gboolean
 system-ca-certs
 Read / Write / Construct
 
@@ -859,6 +989,10 @@
 NMSetting8021xCKScheme
 
 
+enum
+NMSetting8021xAuthFlags
+
+
 #define
 NM_SETTING_802_1X_SETTING_NAME
 
@@ -884,6 +1018,14 @@
 
 
 #define
+NM_SETTING_802_1X_CA_CERT_PASSWORD
+
+
+#define
+NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS
+
+
+#define
 NM_SETTING_802_1X_CA_PATH
 
 
@@ -904,6 +1046,14 @@
 
 
 #define
+NM_SETTING_802_1X_CLIENT_CERT_PASSWORD
+
+
+#define
+NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS
+
+
+#define
 NM_SETTING_802_1X_PHASE1_PEAPVER
 
 
@@ -916,6 +1066,10 @@
 
 
 #define
+NM_SETTING_802_1X_PHASE1_AUTH_FLAGS
+
+
+#define
 NM_SETTING_802_1X_PHASE2_AUTH
 
 
@@ -928,6 +1082,14 @@
 
 
 #define
+NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD
+
+
+#define
+NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS
+
+
+#define
 NM_SETTING_802_1X_PHASE2_CA_PATH
 
 
@@ -948,6 +1110,14 @@
 
 
 #define
+NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD
+
+
+#define
+NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS
+
+
+#define
 NM_SETTING_802_1X_PASSWORD
 
 
@@ -999,6 +1169,10 @@
 NM_SETTING_802_1X_SYSTEM_CA_CERTS
 
 
+#define
+NM_SETTING_802_1X_AUTH_TIMEOUT
+
+
  
 NMSetting8021x
 
@@ -1007,10 +1181,12 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMSetting8021xCKFormat
     ╰── NMSetting8021xCKScheme
-    GObject
+    GFlags
+    ╰── NMSetting8021xAuthFlags
+    GObject
     ╰── NMSetting
         ╰── NMSetting8021x
 
    
@@ -1052,9 +1228,9 @@ nm_setting_802_1x_new (void
 
    nm_setting_802_1x_check_cert_scheme ()
    
 
    NMSetting8021xCKScheme
-nm_setting_802_1x_check_cert_scheme (gconstpointer pdata,
-                                     gsize length,
-                                     GError **error);
    
+nm_setting_802_1x_check_cert_scheme (gconstpointer pdata,
+                                     gsize length,
+                                     GError **error);
    
 
    Determines and verifies the blob type.
 When setting certificate properties of NMSetting8021x
 the blob must be not UNKNOWN (or NULL).
    
@@ -1095,7 +1271,7 @@ For NULL it also returns NM_SETTING_802_1X_CK_SCHEME_UNKNOWN.
    
 
    
 
    
 
    nm_setting_802_1x_get_num_eap_methods ()
    
-
    guint32
+
    guint32
 nm_setting_802_1x_get_num_eap_methods (NMSetting8021x *setting);
    
 
    Returns the number of eap methods allowed for use when connecting to the
 network.  Generally only one EAP method is used.  Use the functions
@@ -1127,7 +1303,7 @@ allowed EAP methods.
    
 
    nm_setting_802_1x_get_eap_method ()
    
 
    const char *
 nm_setting_802_1x_get_eap_method (NMSetting8021x *setting,
-                                  guint32 i);
    
+                                  guint32 i);
    
 
    Returns the name of the allowed EAP method at index i
 .
    
 
    
@@ -1161,7 +1337,7 @@ nm_setting_802_1x_get_eap_method (
 
    
 
    nm_setting_802_1x_add_eap_method ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_add_eap_method (NMSetting8021x *setting,
                                   const char *eap);
    
 
    Adds an allowed EAP method.  The setting is not valid until at least one
@@ -1191,7 +1367,7 @@ allowed EAP methods.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the EAP method was successfully added, FALSE if it was
+
     TRUE if the EAP method was successfully added, FALSE if it was
 not a valid method or if it was already allowed.
    
 
    
 
    
@@ -1200,7 +1376,7 @@ not a valid method or if it was already allowed.
    
 
    nm_setting_802_1x_remove_eap_method ()
    
 
    void
 nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
-                                     guint32 i);
    
+                                     guint32 i);
    
 
    Removes the allowed EAP method at the specified index.
    
 
    
 
    Parameters
    
@@ -1228,7 +1404,7 @@ nm_setting_802_1x_remove_eap_method (
 
    
 
    nm_setting_802_1x_remove_eap_method_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_remove_eap_method_by_value
                                (NMSetting8021x *setting,
                                 const char *eap);
    
@@ -1258,7 +1434,7 @@ nm_setting_802_1x_remove_eap_method_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the EAP method was founs and removed, FALSE if it was not.
    
+
     TRUE if the EAP method was founs and removed, FALSE if it was not.
    
 
    
 
    
 
    
@@ -1369,12 +1545,12 @@ nm_setting_802_1x_get_pac_file (
 
    
 
    nm_setting_802_1x_get_system_ca_certs ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_get_system_ca_certs (NMSetting8021x *setting);
    
 
    Sets the “system-ca-certs” property. The
 “ca-path” and “phase2-ca-path”
 properties are ignored if the “system-ca-certs” property is
-TRUE, in which case a system-wide CA certificate directory specified at
+TRUE, in which case a system-wide CA certificate directory specified at
 compile time (using the --system-ca-path configure option) is used in place
 of these properties.
    
 
    
@@ -1394,7 +1570,7 @@ of these properties.
    
 
    
 
    
 
    Returns
    
-
     TRUE if a system CA certificate path should be used, FALSE if not
    
+
     TRUE if a system CA certificate path should be used, FALSE if not
    
 
    
 
    
 
    
@@ -1489,7 +1665,7 @@ if 
 
    nm_setting_802_1x_get_ca_cert_blob ()
    
-
    GBytes *
+
    GBytes *
 nm_setting_802_1x_get_ca_cert_blob (NMSetting8021x *setting);
    
 
    Returns the CA certificate blob if the CA certificate is stored using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
@@ -1584,12 +1760,12 @@ for local files and 'data' URIs for inline certificate data).
    
 
    
 
    
 
    nm_setting_802_1x_set_ca_cert ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_set_ca_cert (NMSetting8021x *setting,
                                const char *value,
                                NMSetting8021xCKScheme scheme,
                                NMSetting8021xCKFormat *out_format,
-                               GError **error);
    
+                               GError **error);
    
 
    Reads a certificate from disk and sets the “ca-cert” property
 with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
 scheme, or with the path to the certificate file if using the
@@ -1614,7 +1790,7 @@ scheme, or with the path to the certificate file if using the
 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate
 file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
 clears the CA certificate.
    
  
 
@@ -1638,8 +1814,65 @@ clears the CA certificate.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
    
+
    
+
    
+
    
+
    nm_setting_802_1x_get_ca_cert_password ()
    
+
    const char *
+nm_setting_802_1x_get_ca_cert_password
+                               (NMSetting8021x *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSetting8021x
    		 
    
+
    
+
    
+
    Returns
    
+
     the password used to access the CA certificate stored in
+“ca-cert” property. Only makes sense if the certificate
+is stored on a PKCS#11 token that requires a login.
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
+
    nm_setting_802_1x_get_ca_cert_password_flags ()
    
+
    NMSettingSecretFlags
+nm_setting_802_1x_get_ca_cert_password_flags
+                               (NMSetting8021x *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSetting8021x
    		 
    
+
    
+
    
+
    Returns
    
+
     the NMSettingSecretFlags pertaining to the
+“ca-cert-password”
    
 
    
+
    Since: 1.8
    
 
    
 
    
 
    
@@ -1665,14 +1898,14 @@ nm_setting_802_1x_get_subject_match (
    Returns
    
 
     the “subject-match” property. This is the
 substring to be matched against the subject of the authentication
-server certificate, or NULL no subject verification is to be
+server certificate, or NULL no subject verification is to be
 performed.
    
 
    
 
    
 
    
 
    
 
    nm_setting_802_1x_get_num_altsubject_matches ()
    
-
    guint32
+
    guint32
 nm_setting_802_1x_get_num_altsubject_matches
                                (NMSetting8021x *setting);
    
 
    Returns the number of entries in the
@@ -1703,7 +1936,7 @@ nm_setting_802_1x_get_num_altsubject_matches
 
    const char *
 nm_setting_802_1x_get_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    Returns the altSubjectName match at index i
 .
    
 
    
@@ -1737,7 +1970,7 @@ nm_setting_802_1x_get_altsubject_match
 
    
 
    
 
    nm_setting_802_1x_add_altsubject_match ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_add_altsubject_match
                                (NMSetting8021x *setting,
                                 const char *altsubject_match);
    
@@ -1768,8 +2001,8 @@ server is not verified.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the alternative subject name match was
-successfully added, FALSE if it was already allowed.
    
+
     TRUE if the alternative subject name match was
+successfully added, FALSE if it was already allowed.
    
 
    
 
    
 
    
@@ -1778,7 +2011,7 @@ successfully added, void
 nm_setting_802_1x_remove_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    Removes the allowed altSubjectName at the specified index.
    
 
    
 
    Parameters
    
@@ -1806,7 +2039,7 @@ nm_setting_802_1x_remove_altsubject_match
 
    
 
    
 
    nm_setting_802_1x_remove_altsubject_match_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_remove_altsubject_match_by_value
                                (NMSetting8021x *setting,
                                 const char *altsubject_match);
    
@@ -1836,8 +2069,8 @@ nm_setting_802_1x_remove_altsubject_match_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the alternative subject name match was found and removed,
-FALSE if it was not.
    
+
     TRUE if the alternative subject name match was found and removed,
+FALSE if it was not.
    
 
    
 
    
 
    
@@ -1923,7 +2156,7 @@ if 
 
    nm_setting_802_1x_get_client_cert_blob ()
    
-
    GBytes *
+
    GBytes *
 nm_setting_802_1x_get_client_cert_blob
                                (NMSetting8021x *setting);
    
 
    Client certificates are used to identify the connecting client to the network
@@ -2014,12 +2247,12 @@ for local files and 'data' URIs for inline certificate data).
    
 
    
 
    
 
    nm_setting_802_1x_set_client_cert ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_set_client_cert (NMSetting8021x *setting,
                                    const char *value,
                                    NMSetting8021xCKScheme scheme,
                                    NMSetting8021xCKFormat *out_format,
-                                   GError **error);
    
+                                   GError **error);
    
 
    Reads a certificate from disk and sets the “client-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
@@ -2047,7 +2280,7 @@ authentication method.
    
 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client
 certificate file (PEM, DER, or PKCS#12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
 any scheme
 clears the client certificate.
    
  
@@ -2072,8 +2305,65 @@ clears the client certificate.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
    
+
    
+
    
+
    
+
    nm_setting_802_1x_get_client_cert_password ()
    
+
    const char *
+nm_setting_802_1x_get_client_cert_password
+                               (NMSetting8021x *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSetting8021x
    		 
    
+
    
+
    
+
    Returns
    
+
     the password used to access the client certificate stored in
+“client-cert” property. Only makes sense if the certificate
+is stored on a PKCS#11 token that requires a login.
    
 
    
+
    Since: 1.8
    
+
    
+
    
+
    
+
    nm_setting_802_1x_get_client_cert_password_flags ()
    
+
    NMSettingSecretFlags
+nm_setting_802_1x_get_client_cert_password_flags
+                               (NMSetting8021x *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSetting8021x
    		 
    
+
    
+
    
+
    Returns
    
+
     the NMSettingSecretFlags pertaining to the
+“client-cert-password”
    
+
    
+
    Since: 1.8
    
 
    
 
    
 
    
@@ -2099,7 +2389,7 @@ nm_setting_802_1x_get_phase1_peapver (
    Returns
    
 
     the "phase 1" PEAP version to be used when authenticating with
 EAP-PEAP as contained in the “phase1-peapver” property.  Valid
-values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
    
+values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
    
 
    
 
    
 
    
@@ -2127,7 +2417,7 @@ nm_setting_802_1x_get_phase1_peaplabel
 
    Returns
    
 
     whether the "phase 1" PEAP label is new-style or old-style, to be
 used when authenticating with EAP-PEAP, as contained in the
-“phase1-peaplabel” property.  Valid values are NULL (unset),
+“phase1-peaplabel” property.  Valid values are NULL (unset),
 "0" (use old-style label), and "1" (use new-style label).  See the
 wpa_supplicant documentation for more details.
    
 
    
@@ -2246,7 +2536,7 @@ use 
 
    
 
    nm_setting_802_1x_get_phase2_ca_cert_blob ()
    
-
    GBytes *
+
    GBytes *
 nm_setting_802_1x_get_phase2_ca_cert_blob
                                (NMSetting8021x *setting);
    
 
    Returns the "phase 2" CA certificate blob if the CA certificate is stored
@@ -2344,12 +2634,12 @@ for local files and 'data' URIs for inline certificate data).
    
 
    
 
    
 
    nm_setting_802_1x_set_phase2_ca_cert ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_set_phase2_ca_cert (NMSetting8021x *setting,
                                       const char *value,
                                       NMSetting8021xCKScheme scheme,
                                       NMSetting8021xCKFormat *out_format,
-                                      GError **error);
    
+                                      GError **error);
    
 
    Reads a certificate from disk and sets the “phase2-ca-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
@@ -2374,7 +2664,7 @@ file if using the NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
 certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
 clears the "phase2" CA certificate.
    
  
 
@@ -2398,8 +2688,65 @@ clears the "phase2" CA certificate.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
    
+
    
+
    
+
    
+
    nm_setting_802_1x_get_phase2_ca_cert_password ()
    
+
    const char *
+nm_setting_802_1x_get_phase2_ca_cert_password
+                               (NMSetting8021x *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSetting8021x
    		 
    
+
    
+
    
+
    Returns
    
+
     the password used to access the "phase2" CA certificate stored in
+“phase2-ca-cert” property. Only makes sense if the certificate
+is stored on a PKCS#11 token that requires a login.
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
+
    nm_setting_802_1x_get_phase2_ca_cert_password_flags ()
    
+
    NMSettingSecretFlags
+nm_setting_802_1x_get_phase2_ca_cert_password_flags
+                               (NMSetting8021x *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSetting8021x
    		 
    
 
    
+
    
+
    Returns
    
+
     the NMSettingSecretFlags pertaining to the
+“phase2-private-key-password”
    
+
    
+
    Since: 1.8
    
 
    
 
    
 
    
@@ -2426,14 +2773,14 @@ nm_setting_802_1x_get_phase2_subject_match
 
    Returns
    
 
     the “phase2-subject-match” property. This is
 the substring to be matched against the subject of the "phase 2"
-authentication server certificate, or NULL no subject verification
+authentication server certificate, or NULL no subject verification
 is to be performed.
    
 
    
 
    
 
    
 
    
 
    nm_setting_802_1x_get_num_phase2_altsubject_matches ()
    
-
    guint32
+
    guint32
 nm_setting_802_1x_get_num_phase2_altsubject_matches
                                (NMSetting8021x *setting);
    
 
    Returns the number of entries in the
@@ -2464,7 +2811,7 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 
    const char *
 nm_setting_802_1x_get_phase2_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    Returns the "phase 2" altSubjectName match at index i
 .
    
 
    
@@ -2498,7 +2845,7 @@ nm_setting_802_1x_get_phase2_altsubject_match
 
    
 
    
 
    nm_setting_802_1x_add_phase2_altsubject_match ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_add_phase2_altsubject_match
                                (NMSetting8021x *setting,
                                 const char *phase2_altsubject_match);
    
@@ -2530,8 +2877,8 @@ connection
    
 
    
 
    
 
    Returns
    
-
     TRUE if the "phase 2" alternative subject name match was
-successfully added, FALSE if it was already allowed.
    
+
     TRUE if the "phase 2" alternative subject name match was
+successfully added, FALSE if it was already allowed.
    
 
    
 
    
 
    
@@ -2540,7 +2887,7 @@ successfully added, void
 nm_setting_802_1x_remove_phase2_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    Removes the allowed "phase 2" altSubjectName at the specified index.
    
 
    
 
    Parameters
    
@@ -2568,7 +2915,7 @@ nm_setting_802_1x_remove_phase2_altsubject_match
 
    
 
    
 
    nm_setting_802_1x_remove_phase2_altsubject_match_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_remove_phase2_altsubject_match_by_value
                                (NMSetting8021x *setting,
                                 const char *phase2_altsubject_match);
    
@@ -2598,8 +2945,8 @@ nm_setting_802_1x_remove_phase2_altsubject_match_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the alternative subject name match for "phase 2" was found and removed,
-FALSE if it was not.
    
+
     TRUE if the alternative subject name match for "phase 2" was found and removed,
+FALSE if it was not.
    
 
    
 
    
 
    
@@ -2688,7 +3035,7 @@ returned scheme is 
 
    nm_setting_802_1x_get_phase2_client_cert_blob ()
    
-
    GBytes *
+
    GBytes *
 nm_setting_802_1x_get_phase2_client_cert_blob
                                (NMSetting8021x *setting);
    
 
    Client certificates are used to identify the connecting client to the network
@@ -2780,13 +3127,13 @@ for local files and 'data' URIs for inline certificate data).
    
 
    
 
    
 
    nm_setting_802_1x_set_phase2_client_cert ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_set_phase2_client_cert
                                (NMSetting8021x *setting,
                                 const char *value,
                                 NMSetting8021xCKScheme scheme,
                                 NMSetting8021xCKFormat *out_format,
-                                GError **error);
    
+                                GError **error);
    
 
    Reads a certificate from disk and sets the “phase2-client-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
@@ -2814,7 +3161,7 @@ authentication method.
    
 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
 certificate file (PEM, DER, or PKCS#12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
 any scheme
 clears the "phase2" client certificate.
    
  
@@ -2839,8 +3186,65 @@ clears the "phase2" client certificate.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
    
+
    
+
    
+
    
+
    nm_setting_802_1x_get_phase2_client_cert_password ()
    
+
    const char *
+nm_setting_802_1x_get_phase2_client_cert_password
+                               (NMSetting8021x *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSetting8021x
    		 
    
+
    
+
    
+
    Returns
    
+
     the password used to access the "phase2" client certificate stored in
+“phase2-client-cert” property. Only makes sense if the certificate
+is stored on a PKCS#11 token that requires a login.
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
+
    nm_setting_802_1x_get_phase2_client_cert_password_flags ()
    
+
    NMSettingSecretFlags
+nm_setting_802_1x_get_phase2_client_cert_password_flags
+                               (NMSetting8021x *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSetting8021x
    		 
    
 
    
+
    
+
    Returns
    
+
     the NMSettingSecretFlags pertaining to the
+“phase2-client-cert-password”
    
+
    
+
    Since: 1.8
    
 
    
 
    
 
    
@@ -2896,7 +3300,7 @@ nm_setting_802_1x_get_password_flags (
 
    nm_setting_802_1x_get_password_raw ()
    
-
    GBytes *
+
    GBytes *
 nm_setting_802_1x_get_password_raw (NMSetting8021x *setting);
    
 
    
 
    Parameters
    
@@ -3036,7 +3440,7 @@ nm_setting_802_1x_get_private_key_scheme
 
    
 
    
 
    nm_setting_802_1x_get_private_key_blob ()
    
-
    GBytes *
+
    GBytes *
 nm_setting_802_1x_get_private_key_blob
                                (NMSetting8021x *setting);
    
 
    Private keys are used to authenticate the connecting client to the network
@@ -3130,13 +3534,13 @@ for local files and 'data' URIs for inline certificate data).
    
 
    
 
    
 
    nm_setting_802_1x_set_private_key ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_set_private_key (NMSetting8021x *setting,
                                    const char *value,
                                    const char *password,
                                    NMSetting8021xCKScheme scheme,
                                    NMSetting8021xCKFormat *out_format,
-                                   GError **error);
    
+                                   GError **error);
    
 
    Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
@@ -3150,7 +3554,7 @@ verify that password
  is correct, and if it is, updates the
 “private-key-password” property with the given password
 .  If
-the decryption is unsuccessful, FALSE is returned, error
+the decryption is unsuccessful, FALSE is returned, error
  is set, and no
 internal data is changed.  If no password
  is given, the private key is
@@ -3180,13 +3584,13 @@ key password to prevent unauthorized access to unencrypted private key data.
    
 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
 NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
 (PEM, DER, or PKCS#12 format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
 clears the private key.
    
  
 
 
 
    password
    
-
    password used to decrypt the private key, or NULL if the password
+
    password used to decrypt the private key, or NULL if the password
 is unknown.  If the password is given but fails to decrypt the private key,
 an error is returned.
    
  
@@ -3211,7 +3615,7 @@ an error is returned.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
    
 
    
@@ -3332,7 +3736,7 @@ scheme is 
 
    nm_setting_802_1x_get_phase2_private_key_blob ()
    
-
    GBytes *
+
    GBytes *
 nm_setting_802_1x_get_phase2_private_key_blob
                                (NMSetting8021x *setting);
    
 
    Private keys are used to authenticate the connecting client to the network
@@ -3427,14 +3831,14 @@ for local files and 'data' URIs for inline certificate data).
    
 
    
 
    
 
    nm_setting_802_1x_set_phase2_private_key ()
    
-
    gboolean
+
    gboolean
 nm_setting_802_1x_set_phase2_private_key
                                (NMSetting8021x *setting,
                                 const char *value,
                                 const char *password,
                                 NMSetting8021xCKScheme scheme,
                                 NMSetting8021xCKFormat *out_format,
-                                GError **error);
    
+                                GError **error);
    
 
    Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
@@ -3448,7 +3852,7 @@ verify that password
  is correct, and if it is, updates the
 “phase2-private-key-password” property with the given
 password
-.  If the decryption is unsuccessful, FALSE is returned, error
+.  If the decryption is unsuccessful, FALSE is returned, error
  is
 set, and no internal data is changed.  If no password
  is given, the private
@@ -3478,14 +3882,14 @@ key password to prevent unauthorized access to unencrypted private key data.
    
 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
 NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private
 key file (PEM, DER, or PKCS#12 format).  The path must be UTF-8 encoded;
-use g_filename_to_utf8() to convert if needed.  Passing NULL with any
+use g_filename_to_utf8() to convert if needed.  Passing NULL with any
 scheme
 clears the private key.
    
  
 
 
 
    password
    
-
    password used to decrypt the private key, or NULL if the password
+
    password used to decrypt the private key, or NULL if the password
 is unknown.  If the password is given but fails to decrypt the private key,
 an error is returned.
    
  
@@ -3510,7 +3914,7 @@ an error is returned.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
+
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
    
 
    
@@ -3595,6 +3999,61 @@ nm_setting_802_1x_get_phase2_private_key_format
 “phase2-private-key” property
    
 
    
 
    
+
    
+
    
+
    nm_setting_802_1x_get_phase1_auth_flags ()
    
+
    NMSetting8021xAuthFlags
+nm_setting_802_1x_get_phase1_auth_flags
+                               (NMSetting8021x *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSetting8021x
    		 
    
+
    
+
    
+
    Returns
    
+
     the authentication flags for "phase 1".
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
+
    nm_setting_802_1x_get_auth_timeout ()
    
+
    gint
+nm_setting_802_1x_get_auth_timeout (NMSetting8021x *setting);
    
+
    Returns the value contained in the “auth-timeout” property.
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSetting8021x
    		 
    
+
    
+
    
+
    Returns
    
+
     the configured authentication timeout in seconds. Zero means the
+global default value.
    
+
    
+
    Since: 1.8
    
+
    
 
    
 
    
 
    Types and Values
    
@@ -3710,6 +4169,65 @@ URI of an object on a PKCS11 token
    
 
    
 
    
 
    
+
    enum NMSetting8021xAuthFlags
    
+
    NMSetting8021xAuthFlags values indicate which authentication settings
+should be used.
    
+
    
+
    Members
    
+
    
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    




    NM_SETTING_802_1X_AUTH_FLAGS_NONE
    		
+
    No flags
    
+    		 
    NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_0_DISABLE
    		
+
    Disable TLSv1.0
    
+    		 
    NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_1_DISABLE
    		
+
    Disable TLSv1.1
    
+    		 
    NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_2_DISABLE
    		
+
    Disable TLSv1.2
    
+    		 
    _NM_SETTING_802_1X_AUTH_FLAGS_LAST
    		  
    NM_SETTING_802_1X_AUTH_FLAGS_ALL
    		
+
    All supported flags
    
+    		 
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    NM_SETTING_802_1X_SETTING_NAME
    
 
    #define NM_SETTING_802_1X_SETTING_NAME "802-1x"
 
    
@@ -3746,6 +4264,18 @@ URI of an object on a PKCS11 token
    
 
    
 
    
 
    
+
    NM_SETTING_802_1X_CA_CERT_PASSWORD
    
+
    #define NM_SETTING_802_1X_CA_CERT_PASSWORD "ca-cert-password"
+
    
+
    
+
    
+
    
+
    NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS
    
+
    #define NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS "ca-cert-password-flags"
+
    
+
    
+
    
+
    
 
    NM_SETTING_802_1X_CA_PATH
    
 
    #define NM_SETTING_802_1X_CA_PATH "ca-path"
 
    
@@ -3776,6 +4306,18 @@ URI of an object on a PKCS11 token
    
 
    
 
    
 
    
+
    NM_SETTING_802_1X_CLIENT_CERT_PASSWORD
    
+
    #define NM_SETTING_802_1X_CLIENT_CERT_PASSWORD "client-cert-password"
+
    
+
    
+
    
+
    
+
    NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS
    
+
    #define NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS "client-cert-password-flags"
+
    
+
    
+
    
+
    
 
    NM_SETTING_802_1X_PHASE1_PEAPVER
    
 
    #define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
 
    
@@ -3794,6 +4336,12 @@ URI of an object on a PKCS11 token
    
 
    
 
    
 
    
+
    NM_SETTING_802_1X_PHASE1_AUTH_FLAGS
    
+
    #define NM_SETTING_802_1X_PHASE1_AUTH_FLAGS "phase1-auth-flags"
+
    
+
    
+
    
+
    
 
    NM_SETTING_802_1X_PHASE2_AUTH
    
 
    #define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
 
    
@@ -3812,6 +4360,18 @@ URI of an object on a PKCS11 token
    
 
    
 
    
 
    
+
    NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD
    
+
    #define NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD "phase2-ca-cert-password"
+
    
+
    
+
    
+
    
+
    NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS
    
+
    #define NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS "phase2-ca-cert-password-flags"
+
    
+
    
+
    
+
    
 
    NM_SETTING_802_1X_PHASE2_CA_PATH
    
 
    #define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
 
    
@@ -3842,6 +4402,18 @@ URI of an object on a PKCS11 token
    
 
    
 
    
 
    
+
    NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD
    
+
    #define NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD "phase2-client-cert-password"
+
    
+
    
+
    
+
    
+
    NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS
    
+
    #define NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS "phase2-client-cert-password-flags"
+
    
+
    
+
    
+
    
 
    NM_SETTING_802_1X_PASSWORD
    
 
    #define NM_SETTING_802_1X_PASSWORD "password"
 
    
@@ -3920,15 +4492,22 @@ URI of an object on a PKCS11 token
    
 
    
 
    
 
    
+
    NM_SETTING_802_1X_AUTH_TIMEOUT
    
+
    #define NM_SETTING_802_1X_AUTH_TIMEOUT "auth-timeout"
+
    
+
    
+
    
+
    
 
    NMSetting8021x
    
 
    typedef struct _NMSetting8021x NMSetting8021x;
    
+
    AIEEE 802.1x Authentication Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “altsubject-matches” property
    
-
      “altsubject-matches”       GStrv
    
+
      “altsubject-matches”       GStrv
    
 
    List of strings to be matched against the altSubjectName of the
 certificate presented by the authentication server. If the list is empty,
 no verification of the server certificate's altSubjectName is performed.
    
@@ -3937,7 +4516,7 @@ no verification of the server certificate's altSubjectName is performed.
    
 
    
 
    
 
    The “anonymous-identity” property
    
-
      “anonymous-identity”       gchar *
    
+
      “anonymous-identity”       gchar *
    
 
    Anonymous identity string for EAP authentication methods.  Used as the
 unencrypted identity with EAP types that support different tunneled
 identity like EAP-TTLS.
    
@@ -3946,8 +4525,19 @@ identity like EAP-TTLS.
    
 
    
 
    
 
    
+
    The “auth-timeout” property
    
+
      “auth-timeout”             gint
    
+
    A timeout for the authentication. Zero means the global default; if the
+global default is not set, the authentication timeout is 25 seconds.
    
+
    Flags: Read / Write
    
+
    Allowed values: >= 0
    
+
    Default value: 0
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    The “ca-cert” property
    
-
      “ca-cert”                  GBytes *
    
+
      “ca-cert”                  GBytes *
    
 
    Contains the CA certificate if used by the EAP method specified in the
 “eap” property.
    
 
    Certificate data is specified using a "scheme"; two are currently
@@ -3964,8 +4554,27 @@ but this allows man-in-the-middle attacks and is NOT recommended.
    
 
    
 
    
 
    
+
    The “ca-cert-password” property
    
+
      “ca-cert-password”         gchar *
    
+
    The password used to access the CA certificate stored in
+“ca-cert” property. Only makes sense if the certificate
+is stored on a PKCS#11 token that requires a login.
    
+
    Flags: Read / Write
    
+
    Default value: NULL
    
+
    Since: 1.8
    
+
    
+
    
+
    
+
    The “ca-cert-password-flags” property
    
+
      “ca-cert-password-flags”   NMSettingSecretFlags
    
+
    Flags indicating how to handle the “ca-cert-password” property.
    
+
    Flags: Read / Write
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    The “ca-path” property
    
-
      “ca-path”                  gchar *
    
+
      “ca-path”                  gchar *
    
 
    UTF-8 encoded path to a directory containing PEM or DER formatted
 certificates to be added to the verification chain in addition to the
 certificate specified in the “ca-cert” property.
    
@@ -3975,7 +4584,7 @@ certificate specified in the 
 
    The “client-cert” property
    
-
      “client-cert”              GBytes *
    
+
      “client-cert”              GBytes *
    
 
    Contains the client certificate if used by the EAP method specified in
 the “eap” property.
    
 
    Certificate data is specified using a "scheme"; two are currently
@@ -3990,8 +4599,27 @@ with the string "file://" and ending with a terminating NUL byte.
    
 
    
 
    
 
    
+
    The “client-cert-password” property
    
+
      “client-cert-password”     gchar *
    
+
    The password used to access the client certificate stored in
+“client-cert” property. Only makes sense if the certificate
+is stored on a PKCS#11 token that requires a login.
    
+
    Flags: Read / Write
    
+
    Default value: NULL
    
+
    Since: 1.8
    
+
    
+
    
+
    
+
    The “client-cert-password-flags” property
    
+
      “client-cert-password-flags” NMSettingSecretFlags
    
+
    Flags indicating how to handle the “client-cert-password” property.
    
+
    Flags: Read / Write
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    The “domain-suffix-match” property
    
-
      “domain-suffix-match”      gchar *
    
+
      “domain-suffix-match”      gchar *
    
 
    Constraint for server domain name. If set, this FQDN is used as a suffix
 match requirement for dNSName element(s) of the certificate presented by
 the authentication server.  If a matching dNSName is found, this
@@ -4004,7 +4632,7 @@ matched against SubjectName CN using same suffix match comparison.
    
 
    
 
    
 
    The “eap” property
    
-
      “eap”                      GStrv
    
+
      “eap”                      GStrv
    
 
    The allowed EAP method to be used when authenticating to the network with
 802.1x.  Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd",
 and "fast".  Each method requires different configuration using the
@@ -4015,7 +4643,7 @@ allowed combinations.
    
 
    
 
    
 
    The “identity” property
    
-
      “identity”                 gchar *
    
+
      “identity”                 gchar *
    
 
    Identity string for EAP authentication methods.  Often the user's user or
 login name.
    
 
    Flags: Read / Write
    
@@ -4024,7 +4652,7 @@ login name.
    
 
    
 
    
 
    The “pac-file” property
    
-
      “pac-file”                 gchar *
    
+
      “pac-file”                 gchar *
    
 
    UTF-8 encoded file path containing PAC for EAP-FAST.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -4032,7 +4660,7 @@ login name.
    
 
    
 
    
 
    The “password” property
    
-
      “password”                 gchar *
    
+
      “password”                 gchar *
    
 
    UTF-8 encoded password used for EAP authentication methods. If both the
 “password” property and the “password-raw”
 property are specified, “password” is preferred.
    
@@ -4049,7 +4677,7 @@ property are specified, 
 
    The “password-raw” property
    
-
      “password-raw”             GBytes *
    
+
      “password-raw”             GBytes *
    
 
    Password used for EAP authentication methods, given as a byte array to
 allow passwords in other encodings than UTF-8 to be used. If both the
 “password” property and the “password-raw”
@@ -4065,8 +4693,22 @@ property are specified, 
+
    The “phase1-auth-flags” property
    
+
      “phase1-auth-flags”        guint
    
+
    Specifies authentication flags to use in "phase 1" outer
+authentication using NMSetting8021xAuthFlags options.
+The invidual TLS versions can be explicitly disabled. If a certain
+TLS disable flag is not set, it is up to the supplicant to allow
+or forbid it. The TLS options map to tls_disable_tlsv1_x settings.
+See the wpa_supplicant documentation for more details.
    
+
    Flags: Read / Write / Construct
    
+
    Default value: 0
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    The “phase1-fast-provisioning” property
    
-
      “phase1-fast-provisioning” gchar *
    
+
      “phase1-fast-provisioning” gchar *
    
 
    Enables or disables in-line provisioning of EAP-FAST credentials when
 FAST is specified as the EAP method in the “eap” property.
 Recognized values are "0" (disabled), "1" (allow unauthenticated
@@ -4079,7 +4721,7 @@ wpa_supplicant documentation for more details.
    
 
    
 
    
 
    The “phase1-peaplabel” property
    
-
      “phase1-peaplabel”         gchar *
    
+
      “phase1-peaplabel”         gchar *
    
 
    Forces use of the new PEAP label during key derivation.  Some RADIUS
 servers may require forcing the new PEAP label to interoperate with
 PEAPv1.  Set to "1" to force use of the new PEAP label.  See the
@@ -4090,7 +4732,7 @@ wpa_supplicant documentation for more details.
    
 
    
 
    
 
    The “phase1-peapver” property
    
-
      “phase1-peapver”           gchar *
    
+
      “phase1-peapver”           gchar *
    
 
    Forces which PEAP version is used when PEAP is set as the EAP method in
 the “eap” property.  When unset, the version reported by
 the server will be used.  Sometimes when using older RADIUS servers, it
@@ -4103,7 +4745,7 @@ version.
    
 
    
 
    
 
    The “phase2-altsubject-matches” property
    
-
      “phase2-altsubject-matches” GStrv
    
+
      “phase2-altsubject-matches” GStrv
    
 
    List of strings to be matched against the altSubjectName of the
 certificate presented by the authentication server during the inner
 "phase 2" authentication. If the list is empty, no verification of the
@@ -4113,7 +4755,7 @@ server certificate's altSubjectName is performed.
    
 
    
 
    
 
    The “phase2-auth” property
    
-
      “phase2-auth”              gchar *
    
+
      “phase2-auth”              gchar *
    
 
    Specifies the allowed "phase 2" inner non-EAP authentication methods when
 an EAP method that uses an inner TLS tunnel is specified in the
 “eap” property.  Recognized non-EAP "phase 2" methods are
@@ -4126,7 +4768,7 @@ authentication; see the wpa_supplicant documentation for more details.
    
 
    
 
    
 
    The “phase2-autheap” property
    
-
      “phase2-autheap”           gchar *
    
+
      “phase2-autheap”           gchar *
    
 
    Specifies the allowed "phase 2" inner EAP-based authentication methods
 when an EAP method that uses an inner TLS tunnel is specified in the
 “eap” property.  Recognized EAP-based "phase 2" methods are
@@ -4139,7 +4781,7 @@ wpa_supplicant documentation for more details.
    
 
    
 
    
 
    The “phase2-ca-cert” property
    
-
      “phase2-ca-cert”           GBytes *
    
+
      “phase2-ca-cert”           GBytes *
    
 
    Contains the "phase 2" CA certificate if used by the EAP method specified
 in the “phase2-auth” or “phase2-autheap”
 properties.
    
@@ -4157,8 +4799,27 @@ but this allows man-in-the-middle attacks and is NOT recommended.
    
 
    
 
    
 
    
+
    The “phase2-ca-cert-password” property
    
+
      “phase2-ca-cert-password”  gchar *
    
+
    The password used to access the "phase2" CA certificate stored in
+“phase2-ca-cert” property. Only makes sense if the certificate
+is stored on a PKCS#11 token that requires a login.
    
+
    Flags: Read / Write
    
+
    Default value: NULL
    
+
    Since: 1.8
    
+
    
+
    
+
    
+
    The “phase2-ca-cert-password-flags” property
    
+
      “phase2-ca-cert-password-flags” NMSettingSecretFlags
    
+
    Flags indicating how to handle the “phase2-ca-cert-password” property.
    
+
    Flags: Read / Write
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    The “phase2-ca-path” property
    
-
      “phase2-ca-path”           gchar *
    
+
      “phase2-ca-path”           gchar *
    
 
    UTF-8 encoded path to a directory containing PEM or DER formatted
 certificates to be added to the verification chain in addition to the
 certificate specified in the “phase2-ca-cert” property.
    
@@ -4168,7 +4829,7 @@ certificate specified in the 
 
    The “phase2-client-cert” property
    
-
      “phase2-client-cert”       GBytes *
    
+
      “phase2-client-cert”       GBytes *
    
 
    Contains the "phase 2" client certificate if used by the EAP method
 specified in the “phase2-auth” or
 “phase2-autheap” properties.
    
@@ -4186,8 +4847,27 @@ but this allows man-in-the-middle attacks and is NOT recommended.
    
 
    
 
    
 
    
+
    The “phase2-client-cert-password” property
    
+
      “phase2-client-cert-password” gchar *
    
+
    The password used to access the "phase2" client certificate stored in
+“phase2-client-cert” property. Only makes sense if the certificate
+is stored on a PKCS#11 token that requires a login.
    
+
    Flags: Read / Write
    
+
    Default value: NULL
    
+
    Since: 1.8
    
+
    
+
    
+
    
+
    The “phase2-client-cert-password-flags” property
    
+
      “phase2-client-cert-password-flags” NMSettingSecretFlags
    
+
    Flags indicating how to handle the “phase2-client-cert-password” property.
    
+
    Flags: Read / Write
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    The “phase2-domain-suffix-match” property
    
-
      “phase2-domain-suffix-match” gchar *
    
+
      “phase2-domain-suffix-match” gchar *
    
 
    Constraint for server domain name. If set, this FQDN is used as a suffix
 match requirement for dNSName element(s) of the certificate presented by
 the authentication server during the inner "phase 2" authentication.  If
@@ -4201,7 +4881,7 @@ using same suffix match comparison.
    
 
    
 
    
 
    The “phase2-private-key” property
    
-
      “phase2-private-key”       GBytes *
    
+
      “phase2-private-key”       GBytes *
    
 
    Contains the "phase 2" inner private key when the
 “phase2-auth” or “phase2-autheap” property is
 set to "tls".
    
@@ -4216,7 +4896,7 @@ PKCS#12 data and the “phase2-private-key-password” property must be set to the
 password used to decode the PKCS#12 private key and certificate.
    
@@ -4227,7 +4907,7 @@ password used to decode the PKCS#12 private key and certificate.
    
 
    
 
    
 
    The “phase2-private-key-password” property
    
-
      “phase2-private-key-password” gchar *
    
+
      “phase2-private-key-password” gchar *
    
 
    The password used to decrypt the "phase 2" private key specified in the
 “phase2-private-key” property when the private key either
 uses the path scheme, or is a PKCS#12 format key.  Setting this
@@ -4249,7 +4929,7 @@ function.
    
 
    
 
    
 
    The “phase2-subject-match” property
    
-
      “phase2-subject-match”     gchar *
    
+
      “phase2-subject-match”     gchar *
    
 
    Substring to be matched against the subject of the certificate presented
 by the authentication server during the inner "phase 2"
 authentication. When unset, no verification of the authentication server
@@ -4262,7 +4942,7 @@ NMSetting8021x:phase2-domain-suffix-match.
    
 
    
 
    
 
    The “pin” property
    
-
      “pin”                      gchar *
    
+
      “pin”                      gchar *
    
 
    PIN used for EAP authentication methods.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -4277,7 +4957,7 @@ NMSetting8021x:phase2-domain-suffix-match.
    
 
    
 
    
 
    The “private-key” property
    
-
      “private-key”              GBytes *
    
+
      “private-key”              GBytes *
    
 
    Contains the private key when the “eap” property is set to
 "tls".
    
 
    Key data is specified using a "scheme"; two are currently supported: blob
@@ -4291,7 +4971,7 @@ PKCS#12 data and the 
@@ -4307,7 +4987,7 @@ private key data.
    
 
    
 
    
 
    The “private-key-password” property
    
-
      “private-key-password”     gchar *
    
+
      “private-key-password”     gchar *
    
 
    The password used to decrypt the private key specified in the
 “private-key” property when the private key either uses the
 path scheme, or if the private key is a PKCS#12 format key.  Setting this
@@ -4328,7 +5008,7 @@ property.
    
 
    
 
    
 
    The “subject-match” property
    
-
      “subject-match”            gchar *
    
+
      “subject-match”            gchar *
    
 
    Substring to be matched against the subject of the certificate presented
 by the authentication server. When unset, no verification of the
 authentication server certificate's subject is performed.  This property
@@ -4340,8 +5020,8 @@ NMSetting8021x:domain-suffix-match.
    
 
    
 
    
 
    The “system-ca-certs” property
    
-
      “system-ca-certs”          gboolean
    
-
    When TRUE, overrides the “ca-path” and
+
      “system-ca-certs”          gboolean
    
+
    When TRUE, overrides the “ca-path” and
 “phase2-ca-path” properties using the system CA directory
 specified at configure time with the --system-ca-path switch.  The
 certificates in this directory are added to the verification chain in
diff --git a/docs/libnm/html/NMSettingAdsl.html b/docs/libnm/html/NMSettingAdsl.html
index 1ecbc8a9..8ef99cbc 100644
--- a/docs/libnm/html/NMSettingAdsl.html
+++ b/docs/libnm/html/NMSettingAdsl.html
@@ -79,7 +79,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_adsl_get_vpi ()
@@ -87,7 +87,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_adsl_get_vci ()
@@ -115,13 +115,13 @@
 
 
 
-gchar *
+gchar *
 encapsulation
 Read / Write
 
 
 
-gchar *
+gchar *
 password
 Read / Write
 
@@ -132,23 +132,23 @@
 
 
 
-gchar *
+gchar *
 protocol
 Read / Write
 
 
 
-gchar *
+gchar *
 username
 Read / Write
 
 
-guint
+guint
 vci
 Read / Write
 
 
-guint
+guint
 vpi
 Read / Write
 
@@ -224,7 +224,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingAdsl
 
    
@@ -349,7 +349,7 @@ nm_setting_adsl_get_encapsulation (
 
    
 
    nm_setting_adsl_get_vpi ()
    
-
    guint32
+
    guint32
 nm_setting_adsl_get_vpi (NMSettingAdsl *setting);
    
 
    
 
    Parameters
    
@@ -374,7 +374,7 @@ nm_setting_adsl_get_vpi (
 
    nm_setting_adsl_get_vci ()
    
-
    guint32
+
    guint32
 nm_setting_adsl_get_vci (NMSettingAdsl *setting);
    
 
    
 
    Parameters
    
@@ -505,13 +505,14 @@ nm_setting_adsl_get_password_flags (
 
    NMSettingAdsl
    
 
    typedef struct _NMSettingAdsl NMSettingAdsl;
    
+
    ADSL Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “encapsulation” property
    
-
      “encapsulation”            gchar *
    
+
      “encapsulation”            gchar *
    
 
    Encapsulation of ADSL connection.  Can be "vcmux" or "llc".
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -519,7 +520,7 @@ nm_setting_adsl_get_password_flags (
 
    
 
    The “password” property
    
-
      “password”                 gchar *
    
+
      “password”                 gchar *
    
 
    Password used to authenticate with the ADSL service.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -534,7 +535,7 @@ nm_setting_adsl_get_password_flags (
 
    
 
    The “protocol” property
    
-
      “protocol”                 gchar *
    
+
      “protocol”                 gchar *
    
 
    ADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -542,7 +543,7 @@ nm_setting_adsl_get_password_flags (
 
    
 
    The “username” property
    
-
      “username”                 gchar *
    
+
      “username”                 gchar *
    
 
    Username used to authenticate with the ADSL service.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -550,7 +551,7 @@ nm_setting_adsl_get_password_flags (
 
    
 
    The “vci” property
    
-
      “vci”                      guint
    
+
      “vci”                      guint
    
 
    VCI of ADSL connection
    
 
    Flags: Read / Write
    
 
    Allowed values: <= 65536
    
@@ -559,7 +560,7 @@ nm_setting_adsl_get_password_flags (
 
    
 
    The “vpi” property
    
-
      “vpi”                      guint
    
+
      “vpi”                      guint
    
 
    VPI of ADSL connection
    
 
    Flags: Read / Write
    
 
    Allowed values: <= 65536
    
diff --git a/docs/libnm/html/NMSettingBluetooth.html b/docs/libnm/html/NMSettingBluetooth.html
index b466449d..e6aceb9e 100644
--- a/docs/libnm/html/NMSettingBluetooth.html
+++ b/docs/libnm/html/NMSettingBluetooth.html
@@ -77,13 +77,13 @@
 
 
 
-gchar *
+gchar *
 bdaddr
 Read / Write
 
 
 
-gchar *
+gchar *
 type
 Read / Write
 
@@ -127,7 +127,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingBluetooth
 
    
@@ -248,13 +248,14 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.
    
 
    
 
    NMSettingBluetooth
    
 
    typedef struct _NMSettingBluetooth NMSettingBluetooth;
    
+
    Bluetooth Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “bdaddr” property
    
-
      “bdaddr”                   gchar *
    
+
      “bdaddr”                   gchar *
    
 
    The Bluetooth address of the device.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -262,7 +263,7 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.
    
 
    
 
    
 
    The “type” property
    
-
      “type”                     gchar *
    
+
      “type”                     gchar *
    
 
    Either "dun" for Dial-Up Networking connections or "panu" for Personal
 Area Networking connections to devices supporting the NAP profile.
    
 
    Flags: Read / Write
    
diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html
index d5576a38..a9187235 100644
--- a/docs/libnm/html/NMSettingBond.html
+++ b/docs/libnm/html/NMSettingBond.html
@@ -51,7 +51,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_bond_get_num_options ()
@@ -59,7 +59,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_bond_get_option ()
@@ -74,7 +74,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_bond_add_option ()
@@ -82,7 +82,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_bond_remove_option ()
@@ -90,7 +90,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_bond_validate_option ()
@@ -123,7 +123,7 @@
 
 
 
-GHashTable *
+GHashTable *
 options
 Read / Write
 
@@ -262,7 +262,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingBond
 
    
@@ -288,7 +288,7 @@ nm_setting_bond_new (void<
 
    
 
    
 
    nm_setting_bond_get_num_options ()
    
-
    guint32
+
    guint32
 nm_setting_bond_get_num_options (NMSettingBond *setting);
    
 
    Returns the number of options that should be set for this bond when it
 is activated. This can be used to retrieve each option individually
@@ -316,9 +316,9 @@ using 
 
    
 
    nm_setting_bond_get_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_bond_get_option (NMSettingBond *setting,
-                            guint32 idx,
+                            guint32 idx,
                             const char **out_name,
                             const char **out_value);
    
 
    Given an index, return the value of the bonding option at that index.  Indexes
@@ -364,8 +364,8 @@ modified. 
    
 
    
 
    
 
    Returns
    
-
     TRUE on success if the index was valid and an option was found,
-FALSE if the index was invalid (ie, greater than the number of options
+
     TRUE on success if the index was valid and an option was found,
+FALSE if the index was invalid (ie, greater than the number of options
 currently held by the setting)
    
 
    
 
    
@@ -402,14 +402,14 @@ nm_setting_bond_get_option_by_name (
 
    
 
    Returns
    
-
     the value, or NULL if the key/value pair was never added to the
+
     the value, or NULL if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified
    
 
    
 
    
 
    
 
    
 
    nm_setting_bond_add_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_bond_add_option (NMSettingBond *setting,
                             const char *name,
                             const char *value);
    
@@ -448,14 +448,14 @@ that conflict with each other.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the option was valid and was added to the internal option
-list, FALSE if it was not.
    
+
     TRUE if the option was valid and was added to the internal option
+list, FALSE if it was not.
    
 
    
 
    
 
    
 
    
 
    nm_setting_bond_remove_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_bond_remove_option (NMSettingBond *setting,
                                const char *name);
    
 
    Remove the bonding option referenced by name
@@ -485,14 +485,14 @@ list.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the option was found and removed from the internal option
-list, FALSE if it was not.
    
+
     TRUE if the option was found and removed from the internal option
+list, FALSE if it was not.
    
 
    
 
    
 
    
 
    
 
    nm_setting_bond_validate_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_bond_validate_option (const char *name,
                                  const char *value);
    
 
    Checks whether name
@@ -500,7 +500,7 @@ nm_setting_bond_validate_option (const name
 . If value
- is NULL, the function only validates the option name.
    
+ is NULL, the function only validates the option name.
    
 
    
 
    Parameters
    
 
    
@@ -525,10 +525,10 @@ the name
    
 
    Returns
    
-
     TRUE, if the value
+
     TRUE, if the value
 is valid for the given name.
 If the name
-is not a valid option, FALSE will be returned.
    
+is not a valid option, FALSE will be returned.
    
 
    
@@ -537,6 +537,8 @@ is not a valid option, const char **
 nm_setting_bond_get_valid_options (NMSettingBond *setting);
    Returns a list of valid bond options.
    
+
    The setting
+ argument is unused and may be passed as NULL.
    
 
    Parameters
    
 
    
 
 
 
 
 
 
    
@@ -547,14 +549,14 @@ nm_setting_bond_get_valid_options (
 
-
-
+
+
    
 
    setting
    the NMSettingBond
    		 
     the NMSettingBond. 
    		[allow-none]
 
    
 
    
 
    
 
    
 
    Returns
    
-
     a NULL-terminated array of strings of valid bond options. 
    
+
     a NULL-terminated array of strings of valid bond options. 
    
 
    [transfer none]
    
 
    
 
    
@@ -772,13 +774,14 @@ the 
 
    NMSettingBond
    
 
    typedef struct _NMSettingBond NMSettingBond;
    
+
    Bonding Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “options” property
    
-
      “options”                  GHashTable *
    
+
      “options”                  GHashTable *
    
 
    Dictionary of key/value pairs of bonding options.  Both keys and values
 must be strings. Option names must contain only alphanumeric characters
 (ie, [a-zA-Z0-9]).
    
diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html
index 397e8165..356710e8 100644
--- a/docs/libnm/html/NMSettingBridge.html
+++ b/docs/libnm/html/NMSettingBridge.html
@@ -58,7 +58,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_bridge_get_stp ()
@@ -66,7 +66,7 @@
 
 
 
-guint16
+guint16
 
 
 nm_setting_bridge_get_priority ()
@@ -74,7 +74,7 @@
 
 
 
-guint16
+guint16
 
 
 nm_setting_bridge_get_forward_delay ()
@@ -82,7 +82,7 @@
 
 
 
-guint16
+guint16
 
 
 nm_setting_bridge_get_hello_time ()
@@ -90,7 +90,7 @@
 
 
 
-guint16
+guint16
 
 
 nm_setting_bridge_get_max_age ()
@@ -98,7 +98,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_bridge_get_ageing_time ()
@@ -106,7 +106,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_bridge_get_multicast_snooping ()
@@ -125,43 +125,43 @@
 
 
 
-guint
+guint
 ageing-time
 Read / Write / Construct
 
 
-guint
+guint
 forward-delay
 Read / Write / Construct
 
 
-guint
+guint
 hello-time
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 mac-address
 Read / Write
 
 
-guint
+guint
 max-age
 Read / Write / Construct
 
 
-gboolean
+gboolean
 multicast-snooping
 Read / Write / Construct
 
 
-guint
+guint
 priority
 Read / Write / Construct
 
 
-gboolean
+gboolean
 stp
 Read / Write / Construct
 
@@ -221,7 +221,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingBridge
 
    
@@ -272,7 +272,7 @@ nm_setting_bridge_get_mac_address (
 
    
 
    nm_setting_bridge_get_stp ()
    
-
    gboolean
+
    gboolean
 nm_setting_bridge_get_stp (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -297,7 +297,7 @@ nm_setting_bridge_get_stp (
 
    nm_setting_bridge_get_priority ()
    
-
    guint16
+
    guint16
 nm_setting_bridge_get_priority (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -322,7 +322,7 @@ nm_setting_bridge_get_priority (
 
    
 
    nm_setting_bridge_get_forward_delay ()
    
-
    guint16
+
    guint16
 nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -347,7 +347,7 @@ nm_setting_bridge_get_forward_delay (
 
    
 
    nm_setting_bridge_get_hello_time ()
    
-
    guint16
+
    guint16
 nm_setting_bridge_get_hello_time (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -372,7 +372,7 @@ nm_setting_bridge_get_hello_time (
 
    
 
    nm_setting_bridge_get_max_age ()
    
-
    guint16
+
    guint16
 nm_setting_bridge_get_max_age (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -397,7 +397,7 @@ nm_setting_bridge_get_max_age (
 
    
 
    nm_setting_bridge_get_ageing_time ()
    
-
    guint32
+
    guint32
 nm_setting_bridge_get_ageing_time (NMSettingBridge *setting);
    
 
    
 
    Parameters
    
@@ -422,7 +422,7 @@ nm_setting_bridge_get_ageing_time (
 
    
 
    nm_setting_bridge_get_multicast_snooping ()
    
-
    gboolean
+
    gboolean
 nm_setting_bridge_get_multicast_snooping
                                (NMSettingBridge *setting);
    
 
    
@@ -506,13 +506,14 @@ nm_setting_bridge_get_multicast_snooping
 
    
 
    NMSettingBridge
    
 
    typedef struct _NMSettingBridge NMSettingBridge;
    
+
    Bridging Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “ageing-time” property
    
-
      “ageing-time”              guint
    
+
      “ageing-time”              guint
    
 
    The Ethernet MAC address aging time, in seconds.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: <= 1000000
    
@@ -521,7 +522,7 @@ nm_setting_bridge_get_multicast_snooping
 
    
 
    
 
    The “forward-delay” property
    
-
      “forward-delay”            guint
    
+
      “forward-delay”            guint
    
 
    The Spanning Tree Protocol (STP) forwarding delay, in seconds.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: <= 30
    
@@ -530,7 +531,7 @@ nm_setting_bridge_get_multicast_snooping
 
    
 
    
 
    The “hello-time” property
    
-
      “hello-time”               guint
    
+
      “hello-time”               guint
    
 
    The Spanning Tree Protocol (STP) hello time, in seconds.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: <= 10
    
@@ -539,7 +540,7 @@ nm_setting_bridge_get_multicast_snooping
 
    
 
    
 
    The “mac-address” property
    
-
      “mac-address”              gchar *
    
+
      “mac-address”              gchar *
    
 
    If specified, the MAC address of bridge. When creating a new bridge, this
 MAC address will be set. When matching an existing (outside
 NetworkManager created) bridge, this MAC address must match.
    
@@ -549,7 +550,7 @@ NetworkManager created) bridge, this MAC address must match.
    
 
    
 
    
 
    The “max-age” property
    
-
      “max-age”                  guint
    
+
      “max-age”                  guint
    
 
    The Spanning Tree Protocol (STP) maximum message age, in seconds.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: <= 40
    
@@ -558,7 +559,7 @@ NetworkManager created) bridge, this MAC address must match.
    
 
    
 
    
 
    The “multicast-snooping” property
    
-
      “multicast-snooping”       gboolean
    
+
      “multicast-snooping”       gboolean
    
 
    Controls whether IGMP snooping is enabled for this bridge.
 Note that if snooping was automatically disabled due to hash collisions,
 the system may refuse to enable the feature until the collisions are
@@ -570,7 +571,7 @@ resolved.
    
 
    
 
    
 
    The “priority” property
    
-
      “priority”                 guint
    
+
      “priority”                 guint
    
 
    Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower
 values are "better"; the lowest priority bridge will be elected the root
 bridge.
    
@@ -581,7 +582,7 @@ bridge.
    
 
    
 
    
 
    The “stp” property
    
-
      “stp”                      gboolean
    
+
      “stp”                      gboolean
    
 
    Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: TRUE
    
diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html
index 08af6939..f97f4fc2 100644
--- a/docs/libnm/html/NMSettingBridgePort.html
+++ b/docs/libnm/html/NMSettingBridgePort.html
@@ -51,7 +51,7 @@
 
 
 
-guint16
+guint16
 
 
 nm_setting_bridge_port_get_priority ()
@@ -59,7 +59,7 @@
 
 
 
-guint16
+guint16
 
 
 nm_setting_bridge_port_get_path_cost ()
@@ -67,7 +67,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_bridge_port_get_hairpin_mode ()
@@ -86,17 +86,17 @@
 
 
 
-gboolean
+gboolean
 hairpin-mode
 Read / Write
 
 
-guint
+guint
 path-cost
 Read / Write / Construct
 
 
-guint
+guint
 priority
 Read / Write / Construct
 
@@ -136,7 +136,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingBridgePort
 
    
@@ -162,7 +162,7 @@ nm_setting_bridge_port_new (void<
 
    
 
    
 
    nm_setting_bridge_port_get_priority ()
    
-
    guint16
+
    guint16
 nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);
    
 
    
 
    Parameters
    
@@ -187,7 +187,7 @@ nm_setting_bridge_port_get_priority (
 
    
 
    nm_setting_bridge_port_get_path_cost ()
    
-
    guint16
+
    guint16
 nm_setting_bridge_port_get_path_cost (NMSettingBridgePort *setting);
    
 
    
 
    Parameters
    
@@ -212,7 +212,7 @@ nm_setting_bridge_port_get_path_cost (
 
    nm_setting_bridge_port_get_hairpin_mode ()
    
-
    gboolean
+
    gboolean
 nm_setting_bridge_port_get_hairpin_mode
                                (NMSettingBridgePort *setting);
    
 
    
@@ -265,13 +265,14 @@ nm_setting_bridge_port_get_hairpin_mode
 
    
 
    NMSettingBridgePort
    
 
    typedef struct _NMSettingBridgePort NMSettingBridgePort;
    
+
    Bridge Port Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “hairpin-mode” property
    
-
      “hairpin-mode”             gboolean
    
+
      “hairpin-mode”             gboolean
    
 
    Enables or disabled "hairpin mode" for the port, which allows frames to
 be sent back out through the port the frame was received on.
    
 
    Flags: Read / Write
    
@@ -280,7 +281,7 @@ be sent back out through the port the frame was received on.
    
 
    
 
    
 
    The “path-cost” property
    
-
      “path-cost”                guint
    
+
      “path-cost”                guint
    
 
    The Spanning Tree Protocol (STP) port cost for destinations via this
 port.
    
 
    Flags: Read / Write / Construct
    
@@ -290,7 +291,7 @@ port.
    
 
    
 
    
 
    The “priority” property
    
-
      “priority”                 guint
    
+
      “priority”                 guint
    
 
    The Spanning Tree Protocol (STP) priority of this bridge port.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: <= 63
    
diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html
index 40a6b377..6173885c 100644
--- a/docs/libnm/html/NMSettingCdma.html
+++ b/docs/libnm/html/NMSettingCdma.html
@@ -78,6 +78,14 @@
 nm_setting_cdma_get_password_flags ()
 
 
+
+
+guint32
+
+
+nm_setting_cdma_get_mtu ()
+
+
 
 
    
 
    
@@ -91,14 +99,19 @@
 
 
 
+guint
+mtu
+Read / Write / Construct
+
+
 
-gchar *
+gchar *
 number
 Read / Write
 
 
 
-gchar *
+gchar *
 password
 Read / Write
 
@@ -109,7 +122,7 @@
 
 
 
-gchar *
+gchar *
 username
 Read / Write
 
@@ -145,6 +158,10 @@
 NM_SETTING_CDMA_PASSWORD_FLAGS
 
 
+#define
+NM_SETTING_CDMA_MTU
+
+
  
 NMSettingCdma
 
@@ -153,7 +170,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingCdma
 
    
@@ -276,6 +293,32 @@ nm_setting_cdma_get_password_flags ( the NMSettingSecretFlags pertaining to the “password”
    
 
    
 
    
+
    
+
    
+
    nm_setting_cdma_get_mtu ()
    
+
    guint32
+nm_setting_cdma_get_mtu (NMSettingCdma *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingCdma
    		 
    
+
    
+
    
+
    Returns
    
+
     the “mtu” property of the setting
    
+
    
+
    Since: 1.8
    
+
    
 
    
 
    
 
    Types and Values
    
@@ -310,15 +353,32 @@ nm_setting_cdma_get_password_flags (
 
    
 
    
+
    NM_SETTING_CDMA_MTU
    
+
    #define NM_SETTING_CDMA_MTU            "mtu"
+
    
+
    
+
    
+
    
 
    NMSettingCdma
    
 
    typedef struct _NMSettingCdma NMSettingCdma;
    
+
    CDMA-based Mobile Broadband Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
+
    The “mtu” property
    
+
      “mtu”                      guint
    
+
    If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple frames.
    
+
    Flags: Read / Write / Construct
    
+
    Default value: 0
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    The “number” property
    
-
      “number”                   gchar *
    
+
      “number”                   gchar *
    
 
    The number to dial to establish the connection to the CDMA-based mobile
 broadband network, if any.  If not specified, the default number (777)
 is used when required.
    
@@ -328,7 +388,7 @@ is used when required.
    
 
    
 
    
 
    The “password” property
    
-
      “password”                 gchar *
    
+
      “password”                 gchar *
    
 
    The password used to authenticate with the network, if required.  Many
 providers do not require a password, or accept any password.  But if a
 password is required, it is specified here.
    
@@ -345,7 +405,7 @@ password is required, it is specified here.
    
 
    
 
    
 
    The “username” property
    
-
      “username”                 gchar *
    
+
      “username”                 gchar *
    
 
    The username used to authenticate with the network, if required.  Many
 providers do not require a username, or accept any username.  But if a
 username is required, it is specified here.
    
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 621b9d76..d354a751 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -86,7 +86,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_connection_get_autoconnect ()
@@ -94,7 +94,7 @@
 
 
 
-gint
+gint
 
 
 nm_setting_connection_get_autoconnect_priority ()
@@ -102,7 +102,7 @@
 
 
 
-gint
+gint
 
 
 nm_setting_connection_get_autoconnect_retries ()
@@ -110,7 +110,7 @@
 
 
 
-guint64
+guint64
 
 
 nm_setting_connection_get_timestamp ()
@@ -118,7 +118,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_connection_get_read_only ()
@@ -126,7 +126,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_connection_get_num_permissions ()
@@ -134,7 +134,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_connection_get_permission ()
@@ -149,7 +149,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_connection_permissions_user_allowed ()
@@ -157,7 +157,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_connection_add_permission ()
@@ -173,7 +173,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_connection_remove_permission_by_value ()
@@ -188,7 +188,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_connection_is_slave_type ()
@@ -211,7 +211,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_connection_get_num_secondaries ()
@@ -226,7 +226,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_connection_add_secondary ()
@@ -242,7 +242,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_connection_remove_secondary_by_value ()
@@ -250,7 +250,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_connection_get_gateway_ping_timeout ()
@@ -285,17 +285,17 @@
 
 
 
-gboolean
+gboolean
 autoconnect
 Read / Write / Construct
 
 
-gint
+gint
 autoconnect-priority
 Read / Write / Construct
 
 
-gint
+gint
 autoconnect-retries
 Read / Write / Construct
 
@@ -305,30 +305,30 @@
 Read / Write / Construct
 
 
-guint
+guint
 gateway-ping-timeout
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 id
 Read / Write
 
 
 
-gchar *
+gchar *
 interface-name
 Read / Write
 
 
-gint
+gint
 lldp
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 master
 Read / Write
 
@@ -338,52 +338,52 @@
 Read / Write
 
 
-GStrv
+GStrv
 permissions
 Read / Write
 
 
-gboolean
+gboolean
 read-only
 Read / Write / Construct
 
 
-GStrv
+GStrv
 secondaries
 Read / Write
 
 
 
-gchar *
+gchar *
 slave-type
 Read / Write
 
 
 
-gchar *
+gchar *
 stable-id
 Read / Write
 
 
-guint64
+guint64
 timestamp
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 type
 Read / Write
 
 
 
-gchar *
+gchar *
 uuid
 Read / Write
 
 
 
-gchar *
+gchar *
 zone
 Read / Write / Construct
 
@@ -507,10 +507,10 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMSettingConnectionAutoconnectSlaves
     ╰── NMSettingConnectionLldp
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingConnection
 
    
@@ -670,7 +670,7 @@ nm_setting_connection_get_connection_type
 
    
 
    
 
    nm_setting_connection_get_autoconnect ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_get_autoconnect (NMSettingConnection *setting);
    
 
    Returns the “autoconnect” property of the connection.
    
 
    
@@ -696,7 +696,7 @@ nm_setting_connection_get_autoconnect (
 
    nm_setting_connection_get_autoconnect_priority ()
    
-
    gint
+
    gint
 nm_setting_connection_get_autoconnect_priority
                                (NMSettingConnection *setting);
    
 
    Returns the “autoconnect-priority” property of the connection.
@@ -724,7 +724,7 @@ The higher number, the higher priority.
    
 
    
 
    
 
    nm_setting_connection_get_autoconnect_retries ()
    
-
    gint
+
    gint
 nm_setting_connection_get_autoconnect_retries
                                (NMSettingConnection *setting);
    
 
    Returns the “autoconnect-retries” property of the connection.
@@ -753,7 +753,7 @@ Zero means infinite, -1 means the global default value.
    
 
    
 
    
 
    nm_setting_connection_get_timestamp ()
    
-
    guint64
+
    guint64
 nm_setting_connection_get_timestamp (NMSettingConnection *setting);
    
 
    Returns the “timestamp” property of the connection.
    
 
    
@@ -779,7 +779,7 @@ nm_setting_connection_get_timestamp (
 
    
 
    nm_setting_connection_get_read_only ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_get_read_only (NMSettingConnection *setting);
    
 
    Returns the “read-only” property of the connection.
    
 
    
@@ -799,16 +799,16 @@ nm_setting_connection_get_read_only (
 
    
 
    Returns
    
-
     TRUE if the connection is read-only, FALSE if it is not
    
+
     TRUE if the connection is read-only, FALSE if it is not
    
 
    
 
    
 
    
 
    
 
    nm_setting_connection_get_num_permissions ()
    
-
    guint32
+
    guint32
 nm_setting_connection_get_num_permissions
                                (NMSettingConnection *setting);
    
-
    Returns the number of entires in the “permissions”
+
    Returns the number of entries in the “permissions”
 property of this setting.
    
 
    
 
    Parameters
    
@@ -827,15 +827,15 @@ property of this setting.
    
 
    
 
    
 
    Returns
    
-
     the number of permissions entires
    
+
     the number of permissions entries
    
 
    
 
    
 
    
 
    
 
    nm_setting_connection_get_permission ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_get_permission (NMSettingConnection *setting,
-                                      guint32 idx,
+                                      guint32 idx,
                                       const char **out_ptype,
                                       const char **out_pitem,
                                       const char **out_detail);
    
@@ -874,7 +874,7 @@ of this setting.
    
 
 
 
    out_detail
    
-
    on return, the permission detail (at this time, always NULL)
    
+
    on return, the permission detail (at this time, always NULL)
    
  
 
 
@@ -882,7 +882,7 @@ of this setting.
    
 
    
 
    
 
    Returns
    
-
     TRUE if a permission was returned, FALSE if idx
+
     TRUE if a permission was returned, FALSE if idx
 was invalid
    
 
    
 
    
@@ -915,7 +915,7 @@ nm_setting_connection_get_zone (
 
    
 
    nm_setting_connection_permissions_user_allowed ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_permissions_user_allowed
                                (NMSettingConnection *setting,
                                 const char *uname);
    
@@ -944,14 +944,14 @@ nm_setting_connection_permissions_user_allowed
 
    
 
    
 
    Returns
    
-
     TRUE if the requested user is allowed to view this connection,
-FALSE if the given user is not allowed to view this connection
    
+
     TRUE if the requested user is allowed to view this connection,
+FALSE if the given user is not allowed to view this connection
    
 
    
 
    
 
    
 
    
 
    nm_setting_connection_add_permission ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_add_permission (NMSettingConnection *setting,
                                       const char *ptype,
                                       const char *pitem,
@@ -987,7 +987,7 @@ the "user" permission type is supported, and pitem
 
 
    detail
    
-
     unused at this time; must be NULL. 
    
+
     unused at this time; must be NULL. 
    
 [allow-none]
 
 
@@ -995,8 +995,8 @@ the "user" permission type is supported, and pitem
 
    
 
    Returns
    
-
     TRUE if the permission was unique and was successfully added to the
-list, FALSE if ptype
+
     TRUE if the permission was unique and was successfully added to the
+list, FALSE if ptype
 or pitem
 was invalid or it the permission was already
 present in the list
    
@@ -1008,7 +1008,7 @@ present in the list
    
 
    void
 nm_setting_connection_remove_permission
                                (NMSettingConnection *setting,
-                                guint32 idx);
    
+                                guint32 idx);
    
 
    Removes the permission at index idx
  from the connection.
    
 
    
@@ -1037,7 +1037,7 @@ nm_setting_connection_remove_permission
 
    
 
    
 
    nm_setting_connection_remove_permission_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_remove_permission_by_value
                                (NMSettingConnection *setting,
                                 const char *ptype,
@@ -1074,7 +1074,7 @@ be a username. See 
    detail
    
-
     unused at this time; must be NULL. 
    
+
     unused at this time; must be NULL. 
    
 [allow-none]
 
 
@@ -1082,7 +1082,7 @@ be a username. See 
 
    Returns
    
-
     TRUE if the permission was found and removed; FALSE if it was not.
    
+
     TRUE if the permission was found and removed; FALSE if it was not.
    
 
    
 
    
 
    
@@ -1115,7 +1115,7 @@ connection.
    
 
    
 
    
 
    nm_setting_connection_is_slave_type ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_is_slave_type (NMSettingConnection *setting,
                                      const char *type);
    
 
    
@@ -1144,7 +1144,7 @@ against setting
 
    
 
    
 
    Returns
    
-
     TRUE if connection is of the given slave type
+
     TRUE if connection is of the given slave type
 
    
 
    
 
    
@@ -1206,7 +1206,7 @@ with the connection.
    
 
    
 
    
 
    nm_setting_connection_get_num_secondaries ()
    
-
    guint32
+
    guint32
 nm_setting_connection_get_num_secondaries
                                (NMSettingConnection *setting);
    
 
    
@@ -1234,7 +1234,7 @@ nm_setting_connection_get_num_secondaries
 
    nm_setting_connection_get_secondary ()
    
 
    const char *
 nm_setting_connection_get_secondary (NMSettingConnection *setting,
-                                     guint32 idx);
    
+                                     guint32 idx);
    
 
    
 
    Parameters
    
 
    
@@ -1266,7 +1266,7 @@ nm_setting_connection_get_secondary (
 
    
 
    nm_setting_connection_add_secondary ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_add_secondary (NMSettingConnection *setting,
                                      const char *sec_uuid);
    
 
    Adds a new secondary connetion UUID to the setting.
    
@@ -1294,7 +1294,7 @@ nm_setting_connection_add_secondary (
 
    
 
    Returns
    
-
     TRUE if the secondary connection UUID was added; FALSE if the UUID
+
     TRUE if the secondary connection UUID was added; FALSE if the UUID
 was already present
    
 
    
 
    
@@ -1304,7 +1304,7 @@ was already present
    
 
    void
 nm_setting_connection_remove_secondary
                                (NMSettingConnection *setting,
-                                guint32 idx);
    
+                                guint32 idx);
 
    Removes the secondary coonnection UUID at index idx
 .
    
 
    
@@ -1333,7 +1333,7 @@ nm_setting_connection_remove_secondary
 
    
 
    
 
    nm_setting_connection_remove_secondary_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_connection_remove_secondary_by_value
                                (NMSettingConnection *setting,
                                 const char *sec_uuid);
    
@@ -1363,13 +1363,13 @@ nm_setting_connection_remove_secondary_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the secondary connection UUID was found and removed; FALSE if it was not.
    
+
     TRUE if the secondary connection UUID was found and removed; FALSE if it was not.
    
 
    
 
    
 
    
 
    
 
    nm_setting_connection_get_gateway_ping_timeout ()
    
-
    guint32
+
    guint32
 nm_setting_connection_get_gateway_ping_timeout
                                (NMSettingConnection *setting);
    
 
    
@@ -1670,18 +1670,17 @@ should be activated when master is activated.
    
 
    
 
    NMSettingConnection
    
 
    typedef struct _NMSettingConnection NMSettingConnection;
    
-
    The NMSettingConnection struct contains only private data.
-It should only be accessed through the functions described below.
    
+
    General Connection Profile Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “autoconnect” property
    
-
      “autoconnect”              gboolean
    
+
      “autoconnect”              gboolean
    
 
    Whether or not the connection should be automatically connected by
 NetworkManager when the resources for the connection are available.
-TRUE to automatically activate the connection, FALSE to require manual
+TRUE to automatically activate the connection, FALSE to require manual
 intervention to activate the connection.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: TRUE
    
@@ -1689,7 +1688,7 @@ intervention to activate the connection.
    
 
    
 
    
 
    The “autoconnect-priority” property
    
-
      “autoconnect-priority”     gint
    
+
      “autoconnect-priority”     gint
    
 
    The autoconnect priority. If the connection is set to autoconnect,
 connections with higher priority will be preferred. Defaults to 0.
 The higher number means higher priority.
    
@@ -1700,7 +1699,7 @@ The higher number means higher priority.
    
 
    
 
    
 
    The “autoconnect-retries” property
    
-
      “autoconnect-retries”      gint
    
+
      “autoconnect-retries”      gint
    
 
    The number of times a connection should be tried when autoctivating before
 giving up. Zero means forever, -1 means the global default (4 times if not
 overridden).
    
@@ -1726,7 +1725,7 @@ determine the real value. If it is default as well, this fallbacks to 0.
    
 
    
 
    
 
    The “gateway-ping-timeout” property
    
-
      “gateway-ping-timeout”     guint
    
+
      “gateway-ping-timeout”     guint
    
 
    If greater than zero, delay success of IP addressing until either the
 timeout is reached, or an IP gateway replies to a ping.
    
 
    Flags: Read / Write / Construct
    
@@ -1736,7 +1735,7 @@ timeout is reached, or an IP gateway replies to a ping.
    
 
    
 
    
 
    The “id” property
    
-
      “id”                       gchar *
    
+
      “id”                       gchar *
    
 
    A human readable unique identifier for the connection, like "Work Wi-Fi"
 or "T-Mobile 3G".
    
 
    Flags: Read / Write
    
@@ -1745,7 +1744,7 @@ or "T-Mobile 3G".
    
 
    
 
    
 
    The “interface-name” property
    
-
      “interface-name”           gchar *
    
+
      “interface-name”           gchar *
    
 
    The name of the network interface this connection is bound to. If not
 set, then the connection can be attached to any interface of the
 appropriate type (subject to restrictions imposed by other settings).
    
@@ -1761,7 +1760,7 @@ connection may be applied to the wrong interface.
    
 
    
 
    
 
    The “lldp” property
    
-
      “lldp”                     gint
    
+
      “lldp”                     gint
    
 
    Whether LLDP is enabled for the connection.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: -1
    
@@ -1770,7 +1769,7 @@ connection may be applied to the wrong interface.
    
 
    
 
    
 
    The “master” property
    
-
      “master”                   gchar *
    
+
      “master”                   gchar *
    
 
    Interface name of the master device or UUID of the master connection.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -1789,9 +1788,9 @@ the change takes effect immediately.
    
 
    
 
    
 
    The “permissions” property
    
-
      “permissions”              GStrv
    
+
      “permissions”              GStrv
    
 
    An array of strings defining what access a given user has to this
-connection.  If this is NULL or empty, all users are allowed to access
+connection.  If this is NULL or empty, all users are allowed to access
 this connection.  Otherwise a user is allowed to access this connection
 if and only if they are in this list. Each entry is of the form
 "[type]:[id]:[reserved]"; for example, "user:dcbw:blah".
    
@@ -1805,9 +1804,9 @@ use.  All of [type], [id], and [reserved] must be valid UTF-8.
    
 
    
 
    
 
    The “read-only” property
    
-
      “read-only”                gboolean
    
-
    FALSE if the connection can be modified using the provided settings
-service's D-Bus interface with the right privileges, or TRUE if the
+
      “read-only”                gboolean
    
+
    FALSE if the connection can be modified using the provided settings
+service's D-Bus interface with the right privileges, or TRUE if the
 connection is read-only and cannot be modified.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
@@ -1815,7 +1814,7 @@ connection is read-only and cannot be modified.
    
 
    
 
    
 
    The “secondaries” property
    
-
      “secondaries”              GStrv
    
+
      “secondaries”              GStrv
    
 
    List of connection UUIDs that should be activated when the base
 connection itself is activated. Currently only VPN connections are
 supported.
    
@@ -1824,9 +1823,9 @@ supported.
    
 
    
 
    
 
    The “slave-type” property
    
-
      “slave-type”               gchar *
    
+
      “slave-type”               gchar *
    
 
    Setting name of the device type of this slave's master connection (eg,
-NM_SETTING_BOND_SETTING_NAME), or NULL if this connection is not a
+NM_SETTING_BOND_SETTING_NAME), or NULL if this connection is not a
 slave.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -1834,7 +1833,7 @@ slave.
    
 
    
 
    
 
    The “stable-id” property
    
-
      “stable-id”                gchar *
    
+
      “stable-id”                gchar *
    
 
    Token to generate stable IDs for the connection.
    
 
    The stable-id is used for generating IPv6 stable private addresses
 with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the
@@ -1864,7 +1863,7 @@ their stable-id is also identical before performing dynamic substitutions.
    
 
    
 
    
 
    The “timestamp” property
    
-
      “timestamp”                guint64
    
+
      “timestamp”                guint64
    
 
    The time, in seconds since the Unix Epoch, that the connection was last
 _successfully_ fully activated.
    
 
    NetworkManager updates the connection timestamp periodically when the
@@ -1877,7 +1876,7 @@ property will not be preserved).
    
 
    
 
    
 
    The “type” property
    
-
      “type”                     gchar *
    
+
      “type”                     gchar *
    
 
    Base type of the connection. For hardware-dependent connections, should
 contain the setting name of the hardware-type specific setting (ie,
 "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for
@@ -1889,7 +1888,7 @@ the setting name of that setting type (ie, "vpn" or "bridge", etc).
    
 
    
 
    
 
    The “uuid” property
    
-
      “uuid”                     gchar *
    
+
      “uuid”                     gchar *
    
 
    A universally unique identifier for the connection, for example generated
 with libuuid.  It should be assigned when the connection is created, and
 never changed as long as the connection still applies to the same
@@ -1900,16 +1899,16 @@ provider, or nm_utils_uuid_generate() or
-nm_utils_uuid_generate_from_string().
    
+nm_utils_uuid_generate_from_string().
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
 
    
 
    
 
    
 
    The “zone” property
    
-
      “zone”                     gchar *
    
+
      “zone”                     gchar *
    
 
    The trust level of a the connection.  Free form case-insensitive string
-(for example "Home", "Work", "Public").  NULL or unspecified zone means
+(for example "Home", "Work", "Public").  NULL or unspecified zone means
 the connection will be placed in the default zone as defined by the
 firewall.
    
 
    When updating this property on a currently activated connection,
diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html
index 40b44aa1..6a497ba8 100644
--- a/docs/libnm/html/NMSettingDcb.html
+++ b/docs/libnm/html/NMSettingDcb.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
    
-
+
    Home
 Up
 PrevNextNext
 
    
 
    
 
    
@@ -59,7 +59,7 @@
 
 
 
-gint
+gint
 
 
 nm_setting_dcb_get_app_fcoe_priority ()
@@ -82,7 +82,7 @@
 
 
 
-gint
+gint
 
 
 nm_setting_dcb_get_app_iscsi_priority ()
@@ -98,7 +98,7 @@
 
 
 
-gint
+gint
 
 
 nm_setting_dcb_get_app_fip_priority ()
@@ -114,7 +114,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_dcb_get_priority_flow_control ()
@@ -138,7 +138,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_group_id ()
@@ -154,7 +154,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_group_bandwidth ()
@@ -170,7 +170,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_bandwidth ()
@@ -186,7 +186,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_dcb_get_priority_strict_bandwidth ()
@@ -202,7 +202,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_traffic_class ()
@@ -235,12 +235,12 @@
 
 
 
-gchar *
+gchar *
 app-fcoe-mode
 Read / Write / Construct
 
 
-gint
+gint
 app-fcoe-priority
 Read / Write / Construct
 
@@ -250,7 +250,7 @@
 Read / Write
 
 
-gint
+gint
 app-fip-priority
 Read / Write / Construct
 
@@ -260,19 +260,19 @@
 Read / Write
 
 
-gint
+gint
 app-iscsi-priority
 Read / Write / Construct
 
 
 
-GArray *
+GArray *
 priority-bandwidth
 Read / Write
 
 
 
-GArray *
+GArray *
 priority-flow-control
 Read / Write
 
@@ -283,7 +283,7 @@
 
 
 
-GArray *
+GArray *
 priority-group-bandwidth
 Read / Write
 
@@ -294,19 +294,19 @@
 
 
 
-GArray *
+GArray *
 priority-group-id
 Read / Write
 
 
 
-GArray *
+GArray *
 priority-strict-bandwidth
 Read / Write
 
 
 
-GArray *
+GArray *
 priority-traffic-class
 Read / Write
 
@@ -406,9 +406,9 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GFlags
+
        GFlags
     ╰── NMSettingDcbFlags
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingDcb
 
    
@@ -462,7 +462,7 @@ nm_setting_dcb_get_app_fcoe_flags (
 
    
 
    nm_setting_dcb_get_app_fcoe_priority ()
    
-
    gint
+
    gint
 nm_setting_dcb_get_app_fcoe_priority (NMSettingDcb *setting);
    
 
    
 
    Parameters
    
@@ -537,7 +537,7 @@ nm_setting_dcb_get_app_iscsi_flags (
 
    
 
    nm_setting_dcb_get_app_iscsi_priority ()
    
-
    gint
+
    gint
 nm_setting_dcb_get_app_iscsi_priority (NMSettingDcb *setting);
    
 
    
 
    Parameters
    
@@ -587,7 +587,7 @@ nm_setting_dcb_get_app_fip_flags (
 
    
 
    nm_setting_dcb_get_app_fip_priority ()
    
-
    gint
+
    gint
 nm_setting_dcb_get_app_fip_priority (NMSettingDcb *setting);
    
 
    
 
    Parameters
    
@@ -638,10 +638,10 @@ nm_setting_dcb_get_priority_flow_control_flags
 
    
 
    
 
    nm_setting_dcb_get_priority_flow_control ()
    
-
    gboolean
+
    gboolean
 nm_setting_dcb_get_priority_flow_control
                                (NMSettingDcb *setting,
-                                guint user_priority);
    
+                                guint user_priority);
    
 
    
 
    Parameters
    
 
    
@@ -666,9 +666,9 @@ nm_setting_dcb_get_priority_flow_control
 
    
 
    Returns
    
-
     TRUE if flow control is enabled for the given user_priority
+
     TRUE if flow control is enabled for the given user_priority
 ,
-FALSE if not enabled
    
+FALSE if not enabled
    
 
    
@@ -677,8 +677,8 @@ nm_setting_dcb_get_priority_flow_control
 
    void
 nm_setting_dcb_set_priority_flow_control
                                (NMSettingDcb *setting,
-                                guint user_priority,
-                                gboolean enabled);
    
+                                guint user_priority,
+                                gboolean enabled);
    These values are only valid when “priority-flow-control” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
@@ -702,7 +702,7 @@ the 
 
    
-
+
@@ -738,9 +738,9 @@ nm_setting_dcb_get_priority_group_flags
 
    
 
    
 
    nm_setting_dcb_get_priority_group_id ()
    
-
    guint
+
    guint
 nm_setting_dcb_get_priority_group_id (NMSettingDcb *setting,
-                                      guint user_priority);
    
+                                      guint user_priority);
    
 
    
 
    Parameters
    
 
    
 
 
 
 
 
    
 
    enabled
    TRUE to enable flow control for this priority, FALSE to disable it
    TRUE to enable flow control for this priority, FALSE to disable it
    		
  
 
    
 
    
@@ -776,8 +776,8 @@ only valid when 
    nm_setting_dcb_set_priority_group_id ()
    void
 nm_setting_dcb_set_priority_group_id (NMSettingDcb *setting,
-                                      guint user_priority,
-                                      guint group_id);
    
+                                      guint user_priority,
+                                      guint group_id);
    These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
@@ -813,10 +813,10 @@ unrestricted group.
    
 
    
 
    
 
    nm_setting_dcb_get_priority_group_bandwidth ()
    
-
    guint
+
    guint
 nm_setting_dcb_get_priority_group_bandwidth
                                (NMSettingDcb *setting,
-                                guint group_id);
    
+                                guint group_id);
    
 
    
 
    Parameters
    
 
    
 
 
 
    
@@ -853,8 +853,8 @@ only valid when void
 nm_setting_dcb_set_priority_group_bandwidth
                                (NMSettingDcb *setting,
-                                guint group_id,
-                                guint bandwidth_percent);
+                                guint group_id,
+                                guint bandwidth_percent);
    These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
@@ -889,9 +889,9 @@ to
    
 
    
 
    
 
    nm_setting_dcb_get_priority_bandwidth ()
    
-
    guint
+
    guint
 nm_setting_dcb_get_priority_bandwidth (NMSettingDcb *setting,
-                                       guint user_priority);
    
+                                       guint user_priority);
    
 
    
 
    Parameters
    
 
    
 
 
    
@@ -927,8 +927,8 @@ These values are only valid when 
    nm_setting_dcb_set_priority_bandwidth ()
    void
 nm_setting_dcb_set_priority_bandwidth (NMSettingDcb *setting,
-                                       guint user_priority,
-                                       guint bandwidth_percent);
    
+                                       guint user_priority,
+                                       guint bandwidth_percent);
    These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
@@ -964,10 +964,10 @@ allowed to use within its priority group
    
 
    
 
    
 
    nm_setting_dcb_get_priority_strict_bandwidth ()
    
-
    gboolean
+
    gboolean
 nm_setting_dcb_get_priority_strict_bandwidth
                                (NMSettingDcb *setting,
-                                guint user_priority);
    
+                                guint user_priority);
    
 
    
 
    Parameters
    
 
    
 
 
 
    
@@ -992,9 +992,9 @@ nm_setting_dcb_get_priority_strict_bandwidth
 
    
 
    Returns
    
-
     TRUE if user_priority
+
     TRUE if user_priority
 may use all of the bandwidth allocated to its
-assigned group, or FALSE if not. These values are only valid when
+assigned group, or FALSE if not. These values are only valid when
 “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
@@ -1004,8 +1004,8 @@ assigned group, or void
 nm_setting_dcb_set_priority_strict_bandwidth
                                (NMSettingDcb *setting,
-                                guint user_priority,
-                                gboolean strict);
+                                guint user_priority,
+                                gboolean strict);
    These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
@@ -1029,9 +1029,9 @@ the 
 
    
-
+its priority group, or FALSE if not
    
     
@@ -1041,10 +1041,10 @@ its priority group, or 
 
    nm_setting_dcb_get_priority_traffic_class ()
    
-
    guint
+
    guint
 nm_setting_dcb_get_priority_traffic_class
                                (NMSettingDcb *setting,
-                                guint user_priority);
    
+                                guint user_priority);
    
 
    Parameters
    
 
    
 
 
 
 
    
 
    strict
    TRUE to allow user_priority
+
    TRUE to allow user_priority
 to use all the bandwidth allocated to
-its priority group, or FALSE if not
    		 
 
    
     
 
    
@@ -1081,8 +1081,8 @@ valid when void
 nm_setting_dcb_set_priority_traffic_class
                                (NMSettingDcb *setting,
-                                guint user_priority,
-                                guint traffic_class);
+                                guint user_priority,
+                                guint traffic_class);
    
@@ -1246,6 +1246,7 @@ peer configuration advertisements
    
 
    
 
    NMSettingDcb
    
 
    typedef struct _NMSettingDcb NMSettingDcb;
    
+
    Data Center Bridging Settings
    
 
    
 
    
@@ -1261,7 +1262,7 @@ be any combination of 
 
    The “app-fcoe-mode” property
    
-
      “app-fcoe-mode”            gchar *
    
+
      “app-fcoe-mode”            gchar *
    
 
    The FCoE controller mode; either NM_SETTING_DCB_FCOE_MODE_FABRIC
 (default) or NM_SETTING_DCB_FCOE_MODE_VN2VN.
    
 
    Flags: Read / Write / Construct
    
@@ -1270,7 +1271,7 @@ be any combination of 
 
    The “app-fcoe-priority” property
    
-
      “app-fcoe-priority”        gint
    
+
      “app-fcoe-priority”        gint
    
 
    The highest User Priority (0 - 7) which FCoE frames should use, or -1 for
 default priority.  Only used when the “app-fcoe-flags”
 property includes the NM_SETTING_DCB_FLAG_ENABLE flag.
    
@@ -1290,7 +1291,7 @@ be any combination of 
 
    The “app-fip-priority” property
    
-
      “app-fip-priority”         gint
    
+
      “app-fip-priority”         gint
    
 
    The highest User Priority (0 - 7) which FIP frames should use, or -1 for
 default priority.  Only used when the “app-fip-flags”
 property includes the NM_SETTING_DCB_FLAG_ENABLE flag.
    
@@ -1310,7 +1311,7 @@ may be any combination of 
 
    The “app-iscsi-priority” property
    
-
      “app-iscsi-priority”       gint
    
+
      “app-iscsi-priority”       gint
    
 
    The highest User Priority (0 - 7) which iSCSI frames should use, or -1
 for default priority. Only used when the “app-iscsi-flags”
 property includes the NM_SETTING_DCB_FLAG_ENABLE flag.
    
@@ -1321,7 +1322,7 @@ property includes the 
 
    The “priority-bandwidth” property
    
-
      “priority-bandwidth”       GArray *
    
+
      “priority-bandwidth”       GArray *
    
 
    An array of 8 uint values, where the array index corresponds to the User
 Priority (0 - 7) and the value indicates the percentage of bandwidth of
 the priority's assigned group that the priority may use.  The sum of all
@@ -1333,7 +1334,7 @@ percent.
    
 
    
 
    
 
    The “priority-flow-control” property
    
-
      “priority-flow-control”    GArray *
    
+
      “priority-flow-control”    GArray *
    
 
    An array of 8 boolean values, where the array index corresponds to the User
 Priority (0 - 7) and the value indicates whether or not the corresponding
 priority should transmit priority pause.
    
@@ -1352,7 +1353,7 @@ Flags may be any combination of 
 
    The “priority-group-bandwidth” property
    
-
      “priority-group-bandwidth” GArray *
    
+
      “priority-group-bandwidth” GArray *
    
 
    An array of 8 uint values, where the array index corresponds to the
 Priority Group ID (0 - 7) and the value indicates the percentage of link
 bandwidth allocated to that group.  Allowed values are 0 - 100, and the
@@ -1372,7 +1373,7 @@ any combination of 
 
    The “priority-group-id” property
    
-
      “priority-group-id”        GArray *
    
+
      “priority-group-id”        GArray *
    
 
    An array of 8 uint values, where the array index corresponds to the User
 Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed
 Priority Group ID values are 0 - 7 or 15 for the unrestricted group.
    
@@ -1382,7 +1383,7 @@ Priority Group ID values are 0 - 7 or 15 for the unrestricted group.
    
 
    
 
    
 
    The “priority-strict-bandwidth” property
    
-
      “priority-strict-bandwidth” GArray *
    
+
      “priority-strict-bandwidth” GArray *
    
 
    An array of 8 boolean values, where the array index corresponds to the User
 Priority (0 - 7) and the value indicates whether or not the priority may
 use all of the bandwidth allocated to its assigned group.
    
@@ -1392,7 +1393,7 @@ use all of the bandwidth allocated to its assigned group.
    
 
    
 
    
 
    The “priority-traffic-class” property
    
-
      “priority-traffic-class”   GArray *
    
+
      “priority-traffic-class”   GArray *
    
 
    An array of 8 uint values, where the array index corresponds to the User
 Priority (0 - 7) and the value indicates the traffic class (0 - 7) to
 which the priority is mapped.
    
diff --git a/docs/libnm/html/NMSettingDummy.html b/docs/libnm/html/NMSettingDummy.html
new file mode 100644
index 00000000..a6fc3605
--- /dev/null
+++ b/docs/libnm/html/NMSettingDummy.html
@@ -0,0 +1,116 @@
+
+
+
+
+NMSettingDummy: libnm Reference Manual
+
+
+
+
+
+
+
+
+
+
    
 
 
 
 
    
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    NMSettingDummy
    
+
    NMSettingDummy — Describes connection properties for dummy interfaces
    
+
    
+
    
+
    Functions
    
+
    
++++
+
+
+
+
+
    



    
+NMSetting *
+
+nm_setting_dummy_new ()
+
    
+
    
+
    
+
    Types and Values
    
+
    
++++
+
+
+
+
+
+
+
+
+
+
+
    



    #defineNM_SETTING_DUMMY_SETTING_NAME
     NMSettingDummy
    
+
    
+
    
+
    Object Hierarchy
    
+
        GObject
+    ╰── NMSetting
+        ╰── NMSettingDummy
+
    
+
    
+
    
+
    Description
    
+
    The NMSettingDummy object is a NMSetting subclass that describes properties
+necessary for connection to dummy devices
    
+
    
+
    
+
    Functions
    
+
    
+
    nm_setting_dummy_new ()
    
+
    NMSetting *
+nm_setting_dummy_new (void);
    
+
    Creates a new NMSettingDummy object with default values.
    
+
    
+
    Returns
    
+
     the new empty NMSettingDummy object. 
    
+
    [transfer full]
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
+
    Types and Values
    
+
    
+
    NM_SETTING_DUMMY_SETTING_NAME
    
+
    #define NM_SETTING_DUMMY_SETTING_NAME         "dummy"
+
    
+
    
+
    
+
    
+
    NMSettingDummy
    
+
    typedef struct _NMSettingDummy NMSettingDummy;
    
+
    Dummy Link Settings
    
+
    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html
index 89112de0..714ec7c3 100644
--- a/docs/libnm/html/NMSettingGeneric.html
+++ b/docs/libnm/html/NMSettingGeneric.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 
    
@@ -70,7 +70,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingGeneric
 
    
@@ -81,7 +81,7 @@
 optional properties that apply to "generic" devices (ie, devices that
 NetworkManager does not specifically recognize).
    
 
    There are currently no properties on this object; it exists only to be
-the "connection type" setting on NMConnections for generic devices.
    
+the "connection type" setting on NMConnections for generic devices.
    
 
    
 
    
 
    Functions
    
@@ -108,6 +108,7 @@ nm_setting_generic_new (void
 
    NMSettingGeneric
    
 
    typedef struct _NMSettingGeneric NMSettingGeneric;
    
+
    Generic Link Settings
    
 
    
 
    
 
    
diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html
index be3e09d2..0a80c7f2 100644
--- a/docs/libnm/html/NMSettingGsm.html
+++ b/docs/libnm/html/NMSettingGsm.html
@@ -93,7 +93,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_gsm_get_home_only ()
@@ -122,6 +122,14 @@
 
 
 
+guint32
+
+
+nm_setting_gsm_get_mtu ()
+
+
+
+
 NMSettingSecretFlags
 
 
@@ -150,36 +158,41 @@
 
 
 
-gchar *
+gchar *
 apn
 Read / Write
 
 
 
-gchar *
+gchar *
 device-id
 Read / Write
 
 
-gboolean
+gboolean
 home-only
 Read / Write
 
 
+guint
+mtu
+Read / Write / Construct
+
+
 
-gchar *
+gchar *
 network-id
 Read / Write
 
 
 
-gchar *
+gchar *
 number
 Read / Write
 
 
 
-gchar *
+gchar *
 password
 Read / Write
 
@@ -190,7 +203,7 @@
 
 
 
-gchar *
+gchar *
 pin
 Read / Write
 
@@ -201,19 +214,19 @@
 
 
 
-gchar *
+gchar *
 sim-id
 Read / Write
 
 
 
-gchar *
+gchar *
 sim-operator-id
 Read / Write
 
 
 
-gchar *
+gchar *
 username
 Read / Write
 
@@ -281,6 +294,10 @@
 NM_SETTING_GSM_SIM_OPERATOR_ID
 
 
+#define
+NM_SETTING_GSM_MTU
+
+
  
 NMSettingGsm
 
@@ -289,7 +306,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingGsm
 
    
@@ -465,7 +482,7 @@ nm_setting_gsm_get_pin (
 
    nm_setting_gsm_get_home_only ()
    
-
    gboolean
+
    gboolean
 nm_setting_gsm_get_home_only (NMSettingGsm *setting);
    
 
    
 
    Parameters
    
@@ -567,6 +584,32 @@ nm_setting_gsm_get_sim_operator_id (
 
    
 
    
+
    nm_setting_gsm_get_mtu ()
    
+
    guint32
+nm_setting_gsm_get_mtu (NMSettingGsm *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingGsm
    		 
    
+
    
+
    
+
    Returns
    
+
     the “mtu” property of the setting
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    nm_setting_gsm_get_pin_flags ()
    
 
    NMSettingSecretFlags
 nm_setting_gsm_get_pin_flags (NMSettingGsm *setting);
    
@@ -697,15 +740,22 @@ nm_setting_gsm_get_password_flags (
 
    
 
    
+
    NM_SETTING_GSM_MTU
    
+
    #define NM_SETTING_GSM_MTU             "mtu"
+
    
+
    
+
    
+
    
 
    NMSettingGsm
    
 
    typedef struct _NMSettingGsm NMSettingGsm;
    
+
    GSM-based Mobile Broadband Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “apn” property
    
-
      “apn”                      gchar *
    
+
      “apn”                      gchar *
    
 
    The GPRS Access Point Name specifying the APN used when establishing a
 data session with the GSM-based network.  The APN often determines how
 the user will be billed for their network usage and whether the user has
@@ -719,7 +769,7 @@ The APN may only be composed of the characters a-z, 0-9, ., and - per GSM
 
    
 
    
 
    The “device-id” property
    
-
      “device-id”                gchar *
    
+
      “device-id”                gchar *
    
 
    The device unique identifier (as given by the WWAN management service)
 which this connection applies to.  If given, the connection will only
 apply to the specified device.
    
@@ -730,16 +780,26 @@ apply to the specified device.
    
 
    
 
    
 
    The “home-only” property
    
-
      “home-only”                gboolean
    
-
    When TRUE, only connections to the home network will be allowed.
+
      “home-only”                gboolean
    
+
    When TRUE, only connections to the home network will be allowed.
 Connections to roaming networks will not be made.
    
 
    Flags: Read / Write
    
 
    Default value: FALSE
    
 
    
 
    
 
    
+
    The “mtu” property
    
+
      “mtu”                      guint
    
+
    If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple frames.
    
+
    Flags: Read / Write / Construct
    
+
    Default value: 0
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    The “network-id” property
    
-
      “network-id”               gchar *
    
+
      “network-id”               gchar *
    
 
    The Network ID (GSM LAI format, ie MCC-MNC) to force specific network
 registration.  If the Network ID is specified, NetworkManager will
 attempt to force the device to register only on the specified network.
@@ -751,7 +811,7 @@ roaming control of the device is not otherwise possible.
    
 
    
 
    
 
    The “number” property
    
-
      “number”                   gchar *
    
+
      “number”                   gchar *
    
 
    Number to dial when establishing a PPP data session with the GSM-based
 mobile broadband network.  Many modems do not require PPP for connections
 to the mobile network and thus this property should be left blank, which
@@ -762,7 +822,7 @@ allows NetworkManager to select the appropriate settings automatically.
    
 
    
 
    
 
    The “password” property
    
-
      “password”                 gchar *
    
+
      “password”                 gchar *
    
 
    The password used to authenticate with the network, if required.  Many
 providers do not require a password, or accept any password.  But if a
 password is required, it is specified here.
    
@@ -779,7 +839,7 @@ password is required, it is specified here.
    
 
    
 
    
 
    The “pin” property
    
-
      “pin”                      gchar *
    
+
      “pin”                      gchar *
    
 
    If the SIM is locked with a PIN it must be unlocked before any other
 operations are requested.  Specify the PIN here to allow operation of the
 device.
    
@@ -796,7 +856,7 @@ device.
    
 
    
 
    
 
    The “sim-id” property
    
-
      “sim-id”                   gchar *
    
+
      “sim-id”                   gchar *
    
 
    The SIM card unique identifier (as given by the WWAN management service)
 which this connection applies to.  If given, the connection will apply
 to any device also allowed by “device-id” which contains a
@@ -808,7 +868,7 @@ SIM card matching the given identifier.
    
 
    
 
    
 
    The “sim-operator-id” property
    
-
      “sim-operator-id”          gchar *
    
+
      “sim-operator-id”          gchar *
    
 
    A MCC/MNC string like "310260" or "21601" identifying the specific
 mobile network operator which this connection applies to.  If given,
 the connection will apply to any device also allowed by
@@ -821,7 +881,7 @@ card provisioined by the given operator.
    
 
    
 
    
 
    The “username” property
    
-
      “username”                 gchar *
    
+
      “username”                 gchar *
    
 
    The username used to authenticate with the network, if required.  Many
 providers do not require a username, or accept any username.  But if a
 username is required, it is specified here.
    
diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index 942268a0..e2e7cfed 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -77,13 +77,13 @@
 
 
 
-gchar *
+gchar *
 dhcp-client-id
 Read / Write
 
 
 
-gchar *
+gchar *
 dhcp-fqdn
 Read / Write
 
@@ -139,7 +139,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingIPConfig
             ╰── NMSettingIP4Config
@@ -302,13 +302,14 @@ through that interface to the default network.
    
 
    
 
    NMSettingIP4Config
    
 
    typedef struct _NMSettingIP4Config NMSettingIP4Config;
    
+
    IPv4 Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “dhcp-client-id” property
    
-
      “dhcp-client-id”           gchar *
    
+
      “dhcp-client-id”           gchar *
    
 
    A string sent to the DHCP server to identify the local machine which the
 DHCP server may use to customize the DHCP lease and options.
    
 
    Flags: Read / Write
    
@@ -317,8 +318,8 @@ DHCP server may use to customize the DHCP lease and options.
    
 
    
 
    
 
    The “dhcp-fqdn” property
    
-
      “dhcp-fqdn”                gchar *
    
-
    If the “dhcp-send-hostname” property is TRUE, then the
+
      “dhcp-fqdn”                gchar *
    
+
    If the “dhcp-send-hostname” property is TRUE, then the
 specified FQDN will be sent to the DHCP server when acquiring a lease. This
 property and “dhcp-hostname” are mutually exclusive and
 cannot be set at the same time.
    
diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html
index c2e28391..9f735103 100644
--- a/docs/libnm/html/NMSettingIP6Config.html
+++ b/docs/libnm/html/NMSettingIP6Config.html
@@ -85,7 +85,7 @@
 
 
 
-gint
+gint
 addr-gen-mode
 Read / Write / Construct
 
@@ -96,7 +96,7 @@
 
 
 
-gchar *
+gchar *
 token
 Read / Write
 
@@ -168,10 +168,10 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMSettingIP6ConfigAddrGenMode
     ╰── NMSettingIP6ConfigPrivacy
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingIPConfig
             ╰── NMSettingIP6Config
@@ -460,13 +460,14 @@ specified by RFC7217.
    
 
    
 
    NMSettingIP6Config
    
 
    typedef struct _NMSettingIP6Config NMSettingIP6Config;
    
+
    IPv6 Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “addr-gen-mode” property
    
-
      “addr-gen-mode”            gint
    
+
      “addr-gen-mode”            gint
    
 
    Configure method for creating the address for use with RFC4862 IPv6
 Stateless Address Autoconfiguration. The permitted values are: "eui64",
 or "stable-privacy".
    
@@ -516,7 +517,7 @@ setting as another way of avoiding host tracking with IPv6 addresses.
    
 
    
 
    
 
    The “token” property
    
-
      “token”                    gchar *
    
+
      “token”                    gchar *
    
 
    Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02
 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.
    
 
    Flags: Read / Write
    
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index a375ed35..10afde80 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -76,7 +76,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_ip_address_equal ()
@@ -131,7 +131,7 @@
 
 
 
-guint
+guint
 
 
 nm_ip_address_get_prefix ()
@@ -155,7 +155,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_ip_address_get_attribute ()
@@ -203,7 +203,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_ip_route_equal ()
@@ -258,7 +258,7 @@
 
 
 
-guint
+guint
 
 
 nm_ip_route_get_prefix ()
@@ -289,7 +289,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_ip_route_get_next_hop_binary ()
@@ -305,7 +305,7 @@
 
 
 
-gint64
+gint64
 
 
 nm_ip_route_get_metric ()
@@ -329,7 +329,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_ip_route_get_attribute ()
@@ -344,6 +344,21 @@
 
 
 
+const NMVariantAttributeSpec *const *
+
+
+nm_ip_route_get_variant_attribute_spec ()
+
+
+
+
+gboolean
+
+
+nm_ip_route_attribute_validate ()
+
+
+
 const char *
 
 
@@ -352,7 +367,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_ip_config_get_num_dns ()
@@ -367,7 +382,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_add_dns ()
@@ -383,7 +398,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_remove_dns_by_value ()
@@ -399,7 +414,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_ip_config_get_num_dns_searches ()
@@ -414,7 +429,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_add_dns_search ()
@@ -430,7 +445,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_remove_dns_search_by_value ()
@@ -446,7 +461,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_ip_config_get_num_dns_options ()
@@ -454,7 +469,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_has_dns_options ()
@@ -469,7 +484,7 @@
 
 
 
-gint
+gint
 
 
 nm_setting_ip_config_next_valid_dns_option ()
@@ -477,7 +492,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_add_dns_option ()
@@ -493,7 +508,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_remove_dns_option_by_value ()
@@ -509,7 +524,7 @@
 
 
 
-gint
+gint
 
 
 nm_setting_ip_config_get_dns_priority ()
@@ -517,7 +532,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_ip_config_get_num_addresses ()
@@ -533,7 +548,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_add_address ()
@@ -549,7 +564,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_remove_address_by_value ()
@@ -572,7 +587,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_ip_config_get_num_routes ()
@@ -588,7 +603,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_add_route ()
@@ -604,7 +619,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_remove_route_by_value ()
@@ -620,7 +635,7 @@
 
 
 
-gint64
+gint64
 
 
 nm_setting_ip_config_get_route_metric ()
@@ -628,7 +643,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_get_ignore_auto_routes ()
@@ -636,7 +651,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_get_ignore_auto_dns ()
@@ -651,7 +666,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_get_dhcp_send_hostname ()
@@ -659,7 +674,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_get_never_default ()
@@ -667,7 +682,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_get_may_fail ()
@@ -675,7 +690,7 @@
 
 
 
-gint
+gint
 
 
 nm_setting_ip_config_get_dad_timeout ()
@@ -683,7 +698,7 @@
 
 
 
-gint
+gint
 
 
 nm_setting_ip_config_get_dhcp_timeout ()
@@ -703,91 +718,91 @@
 
 
 
-GPtrArray *
+GPtrArray *
 addresses
 Read / Write
 
 
-gint
+gint
 dad-timeout
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 dhcp-hostname
 Read / Write
 
 
-gboolean
+gboolean
 dhcp-send-hostname
 Read / Write / Construct
 
 
-gint
+gint
 dhcp-timeout
 Read / Write
 
 
-GStrv
+GStrv
 dns
 Read / Write
 
 
-GStrv
+GStrv
 dns-options
 Read / Write
 
 
-gint
+gint
 dns-priority
 Read / Write / Construct
 
 
-GStrv
+GStrv
 dns-search
 Read / Write
 
 
 
-gchar *
+gchar *
 gateway
 Read / Write
 
 
-gboolean
+gboolean
 ignore-auto-dns
 Read / Write / Construct
 
 
-gboolean
+gboolean
 ignore-auto-routes
 Read / Write / Construct
 
 
-gboolean
+gboolean
 may-fail
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 method
 Read / Write
 
 
-gboolean
+gboolean
 never-default
 Read / Write / Construct
 
 
-gint64
+gint64
 route-metric
 Read / Write / Construct
 
 
 
-GPtrArray *
+GPtrArray *
 routes
 Read / Write
 
@@ -804,6 +819,58 @@
 
 
 #define
+NM_IP_ROUTE_ATTRIBUTE_SRC
+
+
+#define
+NM_IP_ROUTE_ATTRIBUTE_FROM
+
+
+#define
+NM_IP_ROUTE_ATTRIBUTE_TOS
+
+
+#define
+NM_IP_ROUTE_ATTRIBUTE_WINDOW
+
+
+#define
+NM_IP_ROUTE_ATTRIBUTE_CWND
+
+
+#define
+NM_IP_ROUTE_ATTRIBUTE_INITCWND
+
+
+#define
+NM_IP_ROUTE_ATTRIBUTE_INITRWND
+
+
+#define
+NM_IP_ROUTE_ATTRIBUTE_MTU
+
+
+#define
+NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW
+
+
+#define
+NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND
+
+
+#define
+NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND
+
+
+#define
+NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND
+
+
+#define
+NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU
+
+
+#define
 NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX
 
 
@@ -943,10 +1010,10 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GBoxed
+
        GBoxed
     ├── NMIPAddress
     ╰── NMIPRoute
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingIPConfig
             ├── NMSettingIP4Config
@@ -971,8 +1038,8 @@ related to IP addressing, routing, and Domain Name Service.
    
 
    NMIPAddress *
 nm_ip_address_new (int family,
                    const char *addr,
-                   guint prefix,
-                   GError **error);
    
+                   guint prefix,
+                   GError **error);
    
 
    Creates a new NMIPAddress object.
    
 
    
 
    Parameters
    
@@ -1001,7 +1068,7 @@ nm_ip_address_new (int fam
 
 
 
    error
    
-
    location to store error, or NULL
    
+
    location to store error, or NULL
    
  
 
 
@@ -1009,7 +1076,7 @@ nm_ip_address_new (int fam
 
    
 
    
 
    Returns
    
-
     the new NMIPAddress object, or NULL on error. 
    
+
     the new NMIPAddress object, or NULL on error. 
    
 
    [transfer full]
    
 
    
 
    
@@ -1018,9 +1085,9 @@ nm_ip_address_new (int fam
 
    nm_ip_address_new_binary ()
    
 
    NMIPAddress *
 nm_ip_address_new_binary (int family,
-                          gconstpointer addr,
-                          guint prefix,
-                          GError **error);
    
+                          gconstpointer addr,
+                          guint prefix,
+                          GError **error);
    
 
    Creates a new NMIPAddress object. addr
  must point to a buffer of the
 correct size for family
@@ -1052,7 +1119,7 @@ correct size for family
 
 
 
    error
    
-
    location to store error, or NULL
    
+
    location to store error, or NULL
    
  
 
 
@@ -1060,7 +1127,7 @@ correct size for family
 
    
 
    
 
    Returns
    
-
     the new NMIPAddress object, or NULL on error. 
    
+
     the new NMIPAddress object, or NULL on error. 
    
 
    [transfer full]
    
 
    
 
    
@@ -1112,7 +1179,7 @@ reaches zero, the object will be destroyed.
    
 
    
 
    
 
    nm_ip_address_equal ()
    
-
    gboolean
+
    gboolean
 nm_ip_address_equal (NMIPAddress *address,
                      NMIPAddress *other);
    
 
    Determines if two NMIPAddress objects contain the same address and prefix
@@ -1142,7 +1209,7 @@ to.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the objects contain the same values, FALSE if they do not.
    
+
     TRUE if the objects contain the same values, FALSE if they do not.
    
 
    
 
    
 
    
@@ -1266,7 +1333,7 @@ have a valid address, use 
    nm_ip_address_get_address_binary ()
    
 
    void
 nm_ip_address_get_address_binary (NMIPAddress *address,
-                                  gpointer addr);
    
+                                  gpointer addr);
    
 
    Gets the IP address property of this address object.
    
 
    addr
  must point to a buffer that is the correct size for address
@@ -1300,7 +1367,7 @@ nm_ip_address_get_address_binary (
    nm_ip_address_set_address_binary ()
    
 
    void
 nm_ip_address_set_address_binary (NMIPAddress *address,
-                                  gconstpointer addr);
    
+                                  gconstpointer addr);
    
 
    Sets the IP address property of this address object.
    
 
    addr
  must point to a buffer that is the correct size for address
@@ -1332,7 +1399,7 @@ nm_ip_address_set_address_binary (
 
    
 
    nm_ip_address_get_prefix ()
    
-
    guint
+
    guint
 nm_ip_address_get_prefix (NMIPAddress *address);
    
 
    Gets the IP address prefix (ie "24" or "30" etc) property of this address
 object.
    
@@ -1361,7 +1428,7 @@ object.
    
 
    nm_ip_address_set_prefix ()
    
 
    void
 nm_ip_address_set_prefix (NMIPAddress *address,
-                          guint prefix);
    
+                          guint prefix);
    
 
    Sets the IP address prefix property of this address object.
    
 
    
 
    Parameters
    
@@ -1410,14 +1477,14 @@ nm_ip_address_get_attribute_names (
 
    
 
    Returns
    
-
     a NULL-terminated array of attribute names,. 
    
+
     a NULL-terminated array of attribute names,. 
    
 
    [transfer full]
    
 
    
 
    
 
    
 
    
 
    nm_ip_address_get_attribute ()
    
-
    GVariant *
+
    GVariant *
 nm_ip_address_get_attribute (NMIPAddress *address,
                              const char *name);
    
 
    Gets the value of the attribute with name name
@@ -1450,7 +1517,7 @@ nm_ip_address_get_attribute (name
 on
 address
-, or NULL if address
+, or NULL if address
 has no such attribute. 
    
 
    [transfer none]
    
 
    
@@ -1461,7 +1528,7 @@ has no such attribute. 
    
 
    void
 nm_ip_address_set_attribute (NMIPAddress *address,
                              const char *name,
-                             GVariant *value);
    
+                             GVariant *value);
    
 
    Sets or clears the named attribute on address
  to the given value.
    
 
    
@@ -1498,10 +1565,10 @@ nm_ip_address_set_attribute (NMIPRoute *
 nm_ip_route_new (int family,
                  const char *dest,
-                 guint prefix,
+                 guint prefix,
                  const char *next_hop,
-                 gint64 metric,
-                 GError **error);
    
+                 gint64 metric,
+                 GError **error);
    
 
    Creates a new NMIPRoute object.
    
 
    
 
    Parameters
    
@@ -1530,7 +1597,7 @@ nm_ip_route_new (int famil
 
 
 
    next_hop
    
-
     the IP address of the next hop (or NULL). 
    
+
     the IP address of the next hop (or NULL). 
    
 [allow-none]
 
 
@@ -1540,7 +1607,7 @@ nm_ip_route_new (int famil
 
 
 
    error
    
-
    location to store error, or NULL
    
+
    location to store error, or NULL
    
  
 
 
@@ -1548,7 +1615,7 @@ nm_ip_route_new (int famil
 
    
 
    
 
    Returns
    
-
     the new NMIPRoute object, or NULL on error. 
    
+
     the new NMIPRoute object, or NULL on error. 
    
 
    [transfer full]
    
 
    
 
    
@@ -1557,14 +1624,14 @@ nm_ip_route_new (int famil
 
    nm_ip_route_new_binary ()
    
 
    NMIPRoute *
 nm_ip_route_new_binary (int family,
-                        gconstpointer dest,
-                        guint prefix,
-                        gconstpointer next_hop,
-                        gint64 metric,
-                        GError **error);
    
+                        gconstpointer dest,
+                        guint prefix,
+                        gconstpointer next_hop,
+                        gint64 metric,
+                        GError **error);
    
 
    Creates a new NMIPRoute object. dest
  and next_hop
- (if non-NULL) must
+ (if non-NULL) must
 point to buffers of the correct size for family
 .
    
 
    
@@ -1594,7 +1661,7 @@ point to buffers of the correct size for family
 
 
    next_hop
    
-
     the IP address of the next hop (or NULL). 
    
+
     the IP address of the next hop (or NULL). 
    
 [allow-none]
 
 
@@ -1604,7 +1671,7 @@ point to buffers of the correct size for family
 
 
    error
    
-
    location to store error, or NULL
    
+
    location to store error, or NULL
    
  
 
 
@@ -1612,7 +1679,7 @@ point to buffers of the correct size for family
 
    
 
    Returns
    
-
     the new NMIPRoute object, or NULL on error. 
    
+
     the new NMIPRoute object, or NULL on error. 
    
 
    [transfer full]
    
 
    
 
    
@@ -1664,7 +1731,7 @@ reaches zero, the object will be destroyed.
    
 
    
 
    
 
    nm_ip_route_equal ()
    
-
    gboolean
+
    gboolean
 nm_ip_route_equal (NMIPRoute *route,
                    NMIPRoute *other);
    
 
    Determines if two NMIPRoute objects contain the same destination, prefix,
@@ -1694,7 +1761,7 @@ to.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the objects contain the same values, FALSE if they do not.
    
+
     TRUE if the objects contain the same values, FALSE if they do not.
    
 
    
 
    
 
    
@@ -1818,7 +1885,7 @@ have a valid address, use 
    nm_ip_route_get_dest_binary ()
    
 
    void
 nm_ip_route_get_dest_binary (NMIPRoute *route,
-                             gpointer dest);
    
+                             gpointer dest);
    
 
    Gets the destination property of this route object.
    
 
    dest
  must point to a buffer that is the correct size for route
@@ -1852,7 +1919,7 @@ nm_ip_route_get_dest_binary (
    nm_ip_route_set_dest_binary ()
    
 
    void
 nm_ip_route_set_dest_binary (NMIPRoute *route,
-                             gconstpointer dest);
    
+                             gconstpointer dest);
    
 
    Sets the destination property of this route object.
    
 
    dest
  must point to a buffer that is the correct size for route
@@ -1884,7 +1951,7 @@ nm_ip_route_set_dest_binary (
 
    nm_ip_route_get_prefix ()
    
-
    guint
+
    guint
 nm_ip_route_get_prefix (NMIPRoute *route);
    
 
    Gets the IP prefix (ie "24" or "30" etc) of this route.
    
 
    
@@ -1912,7 +1979,7 @@ nm_ip_route_get_prefix (
    nm_ip_route_set_prefix ()
    
 
    void
 nm_ip_route_set_prefix (NMIPRoute *route,
-                        guint prefix);
    
+                        guint prefix);
    
 
    Sets the prefix property of this route object.
    
 
    
 
    Parameters
    
@@ -1942,7 +2009,7 @@ nm_ip_route_set_prefix (
    nm_ip_route_get_next_hop ()
    
 
    const char *
 nm_ip_route_get_next_hop (NMIPRoute *route);
    
-
    Gets the IP address of the next hop of this route; this will be NULL if the
+
    Gets the IP address of the next hop of this route; this will be NULL if the
 route has no next hop.
    
 
    
 
    Parameters
    
@@ -1961,7 +2028,7 @@ route has no next hop.
    
 
    
 
    
 
    Returns
    
-
     the IP address of the next hop, or NULL if this is a device route.
    
+
     the IP address of the next hop, or NULL if this is a device route.
    
 
    
 
    
 
    
@@ -1972,7 +2039,7 @@ nm_ip_route_set_next_hop (const char *next_hop);
    
 
    Sets the next-hop property of this route object.
    
 
    next_hop
- (if non-NULL) must be a valid address of route
+ (if non-NULL) must be a valid address of route
 's family. If you
 aren't sure you have a valid address, use nm_utils_ipaddr_valid() to check
 it.
    
@@ -2002,9 +2069,9 @@ it.
    
 
    
 
    
 
    nm_ip_route_get_next_hop_binary ()
    
-
    gboolean
+
    gboolean
 nm_ip_route_get_next_hop_binary (NMIPRoute *route,
-                                 gpointer next_hop);
    
+                                 gpointer next_hop);
    
 
    Gets the next hop property of this route object.
    
 
    next_hop
  must point to a buffer that is the correct size for route
@@ -2034,8 +2101,8 @@ nm_ip_route_get_next_hop_binary (
 
    
 
    Returns
    
-
     TRUE if route
-has a next hop, FALSE if not (in which case
+
     TRUE if route
+has a next hop, FALSE if not (in which case
 next_hop
 will be zeroed out)
    
 
    
@@ -2045,10 +2112,10 @@ will be zeroed out)
    
 
    nm_ip_route_set_next_hop_binary ()
    
 
    void
 nm_ip_route_set_next_hop_binary (NMIPRoute *route,
-                                 gconstpointer next_hop);
    
+                                 gconstpointer next_hop);
    
 
    Sets the destination property of this route object.
    
 
    next_hop
- (if non-NULL) must point to a buffer that is the correct size for
+ (if non-NULL) must point to a buffer that is the correct size for
 route
 's family.
    
 
    [skip]
    
@@ -2078,7 +2145,7 @@ nm_ip_route_set_next_hop_binary (
 
    
 
    nm_ip_route_get_metric ()
    
-
    gint64
+
    gint64
 nm_ip_route_get_metric (NMIPRoute *route);
    
 
    Gets the route metric property of this route object; lower values
 indicate "better" or more preferred routes; -1 indicates "default"
@@ -2108,7 +2175,7 @@ indicate "better" or more preferred routes; -1 indicates "default"
 
    nm_ip_route_set_metric ()
    
 
    void
 nm_ip_route_set_metric (NMIPRoute *route,
-                        gint64 metric);
    
+                        gint64 metric);
    
 
    Sets the metric property of this route object.
    
 
    
 
    Parameters
    
@@ -2157,14 +2224,14 @@ nm_ip_route_get_attribute_names (
 
    
 
    Returns
    
-
     a NULL-terminated array of attribute names. 
    
+
     a NULL-terminated array of attribute names. 
    
 
    [transfer full]
    
 
    
 
    
 
    
 
    
 
    nm_ip_route_get_attribute ()
    
-
    GVariant *
+
    GVariant *
 nm_ip_route_get_attribute (NMIPRoute *route,
                            const char *name);
    
 
    Gets the value of the attribute with name name
@@ -2197,7 +2264,7 @@ nm_ip_route_get_attribute (name
 on
 route
-, or NULL if route
+, or NULL if route
 has no such attribute. 
    
 
    [transfer none]
    
 
    
@@ -2208,7 +2275,7 @@ has no such attribute. 
    
 
    void
 nm_ip_route_set_attribute (NMIPRoute *route,
                            const char *name,
-                           GVariant *value);
    
+                           GVariant *value);
    
 
    Sets the named attribute on route
  to the given value.
    
 
    
@@ -2241,6 +2308,72 @@ nm_ip_route_set_attribute (
+
    nm_ip_route_get_variant_attribute_spec ()
    
+
    const NMVariantAttributeSpec *const *
+nm_ip_route_get_variant_attribute_spec
+                               (void);
    
+
    
+
    Returns
    
+
     the specifiers for route attributes
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
+
    nm_ip_route_attribute_validate ()
    
+
    gboolean
+nm_ip_route_attribute_validate (const char *name,
+                                GVariant *value,
+                                int family,
+                                gboolean *known,
+                                GError **error);
    
+
    Validates a route attribute, i.e. checks that the attribute is a known one
+and the value is of the correct type and well-formed.
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    




    name
    the attribute name
    		 
    value
    the attribute value
    		 
    family
    IP address family of the route
    		 
    known
     on return, whether the attribute name is a known one. 
    		[out]
    error
     return location for a GError, or NULL. 
    		[allow-none]
    
+
    
+
    
+
    Returns
    
+
     TRUE if the attribute is valid, FALSE otherwise
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    nm_setting_ip_config_get_method ()
    
 
    const char *
 nm_setting_ip_config_get_method (NMSettingIPConfig *setting);
    
@@ -2269,7 +2402,7 @@ methods available with each type.
    
 
    
 
    
 
    nm_setting_ip_config_get_num_dns ()
    
-
    guint
+
    guint
 nm_setting_ip_config_get_num_dns (NMSettingIPConfig *setting);
    
 
    
 
    Parameters
    
@@ -2328,7 +2461,7 @@ nm_setting_ip_config_get_dns (
 
    nm_setting_ip_config_add_dns ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_add_dns (NMSettingIPConfig *setting,
                               const char *dns);
    
 
    Adds a new DNS server to the setting.
    
@@ -2356,7 +2489,7 @@ nm_setting_ip_config_add_dns (
 
    Returns
    
-
     TRUE if the DNS server was added; FALSE if the server was already
+
     TRUE if the DNS server was added; FALSE if the server was already
 known
    
 
    
 
    
@@ -2394,7 +2527,7 @@ nm_setting_ip_config_remove_dns (
 
    
 
    nm_setting_ip_config_remove_dns_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_remove_dns_by_value
                                (NMSettingIPConfig *setting,
                                 const char *dns);
    
@@ -2424,7 +2557,7 @@ nm_setting_ip_config_remove_dns_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the DNS server was found and removed; FALSE if it was not.
    
+
     TRUE if the DNS server was found and removed; FALSE if it was not.
    
 
    
 
    
 
    
@@ -2452,7 +2585,7 @@ nm_setting_ip_config_clear_dns (
 
    
 
    nm_setting_ip_config_get_num_dns_searches ()
    
-
    guint
+
    guint
 nm_setting_ip_config_get_num_dns_searches
                                (NMSettingIPConfig *setting);
    
 
    
@@ -2512,7 +2645,7 @@ nm_setting_ip_config_get_dns_search (
 
    
 
    nm_setting_ip_config_add_dns_search ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_add_dns_search (NMSettingIPConfig *setting,
                                      const char *dns_search);
    
 
    Adds a new DNS search domain to the setting.
    
@@ -2540,7 +2673,7 @@ nm_setting_ip_config_add_dns_search (
 
    
 
    Returns
    
-
     TRUE if the DNS search domain was added; FALSE if the search
+
     TRUE if the DNS search domain was added; FALSE if the search
 domain was already known
    
 
    
 
    
@@ -2579,7 +2712,7 @@ nm_setting_ip_config_remove_dns_search
 
    
 
    
 
    nm_setting_ip_config_remove_dns_search_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_remove_dns_search_by_value
                                (NMSettingIPConfig *setting,
                                 const char *dns_search);
    
@@ -2609,7 +2742,7 @@ nm_setting_ip_config_remove_dns_search_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the DNS search domain was found and removed; FALSE if it was not.
    
+
     TRUE if the DNS search domain was found and removed; FALSE if it was not.
    
 
    Since 0.9.10
    
 
    
 
    
@@ -2639,7 +2772,7 @@ nm_setting_ip_config_clear_dns_searches
 
    
 
    
 
    nm_setting_ip_config_get_num_dns_options ()
    
-
    guint
+
    guint
 nm_setting_ip_config_get_num_dns_options
                                (NMSettingIPConfig *setting);
    
 
    
@@ -2666,7 +2799,7 @@ nm_setting_ip_config_get_num_dns_options
 
    
 
    
 
    nm_setting_ip_config_has_dns_options ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_has_dns_options (NMSettingIPConfig *setting);
    
 
    NMSettingIPConfig can have a list of dns-options. If the list
 is empty, there are two similar (but differentiated) states.
@@ -2698,7 +2831,7 @@ a default configuration, while the former explicitly means "no-options".
    
 
    nm_setting_ip_config_get_dns_option ()
    
 
    const char *
 nm_setting_ip_config_get_dns_option (NMSettingIPConfig *setting,
-                                     guint idx);
    
+                                     guint idx);
    
 
    
 
    Parameters
    
 
    
@@ -2731,10 +2864,10 @@ nm_setting_ip_config_get_dns_option (
 
    
 
    nm_setting_ip_config_next_valid_dns_option ()
    
-
    gint
+
    gint
 nm_setting_ip_config_next_valid_dns_option
                                (NMSettingIPConfig *setting,
-                                guint idx);
    
+                                guint idx);
    
 
    
 
    Parameters
    
 
    
@@ -2768,7 +2901,7 @@ DNS option, or -1 if no valid option is found
    
 
    
 
    
 
    nm_setting_ip_config_add_dns_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_add_dns_option (NMSettingIPConfig *setting,
                                      const char *dns_option);
    
 
    Adds a new DNS option to the setting.
    
@@ -2796,7 +2929,7 @@ nm_setting_ip_config_add_dns_option (
 
    
 
    Returns
    
-
     TRUE if the DNS option was added; FALSE otherwise
    
+
     TRUE if the DNS option was added; FALSE otherwise
    
 
    
 
    Since: 1.2
    
 
    
@@ -2836,7 +2969,7 @@ nm_setting_ip_config_remove_dns_option
 
    
 
    
 
    nm_setting_ip_config_remove_dns_option_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_remove_dns_option_by_value
                                (NMSettingIPConfig *setting,
                                 const char *dns_option);
    
@@ -2866,7 +2999,7 @@ nm_setting_ip_config_remove_dns_option_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the DNS option was found and removed; FALSE if it was not.
    
+
     TRUE if the DNS option was found and removed; FALSE if it was not.
    
 
    
 
    Since: 1.2
    
 
@@ -2876,7 +3009,7 @@ nm_setting_ip_config_remove_dns_option_by_value
 
    void
 nm_setting_ip_config_clear_dns_options
                                (NMSettingIPConfig *setting,
-                                gboolean is_set);
    
+                                gboolean is_set);
 
    Removes all configured DNS options.
    
 
    
 
    Parameters
    
@@ -2906,7 +3039,7 @@ Specify how to clear the options.
    
 
    
 
    
 
    nm_setting_ip_config_get_dns_priority ()
    
-
    gint
+
    gint
 nm_setting_ip_config_get_dns_priority (NMSettingIPConfig *setting);
    
 
    
 
    Parameters
    
@@ -2932,7 +3065,7 @@ nm_setting_ip_config_get_dns_priority (
 
    nm_setting_ip_config_get_num_addresses ()
    
-
    guint
+
    guint
 nm_setting_ip_config_get_num_addresses
                                (NMSettingIPConfig *setting);
    
 
    
@@ -2993,7 +3126,7 @@ nm_setting_ip_config_get_address (
 
    
 
    nm_setting_ip_config_add_address ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_add_address (NMSettingIPConfig *setting,
                                   NMIPAddress *address);
    
 
    Adds a new IP address and associated information to the setting.  The
@@ -3022,7 +3155,7 @@ given address is duplicated internally and is not changed by this function.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the address was added; FALSE if the address was already
+
     TRUE if the address was added; FALSE if the address was already
 known.
    
 
    
 
    
@@ -3060,7 +3193,7 @@ nm_setting_ip_config_remove_address (
 
    
 
    nm_setting_ip_config_remove_address_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_remove_address_by_value
                                (NMSettingIPConfig *setting,
                                 NMIPAddress *address);
    
@@ -3090,7 +3223,7 @@ nm_setting_ip_config_remove_address_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the address was found and removed; FALSE if it was not.
    
+
     TRUE if the address was found and removed; FALSE if it was not.
    
 
    
 
    
 
    
@@ -3138,13 +3271,13 @@ nm_setting_ip_config_get_gateway (
 
    Returns
    
 
     the IP address of the gateway associated with this configuration, or
-NULL.
    
+NULL.
    
 
    
 
    
 
    
 
    
 
    nm_setting_ip_config_get_num_routes ()
    
-
    guint
+
    guint
 nm_setting_ip_config_get_num_routes (NMSettingIPConfig *setting);
    
 
    
 
    Parameters
    
@@ -3204,7 +3337,7 @@ nm_setting_ip_config_get_route (
 
    
 
    nm_setting_ip_config_add_route ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_add_route (NMSettingIPConfig *setting,
                                 NMIPRoute *route);
    
 
    Adds a new route and associated information to the setting.  The
@@ -3233,7 +3366,7 @@ given route is duplicated internally and is not changed by this function.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the route was added; FALSE if the route was already known.
    
+
     TRUE if the route was added; FALSE if the route was already known.
    
 
    
 
    
 
    
@@ -3270,7 +3403,7 @@ nm_setting_ip_config_remove_route (
 
    
 
    nm_setting_ip_config_remove_route_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_remove_route_by_value
                                (NMSettingIPConfig *setting,
                                 NMIPRoute *route);
    
@@ -3300,7 +3433,7 @@ nm_setting_ip_config_remove_route_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the route was found and removed; FALSE if it was not.
    
+
     TRUE if the route was found and removed; FALSE if it was not.
    
 
    
 
    
 
    
@@ -3328,7 +3461,7 @@ nm_setting_ip_config_clear_routes (
 
    
 
    nm_setting_ip_config_get_route_metric ()
    
-
    gint64
+
    gint64
 nm_setting_ip_config_get_route_metric (NMSettingIPConfig *setting);
    
 
    Returns the value contained in the “route-metric”
 property.
    
@@ -3356,7 +3489,7 @@ specify a metric. See 
 
    nm_setting_ip_config_get_ignore_auto_routes ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_get_ignore_auto_routes
                                (NMSettingIPConfig *setting);
    
 
    Returns the value contained in the “ignore-auto-routes”
@@ -3378,14 +3511,14 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if automatically configured (ie via DHCP) routes should be
+
     TRUE if automatically configured (ie via DHCP) routes should be
 ignored.
    
 
    
 
 
    
 
    
 
    nm_setting_ip_config_get_ignore_auto_dns ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_get_ignore_auto_dns
                                (NMSettingIPConfig *setting);
    
 
    Returns the value contained in the “ignore-auto-dns”
@@ -3407,7 +3540,7 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if automatically configured (ie via DHCP) DNS information
+
     TRUE if automatically configured (ie via DHCP) DNS information
 should be ignored.
    
 
    
 
@@ -3442,7 +3575,7 @@ property.
    
 
    
 
    
 
    nm_setting_ip_config_get_dhcp_send_hostname ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_get_dhcp_send_hostname
                                (NMSettingIPConfig *setting);
    
 
    Returns the value contained in the “dhcp-send-hostname”
@@ -3464,7 +3597,7 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if NetworkManager should send the machine hostname to the
+
     TRUE if NetworkManager should send the machine hostname to the
 DHCP server when requesting addresses to allow the server to automatically
 update DNS information for this machine.
    
 
    
@@ -3472,7 +3605,7 @@ update DNS information for this machine.
    
 
    
 
    
 
    nm_setting_ip_config_get_never_default ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_get_never_default
                                (NMSettingIPConfig *setting);
    
 
    Returns the value contained in the “never-default”
@@ -3494,14 +3627,14 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if this connection should never be the default
+
     TRUE if this connection should never be the default
 connection
    
 
    
 
 
    
 
    
 
    nm_setting_ip_config_get_may_fail ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_config_get_may_fail (NMSettingIPConfig *setting);
    
 
    Returns the value contained in the “may-fail”
 property.
    
@@ -3522,14 +3655,14 @@ property.
    
 
    
 
    
 
    Returns
    
-
     TRUE if this connection doesn't require this type of IP
+
     TRUE if this connection doesn't require this type of IP
 addressing to complete for the connection to succeed.
    
 
    
 
 
    
 
    
 
    nm_setting_ip_config_get_dad_timeout ()
    
-
    gint
+
    gint
 nm_setting_ip_config_get_dad_timeout (NMSettingIPConfig *setting);
    
 
    
 
    Parameters
    
@@ -3555,7 +3688,7 @@ nm_setting_ip_config_get_dad_timeout (
 
    nm_setting_ip_config_get_dhcp_timeout ()
    
-
    gint
+
    gint
 nm_setting_ip_config_get_dhcp_timeout (NMSettingIPConfig *setting);
    
 
    Returns the value contained in the “dhcp-timeout”
 property.
    
@@ -3585,6 +3718,84 @@ the particular kind of device.
    
 
    
 
    Types and Values
    
 
    
+
    NM_IP_ROUTE_ATTRIBUTE_SRC
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_SRC            "src"
+
    
+
    
+
    
+
    
+
    NM_IP_ROUTE_ATTRIBUTE_FROM
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_FROM           "from"
+
    
+
    
+
    
+
    
+
    NM_IP_ROUTE_ATTRIBUTE_TOS
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_TOS            "tos"
+
    
+
    
+
    
+
    
+
    NM_IP_ROUTE_ATTRIBUTE_WINDOW
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_WINDOW         "window"
+
    
+
    
+
    
+
    
+
    NM_IP_ROUTE_ATTRIBUTE_CWND
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_CWND           "cwnd"
+
    
+
    
+
    
+
    
+
    NM_IP_ROUTE_ATTRIBUTE_INITCWND
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_INITCWND       "initcwnd"
+
    
+
    
+
    
+
    
+
    NM_IP_ROUTE_ATTRIBUTE_INITRWND
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_INITRWND       "initrwnd"
+
    
+
    
+
    
+
    
+
    NM_IP_ROUTE_ATTRIBUTE_MTU
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_MTU            "mtu"
+
    
+
    
+
    
+
    
+
    NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW    "lock-window"
+
    
+
    
+
    
+
    
+
    NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND      "lock-cwnd"
+
    
+
    
+
    
+
    
+
    NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND  "lock-initcwnd"
+
    
+
    
+
    
+
    
+
    NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND  "lock-initrwnd"
+
    
+
    
+
    
+
    
+
    NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU
    
+
    #define NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU       "lock-mtu"
+
    
+
    
+
    
+
    
 
    NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX
    
 
    #define NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX     30000
 
    
@@ -3791,7 +4002,7 @@ the particular kind of device.
    
 
    Property Details
    
 
    
 
    The “addresses” property
    
-
      “addresses”                GPtrArray *
    
+
      “addresses”                GPtrArray *
    
 
    Array of IP addresses.
    
 
    Element-Type: NMIPAddress
    
 
    Flags: Read / Write
    
@@ -3799,7 +4010,7 @@ the particular kind of device.
    
 
    
 
    
 
    The “dad-timeout” property
    
-
      “dad-timeout”              gint
    
+
      “dad-timeout”              gint
    
 
    Timeout in milliseconds used to check for the presence of duplicate IP
 addresses on the network.  If an address conflict is detected, the
 activation will fail.  A zero value means that no duplicate address
@@ -3814,8 +4025,8 @@ timeout in milliseconds.
    
 
    
 
    
 
    The “dhcp-hostname” property
    
-
      “dhcp-hostname”            gchar *
    
-
    If the “dhcp-send-hostname” property is TRUE, then the
+
      “dhcp-hostname”            gchar *
    
+
    If the “dhcp-send-hostname” property is TRUE, then the
 specified name will be sent to the DHCP server when acquiring a lease.
 This property and “dhcp-fqdn” are mutually exclusive and
 cannot be set at the same time.
    
@@ -3825,19 +4036,19 @@ cannot be set at the same time.
    
 
    
 
    
 
    The “dhcp-send-hostname” property
    
-
      “dhcp-send-hostname”       gboolean
    
-
    If TRUE, a hostname is sent to the DHCP server when acquiring a lease.
+
      “dhcp-send-hostname”       gboolean
    
+
    If TRUE, a hostname is sent to the DHCP server when acquiring a lease.
 Some DHCP servers use this hostname to update DNS databases, essentially
 providing a static hostname for the computer.  If the
-“dhcp-hostname” property is NULL and this property is
-TRUE, the current persistent hostname of the computer is sent.
    
+“dhcp-hostname” property is NULL and this property is
+TRUE, the current persistent hostname of the computer is sent.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: TRUE
    
 
    
 
    
 
    
 
    The “dhcp-timeout” property
    
-
      “dhcp-timeout”             gint
    
+
      “dhcp-timeout”             gint
    
 
    A timeout for a DHCP transaction in seconds.
    
 
    Flags: Read / Write
    
 
    Allowed values: >= 0
    
@@ -3846,16 +4057,16 @@ providing a static hostname for the computer.  If the
 
    
 
    
 
    The “dns” property
    
-
      “dns”                      GStrv
    
+
      “dns”                      GStrv
    
 
    Array of IP addresses of DNS servers.
    
 
    Flags: Read / Write
    
 
    
 
    
 
    
 
    The “dns-options” property
    
-
      “dns-options”              GStrv
    
+
      “dns-options”              GStrv
    
 
    Array of DNS options as described in man 5 resolv.conf.
    
-
    NULL means that the options are unset and left at the default.
+
    NULL means that the options are unset and left at the default.
 In this case NetworkManager will use default options. This is
 distinct from an empty list of properties.
    
 
    Flags: Read / Write
    
@@ -3864,7 +4075,7 @@ distinct from an empty list of properties.
    
 
    
 
    
 
    The “dns-priority” property
    
-
      “dns-priority”             gint
    
+
      “dns-priority”             gint
    
 
    Intra-connection DNS priority.
    
 
    The relative priority to be used when determining the order of DNS
 servers in resolv.conf.  A lower value means that servers will be on top
@@ -3888,14 +4099,14 @@ value will be used.
    
 
    
 
    
 
    The “dns-search” property
    
-
      “dns-search”               GStrv
    
+
      “dns-search”               GStrv
    
 
    Array of DNS search domains.
    
 
    Flags: Read / Write
    
 
    
 
    
 
    
 
    The “gateway” property
    
-
      “gateway”                  gchar *
    
+
      “gateway”                  gchar *
    
 
    The gateway associated with this configuration. This is only meaningful
 if “addresses” is also set.
    
 
    Flags: Read / Write
    
@@ -3904,9 +4115,9 @@ if 
 
    
 
    The “ignore-auto-dns” property
    
-
      “ignore-auto-dns”          gboolean
    
+
      “ignore-auto-dns”          gboolean
    
 
    When “method” is set to "auto" and this property to
-TRUE, automatically configured nameservers and search domains are
+TRUE, automatically configured nameservers and search domains are
 ignored and only nameservers and search domains specified in the
 “dns” and “dns-search” properties, if
 any, are used.
    
@@ -3916,9 +4127,9 @@ any, are used.
    
 
    
 
    
 
    The “ignore-auto-routes” property
    
-
      “ignore-auto-routes”       gboolean
    
+
      “ignore-auto-routes”       gboolean
    
 
    When “method” is set to "auto" and this property to
-TRUE, automatically configured routes are ignored and only routes
+TRUE, automatically configured routes are ignored and only routes
 specified in the “routes” property, if any, are used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
@@ -3926,12 +4137,12 @@ specified in the 
 
    The “may-fail” property
    
-
      “may-fail”                 gboolean
    
-
    If TRUE, allow overall network configuration to proceed even if the
+
      “may-fail”                 gboolean
    
+
    If TRUE, allow overall network configuration to proceed even if the
 configuration specified by this property times out.  Note that at least
 one IP configuration must succeed or overall network configuration will
 still fail.  For example, in IPv6-only networks, setting this property to
-TRUE on the NMSettingIP4Config allows the overall network configuration
+TRUE on the NMSettingIP4Config allows the overall network configuration
 to succeed if IPv4 configuration fails but IPv6 configuration completes
 successfully.
    
 
    Flags: Read / Write / Construct
    
@@ -3940,7 +4151,7 @@ successfully.
    
 
    
 
    
 
    The “method” property
    
-
      “method”                   gchar *
    
+
      “method”                   gchar *
    
 
    IP configuration method.
    
 
    NMSettingIP4Config and NMSettingIP6Config both support "auto",
 "manual", and "link-local". See the subclass-specific documentation for
@@ -3960,8 +4171,8 @@ manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
    
 
    
 
    
 
    The “never-default” property
    
-
      “never-default”            gboolean
    
-
    If TRUE, this connection will never be the default connection for this
+
      “never-default”            gboolean
    
+
    If TRUE, this connection will never be the default connection for this
 IP type, meaning it will never be assigned the default route by
 NetworkManager.
    
 
    Flags: Read / Write / Construct
    
@@ -3970,7 +4181,7 @@ NetworkManager.
    
 
    
 
    
 
    The “route-metric” property
    
-
      “route-metric”             gint64
    
+
      “route-metric”             gint64
    
 
    The default metric for routes that don't explicitly specify a metric.
 The default value -1 means that the metric is choosen automatically
 based on the device type.
@@ -3988,7 +4199,7 @@ For IPv4, zero is a regular value for the metric.
    
 
    
 
    
 
    The “routes” property
    
-
      “routes”                   GPtrArray *
    
+
      “routes”                   GPtrArray *
    
 
    Array of IP routes.
    
 
    Element-Type: NMIPRoute
    
 
    Flags: Read / Write
    
diff --git a/docs/libnm/html/NMSettingIPTunnel.html b/docs/libnm/html/NMSettingIPTunnel.html
index 26f54ddd..70663b57 100644
--- a/docs/libnm/html/NMSettingIPTunnel.html
+++ b/docs/libnm/html/NMSettingIPTunnel.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
    
-
+
    Home
 Up
 PrevNextNext
 
    
 
    
 
    
@@ -80,7 +80,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_ip_tunnel_get_ttl ()
@@ -88,7 +88,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_ip_tunnel_get_tos ()
@@ -96,7 +96,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ip_tunnel_get_path_mtu_discovery ()
@@ -118,7 +118,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_ip_tunnel_get_encapsulation_limit ()
@@ -126,7 +126,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_ip_tunnel_get_flow_label ()
@@ -134,7 +134,7 @@
 
 
 
-guint
+guint
 
 
 nm_setting_ip_tunnel_get_mtu ()
@@ -153,67 +153,67 @@
 
 
 
-guint
+guint
 encapsulation-limit
 Read / Write / Construct
 
 
-guint
+guint
 flow-label
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 input-key
 Read / Write
 
 
 
-gchar *
+gchar *
 local
 Read / Write
 
 
-guint
+guint
 mode
 Read / Write
 
 
-guint
+guint
 mtu
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 output-key
 Read / Write
 
 
 
-gchar *
+gchar *
 parent
 Read / Write
 
 
-gboolean
+gboolean
 path-mtu-discovery
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 remote
 Read / Write
 
 
-guint
+guint
 tos
 Read / Write / Construct
 
 
-guint
+guint
 ttl
 Read / Write / Construct
 
@@ -289,7 +289,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingIPTunnel
 
    
@@ -422,7 +422,7 @@ nm_setting_ip_tunnel_get_remote (
 
    
 
    nm_setting_ip_tunnel_get_ttl ()
    
-
    guint
+
    guint
 nm_setting_ip_tunnel_get_ttl (NMSettingIPTunnel *setting);
    
 
    Returns the “ttl” property of the setting.
    
 
    
@@ -449,7 +449,7 @@ nm_setting_ip_tunnel_get_ttl (
 
    nm_setting_ip_tunnel_get_tos ()
    
-
    guint
+
    guint
 nm_setting_ip_tunnel_get_tos (NMSettingIPTunnel *setting);
    
 
    Returns the “tos” property of the setting.
    
 
    
@@ -476,7 +476,7 @@ nm_setting_ip_tunnel_get_tos (
 
    nm_setting_ip_tunnel_get_path_mtu_discovery ()
    
-
    gboolean
+
    gboolean
 nm_setting_ip_tunnel_get_path_mtu_discovery
                                (NMSettingIPTunnel *setting);
    
 
    Returns the “path-mtu-discovery” property of the setting.
    
@@ -558,7 +558,7 @@ nm_setting_ip_tunnel_get_output_key (
 
    
 
    nm_setting_ip_tunnel_get_encapsulation_limit ()
    
-
    guint
+
    guint
 nm_setting_ip_tunnel_get_encapsulation_limit
                                (NMSettingIPTunnel *setting);
    
 
    Returns the “encapsulation-limit” property of the setting.
    
@@ -586,7 +586,7 @@ nm_setting_ip_tunnel_get_encapsulation_limit
 
    
 
    
 
    nm_setting_ip_tunnel_get_flow_label ()
    
-
    guint
+
    guint
 nm_setting_ip_tunnel_get_flow_label (NMSettingIPTunnel *setting);
    
 
    Returns the “flow-label” property of the setting.
    
 
    
@@ -613,7 +613,7 @@ nm_setting_ip_tunnel_get_flow_label (
 
    
 
    nm_setting_ip_tunnel_get_mtu ()
    
-
    guint
+
    guint
 nm_setting_ip_tunnel_get_mtu (NMSettingIPTunnel *setting);
    
 
    Returns the “mtu” property of the setting.
    
 
    
@@ -721,13 +721,14 @@ nm_setting_ip_tunnel_get_mtu (
 
    NMSettingIPTunnel
    
 
    typedef struct _NMSettingIPTunnel NMSettingIPTunnel;
    
+
    IP Tunneling Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “encapsulation-limit” property
    
-
      “encapsulation-limit”      guint
    
+
      “encapsulation-limit”      guint
    
 
    How many additional levels of encapsulation are permitted to be prepended
 to packets. This property applies only to IPv6 tunnels.
    
 
    Flags: Read / Write / Construct
    
@@ -738,7 +739,7 @@ to packets. This property applies only to IPv6 tunnels.
    
 
    
 
    
 
    The “flow-label” property
    
-
      “flow-label”               guint
    
+
      “flow-label”               guint
    
 
    The flow label to assign to tunnel packets. This property applies only to
 IPv6 tunnels.
    
 
    Flags: Read / Write / Construct
    
@@ -749,7 +750,7 @@ IPv6 tunnels.
    
 
    
 
    
 
    The “input-key” property
    
-
      “input-key”                gchar *
    
+
      “input-key”                gchar *
    
 
    The key used for tunnel input packets; the property is valid only for
 certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
    
 
    Flags: Read / Write
    
@@ -759,7 +760,7 @@ certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
    
 
    
 
    
 
    The “local” property
    
-
      “local”                    gchar *
    
+
      “local”                    gchar *
    
 
    The local endpoint of the tunnel; the value can be empty, otherwise it
 must contain an IPv4 or IPv6 address.
    
 
    Flags: Read / Write
    
@@ -769,7 +770,7 @@ must contain an IPv4 or IPv6 address.
    
 
    
 
    
 
    The “mode” property
    
-
      “mode”                     guint
    
+
      “mode”                     guint
    
 
    The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP or
 NM_IP_TUNNEL_MODE_GRE.
    
 
    Flags: Read / Write
    
@@ -779,14 +780,14 @@ must contain an IPv4 or IPv6 address.
    
 
    
 
    
 
    The “mtu” property
    
-
      “mtu”                      guint
    
+
      “mtu”                      guint
    
 
    Flags: Read / Write / Construct
    
 
    Default value: 0
    
 
    
 
    
 
    
 
    The “output-key” property
    
-
      “output-key”               gchar *
    
+
      “output-key”               gchar *
    
 
    The key used for tunnel output packets; the property is valid only for
 certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
    
 
    Flags: Read / Write
    
@@ -796,7 +797,7 @@ certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
    
 
    
 
    
 
    The “parent” property
    
-
      “parent”                   gchar *
    
+
      “parent”                   gchar *
    
 
    If given, specifies the parent interface name or parent connection UUID
 the new device will be bound to so that tunneled packets will only be
 routed via that interface.
    
@@ -807,7 +808,7 @@ routed via that interface.
    
 
    
 
    
 
    The “path-mtu-discovery” property
    
-
      “path-mtu-discovery”       gboolean
    
+
      “path-mtu-discovery”       gboolean
    
 
    Whether to enable Path MTU Discovery on this tunnel.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: TRUE
    
@@ -816,7 +817,7 @@ routed via that interface.
    
 
    
 
    
 
    The “remote” property
    
-
      “remote”                   gchar *
    
+
      “remote”                   gchar *
    
 
    The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6
 address.
    
 
    Flags: Read / Write
    
@@ -826,7 +827,7 @@ address.
    
 
    
 
    
 
    The “tos” property
    
-
      “tos”                      guint
    
+
      “tos”                      guint
    
 
    The type of service (IPv4) or traffic class (IPv6) field to be set on
 tunneled packets.
    
 
    Flags: Read / Write / Construct
    
@@ -837,7 +838,7 @@ tunneled packets.
    
 
    
 
    
 
    The “ttl” property
    
-
      “ttl”                      guint
    
+
      “ttl”                      guint
    
 
    The TTL to assign to tunneled packets. 0 is a special value meaning that
 packets inherit the TTL value.
    
 
    Flags: Read / Write / Construct
    
diff --git a/docs/libnm/html/NMSettingInfiniband.html b/docs/libnm/html/NMSettingInfiniband.html
index 94f9a678..13c0751a 100644
--- a/docs/libnm/html/NMSettingInfiniband.html
+++ b/docs/libnm/html/NMSettingInfiniband.html
@@ -58,7 +58,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_infiniband_get_mtu ()
@@ -107,29 +107,29 @@
 
 
 
-gchar *
+gchar *
 mac-address
 Read / Write
 
 
-guint
+guint
 mtu
 Read / Write / Construct
 
 
-gint
+gint
 p-key
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 parent
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 transport-mode
 Read / Write / Construct
 
@@ -177,7 +177,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingInfiniband
 
    
@@ -228,7 +228,7 @@ nm_setting_infiniband_get_mac_address (
 
    nm_setting_infiniband_get_mtu ()
    
-
    guint32
+
    guint32
 nm_setting_infiniband_get_mtu (NMSettingInfiniband *setting);
    
 
    
 
    Parameters
    
@@ -340,7 +340,7 @@ nm_setting_infiniband_get_virtual_interface_name
                                (NMSettingInfiniband *setting);
    
 
    Returns the interface name created by combining “parent”
 and “p-key”. (If either property is unset, this will
-return NULL.)
    
+return NULL.)
    
 
    
 
    Parameters
    
 
    
@@ -358,7 +358,7 @@ return 
 
    
 
    Returns
    
-
     the interface name, or NULL
    
+
     the interface name, or NULL
    
 
    
@@ -403,13 +403,14 @@ return 
 
    NMSettingInfiniband
    typedef struct _NMSettingInfiniband NMSettingInfiniband;
    
+
    Infiniband Settings
    
 
    Property Details
    
 
    
 
    The “mac-address” property
    
-
      “mac-address”              gchar *
    
+
      “mac-address”              gchar *
    
 
    If specified, this connection will only apply to the IPoIB device whose
 permanent MAC address matches. This property does not change the MAC
 address of the device (i.e. MAC spoofing).
    
@@ -419,7 +420,7 @@ address of the device (i.e. MAC spoofing).
    
 
    
 
    
 
    The “mtu” property
    
-
      “mtu”                      guint
    
+
      “mtu”                      guint
    
 
    If non-zero, only transmit packets of the specified size or smaller,
 breaking larger packets up into multiple frames.
    
 
    Flags: Read / Write / Construct
    
@@ -428,7 +429,7 @@ breaking larger packets up into multiple frames.
    
 
    
 
    
 
    The “p-key” property
    
-
      “p-key”                    gint
    
+
      “p-key”                    gint
    
 
    The InfiniBand P_Key to use for this device. A value of -1 means to use
 the default P_Key (aka "the P_Key at index 0").  Otherwise it is a 16-bit
 unsigned integer, whose high bit is set if it is a "full membership"
@@ -440,8 +441,8 @@ P_Key.
    
 
    
 
    
 
    The “parent” property
    
-
      “parent”                   gchar *
    
-
    The interface name of the parent device of this device. Normally NULL,
+
      “parent”                   gchar *
    
+
    The interface name of the parent device of this device. Normally NULL,
 but if the “p_key” property is set, then you must
 specify the base device by setting either this property or
 “mac-address”.
    
@@ -451,7 +452,7 @@ specify the base device by setting either this property or
 
    
 
    
 
    The “transport-mode” property
    
-
      “transport-mode”           gchar *
    
+
      “transport-mode”           gchar *
    
 
    The IP-over-InfiniBand transport mode. Either "datagram" or
 "connected".
    
 
    Flags: Read / Write / Construct
    
diff --git a/docs/libnm/html/NMSettingMacsec.html b/docs/libnm/html/NMSettingMacsec.html
new file mode 100644
index 00000000..e0c7b741
--- /dev/null
+++ b/docs/libnm/html/NMSettingMacsec.html
@@ -0,0 +1,710 @@
+
+
+
+
+NMSettingMacsec: libnm Reference Manual
+
+
+
+
+
+
+
+
+
+
    
 
 
 
 
 
 
    
+
+
+
+
+
+
+
    
+
    
+
    
+
+
+
    
+
    NMSettingMacsec
    
+
    NMSettingMacsec — Describes connection properties for MACSEC interfaces
    
+
    
+
    
+
    Functions
    
+
    
++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    



    
+NMSetting *
+
+nm_setting_macsec_new ()
+
    const char *
+
+nm_setting_macsec_get_parent ()
+
    
+NMSettingMacsecMode
+
+nm_setting_macsec_get_mode ()
+
    
+gboolean
+
+nm_setting_macsec_get_encrypt ()
+
    const char *
+
+nm_setting_macsec_get_mka_cak ()
+
    
+NMSettingSecretFlags
+
+nm_setting_macsec_get_mka_cak_flags ()
+
    const char *
+
+nm_setting_macsec_get_mka_ckn ()
+
    
+int
+
+nm_setting_macsec_get_port ()
+
    
+NMSettingMacsecValidation
+
+nm_setting_macsec_get_validation ()
+
    
+
    
+
    
+
    Properties
    
+
    
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    




    gbooleanencryptRead / Write / Construct
    
+gchar *mka-cakRead / Write / Construct
    NMSettingSecretFlagsmka-cak-flagsRead / Write
    
+gchar *mka-cknRead / Write / Construct
    gintmodeRead / Write / Construct
    
+gchar *parentRead / Write / Construct
    gintportRead / Write / Construct
    gintvalidationRead / Write / Construct
    
+
    
+
    
+
    Types and Values
    
+
    
++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    



    #defineNM_SETTING_MACSEC_SETTING_NAME
    #defineNM_SETTING_MACSEC_PARENT
    #defineNM_SETTING_MACSEC_MODE
    #defineNM_SETTING_MACSEC_ENCRYPT
    #defineNM_SETTING_MACSEC_MKA_CAK
    #defineNM_SETTING_MACSEC_MKA_CAK_FLAGS
    #defineNM_SETTING_MACSEC_MKA_CKN
    #defineNM_SETTING_MACSEC_PORT
    #defineNM_SETTING_MACSEC_VALIDATION
     NMSettingMacsec
    enumNMSettingMacsecMode
    enumNMSettingMacsecValidation
    #defineNM_SETTING_MACSEC_MKA_CAK_LENGTH
    #defineNM_SETTING_MACSEC_MKA_CKN_LENGTH
    
+
    
+
    
+
    Object Hierarchy
    
+
        GEnum
+    ├── NMSettingMacsecMode
+    ╰── NMSettingMacsecValidation
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingMacsec
+
    
+
    
+
    
+
    Description
    
+
    The NMSettingMacsec object is a NMSetting subclass that describes properties
+necessary for connection to MACsec (IEEE 802.1AE) interfaces.
    
+
    
+
    
+
    Functions
    
+
    
+
    nm_setting_macsec_new ()
    
+
    NMSetting *
+nm_setting_macsec_new (void);
    
+
    Creates a new NMSettingMacsec object with default values.
    
+
    
+
    Returns
    
+
     the new empty NMSettingMacsec object. 
    
+
    [transfer full]
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_setting_macsec_get_parent ()
    
+
    const char *
+nm_setting_macsec_get_parent (NMSettingMacsec *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the “parent” property of the setting
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_setting_macsec_get_mode ()
    
+
    NMSettingMacsecMode
+nm_setting_macsec_get_mode (NMSettingMacsec *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the “mode” property of the setting
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_setting_macsec_get_encrypt ()
    
+
    gboolean
+nm_setting_macsec_get_encrypt (NMSettingMacsec *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the “encrypt” property of the setting
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_setting_macsec_get_mka_cak ()
    
+
    const char *
+nm_setting_macsec_get_mka_cak (NMSettingMacsec *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the “mka-cak” property of the setting
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_setting_macsec_get_mka_cak_flags ()
    
+
    NMSettingSecretFlags
+nm_setting_macsec_get_mka_cak_flags (NMSettingMacsec *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the NMSettingSecretFlags pertaining to the “mka-cak”
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_setting_macsec_get_mka_ckn ()
    
+
    const char *
+nm_setting_macsec_get_mka_ckn (NMSettingMacsec *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the “mka-ckn” property of the setting
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_setting_macsec_get_port ()
    
+
    int
+nm_setting_macsec_get_port (NMSettingMacsec *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the “port” property of the setting
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    nm_setting_macsec_get_validation ()
    
+
    NMSettingMacsecValidation
+nm_setting_macsec_get_validation (NMSettingMacsec *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingMacsec
    		 
    
+
    
+
    
+
    Returns
    
+
     the “validation” property of the setting
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    Types and Values
    
+
    
+
    NM_SETTING_MACSEC_SETTING_NAME
    
+
    #define NM_SETTING_MACSEC_SETTING_NAME         "macsec"
+
    
+
    
+
    
+
    
+
    NM_SETTING_MACSEC_PARENT
    
+
    #define NM_SETTING_MACSEC_PARENT               "parent"
+
    
+
    
+
    
+
    
+
    NM_SETTING_MACSEC_MODE
    
+
    #define NM_SETTING_MACSEC_MODE                 "mode"
+
    
+
    
+
    
+
    
+
    NM_SETTING_MACSEC_ENCRYPT
    
+
    #define NM_SETTING_MACSEC_ENCRYPT              "encrypt"
+
    
+
    
+
    
+
    
+
    NM_SETTING_MACSEC_MKA_CAK
    
+
    #define NM_SETTING_MACSEC_MKA_CAK              "mka-cak"
+
    
+
    
+
    
+
    
+
    NM_SETTING_MACSEC_MKA_CAK_FLAGS
    
+
    #define NM_SETTING_MACSEC_MKA_CAK_FLAGS        "mka-cak-flags"
+
    
+
    
+
    
+
    
+
    NM_SETTING_MACSEC_MKA_CKN
    
+
    #define NM_SETTING_MACSEC_MKA_CKN              "mka-ckn"
+
    
+
    
+
    
+
    
+
    NM_SETTING_MACSEC_PORT
    
+
    #define NM_SETTING_MACSEC_PORT                 "port"
+
    
+
    
+
    
+
    
+
    NM_SETTING_MACSEC_VALIDATION
    
+
    #define NM_SETTING_MACSEC_VALIDATION           "validation"
+
    
+
    
+
    
+
    
+
    NMSettingMacsec
    
+
    typedef struct _NMSettingMacsec NMSettingMacsec;
    
+
    MACSec Settings
    
+
    
+
    
+
    
+
    enum NMSettingMacsecMode
    
+
    NMSettingMacsecMode controls how the CAK (Connectivity Association Key) used
+in MKA (MACsec Key Agreement) is obtained.
    
+
    
+
    Members
    
+
    
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
    




    NM_SETTING_MACSEC_MODE_PSK
    		
+
    The CAK is pre-shared
    
+    		 
    NM_SETTING_MACSEC_MODE_EAP
    		
+
    The CAK is the result of participation in EAP
    
+    		 
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    enum NMSettingMacsecValidation
    
+
    NMSettingMacsecValidation specifies a validation mode for incoming frames.
    
+
    
+
    Members
    
+
    
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    




    NM_SETTING_MACSEC_VALIDATION_DISABLE
    		
+
    All incoming frames are accepted if
+  possible
    
+    		 
    NM_SETTING_MACSEC_VALIDATION_CHECK
    		
+
    Non protected, invalid, or impossible to
+  verify frames are accepted and counted as "invalid"
    
+    		 
    NM_SETTING_MACSEC_VALIDATION_STRICT
    		
+
    Non protected, invalid, or impossible to
+  verify frames are dropped
    
+    		 
    
+
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    NM_SETTING_MACSEC_MKA_CAK_LENGTH
    
+
    #define NM_SETTING_MACSEC_MKA_CAK_LENGTH     32
+
    
+
    
+
    
+
    
+
    NM_SETTING_MACSEC_MKA_CKN_LENGTH
    
+
    #define NM_SETTING_MACSEC_MKA_CKN_LENGTH     64
+
    
+
    
+
    
+
    
+
    Property Details
    
+
    
+
    The “encrypt” property
    
+
      “encrypt”                  gboolean
    
+
    Whether the transmitted traffic must be encrypted.
    
+
    Flags: Read / Write / Construct
    
+
    Default value: TRUE
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “mka-cak” property
    
+
      “mka-cak”                  gchar *
    
+
    The pre-shared CAK (Connectivity Association Key) for MACsec
+Key Agreement.
    
+
    Flags: Read / Write / Construct
    
+
    Default value: NULL
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “mka-cak-flags” property
    
+
      “mka-cak-flags”            NMSettingSecretFlags
    
+
    Flags indicating how to handle the “mka-cak”
+property.
    
+
    Flags: Read / Write
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “mka-ckn” property
    
+
      “mka-ckn”                  gchar *
    
+
    The pre-shared CKN (Connectivity-association Key Name) for
+MACsec Key Agreement.
    
+
    Flags: Read / Write / Construct
    
+
    Default value: NULL
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “mode” property
    
+
      “mode”                     gint
    
+
    Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key
+Agreement) is obtained.
    
+
    Flags: Read / Write / Construct
    
+
    Default value: 0
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “parent” property
    
+
      “parent”                   gchar *
    
+
    If given, specifies the parent interface name or parent connection UUID
+from which this MACSEC interface should be created.  If this property is
+not specified, the connection must contain an NMSettingWired setting
+with a “mac-address” property.
    
+
    Flags: Read / Write / Construct
    
+
    Default value: NULL
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “port” property
    
+
      “port”                     gint
    
+
    The port component of the SCI (Secure Channel Identifier), between 1 and 65534.
    
+
    Flags: Read / Write / Construct
    
+
    Allowed values: [1,65534]
    
+
    Default value: 1
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    The “validation” property
    
+
      “validation”               gint
    
+
    Specifies the validation mode for incoming frames.
    
+
    Flags: Read / Write / Construct
    
+
    Default value: 2
    
+
    Since: 1.6
    
+
    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingMacvlan.html b/docs/libnm/html/NMSettingMacvlan.html
index 8794cad9..dd995d47 100644
--- a/docs/libnm/html/NMSettingMacvlan.html
+++ b/docs/libnm/html/NMSettingMacvlan.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -21,7 +21,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 
    
@@ -66,7 +66,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_macvlan_get_promiscuous ()
@@ -74,7 +74,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_macvlan_get_tap ()
@@ -93,23 +93,23 @@
 
 
 
-guint
+guint
 mode
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 parent
 Read / Write / Construct
 
 
-gboolean
+gboolean
 promiscuous
 Read / Write / Construct
 
 
-gboolean
+gboolean
 tap
 Read / Write / Construct
 
@@ -157,9 +157,9 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingMacvlanMode
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingMacvlan
 
    
@@ -238,7 +238,7 @@ nm_setting_macvlan_get_mode (
 
    nm_setting_macvlan_get_promiscuous ()
    
-
    gboolean
+
    gboolean
 nm_setting_macvlan_get_promiscuous (NMSettingMacvlan *setting);
    
 
    
 
    Parameters
    
@@ -264,7 +264,7 @@ nm_setting_macvlan_get_promiscuous (
 
    
 
    nm_setting_macvlan_get_tap ()
    
-
    gboolean
+
    gboolean
 nm_setting_macvlan_get_tap (NMSettingMacvlan *setting);
    
 
    
 
    Parameters
    
@@ -323,6 +323,7 @@ nm_setting_macvlan_get_tap (
 
    NMSettingMacvlan
    
 
    typedef struct _NMSettingMacvlan NMSettingMacvlan;
    
+
    MAC VLAN Settings
    
 
    
 
    
 
    
@@ -397,7 +398,7 @@ nm_setting_macvlan_get_tap (
    Property Details
    
 
    
 
    The “mode” property
    
-
      “mode”                     guint
    
+
      “mode”                     guint
    
 
    The macvlan mode, which specifies the communication mechanism between multiple
 macvlans on the same lower device.
    
 
    Flags: Read / Write / Construct
    
@@ -407,7 +408,7 @@ macvlans on the same lower device.
    
 
    
 
    
 
    The “parent” property
    
-
      “parent”                   gchar *
    
+
      “parent”                   gchar *
    
 
    If given, specifies the parent interface name or parent connection UUID
 from which this MAC-VLAN interface should be created.  If this property is
 not specified, the connection must contain an NMSettingWired setting
@@ -419,7 +420,7 @@ with a 
 
    
 
    The “promiscuous” property
    
-
      “promiscuous”              gboolean
    
+
      “promiscuous”              gboolean
    
 
    Whether the interface should be put in promiscuous mode.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: TRUE
    
@@ -428,7 +429,7 @@ with a 
 
    
 
    The “tap” property
    
-
      “tap”                      gboolean
    
+
      “tap”                      gboolean
    
 
    Whether the interface should be a MACVTAP.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
diff --git a/docs/libnm/html/NMSettingOlpcMesh.html b/docs/libnm/html/NMSettingOlpcMesh.html
index e17b3b4c..58ed5b18 100644
--- a/docs/libnm/html/NMSettingOlpcMesh.html
+++ b/docs/libnm/html/NMSettingOlpcMesh.html
@@ -51,7 +51,7 @@
 
 
 
-GBytes *
+GBytes *
 
 
 nm_setting_olpc_mesh_get_ssid ()
@@ -59,7 +59,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_olpc_mesh_get_channel ()
@@ -85,19 +85,19 @@
 
 
 
-guint
+guint
 channel
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 dhcp-anycast-address
 Read / Write
 
 
 
-GBytes *
+GBytes *
 ssid
 Read / Write
 
@@ -137,7 +137,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingOlpcMesh
 
    
@@ -162,7 +162,7 @@ nm_setting_olpc_mesh_new (void
 
    
 
    nm_setting_olpc_mesh_get_ssid ()
    
-
    GBytes *
+
    GBytes *
 nm_setting_olpc_mesh_get_ssid (NMSettingOlpcMesh *setting);
    
 
    
 
    Parameters
    
@@ -188,7 +188,7 @@ nm_setting_olpc_mesh_get_ssid (
 
    
 
    nm_setting_olpc_mesh_get_channel ()
    
-
    guint32
+
    guint32
 nm_setting_olpc_mesh_get_channel (NMSettingOlpcMesh *setting);
    
 
    
 
    
@@ -228,13 +228,14 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 
    
 
    NMSettingOlpcMesh
    
 
    typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;
    
+
    OLPC Wireless Mesh Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “channel” property
    
-
      “channel”                  guint
    
+
      “channel”                  guint
    
 
    Channel on which the mesh network to join is located.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: 0
    
@@ -242,7 +243,7 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 
    
 
    
 
    The “dhcp-anycast-address” property
    
-
      “dhcp-anycast-address”     gchar *
    
+
      “dhcp-anycast-address”     gchar *
    
 
    Anycast DHCP MAC address used when requesting an IP address via DHCP.
 The specific anycast address used determines which DHCP server class
 answers the request.
    
@@ -252,7 +253,7 @@ answers the request.
    
 
    
 
    
 
    The “ssid” property
    
-
      “ssid”                     GBytes *
    
+
      “ssid”                     GBytes *
    
 
    SSID of the mesh network to join.
    
 
    Flags: Read / Write
    
 
    
diff --git a/docs/libnm/html/NMSettingPpp.html b/docs/libnm/html/NMSettingPpp.html
index d433ea43..a0c6205b 100644
--- a/docs/libnm/html/NMSettingPpp.html
+++ b/docs/libnm/html/NMSettingPpp.html
@@ -52,7 +52,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_noauth ()
@@ -60,7 +60,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_eap ()
@@ -68,7 +68,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_pap ()
@@ -76,7 +76,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_chap ()
@@ -84,7 +84,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_mschap ()
@@ -92,7 +92,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_mschapv2 ()
@@ -100,7 +100,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_nobsdcomp ()
@@ -108,7 +108,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_nodeflate ()
@@ -116,7 +116,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_no_vj_comp ()
@@ -124,7 +124,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_require_mppe ()
@@ -132,7 +132,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_require_mppe_128 ()
@@ -140,7 +140,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_mppe_stateful ()
@@ -148,7 +148,7 @@ that require PPP to deliver IP capability
    
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_crtscts ()
@@ -156,7 +156,7 @@ that require PPP to deliver IP capability
    
 
 
 
-guint32
+guint32
 
 
 nm_setting_ppp_get_baud ()
@@ -164,7 +164,7 @@ that require PPP to deliver IP capability
    
 
 
 
-guint32
+guint32
 
 
 nm_setting_ppp_get_mru ()
@@ -172,7 +172,7 @@ that require PPP to deliver IP capability
    
 
 
 
-guint32
+guint32
 
 
 nm_setting_ppp_get_mtu ()
@@ -180,7 +180,7 @@ that require PPP to deliver IP capability
    
 
 
 
-guint32
+guint32
 
 
 nm_setting_ppp_get_lcp_echo_failure ()
@@ -188,7 +188,7 @@ that require PPP to deliver IP capability
    
 
 
 
-guint32
+guint32
 
 
 nm_setting_ppp_get_lcp_echo_interval ()
@@ -207,92 +207,92 @@ that require PPP to deliver IP capability
    
 
 
 
-guint
+guint
 baud
 Read / Write / Construct
 
 
-gboolean
+gboolean
 crtscts
 Read / Write / Construct
 
 
-guint
+guint
 lcp-echo-failure
 Read / Write / Construct
 
 
-guint
+guint
 lcp-echo-interval
 Read / Write / Construct
 
 
-gboolean
+gboolean
 mppe-stateful
 Read / Write / Construct
 
 
-guint
+guint
 mru
 Read / Write / Construct
 
 
-guint
+guint
 mtu
 Read / Write / Construct
 
 
-gboolean
+gboolean
 no-vj-comp
 Read / Write / Construct
 
 
-gboolean
+gboolean
 noauth
 Read / Write / Construct
 
 
-gboolean
+gboolean
 nobsdcomp
 Read / Write / Construct
 
 
-gboolean
+gboolean
 nodeflate
 Read / Write / Construct
 
 
-gboolean
+gboolean
 refuse-chap
 Read / Write / Construct
 
 
-gboolean
+gboolean
 refuse-eap
 Read / Write / Construct
 
 
-gboolean
+gboolean
 refuse-mschap
 Read / Write / Construct
 
 
-gboolean
+gboolean
 refuse-mschapv2
 Read / Write / Construct
 
 
-gboolean
+gboolean
 refuse-pap
 Read / Write / Construct
 
 
-gboolean
+gboolean
 require-mppe
 Read / Write / Construct
 
 
-gboolean
+gboolean
 require-mppe-128
 Read / Write / Construct
 
@@ -392,7 +392,7 @@ that require PPP to deliver IP capability
    
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingPpp
 
    
@@ -419,7 +419,7 @@ nm_setting_ppp_new (void
 
    
 
    nm_setting_ppp_get_noauth ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_noauth (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -444,7 +444,7 @@ nm_setting_ppp_get_noauth (
 
    nm_setting_ppp_get_refuse_eap ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_refuse_eap (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -469,7 +469,7 @@ nm_setting_ppp_get_refuse_eap (
 
    
 
    nm_setting_ppp_get_refuse_pap ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_refuse_pap (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -494,7 +494,7 @@ nm_setting_ppp_get_refuse_pap (
 
    
 
    nm_setting_ppp_get_refuse_chap ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_refuse_chap (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -519,7 +519,7 @@ nm_setting_ppp_get_refuse_chap (
 
    
 
    nm_setting_ppp_get_refuse_mschap ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_refuse_mschap (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -544,7 +544,7 @@ nm_setting_ppp_get_refuse_mschap (
 
    
 
    nm_setting_ppp_get_refuse_mschapv2 ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_refuse_mschapv2 (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -569,7 +569,7 @@ nm_setting_ppp_get_refuse_mschapv2 (
 
    
 
    nm_setting_ppp_get_nobsdcomp ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_nobsdcomp (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -594,7 +594,7 @@ nm_setting_ppp_get_nobsdcomp (
 
    nm_setting_ppp_get_nodeflate ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_nodeflate (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -619,7 +619,7 @@ nm_setting_ppp_get_nodeflate (
 
    nm_setting_ppp_get_no_vj_comp ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_no_vj_comp (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -644,7 +644,7 @@ nm_setting_ppp_get_no_vj_comp (
 
    
 
    nm_setting_ppp_get_require_mppe ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_require_mppe (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -669,7 +669,7 @@ nm_setting_ppp_get_require_mppe (
 
    
 
    nm_setting_ppp_get_require_mppe_128 ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_require_mppe_128 (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -694,7 +694,7 @@ nm_setting_ppp_get_require_mppe_128 (
 
    
 
    nm_setting_ppp_get_mppe_stateful ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_mppe_stateful (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -719,7 +719,7 @@ nm_setting_ppp_get_mppe_stateful (
 
    
 
    nm_setting_ppp_get_crtscts ()
    
-
    gboolean
+
    gboolean
 nm_setting_ppp_get_crtscts (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -744,7 +744,7 @@ nm_setting_ppp_get_crtscts (
 
    nm_setting_ppp_get_baud ()
    
-
    guint32
+
    guint32
 nm_setting_ppp_get_baud (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -769,7 +769,7 @@ nm_setting_ppp_get_baud (
 
    nm_setting_ppp_get_mru ()
    
-
    guint32
+
    guint32
 nm_setting_ppp_get_mru (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -794,7 +794,7 @@ nm_setting_ppp_get_mru (
 
    nm_setting_ppp_get_mtu ()
    
-
    guint32
+
    guint32
 nm_setting_ppp_get_mtu (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -819,7 +819,7 @@ nm_setting_ppp_get_mtu (
 
    nm_setting_ppp_get_lcp_echo_failure ()
    
-
    guint32
+
    guint32
 nm_setting_ppp_get_lcp_echo_failure (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -844,7 +844,7 @@ nm_setting_ppp_get_lcp_echo_failure (
 
    
 
    nm_setting_ppp_get_lcp_echo_interval ()
    
-
    guint32
+
    guint32
 nm_setting_ppp_get_lcp_echo_interval (NMSettingPpp *setting);
    
 
    
 
    Parameters
    
@@ -986,13 +986,14 @@ nm_setting_ppp_get_lcp_echo_interval (
 
    NMSettingPpp
    
 
    typedef struct _NMSettingPpp NMSettingPpp;
    
+
    Point-to-Point Protocol Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “baud” property
    
-
      “baud”                     guint
    
+
      “baud”                     guint
    
 
    If non-zero, instruct pppd to set the serial port to the specified
 baudrate.  This value should normally be left as 0 to automatically
 choose the speed.
    
@@ -1002,17 +1003,17 @@ choose the speed.
    
 
    
 
    
 
    The “crtscts” property
    
-
      “crtscts”                  gboolean
    
-
    If TRUE, specify that pppd should set the serial port to use hardware
+
      “crtscts”                  gboolean
    
+
    If TRUE, specify that pppd should set the serial port to use hardware
 flow control with RTS and CTS signals.  This value should normally be set
-to FALSE.
    
+to FALSE.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “lcp-echo-failure” property
    
-
      “lcp-echo-failure”         guint
    
+
      “lcp-echo-failure”         guint
    
 
    If non-zero, instruct pppd to presume the connection to the peer has
 failed if the specified number of LCP echo-requests go unanswered by the
 peer.  The "lcp-echo-interval" property must also be set to a non-zero
@@ -1023,7 +1024,7 @@ value if this property is used.
    
 
    
 
    
 
    The “lcp-echo-interval” property
    
-
      “lcp-echo-interval”        guint
    
+
      “lcp-echo-interval”        guint
    
 
    If non-zero, instruct pppd to send an LCP echo-request frame to the peer
 every n seconds (where n is the specified value).  Note that some PPP
 peers will respond to echo requests and some will not, and it is not
@@ -1034,8 +1035,8 @@ possible to autodetect this.
    
 
    
 
    
 
    The “mppe-stateful” property
    
-
      “mppe-stateful”            gboolean
    
-
    If TRUE, stateful MPPE is used.  See pppd documentation for more
+
      “mppe-stateful”            gboolean
    
+
    If TRUE, stateful MPPE is used.  See pppd documentation for more
 information on stateful MPPE.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
@@ -1043,7 +1044,7 @@ information on stateful MPPE.
    
 
    
 
    
 
    The “mru” property
    
-
      “mru”                      guint
    
+
      “mru”                      guint
    
 
    If non-zero, instruct pppd to request that the peer send packets no
 larger than the specified size.  If non-zero, the MRU should be between
 128 and 16384.
    
@@ -1054,7 +1055,7 @@ larger than the specified size.  If non-zero, the MRU should be between
 
    
 
    
 
    The “mtu” property
    
-
      “mtu”                      guint
    
+
      “mtu”                      guint
    
 
    If non-zero, instruct pppd to send packets no larger than the specified
 size.
    
 
    Flags: Read / Write / Construct
    
@@ -1063,82 +1064,82 @@ size.
    
 
    
 
    
 
    The “no-vj-comp” property
    
-
      “no-vj-comp”               gboolean
    
-
    If TRUE, Van Jacobsen TCP header compression will not be requested.
    
+
      “no-vj-comp”               gboolean
    
+
    If TRUE, Van Jacobsen TCP header compression will not be requested.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “noauth” property
    
-
      “noauth”                   gboolean
    
-
    If TRUE, do not require the other side (usually the PPP server) to
-authenticate itself to the client.  If FALSE, require authentication
-from the remote side.  In almost all cases, this should be TRUE.
    
+
      “noauth”                   gboolean
    
+
    If TRUE, do not require the other side (usually the PPP server) to
+authenticate itself to the client.  If FALSE, require authentication
+from the remote side.  In almost all cases, this should be TRUE.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: TRUE
    
 
    
 
    
 
    
 
    The “nobsdcomp” property
    
-
      “nobsdcomp”                gboolean
    
-
    If TRUE, BSD compression will not be requested.
    
+
      “nobsdcomp”                gboolean
    
+
    If TRUE, BSD compression will not be requested.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “nodeflate” property
    
-
      “nodeflate”                gboolean
    
-
    If TRUE, "deflate" compression will not be requested.
    
+
      “nodeflate”                gboolean
    
+
    If TRUE, "deflate" compression will not be requested.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “refuse-chap” property
    
-
      “refuse-chap”              gboolean
    
-
    If TRUE, the CHAP authentication method will not be used.
    
+
      “refuse-chap”              gboolean
    
+
    If TRUE, the CHAP authentication method will not be used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “refuse-eap” property
    
-
      “refuse-eap”               gboolean
    
-
    If TRUE, the EAP authentication method will not be used.
    
+
      “refuse-eap”               gboolean
    
+
    If TRUE, the EAP authentication method will not be used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “refuse-mschap” property
    
-
      “refuse-mschap”            gboolean
    
-
    If TRUE, the MSCHAP authentication method will not be used.
    
+
      “refuse-mschap”            gboolean
    
+
    If TRUE, the MSCHAP authentication method will not be used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “refuse-mschapv2” property
    
-
      “refuse-mschapv2”          gboolean
    
-
    If TRUE, the MSCHAPv2 authentication method will not be used.
    
+
      “refuse-mschapv2”          gboolean
    
+
    If TRUE, the MSCHAPv2 authentication method will not be used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “refuse-pap” property
    
-
      “refuse-pap”               gboolean
    
-
    If TRUE, the PAP authentication method will not be used.
    
+
      “refuse-pap”               gboolean
    
+
    If TRUE, the PAP authentication method will not be used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
 
    
 
    
 
    The “require-mppe” property
    
-
      “require-mppe”             gboolean
    
-
    If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
+
      “require-mppe”             gboolean
    
+
    If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
 the PPP session.  If either 64-bit or 128-bit MPPE is not available the
 session will fail.  Note that MPPE is not used on mobile broadband
 connections.
    
@@ -1148,10 +1149,10 @@ connections.
    
 
    
 
    
 
    The “require-mppe-128” property
    
-
      “require-mppe-128”         gboolean
    
-
    If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
+
      “require-mppe-128”         gboolean
    
+
    If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
 required for the PPP session, and the "require-mppe" property must also
-be set to TRUE.  If 128-bit MPPE is not available the session will fail.
    
+be set to TRUE.  If 128-bit MPPE is not available the session will fail.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
 
    
diff --git a/docs/libnm/html/NMSettingPppoe.html b/docs/libnm/html/NMSettingPppoe.html
index ab308f2e..31d7adfa 100644
--- a/docs/libnm/html/NMSettingPppoe.html
+++ b/docs/libnm/html/NMSettingPppoe.html
@@ -92,7 +92,7 @@
 
 
 
-gchar *
+gchar *
 password
 Read / Write
 
@@ -103,13 +103,13 @@
 
 
 
-gchar *
+gchar *
 service
 Read / Write
 
 
 
-gchar *
+gchar *
 username
 Read / Write
 
@@ -153,7 +153,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingPppoe
 
    
@@ -313,13 +313,14 @@ nm_setting_pppoe_get_password_flags (
 
    NMSettingPppoe
    
 
    typedef struct _NMSettingPppoe NMSettingPppoe;
    
+
    PPP-over-Ethernet Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “password” property
    
-
      “password”                 gchar *
    
+
      “password”                 gchar *
    
 
    Password used to authenticate with the PPPoE service.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -334,7 +335,7 @@ nm_setting_pppoe_get_password_flags (
 
    
 
    The “service” property
    
-
      “service”                  gchar *
    
+
      “service”                  gchar *
    
 
    If specified, instruct PPPoE to only initiate sessions with access
 concentrators that provide the specified service.  For most providers,
 this should be left blank.  It is only required if there are multiple
@@ -345,7 +346,7 @@ access concentrators or a specific service is known to be required.
    
 
    
 
    
 
    The “username” property
    
-
      “username”                 gchar *
    
+
      “username”                 gchar *
    
 
    Username used to authenticate with the PPPoE service.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html
index 7ff296c4..49600d00 100644
--- a/docs/libnm/html/NMSettingSerial.html
+++ b/docs/libnm/html/NMSettingSerial.html
@@ -52,7 +52,7 @@ serial communications
    
 
 
 
-guint
+guint
 
 
 nm_setting_serial_get_baud ()
@@ -60,7 +60,7 @@ serial communications
    
 
 
 
-guint
+guint
 
 
 nm_setting_serial_get_bits ()
@@ -76,7 +76,7 @@ serial communications
    
 
 
 
-guint
+guint
 
 
 nm_setting_serial_get_stopbits ()
@@ -84,7 +84,7 @@ serial communications
    
 
 
 
-guint64
+guint64
 
 
 nm_setting_serial_get_send_delay ()
@@ -103,12 +103,12 @@ serial communications
    
 
 
 
-guint
+guint
 baud
 Read / Write / Construct
 
 
-guint
+guint
 bits
 Read / Write / Construct
 
@@ -118,12 +118,12 @@ serial communications
    
 Read / Write / Construct
 
 
-guint64
+guint64
 send-delay
 Read / Write / Construct
 
 
-guint
+guint
 stopbits
 Read / Write / Construct
 
@@ -175,9 +175,9 @@ serial communications
    
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingSerialParity
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingSerial
 
    
@@ -204,7 +204,7 @@ nm_setting_serial_new (void
 
    
 
    nm_setting_serial_get_baud ()
    
-
    guint
+
    guint
 nm_setting_serial_get_baud (NMSettingSerial *setting);
    
 
    
 
    Parameters
    
@@ -229,7 +229,7 @@ nm_setting_serial_get_baud (
 
    nm_setting_serial_get_bits ()
    
-
    guint
+
    guint
 nm_setting_serial_get_bits (NMSettingSerial *setting);
    
 
    
 
    Parameters
    
@@ -279,7 +279,7 @@ nm_setting_serial_get_parity (
 
    nm_setting_serial_get_stopbits ()
    
-
    guint
+
    guint
 nm_setting_serial_get_stopbits (NMSettingSerial *setting);
    
 
    
 
    Parameters
    
@@ -304,7 +304,7 @@ nm_setting_serial_get_stopbits (
 
    
 
    nm_setting_serial_get_send_delay ()
    
-
    guint64
+
    guint64
 nm_setting_serial_get_send_delay (NMSettingSerial *setting);
    
 
    
 
    Parameters
    
@@ -406,13 +406,14 @@ nm_setting_serial_get_send_delay (
 
    NMSettingSerial
    
 
    typedef struct _NMSettingSerial NMSettingSerial;
    
+
    Serial Link Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “baud” property
    
-
      “baud”                     guint
    
+
      “baud”                     guint
    
 
    Speed to use for communication over the serial port.  Note that this
 value usually has no effect for mobile broadband modems as they generally
 ignore speed settings and use the highest available speed.
    
@@ -422,7 +423,7 @@ ignore speed settings and use the highest available speed.
    
 
    
 
    
 
    The “bits” property
    
-
      “bits”                     guint
    
+
      “bits”                     guint
    
 
    Byte-width of the serial communication. The 8 in "8n1" for example.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: [5,8]
    
@@ -439,7 +440,7 @@ ignore speed settings and use the highest available speed.
    
 
    
 
    
 
    The “send-delay” property
    
-
      “send-delay”               guint64
    
+
      “send-delay”               guint64
    
 
    Time to delay between each byte sent to the modem, in microseconds.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: 0
    
@@ -447,7 +448,7 @@ ignore speed settings and use the highest available speed.
    
 
    
 
    
 
    The “stopbits” property
    
-
      “stopbits”                 guint
    
+
      “stopbits”                 guint
    
 
    Number of stop bits for communication on the serial port.  Either 1 or 2.
 The 1 in "8n1" for example.
    
 
    Flags: Read / Write / Construct
    
diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index bfecc652..b8e1cfa2 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -69,7 +69,7 @@
 
 
 
-gchar *
+gchar *
 config
 Read / Write
 
@@ -100,7 +100,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingTeam
 
    
@@ -166,13 +166,14 @@ nm_setting_team_get_config (
 
    NMSettingTeam
    
 
    typedef struct _NMSettingTeam NMSettingTeam;
    
+
    Teaming Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “config” property
    
-
      “config”                   gchar *
    
+
      “config”                   gchar *
    
 
    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
diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html
index 36880eea..55c1580a 100644
--- a/docs/libnm/html/NMSettingTeamPort.html
+++ b/docs/libnm/html/NMSettingTeamPort.html
@@ -69,7 +69,7 @@
 
 
 
-gchar *
+gchar *
 config
 Read / Write
 
@@ -100,7 +100,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingTeamPort
 
    
@@ -166,13 +166,14 @@ nm_setting_team_port_get_config (
 
    NMSettingTeamPort
    
 
    typedef struct _NMSettingTeamPort NMSettingTeamPort;
    
+
    Team Port Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “config” property
    
-
      “config”                   gchar *
    
+
      “config”                   gchar *
    
 
    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
diff --git a/docs/libnm/html/NMSettingTun.html b/docs/libnm/html/NMSettingTun.html
index cf80c41d..85ebdcb8 100644
--- a/docs/libnm/html/NMSettingTun.html
+++ b/docs/libnm/html/NMSettingTun.html
@@ -73,7 +73,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_tun_get_pi ()
@@ -81,7 +81,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_tun_get_vnet_hdr ()
@@ -89,7 +89,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_tun_get_multi_queue ()
@@ -109,33 +109,33 @@
 
 
 
-gchar *
+gchar *
 group
 Read / Write
 
 
-guint
+guint
 mode
 Read / Write / Construct
 
 
-gboolean
+gboolean
 multi-queue
 Read / Write
 
 
 
-gchar *
+gchar *
 owner
 Read / Write
 
 
-gboolean
+gboolean
 pi
 Read / Write
 
 
-gboolean
+gboolean
 vnet-hdr
 Read / Write
 
@@ -191,9 +191,9 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingTunMode
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingTun
 
    
@@ -298,7 +298,7 @@ nm_setting_tun_get_group (
 
    nm_setting_tun_get_pi ()
    
-
    gboolean
+
    gboolean
 nm_setting_tun_get_pi (NMSettingTun *setting);
    
 
    
 
    Parameters
    
@@ -324,7 +324,7 @@ nm_setting_tun_get_pi (
 
    nm_setting_tun_get_vnet_hdr ()
    
-
    gboolean
+
    gboolean
 nm_setting_tun_get_vnet_hdr (NMSettingTun *setting);
    
 
    
 
    Parameters
    
@@ -350,7 +350,7 @@ nm_setting_tun_get_vnet_hdr (
 
    nm_setting_tun_get_multi_queue ()
    
-
    gboolean
+
    gboolean
 nm_setting_tun_get_multi_queue (NMSettingTun *setting);
    
 
    
 
    Parameters
    
@@ -459,14 +459,15 @@ nm_setting_tun_get_multi_queue (
 
    NMSettingTun
    
 
    typedef struct _NMSettingTun NMSettingTun;
    
+
    Tunnel Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “group” property
    
-
      “group”                    gchar *
    
-
    The group ID which will own the device. If set to NULL everyone
+
      “group”                    gchar *
    
+
    The group ID which will own the device. If set to NULL everyone
 will be able to use the device.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -475,7 +476,7 @@ will be able to use the device.
    
 
    
 
    
 
    The “mode” property
    
-
      “mode”                     guint
    
+
      “mode”                     guint
    
 
    The operating mode of the virtual device. Allowed values are
 NM_SETTING_TUN_MODE_TUN to create a layer 3 device and
 NM_SETTING_TUN_MODE_TAP to create an Ethernet-like layer 2
@@ -487,8 +488,8 @@ one.
    
 
    
 
    
 
    The “multi-queue” property
    
-
      “multi-queue”              gboolean
    
-
    If the property is set to TRUE, the interface will support
+
      “multi-queue”              gboolean
    
+
    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.
    
@@ -499,8 +500,8 @@ support a single queue.
    
 
    
 
    
 
    The “owner” property
    
-
      “owner”                    gchar *
    
-
    The user ID which will own the device. If set to NULL everyone
+
      “owner”                    gchar *
    
+
    The user ID which will own the device. If set to NULL everyone
 will be able to use the device.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
@@ -509,8 +510,8 @@ will be able to use the device.
    
 
    
 
    
 
    The “pi” property
    
-
      “pi”                       gboolean
    
-
    If TRUE the interface will prepend a 4 byte header describing the
+
      “pi”                       gboolean
    
+
    If TRUE the interface will prepend a 4 byte header describing the
 physical interface to the packets.
    
 
    Flags: Read / Write
    
 
    Default value: FALSE
    
@@ -519,8 +520,8 @@ physical interface to the packets.
    
 
    
 
    
 
    The “vnet-hdr” property
    
-
      “vnet-hdr”                 gboolean
    
-
    If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio
+
      “vnet-hdr”                 gboolean
    
+
    If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio
 network header.
    
 
    Flags: Read / Write
    
 
    Default value: FALSE
    
diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index ec8eb58b..7451a21d 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -58,7 +58,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_vlan_get_id ()
@@ -66,7 +66,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_vlan_get_flags ()
@@ -74,7 +74,7 @@
 
 
 
-gint32
+gint32
 
 
 nm_setting_vlan_get_num_priorities ()
@@ -82,7 +82,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_vlan_get_priority ()
@@ -90,7 +90,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_vlan_add_priority ()
@@ -106,7 +106,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_vlan_remove_priority_by_value ()
@@ -114,7 +114,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_vlan_remove_priority_str_by_value ()
@@ -130,7 +130,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_vlan_add_priority_str ()
@@ -149,7 +149,7 @@
 
 
 
-GStrv
+GStrv
 egress-priority-map
 Read / Write
 
@@ -159,18 +159,18 @@
 Read / Write / Construct
 
 
-guint
+guint
 id
 Read / Write / Construct
 
 
-GStrv
+GStrv
 ingress-priority-map
 Read / Write
 
 
 
-gchar *
+gchar *
 parent
 Read / Write / Construct
 
@@ -230,11 +230,11 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMVlanPriorityMap
-    GFlags
+    GFlags
     ╰── NMVlanFlags
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingVlan
 
    
@@ -285,7 +285,7 @@ nm_setting_vlan_get_parent (
 
    nm_setting_vlan_get_id ()
    
-
    guint32
+
    guint32
 nm_setting_vlan_get_id (NMSettingVlan *setting);
    
 
    
 
    Parameters
    
@@ -310,7 +310,7 @@ nm_setting_vlan_get_id (
 
    nm_setting_vlan_get_flags ()
    
-
    guint32
+
    guint32
 nm_setting_vlan_get_flags (NMSettingVlan *setting);
    
 
    
 
    Parameters
    
@@ -335,10 +335,10 @@ nm_setting_vlan_get_flags (
 
    nm_setting_vlan_get_num_priorities ()
    
-
    gint32
+
    gint32
 nm_setting_vlan_get_num_priorities (NMSettingVlan *setting,
                                     NMVlanPriorityMap map);
    
-
    Returns the number of entires in the
+
    Returns the number of entries in the
 “ingress_priority_map” or “egress_priority_map”
 properties of this setting.
    
 
    
@@ -371,12 +371,12 @@ properties of this setting.
    
 
    
 
    
 
    nm_setting_vlan_get_priority ()
    
-
    gboolean
+
    gboolean
 nm_setting_vlan_get_priority (NMSettingVlan *setting,
                               NMVlanPriorityMap map,
-                              guint32 idx,
-                              guint32 *out_from,
-                              guint32 *out_to);
    
+                              guint32 idx,
+                              guint32 *out_from,
+                              guint32 *out_to);
    
 
    Retrieve one of the entries of the “ingress_priority_map”
 or “egress_priority_map” properties of this setting.
    
 
    
@@ -418,17 +418,17 @@ or 
 
    
 
    Returns
    
-
     TRUE if a priority map was returned, FALSE if error
    
+
     TRUE if a priority map was returned, FALSE if error
    
 
    
 
    
 
    
 
    
 
    nm_setting_vlan_add_priority ()
    
-
    gboolean
+
    gboolean
 nm_setting_vlan_add_priority (NMSettingVlan *setting,
                               NMVlanPriorityMap map,
-                              guint32 from,
-                              guint32 to);
    
+                              guint32 from,
+                              guint32 to);
    
 
    Adds a priority mapping to the “ingress_priority_map” or
 “egress_priority_map” properties of the setting. If from
  is
@@ -481,8 +481,8 @@ to
    
 
    
 
    
 
    Returns
    
-
     TRUE if the new priority mapping was successfully added to the
-list, FALSE if error
    
+
     TRUE if the new priority mapping was successfully added to the
+list, FALSE if error
    
 
    
 
    
 
    
@@ -491,7 +491,7 @@ list, void
 nm_setting_vlan_remove_priority (NMSettingVlan *setting,
                                  NMVlanPriorityMap map,
-                                 guint32 idx);
    
+                                 guint32 idx);
    
 
    Removes the priority map at index idx
  from the
 “ingress_priority_map” or “egress_priority_map”
@@ -527,12 +527,12 @@ properties.
    
 
    
 
    
 
    nm_setting_vlan_remove_priority_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_vlan_remove_priority_by_value
                                (NMSettingVlan *setting,
                                 NMVlanPriorityMap map,
-                                guint32 from,
-                                guint32 to);
    
+                                guint32 from,
+                                guint32 to);
    
 
    Removes the priority map form
 :to
  from the “ingress_priority_map”
@@ -575,13 +575,13 @@ to
    
 
    
 
    
 
    Returns
    
-
     TRUE if the priority mapping was found and removed; FALSE if it was not.
    
+
     TRUE if the priority mapping was found and removed; FALSE if it was not.
    
 
    
 
    
 
    
 
    
 
    nm_setting_vlan_remove_priority_str_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_vlan_remove_priority_str_by_value
                                (NMSettingVlan *setting,
                                 NMVlanPriorityMap map,
@@ -620,7 +620,7 @@ properties.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the priority mapping was found and removed; FALSE if it was not.
    
+
     TRUE if the priority mapping was found and removed; FALSE if it was not.
    
 
    
 
    
 
    
@@ -629,7 +629,7 @@ properties.
    
 
    void
 nm_setting_vlan_clear_priorities (NMSettingVlan *setting,
                                   NMVlanPriorityMap map);
    
-
    Clear all the entires from “ingress_priority_map” or
+
    Clear all the entries from “ingress_priority_map” or
 “egress_priority_map” properties.
    
 
    
 
    Parameters
    
@@ -657,7 +657,7 @@ nm_setting_vlan_clear_priorities (
 
    
 
    nm_setting_vlan_add_priority_str ()
    
-
    gboolean
+
    gboolean
 nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
                                   NMVlanPriorityMap map,
                                   const char *str);
    
@@ -693,8 +693,8 @@ the Linux SKB priorities to 802.1p priorities.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the entry was successfully added to the list, or it
-overwrote the old value, FALSE if error
    
+
     TRUE if the entry was successfully added to the list, or it
+overwrote the old value, FALSE if error
    
 
    
 
    
 
    
@@ -739,6 +739,7 @@ overwrote the old value, 
 
    NMSettingVlan
    
 
    typedef struct _NMSettingVlan NMSettingVlan;
    
+
    VLAN Settings
    
 
    
 
    
 
    
@@ -832,7 +833,7 @@ to 802.1p priorities used in VLANs.
    
 
    Property Details
    
 
    
 
    The “egress-priority-map” property
    
-
      “egress-priority-map”      GStrv
    
+
      “egress-priority-map”      GStrv
    
 
    For outgoing packets, a list of mappings from Linux SKB priorities to
 802.1p priorities.  The mapping is given in the format "from:to" where
 both "from" and "to" are unsigned integers, ie "7:3".
    
@@ -858,7 +859,7 @@ is still considered as 0.
    
 
    
 
    
 
    The “id” property
    
-
      “id”                       guint
    
+
      “id”                       guint
    
 
    The VLAN identifier that the interface created by this connection should
 be assigned. The valid range is from 0 to 4094, without the reserved id 4095.
    
 
    Flags: Read / Write / Construct
    
@@ -868,7 +869,7 @@ be assigned. The valid range is from 0 to 4094, without the reserved id 4095.
    
 
    
 
    The “ingress-priority-map” property
    
-
      “ingress-priority-map”     GStrv
    
+
      “ingress-priority-map”     GStrv
    
 
    For incoming packets, a list of mappings from 802.1p priorities to Linux
 SKB priorities.  The mapping is given in the format "from:to" where both
 "from" and "to" are unsigned integers, ie "7:3".
    
@@ -877,7 +878,7 @@ SKB priorities.  The mapping is given in the format "from:to" where both
 
    
 
    
 
    The “parent” property
    
-
      “parent”                   gchar *
    
+
      “parent”                   gchar *
    
 
    If given, specifies the parent interface name or parent connection UUID
 from which this VLAN interface should be created.  If this property is
 not specified, the connection must contain an NMSettingWired setting
diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html
index 0a51b06a..439e24b9 100644
--- a/docs/libnm/html/NMSettingVpn.html
+++ b/docs/libnm/html/NMSettingVpn.html
@@ -73,7 +73,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_vpn_get_persistent ()
@@ -81,7 +81,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_vpn_get_num_data_items ()
@@ -104,7 +104,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_vpn_remove_data_item ()
@@ -120,7 +120,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_vpn_get_num_secrets ()
@@ -143,7 +143,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_vpn_remove_secret ()
@@ -159,7 +159,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_vpn_get_timeout ()
@@ -179,35 +179,35 @@
 
 
 
-GHashTable *
+GHashTable *
 data
 Read / Write
 
 
-gboolean
+gboolean
 persistent
 Read / Write
 
 
 
-GHashTable *
+GHashTable *
 secrets
 Read / Write
 
 
 
-gchar *
+gchar *
 service-type
 Read / Write
 
 
-guint
+guint
 timeout
 Read / Write
 
 
 
-gchar *
+gchar *
 user-name
 Read / Write
 
@@ -259,7 +259,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingVpn
 
    
@@ -281,7 +281,7 @@ properties.
    
 
    void
 (*NMVpnIterFunc) (const char *key,
                   const char *value,
-                  gpointer user_data);
    
+                  gpointer user_data);
    
 
    
 
    Parameters
    
 
    
@@ -378,7 +378,7 @@ nm_setting_vpn_get_user_name (
 
    nm_setting_vpn_get_persistent ()
    
-
    gboolean
+
    gboolean
 nm_setting_vpn_get_persistent (NMSettingVpn *setting);
    
 
    
 
    Parameters
    
@@ -403,7 +403,7 @@ nm_setting_vpn_get_persistent (
 
    
 
    nm_setting_vpn_get_num_data_items ()
    
-
    guint32
+
    guint32
 nm_setting_vpn_get_num_data_items (NMSettingVpn *setting);
    
 
    Gets number of key/value pairs of VPN configuration data.
    
 
    
@@ -506,7 +506,7 @@ by 
 
    nm_setting_vpn_remove_data_item ()
    
-
    gboolean
+
    gboolean
 nm_setting_vpn_remove_data_item (NMSettingVpn *setting,
                                  const char *key);
    
 
    Deletes a key/value relationship previously established by
@@ -535,8 +535,8 @@ nm_setting_vpn_remove_data_item (
 
    
 
    Returns
    
-
     TRUE if the data item was found and removed from the internal list,
-FALSE if it was not.
    
+
     TRUE if the data item was found and removed from the internal list,
+FALSE if it was not.
    
 
    
 
    
 
    
@@ -545,7 +545,7 @@ nm_setting_vpn_remove_data_item (void
 nm_setting_vpn_foreach_data_item (NMSettingVpn *setting,
                                   NMVpnIterFunc func,
-                                  gpointer user_data);
    
+                                  gpointer user_data);
    
 
    Iterates all data items stored in this setting.  It is safe to add, remove,
 and modify data items inside func
 , though any additions or removals made
@@ -582,7 +582,7 @@ during iteration will not be part of the iteration.
    
 
    
 
    
 
    nm_setting_vpn_get_num_secrets ()
    
-
    guint32
+
    guint32
 nm_setting_vpn_get_num_secrets (NMSettingVpn *setting);
    
 
    Gets number of VPN plugin specific secrets in the setting.
    
 
    
@@ -684,7 +684,7 @@ by 
 
    nm_setting_vpn_remove_secret ()
    
-
    gboolean
+
    gboolean
 nm_setting_vpn_remove_secret (NMSettingVpn *setting,
                               const char *key);
    
 
    Deletes a key/value relationship previously established by
@@ -713,8 +713,8 @@ nm_setting_vpn_remove_secret (
 
    Returns
    
-
     TRUE if the secret was found and removed from the internal list,
-FALSE if it was not.
    
+
     TRUE if the secret was found and removed from the internal list,
+FALSE if it was not.
    
 
    
 
    
 
    
@@ -723,7 +723,7 @@ nm_setting_vpn_remove_secret (void
 nm_setting_vpn_foreach_secret (NMSettingVpn *setting,
                                NMVpnIterFunc func,
-                               gpointer user_data);
+                               gpointer user_data);
 
    Iterates all secrets stored in this setting.  It is safe to add, remove,
 and modify secrets inside func
 , though any additions or removals made during
@@ -760,7 +760,7 @@ iteration will not be part of the iteration.
    
 
    
 
    
 
    nm_setting_vpn_get_timeout ()
    
-
    guint32
+
    guint32
 nm_setting_vpn_get_timeout (NMSettingVpn *setting);
    
 
    
 
    Parameters
    
@@ -831,13 +831,14 @@ nm_setting_vpn_get_timeout (
 
    NMSettingVpn
    
 
    typedef struct _NMSettingVpn NMSettingVpn;
    
+
    VPN Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “data” property
    
-
      “data”                     GHashTable *
    
+
      “data”                     GHashTable *
    
 
    Dictionary of key/value pairs of VPN plugin specific data.  Both keys and
 values must be strings.
    
 
    Type: GHashTable(utf8,utf8)
    
@@ -846,8 +847,8 @@ values must be strings.
    
 
    
 
    
 
    The “persistent” property
    
-
      “persistent”               gboolean
    
-
    If the VPN service supports persistence, and this property is TRUE,
+
      “persistent”               gboolean
    
+
    If the VPN service supports persistence, and this property is TRUE,
 the VPN will attempt to stay connected across link changes and outages,
 until explicitly disconnected.
    
 
    Flags: Read / Write
    
@@ -856,7 +857,7 @@ until explicitly disconnected.
    
 
    
 
    
 
    The “secrets” property
    
-
      “secrets”                  GHashTable *
    
+
      “secrets”                  GHashTable *
    
 
    Dictionary of key/value pairs of VPN plugin specific secrets like
 passwords or private keys.  Both keys and values must be strings.
    
 
    Type: GHashTable(utf8,utf8)
    
@@ -865,7 +866,7 @@ passwords or private keys.  Both keys and values must be strings.
    
 
    
 
    
 
    The “service-type” property
    
-
      “service-type”             gchar *
    
+
      “service-type”             gchar *
    
 
    D-Bus service name of the VPN plugin that this setting uses to connect to
 its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc
 plugin.
    
@@ -875,7 +876,7 @@ plugin.
    
 
    
 
    
 
    The “timeout” property
    
-
      “timeout”                  guint
    
+
      “timeout”                  guint
    
 
    Timeout for the VPN service to establish the connection. Some services
 may take quite a long time to connect.
 Value of 0 means a default timeout, which is 60 seconds (unless overriden
@@ -888,7 +889,7 @@ timeout in seconds.
    
 
    
 
    
 
    The “user-name” property
    
-
      “user-name”                gchar *
    
+
      “user-name”                gchar *
    
 
    If the VPN connection requires a user name for authentication, that name
 should be provided here.  If the connection is available to more than one
 user, and the VPN requires each user to supply a different name, then
diff --git a/docs/libnm/html/NMSettingVxlan.html b/docs/libnm/html/NMSettingVxlan.html
index ae79a96d..53f5b707 100644
--- a/docs/libnm/html/NMSettingVxlan.html
+++ b/docs/libnm/html/NMSettingVxlan.html
@@ -58,7 +58,7 @@
 
 
    
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+gchar *
 
+gchar *
 
-
+
+gchar *
 
-
+
-
+
-
+
-
+
-
+
@@ -357,7 +357,7 @@
 
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingVxlan
 
    
@@ -410,7 +410,7 @@ nm_setting_vxlan_get_parent (
 
    nm_setting_vxlan_get_id ()
    
-
    guint
+
    guint
 nm_setting_vxlan_get_id (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -488,7 +488,7 @@ nm_setting_vxlan_get_remote (
 
    nm_setting_vxlan_get_source_port_min ()
    
-
    guint
+
    guint
 nm_setting_vxlan_get_source_port_min (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -514,7 +514,7 @@ nm_setting_vxlan_get_source_port_min (
 
    nm_setting_vxlan_get_source_port_max ()
    
-
    guint
+
    guint
 nm_setting_vxlan_get_source_port_max (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -540,7 +540,7 @@ nm_setting_vxlan_get_source_port_max (
 
    nm_setting_vxlan_get_destination_port ()
    
-
    guint
+
    guint
 nm_setting_vxlan_get_destination_port (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -566,7 +566,7 @@ nm_setting_vxlan_get_destination_port (
 
    nm_setting_vxlan_get_tos ()
    
-
    guint
+
    guint
 nm_setting_vxlan_get_tos (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -592,7 +592,7 @@ nm_setting_vxlan_get_tos (
 
    nm_setting_vxlan_get_ttl ()
    
-
    guint
+
    guint
 nm_setting_vxlan_get_ttl (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -618,7 +618,7 @@ nm_setting_vxlan_get_ttl (
 
    nm_setting_vxlan_get_ageing ()
    
-
    guint
+
    guint
 nm_setting_vxlan_get_ageing (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -644,7 +644,7 @@ nm_setting_vxlan_get_ageing (
 
    nm_setting_vxlan_get_limit ()
    
-
    guint
+
    guint
 nm_setting_vxlan_get_limit (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -670,7 +670,7 @@ nm_setting_vxlan_get_limit (
 
    nm_setting_vxlan_get_proxy ()
    
-
    gboolean
+
    gboolean
 nm_setting_vxlan_get_proxy (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -696,7 +696,7 @@ nm_setting_vxlan_get_proxy (
 
    nm_setting_vxlan_get_learning ()
    
-
    gboolean
+
    gboolean
 nm_setting_vxlan_get_learning (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -722,7 +722,7 @@ nm_setting_vxlan_get_learning (
 
    
 
    nm_setting_vxlan_get_rsc ()
    
-
    gboolean
+
    gboolean
 nm_setting_vxlan_get_rsc (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -748,7 +748,7 @@ nm_setting_vxlan_get_rsc (
 
    nm_setting_vxlan_get_l2_miss ()
    
-
    gboolean
+
    gboolean
 nm_setting_vxlan_get_l2_miss (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -774,7 +774,7 @@ nm_setting_vxlan_get_l2_miss (
 
    nm_setting_vxlan_get_l3_miss ()
    
-
    gboolean
+
    gboolean
 nm_setting_vxlan_get_l3_miss (NMSettingVxlan *setting);
    
 
    
 
    Parameters
    
@@ -905,13 +905,14 @@ nm_setting_vxlan_get_l3_miss (
 
    NMSettingVxlan
    
 
    typedef struct _NMSettingVxlan NMSettingVxlan;
    
+
    VXLAN Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “ageing” property
    
-
      “ageing”                   guint
    
+
      “ageing”                   guint
    
 
    Specifies the lifetime in seconds of FDB entries learnt by the kernel.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: 300
    
@@ -920,7 +921,7 @@ nm_setting_vxlan_get_l3_miss (
 
    The “destination-port” property
    
-
      “destination-port”         guint
    
+
      “destination-port”         guint
    
 
    Specifies the UDP destination port to communicate to the remote VXLAN
 tunnel endpoint.
    
 
    Flags: Read / Write / Construct
    
@@ -931,7 +932,7 @@ tunnel endpoint.
    
 
    
 
    
 
    The “id” property
    
-
      “id”                       guint
    
+
      “id”                       guint
    
 
    Specifies the VXLAN Network Identifer (or VXLAN Segment Identifier) to
 use.
    
 
    Flags: Read / Write / Construct
    
@@ -942,7 +943,7 @@ use.
    
 
    
 
    
 
    The “l2-miss” property
    
-
      “l2-miss”                  gboolean
    
+
      “l2-miss”                  gboolean
    
 
    Specifies whether netlink LL ADDR miss notifications are generated.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
@@ -951,7 +952,7 @@ use.
    
 
    
 
    
 
    The “l3-miss” property
    
-
      “l3-miss”                  gboolean
    
+
      “l3-miss”                  gboolean
    
 
    Specifies whether netlink IP ADDR miss notifications are generated.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
@@ -960,7 +961,7 @@ use.
    
 
    
 
    
 
    The “learning” property
    
-
      “learning”                 gboolean
    
+
      “learning”                 gboolean
    
 
    Specifies whether unknown source link layer addresses and IP addresses
 are entered into the VXLAN device forwarding database.
    
 
    Flags: Read / Write / Construct
    
@@ -970,7 +971,7 @@ are entered into the VXLAN device forwarding database.
    
 
    
 
    
 
    The “limit” property
    
-
      “limit”                    guint
    
+
      “limit”                    guint
    
 
    Specifies the maximum number of FDB entries. A value of zero means that
 the kernel will store unlimited entries.
    
 
    Flags: Read / Write / Construct
    
@@ -980,7 +981,7 @@ the kernel will store unlimited entries.
    
 
    
 
    
 
    The “local” property
    
-
      “local”                    gchar *
    
+
      “local”                    gchar *
    
 
    If given, specifies the source IP address to use in outgoing packets.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: NULL
    
@@ -989,7 +990,7 @@ the kernel will store unlimited entries.
    
 
    
 
    
 
    The “parent” property
    
-
      “parent”                   gchar *
    
+
      “parent”                   gchar *
    
 
    If given, specifies the parent interface name or parent connection UUID.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: NULL
    
@@ -998,7 +999,7 @@ the kernel will store unlimited entries.
    
 
    
 
    
 
    The “proxy” property
    
-
      “proxy”                    gboolean
    
+
      “proxy”                    gboolean
    
 
    Specifies whether ARP proxy is turned on.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
@@ -1007,7 +1008,7 @@ the kernel will store unlimited entries.
    
 
    
 
    
 
    The “remote” property
    
-
      “remote”                   gchar *
    
+
      “remote”                   gchar *
    
 
    Specifies the unicast destination IP address to use in outgoing packets
 when the destination link layer address is not known in the VXLAN device
 forwarding database, or the multicast IP address to join.
    
@@ -1018,7 +1019,7 @@ forwarding database, or the multicast IP address to join.
    
 
    
 
    
 
    The “rsc” property
    
-
      “rsc”                      gboolean
    
+
      “rsc”                      gboolean
    
 
    Specifies whether route short circuit is turned on.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
@@ -1027,7 +1028,7 @@ forwarding database, or the multicast IP address to join.
    
 
    
 
    
 
    The “source-port-max” property
    
-
      “source-port-max”          guint
    
+
      “source-port-max”          guint
    
 
    Specifies the maximum UDP source port to communicate to the remote VXLAN
 tunnel endpoint.
    
 
    Flags: Read / Write / Construct
    
@@ -1038,7 +1039,7 @@ tunnel endpoint.
    
 
    
 
    
 
    The “source-port-min” property
    
-
      “source-port-min”          guint
    
+
      “source-port-min”          guint
    
 
    Specifies the minimum UDP source port to communicate to the remote VXLAN
 tunnel endpoint.
    
 
    Flags: Read / Write / Construct
    
@@ -1049,7 +1050,7 @@ tunnel endpoint.
    
 
    
 
    
 
    The “tos” property
    
-
      “tos”                      guint
    
+
      “tos”                      guint
    
 
    Specifies the TOS value to use in outgoing packets.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: <= 255
    
@@ -1059,7 +1060,7 @@ tunnel endpoint.
    
 
    
 
    
 
    The “ttl” property
    
-
      “ttl”                      guint
    
+
      “ttl”                      guint
    
 
    Specifies the time-to-live value to use in outgoing packets.
    
 
    Flags: Read / Write / Construct
    
 
    Allowed values: <= 255
    
diff --git a/docs/libnm/html/NMSettingWimax.html b/docs/libnm/html/NMSettingWimax.html
index 1c7d41b4..b3211dda 100644
--- a/docs/libnm/html/NMSettingWimax.html
+++ b/docs/libnm/html/NMSettingWimax.html
@@ -77,13 +77,13 @@
 
    
+gchar *
 
+gchar *
 
@@ -119,7 +119,7 @@
 
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSetting
         ╰── NMSettingWimax
 
    
@@ -234,13 +234,14 @@ to.
    
 
    
 
    NMSettingWimax
    
 
    typedef struct _NMSettingWimax NMSettingWimax;
    
+
    WiMax Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “mac-address” property
    
-
      “mac-address”              gchar *
    
+
      “mac-address”              gchar *
    
 
    If specified, this connection will only apply to the WiMAX device whose
 MAC address matches. This property does not change the MAC address of the
 device (known as MAC spoofing).
    
@@ -254,7 +255,7 @@ device (known as MAC spoofing).
    
 
    
 
    
 
    The “network-name” property
    
-
      “network-name”             gchar *
    
+
      “network-name”             gchar *
    
 
    Network Service Provider (NSP) name of the WiMAX network this connection
 should use.
    
 
    
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index 68eb0a3a..1866c91a 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -58,7 +58,7 @@
 
 
    
-
+
+gchar *
 
+gchar *
 
+gchar *
 
+gchar *
 
-
+
-
+
+gchar *
 
+gchar *
 
+GHashTable *
 
-
+
-
+
-
+
+gchar *
 
@@ -411,9 +411,9 @@
 
 
    
 
    Object Hierarchy
    
-
        GFlags
+
        GFlags
     ╰── NMSettingWiredWakeOnLan
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWired
 
    
@@ -464,7 +464,7 @@ nm_setting_wired_get_port (
 
    nm_setting_wired_get_speed ()
    
-
    guint32
+
    guint32
 nm_setting_wired_get_speed (NMSettingWired *setting);
    
 
    
 
    Parameters
    
@@ -514,7 +514,7 @@ nm_setting_wired_get_duplex (
 
    nm_setting_wired_get_auto_negotiate ()
    
-
    gboolean
+
    gboolean
 nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);
    
 
    
 
    Parameters
    
@@ -643,7 +643,7 @@ nm_setting_wired_get_mac_address_blacklist
 
    
 
    
 
    nm_setting_wired_get_num_mac_blacklist_items ()
    
-
    guint32
+
    guint32
 nm_setting_wired_get_num_mac_blacklist_items
                                (NMSettingWired *setting);
    
 
    
@@ -672,7 +672,7 @@ nm_setting_wired_get_num_mac_blacklist_items
 
    const char *
 nm_setting_wired_get_mac_blacklist_item
                                (NMSettingWired *setting,
-                                guint32 idx);
    
+                                guint32 idx);
    
 
    
 
    Parameters
    
 
    
 
-guint
+guint
 
 
 nm_setting_vxlan_get_id ()
@@ -80,7 +80,7 @@
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_vxlan_get_source_port_min ()
@@ -88,7 +88,7 @@
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_vxlan_get_source_port_max ()
@@ -96,7 +96,7 @@
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_vxlan_get_destination_port ()
@@ -104,7 +104,7 @@
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_vxlan_get_tos ()
@@ -112,7 +112,7 @@
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_vxlan_get_ttl ()
@@ -120,7 +120,7 @@
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_vxlan_get_ageing ()
@@ -128,7 +128,7 @@
 
    
 
    
 
-guint
+guint
 
 
 nm_setting_vxlan_get_limit ()
@@ -136,7 +136,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vxlan_get_proxy ()
@@ -144,7 +144,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vxlan_get_learning ()
@@ -152,7 +152,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vxlan_get_rsc ()
@@ -160,7 +160,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vxlan_get_l2_miss ()
@@ -168,7 +168,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_vxlan_get_l3_miss ()
@@ -187,85 +187,85 @@
 
 
    
 
    guintguint
 ageing
 Read / Write / Construct
 
    
 
    guintguint
 destination-port
 Read / Write / Construct
 
    
 
    guintguint
 id
 Read / Write / Construct
 
    
 
    gbooleangboolean
 l2-miss
 Read / Write / Construct
 
    
 
    gbooleangboolean
 l3-miss
 Read / Write / Construct
 
    
 
    gbooleangboolean
 learning
 Read / Write / Construct
 
    
 
    guintguint
 limit
 Read / Write / Construct
 
    
 
    
 
-gchar *local
 Read / Write / Construct
 
    
 
    
 
-gchar *parent
 Read / Write / Construct
 
    
 
    gbooleangboolean
 proxy
 Read / Write / Construct
 
    
 
    
 
-gchar *remote
 Read / Write / Construct
 
    
 
    gbooleangboolean
 rsc
 Read / Write / Construct
 
    
 
    guintguint
 source-port-max
 Read / Write / Construct
 
    
 
    guintguint
 source-port-min
 Read / Write / Construct
 
    
 
    guintguint
 tos
 Read / Write / Construct
 
    
 
    guintguint
 ttl
 Read / Write / Construct
 
    
 
    
 
-gchar *mac-address
 Read / Write
 
    
 
    
 
-gchar *network-name
 Read / Write
 
    
 
-guint32
+guint32
 
 
 nm_setting_wired_get_speed ()
@@ -73,7 +73,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wired_get_auto_negotiate ()
@@ -109,7 +109,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wired_get_num_mac_blacklist_items ()
@@ -124,7 +124,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wired_add_mac_blacklist_item ()
@@ -140,7 +140,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wired_remove_mac_blacklist_item_by_value ()
@@ -156,7 +156,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wired_get_mtu ()
@@ -178,7 +178,7 @@
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wired_get_num_s390_options ()
@@ -186,7 +186,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wired_get_s390_option ()
@@ -201,7 +201,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wired_add_s390_option ()
@@ -209,7 +209,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wired_remove_s390_option ()
@@ -250,80 +250,80 @@
 
 
    
 
    gbooleangboolean
 auto-negotiate
 Read / Write / Construct
 
    
 
    
 
-gchar *cloned-mac-address
 Read / Write
 
    
 
    
 
-gchar *duplex
 Read / Write
 
    
 
    
 
-gchar *generate-mac-address-mask
 Read / Write
 
    
 
    
 
-gchar *mac-address
 Read / Write
 
    
 
    GStrvGStrv
 mac-address-blacklist
 Read / Write
 
    
 
    guintguint
 mtu
 Read / Write / Construct
 
    
 
    
 
-gchar *port
 Read / Write
 
    
 
    
 
-gchar *s390-nettype
 Read / Write
 
    
 
    
 
-GHashTable *s390-options
 Read / Write
 
    
 
    GStrvGStrv
 s390-subchannels
 Read / Write
 
    
 
    guintguint
 speed
 Read / Write / Construct
 
    
 
    guintguint
 wake-on-lan
 Read / Write / Construct
 
    
 
    
 
-gchar *wake-on-lan-password
 Read / Write
 
    
@@ -705,7 +705,7 @@ at index idx
 
    
 
    
 
    nm_setting_wired_add_mac_blacklist_item ()
    
-
    gboolean
+
    gboolean
 nm_setting_wired_add_mac_blacklist_item
                                (NMSettingWired *setting,
                                 const char *mac);
    
@@ -734,7 +734,7 @@ nm_setting_wired_add_mac_blacklist_item
 
    
 
    
 
    Returns
    
-
     TRUE if the MAC address was added; FALSE if the MAC address
+
     TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present
    
 
    
 
@@ -744,7 +744,7 @@ is invalid or was already present
    
 
    void
 nm_setting_wired_remove_mac_blacklist_item
                                (NMSettingWired *setting,
-                                guint32 idx);
    
+                                guint32 idx);
 
    Removes the MAC address at index idx
  from the blacklist.
    
 
    
@@ -773,7 +773,7 @@ nm_setting_wired_remove_mac_blacklist_item
 
    
 
    
 
    nm_setting_wired_remove_mac_blacklist_item_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_wired_remove_mac_blacklist_item_by_value
                                (NMSettingWired *setting,
                                 const char *mac);
    
@@ -804,7 +804,7 @@ the blacklist
    
 
    
 
    
 
    Returns
    
-
     TRUE if the MAC address was found and removed; FALSE if it was not.
    
+
     TRUE if the MAC address was found and removed; FALSE if it was not.
    
 
    
 
    
 
    
@@ -833,7 +833,7 @@ nm_setting_wired_clear_mac_blacklist_items
 
    
 
    
 
    nm_setting_wired_get_mtu ()
    
-
    guint32
+
    guint32
 nm_setting_wired_get_mtu (NMSettingWired *setting);
    
 
    
 
    Parameters
    
@@ -915,7 +915,7 @@ of 'qeth', 'lcs', or 'ctc'.
    
 
    
 
    
 
    nm_setting_wired_get_num_s390_options ()
    
-
    guint32
+
    guint32
 nm_setting_wired_get_num_s390_options (NMSettingWired *setting);
    
 
    Returns the number of s390-specific options that should be set for this
 device when it is activated.  This can be used to retrieve each s390
@@ -943,9 +943,9 @@ option individually using 
 
    nm_setting_wired_get_s390_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_wired_get_s390_option (NMSettingWired *setting,
-                                  guint32 idx,
+                                  guint32 idx,
                                   const char **out_key,
                                   const char **out_value);
    
 
    Given an index, return the value of the s390 option at that index.  indexes
@@ -991,8 +991,8 @@ modified. 
    
 
    
 
    
 
    Returns
    
-
     TRUE on success if the index was valid and an option was found,
-FALSE if the index was invalid (ie, greater than the number of options
+
     TRUE on success if the index was valid and an option was found,
+FALSE if the index was invalid (ie, greater than the number of options
 currently held by the setting)
    
 
    
 
    
@@ -1030,14 +1030,14 @@ nm_setting_wired_get_s390_option_by_key
 
    
 
    
 
    Returns
    
-
     the value, or NULL if the key/value pair was never added to the
+
     the value, or NULL if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified
    
 
    
 
 
    
 
    
 
    nm_setting_wired_add_s390_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_wired_add_s390_option (NMSettingWired *setting,
                                   const char *key,
                                   const char *value);
    
@@ -1074,14 +1074,14 @@ may already exist.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the option was valid and was added to the internal option
-list, FALSE if it was not.
    
+
     TRUE if the option was valid and was added to the internal option
+list, FALSE if it was not.
    
 
    
 
 
    
 
    
 
    nm_setting_wired_remove_s390_option ()
    
-
    gboolean
+
    gboolean
 nm_setting_wired_remove_s390_option (NMSettingWired *setting,
                                      const char *key);
    
 
    Remove the s390-specific option referenced by key
@@ -1111,8 +1111,8 @@ list.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the option was found and removed from the internal option
-list, FALSE if it was not.
    
+
     TRUE if the option was found and removed from the internal option
+list, FALSE if it was not.
    
 
    
 
 
    
@@ -1122,6 +1122,8 @@ list, NMSettingWired *setting    );
 
    Returns a list of valid s390 options.
    
+
    The setting
+ argument is unused and NULL may be passed instead.
    
 
    
 
    Parameters
    
 
    
@@ -1132,14 +1134,14 @@ nm_setting_wired_get_valid_s390_options
 
 
-
-
+
+
    
 
    setting
    the NMSettingWired
    		 
     the NMSettingWired. 
    		[allow-none]
 
    
 
    
 
    
 
    
 
    Returns
    
-
     a NULL-terminated array of strings of valid s390 options. 
    
+
     a NULL-terminated array of strings of valid s390 options. 
    
 
    [transfer none]
    
 
    
 
    
@@ -1195,7 +1197,7 @@ nm_setting_wired_get_wake_on_lan_password
 
    
 
    
 
    Returns
    
-
     the Wake-on-LAN setting password, or NULL if there is no password.
    
+
     the Wake-on-LAN setting password, or NULL if there is no password.
    
 
    
 
    Since: 1.2
    
 
    
@@ -1401,15 +1403,16 @@ are supported by all devices.
    
 
    
 
    NMSettingWired
    
 
    typedef struct _NMSettingWired NMSettingWired;
    
+
    Wired Ethernet Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “auto-negotiate” property
    
-
      “auto-negotiate”           gboolean
    
-
    If TRUE, enforce auto-negotiation of port speed and duplex mode.  If
-FALSE, "speed" and "duplex" properties should be both set or link configuration
+
      “auto-negotiate”           gboolean
    
+
    If TRUE, enforce auto-negotiation of port speed and duplex mode.  If
+FALSE, "speed" and "duplex" properties should be both set or link configuration
 will be skipped.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: FALSE
    
@@ -1417,7 +1420,7 @@ will be skipped.
    
 
    
 
    
 
    The “cloned-mac-address” property
    
-
      “cloned-mac-address”       gchar *
    
+
      “cloned-mac-address”       gchar *
    
 
    If specified, request that the device use this MAC address instead.
 This is known as MAC cloning or spoofing.
    
 
    Beside explicitly specifing a MAC address, the special values "preserve", "permanent",
@@ -1438,7 +1441,7 @@ of NetworkManager.conf. If still unspecified, it defaults to "preserve"
 
    
 
    
 
    The “duplex” property
    
-
      “duplex”                   gchar *
    
+
      “duplex”                   gchar *
    
 
    Can be specified only when "auto-negotiate" is "off". In that case, statically
 configures the device to use that specified duplex mode, either "half" or "full".
 Must be set together with the "speed" property if specified.
@@ -1449,14 +1452,14 @@ Before specifying a duplex mode be sure your device supports it.
    
 
    
 
    
 
    The “generate-mac-address-mask” property
    
-
      “generate-mac-address-mask” gchar *
    
+
      “generate-mac-address-mask” gchar *
    
 
    With “cloned-mac-address” setting "random" or "stable",
 by default all bits of the MAC address are scrambled and a locally-administered,
 unicast MAC address is created. This property allows to specify that certain bits
 are fixed. Note that the least significant bit of the first MAC address will
 always be unset to create a unicast MAC address.
    
-
    If the property is NULL, it is eligible to be overwritten by a default
-connection setting. If the value is still NULL or an empty string, the
+
    If the property is NULL, it is eligible to be overwritten by a default
+connection setting. If the value is still NULL or an empty string, the
 default is to create a locally-administered, unicast MAC address.
    
 
    If the value contains one MAC address, this address is used as mask. The set
 bits of the mask are to be filled with the current MAC address of the device,
@@ -1480,7 +1483,7 @@ administered.
    
 
    
 
    
 
    The “mac-address” property
    
-
      “mac-address”              gchar *
    
+
      “mac-address”              gchar *
    
 
    If specified, this connection will only apply to the Ethernet device
 whose permanent MAC address matches. This property does not change the
 MAC address of the device (i.e. MAC spoofing).
    
@@ -1490,7 +1493,7 @@ MAC address of the device (i.e. MAC spoofing).
    
 
    
 
    
 
    The “mac-address-blacklist” property
    
-
      “mac-address-blacklist”    GStrv
    
+
      “mac-address-blacklist”    GStrv
    
 
    If specified, this connection will never apply to the Ethernet device
 whose permanent MAC address matches an address in the list.  Each MAC
 address is in the standard hex-digits-and-colons notation
@@ -1500,7 +1503,7 @@ address is in the standard hex-digits-and-colons notation
 
    
 
    
 
    The “mtu” property
    
-
      “mtu”                      guint
    
+
      “mtu”                      guint
    
 
    If non-zero, only transmit packets of the specified size or smaller,
 breaking larger packets up into multiple Ethernet frames.
    
 
    Flags: Read / Write / Construct
    
@@ -1509,7 +1512,7 @@ breaking larger packets up into multiple Ethernet frames.
    
 
    
 
    
 
    The “port” property
    
-
      “port”                     gchar *
    
+
      “port”                     gchar *
    
 
    Specific port type to use if multiple the device supports multiple
 attachment methods.  One of "tp" (Twisted Pair), "aui" (Attachment Unit
 Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface.
@@ -1520,7 +1523,7 @@ If the device supports only one port type, this setting is ignored.
    
 
    
 
    
 
    The “s390-nettype” property
    
-
      “s390-nettype”             gchar *
    
+
      “s390-nettype”             gchar *
    
 
    s390 network device type; one of "qeth", "lcs", or "ctc", representing
 the different types of virtual network devices available on s390 systems.
    
 
    Flags: Read / Write
    
@@ -1529,7 +1532,7 @@ the different types of virtual network devices available on s390 systems.
    
 
    
 
    
 
    The “s390-options” property
    
-
      “s390-options”             GHashTable *
    
+
      “s390-options”             GHashTable *
    
 
    Dictionary of key/value pairs of s390-specific device options.  Both keys
 and values must be strings.  Allowed keys include "portno", "layer2",
 "portname", "protocol", among others.  Key names must contain only
@@ -1540,7 +1543,7 @@ alphanumeric characters (ie, [a-zA-Z0-9]).
    
 
    
 
    
 
    The “s390-subchannels” property
    
-
      “s390-subchannels”         GStrv
    
+
      “s390-subchannels”         GStrv
    
 
    Identifies specific subchannels that this network device uses for
 communication with z/VM or s390 host.  Like the
 “mac-address” property for non-z/VM devices, this property
@@ -1553,7 +1556,7 @@ period (.) character.
    
 
    
 
    
 
    The “speed” property
    
-
      “speed”                    guint
    
+
      “speed”                    guint
    
 
    Can be set to a value grater than zero only when "auto-negotiate" is "off".
 In that case, statically configures the device to use that specified speed.
 In Mbit/s, ie 100 == 100Mbit/s.
@@ -1565,7 +1568,7 @@ Before specifying a speed value be sure your device supports it.
    
 
    
 
    
 
    The “wake-on-lan” property
    
-
      “wake-on-lan”              guint
    
+
      “wake-on-lan”              guint
    
 
    The NMSettingWiredWakeOnLan options to enable. Not all devices support all options.
 May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY,
 NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST, NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST,
@@ -1581,9 +1584,9 @@ NetworkManager).
    
 
    
 
    
 
    The “wake-on-lan-password” property
    
-
      “wake-on-lan-password”     gchar *
    
+
      “wake-on-lan-password”     gchar *
    
 
    If specified, the password used with magic-packet-based
-Wake-on-LAN, represented as an Ethernet MAC address.  If NULL,
+Wake-on-LAN, represented as an Ethernet MAC address.  If NULL,
 no password will be required.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index 740f31e2..f650348e 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -51,7 +51,7 @@
 
 
 
-GBytes *
+GBytes *
 
 
 nm_setting_wireless_get_ssid ()
@@ -73,7 +73,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_channel ()
@@ -88,7 +88,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_rate ()
@@ -96,7 +96,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_tx_power ()
@@ -132,7 +132,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_num_mac_blacklist_items ()
@@ -147,7 +147,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_add_mac_blacklist_item ()
@@ -163,7 +163,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_remove_mac_blacklist_item_by_value ()
@@ -179,7 +179,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_mtu ()
@@ -187,7 +187,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_get_hidden ()
@@ -195,7 +195,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_powersave ()
@@ -211,7 +211,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_add_seen_bssid ()
@@ -219,7 +219,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_wireless_get_num_seen_bssids ()
@@ -234,7 +234,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_ap_security_compatible ()
@@ -254,88 +254,88 @@
 
 
 
-gchar *
+gchar *
 band
 Read / Write
 
 
 
-gchar *
+gchar *
 bssid
 Read / Write
 
 
-guint
+guint
 channel
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 cloned-mac-address
 Read / Write
 
 
 
-gchar *
+gchar *
 generate-mac-address-mask
 Read / Write
 
 
-gboolean
+gboolean
 hidden
 Read / Write
 
 
 
-gchar *
+gchar *
 mac-address
 Read / Write
 
 
-GStrv
+GStrv
 mac-address-blacklist
 Read / Write
 
 
-guint
+guint
 mac-address-randomization
 Read / Write
 
 
 
-gchar *
+gchar *
 mode
 Read / Write
 
 
-guint
+guint
 mtu
 Read / Write / Construct
 
 
-guint
+guint
 powersave
 Read / Write
 
 
-guint
+guint
 rate
 Read / Write / Construct
 
 
-GStrv
+GStrv
 seen-bssids
 Read / Write
 
 
 
-GBytes *
+GBytes *
 ssid
 Read / Write
 
 
-guint
+guint
 tx-power
 Read / Write / Construct
 
@@ -443,9 +443,9 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMSettingWirelessPowersave
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWireless
 
    
@@ -471,7 +471,7 @@ nm_setting_wireless_new (void
 
    
 
    nm_setting_wireless_get_ssid ()
    
-
    GBytes *
+
    GBytes *
 nm_setting_wireless_get_ssid (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -547,7 +547,7 @@ nm_setting_wireless_get_band (
 
    nm_setting_wireless_get_channel ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_channel (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -597,7 +597,7 @@ nm_setting_wireless_get_bssid (
 
    
 
    nm_setting_wireless_get_rate ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_rate (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -622,7 +622,7 @@ nm_setting_wireless_get_rate (
 
    nm_setting_wireless_get_tx_power ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_tx_power (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -751,7 +751,7 @@ nm_setting_wireless_get_mac_address_blacklist
 
    
 
    
 
    nm_setting_wireless_get_num_mac_blacklist_items ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_num_mac_blacklist_items
                                (NMSettingWireless *setting);
    
 
    
@@ -780,7 +780,7 @@ nm_setting_wireless_get_num_mac_blacklist_items
 
    const char *
 nm_setting_wireless_get_mac_blacklist_item
                                (NMSettingWireless *setting,
-                                guint32 idx);
    
+                                guint32 idx);
    
 
    
 
    Parameters
    
 
    
@@ -813,7 +813,7 @@ at index idx
    
 
    nm_setting_wireless_add_mac_blacklist_item ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_add_mac_blacklist_item
                                (NMSettingWireless *setting,
                                 const char *mac);
    
@@ -842,7 +842,7 @@ nm_setting_wireless_add_mac_blacklist_item
 
    
 
    Returns
    
-
     TRUE if the MAC address was added; FALSE if the MAC address
+
     TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present
    
 
    
@@ -852,7 +852,7 @@ is invalid or was already present
    void
 nm_setting_wireless_remove_mac_blacklist_item
                                (NMSettingWireless *setting,
-                                guint32 idx);
    
+                                guint32 idx);
    Removes the MAC address at index idx
  from the blacklist.
    
@@ -881,7 +881,7 @@ nm_setting_wireless_remove_mac_blacklist_item
 
    
 
    
 
    nm_setting_wireless_remove_mac_blacklist_item_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_remove_mac_blacklist_item_by_value
                                (NMSettingWireless *setting,
                                 const char *mac);
    
@@ -912,7 +912,7 @@ the blacklist
    
 
    
 
    
 
    Returns
    
-
     TRUE if the MAC address was found and removed; FALSE if it was not.
    
+
     TRUE if the MAC address was found and removed; FALSE if it was not.
    
 
    
 
    
@@ -941,7 +941,7 @@ nm_setting_wireless_clear_mac_blacklist_items
 
    
 
    nm_setting_wireless_get_mtu ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_mtu (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -966,7 +966,7 @@ nm_setting_wireless_get_mtu (
 
    nm_setting_wireless_get_hidden ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_get_hidden (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -991,7 +991,7 @@ nm_setting_wireless_get_hidden (
 
    
 
    nm_setting_wireless_get_powersave ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_powersave (NMSettingWireless *setting);
    
 
    
 
    Parameters
    
@@ -1045,7 +1045,7 @@ setting
    
 
    
 
    
 
    nm_setting_wireless_add_seen_bssid ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting,
                                     const char *bssid);
    
 
    Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
@@ -1076,14 +1076,14 @@ not be preserved.
    
 
    
 
    
 
    Returns
    
-
     TRUE if bssid
-was already known, FALSE if not
    
+
     TRUE if bssid
+was already known, FALSE if not
    
 
    
 
    
 
    
 
    
 
    nm_setting_wireless_get_num_seen_bssids ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_get_num_seen_bssids
                                (NMSettingWireless *setting);
    
 
    
@@ -1111,7 +1111,7 @@ nm_setting_wireless_get_num_seen_bssids
 
    nm_setting_wireless_get_seen_bssid ()
    
 
    const char *
 nm_setting_wireless_get_seen_bssid (NMSettingWireless *setting,
-                                    guint32 i);
    
+                                    guint32 i);
    
 
    
 
    Parameters
    
 
    
 
 
 
 
 
 
 
 
 
    
@@ -1143,7 +1143,7 @@ nm_setting_wireless_get_seen_bssid (
 
    
 
    nm_setting_wireless_ap_security_compatible ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_ap_security_compatible
                                (NMSettingWireless *s_wireless,
                                 NMSettingWirelessSecurity *s_wireless_sec,
@@ -1173,7 +1173,7 @@ compatible with which access points.
    
 
 
    
-
+
@@ -1203,8 +1203,8 @@ capabilities
    
 
 
    
 
    Returns
    
-
     TRUE if the given settings are compatible with the access point's
-security flags and mode, FALSE if they are not.
    
+
     TRUE if the given settings are compatible with the access point's
+security flags and mode, FALSE if they are not.
    
 
    
 
 
@@ -1393,13 +1393,14 @@ for this connection.
    
 
    
 
    NMSettingWireless
    
 
    typedef struct _NMSettingWireless NMSettingWireless;
    
+
    Wi-Fi Settings
    
 
    
 
 
    
 
    Property Details
    
 
    
 
    The “band” property
    
-
      “band”                     gchar *
    
+
      “band”                     gchar *
    
 
    802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or
 "bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network
 to the specific band, i.e. if "a" is specified, the device will not
@@ -1412,7 +1413,7 @@ capability and may not work with all drivers.
    
 
    
 
    
 
    The “bssid” property
    
-
      “bssid”                    gchar *
    
+
      “bssid”                    gchar *
    
 
    If specified, directs the device to only associate with the given access
 point.  This capability is highly driver dependent and not supported by
 all devices.  Note: this property does not control the BSSID used when
@@ -1423,7 +1424,7 @@ creating an Ad-Hoc network and is unlikely to in the future.
    
 
    
 
    
 
    The “channel” property
    
-
      “channel”                  guint
    
+
      “channel”                  guint
    
 
    Wireless channel to use for the Wi-Fi connection.  The device will only
 join (or create for Ad-Hoc networks) a Wi-Fi network on the specified
 channel.  Because channel numbers overlap between bands, this property
@@ -1434,7 +1435,7 @@ also requires the "band" property to be set.
    
 
    
 
    
 
    The “cloned-mac-address” property
    
-
      “cloned-mac-address”       gchar *
    
+
      “cloned-mac-address”       gchar *
    
 
    If specified, request that the device use this MAC address instead.
 This is known as MAC cloning or spoofing.
    
 
    Beside explicitly specifing a MAC address, the special values "preserve", "permanent",
@@ -1455,14 +1456,14 @@ of NetworkManager.conf. If still unspecified, it defaults to "preserve"
 
    
 
    
 
    The “generate-mac-address-mask” property
    
-
      “generate-mac-address-mask” gchar *
    
+
      “generate-mac-address-mask” gchar *
    
 
    With “cloned-mac-address” setting "random" or "stable",
 by default all bits of the MAC address are scrambled and a locally-administered,
 unicast MAC address is created. This property allows to specify that certain bits
 are fixed. Note that the least significant bit of the first MAC address will
 always be unset to create a unicast MAC address.
    
-
    If the property is NULL, it is eligible to be overwritten by a default
-connection setting. If the value is still NULL or an empty string, the
+
    If the property is NULL, it is eligible to be overwritten by a default
+connection setting. If the value is still NULL or an empty string, the
 default is to create a locally-administered, unicast MAC address.
    
 
    If the value contains one MAC address, this address is used as mask. The set
 bits of the mask are to be filled with the current MAC address of the device,
@@ -1486,8 +1487,8 @@ administered.
    
 
    
 
    
 
    The “hidden” property
    
-
      “hidden”                   gboolean
    
-
    If TRUE, indicates this network is a non-broadcasting network that hides
+
      “hidden”                   gboolean
    
+
    If TRUE, indicates this network is a non-broadcasting network that hides
 its SSID.  In this case various workarounds may take place, such as
 probe-scanning the SSID for more reliable network discovery.  However,
 these workarounds expose inherent insecurities with hidden SSID networks,
@@ -1498,7 +1499,7 @@ and thus hidden SSID networks should be used with caution.
    
 
    
 
    
 
    The “mac-address” property
    
-
      “mac-address”              gchar *
    
+
      “mac-address”              gchar *
    
 
    If specified, this connection will only apply to the Wi-Fi device whose
 permanent MAC address matches. This property does not change the MAC
 address of the device (i.e. MAC spoofing).
    
@@ -1508,7 +1509,7 @@ address of the device (i.e. MAC spoofing).
    
 
    
 
    
 
    The “mac-address-blacklist” property
    
-
      “mac-address-blacklist”    GStrv
    
+
      “mac-address-blacklist”    GStrv
    
 
    A list of permanent MAC addresses of Wi-Fi devices to which this
 connection should never apply.  Each MAC address should be given in the
 standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").
    
@@ -1517,7 +1518,7 @@ standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").
    
 
    
 
    
 
    The “mac-address-randomization” property
    
-
      “mac-address-randomization” guint
    
+
      “mac-address-randomization” guint
    
 
    One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (never randomize unless
 the user has set a global default to randomize and the supplicant
 supports randomization),  NM_SETTING_MAC_RANDOMIZATION_NEVER (never
@@ -1535,7 +1536,7 @@ randomize the MAC address), or 
 
    The “mode” property
    
-
      “mode”                     gchar *
    
+
      “mode”                     gchar *
    
 
    Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap".  If blank,
 infrastructure is assumed.
    
 
    Flags: Read / Write
    
@@ -1544,7 +1545,7 @@ infrastructure is assumed.
    
 
    
 
    
 
    The “mtu” property
    
-
      “mtu”                      guint
    
+
      “mtu”                      guint
    
 
    If non-zero, only transmit packets of the specified size or smaller,
 breaking larger packets up into multiple Ethernet frames.
    
 
    Flags: Read / Write / Construct
    
@@ -1553,7 +1554,7 @@ breaking larger packets up into multiple Ethernet frames.
    
 
    
 
    
 
    The “powersave” property
    
-
      “powersave”                guint
    
+
      “powersave”                guint
    
 
    One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (disable Wi-Fi power
 saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (enable Wi-Fi power
 saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (don't touch currently
@@ -1566,7 +1567,7 @@ globally configured value). All other values are reserved.
    
 
    
 
    
 
    The “rate” property
    
-
      “rate”                     guint
    
+
      “rate”                     guint
    
 
    If non-zero, directs the device to only use the specified bitrate for
 communication with the access point.  Units are in Kb/s, ie 5500 = 5.5
 Mbit/s.  This property is highly driver dependent and not all devices
@@ -1577,7 +1578,7 @@ support setting a static bitrate.
    
 
    
 
    
 
    The “seen-bssids” property
    
-
      “seen-bssids”              GStrv
    
+
      “seen-bssids”              GStrv
    
 
    A list of BSSIDs (each BSSID formatted as a MAC address like
 "00:11:22:33:44:55") that have been detected as part of the Wi-Fi
 network.  NetworkManager internally tracks previously seen BSSIDs. The
@@ -1589,14 +1590,14 @@ preserved.
    
 
    
 
    
 
    The “ssid” property
    
-
      “ssid”                     GBytes *
    
+
      “ssid”                     GBytes *
    
 
    SSID of the Wi-Fi network. Must be specified.
    
 
    Flags: Read / Write
    
 
    
 
    
 
    
 
    The “tx-power” property
    
-
      “tx-power”                 guint
    
+
      “tx-power”                 guint
    
 
    If non-zero, directs the device to use the specified transmit power.
 Units are dBm.  This property is highly driver dependent and not all
 devices support setting a static transmit power.
    
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index 98a086a8..7d4cb824 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -59,7 +59,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
+gchar *
 
-
+
+gchar *
 
+gchar *
 
@@ -323,23 +323,23 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
     
+gchar *
 
-
+
-
+
+gchar *
 
@@ -360,30 +360,30 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
     
+gchar *
 
+gchar *
 
+gchar *
 
+gchar *
 
-
+
@@ -483,9 +483,9 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMWepKeyType
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWirelessSecurity
 
    
@@ -547,7 +547,7 @@ nm_setting_wireless_security_get_key_mgmt
 
    
 
    
 
    nm_setting_wireless_security_get_num_protos ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_security_get_num_protos
                                (NMSettingWirelessSecurity *setting);
    
 
    
@@ -577,7 +577,7 @@ connecting to secure Wi-Fi networks
    
 
    const char *
 nm_setting_wireless_security_get_proto
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    
 
    Parameters
    
 
    
 
    s_wireless_sec
    a NMSettingWirelessSecurity or NULL
    a NMSettingWirelessSecurity or NULL
    		
  
 
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_num_protos ()
@@ -74,7 +74,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_add_proto ()
@@ -90,7 +90,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_remove_proto_by_value ()
@@ -106,7 +106,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_num_pairwise ()
@@ -121,7 +121,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_add_pairwise ()
@@ -137,7 +137,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_remove_pairwise_by_value ()
@@ -153,7 +153,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_num_groups ()
@@ -168,7 +168,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_add_group ()
@@ -184,7 +184,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_remove_group_by_value ()
@@ -252,7 +252,7 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_wep_tx_keyidx ()
@@ -295,24 +295,24 @@ use WEP, LEAP, WPA or WPA2/RSN security
    
 
    
 
    
 
-gchar *auth-alg
 Read / Write
 
    
 
    GStrvGStrv
 group
 Read / Write
 
    
 
    
 
-gchar *key-mgmt
 Read / Write
 
    
 
    
 
-gchar *leap-password
 Read / Write
 
    
 
-gchar *leap-username
 Read / Write
 
    
 
    GStrvGStrv
 pairwise
 Read / Write
 
    
 
    GStrvGStrv
 proto
 Read / Write
 
    
 
    
 
-gchar *psk
 Read / Write
 
    
 
-gchar *wep-key0
 Read / Write
 
    
 
    
 
-gchar *wep-key1
 Read / Write
 
    
 
    
 
-gchar *wep-key2
 Read / Write
 
    
 
    
 
-gchar *wep-key3
 Read / Write
 
    
 
    guintguint
 wep-tx-keyidx
 Read / Write / Construct
 
    
@@ -609,7 +609,7 @@ nm_setting_wireless_security_get_proto
 
    
 
    
 
    nm_setting_wireless_security_add_proto ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_security_add_proto
                                (NMSettingWirelessSecurity *setting,
                                 const char *proto);
    
@@ -643,8 +643,8 @@ with the access point.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the protocol was new and and was added to the allowed
-protocol list, or FALSE if it was already in the list
    
+
     TRUE if the protocol was new and was added to the allowed
+protocol list, or FALSE if it was already in the list
    
 
    
 
 
    
@@ -653,7 +653,7 @@ protocol list, or void
 nm_setting_wireless_security_remove_proto
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
+                                guint32 i);
 
    Removes a protocol from the allowed protocol list.
    
 
    
 
    Parameters
    
@@ -681,7 +681,7 @@ nm_setting_wireless_security_remove_proto
 
    
 
    
 
    nm_setting_wireless_security_remove_proto_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_security_remove_proto_by_value
                                (NMSettingWirelessSecurity *setting,
                                 const char *proto);
    
@@ -710,7 +710,7 @@ nm_setting_wireless_security_remove_proto_by_value
 
    
 
    
 
    Returns
    
-
     TRUE if the protocol was found and removed; FALSE it it was not.
    
+
     TRUE if the protocol was found and removed; FALSE if it was not.
    
 
    
 
    
 
    
@@ -740,7 +740,7 @@ specified then all protocols are allowed.
    
 
    
 
    
 
    nm_setting_wireless_security_get_num_pairwise ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_security_get_num_pairwise
                                (NMSettingWirelessSecurity *setting);
    
 
    
@@ -769,7 +769,7 @@ nm_setting_wireless_security_get_num_pairwise
 
    const char *
 nm_setting_wireless_security_get_pairwise
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    Returns the allowed pairwise encryption algorithm from allowed algorithm
 list.
    
 
    
@@ -803,7 +803,7 @@ list.
    
 
    
 
    
 
    nm_setting_wireless_security_add_pairwise ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_security_add_pairwise
                                (NMSettingWirelessSecurity *setting,
                                 const char *pairwise);
    
@@ -835,7 +835,7 @@ compatible with this connection.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the algorithm was added to the list, FALSE if it was
+
     TRUE if the algorithm was added to the list, FALSE if it was
 already in the list
    
 
    
 
    
@@ -845,7 +845,7 @@ already in the list
    
 
    void
 nm_setting_wireless_security_remove_pairwise
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
    
+                                guint32 i);
 
    Removes an encryption algorithm from the allowed pairwise encryption
 algorithm list.
    
 
    
@@ -874,7 +874,7 @@ algorithm list.
    
 
    
 
    
 
    nm_setting_wireless_security_remove_pairwise_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_security_remove_pairwise_by_value
                                (NMSettingWirelessSecurity *setting,
                                 const char *pairwise);
    
@@ -904,7 +904,7 @@ algorithm list.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the encryption algorith was found and removed; FALSE it it was not.
    
+
     TRUE if the encryption algorith was found and removed; FALSE if it was not.
    
 
    
 
    
 
    
@@ -934,7 +934,7 @@ specified then all pairwise encryption algorithms are allowed.
    
 
    
 
    
 
    nm_setting_wireless_security_get_num_groups ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_security_get_num_groups
                                (NMSettingWirelessSecurity *setting);
    
 
    
@@ -963,7 +963,7 @@ nm_setting_wireless_security_get_num_groups
 
    const char *
 nm_setting_wireless_security_get_group
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
    
+                                guint32 i);
    
 
    Returns the allowed groupwise encryption algorithm from allowed algorithm
 list.
    
 
    
@@ -997,7 +997,7 @@ list.
    
 
    
 
    
 
    nm_setting_wireless_security_add_group ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_security_add_group
                                (NMSettingWirelessSecurity *setting,
                                 const char *group);
    
@@ -1030,7 +1030,7 @@ compatible with this connection.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the algorithm was added to the list, FALSE if it was
+
     TRUE if the algorithm was added to the list, FALSE if it was
 already in the list
    
 
    
 
    
@@ -1040,7 +1040,7 @@ already in the list
    
 
    void
 nm_setting_wireless_security_remove_group
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
    
+                                guint32 i);
 
    Removes an encryption algorithm from the allowed groupwise encryption
 algorithm list.
    
 
    
@@ -1069,7 +1069,7 @@ algorithm list.
    
 
    
 
    
 
    nm_setting_wireless_security_remove_group_by_value ()
    
-
    gboolean
+
    gboolean
 nm_setting_wireless_security_remove_group_by_value
                                (NMSettingWirelessSecurity *setting,
                                 const char *group);
    
@@ -1100,7 +1100,7 @@ algorithm list.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the algorithm was found and removed; FALSE it it was not.
    
+
     TRUE if the algorithm was found and removed; FALSE if it was not.
    
 
    
 
    
 
    
@@ -1264,7 +1264,7 @@ nm_setting_wireless_security_get_leap_password_flags
 
    const char *
 nm_setting_wireless_security_get_wep_key
                                (NMSettingWirelessSecurity *setting,
-                                guint32 idx);
    
+                                guint32 idx);
 
    
 
    Parameters
    
 
    
@@ -1298,7 +1298,7 @@ nm_setting_wireless_security_get_wep_key
 
    void
 nm_setting_wireless_security_set_wep_key
                                (NMSettingWirelessSecurity *setting,
-                                guint32 idx,
+                                guint32 idx,
                                 const char *key);
    
 
    Sets a WEP key in the given index.
    
 
    
@@ -1334,7 +1334,7 @@ property.
    
 
    
 
    
 
    nm_setting_wireless_security_get_wep_tx_keyidx ()
    
-
    guint32
+
    guint32
 nm_setting_wireless_security_get_wep_tx_keyidx
                                (NMSettingWirelessSecurity *setting);
    
 
    
@@ -1608,13 +1608,14 @@ the actual WEP key using the MD5 hash algorithm.
    
 
    
 
    NMSettingWirelessSecurity
    
 
    typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;
    
+
    Wi-Fi Security Settings
    
 
    
 
    
 
    
 
    Property Details
    
 
    
 
    The “auth-alg” property
    
-
      “auth-alg”                 gchar *
    
+
      “auth-alg”                 gchar *
    
 
    When WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the
 802.11 authentication algorithm required by the AP here.  One of "open"
 for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP.  When
@@ -1626,7 +1627,7 @@ using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the
 
    
 
    
 
    The “group” property
    
-
      “group”                    GStrv
    
+
      “group”                    GStrv
    
 
    A list of group/broadcast encryption algorithms which prevents
 connections to Wi-Fi networks that do not utilize one of the algorithms
 in the list.  For maximum compatibility leave this property empty.  Each
@@ -1636,7 +1637,7 @@ list element may be one of "wep40", "wep104", "tkip", or "ccmp".
    
 
    
 
    
 
    The “key-mgmt” property
    
-
      “key-mgmt”                 gchar *
    
+
      “key-mgmt”                 gchar *
    
 
    Key management used for the connection.  One of "none" (WEP), "ieee8021x"
 (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure
 WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for
@@ -1647,7 +1648,7 @@ any Wi-Fi connection that uses security.
    
 
    
 
    
 
    The “leap-password” property
    
-
      “leap-password”            gchar *
    
+
      “leap-password”            gchar *
    
 
    The login password for legacy LEAP connections (ie, key-mgmt =
 "ieee8021x" and auth-alg = "leap").
    
 
    Flags: Read / Write
    
@@ -1664,7 +1665,7 @@ any Wi-Fi connection that uses security.
    
 
    
 
    
 
    The “leap-username” property
    
-
      “leap-username”            gchar *
    
+
      “leap-username”            gchar *
    
 
    The login username for legacy LEAP connections (ie, key-mgmt =
 "ieee8021x" and auth-alg = "leap").
    
 
    Flags: Read / Write
    
@@ -1673,7 +1674,7 @@ any Wi-Fi connection that uses security.
    
 
    
 
    
 
    The “pairwise” property
    
-
      “pairwise”                 GStrv
    
+
      “pairwise”                 GStrv
    
 
    A list of pairwise encryption algorithms which prevents connections to
 Wi-Fi networks that do not utilize one of the algorithms in the list.
 For maximum compatibility leave this property empty.  Each list element
@@ -1683,7 +1684,7 @@ may be one of "tkip" or "ccmp".
    
 
    
 
    
 
    The “proto” property
    
-
      “proto”                    GStrv
    
+
      “proto”                    GStrv
    
 
    List of strings specifying the allowed WPA protocol versions to use.
 Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN).  If
 not specified, both WPA and RSN connections are allowed.
    
@@ -1692,7 +1693,7 @@ not specified, both WPA and RSN connections are allowed.
    
 
    
 
    
 
    The “psk” property
    
-
      “psk”                      gchar *
    
+
      “psk”                      gchar *
    
 
    Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it
 must contain only hexadecimal characters and is interpreted as a
 hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII
@@ -1735,7 +1736,7 @@ the actual WEP key.
    
 
    
 
    
 
    The “wep-key0” property
    
-
      “wep-key0”                 gchar *
    
+
      “wep-key0”                 gchar *
    
 
    Index 0 WEP key.  This is the WEP key used in most networks.  See the
 "wep-key-type" property for a description of how this key is interpreted.
    
 
    Flags: Read / Write
    
@@ -1744,7 +1745,7 @@ the actual WEP key.
    
 
    
 
    
 
    The “wep-key1” property
    
-
      “wep-key1”                 gchar *
    
+
      “wep-key1”                 gchar *
    
 
    Index 1 WEP key.  This WEP index is not used by most networks.  See the
 "wep-key-type" property for a description of how this key is interpreted.
    
 
    Flags: Read / Write
    
@@ -1753,7 +1754,7 @@ the actual WEP key.
    
 
    
 
    
 
    The “wep-key2” property
    
-
      “wep-key2”                 gchar *
    
+
      “wep-key2”                 gchar *
    
 
    Index 2 WEP key.  This WEP index is not used by most networks.  See the
 "wep-key-type" property for a description of how this key is interpreted.
    
 
    Flags: Read / Write
    
@@ -1762,7 +1763,7 @@ the actual WEP key.
    
 
    
 
    
 
    The “wep-key3” property
    
-
      “wep-key3”                 gchar *
    
+
      “wep-key3”                 gchar *
    
 
    Index 3 WEP key.  This WEP index is not used by most networks.  See the
 "wep-key-type" property for a description of how this key is interpreted.
    
 
    Flags: Read / Write
    
@@ -1771,7 +1772,7 @@ the actual WEP key.
    
 
    
 
    
 
    The “wep-tx-keyidx” property
    
-
      “wep-tx-keyidx”            guint
    
+
      “wep-tx-keyidx”            guint
    
 
    When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key
 index is used by the AP, put that WEP key index here.  Valid values are 0
 (default key) through 3.  Note that some consumer access points (like the
diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html
index 35e9b224..4409af01 100644
--- a/docs/libnm/html/NMSimpleConnection.html
+++ b/docs/libnm/html/NMSimpleConnection.html
@@ -83,7 +83,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMSimpleConnection
 
    
 
    
@@ -115,8 +115,8 @@ but might be used in the process of creating a new one.
    
 
    
 
    nm_simple_connection_new_from_dbus ()
    
 
    NMConnection *
-nm_simple_connection_new_from_dbus (GVariant *dict,
-                                    GError **error);
    
+nm_simple_connection_new_from_dbus (GVariant *dict,
+                                    GError **error);
    
 
    Creates a new NMSimpleConnection from a hash table describing the
 connection and normalize the connection.  See nm_connection_to_dbus() for a
 description of the expected hash table.
    
@@ -131,7 +131,7 @@ description of the expected hash table.
    
 
    
-
+
@@ -145,7 +145,7 @@ description of the expected hash table.
    
 
    
 
    Returns
    
 
     the new NMSimpleConnection object, populated with
-settings created from the values in the hash table, or NULL if the
+settings created from the values in the hash table, or NULL if the
 connection failed to normalize. 
    
 
    [transfer full]
    
 
    
diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html
index 90e97b8f..2c6878cb 100644
--- a/docs/libnm/html/NMVpnConnection.html
+++ b/docs/libnm/html/NMVpnConnection.html
@@ -72,7 +72,7 @@
     
+gchar *
 
@@ -95,7 +95,7 @@
 
-
+
    
 
    
 
    dict
    a GVariant of type NM_VARIANT_TYPE_CONNECTION describing the connection
    a GVariant of type NM_VARIANT_TYPE_CONNECTION describing the connection
    		
  
 
    
 
    
 
    
 
-gchar *banner
 Read
 
    
 void
 vpn-state-changedRun FirstRun First
 
    
 
    
 
    
@@ -124,7 +124,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMActiveConnection
             ╰── NMVpnConnection
@@ -134,7 +134,7 @@
 
    Implemented Interfaces
    
 
    
 NMVpnConnection implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -217,7 +217,7 @@ string used by the connection, and must not be modified.
    
 
    Property Details
    
 
    
 
    The “banner” property
    
-
      “banner”                   gchar *
    
+
      “banner”                   gchar *
    
 
    The VPN login banner of the active VPN connection.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -237,10 +237,10 @@ string used by the connection, and must not be modified.
    
 
    The “vpn-state-changed” signal
    
 
    void
 user_function (NMVpnConnection *nmvpnconnection,
-               guint            arg1,
-               guint            arg2,
-               gpointer         user_data)
    
-
    Flags: Run First
    
+               guint            arg1,
+               guint            arg2,
+               gpointer         user_data)
    
+
    Flags: Run First
    
 
    
 
    
 
    
diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index 2260ccc0..18967a8a 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -77,7 +77,7 @@
 
 
 
-gsize
+gsize
 
 
 nm_vpn_editor_plugin_get_vt ()
@@ -93,7 +93,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_editor_plugin_export ()
@@ -152,19 +152,19 @@
 
 
 
-gchar *
+gchar *
 description
 Read
 
 
 
-gchar *
+gchar *
 name
 Read
 
 
 
-gchar *
+gchar *
 service
 Read
 
@@ -182,7 +182,7 @@
 
 void
 changed
-Run First
+Run First
 
 
    
 
    
@@ -227,9 +227,9 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GFlags
+
        GFlags
     ╰── NMVpnEditorPluginCapability
-    GInterface
+    GInterface
     ├── NMVpnEditor
     ╰── NMVpnEditorPlugin
 
    
@@ -238,7 +238,7 @@
 
    Prerequisites
    
 
    
 NMVpnEditor requires
- GObject.
    
+ GObject.
    
 
    
 
    
 
    Description
    
@@ -248,13 +248,13 @@ NMVpnEditor requires
 
    
 
    NMVpnEditorPluginFactory ()
    
 
    NMVpnEditorPlugin *
-(*NMVpnEditorPluginFactory) (GError **error);
    
+(*NMVpnEditorPluginFactory) (GError **error);
    
 
    
 
    
 
    
 
    nm_vpn_editor_plugin_factory ()
    
 
    NMVpnEditorPlugin *
-nm_vpn_editor_plugin_factory (GError **error);
    
+nm_vpn_editor_plugin_factory (GError **error);
    
 
    
 
    
 
    
@@ -262,7 +262,7 @@ nm_vpn_editor_plugin_factory (NMVpnEditor *
 nm_vpn_editor_plugin_get_editor (NMVpnEditorPlugin *plugin,
                                  NMConnection *connection,
-                                 GError **error);
    
+                                 GError **error);
    
 
    
 
    Parameters
    
 
    
@@ -284,7 +284,7 @@ nm_vpn_editor_plugin_get_editor (
 
-
+
@@ -292,7 +292,7 @@ nm_vpn_editor_plugin_get_editor (
 
    
 
    Returns
    
-
     a new NMVpnEditor or NULL on error. 
    
+
     a new NMVpnEditor or NULL on error. 
    
 
    [transfer full]
    
 
    
 
@@ -305,10 +305,10 @@ nm_vpn_editor_plugin_get_capabilities (
 
    nm_vpn_editor_plugin_get_vt ()
    
-
    gsize
+
    gsize
 nm_vpn_editor_plugin_get_vt (NMVpnEditorPlugin *plugin,
                              NMVpnEditorPluginVT *vt,
-                             gsize vt_size);
    
+                             gsize vt_size);
    
 
    Returns an opaque VT function table for the plugin to extend
 functionality. The actual meaning of NMVpnEditorPluginVT is not
 defined in public API of libnm, instead it must be agreed by
@@ -355,7 +355,7 @@ size of plugin's VT.
    
 
    NMConnection *
 nm_vpn_editor_plugin_import (NMVpnEditorPlugin *plugin,
                              const char *path,
-                             GError **error);
    
+                             GError **error);
 
    
 
    Parameters
    
 
    
 
    error
    on return, an error or NULL
    on return, an error or NULL
    		
  
 
    
 
    
@@ -377,7 +377,7 @@ nm_vpn_editor_plugin_import (
    error
    
-    
+
@@ -386,7 +386,7 @@ nm_vpn_editor_plugin_import (
 
    Returns
    
 
     a new NMConnection imported from path
-, or NULL
+, or NULL
 on error or if the file at path
 was not recognized by this plugin. 
    
 
    [transfer full]
    
@@ -395,11 +395,11 @@ was not recognized by this plugin. 
    
 
    
 
    
 
    nm_vpn_editor_plugin_export ()
    
-
    gboolean
+
    gboolean
 nm_vpn_editor_plugin_export (NMVpnEditorPlugin *plugin,
                              const char *path,
                              NMConnection *connection,
-                             GError **error);
    
+                             GError **error);
    
 
    
 
    
 
    
@@ -417,8 +417,8 @@ nm_vpn_editor_plugin_load_from_file (const const char *check_service,
                                      int check_owner,
                                      NMUtilsCheckFilePredicate check_file,
-                                     gpointer user_data,
-                                     GError **error);
+                                     gpointer user_data,
+                                     GError **error);
 
    Load the shared libary plugin_name
  and create a new
 NMVpnEditorPlugin instace via the NMVpnEditorPluginFactory
@@ -482,7 +482,7 @@ loading the shared library. 
    
 
    
 
    
 
    Returns
    
-
     a new plugin instance or NULL on error. 
    
+
     a new plugin instance or NULL on error. 
    
 
    [transfer full]
    
 
    
 
    Since: 1.2
    
@@ -493,7 +493,7 @@ loading the shared library. 
    
 
    NMVpnEditorPlugin *
 nm_vpn_editor_plugin_load (const char *plugin_name,
                            const char *check_service,
-                           GError **error);
    
+                           GError **error);
 
    Load the shared libary plugin_name
  and create a new
 NMVpnEditorPlugin instace via the NMVpnEditorPluginFactory
@@ -534,7 +534,7 @@ the given service.
    
 
 
    
 
    Returns
    
-
     a new plugin instance or NULL on error. 
    
+
     a new plugin instance or NULL on error. 
    
 
    [transfer full]
    
 
    
 
    Since: 1.4
    
@@ -592,7 +592,7 @@ reference as the plugin-info might also reference the editor-plugin.
    
 
     
-
+
@@ -708,7 +708,7 @@ reference as the plugin-info might also reference the editor-plugin.
    
     
+if non-NULL.
    
     
@@ -719,27 +719,27 @@ if non-
 
@@ -773,7 +773,7 @@ the plugin, without requiring to update libnm. Used by 
    Property Details
    
 
    
 
    The “description” property
    
-
      “description”              gchar *
    
+
      “description”              gchar *
    
 
    Longer description of the VPN plugin.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -781,7 +781,7 @@ the plugin, without requiring to update libnm. Used by 
 
    The “name” property
    
-
      “name”                     gchar *
    
+
      “name”                     gchar *
    
 
    Short display name of the VPN plugin.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -789,7 +789,7 @@ the plugin, without requiring to update libnm. Used by 
 
    The “service” property
    
-
      “service”                  gchar *
    
+
      “service”                  gchar *
    
 
    D-Bus service name of the plugin's VPN service.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -801,8 +801,8 @@ the plugin, without requiring to update libnm. Used by 
    The “changed” signal
    
 
    void
 user_function (NMVpnEditor *nmvpneditor,
-               gpointer     user_data)
    
-
    Flags: Run First
    
+               gpointer     user_data)
+
    Flags: Run First
    
 
    
 
 
diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index 167505c5..b4f48849 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -51,7 +51,7 @@
 
     
+gchar *
 
@@ -105,7 +105,7 @@
 
-
+
@@ -141,7 +141,7 @@
 
 
    
 
    Object Hierarchy
    
-
        GObject
+
        GObject
     ╰── NMObject
         ╰── NMWimaxNsp
 
    
@@ -150,7 +150,7 @@
 
    Implemented Interfaces
    
 
    
 NMWimaxNsp implements
- GInitable and  GAsyncInitable.
    
+ GInitable and  GAsyncInitable.
    
 
    
 
    
 
    Description
    
@@ -185,7 +185,7 @@ nm_wimax_nsp_get_name (
 
    nm_wimax_nsp_get_signal_quality ()
    
-
    guint32
+
    guint32
 nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp);
    
 
    Gets the WPA signal quality of the wimax NSP.
    
 
    
@@ -237,9 +237,9 @@ nm_wimax_nsp_get_network_type (
 
    
 
    nm_wimax_nsp_filter_connections ()
    
-
    GPtrArray *
+
    GPtrArray *
 nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp,
-                                 const GPtrArray *connections);
    
+                                 const GPtrArray *connections);
    
 
    Filters a given array of connections for a given NMWimaxNsp object and
 return connections which may be activated with the NSP.  Any returned
 connections will match the nsp
@@ -260,7 +260,7 @@ connections will match the nsp
 
 
    
-
@@ -270,16 +270,16 @@ filter. 
    
 
    
 
    Returns
    
 
     an array of
-NMConnections that could be activated with the given nsp
+NMConnections that could be activated with the given nsp
 .  The array should
-be freed with g_ptr_array_unref() when it is no longer required. 
    
+be freed with g_ptr_array_unref() when it is no longer required. 
    
 
    [transfer container][element-type NMConnection]
    
 
    
 
 
    
 
    
 
    nm_wimax_nsp_connection_valid ()
    
-
    gboolean
+
    gboolean
 nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp,
                                NMConnection *connection);
    
 
    Validates a given connection against a given WiMAX NSP to ensure that the
@@ -312,8 +312,8 @@ against
    
 
    
 
    
 
    Returns
    
-
     TRUE if the connection may be activated with this WiMAX NSP,
-FALSE if it cannot be.
    
+
     TRUE if the connection may be activated with this WiMAX NSP,
+FALSE if it cannot be.
    
 
    
 
 
@@ -346,7 +346,7 @@ against
    
 
    Property Details
    
 
    
 
    The “name” property
    
-
      “name”                     gchar *
    
+
      “name”                     gchar *
    
 
    The name of the WiMAX NSP.
    
 
    Flags: Read
    
 
    Default value: NULL
    
@@ -362,7 +362,7 @@ against
    
 
    
 
    
 
    The “signal-quality” property
    
-
      “signal-quality”           guint
    
+
      “signal-quality”           guint
    
 
    The signal quality of the WiMAX NSP.
    
 
    Flags: Read
    
 
    Allowed values: <= 100
    
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index cc1bc431..23e29073 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -207,6 +207,10 @@
 
 
    
 
    
+NMActiveConnection::state-changed, object signal in nm-types
+
    
+
    
+
    
 NMActiveConnection:connection, object property in nm-types
 
    
 
    
@@ -271,6 +275,10 @@
 
 
    
 
    
+NMActiveConnectionStateReason, enum in nm-dbus-interface
+
    
+
    
+
    
 NM_ACTIVE_CONNECTION_CONNECTION, macro in NMActiveConnection
 
    
 
    
@@ -347,6 +355,10 @@
 
 
    
 
    
+nm_active_connection_get_state_reason, function in NMActiveConnection
+
    
+
    
+
    
 nm_active_connection_get_uuid, function in NMActiveConnection
 
    
 
    
@@ -422,6 +434,10 @@
 NM_AVAILABLE_IN_1_6, macro in nm-version
 
 
    
+
    
+NM_AVAILABLE_IN_1_8, macro in nm-version
+
    
+
    
 
    B
    
 
    
 NMBluetoothCapabilities, enum in nm-dbus-interface
@@ -953,19 +969,19 @@
 
    
 
    
 
    
-NMConnection, struct in nm-core-types
+NMConnection, struct in nm-core-types
 
    
 
    
 
    
-NMConnection::changed, object signal in nm-core-types
+NMConnection::changed, object signal in nm-core-types
 
    
 
    
 
    
-NMConnection::secrets-cleared, object signal in nm-core-types
+NMConnection::secrets-cleared, object signal in nm-core-types
 
    
 
    
 
    
-NMConnection::secrets-updated, object signal in nm-core-types
+NMConnection::secrets-updated, object signal in nm-core-types
 
    
 
    
 
    
@@ -1085,6 +1101,10 @@
 
    
 
    
 
    
+nm_connection_get_setting_dummy, function in NMConnection
+
    
+
    
+
    
 nm_connection_get_setting_generic, function in NMConnection
 
    
 
    
@@ -1298,6 +1318,10 @@
 
 
    
 
    
+NM_DBUS_INTERFACE_DEVICE_DUMMY, macro in nm-dbus-interface
+
    
+
    
+
    
 NM_DBUS_INTERFACE_DEVICE_GENERIC, macro in nm-dbus-interface
 
    
 
    
@@ -1574,6 +1598,14 @@
 
 
    
 
    
+NM_DEPRECATED_IN_1_8, macro in nm-version
+
    
+
    
+
    
+NM_DEPRECATED_IN_1_8_FOR, macro in nm-vpn-dbus-interface
+
    
+
    
+
    
 NMDevice, struct in nm-types
 
    
 
    
@@ -1750,6 +1782,10 @@
 
 
    
 
    
+NMDeviceDummy, struct in nm-types
+
    
+
    
+
    
 NMDeviceError, enum in nm-errors
 
    
 
    
@@ -1850,63 +1886,63 @@
 
 
    
 
    
-NMDeviceMacsec, struct in nm-types
+NMDeviceMacsec, struct in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:cipher-suite, object property in nm-types
+NMDeviceMacsec:cipher-suite, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:encoding-sa, object property in nm-types
+NMDeviceMacsec:encoding-sa, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:encrypt, object property in nm-types
+NMDeviceMacsec:encrypt, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:es, object property in nm-types
+NMDeviceMacsec:es, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:hw-address, object property in nm-types
+NMDeviceMacsec:hw-address, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:icv-length, object property in nm-types
+NMDeviceMacsec:icv-length, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:include-sci, object property in nm-types
+NMDeviceMacsec:include-sci, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:parent, object property in nm-types
+NMDeviceMacsec:parent, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:protect, object property in nm-types
+NMDeviceMacsec:protect, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:replay-protect, object property in nm-types
+NMDeviceMacsec:replay-protect, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:scb, object property in nm-types
+NMDeviceMacsec:scb, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:sci, object property in nm-types
+NMDeviceMacsec:sci, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:validation, object property in nm-types
+NMDeviceMacsec:validation, object property in nm-types
 
    
 
    
 
    
-NMDeviceMacsec:window, object property in nm-types
+NMDeviceMacsec:window, object property in nm-types
 
    
 
    
 
    
@@ -2702,115 +2738,115 @@ NMDeviceMacsec:window, object property in nm-types
 
    
 
    
 
    
-NM_DEVICE_MACSEC_CIPHER_SUITE, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_CIPHER_SUITE, macro in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_ENCODING_SA, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_ENCODING_SA, macro in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_ENCRYPT, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_ENCRYPT, macro in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_ES, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_ES, macro in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_cipher_suite, function in NMDeviceMacsec
+nm_device_macsec_get_cipher_suite, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_encoding_sa, function in NMDeviceMacsec
+nm_device_macsec_get_encoding_sa, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_encrypt, function in NMDeviceMacsec
+nm_device_macsec_get_encrypt, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_es, function in NMDeviceMacsec
+nm_device_macsec_get_es, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_hw_address, function in NMDeviceMacsec
+nm_device_macsec_get_hw_address, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_icv_length, function in NMDeviceMacsec
+nm_device_macsec_get_icv_length, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_include_sci, function in NMDeviceMacsec
+nm_device_macsec_get_include_sci, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_parent, function in NMDeviceMacsec
+nm_device_macsec_get_parent, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_protect, function in NMDeviceMacsec
+nm_device_macsec_get_protect, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_replay_protect, function in NMDeviceMacsec
+nm_device_macsec_get_replay_protect, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_scb, function in NMDeviceMacsec
+nm_device_macsec_get_scb, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_sci, function in NMDeviceMacsec
+nm_device_macsec_get_sci, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_validation, function in NMDeviceMacsec
+nm_device_macsec_get_validation, function in NMDeviceMacsec
 
    
 
    
 
    
-nm_device_macsec_get_window, function in NMDeviceMacsec
+nm_device_macsec_get_window, function in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_HW_ADDRESS, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_HW_ADDRESS, macro in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_ICV_LENGTH, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_ICV_LENGTH, macro in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_INCLUDE_SCI, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_INCLUDE_SCI, macro in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_PARENT, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_PARENT, macro in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_PROTECT, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_PROTECT, macro in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_REPLAY_PROTECT, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_REPLAY_PROTECT, macro in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_SCB, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_SCB, macro in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_SCI, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_SCI, macro in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_VALIDATION, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_VALIDATION, macro in NMDeviceMacsec
 
    
 
    
 
    
-NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
+NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
    
 
    
 
    
@@ -3595,6 +3631,62 @@ NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
    
 
    
 
    
+NM_IP_ROUTE_ATTRIBUTE_CWND, macro in NMSettingIPConfig
+
    
+
    
+
    
+NM_IP_ROUTE_ATTRIBUTE_FROM, macro in NMSettingIPConfig
+
    
+
    
+
    
+NM_IP_ROUTE_ATTRIBUTE_INITCWND, macro in NMSettingIPConfig
+
    
+
    
+
    
+NM_IP_ROUTE_ATTRIBUTE_INITRWND, macro in NMSettingIPConfig
+
    
+
    
+
    
+NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND, macro in NMSettingIPConfig
+
    
+
    
+
    
+NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND, macro in NMSettingIPConfig
+
    
+
    
+
    
+NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND, macro in NMSettingIPConfig
+
    
+
    
+
    
+NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, macro in NMSettingIPConfig
+
    
+
    
+
    
+NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW, macro in NMSettingIPConfig
+
    
+
    
+
    
+NM_IP_ROUTE_ATTRIBUTE_MTU, macro in NMSettingIPConfig
+
    
+
    
+
    
+NM_IP_ROUTE_ATTRIBUTE_SRC, macro in NMSettingIPConfig
+
    
+
    
+
    
+NM_IP_ROUTE_ATTRIBUTE_TOS, macro in NMSettingIPConfig
+
    
+
    
+
    
+nm_ip_route_attribute_validate, function in NMSettingIPConfig
+
    
+
    
+
    
+NM_IP_ROUTE_ATTRIBUTE_WINDOW, macro in NMSettingIPConfig
+
    
+
    
+
    
 nm_ip_route_dup, function in NMSettingIPConfig
 
    
 
    
@@ -3639,6 +3731,10 @@ NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
 
    
 
    
+nm_ip_route_get_variant_attribute_spec, function in NMSettingIPConfig
+
    
+
    
+
    
 nm_ip_route_new, function in NMSettingIPConfig
 
    
 
    
@@ -4048,10 +4144,22 @@ NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
 
    
 
    
+NMSetting8021x:auth-timeout, object property in NMSetting8021x
+
    
+
    
+
    
 NMSetting8021x:ca-cert, object property in NMSetting8021x
 
    
 
    
 
    
+NMSetting8021x:ca-cert-password, object property in NMSetting8021x
+
    
+
    
+
    
+NMSetting8021x:ca-cert-password-flags, object property in NMSetting8021x
+
    
+
    
+
    
 NMSetting8021x:ca-path, object property in NMSetting8021x
 
    
 
    
@@ -4060,6 +4168,14 @@ NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
 
    
 
    
+NMSetting8021x:client-cert-password, object property in NMSetting8021x
+
    
+
    
+
    
+NMSetting8021x:client-cert-password-flags, object property in NMSetting8021x
+
    
+
    
+
    
 NMSetting8021x:domain-suffix-match, object property in NMSetting8021x
 
    
 
    
@@ -4092,6 +4208,10 @@ NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
 
    
 
    
+NMSetting8021x:phase1-auth-flags, object property in NMSetting8021x
+
    
+
    
+
    
 NMSetting8021x:phase1-fast-provisioning, object property in NMSetting8021x
 
    
 
    
@@ -4120,6 +4240,14 @@ NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
 
    
 
    
+NMSetting8021x:phase2-ca-cert-password, object property in NMSetting8021x
+
    
+
    
+
    
+NMSetting8021x:phase2-ca-cert-password-flags, object property in NMSetting8021x
+
    
+
    
+
    
 NMSetting8021x:phase2-ca-path, object property in NMSetting8021x
 
    
 
    
@@ -4128,6 +4256,14 @@ NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
 
    
 
    
+NMSetting8021x:phase2-client-cert-password, object property in NMSetting8021x
+
    
+
    
+
    
+NMSetting8021x:phase2-client-cert-password-flags, object property in NMSetting8021x
+
    
+
    
+
    
 NMSetting8021x:phase2-domain-suffix-match, object property in NMSetting8021x
 
    
 
    
@@ -4176,6 +4312,10 @@ NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
 
    
 
    
+NMSetting8021xAuthFlags, enum in NMSetting8021x
+
    
+
    
+
    
 NMSetting8021xCKFormat, enum in NMSetting8021x
 
    
 
    
@@ -4296,6 +4436,10 @@ NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
 
    
 
    
+NMSettingCdma:mtu, object property in NMSettingCdma
+
    
+
    
+
    
 NMSettingCdma:number, object property in NMSettingCdma
 
    
 
    
@@ -4480,6 +4624,10 @@ NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
 
    
 
    
+NMSettingDummy, struct in NMSettingDummy
+
    
+
    
+
    
 NMSettingGeneric, struct in NMSettingGeneric
 
    
 
    
@@ -4500,6 +4648,10 @@ NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
 
    
 
    
+NMSettingGsm:mtu, object property in NMSettingGsm
+
    
+
    
+
    
 NMSettingGsm:network-id, object property in NMSettingGsm
 
    
 
    
@@ -4724,47 +4876,47 @@ NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 
 
    
 
    
-NMSettingMacsec, struct in NMSettingMacsec
+NMSettingMacsec, struct in NMSettingMacsec
 
    
 
    
 
    
-NMSettingMacsec:encrypt, object property in NMSettingMacsec
+NMSettingMacsec:encrypt, object property in NMSettingMacsec
 
    
 
    
 
    
-NMSettingMacsec:mka-cak, object property in NMSettingMacsec
+NMSettingMacsec:mka-cak, object property in NMSettingMacsec
 
    
 
    
 
    
-NMSettingMacsec:mka-cak-flags, object property in NMSettingMacsec
+NMSettingMacsec:mka-cak-flags, object property in NMSettingMacsec
 
    
 
    
 
    
-NMSettingMacsec:mka-ckn, object property in NMSettingMacsec
+NMSettingMacsec:mka-ckn, object property in NMSettingMacsec
 
    
 
    
 
    
-NMSettingMacsec:mode, object property in NMSettingMacsec
+NMSettingMacsec:mode, object property in NMSettingMacsec
 
    
 
    
 
    
-NMSettingMacsec:parent, object property in NMSettingMacsec
+NMSettingMacsec:parent, object property in NMSettingMacsec
 
    
 
    
 
    
-NMSettingMacsec:port, object property in NMSettingMacsec
+NMSettingMacsec:port, object property in NMSettingMacsec
 
    
 
    
 
    
-NMSettingMacsec:validation, object property in NMSettingMacsec
+NMSettingMacsec:validation, object property in NMSettingMacsec
 
    
 
    
 
    
-NMSettingMacsecMode, enum in NMSettingMacsec
+NMSettingMacsecMode, enum in NMSettingMacsec
 
    
 
    
 
    
-NMSettingMacsecValidation, enum in NMSettingMacsec
+NMSettingMacsecValidation, enum in NMSettingMacsec
 
    
 
    
 
    
@@ -5020,6 +5172,14 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
    
 
    
 
    
+NMSettingUser, struct in nm-core-types
+
    
+
    
+
    
+NMSettingUser:data, object property in nm-core-types
+
    
+
    
+
    
 NMSettingValueIterFn, user_function in NMSetting
 
    
 
    
@@ -5384,10 +5544,22 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+NM_SETTING_802_1X_AUTH_TIMEOUT, macro in NMSetting8021x
+
    
+
    
+
    
 NM_SETTING_802_1X_CA_CERT, macro in NMSetting8021x
 
    
 
    
 
    
+NM_SETTING_802_1X_CA_CERT_PASSWORD, macro in NMSetting8021x
+
    
+
    
+
    
+NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS, macro in NMSetting8021x
+
    
+
    
+
    
 NM_SETTING_802_1X_CA_PATH, macro in NMSetting8021x
 
    
 
    
@@ -5420,6 +5592,14 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+NM_SETTING_802_1X_CLIENT_CERT_PASSWORD, macro in NMSetting8021x
+
    
+
    
+
    
+NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS, macro in NMSetting8021x
+
    
+
    
+
    
 NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH, macro in NMSetting8021x
 
    
 
    
@@ -5436,10 +5616,22 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+nm_setting_802_1x_get_auth_timeout, function in NMSetting8021x
+
    
+
    
+
    
 nm_setting_802_1x_get_ca_cert_blob, function in NMSetting8021x
 
    
 
    
 
    
+nm_setting_802_1x_get_ca_cert_password, function in NMSetting8021x
+
    
+
    
+
    
+nm_setting_802_1x_get_ca_cert_password_flags, function in NMSetting8021x
+
    
+
    
+
    
 nm_setting_802_1x_get_ca_cert_path, function in NMSetting8021x
 
    
 
    
@@ -5460,6 +5652,14 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+nm_setting_802_1x_get_client_cert_password, function in NMSetting8021x
+
    
+
    
+
    
+nm_setting_802_1x_get_client_cert_password_flags, function in NMSetting8021x
+
    
+
    
+
    
 nm_setting_802_1x_get_client_cert_path, function in NMSetting8021x
 
    
 
    
@@ -5516,6 +5716,10 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+nm_setting_802_1x_get_phase1_auth_flags, function in NMSetting8021x
+
    
+
    
+
    
 nm_setting_802_1x_get_phase1_fast_provisioning, function in NMSetting8021x
 
    
 
    
@@ -5544,6 +5748,14 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+nm_setting_802_1x_get_phase2_ca_cert_password, function in NMSetting8021x
+
    
+
    
+
    
+nm_setting_802_1x_get_phase2_ca_cert_password_flags, function in NMSetting8021x
+
    
+
    
+
    
 nm_setting_802_1x_get_phase2_ca_cert_path, function in NMSetting8021x
 
    
 
    
@@ -5564,6 +5776,14 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+nm_setting_802_1x_get_phase2_client_cert_password, function in NMSetting8021x
+
    
+
    
+
    
+nm_setting_802_1x_get_phase2_client_cert_password_flags, function in NMSetting8021x
+
    
+
    
+
    
 nm_setting_802_1x_get_phase2_client_cert_path, function in NMSetting8021x
 
    
 
    
@@ -5684,6 +5904,10 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+NM_SETTING_802_1X_PHASE1_AUTH_FLAGS, macro in NMSetting8021x
+
    
+
    
+
    
 NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, macro in NMSetting8021x
 
    
 
    
@@ -5712,6 +5936,14 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD, macro in NMSetting8021x
+
    
+
    
+
    
+NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS, macro in NMSetting8021x
+
    
+
    
+
    
 NM_SETTING_802_1X_PHASE2_CA_PATH, macro in NMSetting8021x
 
    
 
    
@@ -5720,6 +5952,14 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD, macro in NMSetting8021x
+
    
+
    
+
    
+NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS, macro in NMSetting8021x
+
    
+
    
+
    
 NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH, macro in NMSetting8021x
 
    
 
    
@@ -6192,6 +6432,10 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+nm_setting_cdma_get_mtu, function in NMSettingCdma
+
    
+
    
+
    
 nm_setting_cdma_get_number, function in NMSettingCdma
 
    
 
    
@@ -6208,6 +6452,10 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+NM_SETTING_CDMA_MTU, macro in NMSettingCdma
+
    
+
    
+
    
 nm_setting_cdma_new, function in NMSettingCdma
 
    
 
    
@@ -6672,6 +6920,14 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+nm_setting_dummy_new, function in NMSettingDummy
+
    
+
    
+
    
+NM_SETTING_DUMMY_SETTING_NAME, macro in NMSettingDummy
+
    
+
    
+
    
 nm_setting_duplicate, function in NMSetting
 
    
 
    
@@ -6720,6 +6976,10 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+nm_setting_gsm_get_mtu, function in NMSettingGsm
+
    
+
    
+
    
 nm_setting_gsm_get_network_id, function in NMSettingGsm
 
    
 
    
@@ -6760,6 +7020,10 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
+NM_SETTING_GSM_MTU, macro in NMSettingGsm
+
    
+
    
+
    
 NM_SETTING_GSM_NETWORK_ID, macro in NMSettingGsm
 
    
 
    
@@ -7312,83 +7576,83 @@ NMSettingProxyMethod, enum in NMSettingProxy
 
 
    
 
    
-NM_SETTING_MACSEC_ENCRYPT, macro in NMSettingMacsec
+NM_SETTING_MACSEC_ENCRYPT, macro in NMSettingMacsec
 
    
 
    
 
    
-nm_setting_macsec_get_encrypt, function in NMSettingMacsec
+nm_setting_macsec_get_encrypt, function in NMSettingMacsec
 
    
 
    
 
    
-nm_setting_macsec_get_mka_cak, function in NMSettingMacsec
+nm_setting_macsec_get_mka_cak, function in NMSettingMacsec
 
    
 
    
 
    
-nm_setting_macsec_get_mka_cak_flags, function in NMSettingMacsec
+nm_setting_macsec_get_mka_cak_flags, function in NMSettingMacsec
 
    
 
    
 
    
-nm_setting_macsec_get_mka_ckn, function in NMSettingMacsec
+nm_setting_macsec_get_mka_ckn, function in NMSettingMacsec
 
    
 
    
 
    
-nm_setting_macsec_get_mode, function in NMSettingMacsec
+nm_setting_macsec_get_mode, function in NMSettingMacsec
 
    
 
    
 
    
-nm_setting_macsec_get_parent, function in NMSettingMacsec
+nm_setting_macsec_get_parent, function in NMSettingMacsec
 
    
 
    
 
    
-nm_setting_macsec_get_port, function in NMSettingMacsec
+nm_setting_macsec_get_port, function in NMSettingMacsec
 
    
 
    
 
    
-nm_setting_macsec_get_validation, function in NMSettingMacsec
+nm_setting_macsec_get_validation, function in NMSettingMacsec
 
    
 
    
 
    
-NM_SETTING_MACSEC_MKA_CAK, macro in NMSettingMacsec
+NM_SETTING_MACSEC_MKA_CAK, macro in NMSettingMacsec
 
    
 
    
 
    
-NM_SETTING_MACSEC_MKA_CAK_FLAGS, macro in NMSettingMacsec
+NM_SETTING_MACSEC_MKA_CAK_FLAGS, macro in NMSettingMacsec
 
    
 
    
 
    
-NM_SETTING_MACSEC_MKA_CAK_LENGTH, macro in NMSettingMacsec
+NM_SETTING_MACSEC_MKA_CAK_LENGTH, macro in NMSettingMacsec
 
    
 
    
 
    
-NM_SETTING_MACSEC_MKA_CKN, macro in NMSettingMacsec
+NM_SETTING_MACSEC_MKA_CKN, macro in NMSettingMacsec
 
    
 
    
 
    
-NM_SETTING_MACSEC_MKA_CKN_LENGTH, macro in NMSettingMacsec
+NM_SETTING_MACSEC_MKA_CKN_LENGTH, macro in NMSettingMacsec
 
    
 
    
 
    
-NM_SETTING_MACSEC_MODE, macro in NMSettingMacsec
+NM_SETTING_MACSEC_MODE, macro in NMSettingMacsec
 
    
 
    
 
    
-nm_setting_macsec_new, function in NMSettingMacsec
+nm_setting_macsec_new, function in NMSettingMacsec
 
    
 
    
 
    
-NM_SETTING_MACSEC_PARENT, macro in NMSettingMacsec
+NM_SETTING_MACSEC_PARENT, macro in NMSettingMacsec
 
    
 
    
 
    
-NM_SETTING_MACSEC_PORT, macro in NMSettingMacsec
+NM_SETTING_MACSEC_PORT, macro in NMSettingMacsec
 
    
 
    
 
    
-NM_SETTING_MACSEC_SETTING_NAME, macro in NMSettingMacsec
+NM_SETTING_MACSEC_SETTING_NAME, macro in NMSettingMacsec
 
    
 
    
 
    
-NM_SETTING_MACSEC_VALIDATION, macro in NMSettingMacsec
+NM_SETTING_MACSEC_VALIDATION, macro in NMSettingMacsec
 
    
 
    
 
    
@@ -7856,6 +8120,38 @@ NM_SETTING_PROXY_SETTING_NAME, macro in NMSettingProxy
 
    
 
    
 
    
+nm_setting_user_check_key, function in nm-setting-user
+
    
+
    
+
    
+nm_setting_user_check_val, function in nm-setting-user
+
    
+
    
+
    
+NM_SETTING_USER_DATA, macro in nm-setting-user
+
    
+
    
+
    
+nm_setting_user_get_data, function in nm-setting-user
+
    
+
    
+
    
+nm_setting_user_get_keys, function in nm-setting-user
+
    
+
    
+
    
+nm_setting_user_new, function in nm-setting-user
+
    
+
    
+
    
+NM_SETTING_USER_SETTING_NAME, macro in nm-setting-user
+
    
+
    
+
    
+nm_setting_user_set_data, function in nm-setting-user
+
    
+
    
+
    
 nm_setting_verify, function in NMSetting
 
    
 
    
@@ -8817,6 +9113,10 @@ NM_SETTING_PROXY_SETTING_NAME, macro in NMSettingProxy
 
 
    
 
    
+nm_utils_format_variant_attributes, function in nm-utils
+
    
+
    
+
    
 nm_utils_hexstr2bin, function in nm-utils
 
    
 
    
@@ -8965,6 +9265,10 @@ NM_SETTING_PROXY_SETTING_NAME, macro in NMSettingProxy
 
 
    
 
    
+nm_utils_parse_variant_attributes, function in nm-utils
+
    
+
    
+
    
 nm_utils_same_ssid, function in nm-utils
 
    
 
    
@@ -9022,6 +9326,10 @@ NM_SETTING_PROXY_SETTING_NAME, macro in NMSettingProxy
 
    
 
    V
    
 
    
+NMVariantAttributeSpec, struct in nm-utils
+
    
+
    
+
    
 NM_VARIANT_TYPE_SETTING, macro in NMConnection
 
    
 
    
@@ -9078,7 +9386,7 @@ NM_SETTING_PROXY_SETTING_NAME, macro in NMSettingProxy
 
 
    
 
    
-NMVpnEditorInterface, struct in NMVpnEditor
+NMVpnEditorInterface, struct in NMVpnEditor
 
    
 
    
 
    
@@ -9154,7 +9462,7 @@ NMVpnPluginInfo, struct in nm-vpn-plugin-info
 
    
 
    
 
    
-nm_vpn_editor_get_widget, function in NMVpnEditor
+nm_vpn_editor_get_widget, function in NMVpnEditor
 
    
 
    
 
    
@@ -9214,7 +9522,7 @@ NMVpnPluginInfo, struct in nm-vpn-plugin-info
 
    
 
    
 
    
-nm_vpn_editor_update_connection, function in NMVpnEditor
+nm_vpn_editor_update_connection, function in NMVpnEditor
 
    
 
    
 
    
diff --git a/docs/libnm/html/ch02.html b/docs/libnm/html/ch02.html
index 82f3f9b7..0d2a1593 100644
--- a/docs/libnm/html/ch02.html
+++ b/docs/libnm/html/ch02.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -16,7 +16,7 @@
 
    
-
+
    on return, an error or NULL
    on return, an error or NULL
    		
  
 
    
 
    
 
    plugin_info
     a NMVpnPluginInfo instance or NULL. 
     a NMVpnPluginInfo instance or NULL. 
    		
 [allow-none]
 
    
 
    
 
    get_editor ()
    		
 
    returns an NMVpnEditor, pre-filled with values from connection
-if non-NULL.
    		 
 
    
 
    import_from_file ()
    		
 
    Try to import a connection from the specified path.  On
-success, return a partial NMConnection object.  On error, return NULL and
+success, return a partial NMConnection object.  On error, return NULL and
 set error
 with additional information.  Note that error
-can be NULL, in
+can be NULL, in
 which case no additional error information should be provided.
    		
  
 
    
 
    
 
    export_to_file ()
    		
 
    Export the given connection to the specified path.  Return
-TRUE on success.  On error, return FALSE and set error
+TRUE on success.  On error, return FALSE and set error
 with additional
 error information.  Note that error
-can be NULL, in which case no
+can be NULL, in which case no
 additional error information should be provided.
    		
  
 
    
 
    
 
    get_suggested_filename ()
    		
 
    For a given connection, return a suggested file
-name.  Returned value will be NULL or a suggested file name to be freed by
+name.  Returned value will be NULL or a suggested file name to be freed by
 the caller.
    		
  
 
    
 
-guint32
+guint32
 
 
 nm_wimax_nsp_get_signal_quality ()
@@ -67,7 +67,7 @@
 
    
 
    
 
-GPtrArray *
+GPtrArray *
 
 
 nm_wimax_nsp_filter_connections ()
@@ -75,7 +75,7 @@
 
    
 
    
 
-gboolean
+gboolean
 
 
 nm_wimax_nsp_connection_valid ()
@@ -95,7 +95,7 @@
 
    
 
    
 
-gchar *name
 Read
 
    Read
 
    
 
    guintguint
 signal-quality
 Read
 
    
 
    connections
     an array of NMConnections to
+
     an array of NMConnections to
 filter. 
    		
 [element-type NMConnection]
 
    
 Home
 PrevPrev
 Next
 
    
 
    
diff --git a/docs/libnm/html/ch03.html b/docs/libnm/html/ch03.html
index 9b411960..0b11027a 100644
--- a/docs/libnm/html/ch03.html
+++ b/docs/libnm/html/ch03.html
@@ -60,6 +60,9 @@
 NMSettingDcb — Connection properties for Data Center Bridging
 
 
    
+NMSettingDummy — Describes connection properties for dummy interfaces
+
    
+
    
 NMSettingGeneric — Describes connection properties for generic devices
 
    
 
    
@@ -82,6 +85,9 @@
 NMSettingIPTunnel — Describes connection properties for IP tunnel devices
 
    
 
    
+NMSettingMacsec — Describes connection properties for MACSEC interfaces
+
    
+
    
 NMSettingMacvlan — Describes connection properties for macvlan interfaces
 
    
 
    
diff --git a/docs/libnm/html/ch04.html b/docs/libnm/html/ch04.html
index bd207fa5..6a14ecc7 100644
--- a/docs/libnm/html/ch04.html
+++ b/docs/libnm/html/ch04.html
@@ -39,6 +39,9 @@
 NMDeviceBt
 
    
 
    
+NMDeviceDummy
+
    
+
    
 NMDeviceEthernet
 
    
 
    
@@ -51,6 +54,9 @@
 NMDeviceIPTunnel
 
    
 
    
+NMDeviceMacsec
+
    
+
    
 NMDeviceMacvlan
 
    
 
    
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index e93a7482..78e47df6 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,12 +15,12 @@
 
    
 
    
 
    
-      for libnm 1.6.2
+      for libnm 1.8.0
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm/stable/.
     
    
-
    Copyright © 2012-2014 The NetworkManager Authors
    
+
    Copyright © 2012, 2013, 2014, 2015, 2016, 2017 The NetworkManager Authors
    
 
    
 
    
 	Permission is granted to copy, distribute and/or modify this
@@ -48,6 +48,10 @@
 
    
 
    
 
    Overview
    
+
    
+
    Introduction to libnm
    
+
    Using libnm
    
+
    
 
    Client Object API Reference
    
 
    
 
    
@@ -105,6 +109,9 @@
 NMSettingDcb — Connection properties for Data Center Bridging
 
    
 
    
+NMSettingDummy — Describes connection properties for dummy interfaces
+
    
+
    
 NMSettingGeneric — Describes connection properties for generic devices
 
    
 
    
@@ -127,6 +134,9 @@
 NMSettingIPTunnel — Describes connection properties for IP tunnel devices
 
    
 
    
+NMSettingMacsec — Describes connection properties for MACSEC interfaces
+
    
+
    
 NMSettingMacvlan — Describes connection properties for macvlan interfaces
 
    
 
    
@@ -193,6 +203,9 @@ use WEP, LEAP, WPA or WPA2/RSN security
 NMDeviceBt
 
    
 
    
+NMDeviceDummy
+
    
+
    
 NMDeviceEthernet
 
    
 
    
@@ -205,6 +218,9 @@ use WEP, LEAP, WPA or WPA2/RSN security
 NMDeviceIPTunnel
 
    
 
    
+NMDeviceMacsec
+
    
+
    
 NMDeviceMacvlan
 
    
 
    
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 7038eb1f..fdbddb36 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -46,6 +46,10 @@
 
 
 #define
+NM_AVAILABLE_IN_1_8
+
+
+#define
 NM_DBUS_SERVICE
 
 
@@ -134,6 +138,10 @@
 
 
 #define
+NM_DBUS_INTERFACE_DEVICE_DUMMY
+
+
+#define
 NM_DBUS_INTERFACE_DEVICE_TEAM
 
 
@@ -290,6 +298,10 @@
 
 
 enum
+NMActiveConnectionStateReason
+
+
+enum
 NMSecretAgentGetSecretsFlags
 
 
@@ -381,9 +393,10 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NM80211Mode
     ├── NMActiveConnectionState
+    ├── NMActiveConnectionStateReason
     ├── NMCapability
     ├── NMConnectivityState
     ├── NMDeviceState
@@ -393,7 +406,7 @@
     ├── NMMetered
     ├── NMState
     ╰── NMWimaxNspNetworkType
-    GFlags
+    GFlags
     ├── NM80211ApFlags
     ├── NM80211ApSecurityFlags
     ├── NMBluetoothCapabilities
@@ -419,6 +432,11 @@
 
    
 
    
 
    
+
    NM_AVAILABLE_IN_1_8
    
+
    #define             NM_AVAILABLE_IN_1_8
    
+
    
+
    
+
    
 
    NM_DBUS_SERVICE
    
 
    #define NM_DBUS_SERVICE                     "org.freedesktop.NetworkManager"
 
    
@@ -551,6 +569,12 @@
 
    
 
    
 
    
+
    NM_DBUS_INTERFACE_DEVICE_DUMMY
    
+
    #define NM_DBUS_INTERFACE_DEVICE_DUMMY      NM_DBUS_INTERFACE_DEVICE ".Dummy"
+
    
+
    
+
    
+
    
 
    NM_DBUS_INTERFACE_DEVICE_TEAM
    
 
    #define NM_DBUS_INTERFACE_DEVICE_TEAM       NM_DBUS_INTERFACE_DEVICE ".Team"
 
    
@@ -730,56 +754,74 @@ extensions.
    
 
 
    NM_STATE_UNKNOWN
    
 
-
    networking state is unknown
    
+
    Networking state is unknown. This indicates a daemon error
+   that makes it unable to reasonably assess the state. In such event the
+   applications are expected to assume Internet connectivity might be present
+   and not disable controls that require network access.
+   The graphical shells may hide the network accessibility indicator altogether
+   since no meaningful status indication can be provided.
    
 
  
 
 
 
    NM_STATE_ASLEEP
    
 
-
    networking is not enabled
    
+
    Networking is not enabled, the system is being suspended or
+   resumed from suspend.
    
 
  
 
 
 
    NM_STATE_DISCONNECTED
    
 
-
    there is no active network connection
    
+
    There is no active network connection.
+   The graphical shell should indicate  no network connectivity and the
+   applications should not attempt to access the network.
    
 
  
 
 
 
    NM_STATE_DISCONNECTING
    
 
-
    network connections are being cleaned up
    
+
    Network connections are being cleaned up.
+   The applications should tear down their network sessions.
    
 
  
 
 
 
    NM_STATE_CONNECTING
    
 
-
    a network connection is being started
    
+
    A network connection is being started
+   The graphical shell should indicate the network is being connected while
+   the applications should still make no attempts to connect the network.
    
 
  
 
 
 
    NM_STATE_CONNECTED_LOCAL
    
 
-
    there is only local IPv4 and/or IPv6 connectivity
    
+
    There is only local IPv4 and/or IPv6 connectivity,
+   but no default route to access the Internet. The graphical shell should
+   indicate no network connectivity.
    
 
  
 
 
 
    NM_STATE_CONNECTED_SITE
    
 
-
    there is only site-wide IPv4 and/or IPv6 connectivity
    
+
    There is only site-wide IPv4 and/or IPv6 connectivity.
+   This means a default route is available, but the Internet connectivity check
+   (see "Connectivity" property) did not succeed. The graphical shell should
+   indicate limited network connectivity.
    
 
  
 
 
 
    NM_STATE_CONNECTED_GLOBAL
    
 
-
    there is global IPv4 and/or IPv6 Internet connectivity
    
+
    There is global IPv4 and/or IPv6 Internet connectivity
+   This means the Internet connectivity check succeeded, the graphical shell should
+   indicate full network connectivity.
    
 
  
 
@@ -802,30 +844,41 @@ extensions.
    
 
 
    NM_CONNECTIVITY_UNKNOWN
    
 
-
    Network connectivity is unknown.
    
+
    Network connectivity is unknown. This means the
+  connectivity checks are disabled (e.g. on server installations) or has
+  not run yet. The graphical shell should assume the Internet connection
+  might be available and not present a captive portal window.
    
 
  
 
 
 
    NM_CONNECTIVITY_NONE
    
 
-
    The host is not connected to any network.
    
+
    The host is not connected to any network. There's
+  no active connection that contains a default route to the internet and
+  thus it makes no sense to even attempt a connectivity check. The graphical
+  shell should use this state to indicate the network connection is unavailable.
    
 
  
 
 
 
    NM_CONNECTIVITY_PORTAL
    
 
-
    The host is behind a captive portal and
-  cannot reach the full Internet.
    
+
    The Internet connection is hijacked by a captive
+  portal gateway. The graphical shell may open a sandboxed web browser window
+  (because the captive portals typically attempt a man-in-the-middle attacks
+  agains the https connections) for the purpose of authenticating to a gateway
+  and retrigger the connectivity check with CheckConnectivity() when the
+  browser window is dismissed.
    
 
  
 
 
 
    NM_CONNECTIVITY_LIMITED
    
 
-
    The host is connected to a network, but
-  does not appear to be able to reach the full Internet.
    
+
    The host is connected to a network, does not appear
+  to be able to reach the full Internet, but a captive portal has not been
+  detected.
    
 
  
 
@@ -1010,6 +1063,13 @@ GSM/UMTS, or LTE network access protocols
    
 
  
 
+
+
    NM_DEVICE_TYPE_DUMMY
    
+
+
    a dummy interface
    
+
+ 
+
 
 
    
 
    
@@ -1055,6 +1115,13 @@ GSM/UMTS, or LTE network access protocols
    
 
  
 
+
+
    NM_DEVICE_CAP_SRIOV
    
+
+
    this device supports single-root I/O virtualization
    
+
+ 
+
 
 
    
 
    
@@ -2185,6 +2252,144 @@ network.
    
 
    
 
    
 
    
+
    enum NMActiveConnectionStateReason
    
+
    Active connection state reasons.
    
+
    
+
    Members
    
+
    
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    




    NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN
    		
+
    The reason for the active connection
+  state change is unknown.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_NONE
    		
+
    No reason was given for the active
+  connection state change.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED
    		
+
    The active connection changed
+  state because the user disconnected it.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED
    		
+
    The active connection
+  changed state because the device it was using was disconnected.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED
    		
+
    The service providing the
+  VPN connection was stopped.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID
    		
+
    The IP config of the active
+  connection was invalid.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT
    		
+
    The connection attempt to
+  the VPN service timed out.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT
    		
+
    A timeout occurred
+  while starting the service providing the VPN connection.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED
    		
+
    Starting the service
+  providing the VPN connection failed.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS
    		
+
    Necessary secrets for the
+  connection were not provided.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED
    		
+
    Authentication to the
+  server failed.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED
    		
+
    The connection was
+  deleted from settings.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_DEPENDENCY_FAILED
    		
+
    Master connection of this
+  connection failed to activate.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REALIZE_FAILED
    		
+
    Could not create the
+  software device link.
    
+    		 
    NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REMOVED
    		
+
    The device this connection
+  depended on disappeared.
    
+    		 
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
 
    enum NMSecretAgentGetSecretsFlags
    
 
    NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.
    
 
    
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index acb0782f..071c5eb4 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -42,7 +42,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_agent_manager_error_quark ()
@@ -50,7 +50,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_connection_error_quark ()
@@ -58,7 +58,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_crypto_error_quark ()
@@ -66,7 +66,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_error_quark ()
@@ -74,7 +74,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_manager_error_quark ()
@@ -82,7 +82,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_secret_agent_error_quark ()
@@ -90,7 +90,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_settings_error_quark ()
@@ -98,7 +98,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_vpn_plugin_error_quark ()
@@ -184,7 +184,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMAgentManagerError
     ├── NMConnectionError
     ├── NMCryptoError
@@ -202,49 +202,49 @@
 
    Functions
    
 
    
 
    nm_agent_manager_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_agent_manager_error_quark (void);
    
 
    
 
    
 
    
 
    nm_connection_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_connection_error_quark (void);
    
 
    
 
    
 
    
 
    nm_crypto_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_crypto_error_quark (void);
    
 
    
 
    
 
    
 
    nm_device_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_device_error_quark (void);
    
 
    
 
    
 
    
 
    nm_manager_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_manager_error_quark (void);
    
 
    
 
    
 
    
 
    nm_secret_agent_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_secret_agent_error_quark (void);
    
 
    
 
    
 
    
 
    nm_settings_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_settings_error_quark (void);
    
 
    
 
    
 
    
 
    nm_vpn_plugin_error_quark ()
    
-
    GQuark
+
    GQuark
 nm_vpn_plugin_error_quark (void);
    
 
    
 
    
@@ -254,7 +254,7 @@ nm_vpn_plugin_error_quark (void
    enum NMAgentManagerError
    
 
    Errors returned from the secret-agent manager.
    
 
    These errors may be returned from operations that could cause secrets to be
-requested (such as nm_client_activate_connection()), and correspond to D-Bus
+requested (such as nm_client_activate_connection()), and correspond to D-Bus
 errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.
    
 
    
 
    Members
    
@@ -722,7 +722,7 @@ errors in that namespace.
    
 when they encounter problems retrieving secrets on behalf of NM. They
 correspond to errors in the "org.freedesktop.NetworkManager.SecretManager"
 namespace.
    
-
    Client APIs such as nm_client_activate_connection() will not see these error
+
    Client APIs such as nm_client_activate_connection() will not see these error
 codes; instead, the secret agent manager will translate them to the
 corresponding NMAgentManagerError codes.
    
 
    
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index a794916f..fdd9876f 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -42,7 +42,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_is_empty_ssid ()
@@ -57,7 +57,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_same_ssid ()
@@ -73,7 +73,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_security_valid ()
@@ -81,7 +81,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_ap_mode_security_valid ()
@@ -89,7 +89,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_wep_key_valid ()
@@ -97,7 +97,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_wpa_psk_valid ()
@@ -105,7 +105,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_is_json_object ()
@@ -113,7 +113,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip4_dns_to_variant ()
@@ -129,7 +129,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip4_addresses_to_variant ()
@@ -137,7 +137,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_utils_ip4_addresses_from_variant ()
@@ -145,7 +145,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip4_routes_to_variant ()
@@ -153,7 +153,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_utils_ip4_routes_from_variant ()
@@ -161,7 +161,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_ip4_netmask_to_prefix ()
@@ -169,7 +169,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_ip4_prefix_to_netmask ()
@@ -177,7 +177,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_ip4_get_default_prefix ()
@@ -185,7 +185,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip6_dns_to_variant ()
@@ -201,7 +201,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip6_addresses_to_variant ()
@@ -209,7 +209,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_utils_ip6_addresses_from_variant ()
@@ -217,7 +217,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip6_routes_to_variant ()
@@ -225,7 +225,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_utils_ip6_routes_from_variant ()
@@ -233,7 +233,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip_addresses_to_variant ()
@@ -241,7 +241,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_utils_ip_addresses_from_variant ()
@@ -249,7 +249,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip_routes_to_variant ()
@@ -257,7 +257,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_utils_ip_routes_from_variant ()
@@ -273,7 +273,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_file_is_certificate ()
@@ -281,7 +281,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_file_is_private_key ()
@@ -289,7 +289,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_file_is_pkcs12 ()
@@ -297,7 +297,7 @@
 
 
 
-gboolean
+gboolean
 
 
 (*NMUtilsFileSearchInPathsPredicate) ()
@@ -305,7 +305,7 @@
 
 
 
-gboolean
+gboolean
 
 
 (*NMUtilsCheckFilePredicate) ()
@@ -320,7 +320,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_wifi_freq_to_channel ()
@@ -328,7 +328,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_wifi_channel_to_freq ()
@@ -336,7 +336,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_wifi_find_next_channel ()
@@ -344,21 +344,21 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_wifi_is_channel_valid ()
 
 
 
-const guint *
+const guint *
 
 
 nm_utils_wifi_2ghz_freqs ()
 
 
 
-const guint *
+const guint *
 
 
 nm_utils_wifi_5ghz_freqs ()
@@ -373,7 +373,7 @@
 
 
 
-gsize
+gsize
 
 
 nm_utils_hwaddr_len ()
@@ -389,7 +389,7 @@
 
 
 
-GByteArray *
+GByteArray *
 
 
 nm_utils_hwaddr_atoba ()
@@ -397,7 +397,7 @@
 
 
 
-guint8 *
+guint8 *
 
 
 nm_utils_hwaddr_aton ()
@@ -405,7 +405,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_hwaddr_valid ()
@@ -421,7 +421,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_hwaddr_matches ()
@@ -437,7 +437,7 @@
 
 
 
-GBytes *
+GBytes *
 
 
 nm_utils_hexstr2bin ()
@@ -445,7 +445,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_iface_valid_name ()
@@ -453,7 +453,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_is_valid_iface_name ()
@@ -461,7 +461,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_is_uuid ()
@@ -483,7 +483,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_ipaddr_valid ()
@@ -491,7 +491,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_check_virtual_device_compatibility ()
@@ -522,7 +522,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_enum_from_str ()
@@ -537,12 +537,28 @@
 
 
 
-guint
+guint
 
 
 nm_utils_version ()
 
 
+
+
+GHashTable *
+
+
+nm_utils_parse_variant_attributes ()
+
+
+
+
+char *
+
+
+nm_utils_format_variant_attributes ()
+
+
 
 
    
 
    
@@ -567,6 +583,10 @@
 NM_UTILS_INET_ADDRSTRLEN
 
 
+ 
+NMVariantAttributeSpec
+
+
 struct
 stat
 
@@ -575,7 +595,7 @@
 
    
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ╰── NMUtilsSecurityType
 
    
 
    
@@ -588,9 +608,9 @@ access points and devices, among other things.
    
 
    Functions
    
 
    
 
    nm_utils_is_empty_ssid ()
    
-
    gboolean
-nm_utils_is_empty_ssid (const guint8 *ssid,
-                        gsize len);
    
+
    gboolean
+nm_utils_is_empty_ssid (const guint8 *ssid,
+                        gsize len);
    
 
    Different manufacturers use different mechanisms for not broadcasting the
 AP's SSID.  This function attempts to detect blank/empty SSIDs using a
 number of known SSID-cloaking methods.
    
@@ -619,15 +639,15 @@ number of known SSID-cloaking methods.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the SSID is "empty", FALSE if it is not
    
+
     TRUE if the SSID is "empty", FALSE if it is not
    
 
    
 
    
 
    
 
    
 
    nm_utils_escape_ssid ()
    
 
    const char *
-nm_utils_escape_ssid (const guint8 *ssid,
-                      gsize len);
    
+nm_utils_escape_ssid (const guint8 *ssid,
+                      gsize len);
    
 
    This function does a quick printable character conversion of the SSID, simply
 replacing embedded NULLs and non-printable characters with the hexadecimal
 representation of that character.  Intended for debugging only, should not
@@ -664,12 +684,12 @@ and will be overwritten by subsequent calls to this function
    
 
    
 
    
 
    nm_utils_same_ssid ()
    
-
    gboolean
-nm_utils_same_ssid (const guint8 *ssid1,
-                    gsize len1,
-                    const guint8 *ssid2,
-                    gsize len2,
-                    gboolean ignore_trailing_null);
    
+
    gboolean
+nm_utils_same_ssid (const guint8 *ssid1,
+                    gsize len1,
+                    const guint8 *ssid2,
+                    gsize len2,
+                    gboolean ignore_trailing_null);
    
 
    Earlier versions of the Linux kernel added a NULL byte to the end of the
 SSID to enable easy printing of the SSID on the console or in a terminal,
 but this behavior was problematic (SSIDs are simply byte arrays, not strings)
@@ -709,7 +729,7 @@ NULLs, even though that is functionally pointless.
    
 
 
 
    ignore_trailing_null
    
-
    TRUE to ignore one trailing NULL byte
    
+
    TRUE to ignore one trailing NULL byte
    
  
 
 
@@ -717,15 +737,15 @@ NULLs, even though that is functionally pointless.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the SSIDs are the same, FALSE if they are not
    
+
     TRUE if the SSIDs are the same, FALSE if they are not
    
 
    
 
    
 
    
 
    
 
    nm_utils_ssid_to_utf8 ()
    
 
    char *
-nm_utils_ssid_to_utf8 (const guint8 *ssid,
-                       gsize len);
    
+nm_utils_ssid_to_utf8 (const guint8 *ssid,
+                       gsize len);
    
 
    Wi-Fi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
 contain embedded NULLs and other unprintable characters.  Often it is
 useful to print the SSID out for debugging purposes, but that should be the
@@ -771,19 +791,19 @@ _only_.
    
 
    
 
    Returns
    
 
     an allocated string containing a UTF-8
-representation of the SSID, which must be freed by the caller using g_free().
-Returns NULL on errors. 
    
+representation of the SSID, which must be freed by the caller using g_free().
+Returns NULL on errors. 
    
 
    [transfer full]
    
 
    
 
    
 
    
 
    
 
    nm_utils_security_valid ()
    
-
    gboolean
+
    gboolean
 nm_utils_security_valid (NMUtilsSecurityType type,
                          NMDeviceWifiCapabilities wifi_caps,
-                         gboolean have_ap,
-                         gboolean adhoc,
+                         gboolean have_ap,
+                         gboolean adhoc,
                          NM80211ApFlags ap_flags,
                          NM80211ApSecurityFlags ap_wpa,
                          NM80211ApSecurityFlags ap_rsn);
    
@@ -848,15 +868,15 @@ e.g. (
 
    Returns
    
-
     TRUE if the device capabilities and AP capabilties intersect and are
+
     TRUE if the device capabilities and AP capabilties intersect and are
 compatible with the desired type
-, FALSE if they are not
    
+, FALSE if they are not
    
 
    
 
    
 
    
 
    
 
    nm_utils_ap_mode_security_valid ()
    
-
    gboolean
+
    gboolean
 nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
                                  NMDeviceWifiCapabilities wifi_caps);
    
 
    Given a set of device capabilities, and a desired security type to check
@@ -888,15 +908,15 @@ e.g. 
 
    
 
    Returns
    
-
     TRUE if the device capabilities are compatible with the desired
+
     TRUE if the device capabilities are compatible with the desired
 type
-, FALSE if they are not.
    
+, FALSE if they are not.
    
 
    
 
    
 
    
 
    
 
    nm_utils_wep_key_valid ()
    
-
    gboolean
+
    gboolean
 nm_utils_wep_key_valid (const char *key,
                         NMWepKeyType wep_type);
    
 
    Checks if key
@@ -925,14 +945,14 @@ nm_utils_wep_key_valid (const cha
 
    
 
    
 
    Returns
    
-
     TRUE if key
-is a WEP key, FALSE if not
    
+
     TRUE if key
+is a WEP key, FALSE if not
    
 
    
 
    
 
    
 
    
 
    nm_utils_wpa_psk_valid ()
    
-
    gboolean
+
    gboolean
 nm_utils_wpa_psk_valid (const char *psk);
    
 
    Checks if psk
  is a valid WPA PSK
    
@@ -953,16 +973,16 @@ nm_utils_wpa_psk_valid (const cha
 
    
 
    
 
    Returns
    
-
     TRUE if psk
-is a WPA PSK, FALSE if not
    
+
     TRUE if psk
+is a WPA PSK, FALSE if not
    
 
    
 
    
 
    
 
    
 
    nm_utils_is_json_object ()
    
-
    gboolean
+
    gboolean
 nm_utils_is_json_object (const char *str,
-                         GError **error);
    
+                         GError **error);
    
 
    
 
    Parameters
    
 
    
@@ -989,7 +1009,7 @@ nm_utils_is_json_object (const ch
 
    Returns
    
 
     whether the passed string is valid JSON.
 If libnm is not compiled with libjansson support, this check will
-also return TRUE for possibly invalid inputs. If that is a problem
+also return TRUE for possibly invalid inputs. If that is a problem
 for you, you must validate the JSON yourself.
    
 
 
    Since: 1.6
    
@@ -997,9 +1017,9 @@ for you, you must validate the JSON yourself.
    
 
    
 
    
 
    nm_utils_ip4_dns_to_variant ()
    
-
    GVariant *
+
    GVariant *
 nm_utils_ip4_dns_to_variant (char **dns);
    
-
    Utility function to convert an array of IP address strings int a GVariant of
+
    Utility function to convert an array of IP address strings int a GVariant of
 type 'au' representing an array of IPv4 addresses.
    
 
    
 
    Parameters
    
@@ -1018,7 +1038,7 @@ type 'au' representing an array of IPv4 addresses.
    
 
    
 
    
 
    Returns
    
-
     a new floating GVariant representing dns
+
     a new floating GVariant representing dns
 . 
    
 
    [transfer none]
    
 
    
@@ -1027,8 +1047,8 @@ type 'au' representing an array of IPv4 addresses.
    
 
    
 
    nm_utils_ip4_dns_from_variant ()
    
 
    char **
-nm_utils_ip4_dns_from_variant (GVariant *value);
    
-
    Utility function to convert a GVariant of type 'au' representing a list of
+nm_utils_ip4_dns_from_variant (GVariant *value);
    
+
    Utility function to convert a GVariant of type 'au' representing a list of
 IPv4 addresses into an array of IP address strings.
    
 
    
 
    Parameters
    
@@ -1040,29 +1060,29 @@ IPv4 addresses into an array of IP address strings.
    
 
 
    
-
+
    
 
    value
    a GVariant of type 'au'
    a GVariant of type 'au'
    		
  
 
    
 
    
 
    
 
    
 
    Returns
    
-
     a NULL-terminated array of IP address strings. 
    
+
     a NULL-terminated array of IP address strings. 
    
 
    [transfer full][type utf8]
    
 
    
 
    
 
    
 
    
 
    nm_utils_ip4_addresses_to_variant ()
    
-
    GVariant *
-nm_utils_ip4_addresses_to_variant (GPtrArray *addresses,
+
    GVariant *
+nm_utils_ip4_addresses_to_variant (GPtrArray *addresses,
                                    const char *gateway);
    
-
    Utility function to convert a GPtrArray of NMIPAddress objects representing
-IPv4 addresses into a GVariant of type 'aau' representing an array of
+
    Utility function to convert a GPtrArray of NMIPAddress objects representing
+IPv4 addresses into a GVariant of type 'aau' representing an array of
 NetworkManager IPv4 addresses (which are tuples of address, prefix, and
 gateway). The "gateway" field of the first address will get the value of
 gateway
- (if non-NULL). In all of the other addresses, that field will be 0.
    
+ (if non-NULL). In all of the other addresses, that field will be 0.
    
 
    
 
    Parameters
    
 
    
@@ -1087,7 +1107,7 @@ gateway). The "gateway" field of the first address will get the value of
 
    
 
    Returns
    
-
     a new floating GVariant representing addresses
+
     a new floating GVariant representing addresses
 . 
    
 
    [transfer none]
    
 
    
@@ -1095,12 +1115,12 @@ gateway). The "gateway" field of the first address will get the value of
 
    
 
    nm_utils_ip4_addresses_from_variant ()
    
-
    GPtrArray *
-nm_utils_ip4_addresses_from_variant (GVariant *value,
+
    GPtrArray *
+nm_utils_ip4_addresses_from_variant (GVariant *value,
                                      char **out_gateway);
    
-
    Utility function to convert a GVariant of type 'aau' representing a list of
+
    Utility function to convert a GVariant of type 'aau' representing a list of
 NetworkManager IPv4 addresses (which are tuples of address, prefix, and
-gateway) into a GPtrArray of NMIPAddress objects. The "gateway" field of
+gateway) into a GPtrArray of NMIPAddress objects. The "gateway" field of
 the first address (if set) will be returned in out_gateway
 ; the "gateway" fields
 of the other addresses are ignored.
    
@@ -1115,7 +1135,7 @@ of the other addresses are ignored.
    
 
    
-
+
@@ -1129,17 +1149,17 @@ of the other addresses are ignored.
    
 
    Returns
    
 
     a newly allocated
-GPtrArray of NMIPAddress objects. 
    
+GPtrArray of NMIPAddress objects. 
    
 
    [transfer full][element-type NMIPAddress]
    
 
    
 
    nm_utils_ip4_routes_to_variant ()
    
-
    GVariant *
-nm_utils_ip4_routes_to_variant (GPtrArray *routes);
    
-
    Utility function to convert a GPtrArray of NMIPRoute objects representing
-IPv4 routes into a GVariant of type 'aau' representing an array of
+
    GVariant *
+nm_utils_ip4_routes_to_variant (GPtrArray *routes);
    
+
    Utility function to convert a GPtrArray of NMIPRoute objects representing
+IPv4 routes into a GVariant of type 'aau' representing an array of
 NetworkManager IPv4 routes (which are tuples of route, prefix, next hop, and
 metric).
    
 
    
@@ -1159,7 +1179,7 @@ metric).
    
 
    
 
    
 
    Returns
    
-
     a new floating GVariant representing routes
+
     a new floating GVariant representing routes
 . 
    
 
    [transfer none]
    
 
    
@@ -1167,11 +1187,11 @@ metric).
    
 
    
 
    
 
    nm_utils_ip4_routes_from_variant ()
    
-
    GPtrArray *
-nm_utils_ip4_routes_from_variant (GVariant *value);
    
-
    Utility function to convert a GVariant of type 'aau' representing an array
+
    GPtrArray *
+nm_utils_ip4_routes_from_variant (GVariant *value);
    
+
    Utility function to convert a GVariant of type 'aau' representing an array
 of NetworkManager IPv4 routes (which are tuples of route, prefix, next hop,
-and metric) into a GPtrArray of NMIPRoute objects.
    
+and metric) into a GPtrArray of NMIPRoute objects.
    
 
    
 
    Parameters
    
 
    
 
 
 
    
 
    value
    a GVariant of type 'aau'
    a GVariant of type 'aau'
    		
  
 
    
 
    
 
 
 
 
    
@@ -1182,7 +1202,7 @@ and metric) into a 
    value
    
-    
+
    GVariant of type 'aau'
    GVariant of type 'aau'
    		
  
 
    
 
    
@@ -1190,15 +1210,15 @@ and metric) into a 
 
    Returns
    
 
     a newly allocated
-GPtrArray of NMIPRoute objects. 
    
+GPtrArray of NMIPRoute objects. 
    
 
    [transfer full][element-type NMIPRoute]
    
 
    
 
    
 
    
 
    
 
    nm_utils_ip4_netmask_to_prefix ()
    
-
    guint32
-nm_utils_ip4_netmask_to_prefix (guint32 netmask);
    
+
    guint32
+nm_utils_ip4_netmask_to_prefix (guint32 netmask);
    
 
    
 
    Parameters
    
 
    
@@ -1222,8 +1242,8 @@ nm_utils_ip4_netmask_to_prefix (
 
    nm_utils_ip4_prefix_to_netmask ()
    
-
    guint32
-nm_utils_ip4_prefix_to_netmask (guint32 prefix);
    
+
    guint32
+nm_utils_ip4_prefix_to_netmask (guint32 prefix);
    
 
    
 
    Parameters
    
 
    
@@ -1247,8 +1267,8 @@ nm_utils_ip4_prefix_to_netmask (
 
    nm_utils_ip4_get_default_prefix ()
    
-
    guint32
-nm_utils_ip4_get_default_prefix (guint32 ip);
    
+
    guint32
+nm_utils_ip4_get_default_prefix (guint32 ip);
    
 
    When the Internet was originally set up, various ranges of IP addresses were
 segmented into three network classes: A, B, and C.  This function will return
 a prefix that is associated with the IP address specified defining where it
@@ -1276,9 +1296,9 @@ falls in the predefined classes.
    
 
    
 
    
 
    nm_utils_ip6_dns_to_variant ()
    
-
    GVariant *
+
    GVariant *
 nm_utils_ip6_dns_to_variant (char **dns);
    
-
    Utility function to convert an array of IP address strings int a GVariant of
+
    Utility function to convert an array of IP address strings int a GVariant of
 type 'aay' representing an array of IPv6 addresses.
    
 
    
 
    Parameters
    
@@ -1297,7 +1317,7 @@ type 'aay' representing an array of IPv6 addresses.
    
 
    
 
    
 
    Returns
    
-
     a new floating GVariant representing dns
+
     a new floating GVariant representing dns
 . 
    
 
    [transfer none]
    
 
    
@@ -1306,8 +1326,8 @@ type 'aay' representing an array of IPv6 addresses.
    
 
    
 
    nm_utils_ip6_dns_from_variant ()
    
 
    char **
-nm_utils_ip6_dns_from_variant (GVariant *value);
    
-
    Utility function to convert a GVariant of type 'aay' representing a list of
+nm_utils_ip6_dns_from_variant (GVariant *value);
    
+
    Utility function to convert a GVariant of type 'aay' representing a list of
 IPv6 addresses into an array of IP address strings.
    
 
    
 
    Parameters
    
@@ -1319,29 +1339,29 @@ IPv6 addresses into an array of IP address strings.
    
 
 
    
-
+
    
 
    value
    a GVariant of type 'aay'
    a GVariant of type 'aay'
    		
  
 
    
 
    
 
    
 
    
 
    Returns
    
-
     a NULL-terminated array of IP address strings. 
    
+
     a NULL-terminated array of IP address strings. 
    
 
    [transfer full][type utf8]
    
 
    
 
    
 
    
 
    
 
    nm_utils_ip6_addresses_to_variant ()
    
-
    GVariant *
-nm_utils_ip6_addresses_to_variant (GPtrArray *addresses,
+
    GVariant *
+nm_utils_ip6_addresses_to_variant (GPtrArray *addresses,
                                    const char *gateway);
    
-
    Utility function to convert a GPtrArray of NMIPAddress objects representing
-IPv6 addresses into a GVariant of type 'a(ayuay)' representing an array of
+
    Utility function to convert a GPtrArray of NMIPAddress objects representing
+IPv6 addresses into a GVariant of type 'a(ayuay)' representing an array of
 NetworkManager IPv6 addresses (which are tuples of address, prefix, and
 gateway).  The "gateway" field of the first address will get the value of
 gateway
- (if non-NULL). In all of the other addresses, that field will be
+ (if non-NULL). In all of the other addresses, that field will be
 all 0s.
    
 
    
 
    Parameters
    
@@ -1367,7 +1387,7 @@ all 0s.
    
 
    
 
    
 
    Returns
    
-
     a new floating GVariant representing addresses
+
     a new floating GVariant representing addresses
 . 
    
 
    [transfer none]
    
 
    
@@ -1375,12 +1395,12 @@ all 0s.
    
 
    
 
    
 
    nm_utils_ip6_addresses_from_variant ()
    
-
    GPtrArray *
-nm_utils_ip6_addresses_from_variant (GVariant *value,
+
    GPtrArray *
+nm_utils_ip6_addresses_from_variant (GVariant *value,
                                      char **out_gateway);
    
-
    Utility function to convert a GVariant of type 'a(ayuay)' representing a
+
    Utility function to convert a GVariant of type 'a(ayuay)' representing a
 list of NetworkManager IPv6 addresses (which are tuples of address, prefix,
-and gateway) into a GPtrArray of NMIPAddress objects. The "gateway" field
+and gateway) into a GPtrArray of NMIPAddress objects. The "gateway" field
 of the first address (if set) will be returned in out_gateway
 ; the "gateway"
 fields of the other addresses are ignored.
    
@@ -1395,7 +1415,7 @@ fields of the other addresses are ignored.
    
 
 
 
    value
    
-
    a GVariant of type 'a(ayuay)'
    
+
    a GVariant of type 'a(ayuay)'
    
  
 
 
@@ -1409,17 +1429,17 @@ fields of the other addresses are ignored.
    
 
    
 
    Returns
    
 
     a newly allocated
-GPtrArray of NMIPAddress objects. 
    
+GPtrArray of NMIPAddress objects. 
    
 
    [transfer full][element-type NMIPAddress]
    
 
    
 
    
 
    
 
    
 
    nm_utils_ip6_routes_to_variant ()
    
-
    GVariant *
-nm_utils_ip6_routes_to_variant (GPtrArray *routes);
    
-
    Utility function to convert a GPtrArray of NMIPRoute objects representing
-IPv6 routes into a GVariant of type 'a(ayuayu)' representing an array of
+
    GVariant *
+nm_utils_ip6_routes_to_variant (GPtrArray *routes);
    
+
    Utility function to convert a GPtrArray of NMIPRoute objects representing
+IPv6 routes into a GVariant of type 'a(ayuayu)' representing an array of
 NetworkManager IPv6 routes (which are tuples of route, prefix, next hop, and
 metric).
    
 
    
@@ -1439,7 +1459,7 @@ metric).
    
 
    
 
    
 
    Returns
    
-
     a new floating GVariant representing routes
+
     a new floating GVariant representing routes
 . 
    
 
    [transfer none]
    
 
    
@@ -1447,11 +1467,11 @@ metric).
    
 
    
 
    
 
    nm_utils_ip6_routes_from_variant ()
    
-
    GPtrArray *
-nm_utils_ip6_routes_from_variant (GVariant *value);
    
-
    Utility function to convert a GVariant of type 'a(ayuayu)' representing an
+
    GPtrArray *
+nm_utils_ip6_routes_from_variant (GVariant *value);
    
+
    Utility function to convert a GVariant of type 'a(ayuayu)' representing an
 array of NetworkManager IPv6 routes (which are tuples of route, prefix, next
-hop, and metric) into a GPtrArray of NMIPRoute objects.
    
+hop, and metric) into a GPtrArray of NMIPRoute objects.
    
 
    
 
    Parameters
    
 
    
@@ -1462,7 +1482,7 @@ hop, and metric) into a 
    value
    
-    
+
    GVariant of type 'a(ayuayu)'
    GVariant of type 'a(ayuayu)'
    		
  
 
    
 
    
@@ -1470,17 +1490,17 @@ hop, and metric) into a 
 
    Returns
    
 
     a newly allocated
-GPtrArray of NMIPRoute objects. 
    
+GPtrArray of NMIPRoute objects. 
    
 
    [transfer full][element-type NMIPRoute]
    
 
    
 
    
 
    
 
    
 
    nm_utils_ip_addresses_to_variant ()
    
-
    GVariant *
-nm_utils_ip_addresses_to_variant (GPtrArray *addresses);
    
-
    Utility function to convert a GPtrArray of NMIPAddress objects representing
-IPv4 or IPv6 addresses into a GVariant of type 'aa{sv}' representing an
+
    GVariant *
+nm_utils_ip_addresses_to_variant (GPtrArray *addresses);
    
+
    Utility function to convert a GPtrArray of NMIPAddress objects representing
+IPv4 or IPv6 addresses into a GVariant of type 'aa{sv}' representing an
 array of new-style NetworkManager IP addresses. All addresses will include
 "address" (an IP address string), and "prefix" (a uint). Some addresses may
 include additional attributes.
    
@@ -1501,7 +1521,7 @@ include additional attributes.
    
 
    
 
    
 
    Returns
    
-
     a new floating GVariant representing addresses
+
     a new floating GVariant representing addresses
 . 
    
 
    [transfer none]
    
 
    
@@ -1509,12 +1529,12 @@ include additional attributes.
    
 
    
 
    
 
    nm_utils_ip_addresses_from_variant ()
    
-
    GPtrArray *
-nm_utils_ip_addresses_from_variant (GVariant *value,
+
    GPtrArray *
+nm_utils_ip_addresses_from_variant (GVariant *value,
                                     int family);
    
-
    Utility function to convert a GVariant representing a list of new-style
+
    Utility function to convert a GVariant representing a list of new-style
 NetworkManager IPv4 or IPv6 addresses (as described in the documentation for
-nm_utils_ip_addresses_to_variant()) into a GPtrArray of NMIPAddress
+nm_utils_ip_addresses_to_variant()) into a GPtrArray of NMIPAddress
 objects.
    
 
    
 
    Parameters
    
@@ -1527,7 +1547,7 @@ objects.
    
 
 
 
    value
    
-
    a GVariant of type 'aa{sv}'
    
+
    a GVariant of type 'aa{sv}'
    
  
 
 
@@ -1541,17 +1561,17 @@ objects.
    
 
    
 
    Returns
    
 
     a newly allocated
-GPtrArray of NMIPAddress objects. 
    
+GPtrArray of NMIPAddress objects. 
    
 
    [transfer full][element-type NMIPAddress]
    
 
    
 
    
 
    
 
    
 
    nm_utils_ip_routes_to_variant ()
    
-
    GVariant *
-nm_utils_ip_routes_to_variant (GPtrArray *routes);
    
-
    Utility function to convert a GPtrArray of NMIPRoute objects representing
-IPv4 or IPv6 routes into a GVariant of type 'aa{sv}' representing an array
+
    GVariant *
+nm_utils_ip_routes_to_variant (GPtrArray *routes);
    
+
    Utility function to convert a GPtrArray of NMIPRoute objects representing
+IPv4 or IPv6 routes into a GVariant of type 'aa{sv}' representing an array
 of new-style NetworkManager IP routes (which are tuples of destination,
 prefix, next hop, metric, and additional attributes).
    
 
    
@@ -1571,7 +1591,7 @@ prefix, next hop, metric, and additional attributes).
    
 
    
 
    
 
    Returns
    
-
     a new floating GVariant representing routes
+
     a new floating GVariant representing routes
 . 
    
 
    [transfer none]
    
 
    
@@ -1579,12 +1599,12 @@ prefix, next hop, metric, and additional attributes).
    
 
    
 
    
 
    nm_utils_ip_routes_from_variant ()
    
-
    GPtrArray *
-nm_utils_ip_routes_from_variant (GVariant *value,
+
    GPtrArray *
+nm_utils_ip_routes_from_variant (GVariant *value,
                                  int family);
    
-
    Utility function to convert a GVariant representing a list of new-style
+
    Utility function to convert a GVariant representing a list of new-style
 NetworkManager IPv4 or IPv6 addresses (which are tuples of destination,
-prefix, next hop, metric, and additional attributes) into a GPtrArray of
+prefix, next hop, metric, and additional attributes) into a GPtrArray of
 NMIPRoute objects.
    
 
    
 
    Parameters
    
@@ -1597,7 +1617,7 @@ prefix, next hop, metric, and additional attributes) into a 
    value
    
-
    a GVariant of type 'aa{sv}'
    
+
    a GVariant of type 'aa{sv}'
    
  
 
 
@@ -1611,7 +1631,7 @@ prefix, next hop, metric, and additional attributes) into a 
 
    Returns
    
 
     a newly allocated
-GPtrArray of NMIPRoute objects. 
    
+GPtrArray of NMIPRoute objects. 
    
 
    [transfer full][element-type NMIPRoute]
    
 
    
 
    
@@ -1623,13 +1643,13 @@ nm_utils_uuid_generate (void
 
    Returns
    
 
     a newly allocated UUID suitable for use as the NMSettingConnection
-object's “id”: property.  Should be freed with g_free()
    
+object's “id”: property.  Should be freed with g_free()
    
 
    
 
    
 
    
 
    
 
    nm_utils_file_is_certificate ()
    
-
    gboolean
+
    gboolean
 nm_utils_file_is_certificate (const char *filename);
    
 
    Tests if filename
  has a valid extension for an X.509 certificate file
@@ -1652,15 +1672,15 @@ recognized by NetworkManager.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the file is a certificate, FALSE if it is not
    
+
     TRUE if the file is a certificate, FALSE if it is not
    
 
    
 
    
 
    
 
    
 
    nm_utils_file_is_private_key ()
    
-
    gboolean
+
    gboolean
 nm_utils_file_is_private_key (const char *filename,
-                              gboolean *out_encrypted);
    
+                              gboolean *out_encrypted);
    
 
    Tests if filename
  has a valid extension for an X.509 private key file
 (".der", ".key", ".pem", or ".p12"), and contains a private key in a format
@@ -1689,13 +1709,13 @@ recognized by NetworkManager.
    
 
    
 
    
 
    Returns
    
-
     TRUE if the file is a private key, FALSE if it is not
    
+
     TRUE if the file is a private key, FALSE if it is not
    
 
    
 
    
 
    
 
    
 
    nm_utils_file_is_pkcs12 ()
    
-
    gboolean
+
    gboolean
 nm_utils_file_is_pkcs12 (const char *filename);
    
 
    Tests if filename
  is a PKCS#12 file.
    
@@ -1716,24 +1736,24 @@ nm_utils_file_is_pkcs12 (const ch
 
    
 
    
 
    Returns
    
-
     TRUE if the file is PKCS#12, FALSE if it is not
    
+
     TRUE if the file is PKCS#12, FALSE if it is not
    
 
    
 
    
 
    
 
    
 
    NMUtilsFileSearchInPathsPredicate ()
    
-
    gboolean
+
    gboolean
 (*NMUtilsFileSearchInPathsPredicate) (const char *filename,
-                                      gpointer user_data);
    
+                                      gpointer user_data);
    
 
    
 
    
 
    
 
    NMUtilsCheckFilePredicate ()
    
-
    gboolean
+
    gboolean
 (*NMUtilsCheckFilePredicate) (const char *filename,
                               const struct stat *stat,
-                              gpointer user_data,
-                              GError **error);
    
+                              gpointer user_data,
+                              GError **error);
    
 
    
 
    
 
    
@@ -1742,10 +1762,10 @@ nm_utils_file_is_pkcs12 (const ch
 nm_utils_file_search_in_paths (const char *progname,
                                const char *try_first,
                                const char *const *paths,
-                               GFileTest file_test_flags,
+                               GFileTest file_test_flags,
                                NMUtilsFileSearchInPathsPredicate predicate,
-                               gpointer user_data,
-                               GError **error);
    
+                               gpointer user_data,
+                               GError **error);
    
 
    Searches for a progname
  file in a list of search paths
 .
    
@@ -1772,16 +1792,16 @@ It is silently ignored if it is empty or not an absolute path. 
    
 
 
 
    paths
    
-
     a NULL terminated list of search paths.
-Can be empty or NULL, in which case only try_first
+
     a NULL terminated list of search paths.
+Can be empty or NULL, in which case only try_first
 is checked. 
    
 [allow-none]
 
 
 
    file_test_flags
    
-
    the flags passed to g_file_test() when searching
+
    the flags passed to g_file_test() when searching
 for progname
-. Set it to 0 to skip the g_file_test().
    
+. Set it to 0 to skip the g_file_test().
    
  
 
 
@@ -1802,7 +1822,7 @@ function. 
    
 
 
 
    error
    
-
     on failure, set a "not found" error G_IO_ERROR G_IO_ERROR_NOT_FOUND. 
    
+
     on failure, set a "not found" error G_IO_ERROR G_IO_ERROR_NOT_FOUND. 
    
 [allow-none]
 
 
@@ -1810,7 +1830,7 @@ function. 
    
 
    
 
    
 
    Returns
    
-
     the full path to the helper, if found, or NULL if not found.
+
     the full path to the helper, if found, or NULL if not found.
 The returned string is not owned by the caller, but later
 invocations of the function might overwrite it. 
    
 
    [transfer none]
    
@@ -1819,8 +1839,8 @@ invocations of the function might overwrite it. 
    
 
    
 
    
 
    nm_utils_wifi_freq_to_channel ()
    
-
    guint32
-nm_utils_wifi_freq_to_channel (guint32 freq);
    
+
    guint32
+nm_utils_wifi_freq_to_channel (guint32 freq);
    
 
    Utility function to translate a Wi-Fi frequency to its corresponding channel.
    
 
    
 
    Parameters
    
@@ -1845,8 +1865,8 @@ nm_utils_wifi_freq_to_channel (
 
    nm_utils_wifi_channel_to_freq ()
    
-
    guint32
-nm_utils_wifi_channel_to_freq (guint32 channel,
+
    guint32
+nm_utils_wifi_channel_to_freq (guint32 channel,
                                const char *band);
    
 
    Utility function to translate a Wi-Fi channel to its corresponding frequency.
    
 
    
@@ -1881,8 +1901,8 @@ is invalid
    
 
    
 
    
 
    nm_utils_wifi_find_next_channel ()
    
-
    guint32
-nm_utils_wifi_find_next_channel (guint32 channel,
+
    guint32
+nm_utils_wifi_find_next_channel (guint32 channel,
                                  int direction,
                                  char *band);
    
 
    Utility function to find out next/previous Wi-Fi channel for a channel.
    
@@ -1921,8 +1941,8 @@ nm_utils_wifi_find_next_channel (
 
    nm_utils_wifi_is_channel_valid ()
    
-
    gboolean
-nm_utils_wifi_is_channel_valid (guint32 channel,
+
    gboolean
+nm_utils_wifi_is_channel_valid (guint32 channel,
                                 const char *band);
    
 
    Utility function to verify Wi-Fi channel validity.
    
 
    
@@ -1949,13 +1969,13 @@ nm_utils_wifi_is_channel_valid (
 
    Returns
    
-
     TRUE or FALSE
    
+
     TRUE or FALSE
    
 
    
 
    
 
    
 
    
 
    nm_utils_wifi_2ghz_freqs ()
    
-
    const guint *
+
    const guint *
 nm_utils_wifi_2ghz_freqs (void);
    
 
    Utility function to return 2.4 GHz Wi-Fi frequencies (802.11bg band).
    
 
    
@@ -1967,7 +1987,7 @@ nm_utils_wifi_2ghz_freqs (void
 
    
 
    nm_utils_wifi_5ghz_freqs ()
    
-
    const guint *
+
    const guint *
 nm_utils_wifi_5ghz_freqs (void);
    
 
    Utility function to return 5 GHz Wi-Fi frequencies (802.11a band).
    
 
    
@@ -1980,7 +2000,7 @@ nm_utils_wifi_5ghz_freqs (void
 
    nm_utils_wifi_strength_bars ()
    
 
    const char *
-nm_utils_wifi_strength_bars (guint8 strength);
    
+nm_utils_wifi_strength_bars (guint8 strength);
    
 
    Converts strength
  into a 4-character-wide graphical representation of
 strength suitable for printing to stdout. If the current locale and terminal
@@ -2009,7 +2029,7 @@ support it, this will use unicode graphics characters to represent
 
    
 
    
 
    nm_utils_hwaddr_len ()
    
-
    gsize
+
    gsize
 nm_utils_hwaddr_len (int type);
    
 
    Returns the length in octets of a hardware address of type type
 .
    
@@ -2040,8 +2060,8 @@ nm_utils_hwaddr_len (int t
 
    
 
    nm_utils_hwaddr_ntoa ()
    
 
    char *
-nm_utils_hwaddr_ntoa (gconstpointer addr,
-                      gsize length);
    
+nm_utils_hwaddr_ntoa (gconstpointer addr,
+                      gsize length);
    
 
    Converts addr
  to textual form.
    
 
    
@@ -2077,12 +2097,12 @@ nm_utils_hwaddr_ntoa (
 
    nm_utils_hwaddr_atoba ()
    
-
    GByteArray *
+
    GByteArray *
 nm_utils_hwaddr_atoba (const char *asc,
-                       gsize length);
    
+                       gsize length);
    
 
    Parses asc
- and converts it to binary form in a GByteArray. See
-nm_utils_hwaddr_aton() if you don't want a GByteArray.
    
+ and converts it to binary form in a GByteArray. See
+nm_utils_hwaddr_aton() if you don't want a GByteArray.
    
 
    
 
    Parameters
    
 
    
@@ -2107,7 +2127,7 @@ nm_utils_hwaddr_atoba (const char
 
 
    
 
    Returns
    
-
     a new GByteArray, or NULL if asc
+
     a new GByteArray, or NULL if asc
 couldn't
 be parsed. 
    
 
    [transfer full]
    
@@ -2116,10 +2136,10 @@ be parsed. 
    
 
    
 
    
 
    nm_utils_hwaddr_aton ()
    
-
    guint8 *
+
    guint8 *
 nm_utils_hwaddr_aton (const char *asc,
-                      gpointer buffer,
-                      gsize length);
    
+                      gpointer buffer,
+                      gsize length);
    
 
    Parses asc
  and converts it to binary form in buffer
 .
@@ -2156,7 +2176,7 @@ the size of the buffer in bytes.
    
 
    
 
    Returns
    
 
     buffer
-, or NULL if asc
+, or NULL if asc
 couldn't be parsed
 or would be shorter or longer than length
 .
    
@@ -2165,9 +2185,9 @@ or would be shorter or longer than length
 
    
 
    nm_utils_hwaddr_valid ()
    
-
    gboolean
+
    gboolean
 nm_utils_hwaddr_valid (const char *asc,
-                       gssize length);
    
+                       gssize length);
    
 
    Parses asc
  to see if it is a valid hardware address of the given
 length.
    
@@ -2197,9 +2217,9 @@ is expected to convert to
 
    
 
    
 
    Returns
    
-
     TRUE if asc
+
     TRUE if asc
 appears to be a valid hardware address
-of the indicated length, FALSE if not.
    
+of the indicated length, FALSE if not.
    
 
    
 
    
 
    
@@ -2207,7 +2227,7 @@ of the indicated length, 
    nm_utils_hwaddr_canonical ()
    
 
    char *
 nm_utils_hwaddr_canonical (const char *asc,
-                           gssize length);
    
+                           gssize length);
 
    Parses asc
  to see if it is a valid hardware address of the given
 length, and if so, returns it in canonical form (uppercase, with
@@ -2240,18 +2260,18 @@ is expected to convert to
 
    Returns
    
 
     the canonicalized address if asc
 appears to
-be a valid hardware address of the indicated length, NULL if not. 
    
+be a valid hardware address of the indicated length, NULL if not. 
    
 
    [transfer full]
    
 
    
 
    
 
    
 
    
 
    nm_utils_hwaddr_matches ()
    
-
    gboolean
-nm_utils_hwaddr_matches (gconstpointer hwaddr1,
-                         gssize hwaddr1_len,
-                         gconstpointer hwaddr2,
-                         gssize hwaddr2_len);
    
+
    gboolean
+nm_utils_hwaddr_matches (gconstpointer hwaddr1,
+                         gssize hwaddr1_len,
+                         gconstpointer hwaddr2,
+                         gssize hwaddr2_len);
    
 
    Generalized hardware address comparison function. Tests if hwaddr1
  and
 hwaddr2
@@ -2265,7 +2285,7 @@ over a simple memcmp():
    
  before being compared.
    
 
  • If hwaddr1
  or hwaddr2
- is NULL, it is treated instead as though it was
+ is NULL, it is treated instead as though it was
  a zero-filled buffer hwaddr1_len
  or hwaddr2_len
  bytes long.
    • 
@@ -2294,7 +2314,7 @@ guaranteed to not match if they are invalid.)
    
 
    
-
+
@@ -2306,7 +2326,7 @@ is ASCII
    
     
-
+
@@ -2321,9 +2341,9 @@ is ASCII
    
 
 
    
 
    Returns
    
-
     TRUE if hwaddr1
+
     TRUE if hwaddr1
 and hwaddr2
-are equivalent, FALSE if they are
+are equivalent, FALSE if they are
 different (or either of them is invalid).
    
 
    
 
@@ -2331,8 +2351,8 @@ different (or either of them is invalid).
    
 
    
 
    nm_utils_bin2hexstr ()
    
 
    char *
-nm_utils_bin2hexstr (gconstpointer src,
-                     gsize len,
+nm_utils_bin2hexstr (gconstpointer src,
+                     gsize len,
                      int final_len);
    
 
    Converts the byte array src
  into a hexadecimal string. If final_len
@@ -2377,7 +2397,7 @@ array
    
 
    
 
    
 
    nm_utils_hexstr2bin ()
    
-
    GBytes *
+
    GBytes *
 nm_utils_hexstr2bin (const char *hex);
    
 
    Converts a hexadecimal string hex
  into an array of bytes.  The optional
@@ -2403,18 +2423,18 @@ may not start or end with ':'.
    
 
    
 
    
 
    Returns
    
-
     the converted bytes, or NULL on error. 
    
+
     the converted bytes, or NULL on error. 
    
 
    [transfer full]
    
 
    
 
    
 
    
 
    
 
    nm_utils_iface_valid_name ()
    
-
    gboolean
+
    gboolean
 nm_utils_iface_valid_name (const char *name);
    
 
    
 
    nm_utils_iface_valid_name has been deprecated since version 1.6 and should not be used in newly-written code.
    
-
    use nm_utils_is_valid_iface_name() insteead, with better error reporting.
    
+
    use nm_utils_is_valid_iface_name() instead, with better error reporting.
    
 
    
 
    Validate the network interface name.
    
 
    
@@ -2434,15 +2454,15 @@ nm_utils_iface_valid_name (const 
 
    
 
    
 
    Returns
    
-
     TRUE if interface name is valid, otherwise FALSE is returned.
    
+
     TRUE if interface name is valid, otherwise FALSE is returned.
    
 
    
 
    
 
    
 
    
 
    nm_utils_is_valid_iface_name ()
    
-
    gboolean
+
    gboolean
 nm_utils_is_valid_iface_name (const char *name,
-                              GError **error);
    
+                              GError **error);
    
 
    Validate the network interface name.
    
 
    This function is a 1:1 copy of the kernel's interface validation
 function in net/core/dev.c.
    
@@ -2462,7 +2482,7 @@ function in net/core/dev.c.
    
 
    
-
+
@@ -2470,13 +2490,13 @@ function in net/core/dev.c.
    
 
 
    
 
    Returns
    
-
     TRUE if interface name is valid, otherwise FALSE is returned.
    
+
     TRUE if interface name is valid, otherwise FALSE is returned.
    
 
    
 
 
    
 
    
 
    nm_utils_is_uuid ()
    
-
    gboolean
+
    gboolean
 nm_utils_is_uuid (const char *str);
    
 
    Checks if str
  is a UUID
    
@@ -2497,8 +2517,8 @@ nm_utils_is_uuid (const char
 
    
 
    Returns
    
-
     TRUE if str
-is a UUID, FALSE if not
    
+
     TRUE if str
+is a UUID, FALSE if not
    
 
    
 
    
 
    
@@ -2527,7 +2547,7 @@ nm_utils_inet4_ntop (in_addr_t
    dst
    
 
    Returns
    
 
     the input buffer dst
 , or a pointer to an
-internal, static buffer. NULL is not allowed as in6addr
+internal, static buffer. NULL is not allowed as in6addr
 ,
 otherwise, this function cannot fail.
    
 
@@ -2598,7 +2618,7 @@ otherwise, this function cannot fail.
    
 
    
 
    
 
    nm_utils_ipaddr_valid ()
    
-
    gboolean
+
    gboolean
 nm_utils_ipaddr_valid (int family,
                        const char *ip);
    
 
    Checks if ip
@@ -2628,16 +2648,16 @@ nm_utils_ipaddr_valid (int
 
    
 
    
 
    Returns
    
-
     TRUE or FALSE
    
+
     TRUE or FALSE
    
 
    
 
 
    
 
    
 
    nm_utils_check_virtual_device_compatibility ()
    
-
    gboolean
+
    gboolean
 nm_utils_check_virtual_device_compatibility
-                               (GType virtual_type,
-                                GType other_type);
    
+                               (GType virtual_type,
+                                GType other_type);
    
 
    Determines if a connection of type virtual_type
  can (in the
 general case) work with connections of type other_type
@@ -2651,7 +2671,7 @@ general case) work with connections of type other_ty
 then this checks if other_type
  is a valid type for a slave of that
 master.
    
-
    Note that even if this returns TRUE it is not guaranteed that
+
    Note that even if this returns TRUE it is not guaranteed that
 every connection of type other_type
  is
 compatible with virtual_type
@@ -2683,7 +2703,7 @@ underlying device driver.
    
 
    
 
    
 
    Returns
    
-
     TRUE or FALSE
    
+
     TRUE or FALSE
    
 
    
 
 
    
@@ -2750,12 +2770,12 @@ available modes.
    
 
    
 
    nm_utils_enum_to_str ()
    
 
    char *
-nm_utils_enum_to_str (GType type,
+nm_utils_enum_to_str (GType type,
                       int value);
    
 
    Converts an enum value to its string representation. If the enum is a
-G_TYPE_FLAGS the function returns a comma-separated list of matching values.
-If the enum is a G_TYPE_ENUM and the given value is not valid the
-function returns NULL.
    
+G_TYPE_FLAGS the function returns a comma-separated list of matching values.
+If the enum is a G_TYPE_ENUM and the given value is not valid the
+function returns NULL.
    
 
    
 
    Parameters
    
 
    
 
    
 
    hwaddr1
    pointer to a binary or ASCII hardware address, or NULL
    pointer to a binary or ASCII hardware address, or NULL
    		
  
 
    
 
    
 
    
 
    hwaddr2
    pointer to a binary or ASCII hardware address, or NULL
    pointer to a binary or ASCII hardware address, or NULL
    		
  
 
    
 
    
 
    
 
    error
    location to store the error occurring, or NULL to ignore
    location to store the error occurring, or NULL to ignore
    		
  
 
    
 
    the destination buffer, it must contain at least
 INET_ADDRSTRLEN or NM_UTILS_INET_ADDRSTRLEN
-characters. If set to NULL, it will return a pointer to an internal, static
+characters. If set to NULL, it will return a pointer to an internal, static
 buffer (shared with nm_utils_inet6_ntop()).  Beware, that the internal
 buffer will be overwritten with ever new call of nm_utils_inet4_ntop() or
 nm_utils_inet6_ntop() that does not provied it's own dst
@@ -2573,7 +2593,7 @@ nm_utils_inet6_ntop (const struct
 
    dst
    		
 
    the destination buffer, it must contain at least
 INET6_ADDRSTRLEN or NM_UTILS_INET_ADDRSTRLEN
-characters. If set to NULL, it will return a pointer to an internal, static
+characters. If set to NULL, it will return a pointer to an internal, static
 buffer (shared with nm_utils_inet4_ntop()).  Beware, that the internal
 buffer will be overwritten with ever new call of nm_utils_inet4_ntop() or
 nm_utils_inet6_ntop() that does not provied it's own dst
@@ -2590,7 +2610,7 @@ buffer to avoid these issues.
    		
 
    
@@ -2767,7 +2787,7 @@ function returns 
    type
    
-    
+
@@ -2780,22 +2800,22 @@ function returns 
 
    Returns
    
-
     a newly allocated string or NULL
    
+
     a newly allocated string or NULL
    
 
 
    Since: 1.2
    
 
 
    
 
    
 
    nm_utils_enum_from_str ()
    
-
    gboolean
-nm_utils_enum_from_str (GType type,
+
    gboolean
+nm_utils_enum_from_str (GType type,
                         const char *str,
                         int *out_value,
                         char **err_token);
    
 
    Converts a string to the matching enum value.
    
-
    If the enum is a G_TYPE_FLAGS the function returns the logical OR of values
+
    If the enum is a G_TYPE_FLAGS the function returns the logical OR of values
 matching the comma-separated tokens in the string; if an unknown token is found
-the function returns FALSE and stores a pointer to a newly allocated string
+the function returns FALSE and stores a pointer to a newly allocated string
 containing the unrecognized token in err_token
 .
    
 
    
@@ -2809,7 +2829,7 @@ containing the unrecognized token in err_token
 
    
-
+
@@ -2825,14 +2845,14 @@ containing the unrecognized token in err_token
 
-
+
    the GType of the enum
    the GType of the enum
    		
  
 
    
 
    
 
    type
    the GType of the enum
    the GType of the enum
    		
  
 
    
 
    err_token
    		
 
     location to store the first unrecognized token. 
    		[out][allow-none][out][allow-none][transfer full]
 
    
     
 
    
 
    
 
    
 
    Returns
    
-
     TRUE if the conversion was successful, FALSE otherwise
    
+
     TRUE if the conversion was successful, FALSE otherwise
    
 
    
 
    Since: 1.2
    
 
    
@@ -2840,9 +2860,9 @@ containing the unrecognized token in err_token
 
    nm_utils_enum_get_values ()
    
 
    const char **
-nm_utils_enum_get_values (GType type,
-                          gint from,
-                          gint to);
    
+nm_utils_enum_get_values (GType type,
+                          gint from,
+                          gint to);
    
 
    Returns the list of possible values for a given enum.
    
 
    
 
    Parameters
    
@@ -2855,7 +2875,7 @@ nm_utils_enum_get_values (
    type
    
-
    the GType of the enum
    
+
    the GType of the enum
    
  
 
 
@@ -2874,15 +2894,15 @@ nm_utils_enum_get_values (
 
    Returns
    
 
     a NULL-terminated dynamically-allocated array of static strings
-or NULL on error. 
    
-
    [transfer full]
    
+or NULL on error. 
    
+
    [transfer container]
    
 
    
 
    Since: 1.2
    
 
    
 
    
 
    
 
    nm_utils_version ()
    
-
    guint
+
    guint
 nm_utils_version (void);
    
 
    
 
    Returns
    
@@ -2891,6 +2911,74 @@ at runtime.
    
 
    
 
    Since: 1.6.0
    
 
    
+
    
+
    
+
    nm_utils_parse_variant_attributes ()
    
+
    GHashTable *
+nm_utils_parse_variant_attributes (const char *string,
+                                   char attr_separator,
+                                   char key_value_separator,
+                                   gboolean ignore_unknown,
+                                   const NMVariantAttributeSpec *const *spec,
+                                   GError **error);
    
+
    Parse attributes from a string.
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    




    string
    the input string
    		 
    attr_separator
    the attribute separator character
    		 
    key_value_separator
    character separating key and values
    		 
    ignore_unknown
    whether unknown attributes should be ignored
    		 
    spec
    the attribute format specifiers
    		 
    error
     location to store the error on failure. 
    		[out][allow-none]
    
+
    
+
    
+
    Returns
    
+
     a GHashTable mapping attribute names to GVariant values. 
    
+
    [transfer full]
    
+
    
+
    Since: 1.8
    
+
    
+
    
+
    
+
    nm_utils_format_variant_attributes ()
    
+
    char *
+nm_utils_format_variant_attributes (GHashTable *attributes,
+                                    char attr_separator,
+                                    char key_value_separator);
    
+
    
 
    
 
    
 
    Types and Values
    
@@ -2996,6 +3084,11 @@ for both 
+
    NMVariantAttributeSpec
    
+
    typedef struct _NMVariantAttributeSpec NMVariantAttributeSpec;
    
+
    
+
    
+
    
 
    struct stat
    
 
    struct stat;
    
 
    
diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html
index 3ec2defa..e4cee3e4 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -69,6 +69,12 @@
 NM_DEPRECATED_IN_1_6_FOR()
 
 
+
+#define
+
+NM_DEPRECATED_IN_1_8_FOR()
+
+
 
 
    
 
    
@@ -128,6 +134,14 @@
 #define
 NM_AVAILABLE_IN_1_6
 
+
+#define
+NM_DEPRECATED_IN_1_8
+
+
+#define
+NM_AVAILABLE_IN_1_8
+
 
 
    
 
    
@@ -165,6 +179,11 @@
 
    # define NM_DEPRECATED_IN_1_6_FOR(f)    G_DEPRECATED_FOR(f)
 
    
 
    
+
    
+
    
+
    NM_DEPRECATED_IN_1_8_FOR()
    
+
    #define             NM_DEPRECATED_IN_1_8_FOR(f)
    
+
    
 
    
 
    
 
    Types and Values
    
@@ -238,6 +257,17 @@
 
    # define NM_AVAILABLE_IN_1_6            G_UNAVAILABLE(1,6)
 
    
 
    
+
    
+
    
+
    NM_DEPRECATED_IN_1_8
    
+
    # define NM_DEPRECATED_IN_1_8           G_DEPRECATED
+
    
+
    
+
    
+
    
+
    NM_AVAILABLE_IN_1_8
    
+
    #define             NM_AVAILABLE_IN_1_8
    
+
    
 
    
 
    
 
    
diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
index 3c97de23..b4c94889 100644
--- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
@@ -33,6 +33,21 @@
 
 
    
 
    
+
    Functions
    
+
    
++++
+
+
+
+
+
    



    #define
+NM_DEPRECATED_IN_1_8_FOR()
+
    
+
    
+
    
 
    Types and Values
    
 
    @@ -305,7 +320,7 @@
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMVpnConnectionState
     ├── NMVpnConnectionStateReason
     ├── NMVpnPluginFailure
@@ -317,7 +332,10 @@
 
    
 
    Functions
    
-
    
+
    
+
    NM_DEPRECATED_IN_1_8_FOR()
    
+
    #define             NM_DEPRECATED_IN_1_8_FOR(f)
    
+
    
 
    
 
    Types and Values
    
@@ -616,6 +634,7 @@
 
    
 
    
 
    enum NMVpnConnectionStateReason
    
+
    NMVpnConnectionStateReason is deprecated and should not be used in newly-written code.
    
 
    VPN connection state reasons
    
 
    
 
    Members
    
@@ -770,6 +789,7 @@
 
    NM_VPN_PLUGIN_CONFIG_TUNDEV
    
 
    #define NM_VPN_PLUGIN_CONFIG_TUNDEV      "tundev"
 
    
+
    NM_VPN_PLUGIN_CONFIG_TUNDEV is deprecated and should not be used in newly-written code.
    
 
    
 
    
 
    
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index d4df1c65..4d0ee48d 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -1,7 +1,10 @@
 
 
   
-    
+    
+      
+      
+    
     
       
       
@@ -22,6 +25,7 @@
       
       
       
+      
       
       
       
@@ -29,6 +33,7 @@
       
       
       
+      
       
       
       
@@ -51,10 +56,12 @@
       
       
       
+      
       
       
       
       
+      
       
       
       
@@ -276,6 +283,7 @@
     
     
     
+    
     
     
     
@@ -298,6 +306,7 @@
     
     
     
+    
     
     
     
@@ -337,6 +346,7 @@
     
     
     
+    
     
     
     
@@ -397,6 +407,7 @@
     
     
     
+    
     
     
     
@@ -548,6 +559,8 @@
     
     
     
+    
+    
     
     
     
@@ -561,6 +574,8 @@
     
     
     
+    
+    
     
     
     
@@ -571,6 +586,8 @@
     
     
     
+    
+    
     
     
     
@@ -584,6 +601,8 @@
     
     
     
+    
+    
     
     
     
@@ -606,32 +625,44 @@
     
     
     
+    
+    
     
     
     
     
+    
     
     
     
     
     
     
+    
+    
     
     
     
     
     
+    
+    
     
     
     
+    
     
     
     
+    
+    
     
     
     
     
     
+    
+    
     
     
     
@@ -645,12 +676,18 @@
     
     
     
+    
     
     
     
+    
     
+    
+    
     
     
+    
+    
     
     
     
@@ -659,6 +696,7 @@
     
     
     
+    
     
     
     
@@ -666,8 +704,12 @@
     
     
     
+    
+    
     
     
+    
+    
     
     
     
@@ -804,12 +846,15 @@
     
     
     
+    
     
     
     
     
     
+    
     
+    
     
     
     
@@ -871,6 +916,9 @@
     
     
     
+    
+    
+    
     
     
     
@@ -885,6 +933,7 @@
     
     
     
+    
     
     
     
@@ -900,10 +949,12 @@
     
     
     
+    
     
     
     
     
+    
     
     
     
@@ -1004,6 +1055,8 @@
     
     
     
+    
+    
     
     
     
@@ -1048,6 +1101,19 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -1138,6 +1204,37 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -1744,6 +1841,7 @@
     
     
     
+    
     
     
     
@@ -1807,6 +1905,49 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -2008,6 +2149,7 @@
     
     
     
+    
     
     
     
@@ -2047,6 +2189,7 @@
     
     
     
+    
     
     
     
@@ -2207,7 +2350,7 @@
     
     
     
-    
+    
     
     
     
@@ -2220,15 +2363,19 @@
     
     
     
+    
+    
     
     
     
+    
     
     
     
     
     
     
+    
     
     
     
@@ -2241,6 +2388,9 @@
     
     
     
+    
+    
+    
     
     
     
@@ -2268,9 +2418,9 @@
     
     
     
-    
+    
     
-    
+    
     
     
     
@@ -2455,10 +2605,12 @@
     
     
     
+    
     
     
     
     
+    
     
     
     
@@ -2586,6 +2738,21 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -2651,6 +2818,12 @@
     
     
     
+    
+    
+    
+    
+    
+    
     
     
     
@@ -2661,6 +2834,11 @@
     
     
     
+    
+    
+    
+    
+    
     
     
     
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index a7c7bfc5..36652fe0 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -23,7 +23,7 @@
 
    
 Object Hierarchy
    
 
    -    GObject
+    GObject
     ├── NMSetting
     │   ├── NMSetting8021x
     │   ├── NMSettingAdsl
@@ -34,6 +34,7 @@
     │   ├── NMSettingCdma
     │   ├── NMSettingConnection
     │   ├── NMSettingDcb
+    │   ├── NMSettingDummy
     │   ├── NMSettingGeneric
     │   ├── NMSettingGsm
     │   ├── NMSettingInfiniband
@@ -41,7 +42,7 @@
     │   ├── NMSettingIPConfig
     │   │   ├── NMSettingIP4Config
     │   │   ╰── NMSettingIP6Config
-    │   ├── NMSettingMacsec
+    │   ├── NMSettingMacsec
     │   ├── NMSettingMacvlan
     │   ├── NMSettingOlpcMesh
     │   ├── NMSettingPpp
@@ -51,6 +52,7 @@
     │   ├── NMSettingTeamPort
     │   ├── NMSettingTeam
     │   ├── NMSettingTun
+    │   ├── NMSettingUser
     │   ├── NMSettingVlan
     │   ├── NMSettingVpn
     │   ├── NMSettingVxlan
@@ -67,11 +69,12 @@
     │   │   ├── NMDeviceBond
     │   │   ├── NMDeviceBridge
     │   │   ├── NMDeviceBt
+    │   │   ├── NMDeviceDummy
     │   │   ├── NMDeviceEthernet
     │   │   ├── NMDeviceGeneric
     │   │   ├── NMDeviceInfiniband
     │   │   ├── NMDeviceIPTunnel
-    │   │   ├── NMDeviceMacsec
+    │   │   ├── NMDeviceMacsec
     │   │   ├── NMDeviceMacvlan
     │   │   ├── NMDeviceModem
     │   │   ├── NMDeviceOlpcMesh
@@ -88,11 +91,11 @@
     ├── NMClient
     ├── NMSecretAgentOld
     ╰── NMSimpleConnection
-    GInterface
+    GInterface
     ├── NMConnection
     ├── NMVpnEditor
     ╰── NMVpnEditorPlugin
-    GFlags
+    GFlags
     ├── NM80211ApFlags
     ├── NM80211ApSecurityFlags
     ├── NMBluetoothCapabilities
@@ -102,12 +105,13 @@
     ├── NMDeviceWifiCapabilities
     ├── NMSecretAgentCapabilities
     ├── NMSecretAgentGetSecretsFlags
+    ├── NMSetting8021xAuthFlags
     ├── NMSettingDcbFlags
     ├── NMSettingSecretFlags
     ├── NMSettingWiredWakeOnLan
     ├── NMVlanFlags
     ╰── NMVpnEditorPluginCapability
-    GEnum
+    GEnum
     ├── NMAgentManagerError
     ├── NMConnectionError
     ├── NMDeviceError
@@ -117,6 +121,7 @@
     ├── NMVpnPluginError
     ├── NM80211Mode
     ├── NMActiveConnectionState
+    ├── NMActiveConnectionStateReason
     ├── NMCapability
     ├── NMClientError
     ├── NMClientPermission
@@ -137,8 +142,8 @@
     ├── NMSettingIP6ConfigAddrGenMode
     ├── NMSettingIP6ConfigPrivacy
     ├── NMSettingMacRandomization
-    ├── NMSettingMacsecMode
-    ├── NMSettingMacsecValidation
+    ├── NMSettingMacsecMode
+    ├── NMSettingMacsecValidation
     ├── NMSettingMacvlanMode
     ├── NMSettingProxyMethod
     ├── NMSettingSerialParity
@@ -153,7 +158,7 @@
     ├── NMVpnServiceState
     ├── NMWepKeyType
     ╰── NMWimaxNspNetworkType
-    GBoxed
+    GBoxed
     ├── NMDnsEntry
     ├── NMIPAddress
     ├── NMIPRoute
diff --git a/docs/libnm/html/ref-overview.html b/docs/libnm/html/ref-overview.html
index f1b5e704..d2f12619 100644
--- a/docs/libnm/html/ref-overview.html
+++ b/docs/libnm/html/ref-overview.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -17,29 +17,49 @@
 
    
-
+
    
 

 
 
 
    Home
 
 PrevNextNext
 
    
 
    
 
    
 Overview
    
+
    
+
    Introduction to libnm
    
+
    Using libnm
    
+
    
+
    
+
    
+Introduction to libnm
    
 
    
-      libnm maps fairly closely to the actual D-Bus API that NetworkManager
-      provides, wrapping the remote D-Bus objects as native GObjects,
-      mapping D-Bus signals and properties to GObject signals and properties,
-      and providing helpful accessor and utility functions.  However, unlike
-      the old libnm-util/libnm-glib API, the mapping to the D-Bus API is not
-      exact, and various inconveniences and historical anomolies of the D-Bus
-      API are papered over.
-    
    
+        libnm is a client library for NetworkManager, the standard Linux network
+        management service. NetworkManager supports a wide variety of network
+        configuration scenarios, hardware devices and protocol families. Most of
+        the functionality is exposed on a
+        D-Bus API,
+        allowing other tools to use the functionality provided by NetworkManager.
+      
    
+
    
+        libnm provides C language bindings for functionality provided by
+        NetworkManager, optionally useful from other language runtimes as well.
+      
    
 
    
-      The following is a rough overview of the libnm object structure and
-      how to use the various parts of it:
+        libnm maps fairly closely to the actual D-Bus API that NetworkManager
+        provides, wrapping the remote D-Bus objects as native GObjects,
+        mapping D-Bus signals and properties to GObject signals and properties,
+        and providing helpful accessor and utility functions.  However, unlike
+        the old libnm-util/libnm-glib API, the mapping to the D-Bus API is not
+        exact, and various inconveniences and historical anomolies of the D-Bus
+        API are papered over.
       
    
+
    
+        The following is a rough overview of the libnm object structure and
+        how to use the various parts of it:
+        
    
 
    
 
 
    
 
    
-    
    
+      
    
+
    
 
    
 
    
 
    Generated by GTK-Doc V1.25
    
diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
new file mode 100644
index 00000000..1f7cb3f6
--- /dev/null
+++ b/docs/libnm/html/usage.html
@@ -0,0 +1,166 @@
+
+
+
+
+Using libnm: libnm Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    
+Using libnm
    
+
    
+
    
+When to use libnm
    
+
    
+          libnm is fairly simple to use from C. It's based on glib and GObject.
+          If your project uses these already you'll find integration libnm with your
+          project rather convenient. In fact, the nmcli tool shipped
+          with NetworkManager is based on libnm.
+        
    
+
    
+          libnm should be also the way to go if your project does something non-trivial
+          with NetworkManager, such as manipulating the connection profiles.
+          That is, if you're writing a specialized networking control tool or a desktop
+          environment, libnm is probably the right choice. The popular desktop
+          environments in fact all use libnm directly or with nm-applet and
+          nm-connection-editor that are all based on libnm.
+        
    
+
    
+          An alternative to use of libnm is the use of the
+          D-Bus API
+          directly.  This gives you larger flexibility and reduces the overhead of linking
+          with the libnm library. This makes sense if your task is simple and you have a good
+          D-Bus library at your disposal. Activating a particular connection profile
+          from a Python script is a good example of a task that is perfectly simple
+          without using libnm.
+        
    
+
    
+
    
+
    
+How to use libnm
    
+
    
+          You can use the libnm's C API directly. To do so, all libnm programs need to
+          include NetworkManager.h that provides necessary definitions.
+          The rest of the API is documented in the reference manual.
+        
    
+
    
+  
+    
+      
+        
+        
+      
+    
+  
    1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
    #include <glib.h>
+#include <NetworkManager.h>
+
+int
+main (int argc, char *argv[])
+{
+    NMClient *client;
+
+    client = nm_client_new (NULL, NULL);
+    if (client)
+        g_print ("NetworkManager version: %s\n", nm_client_get_version (client));
+}
    
+
    
+
+
    
+          Use pkg-config for libnm to discover the necessary
+          compiler flags.
+        
    
+
    $ cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c
+  $ ./hello-nm
+  NetworkManager version: 1.8.0
+
+  $ 
    
+
    
+          Utilize the PKG_CHECK_MODULES macro to integrate with an
+          autoconf-based build system. It's also recommended to use
+          NM_VERSION_MIN_REQUIRED and NM_VERSION_MAX_ALLOWED
+          macros to tell libnm headers which API version does your application need to work with.
+          If you use them, the compiler will warn you when you use functionality that is not
+          available in the versions you specified.
+        
    
+
    
+  
+    
+      
+        
+        
+      
+    
+  
    1
+2
+3
    PKG_CHECK_MODULES(LIBNM, libnm >= 1.8)
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_8"
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8"
    
+
    
+
+
    
+          You can use libnm from other languages than C with the use of GObject introspection.
+          This includes Perl, Python, Javascript, Lua, Ruby and more. The example below shows what the
+          typical libnm use in Python would look like.
+        
    
+
    
+  
+    
+      
+        
+        
+      
+    
+  
    1
+2
+3
+4
+5
+6
    import gi
+gi.require_version('NM', '1.0')
+from gi.repository import NM
+
+client = NM.Client.new(None)
+print ("NetworkManager version " + client.get_version())
    
+
    
+
+
    
+          There's NM-1.0 Python API Reference
+          maintained a third party that is generated from the introspection metadata.
+        
    
+
    
+          In general, the C API documentation applies to the use GObject introspection
+          from other languages, with the calling convention respecting the language's
+          customs. Consult the source tree for
+          some examples.
+        
    
+
    
+
    
+
    
+
    Generated by GTK-Doc V1.25
    
+
+
\ No newline at end of file
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index fdc83666..b03efc33 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -14,7 +14,12 @@
     
 
     
-      2012-2014
+      2012
+      2013
+      2014
+      2015
+      2016
+      2017
       The NetworkManager Authors
     
 
@@ -43,24 +48,130 @@
 
   
     Overview
-    
-      libnm maps fairly closely to the actual D-Bus API that NetworkManager
-      provides, wrapping the remote D-Bus objects as native GObjects,
-      mapping D-Bus signals and properties to GObject signals and properties,
-      and providing helpful accessor and utility functions.  However, unlike
-      the old libnm-util/libnm-glib API, the mapping to the D-Bus API is not
-      exact, and various inconveniences and historical anomolies of the D-Bus
-      API are papered over.
-    
-    
-      The following is a rough overview of the libnm object structure and
-      how to use the various parts of it:
-      
-        
-          
-        
-      
-    
+    
    
+      Introduction to libnm
+      
+        libnm is a client library for NetworkManager, the standard Linux network
+        management service. NetworkManager supports a wide variety of network
+        configuration scenarios, hardware devices and protocol families. Most of
+        the functionality is exposed on a
+        D-Bus API,
+        allowing other tools to use the functionality provided by NetworkManager.
+      
+      
+        libnm provides C language bindings for functionality provided by
+        NetworkManager, optionally useful from other language runtimes as well.
+      
+      
+        libnm maps fairly closely to the actual D-Bus API that NetworkManager
+        provides, wrapping the remote D-Bus objects as native GObjects,
+        mapping D-Bus signals and properties to GObject signals and properties,
+        and providing helpful accessor and utility functions.  However, unlike
+        the old libnm-util/libnm-glib API, the mapping to the D-Bus API is not
+        exact, and various inconveniences and historical anomolies of the D-Bus
+        API are papered over.
+      
+      
+        The following is a rough overview of the libnm object structure and
+        how to use the various parts of it:
+        
+          
+            
+          
+        
+      
+    
    
+
+    
    
+      Using libnm
+      
+        When to use libnm
+        
+          libnm is fairly simple to use from C. It's based on glib and GObject.
+          If your project uses these already you'll find integration libnm with your
+          project rather convenient. In fact, the nmcli tool shipped
+          with NetworkManager is based on libnm.
+        
+        
+          libnm should be also the way to go if your project does something non-trivial
+          with NetworkManager, such as manipulating the connection profiles.
+          That is, if you're writing a specialized networking control tool or a desktop
+          environment, libnm is probably the right choice. The popular desktop
+          environments in fact all use libnm directly or with nm-applet and
+          nm-connection-editor that are all based on libnm.
+        
+        
+          An alternative to use of libnm is the use of the
+          D-Bus API
+          directly.  This gives you larger flexibility and reduces the overhead of linking
+          with the libnm library. This makes sense if your task is simple and you have a good
+          D-Bus library at your disposal. Activating a particular connection profile
+          from a Python script is a good example of a task that is perfectly simple
+          without using libnm.
+        
+      
+
+      
+        How to use libnm
+        
+          You can use the libnm's C API directly. To do so, all libnm programs need to
+          include NetworkManager.h that provides necessary definitions.
+          The rest of the API is documented in the reference manual.
+        
+        
+#include 
+
+int
+main (int argc, char *argv[])
+{
+	NMClient *client;
+
+	client = nm_client_new (NULL, NULL);
+	if (client)
+		g_print ("NetworkManager version: %s\n", nm_client_get_version (client));
+}]]>
+        
+          Use pkg-config for libnm to discover the necessary
+          compiler flags.
+        
+  $ cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c
+  $ ./hello-nm
+  NetworkManager version: &version;
+  $ 
+        
+          Utilize the PKG_CHECK_MODULES macro to integrate with an
+          autoconf-based build system. It's also recommended to use
+          NM_VERSION_MIN_REQUIRED and NM_VERSION_MAX_ALLOWED
+          macros to tell libnm headers which API version does your application need to work with.
+          If you use them, the compiler will warn you when you use functionality that is not
+          available in the versions you specified.
+        
+        = 1.8)
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_8"
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8"]]>
+        
+          You can use libnm from other languages than C with the use of GObject introspection.
+          This includes Perl, Python, Javascript, Lua, Ruby and more. The example below shows what the
+          typical libnm use in Python would look like.
+        
+        
+        
+          There's NM-1.0 Python API Reference
+          maintained a third party that is generated from the introspection metadata.
+        
+        
+          In general, the C API documentation applies to the use GObject introspection
+          from other languages, with the calling convention respecting the language's
+          customs. Consult the source tree for
+          some examples.
+        
+      
+    
    
       
 
   
@@ -87,6 +198,7 @@
     
     
     
+    
     
     
     
@@ -94,6 +206,7 @@
     
     
     
+    
     
     
     
@@ -120,10 +233,12 @@
     
     
     
+    
     
     
     
     
+    
     
     
     
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index 4f59d7aa..969bfde8 100644
--- a/docs/libnm/libnm-sections.txt
+++ b/docs/libnm/libnm-sections.txt
@@ -62,6 +62,7 @@ nm_active_connection_get_connection_type
 nm_active_connection_get_specific_object_path
 nm_active_connection_get_devices
 nm_active_connection_get_state
+nm_active_connection_get_state_reason
 nm_active_connection_get_master
 nm_active_connection_get_default
 nm_active_connection_get_ip4_config
@@ -247,6 +248,7 @@ nm_connection_get_setting_bridge_port
 nm_connection_get_setting_cdma
 nm_connection_get_setting_connection
 nm_connection_get_setting_dcb
+nm_connection_get_setting_dummy
 nm_connection_get_setting_generic
 nm_connection_get_setting_gsm
 nm_connection_get_setting_infiniband
@@ -285,6 +287,7 @@ NM_TYPE_802_11_AP_FLAGS
 NM_TYPE_802_11_AP_SECURITY_FLAGS
 NM_TYPE_802_11_MODE
 NM_TYPE_ACTIVE_CONNECTION_STATE
+NM_TYPE_ACTIVE_CONNECTION_STATE_REASON
 NM_TYPE_AGENT_MANAGER_ERROR
 NM_TYPE_BLUETOOTH_CAPABILITIES
 NM_TYPE_CAPABILITY
@@ -306,6 +309,7 @@ NM_TYPE_SECRET_AGENT_CAPABILITIES
 NM_TYPE_SECRET_AGENT_ERROR
 NM_TYPE_SECRET_AGENT_GET_SECRETS_FLAGS
 NM_TYPE_SETTINGS_ERROR
+NM_TYPE_SETTING_802_1X_AUTH_FLAGS
 NM_TYPE_SETTING_802_1X_CK_FORMAT
 NM_TYPE_SETTING_802_1X_CK_SCHEME
 NM_TYPE_SETTING_COMPARE_FLAGS
@@ -341,6 +345,7 @@ nm_802_11_ap_flags_get_type
 nm_802_11_ap_security_flags_get_type
 nm_802_11_mode_get_type
 nm_active_connection_state_get_type
+nm_active_connection_state_reason_get_type
 nm_agent_manager_error_get_type
 nm_bluetooth_capabilities_get_type
 nm_capability_get_type
@@ -361,6 +366,7 @@ nm_metered_get_type
 nm_secret_agent_capabilities_get_type
 nm_secret_agent_error_get_type
 nm_secret_agent_get_secrets_flags_get_type
+nm_setting_802_1x_auth_flags_get_type
 nm_setting_802_1x_ck_format_get_type
 nm_setting_802_1x_ck_scheme_get_type
 nm_setting_compare_flags_get_type
@@ -408,6 +414,7 @@ NMSettingBridgePort
 NMSettingCdma
 NMSettingConnection
 NMSettingDcb
+NMSettingDummy
 NMSettingGeneric
 NMSettingGsm
 NMSettingIP4Config
@@ -425,6 +432,7 @@ NMSettingSerial
 NMSettingTeam
 NMSettingTeamPort
 NMSettingTun
+NMSettingUser
 NMSettingVlan
 NMSettingVpn
 NMSettingVxlan
@@ -438,6 +446,7 @@ NMSimpleConnection
 
    
 nm-dbus-interface
 NM_AVAILABLE_IN_1_2
+NM_AVAILABLE_IN_1_8
 NM_DBUS_SERVICE
 NM_DBUS_PATH
 NM_DBUS_INTERFACE
@@ -460,6 +469,7 @@ NM_DBUS_INTERFACE_IP6_CONFIG
 NM_DBUS_INTERFACE_DHCP6_CONFIG
 NM_DBUS_INTERFACE_DEVICE_INFINIBAND
 NM_DBUS_INTERFACE_DEVICE_BOND
+NM_DBUS_INTERFACE_DEVICE_DUMMY
 NM_DBUS_INTERFACE_DEVICE_TEAM
 NM_DBUS_INTERFACE_DEVICE_VLAN
 NM_DBUS_INTERFACE_DEVICE_BRIDGE
@@ -499,6 +509,7 @@ NMDeviceState
 NMDeviceStateReason
 NMMetered
 NMActiveConnectionState
+NMActiveConnectionStateReason
 NMSecretAgentGetSecretsFlags
 NMSecretAgentCapabilities
 NM_LLDP_ATTR_DESTINATION
@@ -704,6 +715,21 @@ NM_TYPE_DEVICE_BT
 nm_device_bt_get_type
 
    
 
+
    
+nm-device-dummy
+NMDeviceDummy
+NMDeviceDummy
+
+NMDeviceDummyClass
+NM_DEVICE_DUMMY
+NM_DEVICE_DUMMY_CLASS
+NM_DEVICE_DUMMY_GET_CLASS
+NM_IS_DEVICE_DUMMY
+NM_IS_DEVICE_DUMMY_CLASS
+NM_TYPE_DEVICE_DUMMY
+nm_device_dummy_get_type
+
    
+
 
    
 nm-device-ethernet
 NMDeviceEthernet
@@ -1322,28 +1348,38 @@ NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH
 NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11
 NMSetting8021xCKFormat
 NMSetting8021xCKScheme
+NMSetting8021xAuthFlags
 NM_SETTING_802_1X_SETTING_NAME
 NM_SETTING_802_1X_EAP
 NM_SETTING_802_1X_IDENTITY
 NM_SETTING_802_1X_ANONYMOUS_IDENTITY
 NM_SETTING_802_1X_PAC_FILE
 NM_SETTING_802_1X_CA_CERT
+NM_SETTING_802_1X_CA_CERT_PASSWORD
+NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS
 NM_SETTING_802_1X_CA_PATH
 NM_SETTING_802_1X_SUBJECT_MATCH
 NM_SETTING_802_1X_ALTSUBJECT_MATCHES
 NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH
 NM_SETTING_802_1X_CLIENT_CERT
+NM_SETTING_802_1X_CLIENT_CERT_PASSWORD
+NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS
 NM_SETTING_802_1X_PHASE1_PEAPVER
 NM_SETTING_802_1X_PHASE1_PEAPLABEL
 NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
+NM_SETTING_802_1X_PHASE1_AUTH_FLAGS
 NM_SETTING_802_1X_PHASE2_AUTH
 NM_SETTING_802_1X_PHASE2_AUTHEAP
 NM_SETTING_802_1X_PHASE2_CA_CERT
+NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD
+NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS
 NM_SETTING_802_1X_PHASE2_CA_PATH
 NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
 NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
 NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH
 NM_SETTING_802_1X_PHASE2_CLIENT_CERT
+NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD
+NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS
 NM_SETTING_802_1X_PASSWORD
 NM_SETTING_802_1X_PASSWORD_FLAGS
 NM_SETTING_802_1X_PASSWORD_RAW
@@ -1357,6 +1393,7 @@ NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
 NM_SETTING_802_1X_PIN
 NM_SETTING_802_1X_PIN_FLAGS
 NM_SETTING_802_1X_SYSTEM_CA_CERTS
+NM_SETTING_802_1X_AUTH_TIMEOUT
 NMSetting8021x
 nm_setting_802_1x_new
 nm_setting_802_1x_check_cert_scheme
@@ -1377,6 +1414,8 @@ nm_setting_802_1x_get_ca_cert_blob
 nm_setting_802_1x_get_ca_cert_path
 nm_setting_802_1x_get_ca_cert_uri
 nm_setting_802_1x_set_ca_cert
+nm_setting_802_1x_get_ca_cert_password
+nm_setting_802_1x_get_ca_cert_password_flags
 nm_setting_802_1x_get_subject_match
 nm_setting_802_1x_get_num_altsubject_matches
 nm_setting_802_1x_get_altsubject_match
@@ -1390,6 +1429,8 @@ nm_setting_802_1x_get_client_cert_blob
 nm_setting_802_1x_get_client_cert_path
 nm_setting_802_1x_get_client_cert_uri
 nm_setting_802_1x_set_client_cert
+nm_setting_802_1x_get_client_cert_password
+nm_setting_802_1x_get_client_cert_password_flags
 nm_setting_802_1x_get_phase1_peapver
 nm_setting_802_1x_get_phase1_peaplabel
 nm_setting_802_1x_get_phase1_fast_provisioning
@@ -1400,6 +1441,8 @@ nm_setting_802_1x_get_phase2_ca_cert_blob
 nm_setting_802_1x_get_phase2_ca_cert_path
 nm_setting_802_1x_get_phase2_ca_cert_uri
 nm_setting_802_1x_set_phase2_ca_cert
+nm_setting_802_1x_get_phase2_ca_cert_password
+nm_setting_802_1x_get_phase2_ca_cert_password_flags
 nm_setting_802_1x_get_phase2_subject_match
 nm_setting_802_1x_get_num_phase2_altsubject_matches
 nm_setting_802_1x_get_phase2_altsubject_match
@@ -1413,6 +1456,8 @@ nm_setting_802_1x_get_phase2_client_cert_blob
 nm_setting_802_1x_get_phase2_client_cert_path
 nm_setting_802_1x_get_phase2_client_cert_uri
 nm_setting_802_1x_set_phase2_client_cert
+nm_setting_802_1x_get_phase2_client_cert_password
+nm_setting_802_1x_get_phase2_client_cert_password_flags
 nm_setting_802_1x_get_password
 nm_setting_802_1x_get_password_flags
 nm_setting_802_1x_get_password_raw
@@ -1435,6 +1480,8 @@ nm_setting_802_1x_set_phase2_private_key
 nm_setting_802_1x_get_phase2_private_key_password
 nm_setting_802_1x_get_phase2_private_key_password_flags
 nm_setting_802_1x_get_phase2_private_key_format
+nm_setting_802_1x_get_phase1_auth_flags
+nm_setting_802_1x_get_auth_timeout
 
 NMSetting8021xClass
 NM_IS_SETTING_802_1X
@@ -1622,12 +1669,14 @@ NM_SETTING_CDMA_NUMBER
 NM_SETTING_CDMA_USERNAME
 NM_SETTING_CDMA_PASSWORD
 NM_SETTING_CDMA_PASSWORD_FLAGS
+NM_SETTING_CDMA_MTU
 NMSettingCdma
 nm_setting_cdma_new
 nm_setting_cdma_get_number
 nm_setting_cdma_get_username
 nm_setting_cdma_get_password
 nm_setting_cdma_get_password_flags
+nm_setting_cdma_get_mtu
 
 NMSettingCdmaClass
 NM_IS_SETTING_CDMA
@@ -1765,6 +1814,23 @@ NM_TYPE_SETTING_DCB
 nm_setting_dcb_get_type
 
    
 
+
    
+nm-setting-dummy
+NMSettingDummy
+NM_SETTING_DUMMY_SETTING_NAME
+NMSettingDummy
+nm_setting_dummy_new
+
+NMSettingDummyClass
+NM_IS_SETTING_DUMMY
+NM_IS_SETTING_DUMMY_CLASS
+NM_SETTING_DUMMY
+NM_SETTING_DUMMY_CLASS
+NM_SETTING_DUMMY_GET_CLASS
+NM_TYPE_SETTING_DUMMY
+nm_setting_dummy_get_type
+
    
+
 
    
 nm-setting-generic
 NMSettingGeneric
@@ -1798,6 +1864,7 @@ NM_SETTING_GSM_HOME_ONLY
 NM_SETTING_GSM_DEVICE_ID
 NM_SETTING_GSM_SIM_ID
 NM_SETTING_GSM_SIM_OPERATOR_ID
+NM_SETTING_GSM_MTU
 NMSettingGsm
 nm_setting_gsm_new
 nm_setting_gsm_get_number
@@ -1810,6 +1877,7 @@ nm_setting_gsm_get_home_only
 nm_setting_gsm_get_device_id
 nm_setting_gsm_get_sim_id
 nm_setting_gsm_get_sim_operator_id
+nm_setting_gsm_get_mtu
 nm_setting_gsm_get_pin_flags
 nm_setting_gsm_get_password_flags
 
@@ -1892,6 +1960,21 @@ nm_ip_route_set_metric
 nm_ip_route_get_attribute_names
 nm_ip_route_get_attribute
 nm_ip_route_set_attribute
+nm_ip_route_get_variant_attribute_spec
+nm_ip_route_attribute_validate
+NM_IP_ROUTE_ATTRIBUTE_SRC
+NM_IP_ROUTE_ATTRIBUTE_FROM
+NM_IP_ROUTE_ATTRIBUTE_TOS
+NM_IP_ROUTE_ATTRIBUTE_WINDOW
+NM_IP_ROUTE_ATTRIBUTE_CWND
+NM_IP_ROUTE_ATTRIBUTE_INITCWND
+NM_IP_ROUTE_ATTRIBUTE_INITRWND
+NM_IP_ROUTE_ATTRIBUTE_MTU
+NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW
+NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND
+NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND
+NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND
+NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU
 NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX
 NM_SETTING_IP_CONFIG_METHOD
 NM_SETTING_IP_CONFIG_DNS
@@ -2256,13 +2339,13 @@ NM_SETTING_PROXY_METHOD
 NM_SETTING_PROXY_BROWSER_ONLY
 NM_SETTING_PROXY_PAC_URL
 NM_SETTING_PROXY_PAC_SCRIPT
+NMSettingProxy
 nm_setting_proxy_new
 nm_setting_proxy_get_method
 nm_setting_proxy_get_browser_only
 nm_setting_proxy_get_pac_url
 nm_setting_proxy_get_pac_script
 
-NMSettingProxy
 NMSettingProxyClass
 NM_IS_SETTING_PROXY
 NM_IS_SETTING_PROXY_CLASS
@@ -2369,6 +2452,27 @@ NM_TYPE_SETTING_TUN
 nm_setting_tun_get_type
 
    
 
+
    
+nm-setting-user
+NM_SETTING_USER_SETTING_NAME
+NM_SETTING_USER_DATA
+nm_setting_user_new
+nm_setting_user_get_keys
+nm_setting_user_get_data
+nm_setting_user_set_data
+nm_setting_user_check_key
+nm_setting_user_check_val
+
+NMSettingUserClass
+NM_IS_SETTING_USER
+NM_IS_SETTING_USER_CLASS
+NM_SETTING_USER
+NM_SETTING_USER_CLASS
+NM_SETTING_USER_GET_CLASS
+NM_TYPE_SETTING_USER
+nm_setting_user_get_type
+
    
+
 
    
 nm-setting-vlan
 NMSettingVlan
@@ -2725,6 +2829,7 @@ NMDeviceAdsl
 NMDeviceBond
 NMDeviceBridge
 NMDeviceBt
+NMDeviceDummy
 NMDeviceEthernet
 NMDeviceGeneric
 NMDeviceIPTunnel
@@ -2816,6 +2921,9 @@ nm_utils_enum_to_str
 nm_utils_enum_from_str
 nm_utils_enum_get_values
 nm_utils_version
+nm_utils_parse_variant_attributes
+nm_utils_format_variant_attributes
+NMVariantAttributeSpec
 stat
 
    
 
@@ -2838,6 +2946,9 @@ NM_AVAILABLE_IN_1_4
 NM_DEPRECATED_IN_1_6
 NM_DEPRECATED_IN_1_6_FOR
 NM_AVAILABLE_IN_1_6
+NM_DEPRECATED_IN_1_8
+NM_DEPRECATED_IN_1_8_FOR
+NM_AVAILABLE_IN_1_8
 
 
 
    
@@ -2861,6 +2972,7 @@ nm_vpn_connection_get_type
 
 
    
 nm-vpn-dbus-interface
+NM_DEPRECATED_IN_1_8_FOR
 NM_DBUS_PATH_VPN
 NM_DBUS_INTERFACE_VPN
 NM_DBUS_PATH_VPN_CONNECTION
diff --git a/docs/libnm/libnm.types b/docs/libnm/libnm.types
index 2cb52242..2d96d430 100644
--- a/docs/libnm/libnm.types
+++ b/docs/libnm/libnm.types
@@ -4,6 +4,7 @@ nm_802_11_mode_get_type
 nm_access_point_get_type
 nm_active_connection_get_type
 nm_active_connection_state_get_type
+nm_active_connection_state_reason_get_type
 nm_agent_manager_error_get_type
 nm_bluetooth_capabilities_get_type
 nm_capability_get_type
@@ -21,6 +22,7 @@ nm_device_bond_get_type
 nm_device_bridge_get_type
 nm_device_bt_get_type
 nm_device_capabilities_get_type
+nm_device_dummy_get_type
 nm_device_error_get_type
 nm_device_ethernet_get_type
 nm_device_generic_get_type
@@ -57,6 +59,7 @@ nm_secret_agent_capabilities_get_type
 nm_secret_agent_error_get_type
 nm_secret_agent_get_secrets_flags_get_type
 nm_secret_agent_old_get_type
+nm_setting_802_1x_auth_flags_get_type
 nm_setting_802_1x_ck_format_get_type
 nm_setting_802_1x_ck_scheme_get_type
 nm_setting_802_1x_get_type
@@ -73,6 +76,7 @@ nm_setting_connection_lldp_get_type
 nm_setting_dcb_flags_get_type
 nm_setting_dcb_get_type
 nm_setting_diff_result_get_type
+nm_setting_dummy_get_type
 nm_setting_generic_get_type
 nm_setting_get_type
 nm_setting_gsm_get_type
@@ -101,6 +105,7 @@ nm_setting_team_get_type
 nm_setting_team_port_get_type
 nm_setting_tun_get_type
 nm_setting_tun_mode_get_type
+nm_setting_user_get_type
 nm_setting_vlan_get_type
 nm_setting_vpn_get_type
 nm_setting_vxlan_get_type
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index fdd3be6d..27f9cd32 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.6.2
+1.8.0
diff --git a/examples/C/glib/add-connection-gdbus.c b/examples/C/glib/add-connection-gdbus.c
index 7a4d5939..f3b64a02 100644
--- a/examples/C/glib/add-connection-gdbus.c
+++ b/examples/C/glib/add-connection-gdbus.c
@@ -29,6 +29,11 @@
 
 #include 
 #include 
+
+#include 
+
+/* include NetworkManager.h for the defines, but we don't link against
+ * libnm. */
 #include 
 
 /* copied from libnm-core/nm-utils.c */
diff --git a/examples/C/glib/get-active-connections-gdbus.c b/examples/C/glib/get-active-connections-gdbus.c
index 6a19bf89..70bd6747 100644
--- a/examples/C/glib/get-active-connections-gdbus.c
+++ b/examples/C/glib/get-active-connections-gdbus.c
@@ -28,6 +28,11 @@
 
 #include 
 #include 
+
+#include 
+
+/* include NetworkManager.h for the defines, but we don't link against
+ * libnm. */
 #include 
 
 static void
diff --git a/examples/C/glib/list-connections-gdbus.c b/examples/C/glib/list-connections-gdbus.c
index f5922582..14a633f7 100644
--- a/examples/C/glib/list-connections-gdbus.c
+++ b/examples/C/glib/list-connections-gdbus.c
@@ -28,7 +28,8 @@
  */
 
 #include 
-#include 
+
+#include 
 
 static void
 list_connections (GDBusProxy *proxy)
diff --git a/examples/C/qt/add-connection-wired.cpp b/examples/C/qt/add-connection-wired.cpp
index fe790ecd..c06ed71f 100644
--- a/examples/C/qt/add-connection-wired.cpp
+++ b/examples/C/qt/add-connection-wired.cpp
@@ -28,10 +28,9 @@
 #include 
 #include 
 #include 
-
 #include 
 
-#include "nm-dbus-interface.h"
+#include 
 
 typedef QMap > Connection;
 Q_DECLARE_METATYPE(Connection)
diff --git a/examples/C/qt/change-ipv4-addresses.cpp b/examples/C/qt/change-ipv4-addresses.cpp
index 8ca3dde2..d403900a 100644
--- a/examples/C/qt/change-ipv4-addresses.cpp
+++ b/examples/C/qt/change-ipv4-addresses.cpp
@@ -38,9 +38,9 @@
 #include 
 #include 
 
-#include "arpa/inet.h"
+#include 
 
-#include "nm-dbus-interface.h"
+#include 
 
 typedef QMap > Connection;
 Q_DECLARE_METATYPE(Connection)
diff --git a/examples/C/qt/list-connections.cpp b/examples/C/qt/list-connections.cpp
index 66f309c8..48dd685e 100644
--- a/examples/C/qt/list-connections.cpp
+++ b/examples/C/qt/list-connections.cpp
@@ -25,10 +25,9 @@
 #include 
 #include 
 #include 
-
 #include 
 
-#include "nm-dbus-interface.h"
+#include 
 
 
 void listConnections(QDBusInterface& interface) {
diff --git a/examples/nm-conf.d/31-mac-addr-change.conf b/examples/nm-conf.d/31-mac-addr-change.conf
new file mode 100644
index 00000000..1ae2e0dc
--- /dev/null
+++ b/examples/nm-conf.d/31-mac-addr-change.conf
@@ -0,0 +1,11 @@
+# Certain drivers are known not to support changing the MAC address.
+# Disable touching the MAC address on such devices.
+#
+# See man NetworkManager.conf
+#
+# https://bugzilla.gnome.org/show_bug.cgi?id=777523
+[device-mac-addr-change-wifi]
+match-device=driver:rtl8723bs,driver:rtl8189es,driver:r8188eu,driver:eagle_sdio
+wifi.scan-rand-mac-address=no
+wifi.cloned-mac-address=preserve
+ethernet.cloned-mac-address=preserve
diff --git a/examples/python/gi/setting-user-data.py b/examples/python/gi/setting-user-data.py
new file mode 100755
index 00000000..79fb98cd
--- /dev/null
+++ b/examples/python/gi/setting-user-data.py
@@ -0,0 +1,246 @@
+#!/usr/bin/env python
+# -*- Mode: Python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# vim: ft=python ts=4 sts=4 sw=4 et ai
+
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright 2017 Red Hat, Inc.
+
+#
+# set and show user-data for a connection:
+#
+# - Show all user data for all connections:
+#   $ ./examples/python/gi/setting-user-data.py
+# - Filter to show only connections with matching id or uuid
+#   $ ./examples/python/gi/setting-user-data.py id my-connection
+#   $ ./examples/python/gi/setting-user-data.py uuid 123e4567-e89b-12d3-a456-426655440000
+# - id and uuid can be repeated to select multiple connections
+#   $ ./examples/python/gi/setting-user-data.py id my-connection1 id my-other-connection
+#
+# - Specify the user-data keys you want to see
+#   $ ./examples/python/gi/setting-user-data.py id my-connection my.user.field.1
+#   $ ./examples/python/gi/setting-user-data.py id my-connection my.user.field.1 my.other.userfield
+# - Prefix the field name with ~ to use a regex
+#   $ ./examples/python/gi/setting-user-data.py '~^my\.user\.'
+#
+# - set the fields, you need to select exactly one connection
+#   $ ./examples/python/gi/setting-user-data.py set id "$NAME" my.field.1 my-value1
+# - delete a user-setting
+#   $ ./examples/python/gi/setting-user-data.py set id "$NAME" -d my.field.1
+# - set/delete multiple user data values at once
+#   $ ./examples/python/gi/setting-user-data.py set id "$NAME" my.field.1 my-value1 -d my.other.field
+#
+# - libnm already client side rejects invalid values, like
+#   $ ./examples/python/gi/setting-user-data.py set id "$NAME" invalid_name 'has-no-dot'
+# - to allow client side to specify invalid values and send them to the
+#   server, pass --set-gobject
+#   $ ./examples/python/gi/setting-user-data.py set id "$NAME" invalid_name 'has-no-dot' --set-gobject
+#
+
+import sys
+import re
+
+import gi
+gi.require_version('NM', '1.0')
+from gi.repository import NM
+
+def pr(v):
+    import pprint
+    pprint.pprint(v, indent=4, depth=5, width=60)
+
+def parse_args():
+    args = {
+        'set': False,
+        'set-gobject': False,
+        'filter': [],
+        'data': []
+    }
+    i = 1
+    while i < len(sys.argv):
+        a = sys.argv[i]
+        if i == 1:
+            if a in ['s', 'set']:
+                args['set'] = True
+                i += 1
+                continue
+            elif a in ['g', 'get']:
+                args['set'] = False
+                i += 1
+                continue
+        if a in ['id', 'uuid']:
+            args['filter'].append((a, sys.argv[i+1]))
+            i += 2
+            continue
+
+        if a in ['--set-gobject']:
+            args['set-gobject'] = True
+            i += 1
+            continue
+
+        if a == 'data':
+            i += 1
+            a = sys.argv[i]
+        if args['set']:
+            if a == '-d':
+                args['data'].append((sys.argv[i+1], None))
+            else:
+                args['data'].append((a, sys.argv[i+1]))
+            i += 2
+        else:
+            args['data'].append(a)
+            i += 1
+
+    return args
+
+def connection_to_str(connection):
+    return '%s (%s)' % (connection.get_id(), connection.get_uuid())
+
+def connections_filter(connections, filter_data):
+    connections = list(sorted(connections, key=connection_to_str))
+    if not filter_data:
+        return connections
+    # we preserve the order of the selected connections. And
+    # if connections are selected multiple times, we return
+    # them multiple times.
+    l = []
+    for f in filter_data:
+        if f[0] == 'id':
+            for c in connections:
+                if f[1] == c.get_id():
+                    l.append(c)
+        else:
+            assert(f[0] == 'uuid')
+            for c in connections:
+                if f[1] == c.get_uuid():
+                    l.append(c)
+    return l
+
+def print_user_data(connection, data_allow_regex, data, prefix=''):
+    s_u = connection.get_setting(NM.SettingUser)
+    n = 'none'
+    keys_len = 0
+    keys = []
+    if s_u is not None:
+        all_keys = s_u.get_keys()
+        keys_len = len(all_keys)
+        if data:
+            for d in data:
+                if data_allow_regex and len(d) > 0 and d[0] == '~':
+                    r = re.compile(d[1:])
+                    keys.extend([k for k in all_keys if r.match(k)])
+                else:
+                    keys.append (d)
+        else:
+            keys.extend(all_keys)
+        n = '%s' % (keys_len)
+
+    print('%s%s [%s]' % (prefix, connection_to_str(connection), n))
+    dd = { }
+    if s_u is not None:
+        dd = s_u.get_property(NM.SETTING_USER_DATA)
+    for k in keys:
+        if s_u is not None:
+            v = s_u.get_data(k)
+            if v is None:
+                if k in dd:
+                    print('%s   INVALID:   "%s" = "%s"' % (prefix, k, dd[k]))
+                else:
+                    print('%s   MISSING:   "%s"' % (prefix, k))
+            else:
+                assert(v == dd.get(k, None))
+                print('%s   SET:       "%s" = "%s"' % (prefix, k, v))
+        else:
+            print('%s   MISSING:  "%s"' % (prefix, k))
+
+
+def do_get(connections, data):
+    first_line = True
+    connections = list(connections)
+    if not connections:
+        print('no matching connections (use id|uuid argument)')
+        sys.exit(1)
+    for c in connections:
+        if first_line:
+            first_line = False
+        else:
+            print('')
+        print_user_data(c, True, data)
+
+def do_set(connection, data, set_gobject):
+    print_user_data(connection, False,
+                    [d[0] for d in data],
+                    prefix = 'BEFORE: ')
+    print('')
+    s_u = connection.get_setting(NM.SettingUser)
+    if s_u is None:
+        connection.add_setting(NM.SettingUser())
+        s_u = connection.get_setting(NM.SettingUser)
+    for d in data:
+        key = d[0]
+        val = d[1]
+        if val is None:
+            print(' DEL: "%s"' % (key))
+        else:
+            print(' SET: "%s" = "%s"' % (key, val))
+        if set_gobject:
+            d = s_u.get_property(NM.SETTING_USER_DATA)
+            if val is None:
+                d.pop(key, None)
+            else:
+                d[key] = val
+            s_u.set_property(NM.SETTING_USER_DATA, d)
+        else:
+            try:
+                s_u.set_data(key, val)
+            except Exception as e:
+                if val is None:
+                    print('error deleting key "%s": %s' % (key, e))
+                else:
+                    print('error setting key "%s" = "%s": %s' % (key, val, e))
+                sys.exit(1)
+
+
+    try:
+        connection.commit_changes(True, None)
+    except Exception as e:
+        print('failure to commit connection: %s' % (e))
+        sys.exit(1)
+
+    print('')
+    print_user_data(connection, False,
+                    [d[0] for d in data],
+                    prefix = 'AFTER:  ')
+
+###############################################################################
+
+if __name__ == '__main__':
+    args = parse_args()
+    nm_client = NM.Client.new(None)
+
+    connections = connections_filter(nm_client.get_connections(), args['filter'])
+
+    if args['set']:
+        if not args['data']:
+            print('Requires one or more arguments to set or delete')
+            sys.exit(1)
+        if len(connections) != 1:
+            print('To set the user-data of a connection, exactly one connection must be selected via id|uuid. Instead, %s connection matched ([%s])' %
+                  (len(connections), ', '.join([connection_to_str(c) for c in connections])))
+            sys.exit(1)
+        do_set(connections[0], args['data'], args['set-gobject'])
+    else:
+        do_get(connections, args['data'])
+
diff --git a/introspection/org.freedesktop.NetworkManager.AccessPoint.xml b/introspection/org.freedesktop.NetworkManager.AccessPoint.xml
index 617c8671..769ab7a9 100644
--- a/introspection/org.freedesktop.NetworkManager.AccessPoint.xml
+++ b/introspection/org.freedesktop.NetworkManager.AccessPoint.xml
@@ -1,5 +1,10 @@
 
 
+  
   
 
     
   
 
     
diff --git a/introspection/org.freedesktop.NetworkManager.Connection.Active.xml b/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
index 383ede34..31a485c9 100644
--- a/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
+++ b/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
@@ -3,6 +3,7 @@
 
   
     
 
+    
+    
+      
+      
+    
+
     
diff --git a/introspection/org.freedesktop.NetworkManager.DHCP6Config.xml b/introspection/org.freedesktop.NetworkManager.DHCP6Config.xml
index 09e2ca86..0f064c4c 100644
--- a/introspection/org.freedesktop.NetworkManager.DHCP6Config.xml
+++ b/introspection/org.freedesktop.NetworkManager.DHCP6Config.xml
@@ -3,6 +3,7 @@
 
   
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml b/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml
index 0986f069..ef1f580f 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml
@@ -1,5 +1,10 @@
 
 
+  
   
 
     
   
 
     
   
 
     
   
 
     
+  
+
+    
+    
+      
+    
+  
+
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Generic.xml b/introspection/org.freedesktop.NetworkManager.Device.Generic.xml
index 39aafc2c..ecbfed68 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Generic.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Generic.xml
@@ -1,5 +1,10 @@
 
 
+  
   
 
     
   
 
     
   
 
     
   
 
     
   
 
     
   
 
     
   
 
     
   
 
     
   
 
     
   
 
     
   
 
     
   
 
     
   
 
     
   
 
     
   
     
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
index 1973b417..bff89120 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
@@ -1,5 +1,10 @@
 
 
+  
   
     
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.xml b/introspection/org.freedesktop.NetworkManager.Device.xml
index d4535a84..ee424101 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.xml
@@ -1,5 +1,10 @@
 
 
+  
   
 
     
diff --git a/introspection/org.freedesktop.NetworkManager.IP4Config.xml b/introspection/org.freedesktop.NetworkManager.IP4Config.xml
index 17f57bc6..0b04af94 100644
--- a/introspection/org.freedesktop.NetworkManager.IP4Config.xml
+++ b/introspection/org.freedesktop.NetworkManager.IP4Config.xml
@@ -1,5 +1,10 @@
 
 
+  
   
 
     
   
 
     
   
     
 
diff --git a/introspection/org.freedesktop.NetworkManager.SecretAgent.xml b/introspection/org.freedesktop.NetworkManager.SecretAgent.xml
index 33296fb0..654b3f2f 100644
--- a/introspection/org.freedesktop.NetworkManager.SecretAgent.xml
+++ b/introspection/org.freedesktop.NetworkManager.SecretAgent.xml
@@ -3,6 +3,7 @@
 
   
diff --git a/introspection/org.freedesktop.NetworkManager.Settings.xml b/introspection/org.freedesktop.NetworkManager.Settings.xml
index 32675e02..61940f91 100644
--- a/introspection/org.freedesktop.NetworkManager.Settings.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.xml
@@ -3,6 +3,7 @@
 
   
@@ -38,7 +39,7 @@
     
diff --git a/introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml b/introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml
index 7eed9721..0c68f76e 100644
--- a/introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml
+++ b/introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml
@@ -3,6 +3,7 @@
 
   
   
 
     
   
     
 
@@ -395,6 +400,15 @@
 
         The overall state of the NetworkManager daemon.
 
+        This takes state of all active connections and the connectivity state into account
+        to produce a single indicator of the network accessibility status.
+
+        The graphical shells may use this property to provide network connection status
+        indication and applications may use this to check if Internet connection is
+        accessible. Shell that is able to cope with captive portals should use the
+        "Connectivity" property to decide whether to present a captive portal authentication
+        dialog.
+
         Returns: NMState
     -->
     
@@ -412,7 +426,19 @@
     
diff --git a/libnm-core/crypto_nss.c b/libnm-core/crypto_nss.c
index b5d7e630..56e91e26 100644
--- a/libnm-core/crypto_nss.c
+++ b/libnm-core/crypto_nss.c
@@ -91,7 +91,7 @@ crypto_decrypt (const char *cipher,
 	PK11Context *ctx = NULL;
 	SECStatus s;
 	gboolean success = FALSE;
-	unsigned int pad_len = 0, extra = 0;
+	unsigned pad_len = 0, extra = 0;
 	guint32 i, real_iv_len = 0;
 
 	if (!crypto_init (error))
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index 40322427..ecfb9780 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -73,10 +73,6 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-
-static NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error);
-
-
 /*****************************************************************************/
 
 static void
@@ -128,23 +124,15 @@ nm_connection_add_setting (NMConnection *connection, NMSetting *setting)
 	g_signal_emit (connection, signals[CHANGED], 0);
 }
 
-/**
- * nm_connection_remove_setting:
- * @connection: a #NMConnection
- * @setting_type: the #GType of the setting object to remove
- *
- * Removes the #NMSetting with the given #GType from the #NMConnection.  This
- * operation dereferences the #NMSetting object.
- **/
-void
-nm_connection_remove_setting (NMConnection *connection, GType setting_type)
+gboolean
+_nm_connection_remove_setting (NMConnection *connection, GType setting_type)
 {
 	NMConnectionPrivate *priv;
 	NMSetting *setting;
 	const char *setting_name;
 
-	g_return_if_fail (NM_IS_CONNECTION (connection));
-	g_return_if_fail (g_type_is_a (setting_type, NM_TYPE_SETTING));
+	g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
+	g_return_val_if_fail (g_type_is_a (setting_type, NM_TYPE_SETTING), FALSE);
 
 	priv = NM_CONNECTION_GET_PRIVATE (connection);
 	setting_name = g_type_name (setting_type);
@@ -153,7 +141,23 @@ nm_connection_remove_setting (NMConnection *connection, GType setting_type)
 		g_signal_handlers_disconnect_by_func (setting, setting_changed_cb, connection);
 		g_hash_table_remove (priv->settings, setting_name);
 		g_signal_emit (connection, signals[CHANGED], 0);
+		return TRUE;
 	}
+	return FALSE;
+}
+
+/**
+ * nm_connection_remove_setting:
+ * @connection: a #NMConnection
+ * @setting_type: the #GType of the setting object to remove
+ *
+ * Removes the #NMSetting with the given #GType from the #NMConnection.  This
+ * operation dereferences the #NMSetting object.
+ **/
+void
+nm_connection_remove_setting (NMConnection *connection, GType setting_type)
+{
+	_nm_connection_remove_setting (connection, setting_type);
 }
 
 /**
@@ -602,17 +606,17 @@ static gboolean
 _normalize_connection_uuid (NMConnection *self)
 {
 	NMSettingConnection *s_con = nm_connection_get_setting_connection (self);
-	char *uuid;
+	char uuid[37];
 
-	g_assert (s_con);
+	nm_assert (s_con);
 
 	if (nm_setting_connection_get_uuid (s_con))
 		return FALSE;
 
-	uuid = nm_utils_uuid_generate ();
-	g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL);
-	g_free (uuid);
-
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_UUID,
+	              nm_utils_uuid_generate_buf (uuid),
+	              NULL);
 	return TRUE;
 }
 
@@ -986,6 +990,38 @@ _normalize_team_port_config (NMConnection *self, GHashTable *parameters)
 	return FALSE;
 }
 
+static gboolean
+_normalize_required_settings (NMConnection *self, GHashTable *parameters)
+{
+	if (nm_connection_get_setting_vlan (self)) {
+		if (!nm_connection_get_setting_wired (self)) {
+			nm_connection_add_setting (self, nm_setting_wired_new ());
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+static gboolean
+_normalize_invalid_slave_port_settings (NMConnection *self, GHashTable *parameters)
+{
+	NMSettingConnection *s_con = nm_connection_get_setting_connection (self);
+	const char *slave_type;
+	gboolean changed = FALSE;
+
+	slave_type = nm_setting_connection_get_slave_type (s_con);
+
+	if (   !nm_streq0 (slave_type, NM_SETTING_BRIDGE_SETTING_NAME)
+	    && _nm_connection_remove_setting (self, NM_TYPE_SETTING_BRIDGE_PORT))
+		changed = TRUE;
+
+	if (   !nm_streq0 (slave_type, NM_SETTING_TEAM_SETTING_NAME)
+	    && _nm_connection_remove_setting (self, NM_TYPE_SETTING_TEAM_PORT))
+		changed = TRUE;
+
+	return changed;
+}
+
 /**
  * nm_connection_verify:
  * @connection: the #NMConnection to verify
@@ -1017,7 +1053,7 @@ nm_connection_verify (NMConnection *connection, GError **error)
 	return result == NM_SETTING_VERIFY_SUCCESS || result == NM_SETTING_VERIFY_NORMALIZABLE;
 }
 
-static NMSettingVerifyResult
+NMSettingVerifyResult
 _nm_connection_verify (NMConnection *connection, GError **error)
 {
 	NMConnectionPrivate *priv;
@@ -1233,8 +1269,10 @@ nm_connection_normalize (NMConnection *connection,
 	was_modified |= _normalize_connection_uuid (connection);
 	was_modified |= _normalize_connection_type (connection);
 	was_modified |= _normalize_connection_slave_type (connection);
-	was_modified |= _normalize_ethernet_link_neg (connection);
+	was_modified |= _normalize_required_settings (connection, parameters);
+	was_modified |= _normalize_invalid_slave_port_settings (connection, parameters);
 	was_modified |= _normalize_ip_config (connection, parameters);
+	was_modified |= _normalize_ethernet_link_neg (connection);
 	was_modified |= _normalize_infiniband_mtu (connection, parameters);
 	was_modified |= _normalize_bond_mode (connection, parameters);
 	was_modified |= _normalize_wireless_mac_address_randomization (connection, parameters);
@@ -1845,6 +1883,7 @@ nm_connection_is_virtual (NMConnection *connection)
 	g_return_val_if_fail (type != NULL, FALSE);
 
 	if (   !strcmp (type, NM_SETTING_BOND_SETTING_NAME)
+	    || !strcmp (type, NM_SETTING_DUMMY_SETTING_NAME)
 	    || !strcmp (type, NM_SETTING_TEAM_SETTING_NAME)
 	    || !strcmp (type, NM_SETTING_BRIDGE_SETTING_NAME)
 	    || !strcmp (type, NM_SETTING_VLAN_SETTING_NAME)
@@ -2054,6 +2093,24 @@ nm_connection_get_setting_dcb (NMConnection *connection)
 	return (NMSettingDcb *) nm_connection_get_setting (connection, NM_TYPE_SETTING_DCB);
 }
 
+/**
+ * nm_connection_get_setting_dummy:
+ * @connection: the #NMConnection
+ *
+ * A shortcut to return any #NMSettingDummy the connection might contain.
+ *
+ * Returns: (transfer none): an #NMSettingDummy if the connection contains one, otherwise %NULL
+ *
+ * Since: 1.8
+ **/
+NMSettingDummy *
+nm_connection_get_setting_dummy (NMConnection *connection)
+{
+	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
+
+	return (NMSettingDummy *) nm_connection_get_setting (connection, NM_TYPE_SETTING_DUMMY);
+}
+
 /**
  * nm_connection_get_setting_generic:
  * @connection: the #NMConnection
@@ -2461,13 +2518,12 @@ nm_connection_private_free (NMConnectionPrivate *priv)
 static NMConnectionPrivate *
 nm_connection_get_private (NMConnection *connection)
 {
-	static GQuark key = 0;
+	GQuark key;
 	NMConnectionPrivate *priv;
 
 	nm_assert (NM_IS_CONNECTION (connection));
 
-	if (G_UNLIKELY (key == 0))
-		key = g_quark_from_static_string ("NMConnectionPrivate");
+	key = NM_CACHED_QUARK ("NMConnectionPrivate");
 
 	priv = g_object_get_qdata ((GObject *) connection, key);
 	if (!priv) {
diff --git a/libnm-core/nm-connection.h b/libnm-core/nm-connection.h
index 36ef7b6f..fae9862a 100644
--- a/libnm-core/nm-connection.h
+++ b/libnm-core/nm-connection.h
@@ -27,9 +27,9 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
-#include 
-#include 
+#include "nm-core-types.h"
+#include "nm-setting.h"
+#include "nm-errors.h"
 
 G_BEGIN_DECLS
 
@@ -199,6 +199,8 @@ NMSettingBridgePort *      nm_connection_get_setting_bridge_port       (NMConnec
 NMSettingCdma *            nm_connection_get_setting_cdma              (NMConnection *connection);
 NMSettingConnection *      nm_connection_get_setting_connection        (NMConnection *connection);
 NMSettingDcb *             nm_connection_get_setting_dcb               (NMConnection *connection);
+NM_AVAILABLE_IN_1_8
+NMSettingDummy *           nm_connection_get_setting_dummy             (NMConnection *connection);
 NMSettingGeneric *         nm_connection_get_setting_generic           (NMConnection *connection);
 NMSettingGsm *             nm_connection_get_setting_gsm               (NMConnection *connection);
 NMSettingInfiniband *      nm_connection_get_setting_infiniband        (NMConnection *connection);
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 74f45100..ac292bfc 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -45,6 +45,7 @@
 #include "nm-setting-cdma.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-dcb.h"
+#include "nm-setting-dummy.h"
 #include "nm-setting-generic.h"
 #include "nm-setting-gsm.h"
 #include "nm-setting-infiniband.h"
@@ -117,6 +118,26 @@ gboolean _nm_connection_replace_settings (NMConnection *connection,
                                           NMSettingParseFlags parse_flags,
                                           GError **error);
 
+/**
+ * NMSettingVerifyResult:
+ * @NM_SETTING_VERIFY_SUCCESS: the setting verifies successfully
+ * @NM_SETTING_VERIFY_ERROR: the setting has a serious misconfiguration
+ * @NM_SETTING_VERIFY_NORMALIZABLE: the setting is valid but has properties
+ * that should be normalized
+ * @NM_SETTING_VERIFY_NORMALIZABLE_ERROR: the setting is invalid but the
+ * errors can be fixed by nm_connection_normalize().
+ */
+typedef enum {
+	NM_SETTING_VERIFY_SUCCESS       = TRUE,
+	NM_SETTING_VERIFY_ERROR         = FALSE,
+	NM_SETTING_VERIFY_NORMALIZABLE  = 2,
+	NM_SETTING_VERIFY_NORMALIZABLE_ERROR = 3,
+} NMSettingVerifyResult;
+
+NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error);
+
+gboolean _nm_connection_remove_setting (NMConnection *connection, GType setting_type);
+
 NMConnection *_nm_simple_connection_new_from_dbus (GVariant      *dict,
                                                    NMSettingParseFlags parse_flags,
                                                    GError       **error);
@@ -154,8 +175,6 @@ gssize _nm_utils_ptrarray_find_first (gconstpointer *list, gssize len, gconstpoi
 gssize _nm_utils_ptrarray_find_binary_search (gconstpointer *list, gsize len, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data);
 gssize _nm_utils_array_find_binary_search (gconstpointer list, gsize elem_size, gsize len, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data);
 
-gssize      _nm_utils_strv_find_first (char **list, gssize len, const char *needle);
-
 char **_nm_utils_strv_cleanup (char **strv,
                                gboolean strip_whitespace,
                                gboolean skip_empty,
@@ -185,6 +204,8 @@ gboolean _nm_utils_check_module_file (const char *name,
                                       gpointer user_data,
                                       GError **error);
 
+char *_nm_utils_enum_to_str_full (GType type, int value, const char *sep);
+
 #define NM_UTILS_UUID_TYPE_LEGACY            0
 #define NM_UTILS_UUID_TYPE_VARIANT3          1
 
@@ -344,4 +365,6 @@ gboolean _nm_utils_inet6_is_token (const struct in6_addr *in6addr);
 
 gboolean    _nm_utils_team_config_equal (const char *conf1, const char *conf2, gboolean port);
 
+/*****************************************************************************/
+
 #endif
diff --git a/libnm-core/nm-core-types.h b/libnm-core/nm-core-types.h
index 2948b5f5..3b9ec37b 100644
--- a/libnm-core/nm-core-types.h
+++ b/libnm-core/nm-core-types.h
@@ -23,9 +23,9 @@
 
 #include 
 
-#include 
-#include 
-#include 
+#include "nm-version.h"
+#include "nm-dbus-interface.h"
+#include "nm-core-enum-types.h"
 
 typedef struct _NMConnection              NMConnection;
 typedef struct _NMSetting                 NMSetting;
@@ -38,6 +38,7 @@ typedef struct _NMSettingBridgePort       NMSettingBridgePort;
 typedef struct _NMSettingCdma             NMSettingCdma;
 typedef struct _NMSettingConnection       NMSettingConnection;
 typedef struct _NMSettingDcb              NMSettingDcb;
+typedef struct _NMSettingDummy            NMSettingDummy;
 typedef struct _NMSettingGeneric          NMSettingGeneric;
 typedef struct _NMSettingGsm              NMSettingGsm;
 typedef struct _NMSettingInfiniband       NMSettingInfiniband;
@@ -55,6 +56,7 @@ typedef struct _NMSettingSerial           NMSettingSerial;
 typedef struct _NMSettingTeam             NMSettingTeam;
 typedef struct _NMSettingTeamPort         NMSettingTeamPort;
 typedef struct _NMSettingTun              NMSettingTun;
+typedef struct _NMSettingUser             NMSettingUser;
 typedef struct _NMSettingVlan             NMSettingVlan;
 typedef struct _NMSettingVpn              NMSettingVpn;
 typedef struct _NMSettingVxlan            NMSettingVxlan;
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index d2d54f69..8abc91bb 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -30,6 +30,7 @@
 
 #ifndef NM_VERSION_H
 #define NM_AVAILABLE_IN_1_2
+#define NM_AVAILABLE_IN_1_8
 #endif
 
 /*
@@ -58,6 +59,7 @@
 #define NM_DBUS_INTERFACE_DHCP6_CONFIG      NM_DBUS_INTERFACE ".DHCP6Config"
 #define NM_DBUS_INTERFACE_DEVICE_INFINIBAND NM_DBUS_INTERFACE_DEVICE ".Infiniband"
 #define NM_DBUS_INTERFACE_DEVICE_BOND       NM_DBUS_INTERFACE_DEVICE ".Bond"
+#define NM_DBUS_INTERFACE_DEVICE_DUMMY      NM_DBUS_INTERFACE_DEVICE ".Dummy"
 #define NM_DBUS_INTERFACE_DEVICE_TEAM       NM_DBUS_INTERFACE_DEVICE ".Team"
 #define NM_DBUS_INTERFACE_DEVICE_VLAN       NM_DBUS_INTERFACE_DEVICE ".Vlan"
 #define NM_DBUS_INTERFACE_DEVICE_BRIDGE     NM_DBUS_INTERFACE_DEVICE ".Bridge"
@@ -105,14 +107,32 @@ typedef enum {
 
 /**
  * NMState:
- * @NM_STATE_UNKNOWN: networking state is unknown
- * @NM_STATE_ASLEEP: networking is not enabled
- * @NM_STATE_DISCONNECTED: there is no active network connection
- * @NM_STATE_DISCONNECTING: network connections are being cleaned up
- * @NM_STATE_CONNECTING: a network connection is being started
- * @NM_STATE_CONNECTED_LOCAL: there is only local IPv4 and/or IPv6 connectivity
- * @NM_STATE_CONNECTED_SITE: there is only site-wide IPv4 and/or IPv6 connectivity
- * @NM_STATE_CONNECTED_GLOBAL: there is global IPv4 and/or IPv6 Internet connectivity
+ * @NM_STATE_UNKNOWN: Networking state is unknown. This indicates a daemon error
+ *    that makes it unable to reasonably assess the state. In such event the
+ *    applications are expected to assume Internet connectivity might be present
+ *    and not disable controls that require network access.
+ *    The graphical shells may hide the network accessibility indicator altogether
+ *    since no meaningful status indication can be provided.
+ * @NM_STATE_ASLEEP: Networking is not enabled, the system is being suspended or
+ *    resumed from suspend.
+ * @NM_STATE_DISCONNECTED: There is no active network connection.
+ *    The graphical shell should indicate  no network connectivity and the
+ *    applications should not attempt to access the network.
+ * @NM_STATE_DISCONNECTING: Network connections are being cleaned up.
+ *    The applications should tear down their network sessions.
+ * @NM_STATE_CONNECTING: A network connection is being started
+ *    The graphical shell should indicate the network is being connected while
+ *    the applications should still make no attempts to connect the network.
+ * @NM_STATE_CONNECTED_LOCAL: There is only local IPv4 and/or IPv6 connectivity,
+ *    but no default route to access the Internet. The graphical shell should
+ *    indicate no network connectivity.
+ * @NM_STATE_CONNECTED_SITE: There is only site-wide IPv4 and/or IPv6 connectivity.
+ *    This means a default route is available, but the Internet connectivity check
+ *    (see "Connectivity" property) did not succeed. The graphical shell should
+ *    indicate limited network connectivity.
+ * @NM_STATE_CONNECTED_GLOBAL: There is global IPv4 and/or IPv6 Internet connectivity
+ *    This means the Internet connectivity check succeeded, the graphical shell should
+ *    indicate full network connectivity.
  *
  * #NMState values indicate the current overall networking state.
  **/
@@ -129,12 +149,23 @@ typedef enum {
 
 /**
  * NMConnectivityState:
- * @NM_CONNECTIVITY_UNKNOWN: Network connectivity is unknown.
- * @NM_CONNECTIVITY_NONE: The host is not connected to any network.
- * @NM_CONNECTIVITY_PORTAL: The host is behind a captive portal and
- *   cannot reach the full Internet.
- * @NM_CONNECTIVITY_LIMITED: The host is connected to a network, but
- *   does not appear to be able to reach the full Internet.
+ * @NM_CONNECTIVITY_UNKNOWN: Network connectivity is unknown. This means the
+ *   connectivity checks are disabled (e.g. on server installations) or has
+ *   not run yet. The graphical shell should assume the Internet connection
+ *   might be available and not present a captive portal window.
+ * @NM_CONNECTIVITY_NONE: The host is not connected to any network. There's
+ *   no active connection that contains a default route to the internet and
+ *   thus it makes no sense to even attempt a connectivity check. The graphical
+ *   shell should use this state to indicate the network connection is unavailable.
+ * @NM_CONNECTIVITY_PORTAL: The Internet connection is hijacked by a captive
+ *   portal gateway. The graphical shell may open a sandboxed web browser window
+ *   (because the captive portals typically attempt a man-in-the-middle attacks
+ *   agains the https connections) for the purpose of authenticating to a gateway
+ *   and retrigger the connectivity check with CheckConnectivity() when the
+ *   browser window is dismissed.
+ * @NM_CONNECTIVITY_LIMITED: The host is connected to a network, does not appear
+ *   to be able to reach the full Internet, but a captive portal has not been
+ *   detected.
  * @NM_CONNECTIVITY_FULL: The host is connected to a network, and
  *   appears to be able to reach the full Internet.
  */
@@ -171,6 +202,7 @@ typedef enum {
  * @NM_DEVICE_TYPE_VXLAN: a VXLAN interface
  * @NM_DEVICE_TYPE_VETH: a VETH interface
  * @NM_DEVICE_TYPE_MACSEC: a MACsec interface
+ * @NM_DEVICE_TYPE_DUMMY: a dummy interface
  *
  * #NMDeviceType values indicate the type of hardware represented by a
  * device object.
@@ -198,6 +230,7 @@ typedef enum {
 	NM_DEVICE_TYPE_VXLAN      = 19,
 	NM_DEVICE_TYPE_VETH       = 20,
 	NM_DEVICE_TYPE_MACSEC     = 21,
+	NM_DEVICE_TYPE_DUMMY      = 22,
 } NMDeviceType;
 
 /**
@@ -206,6 +239,7 @@ typedef enum {
  * @NM_DEVICE_CAP_NM_SUPPORTED: NetworkManager supports this device
  * @NM_DEVICE_CAP_CARRIER_DETECT: this device can indicate carrier status
  * @NM_DEVICE_CAP_IS_SOFTWARE: this device is a software device
+ * @NM_DEVICE_CAP_SRIOV: this device supports single-root I/O virtualization
  *
  * General device capability flags.
  **/
@@ -214,9 +248,9 @@ typedef enum { /*< flags >*/
 	NM_DEVICE_CAP_NM_SUPPORTED   = 0x00000001,
 	NM_DEVICE_CAP_CARRIER_DETECT = 0x00000002,
 	NM_DEVICE_CAP_IS_SOFTWARE    = 0x00000004,
+	NM_DEVICE_CAP_SRIOV          = 0x00000008,
 } NMDeviceCapabilities;
 
-
 /**
  * NMDeviceWifiCapabilities:
  * @NM_WIFI_DEVICE_CAP_NONE: device has no encryption/authentication capabilities
@@ -608,6 +642,62 @@ typedef enum {
 	NM_ACTIVE_CONNECTION_STATE_DEACTIVATED  = 4,
 } NMActiveConnectionState;
 
+/**
+ * NMActiveConnectionStateReason:
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN: The reason for the active connection
+ *   state change is unknown.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_NONE: No reason was given for the active
+ *   connection state change.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED: The active connection changed
+ *   state because the user disconnected it.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED: The active connection
+ *   changed state because the device it was using was disconnected.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED: The service providing the
+ *   VPN connection was stopped.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID: The IP config of the active
+ *   connection was invalid.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT: The connection attempt to
+ *   the VPN service timed out.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT: A timeout occurred
+ *   while starting the service providing the VPN connection.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED: Starting the service
+ *   providing the VPN connection failed.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS: Necessary secrets for the
+ *   connection were not provided.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED: Authentication to the
+ *   server failed.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED: The connection was
+ *   deleted from settings.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_DEPENDENCY_FAILED: Master connection of this
+ *   connection failed to activate.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REALIZE_FAILED: Could not create the
+ *   software device link.
+ * @NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REMOVED: The device this connection
+ *   depended on disappeared.
+ *
+ * Active connection state reasons.
+ *
+ * Since: 1.8
+ */
+NM_AVAILABLE_IN_1_8
+typedef enum {
+	NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN                  = 0,
+	NM_ACTIVE_CONNECTION_STATE_REASON_NONE                     = 1,
+	NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED        = 2,
+	NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED      = 3,
+	NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED          = 4,
+	NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID        = 5,
+	NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT          = 6,
+	NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT    = 7,
+	NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED     = 8,
+	NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS               = 9,
+	NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED             = 10,
+	NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED       = 11,
+	NM_ACTIVE_CONNECTION_STATE_REASON_DEPENDENCY_FAILED        = 12,
+	NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REALIZE_FAILED    = 13,
+	NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REMOVED           = 14,
+} NMActiveConnectionStateReason;
+
 /**
  * NMSecretAgentGetSecretsFlags:
  * @NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE: no special behavior; by default no
@@ -661,6 +751,7 @@ typedef enum /*< flags >*/ {
 
 #ifndef NM_VERSION_H
 #undef NM_AVAILABLE_IN_1_2
+#undef NM_AVAILABLE_IN_1_8
 #endif
 
 #define NM_LLDP_ATTR_DESTINATION             "destination"
diff --git a/libnm-core/nm-dbus-types.xml b/libnm-core/nm-dbus-types.xml
index 7c6389d4..4e30034c 100644
--- a/libnm-core/nm-dbus-types.xml
+++ b/libnm-core/nm-dbus-types.xml
@@ -55,42 +55,42 @@
             
               NM_STATE_UNKNOWN
               = 0
-              networking state is unknown
+              Networking state is unknown. This indicates a daemon error that makes it unable to reasonably assess the state. In such event the applications are expected to assume Internet connectivity might be present and not disable controls that require network access. The graphical shells may hide the network accessibility indicator altogether since no meaningful status indication can be provided.
             
             
               NM_STATE_ASLEEP
               = 10
-              networking is not enabled
+              Networking is not enabled, the system is being suspended or resumed from suspend.
             
             
               NM_STATE_DISCONNECTED
               = 20
-              there is no active network connection
+              There is no active network connection. The graphical shell should indicate  no network connectivity and the applications should not attempt to access the network.
             
             
               NM_STATE_DISCONNECTING
               = 30
-              network connections are being cleaned up
+              Network connections are being cleaned up. The applications should tear down their network sessions.
             
             
               NM_STATE_CONNECTING
               = 40
-              a network connection is being started
+              A network connection is being started The graphical shell should indicate the network is being connected while the applications should still make no attempts to connect the network.
             
             
               NM_STATE_CONNECTED_LOCAL
               = 50
-              there is only local IPv4 and/or IPv6 connectivity
+              There is only local IPv4 and/or IPv6 connectivity, but no default route to access the Internet. The graphical shell should indicate no network connectivity.
             
             
               NM_STATE_CONNECTED_SITE
               = 60
-              there is only site-wide IPv4 and/or IPv6 connectivity
+              There is only site-wide IPv4 and/or IPv6 connectivity. This means a default route is available, but the Internet connectivity check (see "Connectivity" property) did not succeed. The graphical shell should indicate limited network connectivity.
             
             
               NM_STATE_CONNECTED_GLOBAL
               = 70
-              there is global IPv4 and/or IPv6 Internet connectivity
+              There is global IPv4 and/or IPv6 Internet connectivity This means the Internet connectivity check succeeded, the graphical shell should indicate full network connectivity.
             
           
         
@@ -115,22 +115,22 @@
             
               NM_CONNECTIVITY_UNKNOWN
               = 0
-              Network connectivity is unknown.
+              Network connectivity is unknown. This means the connectivity checks are disabled (e.g. on server installations) or has not run yet. The graphical shell should assume the Internet connection might be available and not present a captive portal window.
             
             
               NM_CONNECTIVITY_NONE
               = 1
-              The host is not connected to any network.
+              The host is not connected to any network. There's no active connection that contains a default route to the internet and thus it makes no sense to even attempt a connectivity check. The graphical shell should use this state to indicate the network connection is unavailable.
             
             
               NM_CONNECTIVITY_PORTAL
               = 2
-              The host is behind a captive portal and cannot reach the full Internet.
+              The Internet connection is hijacked by a captive portal gateway. The graphical shell may open a sandboxed web browser window (because the captive portals typically attempt a man-in-the-middle attacks agains the https connections) for the purpose of authenticating to a gateway and retrigger the connectivity check with CheckConnectivity() when the browser window is dismissed.
             
             
               NM_CONNECTIVITY_LIMITED
               = 3
-              The host is connected to a network, but does not appear to be able to reach the full Internet.
+              The host is connected to a network, does not appear to be able to reach the full Internet, but a captive portal has not been detected.
             
             
               NM_CONNECTIVITY_FULL
@@ -267,6 +267,11 @@
               = 21
               a MACsec interface
             
+            
+              NM_DEVICE_TYPE_DUMMY
+              = 22
+              a dummy interface
+            
           
         
       
@@ -307,6 +312,11 @@
               = 0x00000004
               this device is a software device
             
+            
+              NM_DEVICE_CAP_SRIOV
+              = 0x00000008
+              this device supports single-root I/O virtualization
+            
           
         
       
@@ -1168,6 +1178,101 @@
     
   
 
+  
+    enum NMActiveConnectionStateReason
+    
+      NMActiveConnectionStateReason
+    
+    Active connection state reasons.Since: 1.8
+    
+      Values
+      
+        
+          
+          
+          
+          
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN
+              = 0
+              The reason for the active connection state change is unknown.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_NONE
+              = 1
+              No reason was given for the active connection state change.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED
+              = 2
+              The active connection changed state because the user disconnected it.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED
+              = 3
+              The active connection changed state because the device it was using was disconnected.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED
+              = 4
+              The service providing the VPN connection was stopped.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID
+              = 5
+              The IP config of the active connection was invalid.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT
+              = 6
+              The connection attempt to the VPN service timed out.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT
+              = 7
+              A timeout occurred while starting the service providing the VPN connection.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED
+              = 8
+              Starting the service providing the VPN connection failed.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS
+              = 9
+              Necessary secrets for the connection were not provided.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED
+              = 10
+              Authentication to the server failed.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED
+              = 11
+              The connection was deleted from settings.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_DEPENDENCY_FAILED
+              = 12
+              Master connection of this connection failed to activate.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REALIZE_FAILED
+              = 13
+              Could not create the software device link.
+            
+            
+              NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REMOVED
+              = 14
+              The device this connection depended on disappeared.
+            
+          
+        
+      
+    
+  
+
   
     enum NMSecretAgentGetSecretsFlags
     
diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c
index e9da8d3f..351bc1d0 100644
--- a/libnm-core/nm-errors.c
+++ b/libnm-core/nm-errors.c
@@ -26,14 +26,14 @@
 #include "nm-vpn-dbus-interface.h"
 #include "nm-core-internal.h"
 
-G_DEFINE_QUARK (nm-agent-manager-error-quark, nm_agent_manager_error)
-G_DEFINE_QUARK (nm-connection-error-quark, nm_connection_error)
-G_DEFINE_QUARK (nm-crypto-error-quark, nm_crypto_error)
-G_DEFINE_QUARK (nm-device-error-quark, nm_device_error)
-G_DEFINE_QUARK (nm-manager-error-quark, nm_manager_error)
-G_DEFINE_QUARK (nm-secret-agent-error-quark, nm_secret_agent_error)
-G_DEFINE_QUARK (nm-settings-error-quark, nm_settings_error)
-G_DEFINE_QUARK (nm-vpn-plugin-error-quark, nm_vpn_plugin_error)
+NM_CACHED_QUARK_FCN ("nm-agent-manager-error-quark", nm_agent_manager_error_quark)
+NM_CACHED_QUARK_FCN ("nm-connection-error-quark", nm_connection_error_quark)
+NM_CACHED_QUARK_FCN ("nm-crypto-error-quark", nm_crypto_error_quark)
+NM_CACHED_QUARK_FCN ("nm-device-error-quark", nm_device_error_quark)
+NM_CACHED_QUARK_FCN ("nm-manager-error-quark", nm_manager_error_quark)
+NM_CACHED_QUARK_FCN ("nm-secret-agent-error-quark", nm_secret_agent_error_quark)
+NM_CACHED_QUARK_FCN ("nm-settings-error-quark", nm_settings_error_quark)
+NM_CACHED_QUARK_FCN ("nm-vpn-plugin-error-quark", nm_vpn_plugin_error_quark)
 
 static void
 register_error_domain (GQuark domain,
diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h
index 30c6c200..be11a708 100644
--- a/libnm-core/nm-keyfile-internal.h
+++ b/libnm-core/nm-keyfile-internal.h
@@ -27,6 +27,9 @@
 #include "nm-connection.h"
 #include "nm-setting-8021x.h"
 
+#include "nm-core-internal.h"
+#include "nm-setting-metadata.h"
+
 /*****************************************************************************/
 
 #define NM_KEYFILE_CERT_SCHEME_PREFIX_PATH "file://"
@@ -138,17 +141,8 @@ typedef gboolean (*NMKeyfileWriteHandler) (NMConnection *connection,
  * type %NM_KEYFILE_WRITE_TYPE_CERT.
  */
 typedef struct {
+	const NMSetting8021xSchemeVtable *vtable;
 	NMSetting8021x *setting;
-	const char *property_name;
-
-	/* The following functions are helpers that simplify the implementation
-	 * of the handler. */
-	const char *suffix;
-	NMSetting8021xCKScheme (*scheme_func) (NMSetting8021x *setting);
-	NMSetting8021xCKFormat (*format_func) (NMSetting8021x *setting);
-	const char *           (*path_func)   (NMSetting8021x *setting);
-	GBytes *               (*blob_func)   (NMSetting8021x *setting);
-	const char *           (*uri_func)    (NMSetting8021x *setting);
 } NMKeyfileWriteTypeDataCert;
 
 
diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c
index c071264d..eb257eeb 100644
--- a/libnm-core/nm-keyfile-reader.c
+++ b/libnm-core/nm-keyfile-reader.c
@@ -35,6 +35,8 @@
 #include "nm-core-internal.h"
 #include "nm-keyfile-utils.h"
 
+#include "nm-setting-user.h"
+
 typedef struct {
 	NMConnection *connection;
 	GKeyFile *keyfile;
@@ -428,6 +430,31 @@ read_one_ip_address_or_route (KeyfileReaderInfo *info,
 	return result;
 }
 
+static void
+fill_route_attributes (GKeyFile *kf, NMIPRoute *route, const char *setting, const char *key, int family)
+{
+	gs_free char *value = NULL;
+	gs_unref_hashtable GHashTable *hash = NULL;
+	GHashTableIter iter;
+	char *name;
+	GVariant *variant;
+
+	value = nm_keyfile_plugin_kf_get_string (kf, setting, key, NULL);
+	if (!value || !value[0])
+		return;
+
+	hash = nm_utils_parse_variant_attributes (value, ',', '=', TRUE,
+	                                          nm_ip_route_get_variant_attribute_spec (),
+	                                          NULL);
+	if (hash) {
+		g_hash_table_iter_init (&iter, hash);
+		while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &variant)) {
+			if (nm_ip_route_attribute_validate (name, variant, family, NULL, NULL))
+				nm_ip_route_set_attribute (route, name, g_variant_ref (variant));
+		}
+	}
+}
+
 static void
 ip_address_or_route_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 {
@@ -454,6 +481,7 @@ ip_address_or_route_parser (KeyfileReaderInfo *info, NMSetting *setting, const c
 		for (key_basename = key_names; *key_basename; key_basename++) {
 			char *key_name;
 			gpointer item;
+			char options_key[128];
 
 			/* -1 means no suffix */
 			if (i >= 0)
@@ -463,6 +491,11 @@ ip_address_or_route_parser (KeyfileReaderInfo *info, NMSetting *setting, const c
 
 			item = read_one_ip_address_or_route (info, key, setting_name, key_name, ipv6, routes,
 			                                     gateway ? NULL : &gateway, setting);
+			if (item && routes) {
+				nm_sprintf_buf (options_key, "%s_options", key_name);
+				fill_route_attributes (info->keyfile, item, setting_name, options_key, ipv6 ? AF_INET6 : AF_INET);
+			}
+
 			g_free (key_name);
 
 			if (info->error) {
@@ -637,7 +670,6 @@ mac_address_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key
 			buf_arr = g_new (guint8, buf_len);
 			for (i = 0; i < length; i++) {
 				int val = tmp_list[i];
-				const guint8 v = (guint8) (val & 0xFF);
 
 				if (val < 0 || val > 255) {
 					handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
@@ -645,7 +677,7 @@ mac_address_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key
 					             val);
 					return;
 				}
-				buf_arr[i] = v;
+				buf_arr[i] = (guint8) val;
 			}
 		}
 	}
@@ -684,31 +716,59 @@ mac_address_parser_INFINIBAND (KeyfileReaderInfo *info, NMSetting *setting, cons
 static void
 read_hash_of_string (GKeyFile *file, NMSetting *setting, const char *key)
 {
-	char **keys, **iter;
-	char *value;
+	gs_strfreev char **keys = NULL;
+	const char *const*iter;
 	const char *setting_name = nm_setting_get_name (setting);
+	gboolean is_vpn;
 
 	keys = nm_keyfile_plugin_kf_get_keys (file, setting_name, NULL, NULL);
 	if (!keys || !*keys)
 		return;
 
-	for (iter = keys; *iter; iter++) {
-		value = nm_keyfile_plugin_kf_get_string (file, setting_name, *iter, NULL);
-		if (!value)
-			continue;
-
-		if (NM_IS_SETTING_VPN (setting)) {
-			/* Add any item that's not a class property to the data hash */
-			if (!g_object_class_find_property (G_OBJECT_GET_CLASS (setting), *iter))
-				nm_setting_vpn_add_data_item (NM_SETTING_VPN (setting), *iter, value);
+	if (   (is_vpn = NM_IS_SETTING_VPN (setting))
+	    || NM_IS_SETTING_BOND (setting)) {
+		for (iter = (const char *const*) keys; *iter; iter++) {
+			gs_free char *to_free = NULL;
+			gs_free char *value = NULL;
+			const char *name;
+
+			value = nm_keyfile_plugin_kf_get_string (file, setting_name, *iter, NULL);
+			if (!value)
+				continue;
+
+			name = nm_keyfile_key_decode (*iter, &to_free);
+
+			if (is_vpn) {
+				/* Add any item that's not a class property to the data hash */
+				if (!g_object_class_find_property (G_OBJECT_GET_CLASS (setting), name))
+					nm_setting_vpn_add_data_item (NM_SETTING_VPN (setting), name, value);
+			} else {
+				if (strcmp (name, "interface-name"))
+					nm_setting_bond_add_option (NM_SETTING_BOND (setting), name, value);
+			}
 		}
-		if (NM_IS_SETTING_BOND (setting)) {
-			if (strcmp (*iter, "interface-name"))
-				nm_setting_bond_add_option (NM_SETTING_BOND (setting), *iter, value);
+		return;
+	}
+
+	if (NM_IS_SETTING_USER (setting)) {
+		gs_unref_hashtable GHashTable *data = NULL;
+
+		data = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+		for (iter = (const char *const*) keys; *iter; iter++) {
+			gs_free char *to_free = NULL;
+			char *value = NULL;
+			const char *name;
+
+			value = nm_keyfile_plugin_kf_get_string (file, setting_name, *iter, NULL);
+			if (!value)
+				continue;
+			name = nm_keyfile_key_decode (*iter, &to_free);
+			g_hash_table_insert (data,
+			                     g_steal_pointer (&to_free) ?: g_strdup (name),
+			                     value);
 		}
-		g_free (value);
+		g_object_set (setting, NM_SETTING_USER_DATA, data, NULL);
 	}
-	g_strfreev (keys);
 }
 
 static gsize
@@ -1425,6 +1485,9 @@ read_one_setting_value (NMSetting *setting,
 	if (NM_IS_SETTING_VPN (setting))
 		check_for_key = FALSE;
 
+	if (NM_IS_SETTING_USER (setting))
+		check_for_key = FALSE;
+
 	/* Bonding 'options' don't have the exact key name. The options are right under [bond] group. */
 	if (NM_IS_SETTING_BOND (setting))
 		check_for_key = FALSE;
@@ -1574,7 +1637,7 @@ read_one_setting_value (NMSetting *setting,
 			else {
 				if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
 				                  _("too large FLAGS property '%s' (%llu)"),
-				                  G_VALUE_TYPE_NAME (value), (long long unsigned) uint_val))
+				                  G_VALUE_TYPE_NAME (value), (unsigned long long) uint_val))
 					goto out_error;
 			}
 		}
diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c
index 13cf6161..1b7860d8 100644
--- a/libnm-core/nm-keyfile-utils.c
+++ b/libnm-core/nm-keyfile-utils.c
@@ -361,3 +361,205 @@ _nm_keyfile_has_values (GKeyFile *keyfile)
 	groups = g_key_file_get_groups (keyfile, NULL);
 	return groups && groups[0];
 }
+
+/*****************************************************************************/
+
+static const char *
+_keyfile_key_encode (const char *name,
+                     char **out_to_free)
+{
+	gsize len, i;
+	GString *str;
+
+	nm_assert (name);
+	nm_assert (out_to_free && !*out_to_free);
+
+	/* See g_key_file_is_key_name().
+	 *
+	 * GKeyfile allows all UTF-8 characters (even non-well formed sequences),
+	 * except:
+	 *  - no empty keys
+	 *  - no leading/trailing ' '
+	 *  - no '=', '[', ']'
+	 *
+	 * We do something more strict here. All non-ASCII characters, all non-printable
+	 * characters, and all invalid characters are escaped with "\\XX".
+	 *
+	 * We don't escape \\, unless it is followed by two hex digits.
+	 */
+
+	if (!name[0]) {
+		/* empty keys are are backslash encoded. Note that usually
+		 * \\00 is not a valid encode, the only exception is the empty
+		 * word. */
+		return "\\00";
+	}
+
+	/* find the first character that needs escaping. */
+	i = 0;
+	if (name[0] != ' ') {
+		for (;; i++) {
+			const guchar ch = (guchar) name[i];
+
+			if (ch == '\0')
+				return name;
+
+			if (   ch < 0x20
+			    || ch >= 127
+			    || NM_IN_SET (ch, '=', '[', ']')
+			    || (   ch == '\\'
+			        && g_ascii_isxdigit (name[i + 1])
+			        && g_ascii_isxdigit (name[i + 2]))
+			    || (   ch == ' '
+			        && name[i + 1] == '\0'))
+				break;
+		}
+	} else if (name[1] == '\0')
+		return "\\20";
+
+	len = i + strlen (&name[i]);
+	nm_assert (len == strlen (name));
+	str = g_string_sized_new (len + 15);
+
+	if (name[0] == ' ') {
+		nm_assert (i == 0);
+		g_string_append (str, "\\20");
+		i = 1;
+	} else
+		g_string_append_len (str, name, i);
+
+	for (;; i++) {
+		const guchar ch = (guchar) name[i];
+
+		if (ch == '\0')
+			break;
+
+		if (   ch < 0x20
+		    || ch >= 127
+		    || NM_IN_SET (ch, '=', '[', ']')
+		    || (   ch == '\\'
+		        && g_ascii_isxdigit (name[i + 1])
+		        && g_ascii_isxdigit (name[i + 2]))
+		    || (   ch == ' '
+		        && name[i + 1] == '\0'))
+			g_string_append_printf (str, "\\%2X", ch);
+		else
+			g_string_append_c (str, (char) ch);
+	}
+
+	return (*out_to_free = g_string_free (str, FALSE));
+}
+
+static const char *
+_keyfile_key_decode (const char *key,
+                     char **out_to_free)
+{
+	gsize i, len;
+	GString *str;
+
+	nm_assert (key);
+	nm_assert (out_to_free && !*out_to_free);
+
+	if (!key[0])
+		return "";
+
+	for (i = 0; TRUE; i++) {
+		const char ch = key[i];
+
+		if (ch == '\0')
+			return key;
+		if (   ch == '\\'
+		    && g_ascii_isxdigit (key[i + 1])
+		    && g_ascii_isxdigit (key[i + 2]))
+			break;
+	}
+
+	len = i + strlen (&key[i]);
+
+	if (   len == 3
+	    && nm_streq (key, "\\00"))
+		return "";
+
+	nm_assert (len == strlen (key));
+	str = g_string_sized_new (len + 3);
+
+	g_string_append_len (str, key, i);
+	for (;;) {
+		const char ch = key[i];
+		char ch1, ch2;
+		unsigned v;
+
+		if (ch == '\0')
+			break;
+
+		if (   ch == '\\'
+		    && g_ascii_isxdigit ((ch1 = key[i + 1]))
+		    && g_ascii_isxdigit ((ch2 = key[i + 2]))) {
+			v = (g_ascii_xdigit_value (ch1) << 4) + g_ascii_xdigit_value (ch2);
+			if (v != 0) {
+				g_string_append_c (str, (char) v);
+				i += 3;
+				continue;
+			}
+		}
+		g_string_append_c (str, ch);
+		i++;
+	}
+
+	return (*out_to_free = g_string_free (str, FALSE));
+}
+
+/*****************************************************************************/
+
+const char *
+nm_keyfile_key_encode (const char *name,
+                       char **out_to_free)
+{
+	const char *key;
+
+	key = _keyfile_key_encode (name, out_to_free);
+#if NM_MORE_ASSERTS > 5
+	nm_assert (key);
+	nm_assert (!*out_to_free || key == *out_to_free);
+	nm_assert (!*out_to_free || !nm_streq0 (name, key));
+	{
+		gs_free char *to_free2 = NULL;
+		const char *name2;
+
+		name2 = _keyfile_key_decode (key, &to_free2);
+		/* name2, the result of encode()+decode() is identical to name.
+		 * That is because
+		 *   - encode() is a injective function.
+		 *   - decode() is a surjective function, however for output
+		 *     values of encode() is behaves injective too. */
+		nm_assert (nm_streq0 (name2, name));
+	}
+#endif
+	return key;
+}
+
+const char *
+nm_keyfile_key_decode (const char *key,
+                       char **out_to_free)
+{
+	const char *name;
+
+	name = _keyfile_key_decode (key, out_to_free);
+#if NM_MORE_ASSERTS > 5
+	nm_assert (name);
+	nm_assert (!*out_to_free || name == *out_to_free);
+	{
+		gs_free char *to_free2 = NULL;
+		const char *key2;
+
+		key2 = _keyfile_key_encode (name, &to_free2);
+		/* key2, the result of decode+encode may not be idential
+		 * to the original key. That is, decode() is a surjective
+		 * function mapping different keys to the same name.
+		 * However, decode() behaves injective for input that
+		 * are valid output of encode(). */
+		nm_assert (key2);
+	}
+#endif
+	return name;
+}
diff --git a/libnm-core/nm-keyfile-utils.h b/libnm-core/nm-keyfile-utils.h
index 89fd3041..1f63af8c 100644
--- a/libnm-core/nm-keyfile-utils.h
+++ b/libnm-core/nm-keyfile-utils.h
@@ -81,5 +81,11 @@ gboolean nm_keyfile_plugin_kf_has_key     (GKeyFile *kf,
                                            const char *key,
                                            GError **error);
 
+const char *nm_keyfile_key_encode (const char *name,
+                                   char **out_to_free);
+
+const char *nm_keyfile_key_decode (const char *key,
+                                   char **out_to_free);
+
 #endif  /* __NM_KEYFILE_UTILS_H__ */
 
diff --git a/libnm-core/nm-keyfile-writer.c b/libnm-core/nm-keyfile-writer.c
index 3a7007d9..6a3d9a9f 100644
--- a/libnm-core/nm-keyfile-writer.c
+++ b/libnm-core/nm-keyfile-writer.c
@@ -138,7 +138,7 @@ write_ip_values (GKeyFile *file,
 	int family, i;
 	const char *addr, *gw;
 	guint32 plen, metric;
-	char key_name[30], *key_name_idx;
+	char key_name[64], *key_name_idx;
 
 	if (!array->len)
 		return;
@@ -188,6 +188,23 @@ write_ip_values (GKeyFile *file,
 
 		sprintf (key_name_idx, "%d", i + 1);
 		nm_keyfile_plugin_kf_set_string (file, setting_name, key_name, output->str);
+
+		if (is_route) {
+			gs_free char *attributes = NULL;
+			gs_strfreev char **names = NULL;
+			gs_unref_hashtable GHashTable *hash = g_hash_table_new (g_str_hash, g_str_equal);
+			int j;
+
+			names = nm_ip_route_get_attribute_names (array->pdata[i]);
+			for (j = 0; names && names[j]; j++)
+				g_hash_table_insert (hash, names[j], nm_ip_route_get_attribute (array->pdata[i], names[j]));
+
+			attributes = nm_utils_format_variant_attributes (hash, ',', '=');
+			if (attributes) {
+				g_strlcat (key_name, "_options", sizeof (key_name));
+				nm_keyfile_plugin_kf_set_string (file, setting_name, key_name, attributes);
+			}
+		}
 	}
 	g_string_free (output, TRUE);
 }
@@ -283,8 +300,12 @@ write_hash_of_string (GKeyFile *file,
 		}
 
 		if (write_item) {
+			gs_free char *to_free = NULL;
+
 			data = g_hash_table_lookup (hash, property);
-			nm_keyfile_plugin_kf_set_string (file, group_name, property, data);
+			nm_keyfile_plugin_kf_set_string (file, group_name,
+			                                 nm_keyfile_key_encode (property, &to_free),
+			                                 data);
 		}
 	}
 }
@@ -373,68 +394,6 @@ password_raw_writer (KeyfileWriterInfo *info,
 	nm_keyfile_plugin_kf_set_integer_list_uint8 (info->keyfile, setting_name, key, data, len);
 }
 
-typedef struct ObjectType {
-	const char *key;
-	const char *suffix;
-	NMSetting8021xCKScheme (*scheme_func) (NMSetting8021x *setting);
-	NMSetting8021xCKFormat (*format_func) (NMSetting8021x *setting);
-	const char *           (*path_func)   (NMSetting8021x *setting);
-	GBytes *               (*blob_func)   (NMSetting8021x *setting);
-	const char *           (*uri_func)    (NMSetting8021x *setting);
-} ObjectType;
-
-static const ObjectType objtypes[10] = {
-	{ NM_SETTING_802_1X_CA_CERT,
-	  "ca-cert",
-	  nm_setting_802_1x_get_ca_cert_scheme,
-	  NULL,
-	  nm_setting_802_1x_get_ca_cert_path,
-	  nm_setting_802_1x_get_ca_cert_blob,
-	  nm_setting_802_1x_get_ca_cert_uri },
-
-	{ NM_SETTING_802_1X_PHASE2_CA_CERT,
-	  "inner-ca-cert",
-	  nm_setting_802_1x_get_phase2_ca_cert_scheme,
-	  NULL,
-	  nm_setting_802_1x_get_phase2_ca_cert_path,
-	  nm_setting_802_1x_get_phase2_ca_cert_blob,
-	  nm_setting_802_1x_get_phase2_ca_cert_uri },
-
-	{ NM_SETTING_802_1X_CLIENT_CERT,
-	  "client-cert",
-	  nm_setting_802_1x_get_client_cert_scheme,
-	  NULL,
-	  nm_setting_802_1x_get_client_cert_path,
-	  nm_setting_802_1x_get_client_cert_blob,
-	  nm_setting_802_1x_get_client_cert_uri },
-
-	{ NM_SETTING_802_1X_PHASE2_CLIENT_CERT,
-	  "inner-client-cert",
-	  nm_setting_802_1x_get_phase2_client_cert_scheme,
-	  NULL,
-	  nm_setting_802_1x_get_phase2_client_cert_path,
-	  nm_setting_802_1x_get_phase2_client_cert_blob,
-	  nm_setting_802_1x_get_phase2_client_cert_uri },
-
-	{ NM_SETTING_802_1X_PRIVATE_KEY,
-	  "private-key",
-	  nm_setting_802_1x_get_private_key_scheme,
-	  nm_setting_802_1x_get_private_key_format,
-	  nm_setting_802_1x_get_private_key_path,
-	  nm_setting_802_1x_get_private_key_blob,
-	  nm_setting_802_1x_get_private_key_uri },
-
-	{ NM_SETTING_802_1X_PHASE2_PRIVATE_KEY,
-	  "inner-private-key",
-	  nm_setting_802_1x_get_phase2_private_key_scheme,
-	  nm_setting_802_1x_get_phase2_private_key_format,
-	  nm_setting_802_1x_get_phase2_private_key_path,
-	  nm_setting_802_1x_get_phase2_private_key_blob,
-	  nm_setting_802_1x_get_phase2_private_key_uri },
-
-	{ NULL },
-};
-
 /*****************************************************************************/
 
 static void
@@ -445,13 +404,13 @@ cert_writer_default (NMConnection *connection,
 	const char *setting_name = nm_setting_get_name (NM_SETTING (cert_data->setting));
 	NMSetting8021xCKScheme scheme;
 
-	scheme = cert_data->scheme_func (cert_data->setting);
+	scheme = cert_data->vtable->scheme_func (cert_data->setting);
 	if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH) {
 		const char *path;
 		char *path_free = NULL, *tmp;
 		gs_free char *base_dir = NULL;
 
-		path = cert_data->path_func (cert_data->setting);
+		path = cert_data->vtable->path_func (cert_data->setting);
 		g_assert (path);
 
 		/* If the path is relative, make it an absolute path.
@@ -475,7 +434,7 @@ cert_writer_default (NMConnection *connection,
 		/* Path contains at least a '/', hence it cannot be recognized as the old
 		 * binary format consisting of a list of integers. */
 
-		nm_keyfile_plugin_kf_set_string (file, setting_name, cert_data->property_name, path);
+		nm_keyfile_plugin_kf_set_string (file, setting_name, cert_data->vtable->setting_key, path);
 		g_free (tmp);
 		g_free (path_free);
 	} else if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) {
@@ -484,19 +443,19 @@ cert_writer_default (NMConnection *connection,
 		gsize blob_len;
 		char *blob_base64, *val;
 
-		blob = cert_data->blob_func (cert_data->setting);
+		blob = cert_data->vtable->blob_func (cert_data->setting);
 		g_assert (blob);
 		blob_data = g_bytes_get_data (blob, &blob_len);
 
 		blob_base64 = g_base64_encode (blob_data, blob_len);
 		val = g_strconcat (NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB, blob_base64, NULL);
 
-		nm_keyfile_plugin_kf_set_string (file, setting_name, cert_data->property_name, val);
+		nm_keyfile_plugin_kf_set_string (file, setting_name, cert_data->vtable->setting_key, val);
 		g_free (val);
 		g_free (blob_base64);
 	} else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PKCS11) {
-		nm_keyfile_plugin_kf_set_string (file, setting_name, cert_data->property_name,
-		                                 cert_data->uri_func (cert_data->setting));
+		nm_keyfile_plugin_kf_set_string (file, setting_name, cert_data->vtable->setting_key,
+		                                 cert_data->vtable->uri_func (cert_data->setting));
 	} else {
 		/* scheme_func() returns UNKNOWN in all other cases. The only valid case
 		 * where a scheme is allowed to be UNKNOWN, is unsetting the value. In this
@@ -514,13 +473,13 @@ cert_writer (KeyfileWriterInfo *info,
              const char *key,
              const GValue *value)
 {
-	const ObjectType *objtype = NULL;
+	const NMSetting8021xSchemeVtable *objtype = NULL;
 	guint i;
 	NMKeyfileWriteTypeDataCert type_data = { 0 };
 
-	for (i = 0; i < G_N_ELEMENTS (objtypes) && objtypes[i].key; i++) {
-		if (g_strcmp0 (objtypes[i].key, key) == 0) {
-			objtype = &objtypes[i];
+	for (i = 0; nm_setting_8021x_scheme_vtable[i].setting_key; i++) {
+		if (g_strcmp0 (nm_setting_8021x_scheme_vtable[i].setting_key, key) == 0) {
+			objtype = &nm_setting_8021x_scheme_vtable[i];
 			break;
 		}
 	}
@@ -528,13 +487,7 @@ cert_writer (KeyfileWriterInfo *info,
 		g_return_if_reached ();
 
 	type_data.setting = NM_SETTING_802_1X (setting);
-	type_data.property_name = key;
-	type_data.suffix = objtype->suffix;
-	type_data.scheme_func = objtype->scheme_func;
-	type_data.format_func = objtype->format_func;
-	type_data.path_func = objtype->path_func;
-	type_data.blob_func = objtype->blob_func;
-	type_data.uri_func = objtype->uri_func;
+	type_data.vtable = objtype;
 
 	if (info->handler) {
 		if (info->handler (info->connection,
diff --git a/libnm-core/nm-property-compare.c b/libnm-core/nm-property-compare.c
index ab19cd71..d13d019f 100644
--- a/libnm-core/nm-property-compare.c
+++ b/libnm-core/nm-property-compare.c
@@ -23,7 +23,6 @@
 #include "nm-default.h"
 
 #include 
-#include 
 #include 
 
 #include "nm-property-compare.h"
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c
index 97296650..ab0f5c66 100644
--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@@ -77,22 +77,31 @@ typedef struct {
 	char *anonymous_identity;
 	char *pac_file;
 	GBytes *ca_cert;
+	char *ca_cert_password;
+	NMSettingSecretFlags ca_cert_password_flags;
 	char *ca_path;
 	char *subject_match;
 	GSList *altsubject_matches;
 	char *domain_suffix_match;
 	GBytes *client_cert;
+	char *client_cert_password;
+	NMSettingSecretFlags client_cert_password_flags;
 	char *phase1_peapver;
 	char *phase1_peaplabel;
 	char *phase1_fast_provisioning;
+	NMSetting8021xAuthFlags phase1_auth_flags;
 	char *phase2_auth;
 	char *phase2_autheap;
 	GBytes *phase2_ca_cert;
+	char *phase2_ca_cert_password;
+	NMSettingSecretFlags phase2_ca_cert_password_flags;
 	char *phase2_ca_path;
 	char *phase2_subject_match;
 	GSList *phase2_altsubject_matches;
 	char *phase2_domain_suffix_match;
 	GBytes *phase2_client_cert;
+	char *phase2_client_cert_password;
+	NMSettingSecretFlags phase2_client_cert_password_flags;
 	char *password;
 	NMSettingSecretFlags password_flags;
 	GBytes *password_raw;
@@ -106,6 +115,7 @@ typedef struct {
 	char *phase2_private_key_password;
 	NMSettingSecretFlags phase2_private_key_password_flags;
 	gboolean system_ca_certs;
+	gint auth_timeout;
 } NMSetting8021xPrivate;
 
 enum {
@@ -115,22 +125,31 @@ enum {
 	PROP_ANONYMOUS_IDENTITY,
 	PROP_PAC_FILE,
 	PROP_CA_CERT,
+	PROP_CA_CERT_PASSWORD,
+	PROP_CA_CERT_PASSWORD_FLAGS,
 	PROP_CA_PATH,
 	PROP_SUBJECT_MATCH,
 	PROP_ALTSUBJECT_MATCHES,
 	PROP_DOMAIN_SUFFIX_MATCH,
 	PROP_CLIENT_CERT,
+	PROP_CLIENT_CERT_PASSWORD,
+	PROP_CLIENT_CERT_PASSWORD_FLAGS,
 	PROP_PHASE1_PEAPVER,
 	PROP_PHASE1_PEAPLABEL,
 	PROP_PHASE1_FAST_PROVISIONING,
+	PROP_PHASE1_AUTH_FLAGS,
 	PROP_PHASE2_AUTH,
 	PROP_PHASE2_AUTHEAP,
 	PROP_PHASE2_CA_CERT,
+	PROP_PHASE2_CA_CERT_PASSWORD,
+	PROP_PHASE2_CA_CERT_PASSWORD_FLAGS,
 	PROP_PHASE2_CA_PATH,
 	PROP_PHASE2_SUBJECT_MATCH,
 	PROP_PHASE2_ALTSUBJECT_MATCHES,
 	PROP_PHASE2_DOMAIN_SUFFIX_MATCH,
 	PROP_PHASE2_CLIENT_CERT,
+	PROP_PHASE2_CLIENT_CERT_PASSWORD,
+	PROP_PHASE2_CLIENT_CERT_PASSWORD_FLAGS,
 	PROP_PASSWORD,
 	PROP_PASSWORD_FLAGS,
 	PROP_PASSWORD_RAW,
@@ -144,6 +163,7 @@ enum {
 	PROP_PIN,
 	PROP_PIN_FLAGS,
 	PROP_SYSTEM_CA_CERTS,
+	PROP_AUTH_TIMEOUT,
 
 	LAST_PROP
 };
@@ -161,6 +181,8 @@ nm_setting_802_1x_new (void)
 	return (NMSetting *) g_object_new (NM_TYPE_SETTING_802_1X, NULL);
 }
 
+/*****************************************************************************/
+
 /**
  * nm_setting_802_1x_get_num_eap_methods:
  * @setting: the #NMSetting8021x
@@ -739,6 +761,41 @@ nm_setting_802_1x_set_ca_cert (NMSetting8021x *setting,
 	return priv->ca_cert != NULL;
 }
 
+/**
+ * nm_setting_802_1x_get_ca_cert_password:
+ * @setting: the #NMSetting8021x
+ *
+ * Returns: the password used to access the CA certificate stored in
+ * #NMSetting8021x:ca-cert property. Only makes sense if the certificate
+ * is stored on a PKCS#11 token that requires a login.
+ *
+ * Since: 1.8
+ **/
+const char *
+nm_setting_802_1x_get_ca_cert_password (NMSetting8021x *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
+
+	return NM_SETTING_802_1X_GET_PRIVATE (setting)->ca_cert_password;
+}
+
+/**
+ * nm_setting_802_1x_get_ca_cert_password_flags:
+ * @setting: the #NMSetting8021x
+ *
+ * Returns: the #NMSettingSecretFlags pertaining to the
+ * #NMSetting8021x:ca-cert-password
+ *
+ * Since: 1.8
+ **/
+NMSettingSecretFlags
+nm_setting_802_1x_get_ca_cert_password_flags (NMSetting8021x *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NM_SETTING_SECRET_FLAG_NONE);
+
+	return NM_SETTING_802_1X_GET_PRIVATE (setting)->ca_cert_password_flags;
+}
+
 /**
  * nm_setting_802_1x_get_subject_match:
  * @setting: the #NMSetting8021x
@@ -1120,6 +1177,41 @@ nm_setting_802_1x_set_client_cert (NMSetting8021x *setting,
 	return priv->client_cert != NULL;
 }
 
+/**
+ * nm_setting_802_1x_get_client_cert_password:
+ * @setting: the #NMSetting8021x
+ *
+ * Returns: the password used to access the client certificate stored in
+ * #NMSetting8021x:client-cert property. Only makes sense if the certificate
+ * is stored on a PKCS#11 token that requires a login.
+ *
+ * Since: 1.8
+ **/
+const char *
+nm_setting_802_1x_get_client_cert_password (NMSetting8021x *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
+
+	return NM_SETTING_802_1X_GET_PRIVATE (setting)->client_cert_password;
+}
+
+/**
+ * nm_setting_802_1x_get_client_cert_password_flags:
+ * @setting: the #NMSetting8021x
+ *
+ * Returns: the #NMSettingSecretFlags pertaining to the
+ * #NMSetting8021x:client-cert-password
+ *
+ * Since: 1.8
+ **/
+NMSettingSecretFlags
+nm_setting_802_1x_get_client_cert_password_flags (NMSetting8021x *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NM_SETTING_SECRET_FLAG_NONE);
+
+	return NM_SETTING_802_1X_GET_PRIVATE (setting)->client_cert_password_flags;
+}
+
 /**
  * nm_setting_802_1x_get_phase1_peapver:
  * @setting: the #NMSetting8021x
@@ -1170,6 +1262,22 @@ nm_setting_802_1x_get_phase1_fast_provisioning (NMSetting8021x *setting)
 	return NM_SETTING_802_1X_GET_PRIVATE (setting)->phase1_fast_provisioning;
 }
 
+/**
+ * nm_setting_802_1x_get_phase1_auth_flags:
+ * @setting: the #NMSetting8021x
+ *
+ * Returns: the authentication flags for "phase 1".
+ *
+ * Since: 1.8
+ */
+NMSetting8021xAuthFlags
+nm_setting_802_1x_get_phase1_auth_flags (NMSetting8021x *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), 0);
+
+	return NM_SETTING_802_1X_GET_PRIVATE (setting)->phase1_auth_flags;
+}
+
 /**
  * nm_setting_802_1x_get_phase2_auth:
  * @setting: the #NMSetting8021x
@@ -1412,6 +1520,41 @@ nm_setting_802_1x_set_phase2_ca_cert (NMSetting8021x *setting,
 	return priv->phase2_ca_cert != NULL;
 }
 
+/**
+ * nm_setting_802_1x_get_phase2_ca_cert_password:
+ * @setting: the #NMSetting8021x
+ *
+ * Returns: the password used to access the "phase2" CA certificate stored in
+ * #NMSetting8021x:phase2-ca-cert property. Only makes sense if the certificate
+ * is stored on a PKCS#11 token that requires a login.
+ *
+ * Since: 1.8
+ **/
+const char *
+nm_setting_802_1x_get_phase2_ca_cert_password (NMSetting8021x *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
+
+	return NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_ca_cert_password;
+}
+
+/**
+ * nm_setting_802_1x_get_phase2_ca_cert_password_flags:
+ * @setting: the #NMSetting8021x
+ *
+ * Returns: the #NMSettingSecretFlags pertaining to the
+ * #NMSetting8021x:phase2-private-key-password
+ *
+ * Since: 1.8
+ **/
+NMSettingSecretFlags
+nm_setting_802_1x_get_phase2_ca_cert_password_flags (NMSetting8021x *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NM_SETTING_SECRET_FLAG_NONE);
+
+	return NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_ca_cert_password_flags;
+}
+
 /**
  * nm_setting_802_1x_get_phase2_subject_match:
  * @setting: the #NMSetting8021x
@@ -1799,6 +1942,41 @@ nm_setting_802_1x_set_phase2_client_cert (NMSetting8021x *setting,
 	return priv->phase2_client_cert != NULL;
 }
 
+/**
+ * nm_setting_802_1x_get_phase2_client_cert_password:
+ * @setting: the #NMSetting8021x
+ *
+ * Returns: the password used to access the "phase2" client certificate stored in
+ * #NMSetting8021x:phase2-client-cert property. Only makes sense if the certificate
+ * is stored on a PKCS#11 token that requires a login.
+ *
+ * Since: 1.8
+ **/
+const char *
+nm_setting_802_1x_get_phase2_client_cert_password (NMSetting8021x *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
+
+	return NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_client_cert_password;
+}
+
+/**
+ * nm_setting_802_1x_get_phase2_client_cert_password_flags:
+ * @setting: the #NMSetting8021x
+ *
+ * Returns: the #NMSettingSecretFlags pertaining to the
+ * #NMSetting8021x:phase2-client-cert-password
+ *
+ * Since: 1.8
+ **/
+NMSettingSecretFlags
+nm_setting_802_1x_get_phase2_client_cert_password_flags (NMSetting8021x *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NM_SETTING_SECRET_FLAG_NONE);
+
+	return NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_client_cert_password_flags;
+}
+
 /**
  * nm_setting_802_1x_get_password:
  * @setting: the #NMSetting8021x
@@ -2548,6 +2726,25 @@ nm_setting_802_1x_get_phase2_private_key_format (NMSetting8021x *setting)
 	return NM_SETTING_802_1X_CK_FORMAT_UNKNOWN;
 }
 
+/**
+ * nm_setting_802_1x_get_auth_timeout:
+ * @setting: the #NMSetting8021x
+ *
+ * Returns the value contained in the #NMSetting8021x:auth-timeout property.
+ *
+ * Returns: the configured authentication timeout in seconds. Zero means the
+ * global default value.
+ *
+ * Since: 1.8
+ **/
+gint
+nm_setting_802_1x_get_auth_timeout (NMSetting8021x *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), 0);
+
+	return NM_SETTING_802_1X_GET_PRIVATE (setting)->auth_timeout;
+}
+
 static void
 need_secrets_password (NMSetting8021x *self,
                        GPtrArray *secrets,
@@ -2576,10 +2773,14 @@ need_secrets_sim (NMSetting8021x *self,
 static gboolean
 need_private_key_password (GBytes *blob,
                            const char *path,
-                           const char *password)
+                           const char *password,
+                           NMSettingSecretFlags flags)
 {
 	NMCryptoFileFormat format = NM_CRYPTO_FILE_FORMAT_UNKNOWN;
 
+	if (flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
+		return FALSE;
+
 	/* Private key password is required */
 	if (password) {
 		if (path)
@@ -2589,7 +2790,7 @@ need_private_key_password (GBytes *blob,
 			                                         g_bytes_get_size (blob),
 			                                         password, NULL, NULL);
 		else
-			g_warning ("%s: unknown private key password scheme", __func__);
+			return FALSE;
 	}
 
 	return (format == NM_CRYPTO_FILE_FORMAT_UNKNOWN);
@@ -2609,34 +2810,52 @@ need_secrets_tls (NMSetting8021x *self,
 		scheme = nm_setting_802_1x_get_phase2_private_key_scheme (self);
 		if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH)
 			path = nm_setting_802_1x_get_phase2_private_key_path (self);
-		else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PKCS11)
-			return;
 		else if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB)
 			blob = nm_setting_802_1x_get_phase2_private_key_blob (self);
-		else {
+		else if (scheme != NM_SETTING_802_1X_CK_SCHEME_PKCS11)
 			g_warning ("%s: unknown phase2 private key scheme %d", __func__, scheme);
-			g_ptr_array_add (secrets, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY);
-			return;
-		}
 
-		if (need_private_key_password (blob, path, priv->phase2_private_key_password))
+		if (need_private_key_password (blob, path,
+		                               priv->phase2_private_key_password,
+		                               priv->phase2_private_key_password_flags))
 			g_ptr_array_add (secrets, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD);
+
+		scheme = nm_setting_802_1x_get_phase2_ca_cert_scheme (self);
+		if (    scheme == NM_SETTING_802_1X_CK_SCHEME_PKCS11
+		    && !(priv->phase2_ca_cert_password_flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
+		    && !priv->phase2_ca_cert_password)
+			g_ptr_array_add (secrets, NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD);
+
+		scheme = nm_setting_802_1x_get_phase2_client_cert_scheme (self);
+		if (    scheme == NM_SETTING_802_1X_CK_SCHEME_PKCS11
+		    && !(priv->phase2_client_cert_password_flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
+		    && !priv->phase2_client_cert_password)
+			g_ptr_array_add (secrets, NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD);
 	} else {
 		scheme = nm_setting_802_1x_get_private_key_scheme (self);
 		if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH)
 			path = nm_setting_802_1x_get_private_key_path (self);
-		else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PKCS11)
-			return;
 		else if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB)
 			blob = nm_setting_802_1x_get_private_key_blob (self);
-		else {
+		else if (scheme != NM_SETTING_802_1X_CK_SCHEME_PKCS11)
 			g_warning ("%s: unknown private key scheme %d", __func__, scheme);
-			g_ptr_array_add (secrets, NM_SETTING_802_1X_PRIVATE_KEY);
-			return;
-		}
 
-		if (need_private_key_password (blob, path, priv->private_key_password))
+		if (need_private_key_password (blob, path,
+		                               priv->private_key_password,
+		                               priv->private_key_password_flags))
 			g_ptr_array_add (secrets, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD);
+
+		scheme = nm_setting_802_1x_get_ca_cert_scheme (self);
+		if (    scheme == NM_SETTING_802_1X_CK_SCHEME_PKCS11
+		    && !(priv->ca_cert_password_flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
+		    && !priv->ca_cert_password)
+			g_ptr_array_add (secrets, NM_SETTING_802_1X_CA_CERT_PASSWORD);
+
+		scheme = nm_setting_802_1x_get_client_cert_scheme (self);
+		if (    scheme == NM_SETTING_802_1X_CK_SCHEME_PKCS11
+		    && !(priv->client_cert_password_flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
+		    && !priv->client_cert_password)
+			g_ptr_array_add (secrets, NM_SETTING_802_1X_CLIENT_CERT_PASSWORD);
 	}
 }
 
@@ -2951,21 +3170,37 @@ need_secrets (NMSetting *setting)
 }
 
 static gboolean
-verify_cert (GBytes *bytes, const char *prop_name, GError **error)
+verify_cert (GBytes *bytes, const char *prop_name,
+             const char *password, const char *password_prop_name, GError **error)
 {
 	GError *local = NULL;
+	NMSetting8021xCKScheme scheme;
 
-	if (   !bytes
-	    || get_cert_scheme (bytes, &local) != NM_SETTING_802_1X_CK_SCHEME_UNKNOWN)
+	if (bytes)
+		scheme = get_cert_scheme (bytes, &local);
+	else
 		return TRUE;
 
-	g_set_error (error,
-	             NM_CONNECTION_ERROR,
-	             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-	             _("certificate is invalid: %s"), local->message);
-	g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, prop_name);
-	g_error_free (local);
-	return FALSE;
+	if (scheme == NM_SETTING_802_1X_CK_SCHEME_UNKNOWN) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		             _("certificate is invalid: %s"), local->message);
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, prop_name);
+		g_error_free (local);
+		return FALSE;
+	}
+
+	if (password && (scheme != NM_SETTING_802_1X_CK_SCHEME_PKCS11)) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		             _("password is not supported when certificate is not on a PKCS#11 token"));
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, password_prop_name);
+		return FALSE;
+	}
+
+	return TRUE;
 }
 
 static gboolean
@@ -3048,6 +3283,15 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		return FALSE;
 	}
 
+	if (NM_FLAGS_ANY (priv->phase1_auth_flags, ~NM_SETTING_802_1X_AUTH_FLAGS_ALL)) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("invalid auth flags"));
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE1_AUTH_FLAGS);
+		return FALSE;
+	}
+
 	if (priv->phase2_auth && !g_strv_contains (valid_phase2_auth, priv->phase2_auth)) {
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
@@ -3068,19 +3312,23 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		return FALSE;
 	}
 
-	if (!verify_cert (priv->ca_cert, NM_SETTING_802_1X_CA_CERT, error))
+	if (!verify_cert (priv->ca_cert, NM_SETTING_802_1X_CA_CERT,
+	                  priv->ca_cert_password, NM_SETTING_802_1X_CA_CERT_PASSWORD, error))
 		return FALSE;
-	if (!verify_cert (priv->phase2_ca_cert, NM_SETTING_802_1X_PHASE2_CA_CERT, error))
+	if (!verify_cert (priv->phase2_ca_cert, NM_SETTING_802_1X_PHASE2_CA_CERT,
+	                  priv->phase2_ca_cert_password, NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD, error))
 		return FALSE;
 
-	if (!verify_cert (priv->client_cert, NM_SETTING_802_1X_CLIENT_CERT, error))
+	if (!verify_cert (priv->client_cert, NM_SETTING_802_1X_CLIENT_CERT,
+	                  priv->client_cert_password, NM_SETTING_802_1X_CLIENT_CERT_PASSWORD, error))
 		return FALSE;
-	if (!verify_cert (priv->phase2_client_cert, NM_SETTING_802_1X_PHASE2_CLIENT_CERT, error))
+	if (!verify_cert (priv->phase2_client_cert, NM_SETTING_802_1X_PHASE2_CLIENT_CERT,
+	                  priv->phase2_client_cert_password, NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD, error))
 		return FALSE;
 
-	if (!verify_cert (priv->private_key, NM_SETTING_802_1X_PRIVATE_KEY, error))
+	if (!verify_cert (priv->private_key, NM_SETTING_802_1X_PRIVATE_KEY, NULL, NULL, error))
 		return FALSE;
-	if (!verify_cert (priv->phase2_private_key, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, error))
+	if (!verify_cert (priv->phase2_private_key, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, NULL, NULL, error))
 		return FALSE;
 
 	/* FIXME: finish */
@@ -3125,15 +3373,19 @@ finalize (GObject *object)
 
 	if (priv->ca_cert)
 		g_bytes_unref (priv->ca_cert);
+	g_free (priv->ca_cert_password);
 	if (priv->client_cert)
 		g_bytes_unref (priv->client_cert);
+	g_free (priv->client_cert_password);
 	if (priv->private_key)
 		g_bytes_unref (priv->private_key);
 	g_free (priv->private_key_password);
 	if (priv->phase2_ca_cert)
 		g_bytes_unref (priv->phase2_ca_cert);
+	g_free (priv->phase2_ca_cert_password);
 	if (priv->phase2_client_cert)
 		g_bytes_unref (priv->phase2_client_cert);
+	g_free (priv->phase2_client_cert_password);
 	if (priv->phase2_private_key)
 		g_bytes_unref (priv->phase2_private_key);
 	g_free (priv->phase2_private_key_password);
@@ -3150,7 +3402,7 @@ set_cert_prop_helper (const GValue *value, const char *prop_name, GError **error
 	bytes = g_value_dup_boxed (value);
 	/* Verify the new data */
 	if (bytes) {
-		valid = verify_cert (bytes, prop_name, error);
+		valid = verify_cert (bytes, prop_name, NULL, NULL, error);
 		if (!valid)
 			g_clear_pointer (&bytes, g_bytes_unref);
 	}
@@ -3191,6 +3443,13 @@ set_property (GObject *object, guint prop_id,
 			g_error_free (error);
 		}
 		break;
+	case PROP_CA_CERT_PASSWORD:
+		g_free (priv->ca_cert_password);
+		priv->ca_cert_password = g_value_dup_string (value);
+		break;
+	case PROP_CA_CERT_PASSWORD_FLAGS:
+		priv->ca_cert_password_flags = g_value_get_flags (value);
+		break;
 	case PROP_CA_PATH:
 		g_free (priv->ca_path);
 		priv->ca_path = g_value_dup_string (value);
@@ -3216,6 +3475,13 @@ set_property (GObject *object, guint prop_id,
 			g_error_free (error);
 		}
 		break;
+	case PROP_CLIENT_CERT_PASSWORD:
+		g_free (priv->client_cert_password);
+		priv->client_cert_password = g_value_dup_string (value);
+		break;
+	case PROP_CLIENT_CERT_PASSWORD_FLAGS:
+		priv->client_cert_password_flags = g_value_get_flags (value);
+		break;
 	case PROP_PHASE1_PEAPVER:
 		g_free (priv->phase1_peapver);
 		priv->phase1_peapver = g_value_dup_string (value);
@@ -3228,6 +3494,9 @@ set_property (GObject *object, guint prop_id,
 		g_free (priv->phase1_fast_provisioning);
 		priv->phase1_fast_provisioning = g_value_dup_string (value);
 		break;
+	case PROP_PHASE1_AUTH_FLAGS:
+		priv->phase1_auth_flags = g_value_get_uint (value);
+		break;
 	case PROP_PHASE2_AUTH:
 		g_free (priv->phase2_auth);
 		priv->phase2_auth = g_value_dup_string (value);
@@ -3245,6 +3514,13 @@ set_property (GObject *object, guint prop_id,
 			g_error_free (error);
 		}
 		break;
+	case PROP_PHASE2_CA_CERT_PASSWORD:
+		g_free (priv->phase2_ca_cert_password);
+		priv->phase2_ca_cert_password = g_value_dup_string (value);
+		break;
+	case PROP_PHASE2_CA_CERT_PASSWORD_FLAGS:
+		priv->phase2_ca_cert_password_flags = g_value_get_flags (value);
+		break;
 	case PROP_PHASE2_CA_PATH:
 		g_free (priv->phase2_ca_path);
 		priv->phase2_ca_path = g_value_dup_string (value);
@@ -3262,6 +3538,7 @@ set_property (GObject *object, guint prop_id,
 		priv->phase2_domain_suffix_match = nm_strdup_not_empty (g_value_get_string (value));
 		break;
 	case PROP_PHASE2_CLIENT_CERT:
+
 		if (priv->phase2_client_cert)
 			g_bytes_unref (priv->phase2_client_cert);
 		priv->phase2_client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CLIENT_CERT, &error);
@@ -3270,6 +3547,13 @@ set_property (GObject *object, guint prop_id,
 			g_error_free (error);
 		}
 		break;
+	case PROP_PHASE2_CLIENT_CERT_PASSWORD:
+		g_free (priv->phase2_client_cert_password);
+		priv->phase2_client_cert_password = g_value_dup_string (value);
+		break;
+	case PROP_PHASE2_CLIENT_CERT_PASSWORD_FLAGS:
+		priv->phase2_client_cert_password_flags = g_value_get_flags (value);
+		break;
 	case PROP_PASSWORD:
 		g_free (priv->password);
 		priv->password = g_value_dup_string (value);
@@ -3327,6 +3611,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_SYSTEM_CA_CERTS:
 		priv->system_ca_certs = g_value_get_boolean (value);
 		break;
+	case PROP_AUTH_TIMEOUT:
+		priv->auth_timeout = g_value_get_int (value);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -3356,6 +3643,12 @@ get_property (GObject *object, guint prop_id,
 	case PROP_CA_CERT:
 		g_value_set_boxed (value, priv->ca_cert);
 		break;
+	case PROP_CA_CERT_PASSWORD:
+		g_value_set_string (value, priv->ca_cert_password);
+		break;
+	case PROP_CA_CERT_PASSWORD_FLAGS:
+		g_value_set_flags (value, priv->ca_cert_password_flags);
+		break;
 	case PROP_CA_PATH:
 		g_value_set_string (value, priv->ca_path);
 		break;
@@ -3371,6 +3664,12 @@ get_property (GObject *object, guint prop_id,
 	case PROP_CLIENT_CERT:
 		g_value_set_boxed (value, priv->client_cert);
 		break;
+	case PROP_CLIENT_CERT_PASSWORD:
+		g_value_set_string (value, priv->client_cert_password);
+		break;
+	case PROP_CLIENT_CERT_PASSWORD_FLAGS:
+		g_value_set_flags (value, priv->client_cert_password_flags);
+		break;
 	case PROP_PHASE1_PEAPVER:
 		g_value_set_string (value, priv->phase1_peapver);
 		break;
@@ -3380,6 +3679,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_PHASE1_FAST_PROVISIONING:
 		g_value_set_string (value, priv->phase1_fast_provisioning);
 		break;
+	case PROP_PHASE1_AUTH_FLAGS:
+		g_value_set_uint (value, priv->phase1_auth_flags);
+		break;
 	case PROP_PHASE2_AUTH:
 		g_value_set_string (value, priv->phase2_auth);
 		break;
@@ -3389,6 +3691,12 @@ get_property (GObject *object, guint prop_id,
 	case PROP_PHASE2_CA_CERT:
 		g_value_set_boxed (value, priv->phase2_ca_cert);
 		break;
+	case PROP_PHASE2_CA_CERT_PASSWORD:
+		g_value_set_string (value, priv->phase2_ca_cert_password);
+		break;
+	case PROP_PHASE2_CA_CERT_PASSWORD_FLAGS:
+		g_value_set_flags (value, priv->phase2_ca_cert_password_flags);
+		break;
 	case PROP_PHASE2_CA_PATH:
 		g_value_set_string (value, priv->phase2_ca_path);
 		break;
@@ -3404,6 +3712,12 @@ get_property (GObject *object, guint prop_id,
 	case PROP_PHASE2_CLIENT_CERT:
 		g_value_set_boxed (value, priv->phase2_client_cert);
 		break;
+	case PROP_PHASE2_CLIENT_CERT_PASSWORD:
+		g_value_set_string (value, priv->phase2_client_cert_password);
+		break;
+	case PROP_PHASE2_CLIENT_CERT_PASSWORD_FLAGS:
+		g_value_set_flags (value, priv->phase2_client_cert_password_flags);
+		break;
 	case PROP_PASSWORD:
 		g_value_set_string (value, priv->password);
 		break;
@@ -3443,6 +3757,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_SYSTEM_CA_CERTS:
 		g_value_set_boolean (value, priv->system_ca_certs);
 		break;
+	case PROP_AUTH_TIMEOUT:
+		g_value_set_int (value, priv->auth_timeout);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -3582,6 +3899,44 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 		                     G_PARAM_READWRITE |
 		                     G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * NMSetting8021x:ca-cert-password:
+	 *
+	 * The password used to access the CA certificate stored in
+	 * #NMSetting8021x:ca-cert property. Only makes sense if the certificate
+	 * is stored on a PKCS#11 token that requires a login.
+	 *
+	 * Since: 1.8
+	 **/
+	/* ---ifcfg-rh---
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_CA_CERT_PASSWORD,
+		 g_param_spec_string (NM_SETTING_802_1X_CA_CERT_PASSWORD, "", "",
+		                      NULL,
+		                      G_PARAM_READWRITE |
+		                      NM_SETTING_PARAM_SECRET |
+		                      G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSetting8021x:ca-cert-password-flags:
+	 *
+	 * Flags indicating how to handle the #NMSetting8021x:ca-cert-password property.
+	 *
+	 * Since: 1.8
+	 **/
+	/* ---ifcfg-rh---
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_CA_CERT_PASSWORD_FLAGS,
+		 g_param_spec_flags (NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS, "", "",
+		                     NM_TYPE_SETTING_SECRET_FLAGS,
+		                     NM_SETTING_SECRET_FLAG_NONE,
+		                     G_PARAM_READWRITE |
+		                     G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * NMSetting8021x:ca-path:
 	 *
@@ -3700,6 +4055,44 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 		                     G_PARAM_READWRITE |
 		                     G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * NMSetting8021x:client-cert-password:
+	 *
+	 * The password used to access the client certificate stored in
+	 * #NMSetting8021x:client-cert property. Only makes sense if the certificate
+	 * is stored on a PKCS#11 token that requires a login.
+	 *
+	 * Since: 1.8
+	 **/
+	/* ---ifcfg-rh---
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_CLIENT_CERT_PASSWORD,
+		 g_param_spec_string (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD, "", "",
+		                      NULL,
+		                      G_PARAM_READWRITE |
+		                      NM_SETTING_PARAM_SECRET |
+		                      G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSetting8021x:client-cert-password-flags:
+	 *
+	 * Flags indicating how to handle the #NMSetting8021x:client-cert-password property.
+	 *
+	 * Since: 1.8
+	 **/
+	/* ---ifcfg-rh---
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_CLIENT_CERT_PASSWORD_FLAGS,
+		 g_param_spec_flags (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS, "", "",
+		                     NM_TYPE_SETTING_SECRET_FLAGS,
+		                     NM_SETTING_SECRET_FLAG_NONE,
+		                     G_PARAM_READWRITE |
+		                     G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * NMSetting8021x:phase1-peapver:
 	 *
@@ -3772,6 +4165,34 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 		                      G_PARAM_READWRITE |
 		                      G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * NMSetting8021x:phase1-auth-flags:
+	 *
+	 * Specifies authentication flags to use in "phase 1" outer
+	 * authentication using #NMSetting8021xAuthFlags options.
+	 * The invidual TLS versions can be explicitly disabled. If a certain
+	 * TLS disable flag is not set, it is up to the supplicant to allow
+	 * or forbid it. The TLS options map to tls_disable_tlsv1_x settings.
+	 * See the wpa_supplicant documentation for more details.
+	 *
+	 * Since: 1.8
+	 */
+	/* ---ifcfg-rh---
+	 * property: phase1-auth-flags
+	 * variable: IEEE_8021X_PHASE1_AUTH_FLAGS(+)
+	 * values: space-separated list of authentication flags names
+	 * description: Authentication flags for the supplicant
+	 * example: IEEE_8021X_PHASE1_AUTH_FLAGS="tls-1-0-disable tls-1-1-disable"
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_PHASE1_AUTH_FLAGS,
+		 g_param_spec_uint (NM_SETTING_802_1X_PHASE1_AUTH_FLAGS, "", "",
+		                    0, G_MAXUINT32, NM_SETTING_802_1X_AUTH_FLAGS_NONE,
+		                    G_PARAM_CONSTRUCT |
+		                    G_PARAM_READWRITE |
+		                    G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * NMSetting8021x:phase2-auth:
 	 *
@@ -3850,6 +4271,44 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 		                     G_PARAM_READWRITE |
 		                     G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * NMSetting8021x:phase2-ca-cert-password:
+	 *
+	 * The password used to access the "phase2" CA certificate stored in
+	 * #NMSetting8021x:phase2-ca-cert property. Only makes sense if the certificate
+	 * is stored on a PKCS#11 token that requires a login.
+	 *
+	 * Since: 1.8
+	 **/
+	/* ---ifcfg-rh---
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_PHASE2_CA_CERT_PASSWORD,
+		 g_param_spec_string (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD, "", "",
+		                      NULL,
+		                      G_PARAM_READWRITE |
+		                      NM_SETTING_PARAM_SECRET |
+		                      G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSetting8021x:phase2-ca-cert-password-flags:
+	 *
+	 * Flags indicating how to handle the #NMSetting8021x:phase2-ca-cert-password property.
+	 *
+	 * Since: 1.8
+	 **/
+	/* ---ifcfg-rh---
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_PHASE2_CA_CERT_PASSWORD_FLAGS,
+		 g_param_spec_flags (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS, "", "",
+		                     NM_TYPE_SETTING_SECRET_FLAGS,
+		                     NM_SETTING_SECRET_FLAG_NONE,
+		                     G_PARAM_READWRITE |
+		                     G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * NMSetting8021x:phase2-ca-path:
 	 *
@@ -3966,6 +4425,47 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 		                     G_PARAM_READWRITE |
 		                     G_PARAM_STATIC_STRINGS));
 
+
+
+
+	/**
+	 * NMSetting8021x:phase2-client-cert-password:
+	 *
+	 * The password used to access the "phase2" client certificate stored in
+	 * #NMSetting8021x:phase2-client-cert property. Only makes sense if the certificate
+	 * is stored on a PKCS#11 token that requires a login.
+	 *
+	 * Since: 1.8
+	 **/
+	/* ---ifcfg-rh---
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_PHASE2_CLIENT_CERT_PASSWORD,
+		 g_param_spec_string (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD, "", "",
+		                      NULL,
+		                      G_PARAM_READWRITE |
+		                      NM_SETTING_PARAM_SECRET |
+		                      G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSetting8021x:phase2-client-cert-password-flags:
+	 *
+	 * Flags indicating how to handle the #NMSetting8021x:phase2-client-cert-password property.
+	 *
+	 * Since: 1.8
+	 **/
+	/* ---ifcfg-rh---
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_PHASE2_CLIENT_CERT_PASSWORD_FLAGS,
+		 g_param_spec_flags (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS, "", "",
+		                     NM_TYPE_SETTING_SECRET_FLAGS,
+		                     NM_SETTING_SECRET_FLAG_NONE,
+		                     G_PARAM_READWRITE |
+		                     G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * NMSetting8021x:password:
 	 *
@@ -4066,7 +4566,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 	 * property must be set to password used to decrypt the PKCS#12
 	 * certificate and key. When using PKCS#12 files and the path
 	 * scheme, this property should be set to the full UTF-8 encoded path of the
-	 * key, prefixed with the string "file://" and and ending with a terminating
+	 * key, prefixed with the string "file://" and ending with a terminating
 	 * NUL byte, and as with the blob scheme the "private-key-password" property
 	 * must be set to the password used to decode the PKCS#12 private
 	 * key and certificate.
@@ -4158,7 +4658,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 	 * property must be set to password used to decrypt the PKCS#12
 	 * certificate and key. When using PKCS#12 files and the path
 	 * scheme, this property should be set to the full UTF-8 encoded path of the
-	 * key, prefixed with the string "file://" and and ending with a terminating
+	 * key, prefixed with the string "file://" and ending with a terminating
 	 * NUL byte, and as with the blob scheme the
 	 * #NMSetting8021x:phase2-private-key-password property must be set to the
 	 * password used to decode the PKCS#12 private key and certificate.
@@ -4290,4 +4790,28 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 		                       G_PARAM_READWRITE |
 		                       G_PARAM_CONSTRUCT |
 		                       G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSetting8021x:auth-timeout:
+	 *
+	 * A timeout for the authentication. Zero means the global default; if the
+	 * global default is not set, the authentication timeout is 25 seconds.
+	 *
+	 * Since: 1.8
+	 **/
+	/* ---ifcfg-rh---
+	 * property: auth-timeout
+	 * variable: IEEE_8021X_AUTH_TIMEOUT(+)
+	 * default: 0
+	 * description: Timeout in seconds for the 802.1X authentication. Zero means the global default or 25.
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_AUTH_TIMEOUT,
+		 g_param_spec_int (NM_SETTING_802_1X_AUTH_TIMEOUT, "", "",
+		                   0, G_MAXINT32, 0,
+		                   G_PARAM_READWRITE |
+		                   NM_SETTING_PARAM_FUZZY_IGNORE |
+		                   G_PARAM_STATIC_STRINGS));
+
 }
diff --git a/libnm-core/nm-setting-8021x.h b/libnm-core/nm-setting-8021x.h
index 9e58e4e2..0f5f7ddd 100644
--- a/libnm-core/nm-setting-8021x.h
+++ b/libnm-core/nm-setting-8021x.h
@@ -27,7 +27,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -75,6 +75,28 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
 	NM_SETTING_802_1X_CK_SCHEME_PKCS11,
 } NMSetting8021xCKScheme;
 
+/**
+ * NMSetting8021xAuthFlags:
+ * @NM_SETTING_802_1X_AUTH_FLAGS_NONE: No flags
+ * @NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_0_DISABLE: Disable TLSv1.0
+ * @NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_1_DISABLE: Disable TLSv1.1
+ * @NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_2_DISABLE: Disable TLSv1.2
+ * @NM_SETTING_802_1X_AUTH_FLAGS_ALL: All supported flags
+ *
+ * #NMSetting8021xAuthFlags values indicate which authentication settings
+ * should be used.
+ *
+ * Since: 1.8
+ */
+typedef enum { /*< underscore_name=nm_setting_802_1x_auth_flags >*/
+	NM_SETTING_802_1X_AUTH_FLAGS_NONE                = 0,
+	NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_0_DISABLE     = (1 << 0),
+	NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_1_DISABLE     = (1 << 1),
+	NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_2_DISABLE     = (1 << 2),
+
+	_NM_SETTING_802_1X_AUTH_FLAGS_LAST, /*< skip >*/
+	NM_SETTING_802_1X_AUTH_FLAGS_ALL                 = (((_NM_SETTING_802_1X_AUTH_FLAGS_LAST - 1) << 1) - 1),
+} NMSetting8021xAuthFlags;
 
 #define NM_TYPE_SETTING_802_1X            (nm_setting_802_1x_get_type ())
 #define NM_SETTING_802_1X(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_802_1X, NMSetting8021x))
@@ -90,22 +112,31 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
 #define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
 #define NM_SETTING_802_1X_PAC_FILE "pac-file"
 #define NM_SETTING_802_1X_CA_CERT "ca-cert"
+#define NM_SETTING_802_1X_CA_CERT_PASSWORD "ca-cert-password"
+#define NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS "ca-cert-password-flags"
 #define NM_SETTING_802_1X_CA_PATH "ca-path"
 #define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
 #define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
 #define NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH "domain-suffix-match"
 #define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
+#define NM_SETTING_802_1X_CLIENT_CERT_PASSWORD "client-cert-password"
+#define NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS "client-cert-password-flags"
 #define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
 #define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
 #define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
+#define NM_SETTING_802_1X_PHASE1_AUTH_FLAGS "phase1-auth-flags"
 #define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
 #define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
 #define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
+#define NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD "phase2-ca-cert-password"
+#define NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS "phase2-ca-cert-password-flags"
 #define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
 #define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
 #define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
 #define NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH "phase2-domain-suffix-match"
 #define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
+#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD "phase2-client-cert-password"
+#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS "phase2-client-cert-password-flags"
 #define NM_SETTING_802_1X_PASSWORD "password"
 #define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
 #define NM_SETTING_802_1X_PASSWORD_RAW "password-raw"
@@ -119,6 +150,7 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
 #define NM_SETTING_802_1X_PIN "pin"
 #define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
 #define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
+#define NM_SETTING_802_1X_AUTH_TIMEOUT "auth-timeout"
 
 /* PRIVATE KEY NOTE: when setting PKCS#12 private keys directly via properties
  * using the "blob" scheme, the data must be passed in PKCS#12 binary format.
@@ -142,6 +174,8 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
 
 /**
  * NMSetting8021x:
+ *
+ * AIEEE 802.1x Authentication Settings
  */
 struct _NMSetting8021x {
 	NMSetting parent;
@@ -189,6 +223,11 @@ gboolean               nm_setting_802_1x_set_ca_cert                 (NMSetting8
                                                                       NMSetting8021xCKFormat *out_format,
                                                                       GError **error);
 
+NM_AVAILABLE_IN_1_8
+const char *           nm_setting_802_1x_get_ca_cert_password        (NMSetting8021x *setting);
+NM_AVAILABLE_IN_1_8
+NMSettingSecretFlags   nm_setting_802_1x_get_ca_cert_password_flags  (NMSetting8021x *setting);
+
 const char *      nm_setting_802_1x_get_subject_match                (NMSetting8021x *setting);
 
 guint32           nm_setting_802_1x_get_num_altsubject_matches       (NMSetting8021x *setting);
@@ -215,6 +254,11 @@ gboolean               nm_setting_802_1x_set_client_cert             (NMSetting8
                                                                       NMSetting8021xCKFormat *out_format,
                                                                       GError **error);
 
+NM_AVAILABLE_IN_1_8
+const char *           nm_setting_802_1x_get_client_cert_password    (NMSetting8021x *setting);
+NM_AVAILABLE_IN_1_8
+NMSettingSecretFlags   nm_setting_802_1x_get_client_cert_password_flags (NMSetting8021x *setting);
+
 const char *      nm_setting_802_1x_get_phase1_peapver               (NMSetting8021x *setting);
 
 const char *      nm_setting_802_1x_get_phase1_peaplabel             (NMSetting8021x *setting);
@@ -236,6 +280,12 @@ gboolean               nm_setting_802_1x_set_phase2_ca_cert          (NMSetting8
                                                                       NMSetting8021xCKFormat *out_format,
                                                                       GError **error);
 
+
+NM_AVAILABLE_IN_1_8
+const char *           nm_setting_802_1x_get_phase2_ca_cert_password        (NMSetting8021x *setting);
+NM_AVAILABLE_IN_1_8
+NMSettingSecretFlags   nm_setting_802_1x_get_phase2_ca_cert_password_flags  (NMSetting8021x *setting);
+
 const char *      nm_setting_802_1x_get_phase2_subject_match         (NMSetting8021x *setting);
 
 guint32           nm_setting_802_1x_get_num_phase2_altsubject_matches       (NMSetting8021x *setting);
@@ -262,6 +312,11 @@ gboolean               nm_setting_802_1x_set_phase2_client_cert          (NMSett
                                                                           NMSetting8021xCKFormat *out_format,
                                                                           GError **error);
 
+NM_AVAILABLE_IN_1_8
+const char *           nm_setting_802_1x_get_phase2_client_cert_password (NMSetting8021x *setting);
+NM_AVAILABLE_IN_1_8
+NMSettingSecretFlags   nm_setting_802_1x_get_phase2_client_cert_password_flags (NMSetting8021x *setting);
+
 const char *      nm_setting_802_1x_get_password                     (NMSetting8021x *setting);
 NMSettingSecretFlags nm_setting_802_1x_get_password_flags            (NMSetting8021x *setting);
 GBytes *             nm_setting_802_1x_get_password_raw              (NMSetting8021x *setting);
@@ -302,6 +357,10 @@ NMSettingSecretFlags   nm_setting_802_1x_get_phase2_private_key_password_flags (
 
 NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format   (NMSetting8021x *setting);
 
+NM_AVAILABLE_IN_1_8
+NMSetting8021xAuthFlags nm_setting_802_1x_get_phase1_auth_flags          (NMSetting8021x *setting);
+NM_AVAILABLE_IN_1_8
+gint                   nm_setting_802_1x_get_auth_timeout                (NMSetting8021x *setting);
 
 G_END_DECLS
 
diff --git a/libnm-core/nm-setting-adsl.h b/libnm-core/nm-setting-adsl.h
index 5afbe5bf..4f04355e 100644
--- a/libnm-core/nm-setting-adsl.h
+++ b/libnm-core/nm-setting-adsl.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -56,6 +56,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingAdsl:
+ *
+ * ADSL Settings
  */
 struct _NMSettingAdsl {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-bluetooth.h b/libnm-core/nm-setting-bluetooth.h
index 6746782e..312aab14 100644
--- a/libnm-core/nm-setting-bluetooth.h
+++ b/libnm-core/nm-setting-bluetooth.h
@@ -61,6 +61,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingBluetooth:
+ *
+ * Bluetooth Settings
  */
 struct _NMSettingBluetooth {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c
index 904ebbfc..9a8bdc37 100644
--- a/libnm-core/nm-setting-bond.c
+++ b/libnm-core/nm-setting-bond.c
@@ -395,10 +395,12 @@ nm_setting_bond_remove_option (NMSettingBond *setting,
 
 /**
  * nm_setting_bond_get_valid_options:
- * @setting: the #NMSettingBond
+ * @setting: (allow-none): the #NMSettingBond
  *
  * Returns a list of valid bond options.
  *
+ * The @setting argument is unused and may be passed as %NULL.
+ *
  * Returns: (transfer none): a %NULL-terminated array of strings of valid bond options.
  **/
 const char **
diff --git a/libnm-core/nm-setting-bond.h b/libnm-core/nm-setting-bond.h
index 8ee31888..e2d8f9b5 100644
--- a/libnm-core/nm-setting-bond.h
+++ b/libnm-core/nm-setting-bond.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -72,6 +72,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingBond:
+ *
+ * Bonding Settings
  */
 struct _NMSettingBond {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-bridge-port.h b/libnm-core/nm-setting-bridge-port.h
index b43f6366..0ff6d9f1 100644
--- a/libnm-core/nm-setting-bridge-port.h
+++ b/libnm-core/nm-setting-bridge-port.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -45,6 +45,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingBridgePort:
+ *
+ * Bridge Port Settings
  */
 struct _NMSettingBridgePort {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index 844c06ad..81e4c644 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -50,6 +50,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingBridge:
+ *
+ * Bridging Settings
  */
 struct _NMSettingBridge {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-cdma.c b/libnm-core/nm-setting-cdma.c
index 31b02d7f..b267ba63 100644
--- a/libnm-core/nm-setting-cdma.c
+++ b/libnm-core/nm-setting-cdma.c
@@ -48,6 +48,7 @@ typedef struct {
 	char *username;
 	char *password;
 	NMSettingSecretFlags password_flags;
+	guint32 mtu;
 } NMSettingCdmaPrivate;
 
 enum {
@@ -56,6 +57,7 @@ enum {
 	PROP_USERNAME,
 	PROP_PASSWORD,
 	PROP_PASSWORD_FLAGS,
+	PROP_MTU,
 
 	LAST_PROP
 };
@@ -129,6 +131,22 @@ nm_setting_cdma_get_password_flags (NMSettingCdma *setting)
 	return NM_SETTING_CDMA_GET_PRIVATE (setting)->password_flags;
 }
 
+/**
+ * nm_setting_cdma_get_mtu:
+ * @setting: the #NMSettingCdma
+ *
+ * Returns: the #NMSettingCdma:mtu property of the setting
+ *
+ * Since: 1.8
+ **/
+guint32
+nm_setting_cdma_get_mtu (NMSettingCdma *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_CDMA (setting), 0);
+
+	return NM_SETTING_CDMA_GET_PRIVATE (setting)->mtu;
+}
+
 static gboolean
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
@@ -229,6 +247,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_PASSWORD_FLAGS:
 		priv->password_flags = g_value_get_flags (value);
 		break;
+	case PROP_MTU:
+		priv->mtu = g_value_get_uint (value);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -254,6 +275,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_PASSWORD_FLAGS:
 		g_value_set_flags (value, nm_setting_cdma_get_password_flags (setting));
 		break;
+	case PROP_MTU:
+		g_value_set_uint (value, nm_setting_cdma_get_mtu (setting));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -333,4 +357,22 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *setting_class)
 		                     NM_SETTING_SECRET_FLAG_NONE,
 		                     G_PARAM_READWRITE |
 		                     G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingCdma:mtu:
+	 *
+	 * If non-zero, only transmit packets of the specified size or smaller,
+	 * breaking larger packets up into multiple frames.
+	 *
+	 * Since: 1.8
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_MTU,
+		 g_param_spec_uint (NM_SETTING_CDMA_MTU, "", "",
+		                    0, G_MAXUINT32, 0,
+		                    G_PARAM_READWRITE |
+		                    G_PARAM_CONSTRUCT |
+		                    NM_SETTING_PARAM_FUZZY_IGNORE |
+		                    G_PARAM_STATIC_STRINGS));
+
 }
diff --git a/libnm-core/nm-setting-cdma.h b/libnm-core/nm-setting-cdma.h
index 091c530e..6e429bd1 100644
--- a/libnm-core/nm-setting-cdma.h
+++ b/libnm-core/nm-setting-cdma.h
@@ -27,7 +27,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -44,9 +44,12 @@ G_BEGIN_DECLS
 #define NM_SETTING_CDMA_USERNAME       "username"
 #define NM_SETTING_CDMA_PASSWORD       "password"
 #define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags"
+#define NM_SETTING_CDMA_MTU            "mtu"
 
 /**
  * NMSettingCdma:
+ *
+ * CDMA-based Mobile Broadband Settings
  */
 struct _NMSettingCdma {
 	NMSetting parent;
@@ -67,6 +70,9 @@ const char *nm_setting_cdma_get_username (NMSettingCdma *setting);
 const char *nm_setting_cdma_get_password (NMSettingCdma *setting);
 NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);
 
+NM_AVAILABLE_IN_1_8
+guint32 nm_setting_cdma_get_mtu          (NMSettingCdma *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_CDMA_H__ */
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index ac8bdf2d..38f3bf44 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -289,10 +289,10 @@ nm_setting_connection_get_connection_type (NMSettingConnection *setting)
  * nm_setting_connection_get_num_permissions:
  * @setting: the #NMSettingConnection
  *
- * Returns the number of entires in the #NMSettingConnection:permissions
+ * Returns the number of entries in the #NMSettingConnection:permissions
  * property of this setting.
  *
- * Returns: the number of permissions entires
+ * Returns: the number of permissions entries
  */
 guint32
 nm_setting_connection_get_num_permissions (NMSettingConnection *setting)
@@ -857,7 +857,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
 	NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (setting);
 	gboolean is_slave;
-	const char *slave_setting_type = NULL;
+	const char *slave_setting_type;
 	NMSetting *normerr_base_type = NULL;
 	const char *normerr_slave_setting_type = NULL;
 	const char *normerr_missing_slave_type = NULL;
@@ -958,16 +958,17 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	}
 
 	is_slave = FALSE;
-	if (priv->slave_type)
+	slave_setting_type = NULL;
+	if (priv->slave_type) {
 		is_slave = _nm_setting_slave_type_is_valid (priv->slave_type, &slave_setting_type);
-
-	if (priv->slave_type && !is_slave) {
-		g_set_error (error,
-		             NM_CONNECTION_ERROR,
-		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-		             _("Unknown slave type '%s'"), priv->slave_type);
-		g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_SLAVE_TYPE);
-		return FALSE;
+		if (!is_slave) {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			             _("Unknown slave type '%s'"), priv->slave_type);
+			g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_SLAVE_TYPE);
+			return FALSE;
+		}
 	}
 
 	if (is_slave) {
@@ -1063,6 +1064,24 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		return NM_SETTING_VERIFY_NORMALIZABLE_ERROR;
 	}
 
+	if (connection) {
+		gboolean has_bridge_port = FALSE;
+
+		if (   (   !nm_streq0 (priv->slave_type, NM_SETTING_BRIDGE_SETTING_NAME)
+		        && (has_bridge_port = !!nm_connection_get_setting_by_name (connection, NM_SETTING_BRIDGE_PORT_SETTING_NAME)))
+		    || (   !nm_streq0 (priv->slave_type, NM_SETTING_TEAM_SETTING_NAME)
+		        && nm_connection_get_setting_by_name (connection, NM_SETTING_TEAM_PORT_SETTING_NAME))) {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_INVALID_SETTING,
+			             _("A slave connection with '%s' set to '%s' cannot have a '%s' setting"),
+			             NM_SETTING_CONNECTION_SLAVE_TYPE, priv->slave_type ?: "",
+			             has_bridge_port ? NM_SETTING_BRIDGE_PORT_SETTING_NAME : NM_SETTING_TEAM_PORT_SETTING_NAME);
+			g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_SLAVE_TYPE);
+			return NM_SETTING_VERIFY_NORMALIZABLE_ERROR;
+		}
+	}
+
 	return TRUE;
 }
 
diff --git a/libnm-core/nm-setting-connection.h b/libnm-core/nm-setting-connection.h
index 89fa64ce..bd5b98ff 100644
--- a/libnm-core/nm-setting-connection.h
+++ b/libnm-core/nm-setting-connection.h
@@ -99,8 +99,7 @@ typedef enum {
 /**
  * NMSettingConnection:
  *
- * The NMSettingConnection struct contains only private data.
- * It should only be accessed through the functions described below.
+ * General Connection Profile Settings
  */
 struct _NMSettingConnection {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-dcb.h b/libnm-core/nm-setting-dcb.h
index 6cc2ce41..d2a364a2 100644
--- a/libnm-core/nm-setting-dcb.h
+++ b/libnm-core/nm-setting-dcb.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -94,6 +94,8 @@ typedef enum { /*< flags >*/
 
 /**
  * NMSettingDcb:
+ *
+ * Data Center Bridging Settings
  */
 struct _NMSettingDcb {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-dummy.c b/libnm-core/nm-setting-dummy.c
new file mode 100644
index 00000000..d23f0a30
--- /dev/null
+++ b/libnm-core/nm-setting-dummy.c
@@ -0,0 +1,76 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2017 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-setting-dummy.h"
+
+#include "nm-connection-private.h"
+#include "nm-setting-connection.h"
+#include "nm-setting-private.h"
+
+/**
+ * SECTION:nm-setting-dummy
+ * @short_description: Describes connection properties for dummy interfaces
+ *
+ * The #NMSettingDummy object is a #NMSetting subclass that describes properties
+ * necessary for connection to dummy devices
+ **/
+
+G_DEFINE_TYPE_WITH_CODE (NMSettingDummy, nm_setting_dummy, NM_TYPE_SETTING,
+                         _nm_register_setting (DUMMY, 1))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_DUMMY)
+
+/**
+ * nm_setting_dummy_new:
+ *
+ * Creates a new #NMSettingDummy object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingDummy object
+ *
+ * Since: 1.8
+ **/
+NMSetting *
+nm_setting_dummy_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_DUMMY, NULL);
+}
+
+static gboolean
+verify (NMSetting *setting, NMConnection *connection, GError **error)
+{
+	if (!_nm_connection_verify_required_interface_name (connection, error))
+		return FALSE;
+
+	return TRUE;
+}
+
+static void
+nm_setting_dummy_init (NMSettingDummy *setting)
+{
+}
+
+static void
+nm_setting_dummy_class_init (NMSettingDummyClass *setting_class)
+{
+	NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class);
+
+	parent_class->verify           = verify;
+}
diff --git a/libnm-core/nm-setting-dummy.h b/libnm-core/nm-setting-dummy.h
new file mode 100644
index 00000000..62fe3fa6
--- /dev/null
+++ b/libnm-core/nm-setting-dummy.h
@@ -0,0 +1,65 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2017 Red Hat, Inc.
+ */
+
+#ifndef __NM_SETTING_DUMMY_H__
+#define __NM_SETTING_DUMMY_H__
+
+#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
+#error "Only  can be included directly."
+#endif
+
+#include "nm-setting.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_SETTING_DUMMY            (nm_setting_dummy_get_type ())
+#define NM_SETTING_DUMMY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_DUMMY, NMSettingDummy))
+#define NM_SETTING_DUMMY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_DUMMYCONFIG, NMSettingDummyClass))
+#define NM_IS_SETTING_DUMMY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_DUMMY))
+#define NM_IS_SETTING_DUMMY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_DUMMY))
+#define NM_SETTING_DUMMY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_DUMMY, NMSettingDummyClass))
+
+#define NM_SETTING_DUMMY_SETTING_NAME         "dummy"
+
+/**
+ * NMSettingDummy:
+ *
+ * Dummy Link Settings
+ */
+struct _NMSettingDummy {
+	NMSetting parent;
+};
+
+typedef struct {
+	NMSettingClass parent;
+
+	/*< private >*/
+	gpointer padding[4];
+} NMSettingDummyClass;
+
+NM_AVAILABLE_IN_1_8
+GType nm_setting_dummy_get_type (void);
+NM_AVAILABLE_IN_1_8
+NMSetting *nm_setting_dummy_new (void);
+
+G_END_DECLS
+
+#endif /* __NM_SETTING_DUMMY_H__ */
diff --git a/libnm-core/nm-setting-generic.h b/libnm-core/nm-setting-generic.h
index 0ce3b160..864b9004 100644
--- a/libnm-core/nm-setting-generic.h
+++ b/libnm-core/nm-setting-generic.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -41,6 +41,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingGeneric:
+ *
+ * Generic Link Settings
  */
 struct _NMSettingGeneric {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-gsm.c b/libnm-core/nm-setting-gsm.c
index 86166df2..be32b852 100644
--- a/libnm-core/nm-setting-gsm.c
+++ b/libnm-core/nm-setting-gsm.c
@@ -62,6 +62,7 @@ typedef struct {
 	NMSettingSecretFlags pin_flags;
 
 	gboolean home_only;
+	guint32 mtu;
 } NMSettingGsmPrivate;
 
 enum {
@@ -78,6 +79,7 @@ enum {
 	PROP_DEVICE_ID,
 	PROP_SIM_ID,
 	PROP_SIM_OPERATOR_ID,
+	PROP_MTU,
 
 	LAST_PROP
 };
@@ -269,6 +271,22 @@ nm_setting_gsm_get_sim_operator_id (NMSettingGsm *setting)
 	return NM_SETTING_GSM_GET_PRIVATE (setting)->sim_operator_id;
 }
 
+/**
+ * nm_setting_gsm_get_mtu:
+ * @setting: the #NMSettingGsm
+ *
+ * Returns: the #NMSettingGsm:mtu property of the setting
+ *
+ * Since: 1.8
+ **/
+guint32
+nm_setting_gsm_get_mtu (NMSettingGsm *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_GSM (setting), 0);
+
+	return NM_SETTING_GSM_GET_PRIVATE (setting)->mtu;
+}
+
 static gboolean
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
@@ -524,6 +542,9 @@ set_property (GObject *object, guint prop_id,
 		g_free (priv->sim_operator_id);
 		priv->sim_operator_id = g_value_dup_string (value);
 		break;
+	case PROP_MTU:
+		priv->mtu = g_value_get_uint (value);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -573,6 +594,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_SIM_OPERATOR_ID:
 		g_value_set_string (value, nm_setting_gsm_get_sim_operator_id (setting));
 		break;
+	case PROP_MTU:
+		g_value_set_uint (value, nm_setting_gsm_get_mtu (setting));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -780,6 +804,23 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
 		                      G_PARAM_READWRITE |
 		                      G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * NMSettingGsm:mtu:
+	 *
+	 * If non-zero, only transmit packets of the specified size or smaller,
+	 * breaking larger packets up into multiple frames.
+	 *
+	 * Since: 1.8
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_MTU,
+		 g_param_spec_uint (NM_SETTING_GSM_MTU, "", "",
+		                    0, G_MAXUINT32, 0,
+		                    G_PARAM_READWRITE |
+		                    G_PARAM_CONSTRUCT |
+		                    NM_SETTING_PARAM_FUZZY_IGNORE |
+		                    G_PARAM_STATIC_STRINGS));
+
 	/* Ignore incoming deprecated properties */
 	_nm_setting_class_add_dbus_only_property (parent_class, "allowed-bands",
 	                                          G_VARIANT_TYPE_UINT32,
diff --git a/libnm-core/nm-setting-gsm.h b/libnm-core/nm-setting-gsm.h
index 7f97d386..8516698d 100644
--- a/libnm-core/nm-setting-gsm.h
+++ b/libnm-core/nm-setting-gsm.h
@@ -27,7 +27,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -52,9 +52,12 @@ G_BEGIN_DECLS
 #define NM_SETTING_GSM_DEVICE_ID       "device-id"
 #define NM_SETTING_GSM_SIM_ID          "sim-id"
 #define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id"
+#define NM_SETTING_GSM_MTU             "mtu"
 
 /**
  * NMSettingGsm:
+ *
+ * GSM-based Mobile Broadband Settings
  */
 struct _NMSettingGsm {
 	NMSetting parent;
@@ -84,6 +87,8 @@ NM_AVAILABLE_IN_1_2
 const char *nm_setting_gsm_get_sim_id          (NMSettingGsm *setting);
 NM_AVAILABLE_IN_1_2
 const char *nm_setting_gsm_get_sim_operator_id (NMSettingGsm *setting);
+NM_AVAILABLE_IN_1_8
+guint32 nm_setting_gsm_get_mtu                 (NMSettingGsm *setting);
 
 NMSettingSecretFlags nm_setting_gsm_get_pin_flags      (NMSettingGsm *setting);
 NMSettingSecretFlags nm_setting_gsm_get_password_flags (NMSettingGsm *setting);
diff --git a/libnm-core/nm-setting-infiniband.h b/libnm-core/nm-setting-infiniband.h
index f19983b4..ff78b3dc 100644
--- a/libnm-core/nm-setting-infiniband.h
+++ b/libnm-core/nm-setting-infiniband.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -47,6 +47,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingInfiniband:
+ *
+ * Infiniband Settings
  */
 struct _NMSettingInfiniband {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index 09c5798a..139c2c3e 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -1182,6 +1182,157 @@ nm_ip_route_set_attribute (NMIPRoute *route, const char *name, GVariant *value)
 		g_hash_table_remove (route->attributes, name);
 }
 
+#define ATTR_SPEC_PTR(name, type, v4, v6, str_type) \
+	&(NMVariantAttributeSpec) { name, type, v4, v6, str_type }
+
+static const NMVariantAttributeSpec * const ip_route_attribute_spec[] = {
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_SRC,             G_VARIANT_TYPE_STRING,   TRUE,  TRUE, 'a'),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_FROM,            G_VARIANT_TYPE_STRING,   FALSE, TRUE, 'p'),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_TOS,             G_VARIANT_TYPE_BYTE,     TRUE,  TRUE,  0 ),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_WINDOW,          G_VARIANT_TYPE_UINT32,   TRUE,  TRUE,  0 ),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_CWND,            G_VARIANT_TYPE_UINT32,   TRUE,  TRUE,  0 ),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_INITCWND,        G_VARIANT_TYPE_UINT32,   TRUE,  TRUE,  0 ),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_INITRWND,        G_VARIANT_TYPE_UINT32,   TRUE,  TRUE,  0 ),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_MTU,             G_VARIANT_TYPE_UINT32,   TRUE,  TRUE,  0 ),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW,     G_VARIANT_TYPE_BOOLEAN,  TRUE,  TRUE,  0 ),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND,       G_VARIANT_TYPE_BOOLEAN,  TRUE,  TRUE,  0 ),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND,   G_VARIANT_TYPE_BOOLEAN,  TRUE,  TRUE,  0 ),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND,   G_VARIANT_TYPE_BOOLEAN,  TRUE,  TRUE,  0 ),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU,        G_VARIANT_TYPE_BOOLEAN,  TRUE,  TRUE,  0 ),
+	NULL,
+};
+
+/**
+ * nm_ip_route_get_variant_attribute_spec:
+ *
+ * Returns: the specifiers for route attributes
+ *
+ * Since: 1.8
+ */
+const NMVariantAttributeSpec *const *
+nm_ip_route_get_variant_attribute_spec (void)
+{
+	return ip_route_attribute_spec;
+}
+
+/**
+ * nm_ip_route_attribute_validate:
+ * @name: the attribute name
+ * @value: the attribute value
+ * @family: IP address family of the route
+ * @known: (out): on return, whether the attribute name is a known one
+ * @error: (allow-none): return location for a #GError, or %NULL
+ *
+ * Validates a route attribute, i.e. checks that the attribute is a known one
+ * and the value is of the correct type and well-formed.
+ *
+ * Returns: %TRUE if the attribute is valid, %FALSE otherwise
+ *
+ * Since: 1.8
+ */
+gboolean
+nm_ip_route_attribute_validate  (const char *name,
+                                 GVariant *value,
+                                 int family,
+                                 gboolean *known,
+                                 GError **error)
+{
+	const NMVariantAttributeSpec *const *iter;
+	const NMVariantAttributeSpec *spec = NULL;
+
+	g_return_val_if_fail (name, FALSE);
+	g_return_val_if_fail (value, FALSE);
+	g_return_val_if_fail (family == AF_INET || family == AF_INET6, FALSE);
+	g_return_val_if_fail (!error || !*error, FALSE);
+
+	for (iter = ip_route_attribute_spec; *iter; iter++) {
+		if (nm_streq (name, (*iter)->name)) {
+			spec = *iter;
+			break;
+		}
+	}
+
+	if (!spec) {
+		NM_SET_OUT (known, FALSE);
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_FAILED,
+		                     _("unknown attribute"));
+		return FALSE;
+	}
+
+	NM_SET_OUT (known, TRUE);
+
+	if (!g_variant_is_of_type (value, spec->type)) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_FAILED,
+		             _("invalid attribute type '%s'"),
+		             g_variant_get_type_string (value));
+		return FALSE;
+	}
+
+	if (   (family == AF_INET && !spec->v4)
+	    || (family == AF_INET6 && !spec->v6)) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_FAILED,
+		             family == AF_INET ?
+		                 _("attribute is not valid for a IPv4 route") :
+		                 _("attribute is not valid for a IPv6 route"));
+		return FALSE;
+	}
+
+	if (spec->type == G_VARIANT_TYPE_STRING) {
+		const char *string = g_variant_get_string (value, NULL);
+		gs_free char *string_free = NULL;
+		char *sep;
+
+		switch (spec->str_type) {
+		case 'a':	/* IP address */
+			if (!nm_utils_ipaddr_valid (family, string)) {
+				g_set_error (error,
+				             NM_CONNECTION_ERROR,
+				             NM_CONNECTION_ERROR_FAILED,
+				             family == AF_INET ?
+				                 _("'%s' is not a valid IPv4 address") :
+				                 _("'%s' is not a valid IPv6 address"),
+				             string);
+				return FALSE;
+			}
+			break;
+		case 'p':	/* IP address + optional prefix */
+			string_free = g_strdup (string);
+			sep = strchr (string_free, '/');
+			if (sep) {
+				*sep = 0;
+				if (_nm_utils_ascii_str_to_int64 (sep + 1, 10, 1, family == AF_INET ? 32 : 128, -1) < 0) {
+					g_set_error (error,
+					             NM_CONNECTION_ERROR,
+					             NM_CONNECTION_ERROR_FAILED,
+					             _("invalid prefix %s"), sep + 1);
+					return FALSE;
+				}
+			}
+			if (!nm_utils_ipaddr_valid (family, string_free)) {
+				g_set_error (error,
+				             NM_CONNECTION_ERROR,
+				             NM_CONNECTION_ERROR_FAILED,
+				             family == AF_INET ?
+				                 _("'%s' is not a valid IPv4 address") :
+				                 _("'%s' is not a valid IPv6 address"),
+				             string_free);
+				return FALSE;
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	return TRUE;
+}
+
 /*****************************************************************************/
 
 G_DEFINE_ABSTRACT_TYPE (NMSettingIPConfig, nm_setting_ip_config, NM_TYPE_SETTING)
diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h
index b18d6a94..b7bb0215 100644
--- a/libnm-core/nm-setting-ip-config.h
+++ b/libnm-core/nm-setting-ip-config.h
@@ -28,6 +28,7 @@
 #endif
 
 #include "nm-setting.h"
+#include "nm-utils.h"
 
 G_BEGIN_DECLS
 
@@ -121,7 +122,28 @@ GVariant    *nm_ip_route_get_attribute       (NMIPRoute   *route,
 void         nm_ip_route_set_attribute       (NMIPRoute   *route,
                                               const char  *name,
                                               GVariant    *value);
+NM_AVAILABLE_IN_1_8
+const NMVariantAttributeSpec *const *nm_ip_route_get_variant_attribute_spec (void);
+NM_AVAILABLE_IN_1_8
+gboolean     nm_ip_route_attribute_validate  (const char *name,
+                                              GVariant *value,
+                                              int family,
+                                              gboolean *known,
+                                              GError **error);
 
+#define NM_IP_ROUTE_ATTRIBUTE_SRC            "src"
+#define NM_IP_ROUTE_ATTRIBUTE_FROM           "from"
+#define NM_IP_ROUTE_ATTRIBUTE_TOS            "tos"
+#define NM_IP_ROUTE_ATTRIBUTE_WINDOW         "window"
+#define NM_IP_ROUTE_ATTRIBUTE_CWND           "cwnd"
+#define NM_IP_ROUTE_ATTRIBUTE_INITCWND       "initcwnd"
+#define NM_IP_ROUTE_ATTRIBUTE_INITRWND       "initrwnd"
+#define NM_IP_ROUTE_ATTRIBUTE_MTU            "mtu"
+#define NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW    "lock-window"
+#define NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND      "lock-cwnd"
+#define NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND  "lock-initcwnd"
+#define NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND  "lock-initrwnd"
+#define NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU       "lock-mtu"
 
 #define NM_TYPE_SETTING_IP_CONFIG            (nm_setting_ip_config_get_type ())
 #define NM_SETTING_IP_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_IP_CONFIG, NMSettingIPConfig))
diff --git a/libnm-core/nm-setting-ip-tunnel.h b/libnm-core/nm-setting-ip-tunnel.h
index 3ee4aafe..dfa62116 100644
--- a/libnm-core/nm-setting-ip-tunnel.h
+++ b/libnm-core/nm-setting-ip-tunnel.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -53,6 +53,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingIPTunnel:
+ *
+ * IP Tunneling Settings
  */
 struct _NMSettingIPTunnel {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
index 91a4a3f5..3a366161 100644
--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@@ -615,7 +615,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *ip4_class)
 	 * ---end---
 	 * ---ifcfg-rh---
 	 * property: routes
-	 * variable: ADDRESS1, NETMASK1, GATEWAY1, METRIC1, ...
+	 * variable: ADDRESS1, NETMASK1, GATEWAY1, METRIC1, OPTIONS1, ...
 	 * description: List of static routes. They are not stored in ifcfg-* file,
 	 *   but in route-* file instead.
 	 * ---end---
diff --git a/libnm-core/nm-setting-ip4-config.h b/libnm-core/nm-setting-ip4-config.h
index adef3754..ca894509 100644
--- a/libnm-core/nm-setting-ip4-config.h
+++ b/libnm-core/nm-setting-ip4-config.h
@@ -89,6 +89,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingIP4Config:
+ *
+ * IPv4 Settings
  */
 struct _NMSettingIP4Config {
 	NMSettingIPConfig parent;
diff --git a/libnm-core/nm-setting-ip6-config.h b/libnm-core/nm-setting-ip6-config.h
index 8e2c7771..e01a36b7 100644
--- a/libnm-core/nm-setting-ip6-config.h
+++ b/libnm-core/nm-setting-ip6-config.h
@@ -139,6 +139,8 @@ typedef enum {
 
 /**
  * NMSettingIP6Config:
+ *
+ * IPv6 Settings
  */
 struct _NMSettingIP6Config {
 	NMSettingIPConfig parent;
diff --git a/libnm-core/nm-setting-macsec.c b/libnm-core/nm-setting-macsec.c
index 60df6839..c818f07f 100644
--- a/libnm-core/nm-setting-macsec.c
+++ b/libnm-core/nm-setting-macsec.c
@@ -251,7 +251,7 @@ verify_macsec_key (const char *key, gboolean cak, GError **error)
 		g_set_error_literal (error,
 		                     NM_CONNECTION_ERROR,
 		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
-		                     _("the key contais non-hexadecimal characters"));
+		                     _("the key contains non-hexadecimal characters"));
 		return FALSE;
 	}
 
diff --git a/libnm-core/nm-setting-macsec.h b/libnm-core/nm-setting-macsec.h
index f9431dfe..6a524faa 100644
--- a/libnm-core/nm-setting-macsec.h
+++ b/libnm-core/nm-setting-macsec.h
@@ -50,6 +50,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingMacsec:
+ *
+ * MACSec Settings
  */
 struct _NMSettingMacsec {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-macvlan.h b/libnm-core/nm-setting-macvlan.h
index 33860aac..605efd0f 100644
--- a/libnm-core/nm-setting-macvlan.h
+++ b/libnm-core/nm-setting-macvlan.h
@@ -46,6 +46,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingMacvlan:
+ *
+ * MAC VLAN Settings
  */
 struct _NMSettingMacvlan {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-olpc-mesh.h b/libnm-core/nm-setting-olpc-mesh.h
index 2506cec9..69b3c6e9 100644
--- a/libnm-core/nm-setting-olpc-mesh.h
+++ b/libnm-core/nm-setting-olpc-mesh.h
@@ -27,7 +27,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -46,6 +46,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingOlpcMesh:
+ *
+ * OLPC Wireless Mesh Settings
  */
 struct _NMSettingOlpcMesh {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-ppp.h b/libnm-core/nm-setting-ppp.h
index a835ef8a..01536d84 100644
--- a/libnm-core/nm-setting-ppp.h
+++ b/libnm-core/nm-setting-ppp.h
@@ -27,7 +27,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -61,6 +61,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingPpp:
+ *
+ * Point-to-Point Protocol Settings
  */
 struct _NMSettingPpp {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-pppoe.h b/libnm-core/nm-setting-pppoe.h
index 1f5b6ed9..b6717cde 100644
--- a/libnm-core/nm-setting-pppoe.h
+++ b/libnm-core/nm-setting-pppoe.h
@@ -27,7 +27,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -47,6 +47,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingPppoe:
+ *
+ * PPP-over-Ethernet Settings
  */
 struct _NMSettingPppoe {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h
index 8d09e3d7..79b6ac87 100644
--- a/libnm-core/nm-setting-private.h
+++ b/libnm-core/nm-setting-private.h
@@ -27,22 +27,6 @@
 
 #include "nm-core-internal.h"
 
-/**
- * NMSettingVerifyResult:
- * @NM_SETTING_VERIFY_SUCCESS: the setting verifies successfully
- * @NM_SETTING_VERIFY_ERROR: the setting has a serious misconfiguration
- * @NM_SETTING_VERIFY_NORMALIZABLE: the setting is valid but has properties
- * that should be normalized
- * @NM_SETTING_VERIFY_NORMALIZABLE_ERROR: the setting is invalid but the
- * errors can be fixed by nm_connection_normalize().
- */
-typedef enum {
-	NM_SETTING_VERIFY_SUCCESS       = TRUE,
-	NM_SETTING_VERIFY_ERROR         = FALSE,
-	NM_SETTING_VERIFY_NORMALIZABLE  = 2,
-	NM_SETTING_VERIFY_NORMALIZABLE_ERROR = 3,
-} NMSettingVerifyResult;
-
 void _nm_register_setting (const char *name,
                            const GType type,
                            const guint32 priority);
diff --git a/libnm-core/nm-setting-proxy.h b/libnm-core/nm-setting-proxy.h
index 2009dfab..0c72799f 100644
--- a/libnm-core/nm-setting-proxy.h
+++ b/libnm-core/nm-setting-proxy.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -58,6 +58,11 @@ typedef enum {
 #define NM_SETTING_PROXY_PAC_URL "pac-url"
 #define NM_SETTING_PROXY_PAC_SCRIPT "pac-script"
 
+/**
+ * NMSettingProxy:
+ *
+ * WWW Proxy Settings
+ */
 struct _NMSettingProxy {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-serial.h b/libnm-core/nm-setting-serial.h
index 182efc61..2362b246 100644
--- a/libnm-core/nm-setting-serial.h
+++ b/libnm-core/nm-setting-serial.h
@@ -27,7 +27,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -62,6 +62,8 @@ typedef enum {
 
 /**
  * NMSettingSerial:
+ *
+ * Serial Link Settings
  */
 struct _NMSettingSerial {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-team-port.h b/libnm-core/nm-setting-team-port.h
index 546cc69a..4fcc5108 100644
--- a/libnm-core/nm-setting-team-port.h
+++ b/libnm-core/nm-setting-team-port.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -42,6 +42,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingTeamPort:
+ *
+ * Team Port Settings
  */
 struct _NMSettingTeamPort {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h
index 726f8420..532963aa 100644
--- a/libnm-core/nm-setting-team.h
+++ b/libnm-core/nm-setting-team.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -42,6 +42,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingTeam:
+ *
+ * Teaming Settings
  */
 struct _NMSettingTeam {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-tun.c b/libnm-core/nm-setting-tun.c
index fe14eec2..62e9ef14 100644
--- a/libnm-core/nm-setting-tun.c
+++ b/libnm-core/nm-setting-tun.c
@@ -184,7 +184,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
 		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-		             _("'%u': invalid mode"), (unsigned int) priv->mode);
+		             _("'%u': invalid mode"), (unsigned) priv->mode);
 		g_prefix_error (error, "%s.%s: ", NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_MODE);
 		return FALSE;
 	}
diff --git a/libnm-core/nm-setting-tun.h b/libnm-core/nm-setting-tun.h
index 63c0cbd8..d977e381 100644
--- a/libnm-core/nm-setting-tun.h
+++ b/libnm-core/nm-setting-tun.h
@@ -62,6 +62,8 @@ typedef enum {
 
 /**
  * NMSettingTun:
+ *
+ * Tunnel Settings
  */
 struct _NMSettingTun {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-user.c b/libnm-core/nm-setting-user.c
new file mode 100644
index 00000000..71d73891
--- /dev/null
+++ b/libnm-core/nm-setting-user.c
@@ -0,0 +1,612 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2017 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-setting-user.h"
+
+#include "nm-setting.h"
+#include "nm-setting-private.h"
+#include "nm-utils-private.h"
+
+/**
+ * SECTION:nm-setting-user
+ * @short_description: Describes user properties
+ *
+ * The #NMSettingUser object is a #NMSetting subclass that allow to attach
+ * arbitrary user data to #NMConnection objects.
+ **/
+
+#define MAX_NUM_KEYS 256
+
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingUser,
+	PROP_DATA,
+);
+
+typedef struct {
+	GHashTable *data;
+	GHashTable *data_invalid;
+	const char **keys;
+} NMSettingUserPrivate;
+
+/**
+ * NMSettingUser:
+ *
+ * General User Profile Settings
+ */
+struct _NMSettingUser {
+	NMSetting parent;
+	NMSettingUserPrivate _priv;
+};
+
+struct _NMSettingUserClass {
+	NMSettingClass parent;
+};
+
+G_DEFINE_TYPE_WITH_CODE (NMSettingUser, nm_setting_user, NM_TYPE_SETTING,
+                         _nm_register_setting (USER, 10))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_USER)
+
+#define NM_SETTING_USER_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMSettingUser, NM_IS_SETTING_USER)
+
+/*****************************************************************************/
+
+static gboolean
+_key_char_is_regular (char ch)
+{
+	/* allow words of printable characters, plus some
+	 * special characters, for example to support base64 encoding. */
+	return    (ch >= 'a' && ch <= 'z')
+	       || (ch >= 'A' && ch <= 'Z')
+	       || (ch >= '0' && ch <= '9')
+	       || NM_IN_SET (ch, '-', '_', '+', '/', '=');
+}
+
+/**
+ * nm_setting_user_check_key:
+ * @key: the key to check
+ * @error: a #GError, %NULL to ignore.
+ *
+ * Checks whether @key is a valid user data key. This means,
+ * key is not %NULL, not too large and valid ASCII. Also,
+ * only digits and numbers are allowed with a few special
+ * characters. The key must contain at least one '.' and
+ * look like a fully qualified DNS name.
+ *
+ * Since: 1.8
+ *
+ * Returns: %TRUE if @key is a valid user data key.
+ */
+gboolean
+nm_setting_user_check_key (const char *key, GError **error)
+{
+	gsize len;
+	gboolean has_dot;
+	char ch;
+
+	g_return_val_if_fail (!error || !*error, FALSE);
+
+	if (!key || !key[0]) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("missing key"));
+		return FALSE;
+	}
+	len = strlen (key);
+	if (len > 255) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("key is too long"));
+		return FALSE;
+	}
+	if (!g_utf8_validate (key, len, NULL)) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("key must be UTF8"));
+		return FALSE;
+	}
+
+	has_dot = FALSE;
+	while (TRUE) {
+		ch = (key++)[0];
+
+		/* Allow something that looks like a FQN, separating namespaces by a single '.'
+		 * We want to print the keys nicely in nmcli requiring escaping.
+		 *
+		 * If a user really has to encode special values in the name, he may base64 encode it. */
+
+		if (!_key_char_is_regular (ch))
+			break;
+
+		while (_key_char_is_regular (key[0]))
+			key++;
+
+		ch = key[0];
+		if (ch == '\0') {
+			if (!has_dot) {
+				g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				                     _("key requires a '.' for a namespace"));
+				return FALSE;
+			}
+			return TRUE;
+		}
+
+		if (ch != '.')
+			break;
+
+		has_dot = TRUE;
+		ch = (++key)[0];
+		if (ch == '.') {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("key cannot contain \"..\""));
+			return FALSE;
+		}
+	}
+	g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+	                     _("key contains invalid characters"));
+	return FALSE;
+}
+
+/**
+ * nm_setting_user_check_val:
+ * @val: the value to check
+ * @error: a #GError, %NULL to ignore.
+ *
+ * Checks whether @val is a valid user data value. This means,
+ * value is not %NULL, not too large and valid UTF-8.
+ *
+ * Since: 1.8
+ *
+ * Returns: %TRUE if @val is a valid user data value.
+ */
+gboolean
+nm_setting_user_check_val (const char *val, GError **error)
+{
+	gsize len;
+
+	g_return_val_if_fail (!error || !*error, FALSE);
+
+	if (!val) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("value is missing"));
+		return FALSE;
+	}
+
+	len = strlen (val);
+	if (len > 8*1024) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("value is too large"));
+		return FALSE;
+	}
+
+	if (!g_utf8_validate (val, len, NULL)) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("value is not valid UTF8"));
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/*****************************************************************************/
+
+static GHashTable *
+_create_data_hash (void)
+{
+	return g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+}
+
+/**
+ * nm_setting_user_get_keys:
+ * @setting: the #NMSettingUser
+ * @out_len: (out): the length of the returned array
+ *
+ * Returns: (array length=out_len) (transfer none): a
+ *   %NULL-terminated array containing each key from the table.
+  **/
+const char *const*
+nm_setting_user_get_keys (NMSettingUser *setting, guint *out_len)
+{
+	NMSettingUser *self = setting;
+	NMSettingUserPrivate *priv;
+	guint len;
+
+	g_return_val_if_fail (NM_IS_SETTING_USER (self), NULL);
+
+	priv = NM_SETTING_USER_GET_PRIVATE (self);
+
+	if (priv->keys) {
+		NM_SET_OUT (out_len, g_hash_table_size (priv->data));
+		return priv->keys;
+	}
+
+	if (!priv->data || !g_hash_table_size (priv->data)) {
+		NM_SET_OUT (out_len, 0);
+		return (const char **) &priv->keys;
+	}
+
+	priv->keys = (const char **) g_hash_table_get_keys_as_array (priv->data, &len);
+	g_qsort_with_data (priv->keys,
+	                   len,
+	                   sizeof (const char *),
+	                   nm_strcmp_p_with_data,
+	                   NULL);
+	NM_SET_OUT (out_len, len);
+	return priv->keys;
+}
+
+/*****************************************************************************/
+
+/**
+ * nm_setting_user_get_data:
+ * @setting: the #NMSettingUser instance
+ * @key: the key to lookup
+ *
+ * Since: 1.8
+ *
+ * Returns: (transfer none): the value associated with @key or %NULL if no such
+ *   value exists.
+ */
+const char *
+nm_setting_user_get_data (NMSettingUser *setting, const char *key)
+{
+	NMSettingUser *self = setting;
+	NMSettingUserPrivate *priv;
+
+	g_return_val_if_fail (NM_IS_SETTING_USER (self), NULL);
+	g_return_val_if_fail (key, NULL);
+
+	priv = NM_SETTING_USER_GET_PRIVATE (self);
+
+	if (!priv->data)
+		return NULL;
+
+	return g_hash_table_lookup (priv->data, key);
+}
+
+/**
+ * nm_setting_user_set_data:
+ * @setting: the #NMSettingUser instance
+ * @key: the key to set
+ * @val: (allow-none): the value to set or %NULL to clear a key.
+ * @error: (allow-none): optional error argument
+ *
+ * Since: 1.8
+ *
+ * Returns: %TRUE if the operation was successful. The operation
+ *   can fail if @key or @val are not valid strings according
+ *   to nm_setting_user_check_key() and nm_setting_user_check_val().
+ */
+gboolean
+nm_setting_user_set_data (NMSettingUser *setting,
+                          const char *key,
+                          const char *val,
+                          GError **error)
+{
+	NMSettingUser *self = setting;
+	NMSettingUserPrivate *priv;
+	gboolean changed = FALSE;
+
+	g_return_val_if_fail (NM_IS_SETTING (self), FALSE);
+	g_return_val_if_fail (!error || !*error, FALSE);
+
+	if (!nm_setting_user_check_key (key, error))
+		return FALSE;
+
+	if (   val
+	    && !nm_setting_user_check_val (val, error))
+		return FALSE;
+
+	priv = NM_SETTING_USER_GET_PRIVATE (self);
+
+	if (!val) {
+		if (   priv->data
+		    && g_hash_table_remove (priv->data, key)) {
+			nm_clear_g_free (&priv->keys);
+			changed = TRUE;
+		}
+		goto out;
+	}
+
+	if (priv->data) {
+		const char *key2, *val2;
+
+		if (g_hash_table_lookup_extended (priv->data, key, (gpointer *) &key2, (gpointer *) &val2)) {
+			if (nm_streq (val, val2))
+				goto out;
+		} else {
+			if (g_hash_table_size (priv->data) >= MAX_NUM_KEYS) {
+				/* limit the number of valid keys */
+				g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				                     _("maximum number of user data entries reached"));
+				return FALSE;
+			}
+
+			nm_clear_g_free (&priv->keys);
+		}
+	} else
+		priv->data = _create_data_hash ();
+
+	g_hash_table_insert (priv->data, g_strdup (key), g_strdup (val));
+	changed = TRUE;
+
+out:
+	if (priv->data_invalid) {
+		/* setting a value purges all invalid values that were set
+		 * via GObject property. */
+		changed = TRUE;
+		g_clear_pointer (&priv->data_invalid, g_hash_table_unref);
+	}
+	if (changed)
+		_notify (self, PROP_DATA);
+	return TRUE;
+}
+
+/*****************************************************************************/
+
+static gboolean
+verify (NMSetting *setting, NMConnection *connection, GError **error)
+{
+	NMSettingUser *self = NM_SETTING_USER (setting);
+	NMSettingUserPrivate *priv = NM_SETTING_USER_GET_PRIVATE (self);
+
+	if (priv->data_invalid) {
+		const char *key, *val;
+		GHashTableIter iter;
+		gs_free_error GError *local = NULL;
+
+		g_hash_table_iter_init (&iter, priv->data_invalid);
+		while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val)) {
+			if (!nm_setting_user_check_key (key, &local)) {
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+				             _("invalid key \"%s\": %s"),
+				             key, local->message);
+			} else if (!nm_setting_user_check_val (val, &local)) {
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+				             _("invalid value for \"%s\": %s"),
+				             key, local->message);
+			} else {
+				nm_assert_not_reached ();
+				continue;
+			}
+			g_prefix_error (error, "%s.%s: ", NM_SETTING_USER_SETTING_NAME, NM_SETTING_USER_DATA);
+			return FALSE;
+		}
+		nm_assert_not_reached ();
+	}
+
+	if (   priv->data
+	    && g_hash_table_size (priv->data) > MAX_NUM_KEYS) {
+		g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		             _("maximum number of user data entries reached (%u instead of %u)"),
+		             g_hash_table_size (priv->data), (unsigned) MAX_NUM_KEYS);
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_USER_SETTING_NAME, NM_SETTING_USER_DATA);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static gboolean
+hash_table_equal (GHashTable *a, GHashTable *b)
+{
+	guint n;
+	GHashTableIter iter;
+	const char *key, *value, *valu2;
+
+	n = a ? g_hash_table_size (a) : 0;
+	if (n != (b ? g_hash_table_size (b) : 0))
+		return FALSE;
+	if (n > 0) {
+		g_hash_table_iter_init (&iter, a);
+		while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &value)) {
+			if (!g_hash_table_lookup_extended (b, key, NULL, (gpointer *) &valu2))
+				return FALSE;
+			if (!nm_streq (value, valu2))
+				return FALSE;
+		}
+	}
+	return TRUE;
+
+}
+
+static gboolean
+compare_property (NMSetting *setting,
+                  NMSetting *other,
+                  const GParamSpec *prop_spec,
+                  NMSettingCompareFlags flags)
+{
+	NMSettingUserPrivate *priv, *pri2;
+
+	g_return_val_if_fail (NM_IS_SETTING_USER (setting), FALSE);
+	g_return_val_if_fail (NM_IS_SETTING_USER (other), FALSE);
+
+	if (!nm_streq0 (prop_spec->name, NM_SETTING_USER_DATA))
+		goto call_parent;
+
+	priv = NM_SETTING_USER_GET_PRIVATE (NM_SETTING_USER (setting));
+	pri2 = NM_SETTING_USER_GET_PRIVATE (NM_SETTING_USER (other));
+
+	if (!hash_table_equal (priv->data, pri2->data))
+		return FALSE;
+
+	if (!hash_table_equal (priv->data_invalid, pri2->data_invalid))
+		return FALSE;
+
+	return TRUE;
+
+call_parent:
+	return NM_SETTING_CLASS (nm_setting_user_parent_class)->compare_property (setting, other, prop_spec, flags);
+}
+
+/*****************************************************************************/
+
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
+{
+	NMSettingUser *self = NM_SETTING_USER (object);
+	NMSettingUserPrivate *priv = NM_SETTING_USER_GET_PRIVATE (self);
+	GHashTableIter iter;
+	GHashTable *data;
+	const char *key, *val;
+
+	switch (prop_id) {
+	case PROP_DATA:
+		data = _create_data_hash ();
+		if (priv->data) {
+			g_hash_table_iter_init (&iter, priv->data);
+			while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val))
+				g_hash_table_insert (data, g_strdup (key), g_strdup (val));
+		}
+		if (priv->data_invalid) {
+			g_hash_table_iter_init (&iter, priv->data_invalid);
+			while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val))
+				g_hash_table_insert (data, g_strdup (key), g_strdup (val));
+		}
+		g_value_take_boxed (value, data);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
+{
+	NMSettingUser *self = NM_SETTING_USER (object);
+	NMSettingUserPrivate *priv = NM_SETTING_USER_GET_PRIVATE (self);
+	GHashTableIter iter;
+	GHashTable *data;
+	const char *key, *val;
+
+	switch (prop_id) {
+	case PROP_DATA:
+		nm_clear_g_free (&priv->keys);
+
+		data = g_value_get_boxed (value);
+		if (!data || !g_hash_table_size (data)) {
+			g_clear_pointer (&priv->data, g_hash_table_unref);
+			g_clear_pointer (&priv->data_invalid, g_hash_table_unref);
+			return;
+		}
+
+		if (priv->data)
+			g_hash_table_remove_all (priv->data);
+		else
+			priv->data = _create_data_hash ();
+
+		if (priv->data_invalid)
+			g_hash_table_remove_all (priv->data_invalid);
+
+		g_hash_table_iter_init (&iter, data);
+		while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val)) {
+			if (   nm_setting_user_check_key (key, NULL)
+			    && nm_setting_user_check_val (val, NULL))
+				g_hash_table_insert (priv->data, g_strdup (key), g_strdup (val));
+			else {
+				if (!priv->data_invalid)
+					priv->data_invalid = _create_data_hash ();
+				g_hash_table_insert (priv->data_invalid, g_strdup (key), g_strdup (val));
+			}
+		}
+		if (   priv->data_invalid
+		    && !g_hash_table_size (priv->data_invalid))
+			g_clear_pointer (&priv->data_invalid, g_hash_table_unref);
+
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+/*****************************************************************************/
+
+static void
+nm_setting_user_init (NMSettingUser *self)
+{
+}
+
+/**
+ * nm_setting_user_new:
+ *
+ * Creates a new #NMSettingUser object with default values.
+ *
+ * Returns: the new empty #NMSettingUser object
+ **/
+NMSetting *nm_setting_user_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_USER, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingUser *self = NM_SETTING_USER (object);
+	NMSettingUserPrivate *priv = NM_SETTING_USER_GET_PRIVATE (self);
+
+	g_free (priv->keys);
+	if (priv->data)
+		g_hash_table_unref (priv->data);
+	if (priv->data_invalid)
+		g_hash_table_unref (priv->data_invalid);
+
+	G_OBJECT_CLASS (nm_setting_user_parent_class)->finalize (object);
+}
+
+static void
+nm_setting_user_class_init (NMSettingUserClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
+
+	object_class->set_property = set_property;
+	object_class->get_property = get_property;
+	object_class->finalize     = finalize;
+	setting_class->compare_property = compare_property;
+	setting_class->verify = verify;
+
+	/**
+	 * NMSettingUser:data:
+	 *
+	 * A dictionary of key/value pairs with user data. This data is ignored by NetworkManager
+	 * and can be used at the users discretion. The keys only support a strict ascii format,
+	 * but the values can be arbitrary UTF8 strings up to a certain length.
+	 *
+	 * Type: GHashTable(utf8,utf8)
+	 *
+	 * Since: 1.8
+	 **/
+	obj_properties[PROP_DATA] =
+	    g_param_spec_boxed (NM_SETTING_USER_DATA, "", "",
+	                        G_TYPE_HASH_TABLE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
+	_nm_setting_class_transform_property (setting_class, NM_SETTING_USER_DATA,
+	                                      G_VARIANT_TYPE ("a{ss}"),
+	                                      _nm_utils_strdict_to_dbus,
+	                                      _nm_utils_strdict_from_dbus);
+}
diff --git a/libnm-core/nm-setting-user.h b/libnm-core/nm-setting-user.h
new file mode 100644
index 00000000..38e97a93
--- /dev/null
+++ b/libnm-core/nm-setting-user.h
@@ -0,0 +1,68 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2017 Red Hat, Inc.
+ */
+
+#ifndef __NM_SETTING_USER_H__
+#define __NM_SETTING_USER_H__
+
+#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
+#error "Only  can be included directly."
+#endif
+
+#include "nm-setting.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_SETTING_USER            (nm_setting_user_get_type ())
+#define NM_SETTING_USER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_USER, NMSettingUser))
+#define NM_SETTING_USER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_USER, NMSettingUserClass))
+#define NM_IS_SETTING_USER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_USER))
+#define NM_IS_SETTING_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_USER))
+#define NM_SETTING_USER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_USER, NMSettingUserClass))
+
+#define NM_SETTING_USER_SETTING_NAME    "user"
+
+#define NM_SETTING_USER_DATA            "data"
+
+typedef struct _NMSettingUserClass NMSettingUserClass;
+
+NM_AVAILABLE_IN_1_8
+GType nm_setting_user_get_type (void);
+
+NM_AVAILABLE_IN_1_8
+NMSetting * nm_setting_user_new                  (void);
+
+NM_AVAILABLE_IN_1_8
+const char *const*nm_setting_user_get_keys       (NMSettingUser *setting, guint *out_len);
+
+NM_AVAILABLE_IN_1_8
+const char *nm_setting_user_get_data             (NMSettingUser *setting, const char *key);
+NM_AVAILABLE_IN_1_8
+gboolean    nm_setting_user_set_data             (NMSettingUser *setting, const char *key, const char *val, GError **error);
+
+
+NM_AVAILABLE_IN_1_8
+gboolean    nm_setting_user_check_key (const char *key, GError **error);
+NM_AVAILABLE_IN_1_8
+gboolean    nm_setting_user_check_val (const char *val, GError **error);
+
+G_END_DECLS
+
+#endif /* __NM_SETTING_USER_H__ */
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c
index 61264784..de9c5c48 100644
--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@@ -290,7 +290,7 @@ nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
  * @setting: the #NMSettingVlan
  * @map: the type of priority map
  *
- * Returns the number of entires in the
+ * Returns the number of entries in the
  * #NMSettingVlan:ingress_priority_map or #NMSettingVlan:egress_priority_map
  * properties of this setting.
  *
@@ -577,7 +577,7 @@ nm_setting_vlan_remove_priority_str_by_value (NMSettingVlan *setting,
  * @setting: the #NMSettingVlan
  * @map: the type of priority map
  *
- * Clear all the entires from #NMSettingVlan:ingress_priority_map or
+ * Clear all the entries from #NMSettingVlan:ingress_priority_map or
  * #NMSettingVlan:egress_priority_map properties.
  */
 void
@@ -600,7 +600,7 @@ nm_setting_vlan_init (NMSettingVlan *setting)
 {
 }
 
-static gboolean
+static int
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
 	NMSettingVlanPrivate *priv = NM_SETTING_VLAN_GET_PRIVATE (setting);
@@ -681,6 +681,18 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		return FALSE;
 	}
 
+	if (connection && !s_wired) {
+		/* technically, a VLAN setting does not require an ethernet setting. However,
+		 * the ifcfg-rh reader always adds a ethernet setting when reading a vlan setting.
+		 * Thus, in order to be consistent, always add one via normalization. */
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_SETTING_NOT_FOUND,
+		                     _("vlan setting should have a ethernet setting as well"));
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_FLAGS);
+		return NM_SETTING_VERIFY_NORMALIZABLE;
+	}
+
 	return TRUE;
 }
 
diff --git a/libnm-core/nm-setting-vlan.h b/libnm-core/nm-setting-vlan.h
index b147a185..ec41b595 100644
--- a/libnm-core/nm-setting-vlan.h
+++ b/libnm-core/nm-setting-vlan.h
@@ -48,6 +48,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingVlan:
+ *
+ * VLAN Settings
  */
 struct _NMSettingVlan {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-vpn.h b/libnm-core/nm-setting-vpn.h
index 539656f8..115aa867 100644
--- a/libnm-core/nm-setting-vpn.h
+++ b/libnm-core/nm-setting-vpn.h
@@ -27,7 +27,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -49,6 +49,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingVpn:
+ *
+ * VPN Settings
  */
 struct _NMSettingVpn {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-vxlan.h b/libnm-core/nm-setting-vxlan.h
index fab2d820..ce266941 100644
--- a/libnm-core/nm-setting-vxlan.h
+++ b/libnm-core/nm-setting-vxlan.h
@@ -58,6 +58,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingVxlan:
+ *
+ * VXLAN Settings
  */
 struct _NMSettingVxlan {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-wimax.h b/libnm-core/nm-setting-wimax.h
index 3f0767e9..fb0abbac 100644
--- a/libnm-core/nm-setting-wimax.h
+++ b/libnm-core/nm-setting-wimax.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -44,6 +44,8 @@ G_BEGIN_DECLS
 
 /**
  * NMSettingWimax:
+ *
+ * WiMax Settings
  */
 struct _NMSettingWimax {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c
index fcd8e837..5569f558 100644
--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@@ -565,10 +565,12 @@ nm_setting_wired_remove_s390_option (NMSettingWired *setting,
 
 /**
  * nm_setting_wired_get_valid_s390_options:
- * @setting: the #NMSettingWired
+ * @setting: (allow-none): the #NMSettingWired
  *
  * Returns a list of valid s390 options.
  *
+ * The @setting argument is unused and %NULL may be passed instead.
+ *
  * Returns: (transfer none): a %NULL-terminated array of strings of valid s390 options.
  **/
 const char **
diff --git a/libnm-core/nm-setting-wired.h b/libnm-core/nm-setting-wired.h
index 30b0b6c2..015f09da 100644
--- a/libnm-core/nm-setting-wired.h
+++ b/libnm-core/nm-setting-wired.h
@@ -27,7 +27,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -96,6 +96,8 @@ typedef enum { /*< flags >*/
 
 /**
  * NMSettingWired:
+ *
+ * Wired Ethernet Settings
  */
 struct _NMSettingWired {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c
index f98e9e57..70bdf754 100644
--- a/libnm-core/nm-setting-wireless-security.c
+++ b/libnm-core/nm-setting-wireless-security.c
@@ -182,7 +182,7 @@ nm_setting_wireless_security_get_proto (NMSettingWirelessSecurity *setting, guin
  * by this connection only supports WPA2/RSN, the connection cannot be used
  * with the access point.
  *
- * Returns: %TRUE if the protocol was new and and was added to the allowed
+ * Returns: %TRUE if the protocol was new and was added to the allowed
  * protocol list, or %FALSE if it was already in the list
  **/
 gboolean
@@ -236,7 +236,7 @@ nm_setting_wireless_security_remove_proto (NMSettingWirelessSecurity *setting, g
  *
  * Removes a protocol from the allowed protocol list.
  *
- * Returns: %TRUE if the protocol was found and removed; %FALSE it it was not.
+ * Returns: %TRUE if the protocol was found and removed; %FALSE if it was not.
  **/
 gboolean
 nm_setting_wireless_security_remove_proto_by_value (NMSettingWirelessSecurity *setting,
@@ -382,7 +382,7 @@ nm_setting_wireless_security_remove_pairwise (NMSettingWirelessSecurity *setting
  * Removes an encryption algorithm from the allowed pairwise encryption
  * algorithm list.
  *
- * Returns: %TRUE if the encryption algorith was found and removed; %FALSE it it was not.
+ * Returns: %TRUE if the encryption algorith was found and removed; %FALSE if it was not.
  **/
 gboolean
 nm_setting_wireless_security_remove_pairwise_by_value (NMSettingWirelessSecurity *setting,
@@ -530,7 +530,7 @@ nm_setting_wireless_security_remove_group (NMSettingWirelessSecurity *setting, g
  * Removes an encryption algorithm from the allowed groupwise encryption
  * algorithm list.
  *
- * Returns: %TRUE if the algorithm was found and removed; %FALSE it it was not.
+ * Returns: %TRUE if the algorithm was found and removed; %FALSE if it was not.
  **/
 gboolean
 nm_setting_wireless_security_remove_group_by_value (NMSettingWirelessSecurity *setting,
diff --git a/libnm-core/nm-setting-wireless-security.h b/libnm-core/nm-setting-wireless-security.h
index 093cb386..ae252f11 100644
--- a/libnm-core/nm-setting-wireless-security.h
+++ b/libnm-core/nm-setting-wireless-security.h
@@ -27,7 +27,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
@@ -91,6 +91,8 @@ typedef enum {
 
 /**
  * NMSettingWirelessSecurity:
+ *
+ * Wi-Fi Security Settings
  */
 struct _NMSettingWirelessSecurity {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-wireless.h b/libnm-core/nm-setting-wireless.h
index 35fa79c1..b0ef4756 100644
--- a/libnm-core/nm-setting-wireless.h
+++ b/libnm-core/nm-setting-wireless.h
@@ -27,8 +27,8 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
-#include 
+#include "nm-setting.h"
+#include "nm-setting-wireless-security.h"
 
 G_BEGIN_DECLS
 
@@ -101,6 +101,8 @@ typedef enum {
 
 /**
  * NMSettingWireless:
+ *
+ * Wi-Fi Settings
  */
 struct _NMSettingWireless {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index 82467c9c..e4be8706 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -147,6 +147,8 @@ _ensure_registered_constructor (void)
  * can be established, like PPP, PPPoE, etc.
  *
  * 4: IP-level stuff
+ *
+ * 10: NMSettingUser
  */
 void
 (_nm_register_setting) (const char *name,
@@ -158,7 +160,6 @@ void
 	g_return_if_fail (name != NULL && *name);
 	g_return_if_fail (type != G_TYPE_INVALID);
 	g_return_if_fail (type != G_TYPE_NONE);
-	g_return_if_fail (priority <= 4);
 
 	_ensure_registered ();
 
@@ -304,8 +305,8 @@ typedef struct {
 	NMSettingPropertyTransformFromFunc from_dbus;
 } NMSettingProperty;
 
-static GQuark setting_property_overrides_quark;
-static GQuark setting_properties_quark;
+static NM_CACHED_QUARK_FCN ("nm-setting-property-overrides", setting_property_overrides_quark)
+static NM_CACHED_QUARK_FCN ("nm-setting-properties", setting_properties_quark)
 
 static NMSettingProperty *
 find_property (GArray *properties, const char *name)
@@ -341,7 +342,7 @@ add_property_override (NMSettingClass *setting_class,
 	GArray *overrides;
 	NMSettingProperty override;
 
-	g_return_if_fail (g_type_get_qdata (setting_type, setting_properties_quark) == NULL);
+	g_return_if_fail (g_type_get_qdata (setting_type, setting_properties_quark ()) == NULL);
 
 	memset (&override, 0, sizeof (override));
 	override.name = property_name;
@@ -354,10 +355,10 @@ add_property_override (NMSettingClass *setting_class,
 	override.to_dbus = to_dbus;
 	override.from_dbus = from_dbus;
 
-	overrides = g_type_get_qdata (setting_type, setting_property_overrides_quark);
+	overrides = g_type_get_qdata (setting_type, setting_property_overrides_quark ());
 	if (!overrides) {
 		overrides = g_array_new (FALSE, FALSE, sizeof (NMSettingProperty));
-		g_type_set_qdata (setting_type, setting_property_overrides_quark, overrides);
+		g_type_set_qdata (setting_type, setting_property_overrides_quark (), overrides);
 	}
 	g_return_if_fail (find_property (overrides, property_name) == NULL);
 
@@ -530,14 +531,14 @@ nm_setting_class_ensure_properties (NMSettingClass *setting_class)
 	GParamSpec **property_specs;
 	guint n_property_specs, i;
 
-	properties = g_type_get_qdata (type, setting_properties_quark);
+	properties = g_type_get_qdata (type, setting_properties_quark ());
 	if (properties)
 		return properties;
 
 	/* Build overrides array from @setting_class and its superclasses */
 	overrides = g_array_new (FALSE, FALSE, sizeof (NMSettingProperty));
 	for (otype = type; otype != G_TYPE_OBJECT; otype = g_type_parent (otype)) {
-		type_overrides = g_type_get_qdata (otype, setting_property_overrides_quark);
+		type_overrides = g_type_get_qdata (otype, setting_property_overrides_quark ());
 		if (type_overrides)
 			g_array_append_vals (overrides, (NMSettingProperty *)type_overrides->data, type_overrides->len);
 	}
@@ -568,7 +569,7 @@ nm_setting_class_ensure_properties (NMSettingClass *setting_class)
 	}
 	g_array_unref (overrides);
 
-	g_type_set_qdata (type, setting_properties_quark, properties);
+	g_type_set_qdata (type, setting_properties_quark (), properties);
 	return properties;
 }
 
@@ -1995,11 +1996,6 @@ nm_setting_class_init (NMSettingClass *setting_class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (setting_class);
 
-	if (!setting_property_overrides_quark)
-		setting_property_overrides_quark = g_quark_from_static_string ("nm-setting-property-overrides");
-	if (!setting_properties_quark)
-		setting_properties_quark = g_quark_from_static_string ("nm-setting-properties");
-
 	g_type_class_add_private (setting_class, sizeof (NMSettingPrivate));
 
 	/* virtual methods */
diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h
index 3083ef60..bf3f8e56 100644
--- a/libnm-core/nm-setting.h
+++ b/libnm-core/nm-setting.h
@@ -27,7 +27,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-core-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-core/nm-simple-connection.h b/libnm-core/nm-simple-connection.h
index d6a60447..4166d4ca 100644
--- a/libnm-core/nm-simple-connection.h
+++ b/libnm-core/nm-simple-connection.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-core/nm-utils-private.h b/libnm-core/nm-utils-private.h
index fab38038..03c87907 100644
--- a/libnm-core/nm-utils-private.h
+++ b/libnm-core/nm-utils-private.h
@@ -28,6 +28,14 @@
 #include "nm-setting-private.h"
 #include "nm-setting-ip-config.h"
 
+struct _NMVariantAttributeSpec {
+	char *name;
+	const GVariantType *type;
+	bool v4:1;
+	bool v6:1;
+	char str_type;
+};
+
 gboolean    _nm_utils_string_slist_validate (GSList *list,
                                              const char **valid_values);
 
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 478a548d..1feee7ac 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -443,52 +443,6 @@ nm_utils_same_ssid (const guint8 *ssid1, gsize len1,
 	return memcmp (ssid1, ssid2, len1) == 0 ? TRUE : FALSE;
 }
 
-/**
- * _nm_utils_strv_find_first:
- * @list: the strv list to search
- * @len: the length of the list, or a negative value if @list is %NULL terminated.
- * @needle: the value to search for. The search is done using strcmp().
- *
- * Searches @list for @needle and returns the index of the first match (based
- * on strcmp()).
- *
- * For convenience, @list has type 'char**' instead of 'const char **'.
- *
- * Returns: index of first occurrence or -1 if @needle is not found in @list.
- */
-gssize
-_nm_utils_strv_find_first (char **list, gssize len, const char *needle)
-{
-	gssize i;
-
-	if (len > 0) {
-		g_return_val_if_fail (list, -1);
-
-		if (!needle) {
-			/* if we search a list with known length, %NULL is a valid @needle. */
-			for (i = 0; i < len; i++) {
-				if (!list[i])
-					return i;
-			}
-		} else {
-			for (i = 0; i < len; i++) {
-				if (list[i] && !strcmp (needle, list[i]))
-					return i;
-			}
-		}
-	} else if (len < 0) {
-		g_return_val_if_fail (needle, -1);
-
-		if (list) {
-			for (i = 0; list[i]; i++) {
-				if (strcmp (needle, list[i]) == 0)
-					return i;
-			}
-		}
-	}
-	return -1;
-}
-
 char **
 _nm_utils_strv_cleanup (char **strv,
                         gboolean strip_whitespace,
@@ -509,7 +463,7 @@ _nm_utils_strv_cleanup (char **strv,
 	j = 0;
 	for (i = 0; strv[i]; i++) {
 		if (   (skip_empty && !*strv[i])
-		    || (skip_repeated && _nm_utils_strv_find_first (strv, j, strv[i]) >= 0))
+		    || (skip_repeated && nm_utils_strv_find_first (strv, j, strv[i]) >= 0))
 			g_free (strv[i]);
 		else
 			strv[j++] = strv[i];
@@ -3791,7 +3745,7 @@ nm_utils_is_valid_iface_name (const char *name, GError **error)
  *
  * Validate the network interface name.
  *
- * Deprecated: 1.6: use nm_utils_is_valid_iface_name() insteead, with better error reporting.
+ * Deprecated: 1.6: use nm_utils_is_valid_iface_name() instead, with better error reporting.
  *
  * Returns: %TRUE if interface name is valid, otherwise %FALSE is returned.
  */
@@ -4295,48 +4249,74 @@ int _nm_utils_dns_option_find_idx (GPtrArray *array, const char *option)
 	return -1;
 }
 
-/**
- * nm_utils_enum_to_str:
- * @type: the %GType of the enum
- * @value: the value to be translated
- *
- * Converts an enum value to its string representation. If the enum is a
- * %G_TYPE_FLAGS the function returns a comma-separated list of matching values.
- * If the enum is a %G_TYPE_ENUM and the given value is not valid the
- * function returns %NULL.
- *
- * Returns: a newly allocated string or %NULL
- *
- * Since: 1.2
- */
-char *nm_utils_enum_to_str (GType type, int value)
+#define IS_FLAGS_SEPARATOR(ch)  (NM_IN_SET ((ch), ' ', '\t', ',', '\n', '\r'))
+
+static gboolean
+_is_hex_string (const char *str)
+{
+	return    str[0] == '0'
+	       && str[1] == 'x'
+	       && str[2]
+	       && NM_STRCHAR_ALL (&str[2], ch, g_ascii_isxdigit (ch));
+}
+
+static gboolean
+_enum_is_valid_enum_nick (const char *str)
+{
+	return    str[0]
+	       && !NM_STRCHAR_ANY (str, ch, g_ascii_isspace (ch))
+	       && !NM_STRCHAR_ALL (str, ch, g_ascii_isdigit (ch));
+}
+
+static gboolean
+_enum_is_valid_flags_nick (const char *str)
+{
+	return    str[0]
+	       && !NM_STRCHAR_ANY (str, ch, IS_FLAGS_SEPARATOR (ch))
+	       && !_is_hex_string (str);
+}
+
+char *
+_nm_utils_enum_to_str_full (GType type,
+                            int value,
+                            const char *flags_separator)
 {
 	GTypeClass *class;
 	char *ret;
 
+	if (   flags_separator
+	    && (   !flags_separator[0]
+	        || NM_STRCHAR_ANY (flags_separator, ch, !IS_FLAGS_SEPARATOR (ch))))
+		g_return_val_if_reached (NULL);
+
 	class = g_type_class_ref (type);
 
 	if (G_IS_ENUM_CLASS (class)) {
 		GEnumValue *enum_value;
 
 		enum_value = g_enum_get_value (G_ENUM_CLASS (class), value);
-		ret = enum_value ? strdup (enum_value->value_nick) : NULL;
+		if (   !enum_value
+		    || !_enum_is_valid_enum_nick (enum_value->value_nick))
+			ret = g_strdup_printf ("%d", value);
+		else
+			ret = strdup (enum_value->value_nick);
 	} else if (G_IS_FLAGS_CLASS (class)) {
 		GFlagsValue *flags_value;
 		GString *str = g_string_new ("");
-		gboolean first = TRUE;
+
+		flags_separator = flags_separator ?: " ";
 
 		while (value) {
 			flags_value = g_flags_get_first_value (G_FLAGS_CLASS (class), value);
-			if (!flags_value)
+			if (str->len)
+				g_string_append (str, flags_separator);
+			if (   !flags_value
+			    || !_enum_is_valid_flags_nick (flags_value->value_nick)) {
+				g_string_append_printf (str, "0x%x", (unsigned) value);
 				break;
-
-			if (!first)
-				g_string_append (str, ", ");
+			}
 			g_string_append (str, flags_value->value_nick);
-
 			value &= ~flags_value->value;
-			first = FALSE;
 		}
 		ret = g_string_free (str, FALSE);
 	} else
@@ -4346,12 +4326,32 @@ char *nm_utils_enum_to_str (GType type, int value)
 	return ret;
 }
 
+/**
+ * nm_utils_enum_to_str:
+ * @type: the %GType of the enum
+ * @value: the value to be translated
+ *
+ * Converts an enum value to its string representation. If the enum is a
+ * %G_TYPE_FLAGS the function returns a comma-separated list of matching values.
+ * If the enum is a %G_TYPE_ENUM and the given value is not valid the
+ * function returns %NULL.
+ *
+ * Returns: a newly allocated string or %NULL
+ *
+ * Since: 1.2
+ */
+char *
+nm_utils_enum_to_str (GType type, int value)
+{
+	return _nm_utils_enum_to_str_full (type, value, ", ");
+}
+
 /**
  * nm_utils_enum_from_str:
  * @type: the %GType of the enum
  * @str: the input string
  * @out_value: (out) (allow-none): the output value
- * @err_token: (out) (allow-none): location to store the first unrecognized token
+ * @err_token: (out) (allow-none) (transfer full): location to store the first unrecognized token
  *
  * Converts a string to the matching enum value.
  *
@@ -4364,55 +4364,83 @@ char *nm_utils_enum_to_str (GType type, int value)
  *
  * Since: 1.2
  */
-gboolean nm_utils_enum_from_str (GType type, const char *str,
-                                 int *out_value, char **err_token)
+gboolean
+nm_utils_enum_from_str (GType type, const char *str,
+                        int *out_value, char **err_token)
 {
 	GTypeClass *class;
 	gboolean ret = FALSE;
 	int value = 0;
-	gs_free char *stripped = NULL;
+	gs_free char *str_clone = NULL;
+	char *s;
+	gint64 v64;
 
 	g_return_val_if_fail (str, FALSE);
-	stripped = g_strstrip (strdup (str));
+
+	str_clone = strdup (str);
+	s = nm_str_skip_leading_spaces (str_clone);
+	g_strchomp (s);
+
 	class = g_type_class_ref (type);
 
 	if (G_IS_ENUM_CLASS (class)) {
 		GEnumValue *enum_value;
 
-		enum_value = g_enum_get_value_by_nick (G_ENUM_CLASS (class), stripped);
-		if (enum_value) {
-			value = enum_value->value;
-			ret = TRUE;
+		if (s[0]) {
+			if (NM_STRCHAR_ALL (s, ch, g_ascii_isdigit (ch))) {
+				v64 = _nm_utils_ascii_str_to_int64 (s, 10, 0, G_MAXINT, -1);
+				if (v64 != -1) {
+					value = (int) v64;
+					ret = TRUE;
+				}
+			} else {
+				enum_value = g_enum_get_value_by_nick (G_ENUM_CLASS (class), s);
+				if (enum_value) {
+					value = enum_value->value;
+					ret = TRUE;
+				}
+			}
 		}
 	} else if (G_IS_FLAGS_CLASS (class)) {
 		GFlagsValue *flags_value;
-		gs_strfreev char **strv = NULL;
-		int i;
 
-		strv = g_strsplit_set (stripped, " \t,", 0);
-		for (i = 0; strv[i]; i++) {
-			if (!strv[i][0])
-				continue;
+		ret = TRUE;
+		while (s[0]) {
+			char *s_end;
 
-			flags_value = g_flags_get_value_by_nick (G_FLAGS_CLASS (class), strv[i]);
-			if (!flags_value)
-				break;
+			for (s_end = s; s_end[0]; s_end++) {
+				if (IS_FLAGS_SEPARATOR (s_end[0])) {
+					s_end[0] = '\0';
+					s_end++;
+					break;
+				}
+			}
 
-			value |= flags_value->value;
-		}
+			if (s[0]) {
+				if (_is_hex_string (s)) {
+					v64 = _nm_utils_ascii_str_to_int64 (&s[2], 16, 0, G_MAXUINT, -1);
+					if (v64 == -1) {
+						ret = FALSE;
+						break;
+					}
+					value |= (int) v64;
+				} else {
+					flags_value = g_flags_get_value_by_nick (G_FLAGS_CLASS (class), s);
+					if (!flags_value) {
+						ret = FALSE;
+						break;
+					}
+					value |= flags_value->value;
+				}
+			}
 
-		if (strv[i]) {
-			if (err_token)
-				*err_token = strdup (strv[i]);
-			value = 0;
-		} else
-			ret = TRUE;
+			s = s_end;
+		}
 	} else
 		g_return_val_if_reached (FALSE);
 
-	if (out_value)
-		*out_value = value;
-
+	NM_SET_OUT (err_token, !ret && s[0] ? g_strdup (s) : NULL);
+	NM_SET_OUT (out_value, ret ? value : 0);
 	g_type_class_unref (class);
 	return ret;
 }
@@ -4425,7 +4453,7 @@ gboolean nm_utils_enum_from_str (GType type, const char *str,
  *
  * Returns the list of possible values for a given enum.
  *
- * Returns: (transfer full): a NULL-terminated dynamically-allocated array of static strings
+ * Returns: (transfer container): a NULL-terminated dynamically-allocated array of static strings
  * or %NULL on error
  *
  * Since: 1.2
@@ -4435,6 +4463,7 @@ const char **nm_utils_enum_get_values (GType type, gint from, gint to)
 	GTypeClass *class;
 	GPtrArray *array;
 	gint i;
+	char sbuf[64];
 
 	class = g_type_class_ref (type);
 	array = g_ptr_array_new ();
@@ -4445,8 +4474,12 @@ const char **nm_utils_enum_get_values (GType type, gint from, gint to)
 
 		for (i = 0; i < enum_class->n_values; i++) {
 			enum_value = &enum_class->values[i];
-			if (enum_value->value >= from && enum_value->value <= to)
-				g_ptr_array_add (array, (gpointer) enum_value->value_nick);
+			if (enum_value->value >= from && enum_value->value <= to) {
+				if (_enum_is_valid_enum_nick (enum_value->value_nick))
+					g_ptr_array_add (array, (gpointer) enum_value->value_nick);
+				else
+					g_ptr_array_add (array, (gpointer) g_intern_string (nm_sprintf_buf (sbuf, "%d", enum_value->value)));
+			}
 		}
 	} else if (G_IS_FLAGS_CLASS (class)) {
 		GFlagsClass *flags_class = G_FLAGS_CLASS (class);
@@ -4454,8 +4487,12 @@ const char **nm_utils_enum_get_values (GType type, gint from, gint to)
 
 		for (i = 0; i < flags_class->n_values; i++) {
 			flags_value = &flags_class->values[i];
-			if (flags_value->value >= from && flags_value->value <= to)
-				g_ptr_array_add (array, (gpointer) flags_value->value_nick);
+			if (flags_value->value >= from && flags_value->value <= to) {
+				if (_enum_is_valid_flags_nick (flags_value->value_nick))
+					g_ptr_array_add (array, (gpointer) flags_value->value_nick);
+				else
+					g_ptr_array_add (array, (gpointer) g_intern_string (nm_sprintf_buf (sbuf, "0x%x", (unsigned) flags_value->value)));
+			}
 		}
 	} else {
 		g_type_class_unref (class);
@@ -4660,6 +4697,261 @@ _nm_utils_team_config_equal (const char *conf1,
 }
 #endif
 
+static char *
+attribute_escape (const char *src, char c1, char c2)
+{
+	char *ret, *dest;
+
+	dest = ret = malloc (strlen (src) * 2 + 1);
+
+	while (*src) {
+		if (*src == c1 || *src == c2 || *src == '\\')
+			*dest++ = '\\';
+		*dest++ = *src++;
+	}
+	*dest++ = '\0';
+
+	return ret;
+}
+
+static char *
+attribute_unescape (const char *start, const char *end)
+{
+	char *ret, *dest;
+
+	nm_assert (start <= end);
+	dest = ret = g_malloc (end - start + 1);
+
+	for (; start < end && *start; start++) {
+		if (*start == '\\') {
+			start++;
+			if (!*start)
+				break;
+		}
+		*dest++ = *start;
+	}
+	*dest = '\0';
+
+	return ret;
+}
+
+/**
+ * nm_utils_parse_variant_attributes:
+ * @string: the input string
+ * @attr_separator: the attribute separator character
+ * @key_value_separator: character separating key and values
+ * @ignore_unknown: whether unknown attributes should be ignored
+ * @spec: the attribute format specifiers
+ * @error: (out) (allow-none): location to store the error on failure
+ *
+ * Parse attributes from a string.
+ *
+ * Returns: (transfer full): a #GHashTable mapping attribute names to #GVariant values.
+ *
+ * Since: 1.8
+ */
+GHashTable *
+nm_utils_parse_variant_attributes (const char *string,
+                                   char attr_separator,
+                                   char key_value_separator,
+                                   gboolean ignore_unknown,
+                                   const NMVariantAttributeSpec *const *spec,
+                                   GError **error)
+{
+	gs_unref_hashtable GHashTable *ht = NULL;
+	const char *ptr = string, *start = NULL, *sep;
+	GVariant *variant;
+	const NMVariantAttributeSpec * const *s;
+
+	g_return_val_if_fail (string, NULL);
+	g_return_val_if_fail (attr_separator, NULL);
+	g_return_val_if_fail (key_value_separator, NULL);
+	g_return_val_if_fail (!error || !*error, NULL);
+
+	ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref);
+
+	while (TRUE) {
+		gs_free char *name = NULL, *value = NULL;
+
+		if (!start)
+			start = ptr;
+		if (*ptr == '\\') {
+			ptr++;
+			if (!*ptr) {
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+				             _("unterminated escape sequence"));
+				return NULL;
+			}
+			goto next;
+		}
+		if (*ptr == attr_separator || *ptr == '\0') {
+			if (ptr == start) {
+				/* multiple separators */
+				start = NULL;
+				goto next;
+			}
+
+			/* Find the key-value separator */
+			for (sep = start; sep != ptr; sep++) {
+				if (*sep == '\\') {
+					sep++;
+					if (!*sep) {
+						g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+						             _("unterminated escape sequence"));
+						return NULL;
+					}
+				}
+				if (*sep == key_value_separator)
+					break;
+			}
+
+			if (*sep != key_value_separator) {
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+				             _("missing key-value separator '%c'"), key_value_separator);
+				return NULL;
+			}
+
+			name = attribute_unescape (start, sep);
+			value = attribute_unescape (sep + 1, ptr);
+
+			for (s = spec; *s; s++) {
+				if (nm_streq (name, (*s)->name))
+					break;
+			}
+
+			if (!*s) {
+				if (ignore_unknown)
+					goto next;
+				else {
+					g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+					             _("unknown attribute '%s'"), name);
+					return NULL;
+				}
+			}
+
+			if (g_variant_type_equal ((*s)->type, G_VARIANT_TYPE_UINT32)) {
+				gint64 num = _nm_utils_ascii_str_to_int64 (value, 10, 0, G_MAXUINT32, -1);
+
+				if (num == -1) {
+					g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+					             _("invalid uint32 value '%s' for attribute '%s'"), value, name);
+					return NULL;
+				}
+				variant = g_variant_new_uint32 (num);
+			} else if (g_variant_type_equal ((*s)->type, G_VARIANT_TYPE_BYTE)) {
+				gint64 num = _nm_utils_ascii_str_to_int64 (value, 10, 0, G_MAXUINT8, -1);
+
+				if (num == -1) {
+					g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+					             _("invalid uint8 value '%s' for attribute '%s'"), value, name);
+					return NULL;
+				}
+				variant = g_variant_new_byte ((guchar) num);
+			} else if (g_variant_type_equal ((*s)->type, G_VARIANT_TYPE_BOOLEAN)) {
+				gboolean b;
+
+				if (nm_streq (value, "true"))
+					b = TRUE;
+				else if (nm_streq (value, "false"))
+					b = FALSE;
+				else {
+					g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+					             _("invalid boolean value '%s' for attribute '%s'"), value, name);
+					return NULL;
+				}
+				variant = g_variant_new_boolean (b);
+			} else if (g_variant_type_equal ((*s)->type, G_VARIANT_TYPE_STRING)) {
+				variant = g_variant_new_take_string (g_steal_pointer (&value));
+			} else {
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+				             _("unsupported attribute '%s' of type '%s'"), name,
+				             (char *) (*s)->type);
+				return NULL;
+			}
+
+			g_hash_table_insert (ht, g_steal_pointer (&name), variant);
+			start = NULL;
+		}
+next:
+		if (*ptr == '\0')
+			break;
+		ptr++;
+	}
+
+	return g_steal_pointer (&ht);
+}
+
+/*
+ * nm_utils_format_variant_attributes:
+ * @attributes:  a #GHashTable mapping attribute names to #GVariant values
+ * @attr_separator: the attribute separator character
+ * @key_value_separator: character separating key and values
+ *
+ * Format attributes to a string.
+ *
+ * Returns: (transfer full): the string representing attributes, or %NULL
+ *    in case there are no attributes
+ *
+ * Since: 1.8
+ */
+char *
+nm_utils_format_variant_attributes (GHashTable *attributes,
+                                    char attr_separator,
+                                    char key_value_separator)
+{
+	GString *str = NULL;
+	GVariant *variant;
+	char sep = 0;
+	const char *name, *value;
+	char *escaped;
+	char buf[64];
+	gs_free_list GList *keys = NULL;
+	GList *iter;
+
+	g_return_val_if_fail (attr_separator, NULL);
+	g_return_val_if_fail (key_value_separator, NULL);
+
+	if (!attributes || !g_hash_table_size (attributes))
+		return NULL;
+
+	keys = g_list_sort (g_hash_table_get_keys (attributes), (GCompareFunc) g_strcmp0);
+	str = g_string_new ("");
+
+	for (iter = keys; iter; iter = g_list_next (iter)) {
+		name = iter->data;
+		variant = g_hash_table_lookup (attributes, name);
+		value = NULL;
+
+		if (g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT32))
+			value = nm_sprintf_buf (buf, "%u", g_variant_get_uint32 (variant));
+		else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_BYTE))
+			value = nm_sprintf_buf (buf, "%hhu", g_variant_get_byte (variant));
+		else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_BOOLEAN))
+			value = g_variant_get_boolean (variant) ? "true" : "false";
+		else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING))
+			value = g_variant_get_string (variant, NULL);
+		else
+			continue;
+
+		if (sep)
+			g_string_append_c (str, sep);
+
+		escaped = attribute_escape (name, attr_separator, key_value_separator);
+		g_string_append (str, escaped);
+		g_free (escaped);
+
+		g_string_append_c (str, key_value_separator);
+
+		escaped = attribute_escape (value, attr_separator, key_value_separator);
+		g_string_append (str, escaped);
+		g_free (escaped);
+
+		sep = attr_separator;
+	}
+
+	return g_string_free (str, FALSE);
+}
+
 /*****************************************************************************/
 
 /**
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
index caf2e62e..77fe18a9 100644
--- a/libnm-core/nm-utils.h
+++ b/libnm-core/nm-utils.h
@@ -38,6 +38,8 @@
 
 G_BEGIN_DECLS
 
+typedef struct _NMVariantAttributeSpec NMVariantAttributeSpec;
+
 /* SSID helpers */
 gboolean    nm_utils_is_empty_ssid (const guint8 *ssid, gsize len);
 const char *nm_utils_escape_ssid   (const guint8 *ssid, gsize len);
@@ -215,6 +217,19 @@ const char **nm_utils_enum_get_values (GType type, gint from, gint to);
 NM_AVAILABLE_IN_1_6
 guint nm_utils_version (void);
 
+NM_AVAILABLE_IN_1_8
+GHashTable * nm_utils_parse_variant_attributes (const char *string,
+                                                char attr_separator,
+                                                char key_value_separator,
+                                                gboolean ignore_unknown,
+                                                const NMVariantAttributeSpec *const *spec,
+                                                GError **error);
+
+NM_AVAILABLE_IN_1_8
+char * nm_utils_format_variant_attributes (GHashTable *attributes,
+                                           char attr_separator,
+                                           char key_value_separator);
+
 G_END_DECLS
 
 #endif /* __NM_UTILS_H__ */
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
index aa92c3f8..c6cd2892 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -23,7 +23,7 @@
 
 #include 
 
-#include 
+#include "nm-version-macros.h"
 
 /* Deprecation / Availability macros */
 
@@ -118,4 +118,18 @@
 # define NM_AVAILABLE_IN_1_6
 #endif
 
+#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_8
+# define NM_DEPRECATED_IN_1_8           G_DEPRECATED
+# define NM_DEPRECATED_IN_1_8_FOR(f)    G_DEPRECATED_FOR(f)
+#else
+# define NM_DEPRECATED_IN_1_8
+# define NM_DEPRECATED_IN_1_8_FOR(f)
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_8
+# define NM_AVAILABLE_IN_1_8            G_UNAVAILABLE(1,8)
+#else
+# define NM_AVAILABLE_IN_1_8
+#endif
+
 #endif  /* NM_VERSION_H */
diff --git a/libnm-core/nm-vpn-dbus-interface.h b/libnm-core/nm-vpn-dbus-interface.h
index 1495c955..9c9bc297 100644
--- a/libnm-core/nm-vpn-dbus-interface.h
+++ b/libnm-core/nm-vpn-dbus-interface.h
@@ -26,6 +26,12 @@
 #ifndef __NM_VPN_DBUS_INTERFACE_H__
 #define __NM_VPN_DBUS_INTERFACE_H__
 
+#include "nm-dbus-interface.h"
+
+#ifndef NM_VERSION_H
+#define NM_DEPRECATED_IN_1_8_FOR(n)
+#endif
+
 /*
  * dbus services details
  */
@@ -147,19 +153,20 @@ typedef enum {
  *
  * VPN connection state reasons
  */
+NM_DEPRECATED_IN_1_8_FOR(NMActiveConnectionStateReason)
 typedef enum {
-	NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0,
-	NM_VPN_CONNECTION_STATE_REASON_NONE,
-	NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED,
-	NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED,
-	NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED,
-	NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID,
-	NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT,
-	NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT,
-	NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED,
-	NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS,
-	NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED,
-	NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED
+	NM_VPN_CONNECTION_STATE_REASON_UNKNOWN                  = NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN,
+	NM_VPN_CONNECTION_STATE_REASON_NONE                     = NM_ACTIVE_CONNECTION_STATE_REASON_NONE,
+	NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED        = NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED,
+	NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED      = NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED,
+	NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED          = NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED,
+	NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID        = NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID,
+	NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT          = NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT,
+	NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT    = NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT,
+	NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED     = NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED,
+	NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS               = NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS,
+	NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED             = NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED,
+	NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED       = NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED,
 } NMVpnConnectionStateReason;
 
 /**
@@ -177,6 +184,9 @@ typedef enum {
 	NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG
 } NMVpnPluginFailure;
 
+#ifndef NM_VERSION_H
+#undef NM_DEPRECATED_IN_1_8_FOR
+#endif
 
 /*** Generic config ***/
 
diff --git a/libnm-core/nm-vpn-dbus-types.xml b/libnm-core/nm-vpn-dbus-types.xml
index 5da02420..571b437e 100644
--- a/libnm-core/nm-vpn-dbus-types.xml
+++ b/libnm-core/nm-vpn-dbus-types.xml
@@ -144,62 +144,62 @@
           
             
               NM_VPN_CONNECTION_STATE_REASON_UNKNOWN
-              = 0
+              = NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN
               The reason for the VPN connection state change is unknown.
             
             
               NM_VPN_CONNECTION_STATE_REASON_NONE
-              = 1
+              = NM_ACTIVE_CONNECTION_STATE_REASON_NONE
               No reason was given for the VPN connection state change.
             
             
               NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED
-              = 2
+              = NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED
               The VPN connection changed state because the user disconnected it.
             
             
               NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED
-              = 3
+              = NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED
               The VPN connection changed state because the device it was using was disconnected.
             
             
               NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED
-              = 4
+              = NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED
               The service providing the VPN connection was stopped.
             
             
               NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID
-              = 5
+              = NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID
               The IP config of the VPN connection was invalid.
             
             
               NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT
-              = 6
+              = NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT
               The connection attempt to the VPN service timed out.
             
             
               NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT
-              = 7
+              = NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT
               A timeout occurred while starting the service providing the VPN connection.
             
             
               NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED
-              = 8
+              = NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED
               Starting the service starting the service providing the VPN connection failed.
             
             
               NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS
-              = 9
+              = NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS
               Necessary secrets for the VPN connection were not provided.
             
             
               NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED
-              = 10
+              = NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED
               Authentication to the VPN server failed.
             
             
               NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED
-              = 11
+              = NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED
               The connection was deleted from settings.
             
           
diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c
index 14c3588e..115c397f 100644
--- a/libnm-core/nm-vpn-plugin-info.c
+++ b/libnm-core/nm-vpn-plugin-info.c
@@ -339,7 +339,7 @@ nm_vpn_plugin_info_list_load ()
 
 	for (i = 0; i < G_N_ELEMENTS (dir); i++) {
 		if (   !dir[i]
-		    || _nm_utils_strv_find_first ((char **) dir, i, dir[i]) >= 0)
+		    || nm_utils_strv_find_first ((char **) dir, i, dir[i]) >= 0)
 			continue;
 
 		infos = _nm_vpn_plugin_info_list_load_dir (dir[i], TRUE, uid, NULL, NULL);
@@ -384,7 +384,7 @@ nm_vpn_plugin_info_new_search_file (const char *name, const char *service)
 
 	for (i = 0; !plugin_info && i < G_N_ELEMENTS (dir); i++) {
 		if (   !dir[i]
-		    || _nm_utils_strv_find_first ((char **) dir, i, dir[i]) >= 0)
+		    || nm_utils_strv_find_first ((char **) dir, i, dir[i]) >= 0)
 			continue;
 
 		/* We still must load the entire directory while searching for the matching
@@ -400,8 +400,8 @@ nm_vpn_plugin_info_new_search_file (const char *name, const char *service)
 				continue;
 			if (   service
 			    && !nm_streq (nm_vpn_plugin_info_get_service (p), service)
-			    && (_nm_utils_strv_find_first (NM_VPN_PLUGIN_INFO_GET_PRIVATE (p)->aliases,
-			                                   -1, service) < 0))
+			    && (nm_utils_strv_find_first (NM_VPN_PLUGIN_INFO_GET_PRIVATE (p)->aliases,
+			                                  -1, service) < 0))
 				continue;
 			plugin_info = g_object_ref (p);
 			break;
@@ -580,7 +580,7 @@ _list_find_by_service (GSList *list, const char *service)
 		NMVpnPluginInfoPrivate *priv = NM_VPN_PLUGIN_INFO_GET_PRIVATE (list->data);
 
 		if (   nm_streq (priv->service, service)
-		    || _nm_utils_strv_find_first (priv->aliases, -1, service) >= 0)
+		    || nm_utils_strv_find_first (priv->aliases, -1, service) >= 0)
 			return list->data;
 	}
 	return NULL;
@@ -667,7 +667,7 @@ nm_vpn_plugin_info_list_find_service_type (GSList *list, const char *name)
 
 	/* check the hard-coded list of short-names. They all have have the same
 	 * well-known prefix org.freedesktop.NetworkManager and the name. */
-	if (_nm_utils_strv_find_first ((char **) known_names, G_N_ELEMENTS (known_names), name) >= 0)
+	if (nm_utils_strv_find_first ((char **) known_names, G_N_ELEMENTS (known_names), name) >= 0)
 		return g_strdup_printf ("%s.%s", NM_DBUS_INTERFACE, name);
 
 	/* try, if there exists a plugin with @name under org.freedesktop.NetworkManager.
diff --git a/libnm-core/tests/test-general-enums.h b/libnm-core/tests/test-general-enums.h
index d06d6e39..8aa3f99f 100644
--- a/libnm-core/tests/test-general-enums.h
+++ b/libnm-core/tests/test-general-enums.h
@@ -27,6 +27,8 @@ typedef enum {
 	NM_TEST_GENERAL_BOOL_ENUM_MAYBE    = 2,
 	NM_TEST_GENERAL_BOOL_ENUM_UNKNOWN  = 3,
 	NM_TEST_GENERAL_BOOL_ENUM_INVALID  = 4, /*< skip >*/
+	NM_TEST_GENERAL_BOOL_ENUM_67       = 67,
+	NM_TEST_GENERAL_BOOL_ENUM_46       = 64,
 } NMTestGeneralBoolEnum;
 
 typedef enum {
@@ -34,6 +36,8 @@ typedef enum {
 	NM_TEST_GENERAL_META_FLAGS_FOO     = (1 << 0),
 	NM_TEST_GENERAL_META_FLAGS_BAR     = (1 << 1),
 	NM_TEST_GENERAL_META_FLAGS_BAZ     = (1 << 2),
+	NM_TEST_GENERAL_META_FLAGS_0x8     = (1 << 3),
+	NM_TEST_GENERAL_META_FLAGS_0x4     = (1 << 4),
 } NMTestGeneralMetaFlags;
 
 typedef enum {  /*< flags >*/
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index b9fef8da..7ecd6813 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -51,6 +51,7 @@
 #include "nm-setting-serial.h"
 #include "nm-setting-team.h"
 #include "nm-setting-team-port.h"
+#include "nm-setting-user.h"
 #include "nm-setting-vlan.h"
 #include "nm-setting-vpn.h"
 #include "nm-setting-wimax.h"
@@ -642,6 +643,47 @@ test_setting_ip4_config_address_data (void)
 	g_object_unref (conn);
 }
 
+static void
+test_setting_ip_route_attributes (void)
+{
+	GVariant *variant;
+	gboolean res, known;
+
+#define TEST_ATTR(name, type, value, family, exp_res, exp_known) \
+	variant = g_variant_new_ ## type (value); \
+	res = nm_ip_route_attribute_validate (name, variant, family, &known, NULL); \
+	g_assert (res == exp_res); \
+	g_assert (known == exp_known); \
+	g_variant_unref (variant);
+
+	TEST_ATTR ("foo", uint32, 12, AF_INET, FALSE, FALSE);
+
+	TEST_ATTR ("tos", byte,   127, AF_INET, TRUE, TRUE);
+	TEST_ATTR ("tos", string, "0x28", AF_INET, FALSE, TRUE);
+
+	TEST_ATTR ("cwnd",  uint32, 10,    AF_INET, TRUE,  TRUE);
+	TEST_ATTR ("cwnd",  string, "11",  AF_INET, FALSE, TRUE);
+
+	TEST_ATTR ("lock-mtu", boolean, TRUE, AF_INET, TRUE,  TRUE);
+	TEST_ATTR ("lock-mtu", uint32,  1,    AF_INET, FALSE, TRUE);
+
+	TEST_ATTR ("from", string, "fd01::1",     AF_INET6, TRUE,  TRUE);
+	TEST_ATTR ("from", string, "fd01::1/64",  AF_INET6, TRUE,  TRUE);
+	TEST_ATTR ("from", string, "fd01::1/128", AF_INET6, TRUE,  TRUE);
+	TEST_ATTR ("from", string, "fd01::1/129", AF_INET6, FALSE, TRUE);
+	TEST_ATTR ("from", string, "fd01::1/a",   AF_INET6, FALSE, TRUE);
+	TEST_ATTR ("from", string, "abc/64",      AF_INET6, FALSE, TRUE);
+	TEST_ATTR ("from", string, "1.2.3.4",     AF_INET,  FALSE, TRUE);
+	TEST_ATTR ("from", string, "1.2.3.4",     AF_INET6, FALSE, TRUE);
+
+	TEST_ATTR ("src", string, "1.2.3.4",    AF_INET,  TRUE,  TRUE);
+	TEST_ATTR ("src", string, "1.2.3.4",    AF_INET6, FALSE, TRUE);
+	TEST_ATTR ("src", string, "1.2.3.0/24", AF_INET,  FALSE, TRUE);
+	TEST_ATTR ("src", string, "fd01::12",   AF_INET6, TRUE,  TRUE);
+
+#undef TEST_ATTR
+}
+
 static void
 test_setting_gsm_apn_spaces (void)
 {
@@ -4285,6 +4327,18 @@ test_setting_compare_default_strv (void)
 	out_settings = NULL;
 }
 
+/*****************************************************************************/
+
+static void
+test_setting_user_data (void)
+{
+	gs_unref_object NMSettingUser *s_user = NULL;
+
+	s_user = NM_SETTING_USER (nm_setting_user_new ());
+}
+
+/*****************************************************************************/
+
 static void
 test_hexstr2bin (void)
 {
@@ -4837,7 +4891,7 @@ test_nm_utils_is_power_of_two (void)
 		if (i == -1)
 			xyes = 0;
 		else {
-			xyes = (1LL << i);
+			xyes = (((guint64) 1) << i);
 			g_assert (xyes != 0);
 		}
 
@@ -4848,7 +4902,7 @@ again:
 			 * by randomly setting bits. */
 			numbits = g_rand_int_range (rand, 1, 65);
 			while (xno != ~((guint64) 0) && numbits > 0) {
-				guint64 v = (1LL << g_rand_int_range (rand, 0, 64));
+				guint64 v = (((guint64) 1) << g_rand_int_range (rand, 0, 64));
 
 				if ((xno | v) != xno) {
 					xno |= v;
@@ -5142,25 +5196,30 @@ static void test_nm_utils_enum (void)
 
 	test_nm_utils_enum_to_str_do (bool_enum, NM_TEST_GENERAL_BOOL_ENUM_YES, "yes");
 	test_nm_utils_enum_to_str_do (bool_enum, NM_TEST_GENERAL_BOOL_ENUM_UNKNOWN, "unknown");
-	test_nm_utils_enum_to_str_do (bool_enum, NM_TEST_GENERAL_BOOL_ENUM_INVALID, NULL);
+	test_nm_utils_enum_to_str_do (bool_enum, NM_TEST_GENERAL_BOOL_ENUM_INVALID, "4");
+	test_nm_utils_enum_to_str_do (bool_enum, NM_TEST_GENERAL_BOOL_ENUM_67, "67");
+	test_nm_utils_enum_to_str_do (bool_enum, NM_TEST_GENERAL_BOOL_ENUM_46, "64");
 
 	test_nm_utils_enum_to_str_do (meta_flags, NM_TEST_GENERAL_META_FLAGS_NONE, "");
 	test_nm_utils_enum_to_str_do (meta_flags, NM_TEST_GENERAL_META_FLAGS_BAZ, "baz");
 	test_nm_utils_enum_to_str_do (meta_flags, NM_TEST_GENERAL_META_FLAGS_FOO |
 	                                          NM_TEST_GENERAL_META_FLAGS_BAR |
 	                                          NM_TEST_GENERAL_META_FLAGS_BAZ, "foo, bar, baz");
+	test_nm_utils_enum_to_str_do (meta_flags, 0xFF, "foo, bar, baz, 0xf8");
+	test_nm_utils_enum_to_str_do (meta_flags, NM_TEST_GENERAL_META_FLAGS_0x8, "0x8");
+	test_nm_utils_enum_to_str_do (meta_flags, NM_TEST_GENERAL_META_FLAGS_0x4, "0x10");
 
 	test_nm_utils_enum_to_str_do (color_flags, NM_TEST_GENERAL_COLOR_FLAGS_RED, "red");
-	test_nm_utils_enum_to_str_do (color_flags, NM_TEST_GENERAL_COLOR_FLAGS_WHITE, "");
+	test_nm_utils_enum_to_str_do (color_flags, NM_TEST_GENERAL_COLOR_FLAGS_WHITE, "0x1");
 	test_nm_utils_enum_to_str_do (color_flags, NM_TEST_GENERAL_COLOR_FLAGS_RED |
 	                                           NM_TEST_GENERAL_COLOR_FLAGS_GREEN, "red, green");
 
 	test_nm_utils_enum_from_str_do (bool_enum, "", FALSE, 0, NULL);
 	test_nm_utils_enum_from_str_do (bool_enum, " ", FALSE, 0, NULL);
-	test_nm_utils_enum_from_str_do (bool_enum, "invalid", FALSE, 0, NULL);
+	test_nm_utils_enum_from_str_do (bool_enum, "invalid", FALSE, 0, "invalid");
 	test_nm_utils_enum_from_str_do (bool_enum, "yes", TRUE, NM_TEST_GENERAL_BOOL_ENUM_YES, NULL);
 	test_nm_utils_enum_from_str_do (bool_enum, "no", TRUE, NM_TEST_GENERAL_BOOL_ENUM_NO, NULL);
-	test_nm_utils_enum_from_str_do (bool_enum, "yes,no", FALSE, 0, NULL);
+	test_nm_utils_enum_from_str_do (bool_enum, "yes,no", FALSE, 0, "yes,no");
 
 	test_nm_utils_enum_from_str_do (meta_flags, "", TRUE, 0, NULL);
 	test_nm_utils_enum_from_str_do (meta_flags, " ", TRUE, 0, NULL);
@@ -5172,16 +5231,18 @@ static void test_nm_utils_enum (void)
 	test_nm_utils_enum_from_str_do (meta_flags, "foo,,bar", TRUE, NM_TEST_GENERAL_META_FLAGS_FOO |
 	                                                              NM_TEST_GENERAL_META_FLAGS_BAR, NULL);
 	test_nm_utils_enum_from_str_do (meta_flags, "foo,baz,quux,bar", FALSE, 0, "quux");
+	test_nm_utils_enum_from_str_do (meta_flags, "foo,0x6", TRUE, NM_TEST_GENERAL_META_FLAGS_FOO | 0x6, NULL);
+	test_nm_utils_enum_from_str_do (meta_flags, "0x30,0x08,foo", TRUE, 0x39, NULL);
 
 	test_nm_utils_enum_from_str_do (color_flags, "green", TRUE, NM_TEST_GENERAL_COLOR_FLAGS_GREEN, NULL);
 	test_nm_utils_enum_from_str_do (color_flags, "blue,red", TRUE, NM_TEST_GENERAL_COLOR_FLAGS_BLUE |
 	                                                               NM_TEST_GENERAL_COLOR_FLAGS_RED, NULL);
 	test_nm_utils_enum_from_str_do (color_flags, "blue,white", FALSE, 0, "white");
 
-	test_nm_utils_enum_get_values_do (bool_enum, 0, G_MAXINT, "no,yes,maybe,unknown");
+	test_nm_utils_enum_get_values_do (bool_enum, 0, G_MAXINT, "no,yes,maybe,unknown,67,64");
 	test_nm_utils_enum_get_values_do (bool_enum, NM_TEST_GENERAL_BOOL_ENUM_YES,
 	                                  NM_TEST_GENERAL_BOOL_ENUM_MAYBE, "yes,maybe");
-	test_nm_utils_enum_get_values_do (meta_flags, 0, G_MAXINT, "none,foo,bar,baz");
+	test_nm_utils_enum_get_values_do (meta_flags, 0, G_MAXINT, "none,foo,bar,baz,0x8,0x10");
 	test_nm_utils_enum_get_values_do (color_flags, 0, G_MAXINT, "blue,red,green");
 }
 
@@ -5405,6 +5466,97 @@ test_nm_in_strset (void)
 #undef _ASSERT
 }
 
+static void
+test_route_attributes_parse (void)
+{
+	GHashTable *ht;
+	GError *error = NULL;
+	GVariant *variant;
+
+	ht = nm_utils_parse_variant_attributes ("mtu=1400  src=1.2.3.4 cwnd=14",
+	                                        ' ', '=', FALSE,
+	                                        nm_ip_route_get_variant_attribute_spec (),
+	                                        &error);
+	g_assert_no_error (error);
+	g_assert (ht);
+	g_hash_table_unref (ht);
+
+	ht = nm_utils_parse_variant_attributes ("mtu=1400 src=1.2.3.4 cwnd=14 \\",
+	                                         ' ', '=', FALSE,
+	                                         nm_ip_route_get_variant_attribute_spec (),
+	                                         &error);
+	g_assert_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED);
+	g_assert (!ht);
+	g_clear_error (&error);
+
+	ht = nm_utils_parse_variant_attributes ("mtu.1400 src.1\\.2\\.3\\.4 ",
+	                                         ' ', '.', FALSE,
+	                                         nm_ip_route_get_variant_attribute_spec (),
+	                                         &error);
+	g_assert (ht);
+	g_assert_no_error (error);
+	variant = g_hash_table_lookup (ht, NM_IP_ROUTE_ATTRIBUTE_MTU);
+	g_assert (variant);
+	g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT32));
+	g_assert_cmpuint (g_variant_get_uint32 (variant), ==, 1400);
+
+	variant = g_hash_table_lookup (ht, NM_IP_ROUTE_ATTRIBUTE_SRC);
+	g_assert (variant);
+	g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING));
+	g_assert_cmpstr (g_variant_get_string (variant, NULL), ==, "1.2.3.4");
+	g_hash_table_unref (ht);
+
+	ht = nm_utils_parse_variant_attributes ("from:fd01\\:\\:42\\/64/initrwnd:21",
+	                                         '/', ':', FALSE,
+	                                         nm_ip_route_get_variant_attribute_spec (),
+	                                         &error);
+	g_assert (ht);
+	g_assert_no_error (error);
+	variant = g_hash_table_lookup (ht, NM_IP_ROUTE_ATTRIBUTE_INITRWND);
+	g_assert (variant);
+	g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT32));
+	g_assert_cmpuint (g_variant_get_uint32 (variant), ==, 21);
+
+	variant = g_hash_table_lookup (ht, NM_IP_ROUTE_ATTRIBUTE_FROM);
+	g_assert (variant);
+	g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING));
+	g_assert_cmpstr (g_variant_get_string (variant, NULL), ==, "fd01::42/64");
+	g_hash_table_unref (ht);
+}
+
+static void
+test_route_attributes_format (void)
+{
+	gs_unref_hashtable GHashTable *ht = NULL;
+	char *str;
+
+	ht = g_hash_table_new_full (g_str_hash, g_str_equal,
+	                            NULL, (GDestroyNotify) g_variant_unref);
+
+	str = nm_utils_format_variant_attributes (NULL, ' ', '=');
+	g_assert_cmpstr (str, ==, NULL);
+
+	str = nm_utils_format_variant_attributes (ht, ' ', '=');
+	g_assert_cmpstr (str, ==, NULL);
+
+	g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_MTU, g_variant_new_uint32 (5000));
+	g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_INITRWND, g_variant_new_uint32 (20));
+	g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, g_variant_new_boolean (TRUE));
+	g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_SRC, g_variant_new_string ("aaaa:bbbb::1"));
+	str = nm_utils_format_variant_attributes (ht, ' ', '=');
+	g_assert_cmpstr (str, ==, "initrwnd=20 lock-mtu=true mtu=5000 src=aaaa:bbbb::1");
+	g_hash_table_remove_all (ht);
+	g_free (str);
+
+	g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_WINDOW, g_variant_new_uint32 (30000));
+	g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_INITCWND, g_variant_new_uint32 (21));
+	g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_FROM, g_variant_new_string ("aaaa:bbbb:cccc:dddd::/64"));
+	str = nm_utils_format_variant_attributes (ht, '/', ':');
+	g_assert_cmpstr (str, ==, "from:aaaa\\:bbbb\\:cccc\\:dddd\\:\\:\\/64/initcwnd:21/window:30000");
+	g_hash_table_remove_all (ht);
+	g_free (str);
+}
+
 /*****************************************************************************/
 
 static gboolean
@@ -5460,6 +5612,7 @@ int main (int argc, char **argv)
 	g_test_add_func ("/core/general/test_setting_vpn_modify_during_foreach", test_setting_vpn_modify_during_foreach);
 	g_test_add_func ("/core/general/test_setting_ip4_config_labels", test_setting_ip4_config_labels);
 	g_test_add_func ("/core/general/test_setting_ip4_config_address_data", test_setting_ip4_config_address_data);
+	g_test_add_func ("/core/general/test_setting_ip_route_attributes", test_setting_ip_route_attributes);
 	g_test_add_func ("/core/general/test_setting_gsm_apn_spaces", test_setting_gsm_apn_spaces);
 	g_test_add_func ("/core/general/test_setting_gsm_apn_bad_chars", test_setting_gsm_apn_bad_chars);
 	g_test_add_func ("/core/general/test_setting_gsm_apn_underscore", test_setting_gsm_apn_underscore);
@@ -5551,6 +5704,7 @@ int main (int argc, char **argv)
 	g_test_add_func ("/core/general/test_setting_ip4_gateway", test_setting_ip4_gateway);
 	g_test_add_func ("/core/general/test_setting_ip6_gateway", test_setting_ip6_gateway);
 	g_test_add_func ("/core/general/test_setting_compare_default_strv", test_setting_compare_default_strv);
+	g_test_add_func ("/core/general/test_setting_user_data", test_setting_user_data);
 
 	g_test_add_func ("/core/general/hexstr2bin", test_hexstr2bin);
 	g_test_add_func ("/core/general/test_nm_utils_uuid_generate_from_string", test_nm_utils_uuid_generate_from_string);
@@ -5569,6 +5723,8 @@ int main (int argc, char **argv)
 	g_test_add_func ("/core/general/_nm_utils_team_config_equal", test_nm_utils_team_config_equal);
 	g_test_add_func ("/core/general/test_nm_utils_enum", test_nm_utils_enum);
 	g_test_add_func ("/core/general/nm-set-out", test_nm_set_out);
+	g_test_add_func ("/core/general/route_attributes/parse", test_route_attributes_parse);
+	g_test_add_func ("/core/general/route_attributes/format", test_route_attributes_format);
 
 	return g_test_run ();
 }
diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c
index 9944eb5e..2dc929af 100644
--- a/libnm-core/tests/test-keyfile.c
+++ b/libnm-core/tests/test-keyfile.c
@@ -28,6 +28,7 @@
 #include "nm-setting-wired.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-team.h"
+#include "nm-setting-user.h"
 #include "nm-setting-proxy.h"
 
 #include "nm-utils/nm-test-utils.h"
@@ -36,6 +37,69 @@
 #define TEST_WIRED_TLS_CA_CERT     TEST_CERT_DIR"/test-ca-cert.pem"
 #define TEST_WIRED_TLS_PRIVKEY     TEST_CERT_DIR"/test-key-and-cert.pem"
 
+/*****************************************************************************/
+
+static void
+do_test_encode_key_full (GKeyFile *kf, const char *name, const char *key, const char *key_decode_encode)
+{
+	gs_free char *to_free1 = NULL;
+	gs_free char *to_free2 = NULL;
+	const char *key2;
+	const char *name2;
+
+	g_assert (key);
+
+	if (name) {
+		key2 = nm_keyfile_key_encode (name, &to_free1);
+		g_assert (key2);
+		g_assert (NM_STRCHAR_ALL (key2, ch, (guchar) ch < 127));
+		g_assert_cmpstr (key2, ==, key);
+
+		/* try to add the encoded key to the keyfile. We expect
+		 * no g_critical warning about invalid key. */
+		g_key_file_set_value (kf, "group", key, "dummy");
+	}
+
+	name2 = nm_keyfile_key_decode (key, &to_free2);
+	if (name)
+		g_assert_cmpstr (name2, ==, name);
+	else {
+		key2 = nm_keyfile_key_encode (name2, &to_free1);
+		g_assert (key2);
+		g_assert (NM_STRCHAR_ALL (key2, ch, (guchar) ch < 127));
+		if (key_decode_encode)
+			g_assert_cmpstr (key2, ==, key_decode_encode);
+		g_key_file_set_value (kf, "group", key2, "dummy");
+	}
+}
+
+#define do_test_encode_key_bijection(kf, name, key)                      do_test_encode_key_full (kf, ""name, ""key,  NULL)
+#define do_test_encode_key_identity(kf, name)                            do_test_encode_key_full (kf, ""name, ""name, NULL)
+#define do_test_encode_key_decode_surjection(kf, key, key_decode_encode) do_test_encode_key_full (kf, NULL,   ""key,  ""key_decode_encode)
+
+static void
+test_encode_key (void)
+{
+	gs_unref_keyfile GKeyFile *kf = g_key_file_new ();
+
+	do_test_encode_key_identity (kf, "a");
+	do_test_encode_key_bijection (kf, "", "\\00");
+	do_test_encode_key_bijection (kf, " ", "\\20");
+	do_test_encode_key_bijection (kf, "\\ ", "\\\\20");
+	do_test_encode_key_identity (kf, "\\0");
+	do_test_encode_key_identity (kf, "\\a");
+	do_test_encode_key_identity (kf, "\\0g");
+	do_test_encode_key_bijection (kf, "\\0f", "\\5C0f");
+	do_test_encode_key_bijection (kf, "\\0f ", "\\5C0f\\20");
+	do_test_encode_key_bijection (kf, " \\0f ", "\\20\\5C0f\\20");
+	do_test_encode_key_bijection (kf, "\xF5", "\\F5");
+	do_test_encode_key_bijection (kf, "\x7F", "\\7F");
+	do_test_encode_key_bijection (kf, "\x1f", "\\1F");
+	do_test_encode_key_bijection (kf, "  ", "\\20\\20");
+	do_test_encode_key_bijection (kf, "   ", "\\20 \\20");
+	do_test_encode_key_decode_surjection (kf, "f\\20c", "f c");
+	do_test_encode_key_decode_surjection (kf, "\\20\\20\\20", "\\20 \\20");
+}
 
 /*****************************************************************************/
 
@@ -583,16 +647,85 @@ test_team_conf_read_invalid (void)
 
 /*****************************************************************************/
 
+static void
+test_user_1 (void)
+{
+	gs_unref_keyfile GKeyFile *keyfile = NULL;
+	gs_unref_object NMConnection *con = NULL;
+	NMSettingUser *s_user;
+
+	con = nmtst_create_connection_from_keyfile (
+	      "[connection]\n"
+	      "id=t\n"
+	      "type=ethernet\n"
+	      "\n"
+	      "[user]\n"
+	      "my-value.x=value1\n"
+	      "",
+	      "/test_user_1/invalid", NULL);
+	g_assert (con);
+	s_user = NM_SETTING_USER (nm_connection_get_setting (con, NM_TYPE_SETTING_USER));
+	g_assert (s_user);
+	g_assert_cmpstr (nm_setting_user_get_data (s_user, "my-value.x"), ==, "value1");
+
+	CLEAR (&con, &keyfile);
+
+	con = nmtst_create_minimal_connection ("user-2", "8b85fb8d-3070-48ba-93d9-53eee231d9a2", NM_SETTING_WIRED_SETTING_NAME, NULL);
+	s_user = NM_SETTING_USER (nm_setting_user_new ());
+
+#define _USER_SET_DATA(s_user, key, val) \
+	G_STMT_START { \
+		GError *_error = NULL; \
+		gboolean _success; \
+		\
+		_success = nm_setting_user_set_data ((s_user), (key), (val), &_error); \
+		nmtst_assert_success (_success, _error); \
+	} G_STMT_END
+
+#define _USER_SET_DATA_X(s_user, key) \
+	_USER_SET_DATA (s_user, key, "val="key"")
+
+	_USER_SET_DATA (s_user, "my.val1", "");
+	_USER_SET_DATA_X (s_user, "my.val2");
+	_USER_SET_DATA_X (s_user, "my.v__al3");
+	_USER_SET_DATA_X (s_user, "my._v");
+	_USER_SET_DATA_X (s_user, "my.v+");
+	_USER_SET_DATA_X (s_user, "my.Av");
+	_USER_SET_DATA_X (s_user, "MY.AV");
+	_USER_SET_DATA_X (s_user, "MY.8V");
+	_USER_SET_DATA_X (s_user, "MY.8-V");
+	_USER_SET_DATA_X (s_user, "MY.8_V");
+	_USER_SET_DATA_X (s_user, "MY.8+V");
+	_USER_SET_DATA_X (s_user, "MY.8/V");
+	_USER_SET_DATA_X (s_user, "MY.8=V");
+	_USER_SET_DATA_X (s_user, "MY.-");
+	_USER_SET_DATA_X (s_user, "MY._");
+	_USER_SET_DATA_X (s_user, "MY.+");
+	_USER_SET_DATA_X (s_user, "MY./");
+	_USER_SET_DATA_X (s_user, "MY.=");
+	_USER_SET_DATA_X (s_user, "my.keys.1");
+	_USER_SET_DATA_X (s_user, "my.other.KEY.42");
+
+	nm_connection_add_setting (con, NM_SETTING (s_user));
+	nmtst_connection_normalize (con);
+
+	_keyfile_convert (&con, &keyfile, NULL, NULL, NULL, NULL, NULL, NULL, FALSE);
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE ();
 
 int main (int argc, char **argv)
 {
 	nmtst_init (&argc, &argv, TRUE);
 
+	g_test_add_func ("/core/keyfile/encode_key", test_encode_key);
 	g_test_add_func ("/core/keyfile/test_8021x_cert", test_8021x_cert);
 	g_test_add_func ("/core/keyfile/test_8021x_cert_read", test_8021x_cert_read);
 	g_test_add_func ("/core/keyfile/test_team_conf_read/valid", test_team_conf_read_valid);
 	g_test_add_func ("/core/keyfile/test_team_conf_read/invalid", test_team_conf_read_invalid);
+	g_test_add_func ("/core/keyfile/test_user/1", test_user_1);
 
 	return g_test_run ();
 }
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index 0aef3ee4..70b98f6d 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -24,11 +24,11 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include "nm-connection.h"
+#include "nm-setting-connection.h"
+#include "nm-setting-wireless.h"
+#include "nm-setting-wireless-security.h"
+#include "nm-utils.h"
 
 #include "nm-access-point.h"
 #include "NetworkManager.h"
@@ -309,16 +309,17 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection)
 	const GByteArray *setting_ssid;
 	const GByteArray *ap_ssid;
 	const GByteArray *setting_bssid;
-	struct ether_addr *ap_bssid;
 	const char *setting_mode;
 	NM80211Mode ap_mode;
 	const char *setting_band;
 	guint32 ap_freq, setting_chan, ap_chan;
 
 	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
+	if (!s_con)
+		return FALSE;
+
 	ctype = nm_setting_connection_get_connection_type (s_con);
-	if (strcmp (ctype, NM_SETTING_WIRELESS_SETTING_NAME) != 0)
+	if (!ctype || !nm_streq (ctype, NM_SETTING_WIRELESS_SETTING_NAME))
 		return FALSE;
 
 	s_wifi = nm_connection_get_setting_wireless (connection);
@@ -327,30 +328,34 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection)
 
 	/* SSID checks */
 	ap_ssid = nm_access_point_get_ssid (ap);
-	g_warn_if_fail (ap_ssid != NULL);
-	setting_ssid = nm_setting_wireless_get_ssid (s_wifi);
-	if (!setting_ssid || !ap_ssid || (setting_ssid->len != ap_ssid->len))
+	if (!ap_ssid)
 		return FALSE;
-	if (memcmp (setting_ssid->data, ap_ssid->data, ap_ssid->len) != 0)
+	setting_ssid = nm_setting_wireless_get_ssid (s_wifi);
+	if (   !setting_ssid
+	    || setting_ssid->len != ap_ssid->len
+	    || memcmp (setting_ssid->data, ap_ssid->data, ap_ssid->len) != 0)
 		return FALSE;
 
 	/* BSSID checks */
 	ap_bssid_str = nm_access_point_get_bssid (ap);
-	g_warn_if_fail (ap_bssid_str);
+	if (!ap_bssid_str)
+		return FALSE;
 	setting_bssid = nm_setting_wireless_get_bssid (s_wifi);
-	if (setting_bssid && ap_bssid_str) {
-		g_assert (setting_bssid->len == ETH_ALEN);
-		ap_bssid = ether_aton (ap_bssid_str);
-		g_warn_if_fail (ap_bssid);
-		if (ap_bssid) {
-			if (memcmp (ap_bssid->ether_addr_octet, setting_bssid->data, ETH_ALEN) != 0)
-				return FALSE;
-		}
+	if (setting_bssid) {
+		struct ether_addr addr;
+
+		g_return_val_if_fail (setting_bssid->len == ETH_ALEN, FALSE);
+
+		if (!ether_aton_r (ap_bssid_str, &addr))
+			return FALSE;
+		if (memcmp (addr.ether_addr_octet, setting_bssid->data, ETH_ALEN) != 0)
+			return FALSE;
 	}
 
 	/* Mode */
 	ap_mode = nm_access_point_get_mode (ap);
-	g_warn_if_fail (ap_mode != NM_802_11_MODE_UNKNOWN);
+	if (ap_mode == NM_802_11_MODE_UNKNOWN)
+		return FALSE;
 	setting_mode = nm_setting_wireless_get_mode (s_wifi);
 	if (setting_mode && ap_mode) {
 		if (!strcmp (setting_mode, "infrastructure") && (ap_mode != NM_802_11_MODE_INFRA))
diff --git a/libnm-glib/nm-access-point.h b/libnm-glib/nm-access-point.h
index 7ea8f812..5750c76c 100644
--- a/libnm-glib/nm-access-point.h
+++ b/libnm-glib/nm-access-point.h
@@ -24,8 +24,8 @@
 
 #include 
 #include 
-#include 
-#include 
+#include "NetworkManager.h"
+#include "nm-connection.h"
 #include "nm-object.h"
 
 G_BEGIN_DECLS
diff --git a/libnm-glib/nm-active-connection.h b/libnm-glib/nm-active-connection.h
index e2941564..cdf02a94 100644
--- a/libnm-glib/nm-active-connection.h
+++ b/libnm-glib/nm-active-connection.h
@@ -25,8 +25,8 @@
 #include 
 #include 
 #include "nm-object.h"
-#include 
-#include 
+#include "nm-connection.h"
+#include "NetworkManager.h"
 #include "nm-ip4-config.h"
 #include "nm-dhcp4-config.h"
 #include "nm-ip6-config.h"
diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h
index f10b6e54..fbbc3d92 100644
--- a/libnm-glib/nm-client.h
+++ b/libnm-glib/nm-client.h
@@ -26,7 +26,7 @@
 #include 
 #include 
 #include 
-#include 
+#include "NetworkManager.h"
 #include "nm-object.h"
 #include "nm-device.h"
 #include "nm-active-connection.h"
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index 48ad8897..be86a246 100644
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -22,9 +22,11 @@
 #include "nm-default.h"
 
 #include 
-#include 
+#include 
 
 #include "NetworkManager.h"
+
+#include "nm-utils/nm-udev-utils.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-adsl.h"
 #include "nm-device-wifi.h"
@@ -92,7 +94,7 @@ typedef struct {
 	NMActiveConnection *active_connection;
 	GPtrArray *available_connections;
 
-	GUdevClient *client;
+	NMUdevClient *udev_client;
 	char *product, *short_product;
 	char *vendor, *short_vendor;
 	char *description, *bus_name;
@@ -374,9 +376,10 @@ dispose (GObject *object)
 	g_clear_object (&priv->dhcp4_config);
 	g_clear_object (&priv->ip6_config);
 	g_clear_object (&priv->dhcp6_config);
-	g_clear_object (&priv->client);
 	g_clear_object (&priv->active_connection);
 
+	priv->udev_client = nm_udev_client_unref (priv->udev_client);
+
 	if (priv->available_connections) {
 		int i;
 
@@ -519,7 +522,7 @@ set_property (GObject *object,
 
 	switch (prop_id) {
 	case PROP_DEVICE_TYPE:
-		/* Construct only */
+		/* construct-only */
 		priv->device_type = g_value_get_uint (value);
 		break;
 	case PROP_MANAGED:
@@ -1500,43 +1503,16 @@ nm_device_get_available_connections (NMDevice *device)
 	return handle_ptr_array_return (NM_DEVICE_GET_PRIVATE (device)->available_connections);
 }
 
-static char *
-get_decoded_property (GUdevDevice *device, const char *property)
-{
-	const char *orig, *p;
-	char *unescaped, *n;
-	guint len;
-
-	p = orig = g_udev_device_get_property (device, property);
-	if (!orig)
-		return NULL;
-
-	len = strlen (orig);
-	n = unescaped = g_malloc0 (len + 1);
-	while (*p) {
-		if ((len >= 4) && (*p == '\\') && (*(p+1) == 'x')) {
-			*n++ = (char) nm_utils_hex2byte (p + 2);
-			p += 4;
-			len -= 4;
-		} else {
-			*n++ = *p++;
-			len--;
-		}
-	}
-
-	return unescaped;
-}
-
 static gboolean
 ensure_udev_client (NMDevice *device)
 {
-	static const char *const subsys[3] = { "net", "tty", NULL };
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
 
-	if (!priv->client)
-		priv->client = g_udev_client_new (subsys);
-
-	return priv->client != NULL;
+	if (!priv->udev_client) {
+		priv->udev_client = nm_udev_client_new ((const char *[]) { "net", "tty", NULL },
+		                                        NULL, NULL);
+	}
+	return !!priv->udev_client;
 }
 
 static char *
@@ -1545,7 +1521,7 @@ _get_udev_property (NMDevice *device,
                     const char *db_prop)   /* ID_XXX_FROM_DATABASE */
 {
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
-	GUdevDevice *udev_device = NULL, *tmpdev, *olddev;
+	struct udev_device *udev_device, *tmpdev;
 	const char *ifname;
 	guint32 count = 0;
 	char *enc_value = NULL, *db_value = NULL;
@@ -1557,39 +1533,25 @@ _get_udev_property (NMDevice *device,
 	if (!ifname)
 		return NULL;
 
-	udev_device = g_udev_client_query_by_subsystem_and_name (priv->client, "net", ifname);
-	if (!udev_device)
-		udev_device = g_udev_client_query_by_subsystem_and_name (priv->client, "tty", ifname);
-	if (!udev_device)
-		return NULL;
-
+	udev_device = udev_device_new_from_subsystem_sysname (nm_udev_client_get_udev (priv->udev_client), "net", ifname);
+	if (!udev_device) {
+		udev_device = udev_device_new_from_subsystem_sysname (nm_udev_client_get_udev (priv->udev_client), "tty", ifname);
+		if (!udev_device)
+			return NULL;
+	}
 	/* Walk up the chain of the device and its parents a few steps to grab
 	 * vendor and device ID information off it.
 	 */
-
-	/* Ref the device again because we have to unref it each iteration,
-	 * as g_udev_device_get_parent() returns a ref-ed object.
-	 */
-	tmpdev = g_object_ref (udev_device);
+	tmpdev = udev_device;
 	while ((count++ < 3) && tmpdev && !enc_value) {
 		if (!enc_value)
-			enc_value = get_decoded_property (tmpdev, enc_prop);
+			enc_value = nm_udev_utils_property_decode_cp (udev_device_get_property_value (tmpdev, enc_prop));
 		if (!db_value)
-			db_value = g_strdup (g_udev_device_get_property (tmpdev, db_prop));
+			db_value = g_strdup (udev_device_get_property_value (tmpdev, db_prop));
 
-		olddev = tmpdev;
-		tmpdev = g_udev_device_get_parent (tmpdev);
-		g_object_unref (olddev);
+		tmpdev = udev_device_get_parent (tmpdev);
 	}
-
-	/* Unref the last device if we found what we needed before running out
-	 * of parents.
-	 */
-	if (tmpdev)
-		g_object_unref (tmpdev);
-
-	/* Balance the initial g_udev_client_query_by_subsystem_and_name() */
-	g_object_unref (udev_device);
+	udev_device_unref (udev_device);
 
 	/* Prefer the encoded value which comes directly from the device
 	 * over the hwdata database value.
@@ -1930,7 +1892,7 @@ static const char *
 get_bus_name (NMDevice *device)
 {
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
-	GUdevDevice *udevice;
+	struct udev_device *udevice;
 	const char *ifname, *bus;
 
 	if (priv->bus_name)
@@ -1943,13 +1905,13 @@ get_bus_name (NMDevice *device)
 	if (!ifname)
 		return NULL;
 
-	udevice = g_udev_client_query_by_subsystem_and_name (priv->client, "net", ifname);
+	udevice = udev_device_new_from_subsystem_sysname (nm_udev_client_get_udev (priv->udev_client), "net", ifname);
 	if (!udevice)
-		udevice = g_udev_client_query_by_subsystem_and_name (priv->client, "tty", ifname);
+		udevice = udev_device_new_from_subsystem_sysname (nm_udev_client_get_udev (priv->udev_client), "tty", ifname);
 	if (!udevice)
 		return NULL;
 
-	bus = g_udev_device_get_property (udevice, "ID_BUS");
+	bus = udev_device_get_property_value (udevice, "ID_BUS");
 	if (!g_strcmp0 (bus, "pci"))
 		priv->bus_name = g_strdup (_("PCI"));
 	else if (!g_strcmp0 (bus, "usb"))
@@ -1960,6 +1922,7 @@ get_bus_name (NMDevice *device)
 		 */
 		priv->bus_name = g_strdup ("");
 	}
+	udev_device_unref (udevice);
 
 out:
 	if (*priv->bus_name)
diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c
index fc3491c8..4acdeae7 100644
--- a/libnm-glib/nm-dhcp4-config.c
+++ b/libnm-glib/nm-dhcp4-config.c
@@ -174,6 +174,9 @@ nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class)
 GObject *
 nm_dhcp4_config_new (DBusGConnection *connection, const char *object_path)
 {
+	g_return_val_if_fail (connection != NULL, NULL);
+	g_return_val_if_fail (object_path != NULL, NULL);
+
 	return (GObject *) g_object_new (NM_TYPE_DHCP4_CONFIG,
 	                                 NM_OBJECT_DBUS_CONNECTION, connection,
 	                                 NM_OBJECT_DBUS_PATH, object_path,
diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c
index 43aee15c..aebea8df 100644
--- a/libnm-glib/nm-dhcp6-config.c
+++ b/libnm-glib/nm-dhcp6-config.c
@@ -174,6 +174,9 @@ nm_dhcp6_config_class_init (NMDHCP6ConfigClass *config_class)
 GObject *
 nm_dhcp6_config_new (DBusGConnection *connection, const char *object_path)
 {
+	g_return_val_if_fail (connection != NULL, NULL);
+	g_return_val_if_fail (object_path != NULL, NULL);
+
 	return (GObject *) g_object_new (NM_TYPE_DHCP6_CONFIG,
 	                                 NM_OBJECT_DBUS_CONNECTION, connection,
 	                                 NM_OBJECT_DBUS_PATH, object_path,
diff --git a/libnm-glib/nm-ip4-config.c b/libnm-glib/nm-ip4-config.c
index ae7448f9..9e0e2e2d 100644
--- a/libnm-glib/nm-ip4-config.c
+++ b/libnm-glib/nm-ip4-config.c
@@ -330,6 +330,9 @@ nm_ip4_config_class_init (NMIP4ConfigClass *config_class)
 GObject *
 nm_ip4_config_new (DBusGConnection *connection, const char *object_path)
 {
+	g_return_val_if_fail (connection != NULL, NULL);
+	g_return_val_if_fail (object_path != NULL, NULL);
+
 	return (GObject *) g_object_new (NM_TYPE_IP4_CONFIG,
 	                                 NM_OBJECT_DBUS_CONNECTION, connection,
 	                                 NM_OBJECT_DBUS_PATH, object_path,
diff --git a/libnm-glib/nm-ip6-config.c b/libnm-glib/nm-ip6-config.c
index 320f00f2..5ec02dae 100644
--- a/libnm-glib/nm-ip6-config.c
+++ b/libnm-glib/nm-ip6-config.c
@@ -69,6 +69,9 @@ enum {
 GObject *
 nm_ip6_config_new (DBusGConnection *connection, const char *object_path)
 {
+	g_return_val_if_fail (connection != NULL, NULL);
+	g_return_val_if_fail (object_path != NULL, NULL);
+
 	return (GObject *) g_object_new (NM_TYPE_IP6_CONFIG,
 	                                 NM_OBJECT_DBUS_CONNECTION, connection,
 	                                 NM_OBJECT_DBUS_PATH, object_path,
diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index c7201cda..2e07ff6d 100644
--- a/libnm-glib/nm-object.c
+++ b/libnm-glib/nm-object.c
@@ -175,7 +175,22 @@ constructor (GType type,
 
 	priv = NM_OBJECT_GET_PRIVATE (object);
 
-	if (priv->connection == NULL || priv->path == NULL) {
+	if (priv->connection == NULL) {
+		GError *error = NULL;
+
+		priv->connection = _nm_dbus_new_connection (&error);
+
+		if (priv->connection == NULL) {
+			g_warning ("Error connecting to system bus: %s", error->message);
+			g_clear_error (&error);
+			g_object_unref (object);
+			return NULL;
+		}
+	}
+
+	g_assert (priv->connection != NULL);
+
+	if (priv->path == NULL) {
 		g_warn_if_reached ();
 		g_object_unref (object);
 		return NULL;
@@ -354,13 +369,11 @@ set_property (GObject *object, guint prop_id,
 
 	switch (prop_id) {
 	case PROP_DBUS_CONNECTION:
-		/* Construct only */
+		/* construct-only */
 		priv->connection = g_value_dup_boxed (value);
-		if (!priv->connection)
-			priv->connection = _nm_dbus_new_connection (NULL);
 		break;
 	case PROP_DBUS_PATH:
-		/* Construct only */
+		/* construct-only */
 		priv->path = g_value_dup_string (value);
 		break;
 	default:
diff --git a/libnm-glib/nm-object.h b/libnm-glib/nm-object.h
index 07348f24..73aa9de5 100644
--- a/libnm-glib/nm-object.h
+++ b/libnm-glib/nm-object.h
@@ -26,7 +26,7 @@
 #include 
 #include 
 
-#include 
+#include "nm-version.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c
index 5c07f0ec..d147365b 100644
--- a/libnm-glib/nm-remote-connection.c
+++ b/libnm-glib/nm-remote-connection.c
@@ -796,7 +796,7 @@ set_property (GObject *object, guint prop_id,
 	switch (prop_id) {
 	case PROP_BUS:
 	case PROP_DBUS_CONNECTION:
-		/* Construct only */
+		/* construct-only */
 		/* priv->bus is set from either of two properties so that it (a) remains
 		 * backwards compatible with the previous "bus" property, and that (b)
 		 * it can be created just like an NMObject using the "dbus-connection",
diff --git a/libnm-glib/nm-remote-connection.h b/libnm-glib/nm-remote-connection.h
index 8292c235..5b746a44 100644
--- a/libnm-glib/nm-remote-connection.h
+++ b/libnm-glib/nm-remote-connection.h
@@ -25,7 +25,7 @@
 #include 
 #include 
 
-#include 
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
index 6e90db19..3f2c50f2 100644
--- a/libnm-glib/nm-remote-settings.c
+++ b/libnm-glib/nm-remote-settings.c
@@ -1429,7 +1429,7 @@ set_property (GObject *object, guint prop_id,
 
 	switch (prop_id) {
 	case PROP_BUS:
-		/* Construct only */
+		/* construct-only */
 		priv->bus = g_value_dup_boxed (value);
 		if (!priv->bus)
 			priv->bus = _nm_dbus_new_connection (NULL);
diff --git a/libnm-glib/nm-remote-settings.h b/libnm-glib/nm-remote-settings.h
index 92049ade..af6cc603 100644
--- a/libnm-glib/nm-remote-settings.h
+++ b/libnm-glib/nm-remote-settings.h
@@ -24,8 +24,8 @@
 
 #include 
 #include 
-#include 
-#include 
+#include "nm-connection.h"
+#include "nm-remote-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c
index aeb7a208..75129e06 100644
--- a/libnm-glib/nm-secret-agent.c
+++ b/libnm-glib/nm-secret-agent.c
@@ -304,7 +304,7 @@ verify_request (NMSecretAgent *self,
 {
 	NMConnection *connection = NULL;
 
-	g_return_val_if_fail (out_connection, FALSE);
+	g_return_val_if_fail (!connection_hash || out_connection, FALSE);
 
 	if (!verify_sender (self, context, error))
 		return FALSE;
diff --git a/libnm-glib/nm-secret-agent.h b/libnm-glib/nm-secret-agent.h
index b7df8745..621e5e7b 100644
--- a/libnm-glib/nm-secret-agent.h
+++ b/libnm-glib/nm-secret-agent.h
@@ -21,7 +21,7 @@
 #ifndef NM_SECRET_AGENT_H
 #define NM_SECRET_AGENT_H
 
-#include 
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-glib/nm-types.h b/libnm-glib/nm-types.h
index 81bd299e..9b58cd81 100644
--- a/libnm-glib/nm-types.h
+++ b/libnm-glib/nm-types.h
@@ -24,7 +24,7 @@
 #include 
 #include 
 
-#include 
+#include "nm-glib-enum-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.h b/libnm-glib/nm-vpn-plugin-ui-interface.h
index 37fde91f..b5ea2a7e 100644
--- a/libnm-glib/nm-vpn-plugin-ui-interface.h
+++ b/libnm-glib/nm-vpn-plugin-ui-interface.h
@@ -24,7 +24,7 @@
 
 #include 
 #include 
-#include 
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-glib/nm-vpn-plugin-utils.h b/libnm-glib/nm-vpn-plugin-utils.h
index d87ef16a..dfb621ca 100644
--- a/libnm-glib/nm-vpn-plugin-utils.h
+++ b/libnm-glib/nm-vpn-plugin-utils.h
@@ -22,7 +22,7 @@
 #define NM_VPN_PLUGIN_UTILS_H
 
 #include 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c
index 0ea30b58..4c4c3161 100644
--- a/libnm-glib/nm-vpn-plugin.c
+++ b/libnm-glib/nm-vpn-plugin.c
@@ -799,7 +799,7 @@ set_property (GObject *object, guint prop_id,
 
 	switch (prop_id) {
 	case PROP_DBUS_SERVICE_NAME:
-		/* Construct-only */
+		/* construct-only */
 		priv->dbus_service_name = g_value_dup_string (value);
 		break;
 	case PROP_STATE:
diff --git a/libnm-glib/nm-vpn-plugin.h b/libnm-glib/nm-vpn-plugin.h
index 323017f0..a33349a1 100644
--- a/libnm-glib/nm-vpn-plugin.h
+++ b/libnm-glib/nm-vpn-plugin.h
@@ -25,8 +25,8 @@
 #include 
 #include 
 #include 
-#include 
-#include 
+#include "NetworkManagerVPN.h"
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-glib/nm-wimax-nsp.h b/libnm-glib/nm-wimax-nsp.h
index 74008d18..336f331d 100644
--- a/libnm-glib/nm-wimax-nsp.h
+++ b/libnm-glib/nm-wimax-nsp.h
@@ -24,7 +24,7 @@
 
 #include 
 #include 
-#include 
+#include "NetworkManager.h"
 #include "nm-object.h"
 
 G_BEGIN_DECLS
diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h
index 77c09ae3..5e1c3f9f 100644
--- a/libnm-util/NetworkManager.h
+++ b/libnm-util/NetworkManager.h
@@ -28,7 +28,7 @@
 
 /* This header must not include glib or libnm. */
 
-#include 
+#include "nm-version-macros.h"
 
 /*
  * dbus services details
diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c
index 4e60d2e9..b55af774 100644
--- a/libnm-util/crypto_nss.c
+++ b/libnm-util/crypto_nss.c
@@ -79,7 +79,7 @@ crypto_md5_hash (const char *salt,
 {
 	PK11Context *ctx;
 	int nkey = buflen;
-	unsigned int digest_len;
+	unsigned digest_len;
 	int count = 0;
 	char digest[MD5_HASH_LEN];
 	char *p = buffer;
@@ -144,7 +144,7 @@ crypto_decrypt (const char *cipher,
 	PK11Context *ctx = NULL;
 	SECStatus s;
 	gboolean success = FALSE;
-	unsigned int pad_len = 0, extra = 0;
+	unsigned pad_len = 0, extra = 0;
 	guint32 i, real_iv_len = 0;
 
 	if (!strcmp (cipher, CIPHER_DES_EDE3_CBC)) {
diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h
index 2cee2be5..6e119c2c 100644
--- a/libnm-util/nm-connection.h
+++ b/libnm-util/nm-connection.h
@@ -25,34 +25,34 @@
 
 #include 
 #include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include "nm-setting.h"
+
+#include "nm-setting-8021x.h"
+#include "nm-setting-bluetooth.h"
+#include "nm-setting-bond.h"
+#include "nm-setting-team.h"
+#include "nm-setting-team-port.h"
+#include "nm-setting-bridge.h"
+#include "nm-setting-bridge-port.h"
+#include "nm-setting-cdma.h"
+#include "nm-setting-connection.h"
+#include "nm-setting-dcb.h"
+#include "nm-setting-generic.h"
+#include "nm-setting-gsm.h"
+#include "nm-setting-infiniband.h"
+#include "nm-setting-ip4-config.h"
+#include "nm-setting-ip6-config.h"
+#include "nm-setting-olpc-mesh.h"
+#include "nm-setting-ppp.h"
+#include "nm-setting-pppoe.h"
+#include "nm-setting-serial.h"
+#include "nm-setting-vpn.h"
+#include "nm-setting-wimax.h"
+#include "nm-setting-wired.h"
+#include "nm-setting-adsl.h"
+#include "nm-setting-wireless.h"
+#include "nm-setting-wireless-security.h"
+#include "nm-setting-vlan.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c
index 7021e108..a4e01d8f 100644
--- a/libnm-util/nm-param-spec-specialized.c
+++ b/libnm-util/nm-param-spec-specialized.c
@@ -30,7 +30,6 @@ struct _NMParamSpecSpecialized {
 };
 
 #include 
-#include 
 #include 
 #include 
 
@@ -157,15 +156,19 @@ _gvalues_compare_fixed (const GValue *value1, const GValue *value2)
 	case G_TYPE_FLOAT: {
 		gfloat val1 = g_value_get_float (value1);
 		gfloat val2 = g_value_get_float (value2);
+		float diff = val1 - val2;
+
 		/* Can't use == or != here due to inexactness of FP */
-		if (fabsf (val1 - val2) > FLOAT_FACTOR)
+		if (diff > FLOAT_FACTOR || diff < -FLOAT_FACTOR)
 			ret = val1 < val2 ? -1 : val1 > val2;
 		break;
 	}
 	case G_TYPE_DOUBLE: {
 		gdouble val1 = g_value_get_double (value1);
 		gdouble val2 = g_value_get_double (value2);
-		if (fabs (val1 - val2) > FLOAT_FACTOR)
+		double diff = val1 - val2;
+
+		if (diff > FLOAT_FACTOR || diff < -FLOAT_FACTOR)
 			ret = val1 < val2 ? -1 : val1 > val2;
 		break;
 	}
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 03165bda..5cb19818 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -3560,7 +3560,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 	 * #NMSetting8021x:private-key-password property must be set to password
 	 * used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files
 	 * and the path scheme, this property should be set to the full UTF-8
-	 * encoded path of the key, prefixed with the string "file://" and and
+	 * encoded path of the key, prefixed with the string "file://" and
 	 * ending with a terminating NUL byte, and as with the blob scheme the
 	 * "private-key-password" property must be set to the password used to
 	 * decode the PKCS#12 private key and certificate.
@@ -3632,7 +3632,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 	 * password used to decrypt the PKCS#12 certificate and key. When using
 	 * PKCS#12 files and the path scheme, this property should be set to the
 	 * full UTF-8 encoded path of the key, prefixed with the string "file://"
-	 * and and ending with a terminating NUL byte, and as with the blob scheme
+	 * and ending with a terminating NUL byte, and as with the blob scheme
 	 * the #NMSetting8021x:phase2-private-key-password property must be set to
 	 * the password used to decode the PKCS#12 private key and certificate.
 	 *
diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h
index 62b43905..3de8f4c3 100644
--- a/libnm-util/nm-setting-8021x.h
+++ b/libnm-util/nm-setting-8021x.h
@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_8021X_H
 #define NM_SETTING_8021X_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-adsl.h b/libnm-util/nm-setting-adsl.h
index 82af6ebd..777f0b36 100644
--- a/libnm-util/nm-setting-adsl.h
+++ b/libnm-util/nm-setting-adsl.h
@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_ADSL_H
 #define NM_SETTING_ADSL_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-bond.h b/libnm-util/nm-setting-bond.h
index 172bb4cf..efef82c8 100644
--- a/libnm-util/nm-setting-bond.h
+++ b/libnm-util/nm-setting-bond.h
@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_BOND_H
 #define NM_SETTING_BOND_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-bridge-port.h b/libnm-util/nm-setting-bridge-port.h
index fcaf22ed..76527aef 100644
--- a/libnm-util/nm-setting-bridge-port.h
+++ b/libnm-util/nm-setting-bridge-port.h
@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_BRIDGE_PORT_H
 #define NM_SETTING_BRIDGE_PORT_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-bridge.h b/libnm-util/nm-setting-bridge.h
index f6b59262..bd741415 100644
--- a/libnm-util/nm-setting-bridge.h
+++ b/libnm-util/nm-setting-bridge.h
@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_BRIDGE_H
 #define NM_SETTING_BRIDGE_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-cdma.h b/libnm-util/nm-setting-cdma.h
index eee44205..e2c0376e 100644
--- a/libnm-util/nm-setting-cdma.h
+++ b/libnm-util/nm-setting-cdma.h
@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_CDMA_H
 #define NM_SETTING_CDMA_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c
index e6fe2fe4..28d5fca7 100644
--- a/libnm-util/nm-setting-connection.c
+++ b/libnm-util/nm-setting-connection.c
@@ -278,10 +278,10 @@ nm_setting_connection_get_connection_type (NMSettingConnection *setting)
  * nm_setting_connection_get_num_permissions:
  * @setting: the #NMSettingConnection
  *
- * Returns the number of entires in the #NMSettingConnection:permissions
+ * Returns the number of entries in the #NMSettingConnection:permissions
  * property of this setting.
  *
- * Returns: the number of permissions entires
+ * Returns: the number of permissions entries
  */
 guint32
 nm_setting_connection_get_num_permissions (NMSettingConnection *setting)
diff --git a/libnm-util/nm-setting-dcb.h b/libnm-util/nm-setting-dcb.h
index ac34521e..626f815d 100644
--- a/libnm-util/nm-setting-dcb.h
+++ b/libnm-util/nm-setting-dcb.h
@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_DCB_H
 #define NM_SETTING_DCB_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-generic.h b/libnm-util/nm-setting-generic.h
index 1cabae08..f3b07f69 100644
--- a/libnm-util/nm-setting-generic.h
+++ b/libnm-util/nm-setting-generic.h
@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_GENERIC_H
 #define NM_SETTING_GENERIC_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-gsm.h b/libnm-util/nm-setting-gsm.h
index 564a8b4b..438c6b3b 100644
--- a/libnm-util/nm-setting-gsm.h
+++ b/libnm-util/nm-setting-gsm.h
@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_GSM_H
 #define NM_SETTING_GSM_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-infiniband.h b/libnm-util/nm-setting-infiniband.h
index dff38450..95d343e9 100644
--- a/libnm-util/nm-setting-infiniband.h
+++ b/libnm-util/nm-setting-infiniband.h
@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_INFINIBAND_H
 #define NM_SETTING_INFINIBAND_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-olpc-mesh.h b/libnm-util/nm-setting-olpc-mesh.h
index 54b268e2..1764406e 100644
--- a/libnm-util/nm-setting-olpc-mesh.h
+++ b/libnm-util/nm-setting-olpc-mesh.h
@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_OLPC_MESH_H
 #define NM_SETTING_OLPC_MESH_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-ppp.h b/libnm-util/nm-setting-ppp.h
index 5733902b..52856463 100644
--- a/libnm-util/nm-setting-ppp.h
+++ b/libnm-util/nm-setting-ppp.h
@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_PPP_H
 #define NM_SETTING_PPP_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-pppoe.h b/libnm-util/nm-setting-pppoe.h
index 9d04af9e..9f8add4e 100644
--- a/libnm-util/nm-setting-pppoe.h
+++ b/libnm-util/nm-setting-pppoe.h
@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_PPPOE_H
 #define NM_SETTING_PPPOE_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-serial.h b/libnm-util/nm-setting-serial.h
index 44d46cf3..bca9abae 100644
--- a/libnm-util/nm-setting-serial.h
+++ b/libnm-util/nm-setting-serial.h
@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_SERIAL_H
 #define NM_SETTING_SERIAL_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-team-port.h b/libnm-util/nm-setting-team-port.h
index 4e802220..2da6518b 100644
--- a/libnm-util/nm-setting-team-port.h
+++ b/libnm-util/nm-setting-team-port.h
@@ -21,7 +21,7 @@
 #ifndef NM_SETTING_TEAM_PORT_H
 #define NM_SETTING_TEAM_PORT_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-team.h b/libnm-util/nm-setting-team.h
index d67c8c71..87aa7695 100644
--- a/libnm-util/nm-setting-team.h
+++ b/libnm-util/nm-setting-team.h
@@ -21,7 +21,7 @@
 #ifndef NM_SETTING_TEAM_H
 #define NM_SETTING_TEAM_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c
index 3437d697..3cddb3f9 100644
--- a/libnm-util/nm-setting-vlan.c
+++ b/libnm-util/nm-setting-vlan.c
@@ -286,7 +286,7 @@ nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
  * @setting: the #NMSettingVlan
  * @map: the type of priority map
  *
- * Returns the number of entires in the
+ * Returns the number of entries in the
  * #NMSettingVlan:ingress_priority_map or #NMSettingVlan:egress_priority_map
  * properties of this setting.
  *
@@ -499,7 +499,7 @@ nm_setting_vlan_remove_priority_str_by_value (NMSettingVlan *setting,
  * @setting: the #NMSettingVlan
  * @map: the type of priority map
  *
- * Clear all the entires from #NMSettingVlan:ingress_priority_map or
+ * Clear all the entries from #NMSettingVlan:ingress_priority_map or
  * #NMSettingVlan:egress_priority_map properties.
  */
 void
diff --git a/libnm-util/nm-setting-vpn.h b/libnm-util/nm-setting-vpn.h
index acce6e63..ba952f42 100644
--- a/libnm-util/nm-setting-vpn.h
+++ b/libnm-util/nm-setting-vpn.h
@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_VPN_H
 #define NM_SETTING_VPN_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-wimax.h b/libnm-util/nm-setting-wimax.h
index 9d7a07af..45e53352 100644
--- a/libnm-util/nm-setting-wimax.h
+++ b/libnm-util/nm-setting-wimax.h
@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_WIMAX_H
 #define NM_SETTING_WIMAX_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-wired.h b/libnm-util/nm-setting-wired.h
index 33d6d54d..08a39153 100644
--- a/libnm-util/nm-setting-wired.h
+++ b/libnm-util/nm-setting-wired.h
@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_WIRED_H
 #define NM_SETTING_WIRED_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c
index fd8eb976..22808fea 100644
--- a/libnm-util/nm-setting-wireless-security.c
+++ b/libnm-util/nm-setting-wireless-security.c
@@ -206,7 +206,7 @@ nm_setting_wireless_security_get_proto (NMSettingWirelessSecurity *setting, guin
  * by this connection only supports WPA2/RSN, the connection cannot be used
  * with the access point.
  *
- * Returns: %TRUE if the protocol was new and and was added to the allowed
+ * Returns: %TRUE if the protocol was new and was added to the allowed
  * protocol list, or %FALSE if it was already in the list
  **/
 gboolean
@@ -260,7 +260,7 @@ nm_setting_wireless_security_remove_proto (NMSettingWirelessSecurity *setting, g
  *
  * Removes a protocol from the allowed protocol list.
  *
- * Returns: %TRUE if the protocol was found and removed; %FALSE it it was not.
+ * Returns: %TRUE if the protocol was found and removed; %FALSE if it was not.
  *
  * Since: 0.9.10
  **/
@@ -408,7 +408,7 @@ nm_setting_wireless_security_remove_pairwise (NMSettingWirelessSecurity *setting
  * Removes an encryption algorithm from the allowed pairwise encryption
  * algorithm list.
  *
- * Returns: %TRUE if the encryption algorith was found and removed; %FALSE it it was not.
+ * Returns: %TRUE if the encryption algorith was found and removed; %FALSE if it was not.
  *
  * Since: 0.9.10
  **/
@@ -558,7 +558,7 @@ nm_setting_wireless_security_remove_group (NMSettingWirelessSecurity *setting, g
  * Removes an encryption algorithm from the allowed groupwise encryption
  * algorithm list.
  *
- * Returns: %TRUE if the algorithm was found and removed; %FALSE it it was not.
+ * Returns: %TRUE if the algorithm was found and removed; %FALSE if it was not.
  *
  * Since: 0.9.10
  **/
diff --git a/libnm-util/nm-setting-wireless-security.h b/libnm-util/nm-setting-wireless-security.h
index 97a456b0..1140582b 100644
--- a/libnm-util/nm-setting-wireless-security.h
+++ b/libnm-util/nm-setting-wireless-security.h
@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_WIRELESS_SECURITY_H
 #define NM_SETTING_WIRELESS_SECURITY_H
 
-#include 
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting-wireless.h b/libnm-util/nm-setting-wireless.h
index 77eff73e..5a64f0a0 100644
--- a/libnm-util/nm-setting-wireless.h
+++ b/libnm-util/nm-setting-wireless.h
@@ -23,9 +23,9 @@
 #ifndef NM_SETTING_WIRELESS_H
 #define NM_SETTING_WIRELESS_H
 
-#include 
-#include 
-#include 
+#include "NetworkManager.h"
+#include "nm-setting.h"
+#include "nm-setting-wireless-security.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h
index 28c6975a..ce5cf3f5 100644
--- a/libnm-util/nm-setting.h
+++ b/libnm-util/nm-setting.h
@@ -26,7 +26,7 @@
 #include 
 #include 
 
-#include 
+#include "nm-version.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h
index b8b32306..d4c66ea0 100644
--- a/libnm-util/nm-version.h
+++ b/libnm-util/nm-version.h
@@ -23,7 +23,7 @@
 
 #include 
 
-#include 
+#include "nm-version-macros.h"
 
 /* Deprecation / Availability macros */
 
@@ -118,4 +118,18 @@
 # define NM_AVAILABLE_IN_1_6
 #endif
 
+#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_8
+# define NM_DEPRECATED_IN_1_8           G_DEPRECATED
+# define NM_DEPRECATED_IN_1_8_FOR(f)    G_DEPRECATED_FOR(f)
+#else
+# define NM_DEPRECATED_IN_1_8
+# define NM_DEPRECATED_IN_1_8_FOR(f)
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_8
+# define NM_AVAILABLE_IN_1_8            G_UNAVAILABLE(1,8)
+#else
+# define NM_AVAILABLE_IN_1_8
+#endif
+
 #endif  /* NM_VERSION_H */
diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h
index d0dec1a0..97327f92 100644
--- a/libnm/NetworkManager.h
+++ b/libnm/NetworkManager.h
@@ -23,79 +23,82 @@
 
 #define __NETWORKMANAGER_H_INSIDE__
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include "nm-access-point.h"
+#include "nm-active-connection.h"
+#include "nm-client.h"
+#include "nm-connection.h"
+#include "nm-core-enum-types.h"
+#include "nm-dbus-interface.h"
+#include "nm-device-adsl.h"
+#include "nm-device-bond.h"
+#include "nm-device-bridge.h"
+#include "nm-device-bt.h"
+#include "nm-device-dummy.h"
+#include "nm-device-ethernet.h"
+#include "nm-device-generic.h"
+#include "nm-device-infiniband.h"
+#include "nm-device-ip-tunnel.h"
+#include "nm-device-macvlan.h"
+#include "nm-device-modem.h"
+#include "nm-device-olpc-mesh.h"
+#include "nm-device-team.h"
+#include "nm-device-tun.h"
+#include "nm-device-vlan.h"
+#include "nm-device-vxlan.h"
+#include "nm-device-wifi.h"
+#include "nm-device-wimax.h"
+#include "nm-device.h"
+#include "nm-dhcp-config.h"
+#include "nm-enum-types.h"
+#include "nm-ip-config.h"
+#include "nm-object.h"
+#include "nm-remote-connection.h"
+#include "nm-setting-8021x.h"
+#include "nm-setting-adsl.h"
+#include "nm-setting-bluetooth.h"
+#include "nm-setting-bond.h"
+#include "nm-setting-bridge.h"
+#include "nm-setting-bridge-port.h"
+#include "nm-setting-cdma.h"
+#include "nm-setting-connection.h"
+#include "nm-setting-dcb.h"
+#include "nm-setting-dummy.h"
+#include "nm-setting-generic.h"
+#include "nm-setting-gsm.h"
+#include "nm-setting-infiniband.h"
+#include "nm-setting-ip4-config.h"
+#include "nm-setting-ip6-config.h"
+#include "nm-setting-ip-config.h"
+#include "nm-setting-ip-tunnel.h"
+#include "nm-setting-macsec.h"
+#include "nm-setting-macvlan.h"
+#include "nm-setting-olpc-mesh.h"
+#include "nm-setting-ppp.h"
+#include "nm-setting-pppoe.h"
+#include "nm-setting-proxy.h"
+#include "nm-setting-serial.h"
+#include "nm-setting-team.h"
+#include "nm-setting-team-port.h"
+#include "nm-setting-tun.h"
+#include "nm-setting-user.h"
+#include "nm-setting-vlan.h"
+#include "nm-setting-vpn.h"
+#include "nm-setting-vxlan.h"
+#include "nm-setting-wimax.h"
+#include "nm-setting-wired.h"
+#include "nm-setting-wireless.h"
+#include "nm-setting-wireless-security.h"
+#include "nm-setting.h"
+#include "nm-simple-connection.h"
+#include "nm-utils.h"
+#include "nm-version.h"
+#include "nm-vpn-connection.h"
+#include "nm-vpn-dbus-interface.h"
+#include "nm-vpn-editor.h"
+#include "nm-vpn-editor-plugin.h"
+#include "nm-vpn-plugin-info.h"
+#include "nm-vpn-service-plugin.h"
+#include "nm-wimax-nsp.h"
 
 #undef __NETWORKMANAGER_H_INSIDE__
 
diff --git a/libnm/generate-setting-docs.py b/libnm/generate-setting-docs.py
index e1ea9723..d0625b01 100755
--- a/libnm/generate-setting-docs.py
+++ b/libnm/generate-setting-docs.py
@@ -112,7 +112,7 @@ def get_prop_type(setting, pspec, propxml):
 
     return prop_type
 
-def get_docs(setting, pspec, propxml):
+def get_docs(propxml):
     doc_xml = propxml.find('gi:doc', ns_map)
     if doc_xml is None:
         return None
@@ -162,6 +162,11 @@ def get_default_value(setting, pspec, propxml):
 
     return default_value
 
+def settings_sort_key(x):
+    x_prefix = x.attrib['{%s}symbol-prefix' % ns_map['c']]
+    # always sort NMSettingConnection first
+    return (x_prefix != "setting_connection", x_prefix);
+
 def escape(val):
     return str(val).replace('"', '"')
 
@@ -186,7 +191,7 @@ settings = girxml.findall('./gi:namespace/gi:class[@parent="Setting"]', ns_map)
 # Hack. Need a better way to do this
 ipxml = girxml.find('./gi:namespace/gi:class[@name="SettingIPConfig"]', ns_map)
 settings.extend(girxml.findall('./gi:namespace/gi:class[@parent="SettingIPConfig"]', ns_map))
-settings = sorted(settings, key=lambda setting: setting.attrib['{%s}symbol-prefix' % ns_map['c']])
+settings = sorted(settings, key=settings_sort_key)
 
 init_constants(girxml, settings)
 
@@ -207,7 +212,10 @@ for settingxml in settings:
     new_func = NM.__getattr__(settingxml.attrib['name'])
     setting = new_func()
 
-    outfile.write("  \n" % setting.props.name)
+    class_desc = get_docs(settingxml)
+    if class_desc is None:
+        raise Exception("%s needs a gtk-doc block with one-line description" % setting.props.name)
+    outfile.write("  \n" % (setting.props.name, class_desc))
 
     setting_properties = { prop.name: prop for prop in GObject.list_properties(setting) }
     if args.overrides is None:
@@ -231,7 +239,7 @@ for settingxml in settings:
                 propxml = ipxml.find('./gi:property[@name="%s"]' % pspec.name, ns_map)
 
             value_type = get_prop_type(setting, pspec, propxml)
-            value_desc = get_docs(setting, pspec, propxml)
+            value_desc = get_docs(propxml)
             default_value = get_default_value(setting, pspec, propxml)
 
         if prop in setting_overrides:
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index d0562e2c..b767bf83 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1143,3 +1143,37 @@ global:
 	nm_utils_version;
 	nm_utils_is_valid_iface_name;
 } libnm_1_4_0;
+
+libnm_1_8_0 {
+global:
+	nm_active_connection_state_reason_get_type;
+	nm_active_connection_get_state_reason;
+	nm_connection_get_setting_dummy;
+	nm_device_dummy_get_type;
+	nm_ip_route_get_variant_attribute_spec;
+	nm_ip_route_attribute_validate;
+	nm_setting_802_1x_auth_flags_get_type;
+	nm_setting_802_1x_get_auth_timeout;
+	nm_setting_802_1x_get_ca_cert_password;
+	nm_setting_802_1x_get_ca_cert_password_flags;
+	nm_setting_802_1x_get_client_cert_password;
+	nm_setting_802_1x_get_client_cert_password_flags;
+	nm_setting_802_1x_get_phase1_auth_flags;
+	nm_setting_802_1x_get_phase2_ca_cert_password;
+	nm_setting_802_1x_get_phase2_ca_cert_password_flags;
+	nm_setting_802_1x_get_phase2_client_cert_password;
+	nm_setting_802_1x_get_phase2_client_cert_password_flags;
+	nm_setting_cdma_get_mtu;
+	nm_setting_dummy_get_type;
+	nm_setting_dummy_new;
+	nm_setting_gsm_get_mtu;
+	nm_setting_user_check_key;
+	nm_setting_user_check_val;
+	nm_setting_user_get_data;
+	nm_setting_user_get_keys;
+	nm_setting_user_get_type;
+	nm_setting_user_new;
+	nm_setting_user_set_data;
+	nm_utils_format_variant_attributes;
+	nm_utils_parse_variant_attributes;
+} libnm_1_6_0;
diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index 60b8e33d..ed0135ba 100644
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -271,9 +271,11 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection)
 	guint32 ap_freq, setting_chan, ap_chan;
 
 	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
+	if (!s_con)
+		return FALSE;
+
 	ctype = nm_setting_connection_get_connection_type (s_con);
-	if (strcmp (ctype, NM_SETTING_WIRELESS_SETTING_NAME) != 0)
+	if (!ctype || !nm_streq (ctype, NM_SETTING_WIRELESS_SETTING_NAME))
 		return FALSE;
 
 	s_wifi = nm_connection_get_setting_wireless (connection);
@@ -282,25 +284,30 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection)
 
 	/* SSID checks */
 	ap_ssid = nm_access_point_get_ssid (ap);
-	g_warn_if_fail (ap_ssid != NULL);
-	setting_ssid = nm_setting_wireless_get_ssid (s_wifi);
-	if (!setting_ssid || !ap_ssid)
+	if (!ap_ssid)
 		return FALSE;
-	if (!g_bytes_equal (ap_ssid, setting_ssid))
+	setting_ssid = nm_setting_wireless_get_ssid (s_wifi);
+	if (   !setting_ssid
+	    || !g_bytes_equal (ap_ssid, setting_ssid))
 		return FALSE;
 
 	/* BSSID checks */
 	ap_bssid = nm_access_point_get_bssid (ap);
-	g_warn_if_fail (ap_bssid);
+	if (!ap_bssid)
+		return FALSE;
 	setting_bssid = nm_setting_wireless_get_bssid (s_wifi);
-	if (setting_bssid && ap_bssid) {
-		if (!nm_utils_hwaddr_matches (ap_bssid, -1, setting_bssid, -1))
+	if (setting_bssid) {
+		guint8 c[ETH_ALEN];
+
+		if (   !nm_utils_hwaddr_aton (ap_bssid, c, ETH_ALEN)
+		    || !nm_utils_hwaddr_matches (c, ETH_ALEN, setting_bssid, -1))
 			return FALSE;
 	}
 
 	/* Mode */
 	ap_mode = nm_access_point_get_mode (ap);
-	g_warn_if_fail (ap_mode != NM_802_11_MODE_UNKNOWN);
+	if (ap_mode == NM_802_11_MODE_UNKNOWN)
+		return FALSE;
 	setting_mode = nm_setting_wireless_get_mode (s_wifi);
 	if (setting_mode && ap_mode) {
 		if (!strcmp (setting_mode, "infrastructure") && (ap_mode != NM_802_11_MODE_INFRA))
diff --git a/libnm/nm-access-point.h b/libnm/nm-access-point.h
index 142ab295..177b6a9a 100644
--- a/libnm/nm-access-point.h
+++ b/libnm/nm-access-point.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-object.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c
index 6a823403..412cb3ba 100644
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -37,6 +37,8 @@
 #include "nm-ip6-config.h"
 #include "nm-remote-connection.h"
 
+#include "introspection/org.freedesktop.NetworkManager.Connection.Active.h"
+
 G_DEFINE_TYPE (NMActiveConnection, nm_active_connection, NM_TYPE_OBJECT);
 
 #define NM_ACTIVE_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnectionPrivate))
@@ -57,6 +59,7 @@ typedef struct {
 	NMDhcpConfig *dhcp6_config;
 	gboolean is_vpn;
 	NMDevice *master;
+	NMActiveConnectionStateReason reason;
 } NMActiveConnectionPrivate;
 
 enum {
@@ -80,6 +83,14 @@ enum {
 	LAST_PROP
 };
 
+enum {
+	STATE_CHANGED,
+
+	LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
 /**
  * nm_active_connection_get_connection:
  * @connection: a #NMActiveConnection
@@ -204,6 +215,24 @@ nm_active_connection_get_state (NMActiveConnection *connection)
 	return NM_ACTIVE_CONNECTION_GET_PRIVATE (connection)->state;
 }
 
+/**
+ * nm_active_connection_get_state_reason:
+ * @connection: a #NMActiveConnection
+ *
+ * Gets the reason for active connection's state.
+ *
+ * Returns: the reason
+ *
+ * Since: 1.8
+ **/
+NMActiveConnectionStateReason
+nm_active_connection_get_state_reason (NMActiveConnection *connection)
+{
+	g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (connection), NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN);
+
+	return NM_ACTIVE_CONNECTION_GET_PRIVATE (connection)->reason;
+}
+
 /**
  * nm_active_connection_get_default:
  * @connection: a #NMActiveConnection
@@ -350,10 +379,39 @@ nm_active_connection_init (NMActiveConnection *connection)
 	priv->devices = g_ptr_array_new ();
 }
 
+static void
+state_changed_proxy (NMDBusActiveConnectionProxy *proxy,
+                     NMActiveConnectionState state,
+                     NMActiveConnectionStateReason reason,
+                     gpointer user_data)
+{
+	NMActiveConnection *connection = NM_ACTIVE_CONNECTION (user_data);
+	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (connection);
+
+	priv->state = state;
+	priv->reason = reason;
+	g_signal_emit (connection, signals[STATE_CHANGED], 0, state, reason);
+	g_object_notify (G_OBJECT (connection), NM_ACTIVE_CONNECTION_STATE);
+}
+
+static void
+constructed (GObject *object)
+{
+	GDBusProxy *proxy;
+
+	proxy = _nm_object_get_proxy (NM_OBJECT (object), NM_DBUS_INTERFACE_ACTIVE_CONNECTION);
+	g_signal_connect (proxy, "state-changed",
+	                  G_CALLBACK (state_changed_proxy), object);
+	g_object_unref (proxy);
+
+	G_OBJECT_CLASS (nm_active_connection_parent_class)->constructed (object);
+}
+
 static void
 dispose (GObject *object)
 {
 	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (object);
+	GDBusProxy *proxy;
 
 	g_clear_pointer (&priv->devices, g_ptr_array_unref);
 
@@ -364,6 +422,12 @@ dispose (GObject *object)
 	g_clear_object (&priv->ip6_config);
 	g_clear_object (&priv->dhcp6_config);
 
+	proxy = _nm_object_get_proxy (NM_OBJECT (object), NM_DBUS_INTERFACE_ACTIVE_CONNECTION);
+	if (proxy) {
+		g_signal_handlers_disconnect_by_data (proxy, object);
+		g_object_unref (proxy);
+	}
+
 	G_OBJECT_CLASS (nm_active_connection_parent_class)->dispose (object);
 }
 
@@ -503,6 +567,7 @@ nm_active_connection_class_init (NMActiveConnectionClass *ap_class)
 
 	/* virtual methods */
 	object_class->get_property = get_property;
+	object_class->constructed = constructed;
 	object_class->dispose = dispose;
 	object_class->finalize = finalize;
 
@@ -693,4 +758,13 @@ nm_active_connection_class_init (NMActiveConnectionClass *ap_class)
 		                      NM_TYPE_DEVICE,
 		                      G_PARAM_READABLE |
 		                      G_PARAM_STATIC_STRINGS));
+
+	/* signals */
+	signals[STATE_CHANGED] =
+		g_signal_new ("state-changed",
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_FIRST,
+		              0, NULL, NULL, NULL,
+		              G_TYPE_NONE, 2,
+		              G_TYPE_UINT, G_TYPE_UINT);
 }
diff --git a/libnm/nm-active-connection.h b/libnm/nm-active-connection.h
index 13e50a06..23cd7372 100644
--- a/libnm/nm-active-connection.h
+++ b/libnm/nm-active-connection.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-object.h"
 
 G_BEGIN_DECLS
 
@@ -69,21 +69,23 @@ typedef struct {
 
 GType nm_active_connection_get_type (void);
 
-NMRemoteConnection      *nm_active_connection_get_connection           (NMActiveConnection *connection);
-const char              *nm_active_connection_get_id                   (NMActiveConnection *connection);
-const char              *nm_active_connection_get_uuid                 (NMActiveConnection *connection);
-const char              *nm_active_connection_get_connection_type      (NMActiveConnection *connection);
-const char              *nm_active_connection_get_specific_object_path (NMActiveConnection *connection);
-const GPtrArray         *nm_active_connection_get_devices              (NMActiveConnection *connection);
-NMActiveConnectionState  nm_active_connection_get_state                (NMActiveConnection *connection);
-NMDevice                *nm_active_connection_get_master               (NMActiveConnection *connection);
-gboolean                 nm_active_connection_get_default              (NMActiveConnection *connection);
-NMIPConfig              *nm_active_connection_get_ip4_config           (NMActiveConnection *connection);
-NMDhcpConfig            *nm_active_connection_get_dhcp4_config         (NMActiveConnection *connection);
-gboolean                 nm_active_connection_get_default6             (NMActiveConnection *connection);
-NMIPConfig              *nm_active_connection_get_ip6_config           (NMActiveConnection *connection);
-NMDhcpConfig            *nm_active_connection_get_dhcp6_config         (NMActiveConnection *connection);
-gboolean                 nm_active_connection_get_vpn                  (NMActiveConnection *connection);
+NMRemoteConnection            *nm_active_connection_get_connection           (NMActiveConnection *connection);
+const char                    *nm_active_connection_get_id                   (NMActiveConnection *connection);
+const char                    *nm_active_connection_get_uuid                 (NMActiveConnection *connection);
+const char                    *nm_active_connection_get_connection_type      (NMActiveConnection *connection);
+const char                    *nm_active_connection_get_specific_object_path (NMActiveConnection *connection);
+const GPtrArray               *nm_active_connection_get_devices              (NMActiveConnection *connection);
+NMActiveConnectionState        nm_active_connection_get_state                (NMActiveConnection *connection);
+NM_AVAILABLE_IN_1_8
+NMActiveConnectionStateReason  nm_active_connection_get_state_reason         (NMActiveConnection *connection);
+NMDevice                      *nm_active_connection_get_master               (NMActiveConnection *connection);
+gboolean                       nm_active_connection_get_default              (NMActiveConnection *connection);
+NMIPConfig                    *nm_active_connection_get_ip4_config           (NMActiveConnection *connection);
+NMDhcpConfig                  *nm_active_connection_get_dhcp4_config         (NMActiveConnection *connection);
+gboolean                       nm_active_connection_get_default6             (NMActiveConnection *connection);
+NMIPConfig                    *nm_active_connection_get_ip6_config           (NMActiveConnection *connection);
+NMDhcpConfig                  *nm_active_connection_get_dhcp6_config         (NMActiveConnection *connection);
+gboolean                       nm_active_connection_get_vpn                  (NMActiveConnection *connection);
 
 G_END_DECLS
 
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 63eaa84c..47f1548e 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -22,6 +22,7 @@
 #include "nm-default.h"
 
 #include 
+#include 
 
 #include "nm-utils.h"
 #include "nm-client.h"
@@ -45,6 +46,7 @@
 #include "introspection/org.freedesktop.NetworkManager.Settings.h"
 #include "introspection/org.freedesktop.NetworkManager.Settings.Connection.h"
 #include "introspection/org.freedesktop.NetworkManager.VPN.Connection.h"
+#include "introspection/org.freedesktop.NetworkManager.Connection.Active.h"
 
 #include "nm-access-point.h"
 #include "nm-active-connection.h"
@@ -52,6 +54,7 @@
 #include "nm-device-bond.h"
 #include "nm-device-bridge.h"
 #include "nm-device-bt.h"
+#include "nm-device-dummy.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-generic.h"
 #include "nm-device-infiniband.h"
@@ -94,6 +97,7 @@ typedef struct {
 	NMDnsManager *dns_manager;
 	GDBusObjectManager *object_manager;
 	GCancellable *new_object_manager_cancellable;
+	struct udev *udev;
 } NMClientPrivate;
 
 enum {
@@ -153,15 +157,7 @@ static const GPtrArray empty = { 0, };
  *
  * Returns: the error quark used for #NMClient errors.
  **/
-GQuark
-nm_client_error_quark (void)
-{
-	static GQuark quark;
-
-	if (G_UNLIKELY (!quark))
-		quark = g_quark_from_static_string ("nm-client-error-quark");
-	return quark;
-}
+NM_CACHED_QUARK_FCN ("nm-client-error-quark", nm_client_error_quark)
 
 /*****************************************************************************/
 
@@ -2015,6 +2011,8 @@ proxy_type (GDBusObjectManagerClient *manager,
 		return NMDBUS_TYPE_DNS_MANAGER_PROXY;
 	else if (strcmp (interface_name, NM_DBUS_INTERFACE_VPN_CONNECTION) == 0)
 		return NMDBUS_TYPE_VPN_CONNECTION_PROXY;
+	else if (strcmp (interface_name, NM_DBUS_INTERFACE_ACTIVE_CONNECTION) == 0)
+		return NMDBUS_TYPE_ACTIVE_CONNECTION_PROXY;
 
 	/* Use a generic D-Bus Proxy whenever we can. The typed GDBusProxy
 	 * subclasses actually use quite some memory, so they're better avoided. */
@@ -2022,8 +2020,9 @@ proxy_type (GDBusObjectManagerClient *manager,
 }
 
 static NMObject *
-obj_nm_for_gdbus_object (GDBusObject *object, GDBusObjectManager *object_manager)
+obj_nm_for_gdbus_object (NMClient *self, GDBusObject *object, GDBusObjectManager *object_manager)
 {
+	NMClientPrivate *priv;
 	GList *interfaces;
 	GList *l;
 	GType type = G_TYPE_INVALID;
@@ -2054,6 +2053,8 @@ obj_nm_for_gdbus_object (GDBusObject *object, GDBusObjectManager *object_manager
 			type = NM_TYPE_DEVICE_BRIDGE;
 		else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_BLUETOOTH) == 0)
 			type = NM_TYPE_DEVICE_BT;
+		else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_DUMMY) == 0)
+			type = NM_TYPE_DEVICE_DUMMY;
 		else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_WIRED) == 0)
 			type = NM_TYPE_DEVICE_ETHERNET;
 		else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_GENERIC) == 0)
@@ -2113,6 +2114,12 @@ obj_nm_for_gdbus_object (GDBusObject *object, GDBusObjectManager *object_manager
 	                       NM_OBJECT_DBUS_OBJECT, object,
 	                       NM_OBJECT_DBUS_OBJECT_MANAGER, object_manager,
 	                       NULL);
+	if (NM_IS_DEVICE (obj_nm)) {
+		priv = NM_CLIENT_GET_PRIVATE (self);
+		if (!priv->udev)
+			priv->udev = udev_new ();
+		_nm_device_set_udev (NM_DEVICE (obj_nm), priv->udev);
+	}
 	g_object_set_qdata_full (G_OBJECT (object), _nm_object_obj_nm_quark (),
 	                         obj_nm, g_object_unref);
 	return obj_nm;
@@ -2132,9 +2139,10 @@ obj_nm_inited (GObject *object, GAsyncResult *result, gpointer user_data)
 static void
 object_added (GDBusObjectManager *object_manager, GDBusObject *object, gpointer user_data)
 {
+	NMClient *client = user_data;
 	NMObject *obj_nm;
 
-	obj_nm = obj_nm_for_gdbus_object (object, object_manager);
+	obj_nm = obj_nm_for_gdbus_object (client, object, object_manager);
 	if (obj_nm) {
 		g_async_initable_init_async (G_ASYNC_INITABLE (obj_nm),
 		                             G_PRIORITY_DEFAULT, NULL,
@@ -2161,7 +2169,7 @@ objects_created (NMClient *client, GDBusObjectManager *object_manager, GError **
 	/* First just ensure all the NMObjects for known GDBusObjects exist. */
 	objects = g_dbus_object_manager_get_objects (object_manager);
 	for (iter = objects; iter; iter = iter->next)
-		obj_nm_for_gdbus_object (iter->data, object_manager);
+		obj_nm_for_gdbus_object (client, iter->data, object_manager);
 	g_list_free_full (objects, g_object_unref);
 
 	manager = g_dbus_object_manager_get_object (object_manager, NM_DBUS_PATH);
@@ -2530,10 +2538,7 @@ dispose (GObject *object)
 {
 	NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (object);
 
-	if (priv->new_object_manager_cancellable) {
-		g_cancellable_cancel (priv->new_object_manager_cancellable);
-		g_clear_object (&priv->new_object_manager_cancellable);
-	}
+	nm_clear_g_cancellable (&priv->new_object_manager_cancellable);
 
 	if (priv->manager) {
 		g_signal_handlers_disconnect_by_data (priv->manager, object);
@@ -2564,6 +2569,11 @@ dispose (GObject *object)
 	}
 
 	G_OBJECT_CLASS (nm_client_parent_class)->dispose (object);
+
+	if (priv->udev) {
+		udev_unref (priv->udev);
+		priv->udev = NULL;
+	}
 }
 
 static void
diff --git a/libnm/nm-client.h b/libnm/nm-client.h
index 65e0bac8..5da16490 100644
--- a/libnm/nm-client.h
+++ b/libnm/nm-client.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-adsl.h b/libnm/nm-device-adsl.h
index 113d25b1..0c922299 100644
--- a/libnm/nm-device-adsl.h
+++ b/libnm/nm-device-adsl.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-bond.h b/libnm/nm-device-bond.h
index 67f64280..da666b6e 100644
--- a/libnm/nm-device-bond.h
+++ b/libnm/nm-device-bond.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-bridge.h b/libnm/nm-device-bridge.h
index df0cb303..b860da7c 100644
--- a/libnm/nm-device-bridge.h
+++ b/libnm/nm-device-bridge.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-bt.h b/libnm/nm-device-bt.h
index 773cb148..8d6da684 100644
--- a/libnm/nm-device-bt.h
+++ b/libnm/nm-device-bt.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-dummy.c b/libnm/nm-device-dummy.c
new file mode 100644
index 00000000..f5910dc8
--- /dev/null
+++ b/libnm/nm-device-dummy.c
@@ -0,0 +1,80 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2017 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include 
+
+#include "nm-device-dummy.h"
+#include "nm-object-private.h"
+#include "nm-setting-dummy.h"
+#include "nm-setting-connection.h"
+
+G_DEFINE_TYPE (NMDeviceDummy, nm_device_dummy, NM_TYPE_DEVICE)
+
+#define NM_DEVICE_DUMMY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_DUMMY, NMDeviceDummyPrivate))
+
+/*****************************************************************************/
+
+static gboolean
+connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
+{
+	const char *iface_name;
+
+	if (!NM_DEVICE_CLASS (nm_device_dummy_parent_class)->connection_compatible (device, connection, error))
+		return FALSE;
+
+	if (!nm_connection_is_type (connection, NM_SETTING_DUMMY_SETTING_NAME)) {
+		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
+		                     _("The connection was not a dummy connection."));
+		return FALSE;
+	}
+
+	iface_name = nm_connection_get_interface_name (connection);
+	if (!iface_name) {
+		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INVALID_CONNECTION,
+		                     _("The connection did not specify an interface name."));
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static GType
+get_setting_type (NMDevice *device)
+{
+	return NM_TYPE_SETTING_DUMMY;
+}
+
+/*****************************************************************************/
+
+static void
+nm_device_dummy_init (NMDeviceDummy *device)
+{
+}
+
+static void
+nm_device_dummy_class_init (NMDeviceDummyClass *klass)
+{
+	NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
+
+	device_class->connection_compatible = connection_compatible;
+	device_class->get_setting_type = get_setting_type;
+}
diff --git a/libnm/nm-device-dummy.h b/libnm/nm-device-dummy.h
new file mode 100644
index 00000000..85ee2bab
--- /dev/null
+++ b/libnm/nm-device-dummy.h
@@ -0,0 +1,57 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2017 Red Hat, Inc.
+ */
+
+#ifndef __NM_DEVICE_DUMMY_H__
+#define __NM_DEVICE_DUMMY_H__
+
+#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
+#error "Only  can be included directly."
+#endif
+
+#include "nm-device.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_DEVICE_DUMMY            (nm_device_dummy_get_type ())
+#define NM_DEVICE_DUMMY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_DUMMY, NMDeviceDummy))
+#define NM_DEVICE_DUMMY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_DUMMY, NMDeviceDummyClass))
+#define NM_IS_DEVICE_DUMMY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_DUMMY))
+#define NM_IS_DEVICE_DUMMY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_DUMMY))
+#define NM_DEVICE_DUMMY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_DUMMY, NMDeviceDummyClass))
+
+/**
+ * NMDeviceDummy:
+ */
+struct _NMDeviceDummy {
+	NMDevice parent;
+};
+
+typedef struct {
+	NMDeviceClass parent;
+
+	/*< private >*/
+	gpointer padding[4];
+} NMDeviceDummyClass;
+
+GType nm_device_dummy_get_type (void);
+
+G_END_DECLS
+
+#endif /* __NM_DEVICE_DUMMY_H__ */
diff --git a/libnm/nm-device-ethernet.h b/libnm/nm-device-ethernet.h
index 76f4fde1..86231781 100644
--- a/libnm/nm-device-ethernet.h
+++ b/libnm/nm-device-ethernet.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-generic.h b/libnm/nm-device-generic.h
index 2a4a1160..c37c9495 100644
--- a/libnm/nm-device-generic.h
+++ b/libnm/nm-device-generic.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-infiniband.h b/libnm/nm-device-infiniband.h
index 1f4ea217..38c81d9e 100644
--- a/libnm/nm-device-infiniband.h
+++ b/libnm/nm-device-infiniband.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-ip-tunnel.h b/libnm/nm-device-ip-tunnel.h
index 14251849..6d748d96 100644
--- a/libnm/nm-device-ip-tunnel.h
+++ b/libnm/nm-device-ip-tunnel.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-macsec.h b/libnm/nm-device-macsec.h
index d6d7c0ef..60f7d7f0 100644
--- a/libnm/nm-device-macsec.h
+++ b/libnm/nm-device-macsec.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-macvlan.h b/libnm/nm-device-macvlan.h
index aec280bd..5ccdbd2c 100644
--- a/libnm/nm-device-macvlan.h
+++ b/libnm/nm-device-macvlan.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-modem.h b/libnm/nm-device-modem.h
index fdf5c41f..a5af0346 100644
--- a/libnm/nm-device-modem.h
+++ b/libnm/nm-device-modem.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-olpc-mesh.h b/libnm/nm-device-olpc-mesh.h
index fc88beb9..5089bfd1 100644
--- a/libnm/nm-device-olpc-mesh.h
+++ b/libnm/nm-device-olpc-mesh.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-team.h b/libnm/nm-device-team.h
index 522e3d29..deecf072 100644
--- a/libnm/nm-device-team.h
+++ b/libnm/nm-device-team.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-tun.h b/libnm/nm-device-tun.h
index 71649f8f..2fea4544 100644
--- a/libnm/nm-device-tun.h
+++ b/libnm/nm-device-tun.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-vlan.h b/libnm/nm-device-vlan.h
index 1ee03bd5..158a89aa 100644
--- a/libnm/nm-device-vlan.h
+++ b/libnm/nm-device-vlan.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-vxlan.h b/libnm/nm-device-vxlan.h
index 70c7ed51..bd84f6f0 100644
--- a/libnm/nm-device-vxlan.h
+++ b/libnm/nm-device-vxlan.h
@@ -25,7 +25,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-wifi.h b/libnm/nm-device-wifi.h
index ee0238df..8cfea1f3 100644
--- a/libnm/nm-device-wifi.h
+++ b/libnm/nm-device-wifi.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device-wimax.h b/libnm/nm-device-wimax.h
index 424779bd..cc3fc6e1 100644
--- a/libnm/nm-device-wimax.h
+++ b/libnm/nm-device-wimax.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 02b5cad5..9cbdbd00 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -24,7 +24,7 @@
 #include "nm-device.h"
 
 #include 
-#include 
+#include 
 
 #include "nm-dbus-interface.h"
 #include "nm-active-connection.h"
@@ -40,6 +40,7 @@
 #include "nm-dbus-helpers.h"
 #include "nm-device-tun.h"
 #include "nm-setting-connection.h"
+#include "shared/nm-utils/nm-udev-utils.h"
 
 #include "introspection/org.freedesktop.NetworkManager.Device.h"
 
@@ -79,7 +80,7 @@ typedef struct {
 	NMActiveConnection *active_connection;
 	GPtrArray *available_connections;
 
-	GUdevClient *client;
+	struct udev *udev;
 	char *product, *short_product;
 	char *vendor, *short_vendor;
 	char *description, *bus_name;
@@ -277,6 +278,7 @@ coerce_type (NMDeviceType type)
 	case NM_DEVICE_TYPE_UNUSED1:
 	case NM_DEVICE_TYPE_UNUSED2:
 	case NM_DEVICE_TYPE_UNKNOWN:
+	case NM_DEVICE_TYPE_DUMMY:
 		return type;
 	}
 	return NM_DEVICE_TYPE_UNKNOWN;
@@ -291,12 +293,16 @@ dispose (GObject *object)
 	g_clear_object (&priv->dhcp4_config);
 	g_clear_object (&priv->ip6_config);
 	g_clear_object (&priv->dhcp6_config);
-	g_clear_object (&priv->client);
 	g_clear_object (&priv->active_connection);
 
+	udev_unref (priv->udev);
+	priv->udev = NULL;
+
 	g_clear_pointer (&priv->available_connections, g_ptr_array_unref);
 	g_clear_pointer (&priv->lldp_neighbors, g_ptr_array_unref);
 
+	if (priv->proxy)
+		g_signal_handlers_disconnect_by_func (priv->proxy, device_state_reason_changed, object);
 	g_clear_object (&priv->proxy);
 
 	G_OBJECT_CLASS (nm_device_parent_class)->dispose (object);
@@ -1287,56 +1293,19 @@ nm_device_get_available_connections (NMDevice *device)
 	return NM_DEVICE_GET_PRIVATE (device)->available_connections;
 }
 
-static inline guint8
-hex2byte (const char *hex)
-{
-	int a, b;
-	a = g_ascii_xdigit_value (*hex++);
-	if (a < 0)
-		return -1;
-	b = g_ascii_xdigit_value (*hex++);
-	if (b < 0)
-		return -1;
-	return (a << 4) | b;
-}
-
-static char *
-get_decoded_property (GUdevDevice *device, const char *property)
+void
+_nm_device_set_udev (NMDevice *device, struct udev *udev)
 {
-	const char *orig, *p;
-	char *unescaped, *n;
-	guint len;
-
-	p = orig = g_udev_device_get_property (device, property);
-	if (!orig)
-		return NULL;
-
-	len = strlen (orig);
-	n = unescaped = g_malloc0 (len + 1);
-	while (*p) {
-		if ((len >= 4) && (*p == '\\') && (*(p+1) == 'x')) {
-			*n++ = (char) hex2byte (p + 2);
-			p += 4;
-			len -= 4;
-		} else {
-			*n++ = *p++;
-			len--;
-		}
-	}
+	NMDevicePrivate *priv;
 
-	return unescaped;
-}
+	nm_assert (NM_IS_DEVICE (device));
+	nm_assert (udev);
 
-static gboolean
-ensure_udev_client (NMDevice *device)
-{
-	static const char *const subsys[3] = { "net", "tty", NULL };
-	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
+	priv = NM_DEVICE_GET_PRIVATE (device);
 
-	if (!priv->client)
-		priv->client = g_udev_client_new (subsys);
+	nm_assert (!priv->udev);
 
-	return priv->client != NULL;
+	priv->udev = udev_ref (udev);
 }
 
 static char *
@@ -1345,51 +1314,37 @@ _get_udev_property (NMDevice *device,
                     const char *db_prop)   /* ID_XXX_FROM_DATABASE */
 {
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
-	GUdevDevice *udev_device = NULL, *tmpdev, *olddev;
+	struct udev_device *udev_device, *tmpdev;
 	const char *ifname;
 	guint32 count = 0;
 	char *enc_value = NULL, *db_value = NULL;
 
-	if (!ensure_udev_client (device))
+	if (!priv->udev)
 		return NULL;
 
 	ifname = nm_device_get_iface (device);
 	if (!ifname)
 		return NULL;
 
-	udev_device = g_udev_client_query_by_subsystem_and_name (priv->client, "net", ifname);
-	if (!udev_device)
-		udev_device = g_udev_client_query_by_subsystem_and_name (priv->client, "tty", ifname);
-	if (!udev_device)
-		return NULL;
-
+	udev_device = udev_device_new_from_subsystem_sysname (priv->udev, "net", ifname);
+	if (!udev_device) {
+		udev_device = udev_device_new_from_subsystem_sysname (priv->udev, "tty", ifname);
+		if (!udev_device)
+			return NULL;
+	}
 	/* Walk up the chain of the device and its parents a few steps to grab
 	 * vendor and device ID information off it.
 	 */
-
-	/* Ref the device again because we have to unref it each iteration,
-	 * as g_udev_device_get_parent() returns a ref-ed object.
-	 */
-	tmpdev = g_object_ref (udev_device);
+	tmpdev = udev_device;
 	while ((count++ < 3) && tmpdev && !enc_value) {
 		if (!enc_value)
-			enc_value = get_decoded_property (tmpdev, enc_prop);
+			enc_value = nm_udev_utils_property_decode_cp (udev_device_get_property_value (tmpdev, enc_prop));
 		if (!db_value)
-			db_value = g_strdup (g_udev_device_get_property (tmpdev, db_prop));
+			db_value = g_strdup (udev_device_get_property_value (tmpdev, db_prop));
 
-		olddev = tmpdev;
-		tmpdev = g_udev_device_get_parent (tmpdev);
-		g_object_unref (olddev);
+		tmpdev = udev_device_get_parent (tmpdev);
 	}
-
-	/* Unref the last device if we found what we needed before running out
-	 * of parents.
-	 */
-	if (tmpdev)
-		g_object_unref (tmpdev);
-
-	/* Balance the initial g_udev_client_query_by_subsystem_and_name() */
-	g_object_unref (udev_device);
+	udev_device_unref (udev_device);
 
 	/* Prefer the encoded value which comes directly from the device
 	 * over the hwdata database value.
@@ -1694,6 +1649,8 @@ get_type_name (NMDevice *device)
 		return _("Veth");
 	case NM_DEVICE_TYPE_MACSEC:
 		return _("MACsec");
+	case NM_DEVICE_TYPE_DUMMY:
+		return _("Dummy");
 	case NM_DEVICE_TYPE_GENERIC:
 	case NM_DEVICE_TYPE_UNUSED1:
 	case NM_DEVICE_TYPE_UNUSED2:
@@ -1735,26 +1692,26 @@ static const char *
 get_bus_name (NMDevice *device)
 {
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
-	GUdevDevice *udevice;
+	struct udev_device *udevice;
 	const char *ifname, *bus;
 
 	if (priv->bus_name)
 		goto out;
 
-	if (!ensure_udev_client (device))
+	if (!priv->udev)
 		return NULL;
 
 	ifname = nm_device_get_iface (device);
 	if (!ifname)
 		return NULL;
 
-	udevice = g_udev_client_query_by_subsystem_and_name (priv->client, "net", ifname);
-	if (!udevice)
-		udevice = g_udev_client_query_by_subsystem_and_name (priv->client, "tty", ifname);
-	if (!udevice)
-		return NULL;
-
-	bus = g_udev_device_get_property (udevice, "ID_BUS");
+	udevice = udev_device_new_from_subsystem_sysname (priv->udev, "net", ifname);
+	if (!udevice) {
+		udevice = udev_device_new_from_subsystem_sysname (priv->udev, "tty", ifname);
+		if (!udevice)
+			return NULL;
+	}
+	bus = udev_device_get_property_value (udevice, "ID_BUS");
 	if (!g_strcmp0 (bus, "pci"))
 		priv->bus_name = g_strdup (_("PCI"));
 	else if (!g_strcmp0 (bus, "usb"))
@@ -1765,6 +1722,7 @@ get_bus_name (NMDevice *device)
 		 */
 		priv->bus_name = g_strdup ("");
 	}
+	udev_device_unref (udevice);
 
 out:
 	if (*priv->bus_name)
diff --git a/libnm/nm-device.h b/libnm/nm-device.h
index 5ffeb42e..91f31b87 100644
--- a/libnm/nm-device.h
+++ b/libnm/nm-device.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-object.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-dhcp-config.h b/libnm/nm-dhcp-config.h
index be32992f..ef64048a 100644
--- a/libnm/nm-dhcp-config.h
+++ b/libnm/nm-dhcp-config.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-object.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-dhcp4-config.h b/libnm/nm-dhcp4-config.h
index 4978f848..2cbbdc9e 100644
--- a/libnm/nm-dhcp4-config.h
+++ b/libnm/nm-dhcp4-config.h
@@ -21,7 +21,7 @@
 #ifndef __NM_DHCP4_CONFIG_H__
 #define __NM_DHCP4_CONFIG_H__
 
-#include 
+#include "nm-dhcp-config.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-dhcp6-config.h b/libnm/nm-dhcp6-config.h
index b7c7c822..2d6568e1 100644
--- a/libnm/nm-dhcp6-config.h
+++ b/libnm/nm-dhcp6-config.h
@@ -21,7 +21,7 @@
 #ifndef __NM_DHCP6_CONFIG_H__
 #define __NM_DHCP6_CONFIG_H__
 
-#include 
+#include "nm-dhcp-config.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-dns-manager.h b/libnm/nm-dns-manager.h
index 9ed3dfbe..63989451 100644
--- a/libnm/nm-dns-manager.h
+++ b/libnm/nm-dns-manager.h
@@ -21,7 +21,7 @@
 #ifndef __NM_DNS_MANAGER_H__
 #define __NM_DNS_MANAGER_H__
 
-#include 
+#include "nm-object.h"
 #include "nm-client.h"
 
 G_BEGIN_DECLS
diff --git a/libnm/nm-ip-config.h b/libnm/nm-ip-config.h
index 38d5b454..c407c7fe 100644
--- a/libnm/nm-ip-config.h
+++ b/libnm/nm-ip-config.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-object.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-ip4-config.h b/libnm/nm-ip4-config.h
index 196fe09a..d99b2113 100644
--- a/libnm/nm-ip4-config.h
+++ b/libnm/nm-ip4-config.h
@@ -22,7 +22,7 @@
 #ifndef __NM_IP4_CONFIG_H__
 #define __NM_IP4_CONFIG_H__
 
-#include 
+#include "nm-ip-config.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-ip6-config.h b/libnm/nm-ip6-config.h
index fa67517c..12e723b2 100644
--- a/libnm/nm-ip6-config.h
+++ b/libnm/nm-ip6-config.h
@@ -22,7 +22,7 @@
 #ifndef __NM_IP6_CONFIG_H__
 #define __NM_IP6_CONFIG_H__
 
-#include 
+#include "nm-ip-config.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index 1b453bd9..d3df7337 100644
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -1026,8 +1026,8 @@ device_ac_changed (GObject *object, GParamSpec *pspec, gpointer user_data)
 static void
 device_added (NMManager *self, NMDevice *device)
 {
-	g_signal_connect (device, "notify::" NM_DEVICE_ACTIVE_CONNECTION,
-	                  G_CALLBACK (device_ac_changed), self);
+	g_signal_connect_object (device, "notify::" NM_DEVICE_ACTIVE_CONNECTION,
+	                         G_CALLBACK (device_ac_changed), self, 0);
 }
 
 static void
@@ -1047,8 +1047,8 @@ ac_devices_changed (GObject *object, GParamSpec *pspec, gpointer user_data)
 static void
 active_connection_added (NMManager *self, NMActiveConnection *ac)
 {
-	g_signal_connect (ac, "notify::" NM_ACTIVE_CONNECTION_DEVICES,
-	                  G_CALLBACK (ac_devices_changed), self);
+	g_signal_connect_object (ac, "notify::" NM_ACTIVE_CONNECTION_DEVICES,
+	                         G_CALLBACK (ac_devices_changed), self, 0);
 	recheck_pending_activations (self);
 }
 
@@ -1274,11 +1274,7 @@ dispose (GObject *object)
 	NMManager *manager = NM_MANAGER (object);
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (object);
 
-	if (priv->perm_call_cancellable) {
-		g_cancellable_cancel (priv->perm_call_cancellable);
-		g_clear_object (&priv->perm_call_cancellable);
-	}
-
+	nm_clear_g_cancellable (&priv->perm_call_cancellable);
 
 	if (priv->devices) {
 		g_ptr_array_unref (priv->devices);
diff --git a/libnm/nm-manager.h b/libnm/nm-manager.h
index 362b5f2f..7c63a333 100644
--- a/libnm/nm-manager.h
+++ b/libnm/nm-manager.h
@@ -22,8 +22,8 @@
 #ifndef __NM_MANAGER_H__
 #define __NM_MANAGER_H__
 
-#include 
-#include 
+#include "nm-object.h"
+#include "nm-client.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-object-private.h b/libnm/nm-object-private.h
index 63c4142d..8c2f3a9c 100644
--- a/libnm/nm-object-private.h
+++ b/libnm/nm-object-private.h
@@ -56,4 +56,7 @@ void _nm_object_set_property (NMObject *object,
 GDBusProxy *_nm_object_get_proxy (NMObject   *object,
                                   const char *interface);
 
+struct udev;
+void _nm_device_set_udev (NMDevice *device, struct udev *udev);
+
 #endif /* __NM_OBJECT_PRIVATE_H__ */
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index 6a47c659..95346e06 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -37,7 +37,7 @@
 static gboolean debug = FALSE;
 #define dbgmsg(f,...) if (G_UNLIKELY (debug)) { g_message (f, ## __VA_ARGS__ ); }
 
-G_DEFINE_QUARK (nm-obj-nm, _nm_object_obj_nm);
+NM_CACHED_QUARK_FCN ("nm-obj-nm", _nm_object_obj_nm_quark)
 
 static void nm_object_initable_iface_init (GInitableIface *iface);
 static void nm_object_async_initable_iface_init (GAsyncInitableIface *iface);
@@ -85,6 +85,7 @@ typedef struct {
 	GError *reload_error;
 
 	GSList *pending;        /* ordered list of pending property updates. */
+	GPtrArray *proxies;
 } NMObjectPrivate;
 
 enum {
@@ -128,11 +129,16 @@ GDBusProxy *
 _nm_object_get_proxy (NMObject   *object,
                       const char *interface)
 {
+	NMObjectPrivate *priv;
 	GDBusInterface *proxy;
 
 	g_return_val_if_fail (NM_IS_OBJECT (object), NULL);
 
-	proxy = g_dbus_object_get_interface (NM_OBJECT_GET_PRIVATE (object)->object, interface);
+	priv = NM_OBJECT_GET_PRIVATE (object);
+	if (priv->object == NULL)
+		return NULL;
+
+	proxy = g_dbus_object_get_interface (priv->object, interface);
 	g_return_val_if_fail (proxy != NULL, NULL);
 
 	return G_DBUS_PROXY (proxy);
@@ -939,7 +945,7 @@ _nm_object_register_properties (NMObject *object,
 	proxy = _nm_object_get_proxy (object, interface);
 	g_signal_connect (proxy, "g-properties-changed",
 		          G_CALLBACK (properties_changed), object);
-	g_object_unref (proxy);
+	g_ptr_array_add (priv->proxies, proxy);
 
 	instance = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 	priv->property_tables = g_slist_prepend (priv->property_tables, instance);
@@ -1053,7 +1059,7 @@ init_if (GDBusInterface *interface, gpointer user_data)
 
 	props = g_dbus_proxy_get_cached_property_names (proxy);
 
-	for (prop = props; *prop; prop++) {
+	for (prop = props; prop && *prop; prop++) {
 		val = g_dbus_proxy_get_cached_property (proxy, *prop);
 		str = g_variant_print (val, TRUE);
 		handle_property_changed (self, *prop, val);
@@ -1188,6 +1194,7 @@ nm_object_async_initable_iface_init (GAsyncInitableIface *iface)
 static void
 nm_object_init (NMObject *object)
 {
+	NM_OBJECT_GET_PRIVATE (object)->proxies = g_ptr_array_new ();
 }
 
 static void
@@ -1198,11 +1205,13 @@ set_property (GObject *object, guint prop_id,
 
 	switch (prop_id) {
 	case PROP_DBUS_OBJECT:
-		/* Construct only */
+		/* construct-only */
 		priv->object = g_value_dup_object (value);
+		if (!priv->object)
+			g_return_if_reached ();
 		break;
 	case PROP_DBUS_OBJECT_MANAGER:
-		/* Construct only */
+		/* construct-only */
 		priv->object_manager = g_value_dup_object (value);
 		break;
 	default:
@@ -1240,6 +1249,7 @@ static void
 dispose (GObject *object)
 {
 	NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object);
+	guint i;
 
 	nm_clear_g_source (&priv->notify_id);
 
@@ -1251,6 +1261,17 @@ dispose (GObject *object)
 	g_clear_object (&priv->object);
 	g_clear_object (&priv->object_manager);
 
+	if (priv->proxies) {
+		for (i = 0; i < priv->proxies->len; i++) {
+			g_signal_handlers_disconnect_by_func (priv->proxies->pdata[i],
+			                                      properties_changed,
+			                                      object);
+			g_object_unref (priv->proxies->pdata[i]);
+		}
+		g_ptr_array_free (priv->proxies, TRUE);
+		priv->proxies = NULL;
+	}
+
 	G_OBJECT_CLASS (nm_object_parent_class)->dispose (object);
 }
 
diff --git a/libnm/nm-object.h b/libnm/nm-object.h
index bcf47ba6..5b4580eb 100644
--- a/libnm/nm-object.h
+++ b/libnm/nm-object.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml
index 9d58df94..7754187d 100644
--- a/libnm/nm-property-docs.xml
+++ b/libnm/nm-property-docs.xml
@@ -3,12 +3,39 @@
 
 ]>
 
-  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
     
     
+    
     
+    
+    
     
     
+    
+    
     
     
     
@@ -18,6 +45,7 @@
     
     
     
+    
     
     
     
@@ -25,22 +53,26 @@
     
     
     
+    
+    
     
     
+    
+    
     
-    
+    
     
     
     
     
     
-    
+    
     
     
     
     
   
-  
+  
     
     
     
@@ -50,16 +82,16 @@
     
     
   
-  
+  
     
     
     
   
-  
+  
     
     
   
-  
+  
     
     
     
@@ -70,42 +102,21 @@
     
     
   
-  
+  
     
     
     
     
   
-  
+  
+    
     
     
     
     
     
   
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
+  
     
     
     
@@ -123,13 +134,17 @@
     
     
   
-  
+  
+    
+  
+  
     
   
-  
+  
     
     
     
+    
     
     
     
@@ -141,7 +156,7 @@
     
     
   
-  
+  
     
     
     
@@ -149,7 +164,7 @@
     
     
   
-  
+  
     
     
     
@@ -171,7 +186,7 @@
     
     
   
-  
+  
     
     
     
@@ -194,7 +209,7 @@
     
     
   
-  
+  
     
     
     
@@ -209,7 +224,7 @@
     
     
   
-  
+  
     
     
     
@@ -220,20 +235,20 @@
     
     
   
-  
+  
     
     
     
     
     
   
-  
+  
     
     
     
     
   
-  
+  
     
     
     
@@ -254,21 +269,21 @@
     
     
   
-  
+  
     
     
     
     
     
   
-  
+  
     
     
     
     
     
   
-  
+  
     
     
     
@@ -276,15 +291,15 @@
     
     
   
-  
+  
     
     
   
-  
+  
     
     
   
-  
+  
     
     
     
@@ -293,7 +308,11 @@
     
     
   
-  
+  
+    
+    
+  
+  
     
     
     
@@ -301,7 +320,7 @@
     
     
   
-  
+  
     
     
     
@@ -310,7 +329,7 @@
     
     
   
-  
+  
     
     
     
@@ -329,12 +348,12 @@
     
     
   
-  
+  
     
     
     
   
-  
+  
     
     
     
@@ -351,7 +370,7 @@
     
     
   
-  
+  
     
     
     
@@ -370,7 +389,7 @@
     
     
   
-  
+  
     
     
     
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index fe78f7b8..0f7ea58e 100644
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -763,6 +763,8 @@ get_property (GObject *object, guint prop_id,
 static void
 constructed (GObject *object)
 {
+	G_OBJECT_CLASS (nm_remote_connection_parent_class)->constructed (object);
+
 	nm_connection_set_path (NM_CONNECTION (object),
 	                        nm_object_get_path (NM_OBJECT (object)));
 }
diff --git a/libnm/nm-remote-connection.h b/libnm/nm-remote-connection.h
index a7235755..c04ae367 100644
--- a/libnm/nm-remote-connection.h
+++ b/libnm/nm-remote-connection.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-object.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-remote-settings.h b/libnm/nm-remote-settings.h
index f8eddc5b..06d3ac0a 100644
--- a/libnm/nm-remote-settings.h
+++ b/libnm/nm-remote-settings.h
@@ -22,7 +22,7 @@
 #ifndef __NM_REMOTE_SETTINGS_H__
 #define __NM_REMOTE_SETTINGS_H__
 
-#include 
+#include "nm-object.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-secret-agent-old.h b/libnm/nm-secret-agent-old.h
index 476cc2a2..4f6665d1 100644
--- a/libnm/nm-secret-agent-old.h
+++ b/libnm/nm-secret-agent-old.h
@@ -21,7 +21,7 @@
 #ifndef __NM_SECRET_AGENT_OLD_H__
 #define __NM_SECRET_AGENT_OLD_H__
 
-#include 
+#include "nm-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-settings-docs-overrides.xml b/libnm/nm-settings-docs-overrides.xml
index 474b7319..2b27b640 100644
--- a/libnm/nm-settings-docs-overrides.xml
+++ b/libnm/nm-settings-docs-overrides.xml
@@ -27,6 +27,8 @@ bridge's interface name."/>
 
 
 
+
+
 
 
 
@@ -133,6 +135,8 @@ team's interface name."/>
 
 
 
+
+
 
 
 ]>
 
-  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
     
     
+    
     
+    
+    
     
     
+    
+    
     
     
     
@@ -18,6 +45,7 @@
     
     
     
+    
     
     
     
@@ -25,22 +53,26 @@
     
     
     
+    
+    
     
     
+    
+    
     
-    
+    
     
     
     
     
     
-    
+    
     
     
     
     
   
-  
+  
     
     
     
@@ -50,17 +82,17 @@
     
     
   
-  
+  
     
     
     
   
-  
+  
     
     
     
   
-  
+  
     
     
     
@@ -72,42 +104,21 @@
     
     
   
-  
+  
     
     
     
     
   
-  
+  
+    
     
     
     
     
     
   
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
+  
     
     
     
@@ -125,13 +136,17 @@
     
     
   
-  
+  
+    
+  
+  
     
   
-  
+  
     
     
     
+    
     
     
     
@@ -143,7 +158,7 @@
     
     
   
-  
+  
     
     
     
@@ -151,7 +166,7 @@
     
     
   
-  
+  
     
     
     
@@ -175,7 +190,7 @@
     
     
   
-  
+  
     
     
     
@@ -200,7 +215,7 @@
     
     
   
-  
+  
     
     
     
@@ -215,7 +230,7 @@
     
     
   
-  
+  
     
     
     
@@ -226,20 +241,20 @@
     
     
   
-  
+  
     
     
     
     
     
   
-  
+  
     
     
     
     
   
-  
+  
     
     
     
@@ -260,21 +275,21 @@
     
     
   
-  
+  
     
     
     
     
     
   
-  
+  
     
     
     
     
     
   
-  
+  
     
     
     
@@ -282,16 +297,16 @@
     
     
   
-  
+  
     
     
     
   
-  
+  
     
     
   
-  
+  
     
     
     
@@ -300,7 +315,11 @@
     
     
   
-  
+  
+    
+    
+  
+  
     
     
     
@@ -309,7 +328,7 @@
     
     
   
-  
+  
     
     
     
@@ -318,7 +337,7 @@
     
     
   
-  
+  
     
     
     
@@ -337,12 +356,12 @@
     
     
   
-  
+  
     
     
     
   
-  
+  
     
     
     
@@ -360,7 +379,7 @@
     
     
   
-  
+  
     
     
     
@@ -381,7 +400,7 @@
     
     
   
-  
+  
     
     
     
diff --git a/libnm/nm-settings-ifcfg-rh-docs.xml b/libnm/nm-settings-ifcfg-rh-docs.xml
index aaf3880e..7664fc57 100644
--- a/libnm/nm-settings-ifcfg-rh-docs.xml
+++ b/libnm/nm-settings-ifcfg-rh-docs.xml
@@ -17,6 +17,7 @@
 
 
 
+
 
 
 
 
 
+
 
 
 
@@ -126,6 +128,8 @@ The sum of the numbers must be 100."/>
 "may not utilize all bandwidth", "1" means "may utilize all bandwidth"."/>
 
 
+
+
 
 
 
@@ -155,7 +159,7 @@ servers, initscripts and resolver only care about the first three, usually."/>
 
 
 
-
 
 
@@ -233,6 +237,8 @@ proxy configuration, or set the PAC file via PAC_URL or PAC_SCRIPT."/>
 
 
 
+
+
 
 
 
diff --git a/libnm/nm-settings-keyfile-docs.xml b/libnm/nm-settings-keyfile-docs.xml
index 2b59e9a9..33f53c4c 100644
--- a/libnm/nm-settings-keyfile-docs.xml
+++ b/libnm/nm-settings-keyfile-docs.xml
@@ -24,6 +24,8 @@ or semicolon separated list of 6 decimal bytes (obsolete)"/>
 
 
 
+
+
 
 
 
@@ -72,6 +74,8 @@ versions of NetworkManager stored this as an integer: 69 ('E') for eve
 
 
 
+
+
 
 
 
diff --git a/libnm/nm-types.h b/libnm/nm-types.h
index 7d224c86..84cf48f4 100644
--- a/libnm/nm-types.h
+++ b/libnm/nm-types.h
@@ -23,8 +23,8 @@
 
 #include 
 
-#include 
-#include 
+#include "nm-dbus-interface.h"
+#include "nm-connection.h"
 
 typedef struct _NMAccessPoint       NMAccessPoint;
 typedef struct _NMActiveConnection  NMActiveConnection;
@@ -34,6 +34,7 @@ typedef struct _NMDeviceAdsl        NMDeviceAdsl;
 typedef struct _NMDeviceBond        NMDeviceBond;
 typedef struct _NMDeviceBridge      NMDeviceBridge;
 typedef struct _NMDeviceBt          NMDeviceBt;
+typedef struct _NMDeviceDummy       NMDeviceDummy;
 typedef struct _NMDeviceEthernet    NMDeviceEthernet;
 typedef struct _NMDeviceGeneric     NMDeviceGeneric;
 typedef struct _NMDeviceInfiniband  NMDeviceInfiniband;
diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c
index a91a6f69..814f45f0 100644
--- a/libnm/nm-vpn-connection.c
+++ b/libnm/nm-vpn-connection.c
@@ -36,6 +36,8 @@ G_DEFINE_TYPE (NMVpnConnection, nm_vpn_connection, NM_TYPE_ACTIVE_CONNECTION)
 
 #define NM_VPN_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_CONNECTION, NMVpnConnectionPrivate))
 
+G_STATIC_ASSERT (sizeof (NMVpnConnectionStateReason) == sizeof (NMActiveConnectionStateReason));
+
 typedef struct {
 	char *banner;
 	NMVpnConnectionState vpn_state;
@@ -220,6 +222,7 @@ nm_vpn_connection_class_init (NMVpnConnectionClass *connection_class)
 		                      G_PARAM_STATIC_STRINGS));
 
 	/* signals */
+	G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 	signals[VPN_STATE_CHANGED] =
 		g_signal_new ("vpn-state-changed",
 		              G_OBJECT_CLASS_TYPE (object_class),
@@ -228,4 +231,5 @@ nm_vpn_connection_class_init (NMVpnConnectionClass *connection_class)
 		              NULL, NULL, NULL,
 		              G_TYPE_NONE, 2,
 		              G_TYPE_UINT, G_TYPE_UINT);
+	G_GNUC_END_IGNORE_DEPRECATIONS
 }
diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h
index 79ec90a0..d53f8e92 100644
--- a/libnm/nm-vpn-connection.h
+++ b/libnm/nm-vpn-connection.h
@@ -26,8 +26,8 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
-#include 
+#include "nm-active-connection.h"
+#include "nm-vpn-dbus-interface.h"
 
 G_BEGIN_DECLS
 
@@ -52,9 +52,19 @@ typedef struct {
 	NMActiveConnectionClass parent;
 
 	/* Signals */
+
+	/* NMVpnConnectionStateReason got deprecated in 1.8.0. Thus, vpn_state_changed()
+	 * uses a deprecated type and is itself deprecated.
+	 *
+	 * If you use this signal slot, you are advised to cast the reason
+	 * to the NMActiveConnectionStateReason type, which is fully compatible.
+	 */
+	G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+	NM_DEPRECATED_IN_1_8
 	void (*vpn_state_changed) (NMVpnConnection *connection,
 	                           NMVpnConnectionState state,
 	                           NMVpnConnectionStateReason reason);
+	G_GNUC_END_IGNORE_DEPRECATIONS
 
 	/*< private >*/
 	gpointer padding[4];
diff --git a/libnm/nm-vpn-editor.h b/libnm/nm-vpn-editor.h
index d450bbd6..26e48662 100644
--- a/libnm/nm-vpn-editor.h
+++ b/libnm/nm-vpn-editor.h
@@ -28,9 +28,9 @@
 
 #include 
 #include 
-#include 
+#include "nm-types.h"
 
-#include 
+#include "nm-vpn-editor-plugin.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index aff23b20..2b5922b9 100644
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -1025,7 +1025,7 @@ set_property (GObject *object, guint prop_id,
 
 	switch (prop_id) {
 	case PROP_DBUS_SERVICE_NAME:
-		/* Construct-only */
+		/* construct-only */
 		priv->dbus_service_name = g_value_dup_string (value);
 		break;
 	case PROP_STATE:
diff --git a/libnm/nm-vpn-plugin-old.h b/libnm/nm-vpn-plugin-old.h
index 50e34450..48f3fba1 100644
--- a/libnm/nm-vpn-plugin-old.h
+++ b/libnm/nm-vpn-plugin-old.h
@@ -23,8 +23,8 @@
 #define __NM_VPN_PLUGIN_OLD_H__
 
 #include 
-#include 
-#include 
+#include "nm-vpn-dbus-interface.h"
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index 0b47bf53..31e12954 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -1047,11 +1047,11 @@ set_property (GObject *object, guint prop_id,
 
 	switch (prop_id) {
 	case PROP_DBUS_SERVICE_NAME:
-		/* Construct-only */
+		/* construct-only */
 		priv->dbus_service_name = g_value_dup_string (value);
 		break;
 	case PROP_DBUS_WATCH_PEER:
-		/* Construct-only */
+		/* construct-only */
 		priv->dbus_watch_peer = g_value_get_boolean (value);
 		break;
 	case PROP_STATE:
diff --git a/libnm/nm-vpn-service-plugin.h b/libnm/nm-vpn-service-plugin.h
index 0b655296..329345ea 100644
--- a/libnm/nm-vpn-service-plugin.h
+++ b/libnm/nm-vpn-service-plugin.h
@@ -27,8 +27,8 @@
 #endif
 
 #include 
-#include 
-#include 
+#include "nm-vpn-dbus-interface.h"
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-wimax-nsp.h b/libnm/nm-wimax-nsp.h
index e1f63400..ed399346 100644
--- a/libnm/nm-wimax-nsp.h
+++ b/libnm/nm-wimax-nsp.h
@@ -26,7 +26,7 @@
 #error "Only  can be included directly."
 #endif
 
-#include 
+#include "nm-object.h"
 
 G_BEGIN_DECLS
 
diff --git a/m4/compiler_options.m4 b/m4/compiler_options.m4
index c998711d..23929af8 100644
--- a/m4/compiler_options.m4
+++ b/m4/compiler_options.m4
@@ -119,8 +119,46 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 		[int f () { int i = yolo; yolo; return i; }]
 	)
 
+	dnl clang 3.9 would like to see "{ { 0 } }" here, but that does not
+	dnl look too wise.
+	NM_COMPILER_WARNING([missing-braces],
+		[union { int a[1]; int b[2]; } c = { 0 }]
+	)
+
 	CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS"
 else
 	AC_MSG_RESULT(no)
 fi
 ])
+
+AC_DEFUN([NM_LTO],
+[AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)]))
+if (test "${enable_lto}" = "yes"); then
+	CC_CHECK_FLAG_APPEND([lto_flags], [CFLAGS], [-flto])
+	if (test -n "${lto_flags}"); then
+		CFLAGS="-flto $CFLAGS"
+	else
+		AC_MSG_ERROR([Link Time Optimization -flto is not supported.])
+	fi
+else
+	enable_lto='no'
+fi
+])
+
+AC_DEFUN([NM_LD_GC],
+[AC_ARG_ENABLE(ld-gc, AS_HELP_STRING([--enable-ld-gc], [Enable garbage collection of unused symbols on linking (default: auto)]))
+if (test "${enable_ld_gc}" != "no"); then
+	CC_CHECK_FLAG_APPEND([ld_gc_flags], [CFLAGS], [-fdata-sections -ffunction-sections -Wl,--gc-sections])
+	if (test -n "${ld_gc_flags}"); then
+		enable_ld_gc="yes"
+		CFLAGS="$ld_gc_flags $CFLAGS"
+	else
+		if (test "${enable_ld_gc}" = "yes"); then
+			AC_MSG_ERROR([Unused symbol eviction requested but not supported.])
+		else
+			enable_ld_gc="no"
+		fi
+	fi
+fi
+])
+
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index d18ba497..029dadce 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 
-.\"      Date: 02/15/2017
+.\"      Date: 05/10/2017
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.6.2
+.\"    Source: NetworkManager 1.8.0
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.6\&.2" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.8\&.0" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 6ef2bc5d..339a106d 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 
-.\"      Date: 02/15/2017
+.\"      Date: 05/10/2017
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.6.2
+.\"    Source: NetworkManager 1.8.0
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CON" "5" "" "NetworkManager 1\&.6\&.2" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.8\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -144,7 +144,7 @@ internal
 option uses a built\-in DHCP client which is not currently as featureful as the external clients\&.
 .sp
 If this key is missing, it defaults to
-dhclient\&. It the chosen plugin is not available, clients are looked for in this order:
+internal\&. It the chosen plugin is not available, clients are looked for in this order:
 dhclient,
 dhcpcd,
 internal\&.
@@ -205,6 +205,17 @@ When set to \*(Aqtrue\*(Aq, NetworkManager quits after performing initial networ
 true, network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE interfaces cannot be preserved due to their use of external services, and these devices will be deconfigured when NetworkManager quits even though other interface\*(Aqs configuration may be preserved\&. Also, to preserve DHCP addresses the \*(Aqdhcp\*(Aq option must be set to \*(Aqinternal\*(Aq\&. The default value of the \*(Aqconfigure\-and\-quit\*(Aq option is \*(Aqfalse\*(Aq, meaning that NetworkManager will continue running after initial network configuration and continue responding to system and hardware events, D\-Bus requests, and user commands\&.
 .RE
 .PP
+\fIhostname\-mode\fR
+.RS 4
+Set the management mode of the hostname\&. This parameter will affect only the transient hostname\&. If a valid static hostname is set, NetworkManager will skip the update of the hostname despite the value of this option\&. An hostname empty or equal to \*(Aqlocalhost\*(Aq, \*(Aqlocalhost6\*(Aq, \*(Aqlocalhost\&.localdomain\*(Aq or \*(Aqlocalhost6\&.localdomain\*(Aq is considered invalid\&.
+.sp
+default: NetworkManager will update the hostname with the one provided via DHCP on the main connection (the one with a default route)\&. If not present, the hostname will be updated to the last one set outside NetworkManager\&. If it is not valid, NetworkManager will try to recover the hostname from the reverse lookup of the IP address of the main connection\&. If this fails too, the hostname will be set to \*(Aqlocalhost\&.localdomain\*(Aq\&.
+.sp
+dhcp: NetworkManager will update the transient hostname only with information coming from DHCP\&. No fallback nor reverse lookup will be performed, but when the dhcp connection providing the hostname is deactivated, the hostname is reset to the last hostname set outside NetworkManager or \*(Aqlocalhost\*(Aq if none valid is there\&.
+.sp
+none: NetworkManager will not manage the transient hostname and will never set it\&.
+.RE
+.PP
 \fIdns\fR
 .RS 4
 Set the DNS (resolv\&.conf) processing mode\&. If the key is unspecified,
@@ -225,7 +236,7 @@ to reflect the nameservers provided by currently active connections\&.
 .sp
 dnsmasq: NetworkManager will run dnsmasq as a local caching nameserver, using a "split DNS" configuration if you are connected to a VPN, and then update
 resolv\&.conf
-to point to the local nameserver\&. It is possible to pass custom options to the dnsmasq instance by adding them to files in the "${prefix}/etc/NetworkManager/dnsmasq\&.d/" directory\&. Note that when multiple upstream servers are available, dnsmasq will initially contact them in parallel and then use the fastest to respond, probing again other servers after some time\&. This behavior can be modified passing the \*(Aqall\-servers\*(Aq or \*(Aqstrict\-order\*(Aq options to dnsmasq (see the manual page for more details)\&.
+to point to the local nameserver\&. It is possible to pass custom options to the dnsmasq instance by adding them to files in the "/etc/NetworkManager/dnsmasq\&.d/" directory\&. Note that when multiple upstream servers are available, dnsmasq will initially contact them in parallel and then use the fastest to respond, probing again other servers after some time\&. This behavior can be modified passing the \*(Aqall\-servers\*(Aq or \*(Aqstrict\-order\*(Aq options to dnsmasq (see the manual page for more details)\&.
 .sp
 unbound: NetworkManager will talk to unbound and dnssec\-triggerd, providing a "split DNS" configuration with DNSSEC support\&.
 /etc/resolv\&.conf
@@ -241,15 +252,17 @@ rc\-manager\ \&unmanaged
 .RS 4
 Set the
 resolv\&.conf
-management mode\&. The default value depends on NetworkManager build options, and this version of NetworkManager was build with a default of "symlink"\&. Regardless of this setting, NetworkManager will always write resolv\&.conf to its runtime state directory\&.
+management mode\&. The default value depends on NetworkManager build options, and this version of NetworkManager was build with a default of "symlink"\&. Regardless of this setting, NetworkManager will always write resolv\&.conf to its runtime state directory
+/var/run/NetworkManager/resolv\&.conf\&.
 .sp
-symlink: NetworkManager will symlink
+symlink: If
 /etc/resolv\&.conf
-to its private resolv\&.conf file in the runtime state directory\&. If
+is a regular file, NetworkManager will replace the file on update\&. If
 /etc/resolv\&.conf
-already is a symlink pointing to a different location, the file will not be modified\&. This allows the user to disable managing by pointing the link
+is instead a symlink, NetworkManager will leave it alone\&. Unless the symlink points to the internal file
+/var/run/NetworkManager/resolv\&.conf, in which case the symlink will be updated to emit an inotify notification\&. This allows the user to conveniently instruct NetworkManager not to manage
 /etc/resolv\&.conf
-to somewhere else\&.
+by replacing it with a symlink\&.
 .sp
 file: NetworkManager will write
 /etc/resolv\&.conf
@@ -296,7 +309,7 @@ or other system configuration files according to build options\&.
 .PP
 \fIpath\fR
 .RS 4
-The location where keyfiles are read and stored\&. This defaults to "${prefix}/etc/NetworkManager/conf\&.d"\&.
+The location where keyfiles are read and stored\&. This defaults to "/etc/NetworkManager/system\-connections"\&.
 .RE
 .PP
 \fIunmanaged\-devices\fR
@@ -524,7 +537,7 @@ INFO\&.
 .PP
 \fIbackend\fR
 .RS 4
-The logging backend\&. Supported values are "debug", "syslog", "journal"\&. "debug" uses syslog and logs to standard error\&. If NetworkManager is started in debug mode (\-\-debug) this option is ignored and "debug" is always used\&. Otherwise, the default is "journal"\&.
+The logging backend\&. Supported values are "debug", "syslog", "journal"\&. "debug" uses syslog and logs to standard error\&. If NetworkManager is started in debug mode (\-\-debug) this option is ignored and "debug" is always used\&. Otherwise, the default is "syslog"\&.
 .RE
 .PP
 \fIaudit\fR
@@ -532,7 +545,7 @@ The logging backend\&. Supported values are "debug", "syslog", "journal"\&. "deb
 Whether the audit records are delivered to auditd, the audit daemon\&. If
 false, audit records will be sent only to the NetworkManager logging system\&. If set to
 true, they will be also sent to auditd\&. The default value is
-true\&.
+false\&.
 .RE
 .SH "CONNECTION SECTION"
 .PP
@@ -768,6 +781,11 @@ wifi\&.generate\-mac\-address\-mask, this allows to configure the generated MAC
 \fBnm-settings\fR(5)
 for details\&.
 .RE
+.PP
+\fIsriov\-num\-vfs\fR
+.RS 4
+Specify the number of virtual functions (VF) to enable for a PCI physical device that supports single\-root I/O virtualization (SR\-IOV)\&.
+.RE
 .SS "Sections"
 .PP
 The
@@ -1041,6 +1059,11 @@ type:TYPE
 Match the device type\&. Valid type names are as reported by "nmcli \-f GENERAL\&.TYPE device show"\&. Globbing is not supported\&.
 .RE
 .PP
+driver:DRIVER
+.RS 4
+Match the device driver as reported by "nmcli \-f GENERAL\&.DRIVER,GENERAL\&.DRIVER\-VERSION device show"\&. "DRIVER" must match the driver name exactly and does not support globbing\&. Optionally, a driver version may be specified separated by \*(Aq/\*(Aq\&. Globbing is supported for the version\&.
+.RE
+.PP
 except:SPEC
 .RS 4
 Negative match of a device\&.
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 8c93ac4c..658fd7c2 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -276,6 +276,34 @@ no-auto-default=*
         
       
 
+      
+        hostname-mode
+        
+          
+            Set the management mode of the hostname. This parameter will
+            affect only the transient hostname. If a valid static hostname is set,
+            NetworkManager will skip the update of the hostname despite the value of
+            this option. An hostname empty or equal to 'localhost', 'localhost6',
+            'localhost.localdomain' or 'localhost6.localdomain' is considered invalid.
+          
+          default: NetworkManager will update the hostname
+          with the one provided via DHCP on the main connection (the one with a default
+          route). If not present, the hostname will be updated to the last one set
+          outside NetworkManager. If it is not valid, NetworkManager will try to recover
+          the hostname from the reverse lookup of the IP address of the main connection.
+          If this fails too, the hostname will be set to 'localhost.localdomain'.
+          
+          dhcp: NetworkManager will update the transient hostname
+          only with information coming from DHCP. No fallback nor reverse lookup will be
+          performed, but when the dhcp connection providing the hostname is deactivated,
+          the hostname is reset to the last hostname set outside NetworkManager or
+          'localhost' if none valid is there.
+          
+          none: NetworkManager will not manage the transient
+          hostname and will never set it.
+          
+        
+      
       
         dns
         Set the DNS (resolv.conf) processing mode.
@@ -321,15 +349,17 @@ no-auto-default=*
         options, and this version of NetworkManager was build with a default of
         "&NM_CONFIG_DEFAULT_MAIN_RC_MANAGER;".
         Regardless of this setting, NetworkManager will
-        always write resolv.conf to its runtime state directory.
-        symlink: NetworkManager will symlink
-        /etc/resolv.conf to its private
-        resolv.conf file in the runtime state directory. If
-        /etc/resolv.conf
-        already is a symlink pointing to a different location, the file
-        will not be modified. This allows the user to disable managing
-        by pointing the link /etc/resolv.conf to
-        somewhere else.
+        always write resolv.conf to its runtime state directory
+        &nmrundir;/resolv.conf.
+        symlink: If /etc/resolv.conf is
+        a regular file, NetworkManager will replace the file on update. If
+        /etc/resolv.conf is instead a symlink, NetworkManager
+        will leave it alone. Unless the symlink points to the internal file
+        &nmrundir;/resolv.conf,
+        in which case the symlink will be updated to emit an inotify notification.
+        This allows the user to conveniently instruct NetworkManager not
+        to manage /etc/resolv.conf by replacing it with
+        a symlink.
         file: NetworkManager will write
         /etc/resolv.conf as file. If it finds
         a symlink, it will follow the symlink and update the target
@@ -401,7 +431,7 @@ no-auto-default=*
           path
           
             The location where keyfiles are read and stored.
-            This defaults to "&sysconfdir;/NetworkManager/conf.d".
+            This defaults to "&sysconfdir;/NetworkManager/system-connections".
             
           
         
@@ -825,6 +855,16 @@ unmanaged=1
             
           
         
+        
+          sriov-num-vfs
+          
+            
+              Specify the number of virtual functions (VF) to enable
+              for a PCI physical device that supports single-root I/O
+              virtualization (SR-IOV).
+            
+          
+        
       
     
     
@@ -1170,6 +1210,13 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
           Match the device type. Valid type names are as reported by "nmcli -f GENERAL.TYPE device show".
           Globbing is not supported.
         
+        
+          driver:DRIVER
+          Match the device driver as reported by "nmcli -f GENERAL.DRIVER,GENERAL.DRIVER-VERSION device show".
+          "DRIVER" must match the driver name exactly and does not support globbing.
+          Optionally, a driver version may be specified separated by '/'. Globbing is supported for the version.
+          
+        
         
           except:SPEC
           Negative match of a device. SPEC must be explicitly qualified with
diff --git a/man/common.ent.in b/man/common.ent.in
index 4c3310c4..ddfbb69a 100644
--- a/man/common.ent.in
+++ b/man/common.ent.in
@@ -1,6 +1,7 @@
 
 
 
+
 
 
 
diff --git a/man/nm-online.1 b/man/nm-online.1
index d79310f9..6de8ea32 100644
--- a/man/nm-online.1
+++ b/man/nm-online.1
@@ -2,12 +2,12 @@
 .\"     Title: nm-online
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 
-.\"      Date: 02/15/2017
+.\"      Date: 05/10/2017
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.6.2
+.\"    Source: NetworkManager 1.8.0
 .\"  Language: English
 .\"
-.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.6\&.2" "General Commands Manual"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.8\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index fed899a2..69879b38 100644
--- a/man/nm-settings-ifcfg-rh.5
+++ b/man/nm-settings-ifcfg-rh.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-ifcfg-rh
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 
-.\"      Date: 02/15/2017
+.\"      Date: 05/10/2017
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.6.2
+.\"    Source: NetworkManager 1.8.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.6\&.2" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.8\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -381,6 +381,8 @@ l l l l
 l l l l
 l l l l
 l l l l
+l l l l
+l l l l
 l l l l.
 T{
 eap
@@ -524,6 +526,19 @@ Example: \fRIEEE_8021X_FAST_PROVISIONING="allow\-auth allow\-unauth"\fB
 Allowed values: \fRspace\-separated list of these values [allow\-auth, allow\-unauth]
 T}
 T{
+phase1\-auth\-flags
+T}:T{
+IEEE_8021X_PHASE1_AUTH_FLAGS\fI(+)\fR
+T}:T{
+\ \&
+T}:T{
+Authentication flags for the supplicant\fB
+
+Example: \fRIEEE_8021X_PHASE1_AUTH_FLAGS="tls\-1\-0\-disable tls\-1\-1\-disable"\fB
+
+Allowed values: \fRspace\-separated list of authentication flags names
+T}
+T{
 phase2\-auth
 T}:T{
 IEEE_8021X_INNER_AUTH_METHODS\fI(+)\fR
@@ -708,6 +723,15 @@ T}:T{
 T}:T{
 The property is not handled by ifcfg\-rh plugin\&.
 T}
+T{
+auth\-timeout
+T}:T{
+IEEE_8021X_AUTH_TIMEOUT\fI(+)\fR
+T}:T{
+0
+T}:T{
+Timeout in seconds for the 802\&.1X authentication\&. Zero means the global default or 25\&.
+T}
 .TE
 .sp 1
 .sp
@@ -1328,7 +1352,29 @@ All DCB related configuration is a NetworkManager extension\&. DCB=yes must be u
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&7.\ \&infiniband setting
+.B Table\ \&7.\ \&dummy setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Property
+T}:T{
+Ifcfg\-rh Variable
+T}:T{
+Default
+T}:T{
+Description
+T}
+.T&
+.
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&8.\ \&infiniband setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -1405,7 +1451,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&8.\ \&ipv4 setting
+.B Table\ \&9.\ \&ipv4 setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -1493,7 +1539,7 @@ T}
 T{
 routes
 T}:T{
-ADDRESS1, NETMASK1, GATEWAY1, METRIC1, \&.\&.\&.
+ADDRESS1, NETMASK1, GATEWAY1, METRIC1, OPTIONS1, \&.\&.\&.
 T}:T{
 \ \&
 T}:T{
@@ -1624,7 +1670,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&9.\ \&ipv6 setting
+.B Table\ \&10.\ \&ipv6 setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -1821,7 +1867,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&10.\ \&macsec setting
+.B Table\ \&11.\ \&macsec setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -1843,7 +1889,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&11.\ \&proxy setting
+.B Table\ \&12.\ \&proxy setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -1910,7 +1956,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&12.\ \&team\-port setting
+.B Table\ \&13.\ \&team\-port setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -1941,7 +1987,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&13.\ \&team setting
+.B Table\ \&14.\ \&team setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -1972,7 +2018,29 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&14.\ \&802\-3\-ethernet setting
+.B Table\ \&15.\ \&user setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Property
+T}:T{
+Ifcfg\-rh Variable
+T}:T{
+Default
+T}:T{
+Description
+T}
+.T&
+.
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&16.\ \&802\-3\-ethernet setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2121,7 +2189,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&15.\ \&802\-11\-wireless\-security setting
+.B Table\ \&17.\ \&802\-11\-wireless\-security setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2328,7 +2396,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&16.\ \&802\-11\-wireless setting
+.B Table\ \&18.\ \&802\-11\-wireless setting
 .TS
 allbox tab(:);
 lB lB lB lB.
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index 7b5f56cb..a476608f 100644
--- a/man/nm-settings-ifcfg-rh.xml
+++ b/man/nm-settings-ifcfg-rh.xml
@@ -1,6 +1,6 @@
 
 
-nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.6.2nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription
+nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.8.0nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see nm-settings5 for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
@@ -193,7 +193,11 @@ Allowed values: yes, nophase1-
 
 Example: IEEE_8021X_FAST_PROVISIONING="allow-auth allow-unauth"
 
-Allowed values: space-separated list of these values [allow-auth, allow-unauth]phase2-authIEEE_8021X_INNER_AUTH_METHODS(+)Inner non-EAP authentication methods. IEEE_8021X_INNER_AUTH_METHODS can contain values both for 'phase2-auth' and 'phase2-autheap' properties.
+Allowed values: space-separated list of these values [allow-auth, allow-unauth]phase1-auth-flagsIEEE_8021X_PHASE1_AUTH_FLAGS(+)Authentication flags for the supplicant
+
+Example: IEEE_8021X_PHASE1_AUTH_FLAGS="tls-1-0-disable tls-1-1-disable"
+
+Allowed values: space-separated list of authentication flags namesphase2-authIEEE_8021X_INNER_AUTH_METHODS(+)Inner non-EAP authentication methods. IEEE_8021X_INNER_AUTH_METHODS can contain values both for 'phase2-auth' and 'phase2-autheap' properties.
 
 Example: IEEE_8021X_INNER_AUTH_METHODS=PAP
 
@@ -207,7 +211,7 @@ Example: IEEE_8021X_PHASE2_SUBJECT_MATCH="Red Hat"
 
 Example: IEEE_8021X_INNER_CLIENT_CERT=/home/joe/mycert.crtpasswordIEEE_8021X_PASSWORD(+)UTF-8 encoded password used for EAP. It can also go to "key-" lookaside file, or it can be owned by a secret agent.password-flagsIEEE_8021X_PASSWORD_FLAGS(+)Password flags for IEEE_8021X_PASSWORD password. (see  for _FLAGS values)password-raw(none)The property is not handled by ifcfg-rh plugin.password-raw-flags(none)The property is not handled by ifcfg-rh plugin.private-keyIEEE_8021X_PRIVATE_KEY(+)Private key for EAP-TLS.
 
-Example: IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12private-key-passwordIEEE_8021X_PRIVATE_KEY_PASSWORD(+)Password for IEEE_8021X_PRIVATE_KEY. It can also go to "key-" lookaside file, or it can be owned by a secret agent.private-key-password-flagsIEEE_8021X_PRIVATE_KEY_PASSWORD_FLAGS(+)Password flags for IEEE_8021X_PRIVATE_KEY_PASSWORD password. (see  for _FLAGS values)phase2-private-keyIEEE_8021X_INNER_PRIVATE_KEY(+)Private key for inner authentication method for EAP-TLS.phase2-private-key-passwordIEEE_8021X_INNER_PRIVATE_KEY_PASSWORD(+)Password for IEEE_8021X_INNER_PRIVATE_KEY. It can also go to "key-" lookaside file, or it can be owned by a secret agent.phase2-private-key-password-flagsIEEE_8021X_INNER_PRIVATE_KEY_PASSWORD_FLAGS(+)Password flags for IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD password. (see  for _FLAGS values)pin(none)The property is not handled by ifcfg-rh plugin.pin-flags(none)The property is not handled by ifcfg-rh plugin.system-ca-certs(none)The property is not handled by ifcfg-rh plugin.bond settingPropertyIfcfg-rh VariableDefaultDescriptionoptionsBONDING_OPTSBonding options.
+Example: IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12private-key-passwordIEEE_8021X_PRIVATE_KEY_PASSWORD(+)Password for IEEE_8021X_PRIVATE_KEY. It can also go to "key-" lookaside file, or it can be owned by a secret agent.private-key-password-flagsIEEE_8021X_PRIVATE_KEY_PASSWORD_FLAGS(+)Password flags for IEEE_8021X_PRIVATE_KEY_PASSWORD password. (see  for _FLAGS values)phase2-private-keyIEEE_8021X_INNER_PRIVATE_KEY(+)Private key for inner authentication method for EAP-TLS.phase2-private-key-passwordIEEE_8021X_INNER_PRIVATE_KEY_PASSWORD(+)Password for IEEE_8021X_INNER_PRIVATE_KEY. It can also go to "key-" lookaside file, or it can be owned by a secret agent.phase2-private-key-password-flagsIEEE_8021X_INNER_PRIVATE_KEY_PASSWORD_FLAGS(+)Password flags for IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD password. (see  for _FLAGS values)pin(none)The property is not handled by ifcfg-rh plugin.pin-flags(none)The property is not handled by ifcfg-rh plugin.system-ca-certs(none)The property is not handled by ifcfg-rh plugin.auth-timeoutIEEE_8021X_AUTH_TIMEOUT(+)0Timeout in seconds for the 802.1X authentication. Zero means the global default or 25.
    bond settingPropertyIfcfg-rh VariableDefaultDescriptionoptionsBONDING_OPTSBonding options.
 
 Example: BONDING_OPTS="miimon=100 mode=broadcast"
    bridge-port settingPropertyIfcfg-rh VariableDefaultDescriptionpriorityBRIDGING_OPTS: priority=32STP priority.
 
@@ -276,7 +280,7 @@ Example: DCB_PG_STRICT=01101110DCB_PG_UP2TC=01623701
    
           All DCB related configuration is a NetworkManager extension. DCB=yes must be
           used explicitly to enable DCB so that the rest of the DCB_* variables can apply.
-        infiniband settingPropertyIfcfg-rh VariableDefaultDescriptionmac-addressHWADDRIBoIP 20-byte hardware address of the device (in traditional hex-digits-and-colons notation). Note that for initscripts this is the current MAC address of the device as found during ifup. For NetworkManager this is the permanent MAC address. Or in case no permanent MAC address exists, the MAC address initially configured on the device.
+        
    dummy settingPropertyIfcfg-rh VariableDefaultDescription
    infiniband settingPropertyIfcfg-rh VariableDefaultDescriptionmac-addressHWADDRIBoIP 20-byte hardware address of the device (in traditional hex-digits-and-colons notation). Note that for initscripts this is the current MAC address of the device as found during ifup. For NetworkManager this is the permanent MAC address. Or in case no permanent MAC address exists, the MAC address initially configured on the device.
 
 Example: HWADDR=01:02:03:04:05:06:07:08:09:0A:01:02:03:04:05:06:07:08:09:11mtuMTUMTU of the interface.transport-modeCONNECTED_MODECONNECTED_MODE=noCONNECTED_MODE=yes for "connected" mode, CONNECTED_MODE=no for "datagram" modep-keyPKEY_ID (and PKEY=yes)PKEY=noInfiniBand P_Key. The value can be a hex number prefixed with "0x" or a decimal number. When PKEY_ID is specified, PHYSDEV and DEVICE also must be specified.
 
@@ -290,7 +294,7 @@ Example: DNS1=1.2.3.4 DNS2=10.0.0.254 DNS3=8.8.8.8
 
 Example: IPADDR=10.5.5.23 PREFIX=24 IPADDR1=1.1.1.2 PREFIX1=16gatewayGATEWAYGateway IP address.
 
-Example: GATEWAY=10.5.5.1routesADDRESS1, NETMASK1, GATEWAY1, METRIC1, ...List of static routes. They are not stored in ifcfg-* file, but in route-* file instead.ignore-auto-routesPEERROUTES(+)yesPEERROUTES has the opposite meaning as 'ignore-auto-routes' property.ignore-auto-dnsPEERDNSyesPEERDNS has the opposite meaning as 'ignore-auto-dns' property.dhcp-send-hostnameDHCP_SEND_HOSTNAME(+)yesWhether DHCP_HOSTNAME should be sent to the DHCP server.dhcp-hostnameDHCP_HOSTNAMEHostname to send to the DHCP server. When both DHCP_HOSTNAME and DHCP_FQDN are specified only the latter is used.never-defaultDEFROUTE (GATEWAYDEV in /etc/sysconfig/network)yesDEFROUTE=no tells NetworkManager that this connection should not be assigned the default route. DEFROUTE has the opposite meaning as 'never-default' property.may-failIPV4_FAILURE_FATAL(+)noIPV4_FAILURE_FATAL has the opposite meaning as 'may-fail' property.route-metricIPV4_ROUTE_METRIC(+)-1IPV4_ROUTE_METRIC is the default IPv4 metric for routes on this connection. If set to -1, a default metric based on the device type is used.dns-priorityIPV4_DNS_PRIORITY(+)0The priority for DNS servers of this connection. Lower values have higher priority. If zero, the default value will be used (50 for VPNs, 100 for other connections). A negative value prevents DNS from other connections with greater values to be used.
+Example: GATEWAY=10.5.5.1routesADDRESS1, NETMASK1, GATEWAY1, METRIC1, OPTIONS1, ...List of static routes. They are not stored in ifcfg-* file, but in route-* file instead.ignore-auto-routesPEERROUTES(+)yesPEERROUTES has the opposite meaning as 'ignore-auto-routes' property.ignore-auto-dnsPEERDNSyesPEERDNS has the opposite meaning as 'ignore-auto-dns' property.dhcp-send-hostnameDHCP_SEND_HOSTNAME(+)yesWhether DHCP_HOSTNAME should be sent to the DHCP server.dhcp-hostnameDHCP_HOSTNAMEHostname to send to the DHCP server. When both DHCP_HOSTNAME and DHCP_FQDN are specified only the latter is used.never-defaultDEFROUTE (GATEWAYDEV in /etc/sysconfig/network)yesDEFROUTE=no tells NetworkManager that this connection should not be assigned the default route. DEFROUTE has the opposite meaning as 'never-default' property.may-failIPV4_FAILURE_FATAL(+)noIPV4_FAILURE_FATAL has the opposite meaning as 'may-fail' property.route-metricIPV4_ROUTE_METRIC(+)-1IPV4_ROUTE_METRIC is the default IPv4 metric for routes on this connection. If set to -1, a default metric based on the device type is used.dns-priorityIPV4_DNS_PRIORITY(+)0The priority for DNS servers of this connection. Lower values have higher priority. If zero, the default value will be used (50 for VPNs, 100 for other connections). A negative value prevents DNS from other connections with greater values to be used.
 
 Example: IPV4_DNS_PRIORITY=20dhcp-client-idDHCP_CLIENT_ID(+)A string sent to the DHCP server to identify the local machine.
 
@@ -322,7 +326,7 @@ Allowed values: none, autobrow
 
 Example: PAC_URL=http://wpad.mycompany.com/wpad.datpac-scriptPAC_SCRIPT(+)Path of the PAC script.
 
-Example: PAC_SCRIPT=/home/joe/proxy.pac
    team-port settingPropertyIfcfg-rh VariableDefaultDescriptionconfigTEAM_PORT_CONFIGTeam port configuration in JSON. See man teamd.conf for details.
    team settingPropertyIfcfg-rh VariableDefaultDescriptionconfigTEAM_CONFIGTeam configuration in JSON. See man teamd.conf for details.
    802-3-ethernet settingPropertyIfcfg-rh VariableDefaultDescriptionport(none)The property is not saved by the plugin.speedETHTOOL_OPTSFixed speed for the ethernet link. It is added as "speed" parameter in the ETHTOOL_OPTS variable.duplexETHTOOL_OPTSFixed duplex mode for the ethernet link. It is added as "duplex" parameter in the ETHOOL_OPTS variable.auto-negotiateETHTOOL_OPTSWhether link speed and duplex autonegotiation is enabled. It is not saved only if disabled and no values are provided for the "speed" and "duplex" parameters (skips link configuration).mac-addressHWADDRHardware address of the device in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:05). Note that for initscripts this is the current MAC address of the device as found during ifup. For NetworkManager this is the permanent MAC address. Or in case no permanent MAC address exists, the MAC address initially configured on the device.cloned-mac-addressMACADDRCloned (spoofed) MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:99).generate-mac-address-maskGENERATE_MAC_ADDRESS_MASK(+)the MAC address mask for generating randomized and stable cloned-mac-address.mac-address-blacklistHWADDR_BLACKLIST(+)It denies usage of the connection for any device whose address is listed.
+Example: PAC_SCRIPT=/home/joe/proxy.pac
    team-port settingPropertyIfcfg-rh VariableDefaultDescriptionconfigTEAM_PORT_CONFIGTeam port configuration in JSON. See man teamd.conf for details.
    team settingPropertyIfcfg-rh VariableDefaultDescriptionconfigTEAM_CONFIGTeam configuration in JSON. See man teamd.conf for details.
    user settingPropertyIfcfg-rh VariableDefaultDescription
    802-3-ethernet settingPropertyIfcfg-rh VariableDefaultDescriptionport(none)The property is not saved by the plugin.speedETHTOOL_OPTSFixed speed for the ethernet link. It is added as "speed" parameter in the ETHTOOL_OPTS variable.duplexETHTOOL_OPTSFixed duplex mode for the ethernet link. It is added as "duplex" parameter in the ETHOOL_OPTS variable.auto-negotiateETHTOOL_OPTSWhether link speed and duplex autonegotiation is enabled. It is not saved only if disabled and no values are provided for the "speed" and "duplex" parameters (skips link configuration).mac-addressHWADDRHardware address of the device in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:05). Note that for initscripts this is the current MAC address of the device as found during ifup. For NetworkManager this is the permanent MAC address. Or in case no permanent MAC address exists, the MAC address initially configured on the device.cloned-mac-addressMACADDRCloned (spoofed) MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:99).generate-mac-address-maskGENERATE_MAC_ADDRESS_MASK(+)the MAC address mask for generating randomized and stable cloned-mac-address.mac-address-blacklistHWADDR_BLACKLIST(+)It denies usage of the connection for any device whose address is listed.
 
 Example: HWADDR_BLACKLIST="00:22:68:11:69:08 00:11:22:11:44:55"mtuMTUMTU of the interface.s390-subchannelsSUBCHANNELSSubchannels for IBM S390 hosts.
 
diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5
index c10eaf7a..b729b6c2 100644
--- a/man/nm-settings-keyfile.5
+++ b/man/nm-settings-keyfile.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-keyfile
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 
-.\"      Date: 02/15/2017
+.\"      Date: 05/10/2017
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.6.2
+.\"    Source: NetworkManager 1.8.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.6\&.2" "Configuration"
+.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.8\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index 27586b55..05cb94fd 100644
--- a/man/nm-settings-keyfile.xml
+++ b/man/nm-settings-keyfile.xml
@@ -1,6 +1,6 @@
 
 
-nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.6.2nm-settings-keyfileDescription of keyfile settings pluginDescription
+nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.8.0nm-settings-keyfileDescription of keyfile settings pluginDescription
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see nm-settings5 for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
@@ -149,6 +149,7 @@ Example: mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;121;16
 
 
 
+
 
    infiniband setting (section)PropertyKeyfile VariableFormatDescriptionmac-addressmac-addressusual hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation, or or semicolon separated list of 20 decimal bytes (obsolete)
 
@@ -199,6 +200,7 @@ Example: parity=n
 
 
 
+
 
    
 
    vpn setting (section)PropertyKeyfile VariableFormatDescriptiondataseparate variables named after keys of the dictionaryThe keys of the data dictionary are used as variable names directly under [vpn] section.
 
diff --git a/man/nm-settings.5 b/man/nm-settings.5
index 0d91c79d..543179c1 100644
--- a/man/nm-settings.5
+++ b/man/nm-settings.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 
-.\"      Date: 02/15/2017
+.\"      Date: 05/10/2017
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.6.2
+.\"    Source: NetworkManager 1.8.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.6\&.2" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.8\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -58,12 +58,9 @@ that allows direct configuration of the settings and properties according to a c
 connection editor has also a built\-in
 \fIdescribe\fR
 command that can display description of particular settings and properties of this page\&.
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&1.\ \&802\-1x setting
+.SS "connection setting"
+.PP
+General Connection Profile Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -96,6 +93,234 @@ l l l l
 l l l l
 l l l l
 l l l l
+l l l l.
+T{
+autoconnect
+T}:T{
+boolean
+T}:T{
+TRUE
+T}:T{
+Whether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available\&. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection\&.
+T}
+T{
+autoconnect\-priority
+T}:T{
+int32
+T}:T{
+0
+T}:T{
+The autoconnect priority\&. If the connection is set to autoconnect, connections with higher priority will be preferred\&. Defaults to 0\&. The higher number means higher priority\&.
+T}
+T{
+autoconnect\-retries
+T}:T{
+int32
+T}:T{
+\-1
+T}:T{
+The number of times a connection should be tried when autoctivating before giving up\&. Zero means forever, \-1 means the global default (4 times if not overridden)\&.
+T}
+T{
+autoconnect\-slaves
+T}:T{
+NMSettingConnectionAutoconnectSlaves (int32)
+T}:T{
+\ \&
+T}:T{
+Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection\&. This only has a real effect for master connections\&. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, \-1: default\&. If \-1 (default) is set, global connection\&.autoconnect\-slaves is read to determine the real value\&. If it is default as well, this fallbacks to 0\&.
+T}
+T{
+gateway\-ping\-timeout
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping\&.
+T}
+T{
+id
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+A human readable unique identifier for the connection, like "Work Wi\-Fi" or "T\-Mobile 3G"\&.
+T}
+T{
+interface\-name
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The name of the network interface this connection is bound to\&. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings)\&. For software devices this specifies the name of the created device\&. For connection types where interface names cannot easily be made persistent (e\&.g\&. mobile broadband or USB Ethernet), this property should not be used\&. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface\&.
+T}
+T{
+lldp
+T}:T{
+int32
+T}:T{
+\-1
+T}:T{
+Whether LLDP is enabled for the connection\&.
+T}
+T{
+master
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Interface name of the master device or UUID of the master connection\&.
+T}
+T{
+metered
+T}:T{
+NMMetered (int32)
+T}:T{
+\ \&
+T}:T{
+Whether the connection is metered\&. When updating this property on a currently activated connection, the change takes effect immediately\&.
+T}
+T{
+name
+T}:T{
+string
+T}:T{
+connection
+T}:T{
+The setting\*(Aqs 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"\&.
+T}
+T{
+permissions
+T}:T{
+array of string
+T}:T{
+[]
+T}:T{
+An array of strings defining what access a given user has to this connection\&.  If this is NULL or empty, all users are allowed to access this connection\&.  Otherwise a user is allowed to access this connection if and only if they are in this list\&. Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah"\&. At this time only the "user" [type] is allowed\&.  Any other values are ignored and reserved for future use\&.  [id] is the username that this permission refers to, which may not contain the ":" character\&. Any [reserved] information present must be ignored and is reserved for future use\&.  All of [type], [id], and [reserved] must be valid UTF\-8\&.
+T}
+T{
+read\-only
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+FALSE if the connection can be modified using the provided settings service\*(Aqs D\-Bus interface with the right privileges, or TRUE if the connection is read\-only and cannot be modified\&.
+T}
+T{
+secondaries
+T}:T{
+array of string
+T}:T{
+[]
+T}:T{
+List of connection UUIDs that should be activated when the base connection itself is activated\&. Currently only VPN connections are supported\&.
+T}
+T{
+slave\-type
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Setting name of the device type of this slave\*(Aqs master connection (eg, "bond"), or NULL if this connection is not a slave\&.
+T}
+T{
+stable\-id
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Token to generate stable IDs for the connection\&. The stable\-id is used for generating IPv6 stable private addresses with ipv6\&.addr\-gen\-mode=stable\-privacy\&. It is also used to seed the generated cloned MAC address for ethernet\&.cloned\-mac\-address=stable and wifi\&.cloned\-mac\-address=stable\&. Note that also the interface name of the activating connection and a per\-host secret key is included into the address generation so that the same stable\-id on different hosts/devices yields different addresses\&. If the value is unset, an ID unique for the connection is used\&. Specifing a stable\-id allows multiple connections to generate the same addresses\&. Another use is to generate IDs at runtime via dynamic substitutions\&. The \*(Aq$\*(Aq character is treated special to perform dynamic substitutions at runtime\&. Currently supported are "${CONNECTION}", "${BOOT}", "${RANDOM}"\&. These effectively create unique IDs per\-connection, per\-boot, or every time\&. Any unrecognized patterns following \*(Aq$\*(Aq are treated verbatim, however are reserved for future use\&. You are thus advised to avoid \*(Aq$\*(Aq or escape it as "$$"\&. For example, set it to "${CONNECTION}/${BOOT}" to create a unique id for this connection that changes with every reboot\&. Note that two connections only use the same effective id if their stable\-id is also identical before performing dynamic substitutions\&.
+T}
+T{
+timestamp
+T}:T{
+uint64
+T}:T{
+0
+T}:T{
+The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated\&. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp\&. The property is only meant for reading (changes to this property will not be preserved)\&.
+T}
+T{
+type
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Base type of the connection\&. For hardware\-dependent connections, should contain the setting name of the hardware\-type specific setting (ie, "802\-3\-ethernet" or "802\-11\-wireless" or "bluetooth", etc), and for non\-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc)\&.
+T}
+T{
+uuid
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+A universally unique identifier for the connection, for example generated with libuuid\&.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network\&.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re\-created when the Wi\-Fi SSID, mobile broadband network provider, or "type" property changes\&. The UUID must be in the format "2815492f\-7e56\-435e\-b2e9\-246bd7cdc664" (ie, contains only hexadecimal characters and "\-")\&.
+T}
+T{
+zone
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The trust level of a the connection\&.  Free form case\-insensitive string (for example "Home", "Work", "Public")\&.  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall\&. When updating this property on a currently activated connection, the change takes effect immediately\&.
+T}
+.TE
+.sp 1
+.SS "802\-1x setting"
+.PP
+AIEEE 802\&.1x Authentication Settings\&.
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
 l l l l
 l l l l
 l l l l
@@ -131,6 +356,15 @@ T}:T{
 Anonymous identity string for EAP authentication methods\&.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP\-TTLS\&.
 T}
 T{
+auth\-timeout
+T}:T{
+int32
+T}:T{
+0
+T}:T{
+A timeout for the authentication\&. Zero means the global default; if the global default is not set, the authentication timeout is 25 seconds\&.
+T}
+T{
 ca\-cert
 T}:T{
 byte array
@@ -140,6 +374,24 @@ T}:T{
 Contains the CA certificate if used by the EAP method specified in the "eap" property\&. Certificate data is specified using a "scheme"; two are currently supported: blob and path\&. When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&. When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte\&. This property can be unset even if the EAP method supports CA certificates, but this allows man\-in\-the\-middle attacks and is NOT recommended\&.
 T}
 T{
+ca\-cert\-password
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The password used to access the CA certificate stored in "ca\-cert" property\&. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login\&.
+T}
+T{
+ca\-cert\-password\-flags
+T}:T{
+NMSettingSecretFlags (uint32)
+T}:T{
+\ \&
+T}:T{
+Flags indicating how to handle the "ca\-cert\-password" property\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
 ca\-path
 T}:T{
 string
@@ -158,6 +410,24 @@ T}:T{
 Contains the client certificate if used by the EAP method specified in the "eap" property\&. Certificate data is specified using a "scheme"; two are currently supported: blob and path\&. When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&. When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte\&.
 T}
 T{
+client\-cert\-password
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The password used to access the client certificate stored in "client\-cert" property\&. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login\&.
+T}
+T{
+client\-cert\-password\-flags
+T}:T{
+NMSettingSecretFlags (uint32)
+T}:T{
+\ \&
+T}:T{
+Flags indicating how to handle the "client\-cert\-password" property\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
 domain\-suffix\-match
 T}:T{
 string
@@ -239,6 +509,15 @@ T}:T{
 Flags indicating how to handle the "password\-raw" property\&. (see the section called \(lqSecret flag types:\(rq for flag values)
 T}
 T{
+phase1\-auth\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Specifies authentication flags to use in "phase 1" outer authentication using NMSetting8021xAuthFlags options\&. The invidual TLS versions can be explicitly disabled\&. If a certain TLS disable flag is not set, it is up to the supplicant to allow or forbid it\&. The TLS options map to tls_disable_tlsv1_x settings\&. See the wpa_supplicant documentation for more details\&.
+T}
+T{
 phase1\-fast\-provisioning
 T}:T{
 string
@@ -277,47 +556,83 @@ T}
 T{
 phase2\-auth
 T}:T{
-string
+string
+T}:T{
+\ \&
+T}:T{
+Specifies the allowed "phase 2" inner non\-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property\&.  Recognized non\-EAP "phase 2" methods are "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls"\&. Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details\&.
+T}
+T{
+phase2\-autheap
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Specifies the allowed "phase 2" inner EAP\-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property\&.  Recognized EAP\-based "phase 2" methods are "md5", "mschapv2", "otp", "gtc", and "tls"\&. Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details\&.
+T}
+T{
+phase2\-ca\-cert
+T}:T{
+byte array
+T}:T{
+\ \&
+T}:T{
+Contains the "phase 2" CA certificate if used by the EAP method specified in the "phase2\-auth" or "phase2\-autheap" properties\&. Certificate data is specified using a "scheme"; two are currently supported: blob and path\&. When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&. When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte\&. This property can be unset even if the EAP method supports CA certificates, but this allows man\-in\-the\-middle attacks and is NOT recommended\&.
+T}
+T{
+phase2\-ca\-cert\-password
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The password used to access the "phase2" CA certificate stored in "phase2\-ca\-cert" property\&. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login\&.
+T}
+T{
+phase2\-ca\-cert\-password\-flags
+T}:T{
+NMSettingSecretFlags (uint32)
 T}:T{
 \ \&
 T}:T{
-Specifies the allowed "phase 2" inner non\-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property\&.  Recognized non\-EAP "phase 2" methods are "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls"\&. Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details\&.
+Flags indicating how to handle the "phase2\-ca\-cert\-password" property\&. (see the section called \(lqSecret flag types:\(rq for flag values)
 T}
 T{
-phase2\-autheap
+phase2\-ca\-path
 T}:T{
 string
 T}:T{
 \ \&
 T}:T{
-Specifies the allowed "phase 2" inner EAP\-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property\&.  Recognized EAP\-based "phase 2" methods are "md5", "mschapv2", "otp", "gtc", and "tls"\&. Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details\&.
+UTF\-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the "phase2\-ca\-cert" property\&.
 T}
 T{
-phase2\-ca\-cert
+phase2\-client\-cert
 T}:T{
 byte array
 T}:T{
 \ \&
 T}:T{
-Contains the "phase 2" CA certificate if used by the EAP method specified in the "phase2\-auth" or "phase2\-autheap" properties\&. Certificate data is specified using a "scheme"; two are currently supported: blob and path\&. When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&. When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte\&. This property can be unset even if the EAP method supports CA certificates, but this allows man\-in\-the\-middle attacks and is NOT recommended\&.
+Contains the "phase 2" client certificate if used by the EAP method specified in the "phase2\-auth" or "phase2\-autheap" properties\&. Certificate data is specified using a "scheme"; two are currently supported: blob and path\&. When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&. When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte\&. This property can be unset even if the EAP method supports CA certificates, but this allows man\-in\-the\-middle attacks and is NOT recommended\&.
 T}
 T{
-phase2\-ca\-path
+phase2\-client\-cert\-password
 T}:T{
 string
 T}:T{
 \ \&
 T}:T{
-UTF\-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the "phase2\-ca\-cert" property\&.
+The password used to access the "phase2" client certificate stored in "phase2\-client\-cert" property\&. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login\&.
 T}
 T{
-phase2\-client\-cert
+phase2\-client\-cert\-password\-flags
 T}:T{
-byte array
+NMSettingSecretFlags (uint32)
 T}:T{
 \ \&
 T}:T{
-Contains the "phase 2" client certificate if used by the EAP method specified in the "phase2\-auth" or "phase2\-autheap" properties\&. Certificate data is specified using a "scheme"; two are currently supported: blob and path\&. When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&. When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte\&. This property can be unset even if the EAP method supports CA certificates, but this allows man\-in\-the\-middle attacks and is NOT recommended\&.
+Flags indicating how to handle the "phase2\-client\-cert\-password" property\&. (see the section called \(lqSecret flag types:\(rq for flag values)
 T}
 T{
 phase2\-domain\-suffix\-match
@@ -335,7 +650,7 @@ byte array
 T}:T{
 \ \&
 T}:T{
-Contains the "phase 2" inner private key when the "phase2\-auth" or "phase2\-autheap" property is set to "tls"\&. Key data is specified using a "scheme"; two are currently supported: blob and path\&. When using the blob scheme and private keys, this property should be set to the key\*(Aqs encrypted PEM encoded data\&. When using private keys with the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte\&. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2\-private\-key\-password" property must be set to password used to decrypt the PKCS#12 certificate and key\&. When using PKCS#12 files and the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "phase2\-private\-key\-password" property must be set to the password used to decode the PKCS#12 private key and certificate\&.
+Contains the "phase 2" inner private key when the "phase2\-auth" or "phase2\-autheap" property is set to "tls"\&. Key data is specified using a "scheme"; two are currently supported: blob and path\&. When using the blob scheme and private keys, this property should be set to the key\*(Aqs encrypted PEM encoded data\&. When using private keys with the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte\&. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2\-private\-key\-password" property must be set to password used to decrypt the PKCS#12 certificate and key\&. When using PKCS#12 files and the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "phase2\-private\-key\-password" property must be set to the password used to decode the PKCS#12 private key and certificate\&.
 T}
 T{
 phase2\-private\-key\-password
@@ -389,7 +704,7 @@ byte array
 T}:T{
 \ \&
 T}:T{
-Contains the private key when the "eap" property is set to "tls"\&. Key data is specified using a "scheme"; two are currently supported: blob and path\&. When using the blob scheme and private keys, this property should be set to the key\*(Aqs encrypted PEM encoded data\&. When using private keys with the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte\&. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private\-key\-password" property must be set to password used to decrypt the PKCS#12 certificate and key\&. When using PKCS#12 files and the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "private\-key\-password" property must be set to the password used to decode the PKCS#12 private key and certificate\&. WARNING: "private\-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users\&.  Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data\&.
+Contains the private key when the "eap" property is set to "tls"\&. Key data is specified using a "scheme"; two are currently supported: blob and path\&. When using the blob scheme and private keys, this property should be set to the key\*(Aqs encrypted PEM encoded data\&. When using private keys with the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte\&. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private\-key\-password" property must be set to password used to decrypt the PKCS#12 certificate and key\&. When using PKCS#12 files and the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "private\-key\-password" property must be set to the password used to decode the PKCS#12 private key and certificate\&. WARNING: "private\-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users\&.  Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data\&.
 T}
 T{
 private\-key\-password
@@ -429,12 +744,9 @@ When TRUE, overrides the "ca\-path" and "phase2\-ca\-path" properties using the
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&2.\ \&adsl setting
+.SS "adsl setting"
+.PP
+ADSL Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -530,12 +842,9 @@ VPI of ADSL connection
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&3.\ \&bluetooth setting
+.SS "bluetooth setting"
+.PP
+Bluetooth Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -581,12 +890,9 @@ Either "dun" for Dial\-Up Networking connections or "panu" for Personal Area Net
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&4.\ \&bond setting
+.SS "bond setting"
+.PP
+Bonding Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -632,12 +938,9 @@ Dictionary of key/value pairs of bonding options\&.  Both keys and values must b
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&5.\ \&bridge setting
+.SS "bridge setting"
+.PP
+Bridging Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -707,411 +1010,191 @@ T}:T{
 If specified, the MAC address of bridge\&. When creating a new bridge, this MAC address will be set\&. When matching an existing (outside NetworkManager created) bridge, this MAC address must match\&.
 T}
 T{
-max\-age
-T}:T{
-uint32
-T}:T{
-20
-T}:T{
-The Spanning Tree Protocol (STP) maximum message age, in seconds\&.
-T}
-T{
-multicast\-snooping
-T}:T{
-boolean
-T}:T{
-TRUE
-T}:T{
-Controls whether IGMP snooping is enabled for this bridge\&. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved\&.
-T}
-T{
-name
-T}:T{
-string
-T}:T{
-bridge
-T}:T{
-The setting\*(Aqs 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"\&.
-T}
-T{
-priority
-T}:T{
-uint32
-T}:T{
-32768
-T}:T{
-Sets the Spanning Tree Protocol (STP) priority for this bridge\&.  Lower values are "better"; the lowest priority bridge will be elected the root bridge\&.
-T}
-T{
-stp
-T}:T{
-boolean
-T}:T{
-TRUE
-T}:T{
-Controls whether Spanning Tree Protocol (STP) is enabled for this bridge\&.
-T}
-.TE
-.sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&6.\ \&bridge\-port setting
-.TS
-allbox tab(:);
-lB lB lB lB.
-T{
-Key Name
-T}:T{
-Value Type
-T}:T{
-Default Value
-T}:T{
-Value Description
-T}
-.T&
-l l l l
-l l l l
-l l l l
-l l l l.
-T{
-hairpin\-mode
-T}:T{
-boolean
-T}:T{
-FALSE
-T}:T{
-Enables or disabled "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on\&.
-T}
-T{
-name
-T}:T{
-string
-T}:T{
-bridge\-port
-T}:T{
-The setting\*(Aqs 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"\&.
-T}
-T{
-path\-cost
-T}:T{
-uint32
-T}:T{
-100
-T}:T{
-The Spanning Tree Protocol (STP) port cost for destinations via this port\&.
-T}
-T{
-priority
-T}:T{
-uint32
-T}:T{
-32
-T}:T{
-The Spanning Tree Protocol (STP) priority of this bridge port\&.
-T}
-.TE
-.sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&7.\ \&cdma setting
-.TS
-allbox tab(:);
-lB lB lB lB.
-T{
-Key Name
-T}:T{
-Value Type
-T}:T{
-Default Value
-T}:T{
-Value Description
-T}
-.T&
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l.
-T{
-name
-T}:T{
-string
-T}:T{
-cdma
-T}:T{
-The setting\*(Aqs 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"\&.
-T}
-T{
-number
-T}:T{
-string
-T}:T{
-\ \&
-T}:T{
-The number to dial to establish the connection to the CDMA\-based mobile broadband network, if any\&.  If not specified, the default number (#777) is used when required\&.
-T}
-T{
-password
-T}:T{
-string
-T}:T{
-\ \&
-T}:T{
-The password used to authenticate with the network, if required\&.  Many providers do not require a password, or accept any password\&.  But if a password is required, it is specified here\&.
-T}
-T{
-password\-flags
-T}:T{
-NMSettingSecretFlags (uint32)
-T}:T{
-\ \&
-T}:T{
-Flags indicating how to handle the "password" property\&. (see the section called \(lqSecret flag types:\(rq for flag values)
-T}
-T{
-username
-T}:T{
-string
-T}:T{
-\ \&
-T}:T{
-The username used to authenticate with the network, if required\&.  Many providers do not require a username, or accept any username\&.  But if a username is required, it is specified here\&.
-T}
-.TE
-.sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&8.\ \&connection setting
-.TS
-allbox tab(:);
-lB lB lB lB.
-T{
-Key Name
-T}:T{
-Value Type
-T}:T{
-Default Value
-T}:T{
-Value Description
-T}
-.T&
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l
-l l l l.
-T{
-autoconnect
-T}:T{
-boolean
-T}:T{
-TRUE
-T}:T{
-Whether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available\&. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection\&.
-T}
-T{
-autoconnect\-priority
-T}:T{
-int32
-T}:T{
-0
-T}:T{
-The autoconnect priority\&. If the connection is set to autoconnect, connections with higher priority will be preferred\&. Defaults to 0\&. The higher number means higher priority\&.
-T}
-T{
-autoconnect\-retries
-T}:T{
-int32
-T}:T{
-\-1
-T}:T{
-The number of times a connection should be tried when autoctivating before giving up\&. Zero means forever, \-1 means the global default (4 times if not overridden)\&.
-T}
-T{
-autoconnect\-slaves
+max\-age
 T}:T{
-NMSettingConnectionAutoconnectSlaves (int32)
+uint32
 T}:T{
-\ \&
+20
 T}:T{
-Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection\&. This only has a real effect for master connections\&. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, \-1: default\&. If \-1 (default) is set, global connection\&.autoconnect\-slaves is read to determine the real value\&. If it is default as well, this fallbacks to 0\&.
+The Spanning Tree Protocol (STP) maximum message age, in seconds\&.
 T}
 T{
-gateway\-ping\-timeout
+multicast\-snooping
 T}:T{
-uint32
+boolean
 T}:T{
-0
+TRUE
 T}:T{
-If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping\&.
+Controls whether IGMP snooping is enabled for this bridge\&. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved\&.
 T}
 T{
-id
+name
 T}:T{
 string
 T}:T{
-\ \&
+bridge
 T}:T{
-A human readable unique identifier for the connection, like "Work Wi\-Fi" or "T\-Mobile 3G"\&.
+The setting\*(Aqs 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"\&.
 T}
 T{
-interface\-name
+priority
 T}:T{
-string
+uint32
 T}:T{
-\ \&
+32768
 T}:T{
-The name of the network interface this connection is bound to\&. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings)\&. For software devices this specifies the name of the created device\&. For connection types where interface names cannot easily be made persistent (e\&.g\&. mobile broadband or USB Ethernet), this property should not be used\&. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface\&.
+Sets the Spanning Tree Protocol (STP) priority for this bridge\&.  Lower values are "better"; the lowest priority bridge will be elected the root bridge\&.
 T}
 T{
-lldp
+stp
 T}:T{
-int32
+boolean
 T}:T{
-\-1
+TRUE
 T}:T{
-Whether LLDP is enabled for the connection\&.
+Controls whether Spanning Tree Protocol (STP) is enabled for this bridge\&.
 T}
+.TE
+.sp 1
+.SS "bridge\-port setting"
+.PP
+Bridge Port Settings\&.
+.TS
+allbox tab(:);
+lB lB lB lB.
 T{
-master
+Key Name
 T}:T{
-string
+Value Type
 T}:T{
-\ \&
+Default Value
 T}:T{
-Interface name of the master device or UUID of the master connection\&.
+Value Description
 T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l.
 T{
-metered
+hairpin\-mode
 T}:T{
-NMMetered (int32)
+boolean
 T}:T{
-\ \&
+FALSE
 T}:T{
-Whether the connection is metered\&. When updating this property on a currently activated connection, the change takes effect immediately\&.
+Enables or disabled "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on\&.
 T}
 T{
 name
 T}:T{
 string
 T}:T{
-connection
+bridge\-port
 T}:T{
 The setting\*(Aqs 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"\&.
 T}
 T{
-permissions
+path\-cost
 T}:T{
-array of string
+uint32
 T}:T{
-[]
+100
 T}:T{
-An array of strings defining what access a given user has to this connection\&.  If this is NULL or empty, all users are allowed to access this connection\&.  Otherwise a user is allowed to access this connection if and only if they are in this list\&. Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah"\&. At this time only the "user" [type] is allowed\&.  Any other values are ignored and reserved for future use\&.  [id] is the username that this permission refers to, which may not contain the ":" character\&. Any [reserved] information present must be ignored and is reserved for future use\&.  All of [type], [id], and [reserved] must be valid UTF\-8\&.
+The Spanning Tree Protocol (STP) port cost for destinations via this port\&.
 T}
 T{
-read\-only
+priority
 T}:T{
-boolean
+uint32
 T}:T{
-FALSE
+32
 T}:T{
-FALSE if the connection can be modified using the provided settings service\*(Aqs D\-Bus interface with the right privileges, or TRUE if the connection is read\-only and cannot be modified\&.
+The Spanning Tree Protocol (STP) priority of this bridge port\&.
 T}
+.TE
+.sp 1
+.SS "cdma setting"
+.PP
+CDMA\-based Mobile Broadband Settings\&.
+.TS
+allbox tab(:);
+lB lB lB lB.
 T{
-secondaries
+Key Name
 T}:T{
-array of string
+Value Type
 T}:T{
-[]
+Default Value
 T}:T{
-List of connection UUIDs that should be activated when the base connection itself is activated\&. Currently only VPN connections are supported\&.
+Value Description
 T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
 T{
-slave\-type
+mtu
 T}:T{
-string
+uint32
 T}:T{
-\ \&
+0
 T}:T{
-Setting name of the device type of this slave\*(Aqs master connection (eg, "bond"), or NULL if this connection is not a slave\&.
+If non\-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames\&.
 T}
 T{
-stable\-id
+name
 T}:T{
 string
 T}:T{
-\ \&
+cdma
 T}:T{
-Token to generate stable IDs for the connection\&. The stable\-id is used for generating IPv6 stable private addresses with ipv6\&.addr\-gen\-mode=stable\-privacy\&. It is also used to seed the generated cloned MAC address for ethernet\&.cloned\-mac\-address=stable and wifi\&.cloned\-mac\-address=stable\&. Note that also the interface name of the activating connection and a per\-host secret key is included into the address generation so that the same stable\-id on different hosts/devices yields different addresses\&. If the value is unset, an ID unique for the connection is used\&. Specifing a stable\-id allows multiple connections to generate the same addresses\&. Another use is to generate IDs at runtime via dynamic substitutions\&. The \*(Aq$\*(Aq character is treated special to perform dynamic substitutions at runtime\&. Currently supported are "${CONNECTION}", "${BOOT}", "${RANDOM}"\&. These effectively create unique IDs per\-connection, per\-boot, or every time\&. Any unrecognized patterns following \*(Aq$\*(Aq are treated verbatim, however are reserved for future use\&. You are thus advised to avoid \*(Aq$\*(Aq or escape it as "$$"\&. For example, set it to "${CONNECTION}/${BOOT}" to create a unique id for this connection that changes with every reboot\&. Note that two connections only use the same effective id if their stable\-id is also identical before performing dynamic substitutions\&.
+The setting\*(Aqs 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"\&.
 T}
 T{
-timestamp
+number
 T}:T{
-uint64
+string
 T}:T{
-0
+\ \&
 T}:T{
-The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated\&. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp\&. The property is only meant for reading (changes to this property will not be preserved)\&.
+The number to dial to establish the connection to the CDMA\-based mobile broadband network, if any\&.  If not specified, the default number (#777) is used when required\&.
 T}
 T{
-type
+password
 T}:T{
 string
 T}:T{
 \ \&
 T}:T{
-Base type of the connection\&. For hardware\-dependent connections, should contain the setting name of the hardware\-type specific setting (ie, "802\-3\-ethernet" or "802\-11\-wireless" or "bluetooth", etc), and for non\-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc)\&.
+The password used to authenticate with the network, if required\&.  Many providers do not require a password, or accept any password\&.  But if a password is required, it is specified here\&.
 T}
 T{
-uuid
+password\-flags
 T}:T{
-string
+NMSettingSecretFlags (uint32)
 T}:T{
 \ \&
 T}:T{
-A universally unique identifier for the connection, for example generated with libuuid\&.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network\&.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re\-created when the Wi\-Fi SSID, mobile broadband network provider, or "type" property changes\&. The UUID must be in the format "2815492f\-7e56\-435e\-b2e9\-246bd7cdc664" (ie, contains only hexadecimal characters and "\-")\&.
+Flags indicating how to handle the "password" property\&. (see the section called \(lqSecret flag types:\(rq for flag values)
 T}
 T{
-zone
+username
 T}:T{
 string
 T}:T{
 \ \&
 T}:T{
-The trust level of a the connection\&.  Free form case\-insensitive string (for example "Home", "Work", "Public")\&.  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall\&. When updating this property on a currently activated connection, the change takes effect immediately\&.
+The username used to authenticate with the network, if required\&.  Many providers do not require a username, or accept any username\&.  But if a username is required, it is specified here\&.
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&9.\ \&dcb setting
+.SS "dcb setting"
+.PP
+Data Center Bridging Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -1287,12 +1370,37 @@ An array of 8 uint values, where the array index corresponds to the User Priorit
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&10.\ \&generic setting
+.SS "dummy setting"
+.PP
+Dummy Link Settings\&.
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+dummy
+T}:T{
+The setting\*(Aqs 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"\&.
+T}
+.TE
+.sp 1
+.SS "generic setting"
+.PP
+Generic Link Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -1318,12 +1426,9 @@ The setting\*(Aqs name, which uniquely identifies the setting within the connect
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&11.\ \&gsm setting
+.SS "gsm setting"
+.PP
+GSM\-based Mobile Broadband Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -1349,6 +1454,7 @@ l l l l
 l l l l
 l l l l
 l l l l
+l l l l
 l l l l.
 T{
 apn
@@ -1378,6 +1484,15 @@ T}:T{
 When TRUE, only connections to the home network will be allowed\&. Connections to roaming networks will not be made\&.
 T}
 T{
+mtu
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames\&.
+T}
+T{
 name
 T}:T{
 string
@@ -1469,12 +1584,9 @@ The username used to authenticate with the network, if required\&.  Many provide
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&12.\ \&infiniband setting
+.SS "infiniband setting"
+.PP
+Infiniband Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -1550,12 +1662,9 @@ The IP\-over\-InfiniBand transport mode\&. Either "datagram" or "connected"\&.
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&13.\ \&ipv4 setting
+.SS "ipv4 setting"
+.PP
+IPv4 Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -1791,12 +1900,9 @@ Deprecated in favor of the \*(Aqroute\-data\*(Aq property, but this can be used
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&14.\ \&ipv6 setting
+.SS "ipv6 setting"
+.PP
+IPv6 Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2042,12 +2148,9 @@ Configure the token for draft\-chown\-6man\-tokenised\-ipv6\-identifiers\-02 IPv
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&15.\ \&ip\-tunnel setting
+.SS "ip\-tunnel setting"
+.PP
+IP Tunneling Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2193,12 +2296,9 @@ The TTL to assign to tunneled packets\&. 0 is a special value meaning that packe
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&16.\ \&macsec setting
+.SS "macsec setting"
+.PP
+MACSec Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2304,12 +2404,9 @@ Specifies the validation mode for incoming frames\&.
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&17.\ \&macvlan setting
+.SS "macvlan setting"
+.PP
+MAC VLAN Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2375,12 +2472,9 @@ Whether the interface should be a MACVTAP\&.
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&18.\ \&802\-11\-olpc\-mesh setting
+.SS "802\-11\-olpc\-mesh setting"
+.PP
+OLPC Wireless Mesh Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2436,12 +2530,9 @@ SSID of the mesh network to join\&.
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&19.\ \&ppp setting
+.SS "ppp setting"
+.PP
+Point\-to\-Point Protocol Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2647,12 +2738,9 @@ If TRUE, 128\-bit MPPE (Microsoft Point\-to\-Point Encrpytion) will be required
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&20.\ \&pppoe setting
+.SS "pppoe setting"
+.PP
+PPP\-over\-Ethernet Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2718,12 +2806,9 @@ Username used to authenticate with the PPPoE service\&.
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&21.\ \&proxy setting
+.SS "proxy setting"
+.PP
+WWW Proxy Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2789,12 +2874,9 @@ PAC URL for obtaining PAC file\&.
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&22.\ \&serial setting
+.SS "serial setting"
+.PP
+Serial Link Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2870,12 +2952,9 @@ Number of stop bits for communication on the serial port\&.  Either 1 or 2\&. Th
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&23.\ \&team setting
+.SS "team setting"
+.PP
+Teaming Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2921,12 +3000,9 @@ The setting\*(Aqs name, which uniquely identifies the setting within the connect
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&24.\ \&team\-port setting
+.SS "team\-port setting"
+.PP
+Team Port Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2962,12 +3038,9 @@ The setting\*(Aqs name, which uniquely identifies the setting within the connect
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&25.\ \&tun setting
+.SS "tun setting"
+.PP
+Tunnel Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -3053,12 +3126,47 @@ If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network header
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&26.\ \&vlan setting
+.SS "user setting"
+.PP
+General User Profile Settings\&.
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l.
+T{
+data
+T}:T{
+dict of string to string
+T}:T{
+{}
+T}:T{
+A dictionary of key/value pairs with user data\&. This data is ignored by NetworkManager and can be used at the users discretion\&. The keys only support a strict ascii format, but the values can be arbitrary UTF8 strings up to a certain length\&.
+T}
+T{
+name
+T}:T{
+string
+T}:T{
+user
+T}:T{
+The setting\*(Aqs 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"\&.
+T}
+.TE
+.sp 1
+.SS "vlan setting"
+.PP
+VLAN Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -3144,12 +3252,9 @@ If given, specifies the parent interface name or parent connection UUID from whi
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&27.\ \&vpn setting
+.SS "vpn setting"
+.PP
+VPN Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -3235,12 +3340,9 @@ If the VPN connection requires a user name for authentication, that name should
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&28.\ \&vxlan setting
+.SS "vxlan setting"
+.PP
+VXLAN Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -3426,12 +3528,9 @@ Specifies the time\-to\-live value to use in outgoing packets\&.
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&29.\ \&wimax setting
+.SS "wimax setting"
+.PP
+WiMax Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -3477,12 +3576,9 @@ Network Service Provider (NSP) name of the WiMAX network this connection should
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&30.\ \&802\-3\-ethernet setting
+.SS "802\-3\-ethernet setting"
+.PP
+Wired Ethernet Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -3658,12 +3754,9 @@ If specified, the password used with magic\-packet\-based Wake\-on\-LAN, represe
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&31.\ \&802\-11\-wireless setting
+.SS "802\-11\-wireless setting"
+.PP
+Wi\-Fi Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -3869,12 +3962,9 @@ If non\-zero, directs the device to use the specified transmit power\&. Units ar
 T}
 .TE
 .sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&32.\ \&802\-11\-wireless\-security setting
+.SS "802\-11\-wireless\-security setting"
+.PP
+Wi\-Fi Security Settings\&.
 .TS
 allbox tab(:);
 lB lB lB lB.
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index f3a594e8..1ceee6f4 100644
--- a/man/nm-settings.xml
+++ b/man/nm-settings.xml
@@ -1,6 +1,6 @@
 
 
-nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.6.2nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription
+nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.8.0nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription
           NetworkManager is based on a concept of connection profiles, sometimes referred to as
           connections only. These connection profiles contain a network configuration. When
           NetworkManager activates a connection profile on a network device the configuration will
@@ -33,12 +33,39 @@
               describe command that can display description of particular settings
               and properties of this page.
             
-  
    
 
    802-1x settingKey NameValue TypeDefault ValueValue Description
+  connection settingGeneral Connection Profile Settings.Key NameValue TypeDefault ValueValue Description
+    autoconnectbooleanTRUEWhether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.
+    autoconnect-priorityint320The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.
+    autoconnect-retriesint32-1The number of times a connection should be tried when autoctivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden).
+    autoconnect-slavesNMSettingConnectionAutoconnectSlaves (int32)Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.
+    gateway-ping-timeoutuint320If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.
+    idstringA human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".
+    interface-namestringThe name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.
+    lldpint32-1Whether LLDP is enabled for the connection.
+    masterstringInterface name of the master device or UUID of the master connection.
+    meteredNMMetered (int32)Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.
+    namestringconnectionThe 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".
+    permissionsarray of string[]An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this list. Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". At this time only the "user" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ":" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.
+    read-onlybooleanFALSEFALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.
+    secondariesarray of string[]List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.
+    slave-typestringSetting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
+    stable-idstringToken to generate stable IDs for the connection. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note that also the interface name of the activating connection and a per-host secret key is included into the address generation so that the same stable-id on different hosts/devices yields different addresses. If the value is unset, an ID unique for the connection is used. Specifing a stable-id allows multiple connections to generate the same addresses. Another use is to generate IDs at runtime via dynamic substitutions. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are "${CONNECTION}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-boot, or every time. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as "$$". For example, set it to "${CONNECTION}/${BOOT}" to create a unique id for this connection that changes with every reboot. Note that two connections only use the same effective id if their stable-id is also identical before performing dynamic substitutions.
+    timestampuint640The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).
+    typestringBase type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).
+    uuidstringA universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").
+    zonestringThe trust level of a the connection.  Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.
+  
+  802-1x settingAIEEE 802.1x Authentication Settings.Key NameValue TypeDefault ValueValue Descriptionaltsubject-matchesarray of string[]List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed.anonymous-identitystringAnonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.
+    auth-timeoutint320A timeout for the authentication. Zero means the global default; if the global default is not set, the authentication timeout is 25 seconds.ca-certbyte arrayContains the CA certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
+    ca-cert-passwordstringThe password used to access the CA certificate stored in "ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.
+    ca-cert-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "ca-cert-password" property. (see  for flag values)ca-pathstringUTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the "ca-cert" property.client-certbyte arrayContains the client certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte.
+    client-cert-passwordstringThe password used to access the client certificate stored in "client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.
+    client-cert-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "client-cert-password" property. (see  for flag values)domain-suffix-matchstringConstraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.eaparray of string[]The allowed EAP method to be used when authenticating to the network with 802.1x.  Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd", and "fast".  Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.identitystringIdentity string for EAP authentication methods.  Often the user's user or login name.
@@ -48,6 +75,7 @@
     password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property. (see  for flag values)password-rawbyte arrayPassword used for EAP authentication methods, given as a byte array to allow passwords in other encodings than UTF-8 to be used. If both the "password" property and the "password-raw" property are specified, "password" is preferred.password-raw-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password-raw" property. (see  for flag values)
+    phase1-auth-flagsuint320Specifies authentication flags to use in "phase 1" outer authentication using NMSetting8021xAuthFlags options. The invidual TLS versions can be explicitly disabled. If a certain TLS disable flag is not set, it is up to the supplicant to allow or forbid it. The TLS options map to tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more details.phase1-fast-provisioningstringEnables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the "eap" property. Recognized values are "0" (disabled), "1" (allow unauthenticated provisioning), "2" (allow authenticated provisioning), and "3" (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.phase1-peaplabelstringForces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to "1" to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.phase1-peapverstringForces which PEAP version is used when PEAP is set as the EAP method in the "eap" property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to "0" or "1" to force that specific PEAP version.
@@ -55,22 +83,26 @@
     phase2-authstringSpecifies the allowed "phase 2" inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property.  Recognized non-EAP "phase 2" methods are "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.phase2-autheapstringSpecifies the allowed "phase 2" inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the "eap" property.  Recognized EAP-based "phase 2" methods are "md5", "mschapv2", "otp", "gtc", and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.phase2-ca-certbyte arrayContains the "phase 2" CA certificate if used by the EAP method specified in the "phase2-auth" or "phase2-autheap" properties. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
+    phase2-ca-cert-passwordstringThe password used to access the "phase2" CA certificate stored in "phase2-ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.
+    phase2-ca-cert-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "phase2-ca-cert-password" property. (see  for flag values)phase2-ca-pathstringUTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the "phase2-ca-cert" property.phase2-client-certbyte arrayContains the "phase 2" client certificate if used by the EAP method specified in the "phase2-auth" or "phase2-autheap" properties. Certificate data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string "file://" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
+    phase2-client-cert-passwordstringThe password used to access the "phase2" client certificate stored in "phase2-client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.
+    phase2-client-cert-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "phase2-client-cert-password" property. (see  for flag values)phase2-domain-suffix-matchstringConstraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server during the inner "phase 2" authentication.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
-    phase2-private-keybyte arrayContains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate.
+    phase2-private-keybyte arrayContains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate.phase2-private-key-passwordstringThe password used to decrypt the "phase 2" private key specified in the "phase2-private-key" property when the private key either uses the path scheme, or is a PKCS#12 format key.phase2-private-key-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "phase2-private-key-password" property. (see  for flag values)phase2-subject-matchstringSubstring to be matched against the subject of the certificate presented by the authentication server during the inner "phase 2" authentication. When unset, no verification of the authentication server certificate's subject is performed.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:phase2-domain-suffix-match.pinstringPIN used for EAP authentication methods.pin-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "pin" property. (see  for flag values)
-    private-keybyte arrayContains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users.  Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data.
+    private-keybyte arrayContains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users.  Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data.private-key-passwordstringThe password used to decrypt the private key specified in the "private-key" property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.private-key-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "private-key-password" property. (see  for flag values)subject-matchstringSubstring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match.system-ca-certsbooleanFALSEWhen TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides "ca-cert" and "phase2-ca-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).
-  
    
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
     
    
-  adsl settingKey NameValue TypeDefault ValueValue Description
+  
+  adsl settingADSL Settings.Key NameValue TypeDefault ValueValue DescriptionencapsulationstringEncapsulation of ADSL connection.  Can be "vcmux" or "llc".namestringadslThe 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".passwordstringPassword used to authenticate with the ADSL service.
@@ -79,18 +111,18 @@
     usernamestringUsername used to authenticate with the ADSL service.vciuint320VCI of ADSL connectionvpiuint320VPI of ADSL connection
-  
    
     
     
     
     
     
    
-  bluetooth settingKey NameValue TypeDefault ValueValue Description
+  
+  bluetooth settingBluetooth Settings.Key NameValue TypeDefault ValueValue Descriptionbdaddrbyte arrayThe Bluetooth address of the device.namestringbluetoothThe 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".typestringEither "dun" for Dial-Up Networking connections or "panu" for Personal Area Networking connections to devices supporting the NAP profile.
-  
    
     
     
     
    
-  bond settingKey NameValue TypeDefault ValueValue Description
+  
+  bond settingBonding Settings.Key NameValue TypeDefault ValueValue Descriptioninterface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the bond's interface name.namestringbondThe 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".optionsdict of string to string{'mode': 'balance-rr'}Dictionary of key/value pairs of bonding options.  Both keys and values must be strings. Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
-  
    
     
     
     
    
-  bridge settingKey NameValue TypeDefault ValueValue Description
+  
+  bridge settingBridging Settings.Key NameValue TypeDefault ValueValue Descriptionageing-timeuint32300The Ethernet MAC address aging time, in seconds.forward-delayuint3215The Spanning Tree Protocol (STP) forwarding delay, in seconds.hello-timeuint322The Spanning Tree Protocol (STP) hello time, in seconds.
@@ -101,43 +133,22 @@
     namestringbridgeThe 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".priorityuint3232768Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are "better"; the lowest priority bridge will be elected the root bridge.stpbooleanTRUEControls whether Spanning Tree Protocol (STP) is enabled for this bridge.
-  
    
     
     
     
     
     
    
-  bridge-port settingKey NameValue TypeDefault ValueValue Description
+  
+  bridge-port settingBridge Port Settings.Key NameValue TypeDefault ValueValue Descriptionhairpin-modebooleanFALSEEnables or disabled "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on.namestringbridge-portThe 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".path-costuint32100The Spanning Tree Protocol (STP) port cost for destinations via this port.priorityuint3232The Spanning Tree Protocol (STP) priority of this bridge port.
-  
    
     
     
     
     
    
-  cdma settingKey NameValue TypeDefault ValueValue Description
+  
+  cdma settingCDMA-based Mobile Broadband Settings.Key NameValue TypeDefault ValueValue Description
+    mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.namestringcdmaThe 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".numberstringThe number to dial to establish the connection to the CDMA-based mobile broadband network, if any.  If not specified, the default number (#777) is used when required.passwordstringThe password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property. (see  for flag values)usernamestringThe username used to authenticate with the network, if required.  Many providers do not require a username, or accept any username.  But if a username is required, it is specified here.
-  
    
     
     
     
     
     
    
-  connection settingKey NameValue TypeDefault ValueValue Description
-    autoconnectbooleanTRUEWhether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.
-    autoconnect-priorityint320The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.
-    autoconnect-retriesint32-1The number of times a connection should be tried when autoctivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden).
-    autoconnect-slavesNMSettingConnectionAutoconnectSlaves (int32)Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.
-    gateway-ping-timeoutuint320If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.
-    idstringA human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".
-    interface-namestringThe name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.
-    lldpint32-1Whether LLDP is enabled for the connection.
-    masterstringInterface name of the master device or UUID of the master connection.
-    meteredNMMetered (int32)Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.
-    namestringconnectionThe 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".
-    permissionsarray of string[]An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this list. Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". At this time only the "user" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ":" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.
-    read-onlybooleanFALSEFALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.
-    secondariesarray of string[]List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.
-    slave-typestringSetting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
-    stable-idstringToken to generate stable IDs for the connection. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note that also the interface name of the activating connection and a per-host secret key is included into the address generation so that the same stable-id on different hosts/devices yields different addresses. If the value is unset, an ID unique for the connection is used. Specifing a stable-id allows multiple connections to generate the same addresses. Another use is to generate IDs at runtime via dynamic substitutions. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are "${CONNECTION}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-boot, or every time. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as "$$". For example, set it to "${CONNECTION}/${BOOT}" to create a unique id for this connection that changes with every reboot. Note that two connections only use the same effective id if their stable-id is also identical before performing dynamic substitutions.
-    timestampuint640The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).
-    typestringBase type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).
-    uuidstringA universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").
-    zonestringThe trust level of a the connection.  Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.
-  
    
-  dcb settingKey NameValue TypeDefault ValueValue Description
+  
+  dcb settingData Center Bridging Settings.Key NameValue TypeDefault ValueValue Descriptionapp-fcoe-flagsNMSettingDcbFlags (uint32)Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).app-fcoe-modestring"fabric"The FCoE controller mode; either "fabric" (default) or "vn2vn".app-fcoe-priorityint32-1The highest User Priority (0 - 7) which FCoE frames should use, or -1 for default priority.  Only used when the "app-fcoe-flags" property includes the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag.
@@ -154,14 +165,18 @@
     priority-group-idarray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed Priority Group ID values are 0 - 7 or 15 for the unrestricted group.priority-strict-bandwidtharray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 boolean values, where the array index corresponds to the User Priority (0 - 7) and the value indicates whether or not the priority may use all of the bandwidth allocated to its assigned group.priority-traffic-classarray of uint32[0, 0, 0, 0, 0, 0, 0, 0]An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which the priority is mapped.
-  
    
     
     
     
     
     
    
-  generic settingKey NameValue TypeDefault ValueValue Description
+  
+  dummy settingDummy Link Settings.Key NameValue TypeDefault ValueValue Description
+    namestringdummyThe 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".
+  
+  generic settingGeneric Link Settings.Key NameValue TypeDefault ValueValue DescriptionnamestringgenericThe 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".
-  
    
     
    
-  gsm settingKey NameValue TypeDefault ValueValue Description
+  
+  gsm settingGSM-based Mobile Broadband Settings.Key NameValue TypeDefault ValueValue DescriptionapnstringThe GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan. The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.device-idstringThe device unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will only apply to the specified device.home-onlybooleanFALSEWhen TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.
+    mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.namestringgsmThe 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".network-idstringThe Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.numberstringNumber to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.
@@ -172,16 +187,16 @@
     sim-idstringThe SIM card unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will apply to any device also allowed by "device-id" which contains a SIM card matching the given identifier.sim-operator-idstringA MCC/MNC string like "310260" or "21601" identifying the specific mobile network operator which this connection applies to.  If given, the connection will apply to any device also allowed by "device-id" and "sim-id" which contains a SIM card provisioined by the given operator.usernamestringThe username used to authenticate with the network, if required.  Many providers do not require a username, or accept any username.  But if a username is required, it is specified here.
-  
    
     
     
     
     
     
     
     
     
    
-  infiniband settingKey NameValue TypeDefault ValueValue Description
+  
+  infiniband settingInfiniband Settings.Key NameValue TypeDefault ValueValue Descriptionmac-addressbyte arrayIf specified, this connection will only apply to the IPoIB device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.namestringinfinibandThe 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".p-keyint32-1The InfiniBand P_Key to use for this device. A value of -1 means to use the default P_Key (aka "the P_Key at index 0").  Otherwise it is a 16-bit unsigned integer, whose high bit is set if it is a "full membership" P_Key.parentstringThe interface name of the parent device of this device. Normally NULL, but if the "p_key" property is set, then you must specify the base device by setting either this property or "mac-address".transport-modestringThe IP-over-InfiniBand transport mode. Either "datagram" or "connected".
-  
    
     
     
     
     
     
     
    
-  ipv4 settingKey NameValue TypeDefault ValueValue Description
+  
+  ipv4 settingIPv4 Settings.Key NameValue TypeDefault ValueValue Descriptionaddress-dataarray of vardictArray of IPv4 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.addressesarray of array of uint32[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.dad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds.
@@ -204,8 +219,8 @@
     route-dataarray of vardictArray of IPv4 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'gateway' entry, containing the gateway IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.route-metricint64-1The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is choosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.routesarray of array of uint32[]Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. If the metric is 0, NM will choose an appropriate default metric for the device. (There is no way to explicitly specify an actual metric of 0 with this property.)
-  
    
     
     
     
     
     
    
-  ipv6 settingKey NameValue TypeDefault ValueValue Description
+  
+  ipv6 settingIPv6 Settings.Key NameValue TypeDefault ValueValue Descriptionaddr-gen-modeint321Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection's stable-id and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.address-dataarray of vardictArray of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.addressesarray of legacy IPv6 address struct (a(ayuay))[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv6 address structures.  Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.
@@ -229,8 +244,8 @@
     route-metricint64-1The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is choosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.routesarray of legacy IPv6 route struct (a(ayuayu))[]Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv6 route structures.  Each IPv6 route structure is composed of an IPv6 address, a prefix length (1 - 128), an IPv6 next hop address (which may be zeroed out if there is no next hop), and a metric. If the metric is 0, NM will choose an appropriate default metric for the device.tokenstringConfigure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.
-  
    
     
     
     
     
     
    
-  ip-tunnel settingKey NameValue TypeDefault ValueValue Description
+  
+  ip-tunnel settingIP Tunneling Settings.Key NameValue TypeDefault ValueValue Descriptionencapsulation-limituint320How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.flow-labeluint320The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.input-keystringThe key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
@@ -244,8 +259,8 @@
     remotestringThe remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.tosuint320The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.ttluint320The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.
-  
    
     
     
     
     
     
    
-  macsec settingKey NameValue TypeDefault ValueValue Description
+  
+  macsec settingMACSec Settings.Key NameValue TypeDefault ValueValue DescriptionencryptbooleanTRUEWhether the transmitted traffic must be encrypted.mka-cakstringThe pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.mka-cak-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "mka-cak" property. (see  for flag values)
@@ -255,21 +270,21 @@
     parentstringIf given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.portint321The port component of the SCI (Secure Channel Identifier), between 1 and 65534.validationint322Specifies the validation mode for incoming frames.
-  
    
     
     
     
     
     
    
-  macvlan settingKey NameValue TypeDefault ValueValue Description
+  
+  macvlan settingMAC VLAN Settings.Key NameValue TypeDefault ValueValue Descriptionmodeuint320The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.namestringmacvlanThe 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".parentstringIf given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.promiscuousbooleanTRUEWhether the interface should be put in promiscuous mode.tapbooleanFALSEWhether the interface should be a MACVTAP.
-  
    
     
     
     
     
     
    
-  802-11-olpc-mesh settingKey NameValue TypeDefault ValueValue Description
+  
+  802-11-olpc-mesh settingOLPC Wireless Mesh Settings.Key NameValue TypeDefault ValueValue Descriptionchanneluint320Channel on which the mesh network to join is located.dhcp-anycast-addressbyte arrayAnycast DHCP MAC address used when requesting an IP address via DHCP. The specific anycast address used determines which DHCP server class answers the request.namestring802-11-olpc-meshThe 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".ssidbyte arraySSID of the mesh network to join.
-  
    
     
     
     
     
    
-  ppp settingKey NameValue TypeDefault ValueValue Description
+  
+  ppp settingPoint-to-Point Protocol Settings.Key NameValue TypeDefault ValueValue Descriptionbauduint320If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.crtsctsbooleanFALSEIf TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.lcp-echo-failureuint320If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The "lcp-echo-interval" property must also be set to a non-zero value if this property is used.
@@ -289,39 +304,39 @@
     refuse-papbooleanFALSEIf TRUE, the PAP authentication method will not be used.require-mppebooleanFALSEIf TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.require-mppe-128booleanFALSEIf TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the "require-mppe" property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.
-  
    
     
     
     
     
     
    
-  pppoe settingKey NameValue TypeDefault ValueValue Description
+  
+  pppoe settingPPP-over-Ethernet Settings.Key NameValue TypeDefault ValueValue DescriptionnamestringpppoeThe 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".passwordstringPassword used to authenticate with the PPPoE service.password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property. (see  for flag values)servicestringIf specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified service.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.usernamestringUsername used to authenticate with the PPPoE service.
-  
    
     
     
     
     
     
    
-  proxy settingKey NameValue TypeDefault ValueValue Description
+  
+  proxy settingWWW Proxy Settings.Key NameValue TypeDefault ValueValue Descriptionbrowser-onlybooleanFALSEWhether the proxy configuration is for browser only.methodint320Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)namestringproxyThe 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".pac-scriptstringPAC script for the connection.pac-urlstringPAC URL for obtaining PAC file.
-  
    
     
     
     
     
     
    
-  serial settingKey NameValue TypeDefault ValueValue Description
+  
+  serial settingSerial Link Settings.Key NameValue TypeDefault ValueValue Descriptionbauduint3257600Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.bitsuint328Byte-width of the serial communication. The 8 in "8n1" for example.namestringserialThe 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".paritybyteThe connection parity: 69 (ASCII 'E') for even parity, 111 (ASCII 'o') for odd, 110 (ASCII 'n') for none.send-delayuint640Time to delay between each byte sent to the modem, in microseconds.stopbitsuint321Number of stop bits for communication on the serial port.  Either 1 or 2. The 1 in "8n1" for example.
-  
    
     
     
     
     
     
     
    
-  team settingKey NameValue TypeDefault ValueValue Description
+  
+  team settingTeaming Settings.Key NameValue TypeDefault ValueValue DescriptionconfigstringThe JSON configuration for the team network interface.  The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used.  See man teamd.conf for the format details.interface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the team's interface name.namestringteamThe 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".
-  
    
     
     
     
    
-  team-port settingKey NameValue TypeDefault ValueValue Description
+  
+  team-port settingTeam Port Settings.Key NameValue TypeDefault ValueValue DescriptionconfigstringThe 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.namestringteam-portThe 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".
-  
    
     
     
    
-  tun settingKey NameValue TypeDefault ValueValue Description
+  
+  tun settingTunnel Settings.Key NameValue TypeDefault ValueValue DescriptiongroupstringThe group ID which will own the device. If set to NULL everyone will be able to use the device.modeuint321The 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.multi-queuebooleanFALSEIf 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.
@@ -329,8 +344,12 @@
     ownerstringThe user ID which will own the device. If set to NULL everyone will be able to use the device.pibooleanFALSEIf TRUE the interface will prepend a 4 byte header describing the physical interface to the packets.vnet-hdrbooleanFALSEIf TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network header.
-  
    
     
     
     
     
     
    
-  vlan settingKey NameValue TypeDefault ValueValue Description
+  
+  user settingGeneral User Profile Settings.Key NameValue TypeDefault ValueValue Description
+    datadict of string to string{}A dictionary of key/value pairs with user data. This data is ignored by NetworkManager and can be used at the users discretion. The keys only support a strict ascii format, but the values can be arbitrary UTF8 strings up to a certain length.
+    namestringuserThe 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".
+  
+  vlan settingVLAN Settings.Key NameValue TypeDefault ValueValue Descriptionegress-priority-maparray of string[]For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities.  The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".flagsNMVlanFlags (uint32)One or more flags which control the behavior and features of the VLAN interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of output packet headers), NM_VLAN_FLAG_GVRP (0x2) (use of the GVRP protocol), and NM_VLAN_FLAG_LOOSE_BINDING (0x4) (loose binding of the interface to its master device's operating state). NM_VLAN_FLAG_MVRP (0x8) (use of the MVRP protocol). The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.iduint320The VLAN identifier that the interface created by this connection should be assigned. The valid range is from 0 to 4094, without the reserved id 4095.
@@ -338,8 +357,8 @@
     interface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the vlan's interface name.namestringvlanThe 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".parentstringIf given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
-  
    
     
     
     
     
     
    
-  vpn settingKey NameValue TypeDefault ValueValue Description
+  
+  vpn settingVPN Settings.Key NameValue TypeDefault ValueValue Descriptiondatadict of string to string{}Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.namestringvpnThe 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".persistentbooleanFALSEIf the VPN service supports persistence, and this property is TRUE, the VPN will attempt to stay connected across link changes and outages, until explicitly disconnected.
@@ -347,8 +366,8 @@
     service-typestringD-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.timeoutuint320Timeout for the VPN service to establish the connection. Some services may take quite a long time to connect. Value of 0 means a default timeout, which is 60 seconds (unless overriden by vpn.timeout in configuration file). Values greater than zero mean timeout in seconds.user-namestringIf the VPN connection requires a user name for authentication, that name should be provided here.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.
-  
    
     
     
     
     
     
    
-  vxlan settingKey NameValue TypeDefault ValueValue Description
+  
+  vxlan settingVXLAN Settings.Key NameValue TypeDefault ValueValue Descriptionageinguint32300Specifies the lifetime in seconds of FDB entries learnt by the kernel.destination-portuint328472Specifies the UDP destination port to communicate to the remote VXLAN tunnel endpoint.iduint320Specifies the VXLAN Network Identifer (or VXLAN Segment Identifier) to use.
@@ -366,13 +385,13 @@
     source-port-minuint320Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.tosuint320Specifies the TOS value to use in outgoing packets.ttluint320Specifies the time-to-live value to use in outgoing packets.
-  
    
     
     
     
     
     
    
-  wimax settingKey NameValue TypeDefault ValueValue Description
+  
+  wimax settingWiMax Settings.Key NameValue TypeDefault ValueValue Descriptionmac-addressbyte arrayIf specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1namestringwimaxThe 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".network-namestringNetwork Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1
-  
    
     
     
     
    
-  802-3-ethernet settingKey NameValue TypeDefault ValueValue Description
+  
+  802-3-ethernet settingWired Ethernet Settings.Key NameValue TypeDefault ValueValue Descriptionassigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".auto-negotiatebooleanFALSEIf TRUE, enforce auto-negotiation of port speed and duplex mode.  If FALSE, "speed" and "duplex" properties should be both set or link configuration will be skipped.cloned-mac-addressbyte arrayThis D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random". For libnm and nmcli, this field is called "cloned-mac-address".
@@ -389,8 +408,8 @@
     speeduint320Can be set to a value grater than zero only when "auto-negotiate" is "off". In that case, statically configures the device to use that specified speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the "duplex" property when non-zero. Before specifying a speed value be sure your device supports it.wake-on-lanuint321The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).wake-on-lan-passwordstringIf specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address.  If NULL, no password will be required.
-  
    
     
     
     
     
     
    
-  802-11-wireless settingKey NameValue TypeDefault ValueValue Description
+  
+  802-11-wireless settingWi-Fi Settings.Key NameValue TypeDefault ValueValue Descriptionassigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".bandstring802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or "bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to the specific band, i.e. if "a" is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.bssidbyte arrayIf specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.
@@ -410,8 +429,8 @@
     seen-bssidsarray of string[]A list of BSSIDs (each BSSID formatted as a MAC address like "00:11:22:33:44:55") that have been detected as part of the Wi-Fi network.  NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BSSID list of NetworkManager. The changes you make to this property will not be preserved.ssidbyte arraySSID of the Wi-Fi network. Must be specified.tx-poweruint320If non-zero, directs the device to use the specified transmit power. Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.
-  
    
     
     
     
     
     
    
-  802-11-wireless-security settingKey NameValue TypeDefault ValueValue Description
+  
+  802-11-wireless-security settingWi-Fi Security Settings.Key NameValue TypeDefault ValueValue Descriptionauth-algstringWhen WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the 802.11 authentication algorithm required by the AP here.  One of "open" for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the "leap-username" and "leap-password" properties must be specified.grouparray of string[]A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of "wep40", "wep104", "tkip", or "ccmp".key-mgmtstringKey management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.
@@ -430,7 +449,7 @@
     wep-key2stringIndex 2 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.wep-key3stringIndex 3 WEP key.  This WEP index is not used by most networks.  See the "wep-key-type" property for a description of how this key is interpreted.wep-tx-keyidxuint320When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.
-  
    
     
     
     
     
     
    
+  
 Secret flag types:
             Each secret property in a setting has an associated flags property
             that describes how to handle that secret. The flags property is a bitfield
diff --git a/man/nm-settings.xsl b/man/nm-settings.xsl
index 733d08aa..36fb8288 100644
--- a/man/nm-settings.xsl
+++ b/man/nm-settings.xsl
@@ -126,22 +126,25 @@
   
 
   
-    
+    
       <xsl:value-of select="@name"/> setting
-      
-        
-          
-            Key Name
-            Value Type
-            Default Value
-            Value Description
-          
-        
-        
-          
-        
-      
-    
    
+      .
+      
+        
+          
+            
+              Key Name
+              Value Type
+              Default Value
+              Value Description
+            
+          
+          
+            
+          
+        
+      
+        
   
 
   
diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7
index ab02a564..3291c072 100644
--- a/man/nmcli-examples.7
+++ b/man/nmcli-examples.7
@@ -2,12 +2,12 @@
 .\"     Title: nmcli-examples
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 
-.\"      Date: 02/15/2017
+.\"      Date: 05/10/2017
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.6.2
+.\"    Source: NetworkManager 1.8.0
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.6\&.2" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.8\&.0" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -312,7 +312,47 @@ that is bound to interface name
 \fIcon show\fR
 command displays the profile so that all parameters can be reviewed\&.
 .PP
-\fBExample\ \&10.\ \&Escaping colon characters in tabular mode\fR
+\fBExample\ \&10.\ \&Convenient field values retrieval for scripting\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ \fBnmcli \-g ip4\&.address connection show my\-con\-eth0\fR
+192\&.168\&.1\&.12/24
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ \fBnmcli \-g ip4\&.address,ip4\&.dns connection show my\-con\-eth0\fR
+192\&.168\&.1\&.12/24
+192\&.168\&.1\&.1
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ \fBnmcli \-g ip4 connection show my\-con\-eth0\fR
+IP4:192\&.168\&.1\&.12/24:192\&.168\&.1\&.1::192\&.168\&.1\&.1::
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This example shows retrieval of ip4 connection field values via the \-\-get\-values option\&. Multiple comma separated fields can be provided: they will be printed one per line\&. If a whole section is provided instead of a single field, the name of the section will be printed followed by all the related field values on the same line\&. See also \-\-terse, \-\-mode, \-\-fields and \-\-escape options in
+\fBnmcli\fR(1)
+manual page for more customized output\&.
+.PP
+\fBExample\ \&11.\ \&Escaping colon characters in tabular mode\fR
 .sp
 .if n \{\
 .RS 4
@@ -331,7 +371,7 @@ nager/ActiveConnection/9
 .PP
 This example shows escaping colon characters in tabular mode\&. It may be useful for script processing, because \*(Aq:\*(Aq is used as a field separator\&.
 .PP
-\fBExample\ \&11.\ \&nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi\-Fi mutually exclusive\fR
+\fBExample\ \&12.\ \&nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi\-Fi mutually exclusive\fR
 .sp
 .if n \{\
 .RS 4
@@ -369,7 +409,7 @@ manual page for more information about NetworkManager dispatcher scripts\&.
 .PP
 \fBExample sessions of interactive connection editor\fR
 .PP
-\fBExample\ \&12.\ \&Adding an ethernet connection profile in interactive editor (a)\fR
+\fBExample\ \&13.\ \&Adding an ethernet connection profile in interactive editor (a)\fR
 .sp
 .if n \{\
 .RS 4
diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml
index 864e6504..0b15f112 100644
--- a/man/nmcli-examples.xml
+++ b/man/nmcli-examples.xml
@@ -254,6 +254,25 @@ B,DISPATCH
           
     
 
+    Convenient field values retrieval for scripting
+$ nmcli -g ip4.address connection show my-con-eth0
+192.168.1.12/24
+$ nmcli -g ip4.address,ip4.dns connection show my-con-eth0
+192.168.1.12/24
+192.168.1.1
+$ nmcli -g ip4 connection show my-con-eth0
+IP4:192.168.1.12/24:192.168.1.1::192.168.1.1::
+      
+        This example shows retrieval of ip4 connection field values via the --get-values
+        option. Multiple comma separated fields can be provided: they will be printed one
+        per line. If a whole section is provided instead of a single field, the name of the
+        section will be printed followed by all the related field values on the same line.
+        See also --terse, --mode, --fields and --escape options in nmcli1
+        manual page for more customized output.
+      
+    
+
+
     Escaping colon characters in tabular mode
 $ nmcli -t -f general -e yes -m tab dev show eth0
 GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:
diff --git a/man/nmcli.1 b/man/nmcli.1
index 571f9ed3..349c3331 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -2,12 +2,12 @@
 .\"     Title: nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 
-.\"      Date: 02/15/2017
+.\"      Date: 05/10/2017
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.6.2
+.\"    Source: NetworkManager 1.8.0
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.6\&.2" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.8\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -151,13 +151,16 @@ common
 is used to print common field values of the command\&.
 .sp
 If omitted, default is
-common\&. The option is mandatory when
-\fB\-\-terse\fR
-is used\&. In this case, generic values
-all
-and
-common
-cannot be used\&. This is to maintain compatibility when new fields are added in the future\&.
+common\&.
+.RE
+.PP
+\fB\-g\fR | \fB\-\-get\-values\fR {\fIfield1\fR,\fIfield2\fR... | all | common}
+.RS 4
+This option is used to print values from specific fields\&. It is basically a shortcut for
+\-\-mode tabular \-\-terse \-\-fields
+and is a convenient way to retrieve values for particular fields\&. The values are printed one per line without headers\&.
+.sp
+If a section is specified instead of a field, the section name will be printed followed by colon separated values of the fields belonging to that section, all on the same line\&.
 .RE
 .PP
 \fB\-e\fR | \fB\-\-escape\fR {yes | no}
@@ -877,6 +880,17 @@ macvlan
 vxlan
 .RE
 .sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+dummy
+.RE
+.sp
 The most typical uses are described in the
 EXAMPLES
 section\&.
diff --git a/man/nmcli.xml b/man/nmcli.xml
index d7610c8c..8ee7914b 100644
--- a/man/nmcli.xml
+++ b/man/nmcli.xml
@@ -205,10 +205,30 @@
           command. common is used to print common field values of
           the command.    
 
-          If omitted, default is common. The option is
-          mandatory when  is used. In this case, generic values
-          all and common cannot be used. This
-          is to maintain compatibility when new fields are added in the future.
+          If omitted, default is common.
+            
+          
+
+      
+        
+          
+          
+          
+            field1,field2
+            all
+            common
+          
+        
+
+        
+          This option is used to print values from specific fields. It is basically
+          a shortcut for --mode tabular --terse --fields and is a convenient
+          way to retrieve values for particular fields. The values are printed one per line
+          without headers.
+
+          If a section is specified instead of a field, the section name will be printed
+          followed by colon separated values of the fields belonging to that section, all on
+          the same line.
         
       
 
@@ -925,6 +945,7 @@
             ip-tunnel
             macvlan
             vxlan
+            dummy
           
 
           The most typical uses are described in the  section.
diff --git a/man/nmtui.1 b/man/nmtui.1
index cecd1b98..95ab4506 100644
--- a/man/nmtui.1
+++ b/man/nmtui.1
@@ -2,12 +2,12 @@
 .\"     Title: nmtui
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 
-.\"      Date: 02/15/2017
+.\"      Date: 05/10/2017
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.6.2
+.\"    Source: NetworkManager 1.8.0
 .\"  Language: English
 .\"
-.TH "NMTUI" "1" "" "NetworkManager 1\&.6\&.2" "General Commands Manual"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.8\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d9faa7b1..0a0d9b65 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -77,6 +77,7 @@ libnm-core/nm-setting-proxy.c
 libnm-core/nm-setting-team.c
 libnm-core/nm-setting-team-port.c
 libnm-core/nm-setting-tun.c
+libnm-core/nm-setting-user.c
 libnm-core/nm-setting-vlan.c
 libnm-core/nm-setting-vpn.c
 libnm-core/nm-setting-vxlan.c
@@ -123,6 +124,7 @@ libnm/nm-device-adsl.c
 libnm/nm-device-bond.c
 libnm/nm-device-bridge.c
 libnm/nm-device-bt.c
+libnm/nm-device-dummy.c
 libnm/nm-device-ethernet.c
 libnm/nm-device-generic.c
 libnm/nm-device-tun.c
@@ -157,6 +159,7 @@ src/devices/bluetooth/nm-bluez-device.c
 src/devices/bluetooth/nm-device-bt.c
 src/devices/nm-device-bond.c
 src/devices/nm-device-bridge.c
+src/devices/nm-device-dummy.c
 src/devices/nm-device-ethernet.c
 src/devices/nm-device-ethernet-utils.c
 src/devices/nm-device-infiniband.c
diff --git a/po/ar.po b/po/ar.po
index 64d8f772..92ba2e29 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,12 +7,13 @@
 # Khaled Hosny , 2007.
 # Lubomir Rintel , 2016. #zanata
 # Lubomir Rintel , 2017. #zanata
+# Thomas Haller , 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-16 16:07+0100\n"
-"PO-Revision-Date: 2017-01-16 08:26-0500\n"
+"POT-Creation-Date: 2017-05-10 10:43+0200\n"
+"PO-Revision-Date: 2017-03-22 09:18-0400\n"
 "Last-Translator: Copied by Zanata \n"
 "Language-Team: Arabic \n"
 "Language: ar\n"
@@ -66,29 +67,29 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/agent.c:156
+#: ../clients/cli/agent.c:157
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr ""
 
-#: ../clients/cli/agent.c:158
+#: ../clients/cli/agent.c:159
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr ""
 
-#: ../clients/cli/agent.c:176
+#: ../clients/cli/agent.c:178
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr ""
 
-#: ../clients/cli/agent.c:184
+#: ../clients/cli/agent.c:186
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr ""
 
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:53
 #: ../clients/cli/common.c:61 ../clients/cli/common.c:73
-#: ../clients/cli/connections.c:211 ../clients/cli/connections.c:233
+#: ../clients/cli/connections.c:224 ../clients/cli/connections.c:246
 msgid "GROUP"
 msgstr ""
 
@@ -100,7 +101,7 @@ msgstr ""
 #. 1
 #. 2
 #: ../clients/cli/common.c:42 ../clients/cli/common.c:63
-#: ../clients/cli/connections.c:236
+#: ../clients/cli/connections.c:249
 msgid "GATEWAY"
 msgstr ""
 
@@ -129,7 +130,7 @@ msgstr ""
 msgid "OPTION"
 msgstr ""
 
-#: ../clients/cli/common.c:378 ../clients/cli/common.c:440
+#: ../clients/cli/common.c:378 ../clients/cli/common.c:449
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr ""
@@ -139,487 +140,491 @@ msgstr ""
 msgid "invalid IP address: %s"
 msgstr ""
 
-#: ../clients/cli/common.c:452
-#, c-format
+#: ../clients/cli/common.c:426
 msgid ""
-"the second component of route ('%s') is neither a next hop address nor a "
-"metric"
+"The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
+"ip[/prefix] ...]'"
 msgstr ""
 
-#: ../clients/cli/common.c:462
+#: ../clients/cli/common.c:458
 #, c-format
-msgid "invalid metric '%s'"
+msgid "the next hop ('%s') must be first"
 msgstr ""
 
-#: ../clients/cli/common.c:471
+#: ../clients/cli/common.c:464
 #, c-format
-msgid "invalid route: %s"
+msgid "the metric ('%s') must be before attributes"
 msgstr ""
 
-#: ../clients/cli/common.c:483
+#: ../clients/cli/common.c:504
+#, fuzzy, c-format
+msgid "invalid route: %s. "
+msgstr "خطأ أثناء فتح اتصال VPN '%s'"
+
+#: ../clients/cli/common.c:516
 msgid "default route cannot be added (NetworkManager handles it by itself)"
 msgstr ""
 
-#: ../clients/cli/common.c:500
+#: ../clients/cli/common.c:542
 msgid "unmanaged"
 msgstr ""
 
-#: ../clients/cli/common.c:502
+#: ../clients/cli/common.c:544
 msgid "unavailable"
 msgstr ""
 
-#: ../clients/cli/common.c:504 ../clients/cli/general.c:248
+#: ../clients/cli/common.c:546 ../clients/cli/general.c:248
 msgid "disconnected"
 msgstr ""
 
-#: ../clients/cli/common.c:506
+#: ../clients/cli/common.c:548
 msgid "connecting (prepare)"
 msgstr ""
 
-#: ../clients/cli/common.c:508
+#: ../clients/cli/common.c:550
 msgid "connecting (configuring)"
 msgstr ""
 
-#: ../clients/cli/common.c:510
+#: ../clients/cli/common.c:552
 msgid "connecting (need authentication)"
 msgstr ""
 
-#: ../clients/cli/common.c:512
+#: ../clients/cli/common.c:554
 msgid "connecting (getting IP configuration)"
 msgstr ""
 
-#: ../clients/cli/common.c:514
+#: ../clients/cli/common.c:556
 msgid "connecting (checking IP connectivity)"
 msgstr ""
 
-#: ../clients/cli/common.c:516
+#: ../clients/cli/common.c:558
 msgid "connecting (starting secondary connections)"
 msgstr ""
 
-#: ../clients/cli/common.c:518 ../clients/cli/general.c:244
+#: ../clients/cli/common.c:560 ../clients/cli/general.c:244
 msgid "connected"
 msgstr ""
 
-#: ../clients/cli/common.c:520 ../clients/cli/connections.c:628
+#: ../clients/cli/common.c:562 ../clients/cli/connections.c:647
 msgid "deactivating"
 msgstr ""
 
-#: ../clients/cli/common.c:522
+#: ../clients/cli/common.c:564
 msgid "connection failed"
 msgstr ""
 
-#: ../clients/cli/common.c:524 ../clients/cli/common.c:541
-#: ../clients/cli/connections.c:633 ../clients/cli/connections.c:656
-#: ../clients/cli/connections.c:2136 ../clients/cli/devices.c:1190
-#: ../clients/cli/devices.c:1231 ../clients/cli/devices.c:1233
-#: ../clients/cli/general.c:251 ../clients/cli/general.c:289
-#: ../clients/cli/general.c:437 ../clients/cli/general.c:452
-#: ../clients/cli/settings.c:869 ../clients/cli/settings.c:955
-#: ../clients/cli/settings.c:1402 ../clients/cli/settings.c:2065
-#: ../clients/cli/settings.c:3533
+#: ../clients/cli/common.c:566 ../clients/cli/common.c:583
+#: ../clients/cli/connections.c:652 ../clients/cli/connections.c:675
+#: ../clients/cli/devices.c:1193 ../clients/cli/devices.c:1235
+#: ../clients/cli/devices.c:1237 ../clients/cli/general.c:251
+#: ../clients/cli/general.c:289 ../clients/cli/general.c:431
+#: ../clients/cli/general.c:446 ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:1012 ../clients/cli/settings.c:2806
+#: ../clients/cli/settings.c:2925 ../clients/cli/settings.c:5293
 #, c-format
 msgid "unknown"
 msgstr ""
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:533 ../clients/cli/connections.c:944
-#: ../clients/cli/connections.c:946 ../clients/cli/connections.c:948
-#: ../clients/cli/connections.c:983 ../clients/cli/connections.c:1053
-#: ../clients/cli/connections.c:1054 ../clients/cli/connections.c:1056
-#: ../clients/cli/connections.c:3471 ../clients/cli/connections.c:4673
-#: ../clients/cli/connections.c:6492 ../clients/cli/connections.c:6493
-#: ../clients/cli/devices.c:868 ../clients/cli/devices.c:1155
-#: ../clients/cli/devices.c:1156 ../clients/cli/devices.c:1157
-#: ../clients/cli/devices.c:1158 ../clients/cli/devices.c:1159
-#: ../clients/cli/devices.c:1194 ../clients/cli/devices.c:1196
-#: ../clients/cli/devices.c:1224 ../clients/cli/devices.c:1225
-#: ../clients/cli/devices.c:1226 ../clients/cli/devices.c:1227
-#: ../clients/cli/devices.c:1228 ../clients/cli/devices.c:1229
-#: ../clients/cli/devices.c:1230 ../clients/cli/devices.c:1232
-#: ../clients/cli/devices.c:1234 ../clients/cli/general.c:446
-#: ../clients/cli/settings.c:3528
+#: ../clients/cli/common.c:575 ../clients/cli/connections.c:963
+#: ../clients/cli/connections.c:965 ../clients/cli/connections.c:967
+#: ../clients/cli/connections.c:1002 ../clients/cli/connections.c:1072
+#: ../clients/cli/connections.c:1073 ../clients/cli/connections.c:1075
+#: ../clients/cli/connections.c:3512 ../clients/cli/connections.c:4747
+#: ../clients/cli/connections.c:6578 ../clients/cli/connections.c:6579
+#: ../clients/cli/devices.c:869 ../clients/cli/devices.c:1158
+#: ../clients/cli/devices.c:1159 ../clients/cli/devices.c:1160
+#: ../clients/cli/devices.c:1161 ../clients/cli/devices.c:1162
+#: ../clients/cli/devices.c:1197 ../clients/cli/devices.c:1199
+#: ../clients/cli/devices.c:1200 ../clients/cli/devices.c:1228
+#: ../clients/cli/devices.c:1229 ../clients/cli/devices.c:1230
+#: ../clients/cli/devices.c:1231 ../clients/cli/devices.c:1232
+#: ../clients/cli/devices.c:1233 ../clients/cli/devices.c:1234
+#: ../clients/cli/devices.c:1236 ../clients/cli/devices.c:1238
+#: ../clients/cli/general.c:440 ../clients/cli/settings.c:2801
 msgid "yes"
 msgstr ""
 
-#: ../clients/cli/common.c:535 ../clients/cli/connections.c:944
-#: ../clients/cli/connections.c:946 ../clients/cli/connections.c:948
-#: ../clients/cli/connections.c:1053 ../clients/cli/connections.c:1054
-#: ../clients/cli/connections.c:1056 ../clients/cli/connections.c:3472
-#: ../clients/cli/connections.c:4672 ../clients/cli/connections.c:6492
-#: ../clients/cli/connections.c:6493 ../clients/cli/devices.c:868
-#: ../clients/cli/devices.c:1155 ../clients/cli/devices.c:1156
-#: ../clients/cli/devices.c:1157 ../clients/cli/devices.c:1158
-#: ../clients/cli/devices.c:1159 ../clients/cli/devices.c:1194
-#: ../clients/cli/devices.c:1196 ../clients/cli/devices.c:1224
-#: ../clients/cli/devices.c:1225 ../clients/cli/devices.c:1226
-#: ../clients/cli/devices.c:1227 ../clients/cli/devices.c:1228
-#: ../clients/cli/devices.c:1229 ../clients/cli/devices.c:1230
-#: ../clients/cli/devices.c:1232 ../clients/cli/devices.c:1234
-#: ../clients/cli/general.c:448 ../clients/cli/settings.c:3530
+#: ../clients/cli/common.c:577 ../clients/cli/connections.c:963
+#: ../clients/cli/connections.c:965 ../clients/cli/connections.c:967
+#: ../clients/cli/connections.c:1072 ../clients/cli/connections.c:1073
+#: ../clients/cli/connections.c:1075 ../clients/cli/connections.c:3513
+#: ../clients/cli/connections.c:4746 ../clients/cli/connections.c:6578
+#: ../clients/cli/connections.c:6579 ../clients/cli/devices.c:869
+#: ../clients/cli/devices.c:1158 ../clients/cli/devices.c:1159
+#: ../clients/cli/devices.c:1160 ../clients/cli/devices.c:1161
+#: ../clients/cli/devices.c:1162 ../clients/cli/devices.c:1197
+#: ../clients/cli/devices.c:1199 ../clients/cli/devices.c:1200
+#: ../clients/cli/devices.c:1228 ../clients/cli/devices.c:1229
+#: ../clients/cli/devices.c:1230 ../clients/cli/devices.c:1231
+#: ../clients/cli/devices.c:1232 ../clients/cli/devices.c:1233
+#: ../clients/cli/devices.c:1234 ../clients/cli/devices.c:1236
+#: ../clients/cli/devices.c:1238 ../clients/cli/general.c:442
+#: ../clients/cli/settings.c:2803
 #, fuzzy
 msgid "no"
 msgstr "بلا"
 
-#: ../clients/cli/common.c:537
+#: ../clients/cli/common.c:579
 msgid "yes (guessed)"
 msgstr ""
 
-#: ../clients/cli/common.c:539
+#: ../clients/cli/common.c:581
 msgid "no (guessed)"
 msgstr ""
 
-#: ../clients/cli/common.c:550
+#: ../clients/cli/common.c:592
 msgid "No reason given"
 msgstr ""
 
 #. We should not really come here
-#: ../clients/cli/common.c:553 ../clients/cli/connections.c:3320
+#: ../clients/cli/common.c:595 ../clients/cli/connections.c:3361
 #, c-format
 msgid "Unknown error"
 msgstr ""
 
-#: ../clients/cli/common.c:556
+#: ../clients/cli/common.c:598
 msgid "Device is now managed"
 msgstr ""
 
-#: ../clients/cli/common.c:559
+#: ../clients/cli/common.c:601
 msgid "Device is now unmanaged"
 msgstr ""
 
-#: ../clients/cli/common.c:562
+#: ../clients/cli/common.c:604
 msgid "The device could not be readied for configuration"
 msgstr ""
 
-#: ../clients/cli/common.c:565
+#: ../clients/cli/common.c:607
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
 
-#: ../clients/cli/common.c:568
+#: ../clients/cli/common.c:610
 msgid "The IP configuration is no longer valid"
 msgstr ""
 
-#: ../clients/cli/common.c:571
+#: ../clients/cli/common.c:613
 msgid "Secrets were required, but not provided"
 msgstr ""
 
-#: ../clients/cli/common.c:574
+#: ../clients/cli/common.c:616
 msgid "802.1X supplicant disconnected"
 msgstr ""
 
-#: ../clients/cli/common.c:577
+#: ../clients/cli/common.c:619
 msgid "802.1X supplicant configuration failed"
 msgstr ""
 
-#: ../clients/cli/common.c:580
+#: ../clients/cli/common.c:622
 msgid "802.1X supplicant failed"
 msgstr ""
 
-#: ../clients/cli/common.c:583
+#: ../clients/cli/common.c:625
 msgid "802.1X supplicant took too long to authenticate"
 msgstr ""
 
-#: ../clients/cli/common.c:586
+#: ../clients/cli/common.c:628
 msgid "PPP service failed to start"
 msgstr ""
 
-#: ../clients/cli/common.c:589
+#: ../clients/cli/common.c:631
 msgid "PPP service disconnected"
 msgstr ""
 
-#: ../clients/cli/common.c:592
+#: ../clients/cli/common.c:634
 msgid "PPP failed"
 msgstr ""
 
-#: ../clients/cli/common.c:595
+#: ../clients/cli/common.c:637
 msgid "DHCP client failed to start"
 msgstr ""
 
-#: ../clients/cli/common.c:598
+#: ../clients/cli/common.c:640
 msgid "DHCP client error"
 msgstr ""
 
-#: ../clients/cli/common.c:601
+#: ../clients/cli/common.c:643
 msgid "DHCP client failed"
 msgstr ""
 
-#: ../clients/cli/common.c:604
+#: ../clients/cli/common.c:646
 msgid "Shared connection service failed to start"
 msgstr ""
 
-#: ../clients/cli/common.c:607
+#: ../clients/cli/common.c:649
 msgid "Shared connection service failed"
 msgstr ""
 
-#: ../clients/cli/common.c:610
+#: ../clients/cli/common.c:652
 msgid "AutoIP service failed to start"
 msgstr ""
 
-#: ../clients/cli/common.c:613
+#: ../clients/cli/common.c:655
 msgid "AutoIP service error"
 msgstr ""
 
-#: ../clients/cli/common.c:616
+#: ../clients/cli/common.c:658
 msgid "AutoIP service failed"
 msgstr ""
 
-#: ../clients/cli/common.c:619
+#: ../clients/cli/common.c:661
 msgid "The line is busy"
 msgstr ""
 
-#: ../clients/cli/common.c:622
+#: ../clients/cli/common.c:664
 msgid "No dial tone"
 msgstr ""
 
-#: ../clients/cli/common.c:625
+#: ../clients/cli/common.c:667
 msgid "No carrier could be established"
 msgstr ""
 
-#: ../clients/cli/common.c:628
+#: ../clients/cli/common.c:670
 msgid "The dialing request timed out"
 msgstr ""
 
-#: ../clients/cli/common.c:631
+#: ../clients/cli/common.c:673
 msgid "The dialing attempt failed"
 msgstr ""
 
-#: ../clients/cli/common.c:634
+#: ../clients/cli/common.c:676
 msgid "Modem initialization failed"
 msgstr ""
 
-#: ../clients/cli/common.c:637
+#: ../clients/cli/common.c:679
 msgid "Failed to select the specified APN"
 msgstr ""
 
-#: ../clients/cli/common.c:640
+#: ../clients/cli/common.c:682
 msgid "Not searching for networks"
 msgstr ""
 
-#: ../clients/cli/common.c:643
+#: ../clients/cli/common.c:685
 msgid "Network registration denied"
 msgstr ""
 
-#: ../clients/cli/common.c:646
+#: ../clients/cli/common.c:688
 msgid "Network registration timed out"
 msgstr ""
 
-#: ../clients/cli/common.c:649
+#: ../clients/cli/common.c:691
 msgid "Failed to register with the requested network"
 msgstr ""
 
-#: ../clients/cli/common.c:652
+#: ../clients/cli/common.c:694
 msgid "PIN check failed"
 msgstr ""
 
-#: ../clients/cli/common.c:655
+#: ../clients/cli/common.c:697
 msgid "Necessary firmware for the device may be missing"
 msgstr ""
 
-#: ../clients/cli/common.c:658
+#: ../clients/cli/common.c:700
 msgid "The device was removed"
 msgstr ""
 
-#: ../clients/cli/common.c:661
+#: ../clients/cli/common.c:703
 msgid "NetworkManager went to sleep"
 msgstr ""
 
-#: ../clients/cli/common.c:664
+#: ../clients/cli/common.c:706
 msgid "The device's active connection disappeared"
 msgstr ""
 
-#: ../clients/cli/common.c:667
+#: ../clients/cli/common.c:709
 msgid "Device disconnected by user or client"
 msgstr ""
 
-#: ../clients/cli/common.c:670
+#: ../clients/cli/common.c:712
 msgid "Carrier/link changed"
 msgstr ""
 
-#: ../clients/cli/common.c:673
+#: ../clients/cli/common.c:715
 msgid "The device's existing connection was assumed"
 msgstr ""
 
-#: ../clients/cli/common.c:676
+#: ../clients/cli/common.c:718
 msgid "The supplicant is now available"
 msgstr ""
 
-#: ../clients/cli/common.c:679
+#: ../clients/cli/common.c:721
 msgid "The modem could not be found"
 msgstr ""
 
-#: ../clients/cli/common.c:682
+#: ../clients/cli/common.c:724
 msgid "The Bluetooth connection failed or timed out"
 msgstr ""
 
-#: ../clients/cli/common.c:685
+#: ../clients/cli/common.c:727
 msgid "GSM Modem's SIM card not inserted"
 msgstr ""
 
-#: ../clients/cli/common.c:688
+#: ../clients/cli/common.c:730
 msgid "GSM Modem's SIM PIN required"
 msgstr ""
 
-#: ../clients/cli/common.c:691
+#: ../clients/cli/common.c:733
 msgid "GSM Modem's SIM PUK required"
 msgstr ""
 
-#: ../clients/cli/common.c:694
+#: ../clients/cli/common.c:736
 msgid "GSM Modem's SIM wrong"
 msgstr ""
 
-#: ../clients/cli/common.c:697
+#: ../clients/cli/common.c:739
 msgid "InfiniBand device does not support connected mode"
 msgstr ""
 
-#: ../clients/cli/common.c:700
+#: ../clients/cli/common.c:742
 msgid "A dependency of the connection failed"
 msgstr ""
 
-#: ../clients/cli/common.c:703
+#: ../clients/cli/common.c:745
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr ""
 
-#: ../clients/cli/common.c:706
+#: ../clients/cli/common.c:748
 msgid "ModemManager is unavailable"
 msgstr ""
 
-#: ../clients/cli/common.c:709
+#: ../clients/cli/common.c:751
 msgid "The Wi-Fi network could not be found"
 msgstr ""
 
-#: ../clients/cli/common.c:712
+#: ../clients/cli/common.c:754
 msgid "A secondary connection of the base connection failed"
 msgstr ""
 
-#: ../clients/cli/common.c:715
+#: ../clients/cli/common.c:757
 msgid "DCB or FCoE setup failed"
 msgstr ""
 
-#: ../clients/cli/common.c:718
+#: ../clients/cli/common.c:760
 msgid "teamd control failed"
 msgstr ""
 
-#: ../clients/cli/common.c:721
+#: ../clients/cli/common.c:763
 msgid "Modem failed or no longer available"
 msgstr ""
 
-#: ../clients/cli/common.c:724
+#: ../clients/cli/common.c:766
 msgid "Modem now ready and available"
 msgstr ""
 
-#: ../clients/cli/common.c:727
+#: ../clients/cli/common.c:769
 msgid "SIM PIN was incorrect"
 msgstr ""
 
-#: ../clients/cli/common.c:730
+#: ../clients/cli/common.c:772
 msgid "New connection activation was enqueued"
 msgstr ""
 
-#: ../clients/cli/common.c:733
+#: ../clients/cli/common.c:775
 msgid "The device's parent changed"
 msgstr ""
 
-#: ../clients/cli/common.c:736
+#: ../clients/cli/common.c:778
 msgid "The device parent's management changed"
 msgstr ""
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:740 ../libnm-glib/nm-device.c:1898
-#: ../libnm/nm-device.c:1700
+#: ../clients/cli/common.c:782 ../libnm-glib/nm-device.c:1860
+#: ../libnm/nm-device.c:1660
 msgid "Unknown"
 msgstr ""
 
-#: ../clients/cli/common.c:782
+#: ../clients/cli/common.c:824
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr ""
 
-#: ../clients/cli/common.c:789 ../clients/cli/common.c:795
+#: ../clients/cli/common.c:831 ../clients/cli/common.c:837
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
 msgstr ""
 
-#: ../clients/cli/common.c:869
+#: ../clients/cli/common.c:911
 #, c-format
 msgid "cannot read team config from file '%s'"
 msgstr ""
 
-#: ../clients/cli/common.c:876
+#: ../clients/cli/common.c:918
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
 msgstr ""
 
-#: ../clients/cli/common.c:888
+#: ../clients/cli/common.c:930
 #, c-format
 msgid "'%s' does not contain a valid team configuration"
 msgstr ""
 
-#: ../clients/cli/common.c:891
+#: ../clients/cli/common.c:933
 #, c-format
 msgid "team configuration must be a JSON object"
 msgstr ""
 
-#: ../clients/cli/common.c:944
+#: ../clients/cli/common.c:986
 #, c-format
 msgid "cannot read pac-script from file '%s'"
 msgstr ""
 
-#: ../clients/cli/common.c:951
+#: ../clients/cli/common.c:993
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
 msgstr ""
 
-#: ../clients/cli/common.c:964
+#: ../clients/cli/common.c:1006
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
 msgstr ""
 
-#: ../clients/cli/common.c:967
+#: ../clients/cli/common.c:1009
 #, c-format
 msgid "Not a valid PAC Script"
 msgstr ""
 
-#: ../clients/cli/common.c:1090
+#: ../clients/cli/common.c:1132
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr ""
 
-#: ../clients/cli/common.c:1097
+#: ../clients/cli/common.c:1139
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr ""
 
-#: ../clients/cli/common.c:1099
+#: ../clients/cli/common.c:1141
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr ""
 
-#: ../clients/cli/common.c:1180
+#: ../clients/cli/common.c:1222
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
 msgstr ""
 
-#: ../clients/cli/common.c:1609 ../clients/nm-online.c:159
+#: ../clients/cli/common.c:1651
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr ""
 
-#: ../clients/cli/common.c:1629
+#: ../clients/cli/common.c:1671
 msgid "Error: NetworkManager is not running."
 msgstr ""
 
-#: ../clients/cli/common.c:1713
+#: ../clients/cli/common.c:1768
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr ""
 
-#: ../clients/cli/common.c:1723
+#: ../clients/cli/common.c:1778
 msgid "Error: missing argument. Try passing --help."
 msgstr ""
 
-#: ../clients/cli/common.c:1776
+#: ../clients/cli/common.c:1831
 msgid "access denied"
 msgstr ""
 
@@ -666,7 +671,7 @@ msgstr ""
 msgid "Bonding mode"
 msgstr ""
 
-#: ../clients/cli/connections.c:85 ../clients/cli/connections.c:4257
+#: ../clients/cli/connections.c:85 ../clients/cli/connections.c:4320
 msgid "Bonding monitoring mode"
 msgstr ""
 
@@ -698,38 +703,47 @@ msgstr "إتّصالات VPN"
 
 #: ../clients/cli/connections.c:111
 #, fuzzy
+msgid "MACsec mode"
+msgstr "إتّصالات VPN"
+
+#: ../clients/cli/connections.c:116
+msgid "Proxy method"
+msgstr ""
+
+#: ../clients/cli/connections.c:121
+#, fuzzy
 msgid "Connection (name, UUID, or path)"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:112
+#: ../clients/cli/connections.c:122
 #, fuzzy
 msgid "VPN connection (name, UUID, or path)"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:113
+#: ../clients/cli/connections.c:123
 #, fuzzy
 msgid "Connection(s) (name, UUID, or path)"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:114
+#: ../clients/cli/connections.c:124
 msgid "Connection(s) (name, UUID, path or apath)"
 msgstr ""
 
 #. 0
-#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:212
+#: ../clients/cli/connections.c:130 ../clients/cli/connections.c:225
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:90
-#: ../clients/cli/devices.c:100 ../clients/cli/devices.c:111
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:138
-#: ../clients/cli/devices.c:151 ../clients/cli/devices.c:177
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
-#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:221
-#: ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:100 ../clients/cli/devices.c:112
+#: ../clients/cli/devices.c:122 ../clients/cli/devices.c:139
+#: ../clients/cli/devices.c:152 ../clients/cli/devices.c:178
+#: ../clients/cli/devices.c:193 ../clients/cli/devices.c:202
+#: ../clients/cli/devices.c:212 ../clients/cli/devices.c:222
+#: ../clients/cli/devices.c:263
 msgid "NAME"
 msgstr ""
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:121 ../clients/cli/connections.c:213
+#: ../clients/cli/connections.c:131 ../clients/cli/connections.c:226
 msgid "UUID"
 msgstr ""
 
@@ -737,35 +751,35 @@ msgstr ""
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:122 ../clients/cli/connections.c:234
+#: ../clients/cli/connections.c:132 ../clients/cli/connections.c:247
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:58
-#: ../clients/cli/devices.c:180
+#: ../clients/cli/devices.c:181
 msgid "TYPE"
 msgstr ""
 
 #. 2
-#: ../clients/cli/connections.c:123
+#: ../clients/cli/connections.c:133
 msgid "TIMESTAMP"
 msgstr ""
 
 #. 3
-#: ../clients/cli/connections.c:124
+#: ../clients/cli/connections.c:134
 msgid "TIMESTAMP-REAL"
 msgstr ""
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:125 ../clients/cli/devices.c:73
+#: ../clients/cli/connections.c:135 ../clients/cli/devices.c:73
 msgid "AUTOCONNECT"
 msgstr ""
 
 #. 5
-#: ../clients/cli/connections.c:126
+#: ../clients/cli/connections.c:136
 msgid "AUTOCONNECT-PRIORITY"
 msgstr ""
 
 #. 6
-#: ../clients/cli/connections.c:127
+#: ../clients/cli/connections.c:137
 msgid "READONLY"
 msgstr ""
 
@@ -774,17 +788,17 @@ msgstr ""
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:128 ../clients/cli/connections.c:220
-#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:167
-#: ../clients/cli/devices.c:183
+#: ../clients/cli/connections.c:138 ../clients/cli/connections.c:233
+#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:168
+#: ../clients/cli/devices.c:184
 msgid "DBUS-PATH"
 msgstr ""
 
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:129 ../clients/cli/devices.c:165
-#: ../clients/cli/devices.c:182
+#: ../clients/cli/connections.c:139 ../clients/cli/devices.c:166
+#: ../clients/cli/devices.c:183
 msgid "ACTIVE"
 msgstr ""
 
@@ -793,9 +807,9 @@ msgstr ""
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:130 ../clients/cli/devices.c:41
-#: ../clients/cli/devices.c:57 ../clients/cli/devices.c:164
-#: ../clients/cli/devices.c:181 ../clients/cli/devices.c:263
+#: ../clients/cli/connections.c:140 ../clients/cli/devices.c:41
+#: ../clients/cli/devices.c:57 ../clients/cli/devices.c:165
+#: ../clients/cli/devices.c:182 ../clients/cli/devices.c:264
 msgid "DEVICE"
 msgstr ""
 
@@ -804,46 +818,46 @@ msgstr ""
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:131 ../clients/cli/connections.c:215
+#: ../clients/cli/connections.c:141 ../clients/cli/connections.c:228
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:67
 #: ../clients/cli/general.c:39
 msgid "STATE"
 msgstr ""
 
 #. 11
-#: ../clients/cli/connections.c:132
+#: ../clients/cli/connections.c:142
 msgid "ACTIVE-PATH"
 msgstr ""
 
 #. 12
-#: ../clients/cli/connections.c:133
+#: ../clients/cli/connections.c:143
 msgid "SLAVE"
 msgstr ""
 
 #. 2
-#: ../clients/cli/connections.c:214
+#: ../clients/cli/connections.c:227
 msgid "DEVICES"
 msgstr ""
 
 #. 4
-#: ../clients/cli/connections.c:216
+#: ../clients/cli/connections.c:229
 msgid "DEFAULT"
 msgstr ""
 
 #. 5
-#: ../clients/cli/connections.c:217
+#: ../clients/cli/connections.c:230
 msgid "DEFAULT6"
 msgstr ""
 
 #. 6
-#: ../clients/cli/connections.c:218
+#: ../clients/cli/connections.c:231
 msgid "SPEC-OBJECT"
 msgstr ""
 
 #. 7
 #. 4
-#: ../clients/cli/connections.c:219 ../clients/cli/connections.c:257
-#: ../clients/cli/general.c:1131 ../clients/tui/nm-editor-utils.c:241
+#: ../clients/cli/connections.c:232 ../clients/cli/connections.c:270
+#: ../clients/cli/general.c:1169 ../clients/tui/nm-editor-utils.c:241
 #: ../clients/tui/nmt-connect-connection-list.c:406
 msgid "VPN"
 msgstr ""
@@ -851,70 +865,70 @@ msgstr ""
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:221 ../clients/cli/devices.c:47
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:47
 #: ../clients/cli/devices.c:79
 msgid "CON-PATH"
 msgstr ""
 
 #. 10
-#: ../clients/cli/connections.c:222
+#: ../clients/cli/connections.c:235
 msgid "ZONE"
 msgstr ""
 
 #. 11
-#: ../clients/cli/connections.c:223
+#: ../clients/cli/connections.c:236
 msgid "MASTER-PATH"
 msgstr ""
 
 #. 1
-#: ../clients/cli/connections.c:235
+#: ../clients/cli/connections.c:248
 msgid "USERNAME"
 msgstr ""
 
 #. 3
-#: ../clients/cli/connections.c:237
+#: ../clients/cli/connections.c:250
 msgid "BANNER"
 msgstr ""
 
 #. 4
-#: ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:251
 msgid "VPN-STATE"
 msgstr ""
 
 #. 5
-#: ../clients/cli/connections.c:239
+#: ../clients/cli/connections.c:252
 msgid "CFG"
 msgstr ""
 
-#: ../clients/cli/connections.c:252 ../clients/cli/devices.c:236
+#: ../clients/cli/connections.c:265 ../clients/cli/devices.c:237
 msgid "GENERAL"
 msgstr ""
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:253 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:266 ../clients/cli/devices.c:244
 msgid "IP4"
 msgstr ""
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:254 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:267 ../clients/cli/devices.c:245
 msgid "DHCP4"
 msgstr ""
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:255 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:268 ../clients/cli/devices.c:246
 msgid "IP6"
 msgstr ""
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:256 ../clients/cli/devices.c:246
+#: ../clients/cli/connections.c:269 ../clients/cli/devices.c:247
 msgid "DHCP6"
 msgstr ""
 
-#: ../clients/cli/connections.c:288
+#: ../clients/cli/connections.c:301
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -955,7 +969,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:310
+#: ../clients/cli/connections.c:323
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -982,7 +996,7 @@ msgid ""
 "well.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:331
+#: ../clients/cli/connections.c:344
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1007,7 +1021,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:352
+#: ../clients/cli/connections.c:365
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1021,7 +1035,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:364
+#: ../clients/cli/connections.c:377
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -1139,6 +1153,13 @@ msgid ""
 "                  [local ]\n"
 "                  [dev ]\n"
 "\n"
+"    macsec:       dev \n"
+"                  mode \n"
+"                  [cak  ckn ]\n"
+"                  [encrypt yes|no]\n"
+"                  [port 1-65534]\n"
+"\n"
+"\n"
 "    macvlan:      dev \n"
 "                  mode vepa|bridge|private|passthru|source\n"
 "                  [tap yes|no]\n"
@@ -1151,6 +1172,8 @@ msgid ""
 "                  [source-port-max <0-65535>]\n"
 "                  [destination-port <0-65535>]\n"
 "\n"
+"    dummy:         \n"
+"\n"
 "  SLAVE_OPTIONS:\n"
 "    bridge:       [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
@@ -1164,7 +1187,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:476
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1189,7 +1212,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:499
+#: ../clients/cli/connections.c:518
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1203,7 +1226,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:511
+#: ../clients/cli/connections.c:530
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1219,7 +1242,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:526
+#: ../clients/cli/connections.c:545
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1231,7 +1254,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:537
+#: ../clients/cli/connections.c:556
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1244,7 +1267,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:549
+#: ../clients/cli/connections.c:568
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1253,7 +1276,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:557
+#: ../clients/cli/connections.c:576
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1267,7 +1290,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:569
+#: ../clients/cli/connections.c:588
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1282,7 +1305,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:582
+#: ../clients/cli/connections.c:601
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1294,571 +1317,580 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:624
+#: ../clients/cli/connections.c:643
 msgid "activating"
 msgstr ""
 
-#: ../clients/cli/connections.c:626
+#: ../clients/cli/connections.c:645
 msgid "activated"
 msgstr ""
 
-#: ../clients/cli/connections.c:630
+#: ../clients/cli/connections.c:649
 msgid "deactivated"
 msgstr ""
 
-#: ../clients/cli/connections.c:642
+#: ../clients/cli/connections.c:661
 #, fuzzy
 msgid "VPN connecting (prepare)"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:644
+#: ../clients/cli/connections.c:663
 msgid "VPN connecting (need authentication)"
 msgstr ""
 
-#: ../clients/cli/connections.c:646
+#: ../clients/cli/connections.c:665
 #, fuzzy
 msgid "VPN connecting"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:648
+#: ../clients/cli/connections.c:667
 msgid "VPN connecting (getting IP configuration)"
 msgstr ""
 
-#: ../clients/cli/connections.c:650
+#: ../clients/cli/connections.c:669
 #, fuzzy
 msgid "VPN connected"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:652
+#: ../clients/cli/connections.c:671
 #, fuzzy
 msgid "VPN connection failed"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:654
+#: ../clients/cli/connections.c:673
 #, fuzzy
 msgid "VPN disconnected"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:724
+#: ../clients/cli/connections.c:743
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:744
+#: ../clients/cli/connections.c:763
 msgid "Connection profile details"
 msgstr ""
 
-#: ../clients/cli/connections.c:756 ../clients/cli/connections.c:1183
+#: ../clients/cli/connections.c:775 ../clients/cli/connections.c:1202
 #, fuzzy, c-format
 msgid "Error: 'connection show': %s"
 msgstr "خطأ أثناء فتح اتصال VPN '%s'"
 
-#: ../clients/cli/connections.c:943 ../clients/cli/settings.c:2061
+#: ../clients/cli/connections.c:962 ../clients/cli/settings.c:5289
 msgid "never"
 msgstr ""
 
-#: ../clients/cli/connections.c:1171
+#: ../clients/cli/connections.c:1190
 msgid "Activate connection details"
 msgstr ""
 
-#: ../clients/cli/connections.c:1407
+#: ../clients/cli/connections.c:1426
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr ""
 
-#: ../clients/cli/connections.c:1422 ../clients/cli/connections.c:1430
+#: ../clients/cli/connections.c:1441 ../clients/cli/connections.c:1449
 #, c-format
 msgid "'%s' has to be alone"
 msgstr ""
 
-#: ../clients/cli/connections.c:1630
+#: ../clients/cli/connections.c:1649
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr ""
 
-#: ../clients/cli/connections.c:1656
+#: ../clients/cli/connections.c:1675
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr ""
 
-#: ../clients/cli/connections.c:1686
+#: ../clients/cli/connections.c:1705
 #, fuzzy
 msgid "No connection specified"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:1699
+#: ../clients/cli/connections.c:1720
 #, c-format
 msgid "%s argument is missing"
 msgstr ""
 
-#: ../clients/cli/connections.c:1709
+#: ../clients/cli/connections.c:1730
 #, fuzzy, c-format
 msgid "unknown connection '%s'"
 msgstr "خطأ أثناء فتح اتصال VPN '%s'"
 
-#: ../clients/cli/connections.c:1750
+#: ../clients/cli/connections.c:1763
 msgid "'--order' argument is missing"
 msgstr ""
 
 #. Add headers
-#: ../clients/cli/connections.c:1792
+#: ../clients/cli/connections.c:1801
 msgid "NetworkManager active profiles"
 msgstr ""
 
-#: ../clients/cli/connections.c:1793
+#: ../clients/cli/connections.c:1802
 msgid "NetworkManager connection profiles"
 msgstr ""
 
-#: ../clients/cli/connections.c:1844 ../clients/cli/connections.c:2625
-#: ../clients/cli/connections.c:2635 ../clients/cli/connections.c:2645
-#: ../clients/cli/connections.c:2812 ../clients/cli/connections.c:8517
-#: ../clients/cli/connections.c:8528 ../clients/cli/devices.c:2640
-#: ../clients/cli/devices.c:2648 ../clients/cli/devices.c:2883
-#: ../clients/cli/devices.c:2891 ../clients/cli/devices.c:2907
-#: ../clients/cli/devices.c:2914 ../clients/cli/devices.c:2933
-#: ../clients/cli/devices.c:2941 ../clients/cli/devices.c:2956
-#: ../clients/cli/devices.c:3332 ../clients/cli/devices.c:3340
-#: ../clients/cli/devices.c:3346 ../clients/cli/devices.c:3356
-#: ../clients/cli/devices.c:3369 ../clients/cli/devices.c:3375
-#: ../clients/cli/devices.c:3547 ../clients/cli/devices.c:3556
-#: ../clients/cli/devices.c:3731
+#: ../clients/cli/connections.c:1872 ../clients/cli/connections.c:2617
+#: ../clients/cli/connections.c:2629 ../clients/cli/connections.c:2641
+#: ../clients/cli/connections.c:2817 ../clients/cli/connections.c:8656
+#: ../clients/cli/connections.c:8673 ../clients/cli/devices.c:2652
+#: ../clients/cli/devices.c:2662 ../clients/cli/devices.c:2898
+#: ../clients/cli/devices.c:2908 ../clients/cli/devices.c:2926
+#: ../clients/cli/devices.c:2935 ../clients/cli/devices.c:2956
+#: ../clients/cli/devices.c:2967 ../clients/cli/devices.c:2985
+#: ../clients/cli/devices.c:3363 ../clients/cli/devices.c:3373
+#: ../clients/cli/devices.c:3381 ../clients/cli/devices.c:3393
+#: ../clients/cli/devices.c:3408 ../clients/cli/devices.c:3416
+#: ../clients/cli/devices.c:3590 ../clients/cli/devices.c:3601
+#: ../clients/cli/devices.c:3771
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr ""
 
-#: ../clients/cli/connections.c:1863
+#: ../clients/cli/connections.c:1891
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr ""
 
-#: ../clients/cli/connections.c:1927 ../clients/cli/connections.c:2614
-#: ../clients/cli/connections.c:2673 ../clients/cli/connections.c:8042
-#: ../clients/cli/connections.c:8151 ../clients/cli/connections.c:8639
-#: ../clients/cli/devices.c:1496 ../clients/cli/devices.c:1554
-#: ../clients/cli/devices.c:1840 ../clients/cli/devices.c:2008
-#: ../clients/cli/devices.c:2115 ../clients/cli/devices.c:2303
-#: ../clients/cli/devices.c:3513 ../clients/cli/devices.c:3623
-#: ../clients/cli/devices.c:3737 ../clients/cli/devices.c:3795
-#: ../clients/cli/general.c:391 ../clients/cli/general.c:572
-#: ../clients/cli/general.c:615 ../clients/cli/general.c:642
-#: ../clients/cli/general.c:832 ../clients/cli/general.c:886
+#: ../clients/cli/connections.c:1955 ../clients/cli/connections.c:2604
+#: ../clients/cli/connections.c:2668 ../clients/cli/connections.c:8148
+#: ../clients/cli/connections.c:8259 ../clients/cli/connections.c:8787
+#: ../clients/cli/devices.c:1554 ../clients/cli/devices.c:1841
+#: ../clients/cli/devices.c:2010 ../clients/cli/devices.c:2118
+#: ../clients/cli/devices.c:2307 ../clients/cli/devices.c:3553
+#: ../clients/cli/devices.c:3777 ../clients/cli/general.c:603
+#: ../clients/cli/general.c:868
 #, c-format
 msgid "Error: %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:2025
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2033
+#: ../clients/cli/connections.c:2061
 msgid "no active connection or device"
 msgstr ""
 
-#: ../clients/cli/connections.c:2053
+#: ../clients/cli/connections.c:2081
 #, fuzzy, c-format
 msgid "device '%s' not compatible with connection '%s':"
 msgstr "خطأ أثناء فتح اتصال VPN '%s'"
 
-#: ../clients/cli/connections.c:2089
+#: ../clients/cli/connections.c:2117
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2092
+#: ../clients/cli/connections.c:2120
 #, fuzzy, c-format
 msgid "no device found for connection '%s'"
 msgstr "خطأ أثناء فتح اتصال VPN '%s'"
 
-#: ../clients/cli/connections.c:2112
-msgid "unknown reason"
+#: ../clients/cli/connections.c:2140
+msgid "Unknown reason"
 msgstr ""
 
-#: ../clients/cli/connections.c:2114 ../clients/cli/general.c:280
-msgid "none"
-msgstr "بلا"
+#: ../clients/cli/connections.c:2142
+#, fuzzy
+msgid "The connection was disconnected"
+msgstr "لا يمكن إضافة اتصال VPN"
 
-#: ../clients/cli/connections.c:2116
-msgid "the user was disconnected"
-msgstr ""
+#: ../clients/cli/connections.c:2144
+#, fuzzy
+msgid "Disconnected by user"
+msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:2118
-msgid "the base network connection was interrupted"
+#: ../clients/cli/connections.c:2146
+msgid "The base network connection was interrupted"
 msgstr ""
 
-#: ../clients/cli/connections.c:2120
-msgid "the VPN service stopped unexpectedly"
+#: ../clients/cli/connections.c:2148
+msgid "The VPN service stopped unexpectedly"
 msgstr ""
 
-#: ../clients/cli/connections.c:2122
-msgid "the VPN service returned invalid configuration"
+#: ../clients/cli/connections.c:2150
+msgid "The VPN service returned invalid configuration"
 msgstr ""
 
-#: ../clients/cli/connections.c:2124
-msgid "the connection attempt timed out"
-msgstr ""
+#: ../clients/cli/connections.c:2152
+#, fuzzy
+msgid "The connection attempt timed out"
+msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:2126
-msgid "the VPN service did not start in time"
+#: ../clients/cli/connections.c:2154
+msgid "The VPN service did not start in time"
 msgstr ""
 
-#: ../clients/cli/connections.c:2128
-msgid "the VPN service failed to start"
+#: ../clients/cli/connections.c:2156
+msgid "The VPN service failed to start"
 msgstr ""
 
-#: ../clients/cli/connections.c:2130
-msgid "no valid VPN secrets"
+#: ../clients/cli/connections.c:2158
+msgid "No valid secrets"
 msgstr ""
 
-#: ../clients/cli/connections.c:2132
-msgid "invalid VPN secrets"
+#: ../clients/cli/connections.c:2160
+msgid "Invalid secrets"
 msgstr ""
 
-#: ../clients/cli/connections.c:2134
-msgid "the connection was removed"
-msgstr ""
+#: ../clients/cli/connections.c:2162
+#, fuzzy
+msgid "The connection was removed"
+msgstr "حذف اتصال VPN \"%s\"؟"
 
-#: ../clients/cli/connections.c:2156 ../clients/cli/connections.c:2193
-#: ../clients/cli/connections.c:2372 ../clients/cli/connections.c:6382
-#, c-format
-msgid "Connection successfully activated (D-Bus active path: %s)\n"
+#: ../clients/cli/connections.c:2164
+#, fuzzy
+msgid "Master connection failed"
+msgstr "إتّصالات VPN"
+
+#: ../clients/cli/connections.c:2166
+msgid "Could not create a software link"
 msgstr ""
 
-#: ../clients/cli/connections.c:2164
-#, c-format
-msgid ""
-"Connection successfully activated (master waiting for slaves) (D-Bus active "
-"path: %s)\n"
+#: ../clients/cli/connections.c:2168
+msgid "The device disappeared"
 msgstr ""
 
-#: ../clients/cli/connections.c:2176 ../clients/cli/connections.c:2197
-#, c-format
-msgid "Error: Connection activation failed."
+#: ../clients/cli/connections.c:2171
+msgid "Invalid reason"
 msgstr ""
 
-#: ../clients/cli/connections.c:2245
+#: ../clients/cli/connections.c:2196 ../clients/cli/connections.c:2366
+#: ../clients/cli/connections.c:6468
 #, c-format
-msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:2252
+#: ../clients/cli/connections.c:2202 ../clients/cli/connections.c:2211
+#: ../clients/cli/connections.c:2346
 #, c-format
-msgid "Error: Connection activation failed: %s."
+msgid "Error: Connection activation failed: %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:2266
+#: ../clients/cli/connections.c:2236
 #, c-format
-msgid "Error: Timeout expired (%d seconds)"
+msgid ""
+"Connection successfully activated (master waiting for slaves) (D-Bus active "
+"path: %s)\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:2352
+#: ../clients/cli/connections.c:2261
 #, c-format
-msgid "Error: Connection activation failed: %s"
+msgid "Error: Timeout expired (%d seconds)"
 msgstr ""
 
-#: ../clients/cli/connections.c:2441
+#: ../clients/cli/connections.c:2427
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:2453
+#: ../clients/cli/connections.c:2439
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2461
+#: ../clients/cli/connections.c:2447
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2474
+#: ../clients/cli/connections.c:2460
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2530
+#: ../clients/cli/connections.c:2516
 #, c-format
 msgid "unknown device '%s'."
 msgstr ""
 
-#: ../clients/cli/connections.c:2535
+#: ../clients/cli/connections.c:2521
 msgid "neither a valid connection nor device given"
 msgstr ""
 
-#: ../clients/cli/connections.c:2655 ../clients/cli/devices.c:1502
-#: ../clients/cli/devices.c:2655 ../clients/cli/devices.c:2969
-#: ../clients/cli/devices.c:3562
+#: ../clients/cli/connections.c:2651 ../clients/cli/devices.c:1502
+#: ../clients/cli/devices.c:2669 ../clients/cli/devices.c:2998
+#: ../clients/cli/devices.c:3607
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:2681
+#: ../clients/cli/connections.c:2676
 msgid "preparing"
 msgstr ""
 
-#: ../clients/cli/connections.c:2700
+#: ../clients/cli/connections.c:2696
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:2716
+#: ../clients/cli/connections.c:2712
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:2790 ../clients/cli/connections.c:8260
-#: ../clients/cli/connections.c:8292 ../clients/cli/connections.c:8445
+#: ../clients/cli/connections.c:2793 ../clients/cli/connections.c:8374
+#: ../clients/cli/connections.c:8406 ../clients/cli/connections.c:8563
 #, c-format
 msgid "Error: No connection specified."
 msgstr ""
 
-#: ../clients/cli/connections.c:2829
+#: ../clients/cli/connections.c:2834
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:2830
+#: ../clients/cli/connections.c:2835
 #, c-format
 msgid "Error: not all active connections found."
 msgstr ""
 
-#: ../clients/cli/connections.c:2839
+#: ../clients/cli/connections.c:2844
 #, c-format
 msgid "Error: no active connection provided."
 msgstr ""
 
-#: ../clients/cli/connections.c:3300 ../clients/cli/utils.c:646
+#: ../clients/cli/connections.c:2878
+#, c-format
+msgid "Connection '%s' deactivation failed: %s\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:3341 ../clients/cli/utils.c:710
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr ""
 
-#: ../clients/cli/connections.c:3460
+#: ../clients/cli/connections.c:3501
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:3634
+#: ../clients/cli/connections.c:3675
 #, c-format
 msgid "Error: don't know how to create '%s' setting."
 msgstr ""
 
-#: ../clients/cli/connections.c:3645
+#: ../clients/cli/connections.c:3686
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:3662
+#: ../clients/cli/connections.c:3703
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:3681
+#: ../clients/cli/connections.c:3722
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:3707
+#: ../clients/cli/connections.c:3748
 #, c-format
 msgid "Error: '%s' is mandatory."
 msgstr ""
 
-#: ../clients/cli/connections.c:3739
+#: ../clients/cli/connections.c:3780
 #, fuzzy, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "خطأ أثناء فتح اتصال VPN '%s'"
 
-#: ../clients/cli/connections.c:3752
+#: ../clients/cli/connections.c:3793
 #, fuzzy, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "خطأ أثناء فتح اتصال VPN '%s'"
 
-#: ../clients/cli/connections.c:3939
+#: ../clients/cli/connections.c:4002
 #, fuzzy, c-format
 msgid "Error: bad connection type: %s."
 msgstr "خطأ أثناء فتح اتصال VPN '%s'"
 
-#: ../clients/cli/connections.c:4002
+#: ../clients/cli/connections.c:4065
 #, fuzzy, c-format
 msgid "Error: '%s': %s"
 msgstr "خطأ أثناء فتح اتصال VPN '%s'"
 
-#: ../clients/cli/connections.c:4023
+#: ../clients/cli/connections.c:4086
 msgid "Error: master is required"
 msgstr ""
 
-#: ../clients/cli/connections.c:4082
+#: ../clients/cli/connections.c:4145
 #, fuzzy, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "خطأ أثناء فتح اتصال VPN '%s'"
 
-#: ../clients/cli/connections.c:4113
+#: ../clients/cli/connections.c:4176
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:4144
+#: ../clients/cli/connections.c:4207
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
 msgstr ""
 
-#: ../clients/cli/connections.c:4219
+#: ../clients/cli/connections.c:4282
 msgid "PPPoE username"
 msgstr ""
 
-#: ../clients/cli/connections.c:4220 ../clients/cli/connections.c:4241
-#: ../clients/cli/connections.c:4243 ../clients/cli/connections.c:4292
+#: ../clients/cli/connections.c:4283 ../clients/cli/connections.c:4304
+#: ../clients/cli/connections.c:4306 ../clients/cli/connections.c:4355
 msgid "Password [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4221
+#: ../clients/cli/connections.c:4284
 msgid "Service [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4222 ../clients/cli/connections.c:4225
-#: ../clients/cli/connections.c:4234
+#: ../clients/cli/connections.c:4285 ../clients/cli/connections.c:4288
+#: ../clients/cli/connections.c:4297
 msgid "MTU [auto]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4223 ../clients/cli/connections.c:4226
-#: ../clients/cli/connections.c:4235 ../clients/cli/connections.c:4238
-#: ../clients/cli/connections.c:4279
+#: ../clients/cli/connections.c:4286 ../clients/cli/connections.c:4289
+#: ../clients/cli/connections.c:4298 ../clients/cli/connections.c:4301
+#: ../clients/cli/connections.c:4342
 msgid "MAC [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4224 ../clients/cli/connections.c:4236
+#: ../clients/cli/connections.c:4287 ../clients/cli/connections.c:4299
 msgid "Cloned MAC [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4229
+#: ../clients/cli/connections.c:4292
 msgid "Parent interface [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4230
+#: ../clients/cli/connections.c:4293
 msgid "P_KEY [none]"
 msgstr ""
 
 #. 0
-#: ../clients/cli/connections.c:4231 ../clients/cli/connections.c:4286
-#: ../clients/cli/devices.c:152 ../clients/tui/nmt-page-wifi.c:224
+#: ../clients/cli/connections.c:4294 ../clients/cli/connections.c:4349
+#: ../clients/cli/devices.c:153 ../clients/tui/nmt-page-wifi.c:224
 msgid "SSID"
 msgstr ""
 
-#: ../clients/cli/connections.c:4237
+#: ../clients/cli/connections.c:4300
 msgid "WiMAX NSP name"
 msgstr ""
 
-#: ../clients/cli/connections.c:4239
+#: ../clients/cli/connections.c:4302
 #, fuzzy
 msgid "APN"
 msgstr "LEAP"
 
-#: ../clients/cli/connections.c:4240 ../clients/cli/connections.c:4242
-#: ../clients/cli/connections.c:4285
+#: ../clients/cli/connections.c:4303 ../clients/cli/connections.c:4305
+#: ../clients/cli/connections.c:4348
 msgid "Username [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4244
+#: ../clients/cli/connections.c:4307
 msgid "Bluetooth device address"
 msgstr ""
 
-#: ../clients/cli/connections.c:4247
+#: ../clients/cli/connections.c:4310
 #, fuzzy
 msgid "VLAN parent device or connection UUID"
 msgstr "خطأ أثناء فتح اتصال VPN '%s'"
 
-#: ../clients/cli/connections.c:4249
+#: ../clients/cli/connections.c:4312
 msgid "VLAN ID (<0-4094>)"
 msgstr ""
 
-#: ../clients/cli/connections.c:4250
+#: ../clients/cli/connections.c:4313
 msgid "VLAN flags (<0-7>) [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4251
+#: ../clients/cli/connections.c:4314
 msgid "Ingress priority maps [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4252
+#: ../clients/cli/connections.c:4315
 msgid "Egress priority maps [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4255
+#: ../clients/cli/connections.c:4318
 msgid "Bonding primary interface [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4259
+#: ../clients/cli/connections.c:4322
 msgid "Bonding miimon [100]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4260
+#: ../clients/cli/connections.c:4323
 msgid "Bonding downdelay [0]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4261
+#: ../clients/cli/connections.c:4324
 msgid "Bonding updelay [0]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4262
+#: ../clients/cli/connections.c:4325
 msgid "Bonding arp-interval [0]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4264
+#: ../clients/cli/connections.c:4327
 msgid "Bonding arp-ip-target [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4266
+#: ../clients/cli/connections.c:4329
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4268 ../clients/cli/connections.c:4269
+#: ../clients/cli/connections.c:4331 ../clients/cli/connections.c:4332
 msgid "Team JSON configuration [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4270
+#: ../clients/cli/connections.c:4333
 msgid "Enable STP [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4272
+#: ../clients/cli/connections.c:4335
 msgid "STP priority [32768]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4273
+#: ../clients/cli/connections.c:4336
 msgid "Forward delay [15]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4274
+#: ../clients/cli/connections.c:4337
 msgid "Hello time [2]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4275
+#: ../clients/cli/connections.c:4338
 msgid "Max age [20]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4276
+#: ../clients/cli/connections.c:4339
 msgid "MAC address ageing time [300]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4277
+#: ../clients/cli/connections.c:4340
 msgid "Enable IGMP snooping [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4280
+#: ../clients/cli/connections.c:4343
 msgid "Bridge port priority [32]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4281
+#: ../clients/cli/connections.c:4344
 msgid "Bridge port STP path cost [100]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4282
+#: ../clients/cli/connections.c:4345
 msgid "Hairpin [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4287
+#: ../clients/cli/connections.c:4350
 msgid "OLPC Mesh channel [1]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4288
+#: ../clients/cli/connections.c:4351
 msgid "DHCP anycast MAC address [none]"
 msgstr ""
 
@@ -1866,148 +1898,165 @@ msgstr ""
 #. * is not visible here since we only care about phase2 authentication
 #. * (and don't even care of which one)
 #.
-#: ../clients/cli/connections.c:4289
+#: ../clients/cli/connections.c:4352
 #: ../clients/common/nm-secret-agent-simple.c:223
 #: ../clients/common/nm-secret-agent-simple.c:328
 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
 msgid "Username"
 msgstr ""
 
-#: ../clients/cli/connections.c:4295
+#: ../clients/cli/connections.c:4358
+msgid "MACsec parent device or connection UUID"
+msgstr ""
+
+#: ../clients/cli/connections.c:4360
+msgid "Enable encryption [yes]"
+msgstr ""
+
+#: ../clients/cli/connections.c:4361
+#: ../clients/common/nm-secret-agent-simple.c:520
+msgid "MKA CAK"
+msgstr ""
+
+#: ../clients/cli/connections.c:4362
+msgid "MKA_CKN"
+msgstr ""
+
+#: ../clients/cli/connections.c:4363
+msgid "SCI port [1]"
+msgstr ""
+
+#: ../clients/cli/connections.c:4365
 #, fuzzy
 msgid "MACVLAN parent device or connection UUID"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:4299
+#: ../clients/cli/connections.c:4369
 msgid "Tap [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4301
+#: ../clients/cli/connections.c:4371
 msgid "VXLAN ID"
 msgstr ""
 
-#: ../clients/cli/connections.c:4302 ../clients/cli/connections.c:4321
+#: ../clients/cli/connections.c:4372 ../clients/cli/connections.c:4391
 msgid "Remote"
 msgstr ""
 
-#: ../clients/cli/connections.c:4303 ../clients/cli/connections.c:4322
+#: ../clients/cli/connections.c:4373 ../clients/cli/connections.c:4392
 msgid "Parent device [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4305
+#: ../clients/cli/connections.c:4375
 msgid "Local address [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4306
+#: ../clients/cli/connections.c:4376
 msgid "Minimum source port [0]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4307
+#: ../clients/cli/connections.c:4377
 msgid "Maximum source port [0]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4308
+#: ../clients/cli/connections.c:4378
 msgid "Destination port [8472]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4311
+#: ../clients/cli/connections.c:4381
 msgid "User ID [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4312
+#: ../clients/cli/connections.c:4382
 msgid "Group ID [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4313
+#: ../clients/cli/connections.c:4383
 msgid "Enable PI [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4315
+#: ../clients/cli/connections.c:4385
 msgid "Enable VNET header [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4317
+#: ../clients/cli/connections.c:4387
 msgid "Enable multi queue [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4320
+#: ../clients/cli/connections.c:4390
 msgid "Local endpoint [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4324
+#: ../clients/cli/connections.c:4394
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4326
+#: ../clients/cli/connections.c:4396
 msgid "IPv4 gateway [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4327
+#: ../clients/cli/connections.c:4397
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4329
+#: ../clients/cli/connections.c:4399
 msgid "IPv6 gateway [none]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4330
-msgid "Proxy method"
+#: ../clients/cli/connections.c:4401
+msgid "Browser only [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4331
-msgid "Browser Only"
+#: ../clients/cli/connections.c:4403
+msgid "PAC URL"
 msgstr ""
 
-#: ../clients/cli/connections.c:4332
-msgid "PAC Url"
+#: ../clients/cli/connections.c:4404
+msgid "PAC script"
 msgstr ""
 
-#: ../clients/cli/connections.c:4333
-msgid "PAC Script"
-msgstr ""
-
-#: ../clients/cli/connections.c:4468
+#: ../clients/cli/connections.c:4539
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr ""
 
-#: ../clients/cli/connections.c:4513
+#: ../clients/cli/connections.c:4585
 msgid "Error: . argument is missing."
 msgstr ""
 
-#: ../clients/cli/connections.c:4536
+#: ../clients/cli/connections.c:4608
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:4560
+#: ../clients/cli/connections.c:4633
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr ""
 
-#: ../clients/cli/connections.c:4574
+#: ../clients/cli/connections.c:4647
 #, c-format
 msgid "Error: invalid . '%s'."
 msgstr ""
 
-#: ../clients/cli/connections.c:4615 ../clients/cli/connections.c:8093
+#: ../clients/cli/connections.c:4689 ../clients/cli/connections.c:8199
 #, fuzzy, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "خطأ أثناء فتح اتصال VPN '%s'"
 
-#: ../clients/cli/connections.c:4620
+#: ../clients/cli/connections.c:4694
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:4738
+#: ../clients/cli/connections.c:4816
 #, c-format
 msgid ""
 "You can specify this option more than once. Press  when you're done.\n"
 msgstr ""
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:4776
+#: ../clients/cli/connections.c:4854
 #, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
@@ -2016,7 +2065,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: ../clients/cli/connections.c:4779
+#: ../clients/cli/connections.c:4857
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
@@ -2025,129 +2074,133 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: ../clients/cli/connections.c:4793
+#: ../clients/cli/connections.c:4871
 #, fuzzy
 msgid "Wired Ethernet"
 msgstr "انشيء اتصال VPN"
 
-#: ../clients/cli/connections.c:4795 ../src/devices/nm-device-infiniband.c:186
+#: ../clients/cli/connections.c:4873 ../src/devices/nm-device-infiniband.c:192
 #, fuzzy
 msgid "InfiniBand connection"
 msgstr "لا يمكن إضافة اتصال VPN"
 
-#: ../clients/cli/connections.c:4797
+#: ../clients/cli/connections.c:4875
 #, fuzzy
 msgid "Wi-Fi connection"
 msgstr "انشيء اتصال VPN"
 
-#: ../clients/cli/connections.c:4799
+#: ../clients/cli/connections.c:4877
 #, fuzzy
 msgid "WiMAX connection"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:4801
+#: ../clients/cli/connections.c:4879
 msgid "PPPoE"
 msgstr ""
 
-#: ../clients/cli/connections.c:4803
+#: ../clients/cli/connections.c:4881
 #, fuzzy
 msgid "CDMA mobile broadband connection"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:4805
+#: ../clients/cli/connections.c:4883
 #, fuzzy
 msgid "GSM mobile broadband connection"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:4807
+#: ../clients/cli/connections.c:4885
 #, fuzzy
 msgid "bluetooth connection"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:4809 ../src/devices/nm-device-vlan.c:432
+#: ../clients/cli/connections.c:4887 ../src/devices/nm-device-vlan.c:433
 #, fuzzy
 msgid "VLAN connection"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:4811
+#: ../clients/cli/connections.c:4889
 msgid "Bond device"
 msgstr ""
 
-#: ../clients/cli/connections.c:4813
+#: ../clients/cli/connections.c:4891
 msgid "Team device"
 msgstr ""
 
-#: ../clients/cli/connections.c:4815
+#: ../clients/cli/connections.c:4893
 msgid "Team port"
 msgstr ""
 
-#: ../clients/cli/connections.c:4817
+#: ../clients/cli/connections.c:4895
 #, fuzzy
 msgid "Bridge device"
 msgstr "أضف اتصال VPN جديد"
 
-#: ../clients/cli/connections.c:4819
+#: ../clients/cli/connections.c:4897
 #, fuzzy
 msgid "Bridge port"
 msgstr "أضف اتصال VPN جديد"
 
-#: ../clients/cli/connections.c:4821 ../src/nm-manager.c:3824
+#: ../clients/cli/connections.c:4899 ../src/nm-manager.c:4080
 #, fuzzy
 msgid "VPN connection"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:4823
+#: ../clients/cli/connections.c:4901
 #, fuzzy
 msgid "OLPC Mesh connection"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:4825 ../src/devices/adsl/nm-device-adsl.c:137
+#: ../clients/cli/connections.c:4903 ../src/devices/adsl/nm-device-adsl.c:137
 #, fuzzy
 msgid "ADSL connection"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:4827
+#: ../clients/cli/connections.c:4905
+msgid "MACsec connection"
+msgstr ""
+
+#: ../clients/cli/connections.c:4907
 #, fuzzy
 msgid "macvlan connection"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:4829 ../src/devices/nm-device-vxlan.c:369
+#: ../clients/cli/connections.c:4909 ../src/devices/nm-device-vxlan.c:369
 #, fuzzy
 msgid "VXLAN connection"
 msgstr "إتّصالات VPN"
 
-#: ../clients/cli/connections.c:4831
+#: ../clients/cli/connections.c:4911
 msgid "Tun device"
 msgstr ""
 
-#: ../clients/cli/connections.c:4833
+#: ../clients/cli/connections.c:4913
 msgid "IPv4 protocol"
 msgstr ""
 
-#: ../clients/cli/connections.c:4835
+#: ../clients/cli/connections.c:4915
 msgid "IPv6 protocol"
 msgstr ""
 
-#: ../clients/cli/connections.c:4837
+#: ../clients/cli/connections.c:4917
 msgid "Proxy"
 msgstr ""
 
-#: ../clients/cli/connections.c:4920 ../clients/cli/utils.c:122
+#: ../clients/cli/connections.c:5004 ../clients/cli/utils.c:186
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr ""
 
-#: ../clients/cli/connections.c:4926
+#: ../clients/cli/connections.c:5010
 #, c-format
 msgid "Error: 'save': %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:4998
+#: ../clients/cli/connections.c:5082
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr ""
 
-#: ../clients/cli/connections.c:5968
+#: ../clients/cli/connections.c:6054
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr ""
@@ -2155,7 +2208,7 @@ msgstr ""
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6050
+#: ../clients/cli/connections.c:6136
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2174,7 +2227,7 @@ msgid ""
 "quit                                 :: exit nmcli\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6077
+#: ../clients/cli/connections.c:6163
 #, c-format
 msgid ""
 "goto [.] |   :: enter setting/property for editing\n"
@@ -2186,7 +2239,7 @@ msgid ""
 "          nmcli> goto ipv4.addresses\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6084
+#: ../clients/cli/connections.c:6170
 #, c-format
 msgid ""
 "remove [.]  :: remove setting or reset property value\n"
@@ -2199,7 +2252,7 @@ msgid ""
 "          nmcli> remove eth.mtu\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6091
+#: ../clients/cli/connections.c:6177
 #, c-format
 msgid ""
 "set [. ]  :: set property value\n"
@@ -2209,7 +2262,7 @@ msgid ""
 "Example: nmcli> set con.id My connection\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6096
+#: ../clients/cli/connections.c:6182
 #, c-format
 msgid ""
 "describe [.]  :: describe property\n"
@@ -2218,7 +2271,7 @@ msgid ""
 "see all NM settings and properties.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6101
+#: ../clients/cli/connections.c:6187
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2228,7 +2281,7 @@ msgid ""
 "Example: nmcli ipv4> print all\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6106
+#: ../clients/cli/connections.c:6192
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -2243,7 +2296,7 @@ msgid ""
 "          nmcli bond> verify\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6115
+#: ../clients/cli/connections.c:6201
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2259,7 +2312,7 @@ msgid ""
 "profile must be deleted.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6126
+#: ../clients/cli/connections.c:6212
 #, c-format
 msgid ""
 "activate [] [/|]  :: activate the connection\n"
@@ -2272,21 +2325,21 @@ msgid ""
 "specified)\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6133 ../clients/cli/connections.c:6292
+#: ../clients/cli/connections.c:6219 ../clients/cli/connections.c:6378
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6136
+#: ../clients/cli/connections.c:6222
 #, c-format
 msgid ""
 "help/? []  :: help for the nmcli commands\n"
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6139
+#: ../clients/cli/connections.c:6225
 #, c-format
 msgid ""
 "nmcli [ ]  :: nmcli configuration\n"
@@ -2302,7 +2355,7 @@ msgid ""
 "          nmcli> nmcli prompt-color 3\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6161 ../clients/cli/connections.c:6298
+#: ../clients/cli/connections.c:6247 ../clients/cli/connections.c:6384
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2311,8 +2364,8 @@ msgid ""
 "user is asked to confirm the action.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6166 ../clients/cli/connections.c:6303
-#: ../clients/cli/connections.c:6723 ../clients/cli/connections.c:7675
+#: ../clients/cli/connections.c:6252 ../clients/cli/connections.c:6389
+#: ../clients/cli/connections.c:6809 ../clients/cli/connections.c:7761
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr ""
@@ -2320,7 +2373,7 @@ msgstr ""
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6232
+#: ../clients/cli/connections.c:6318
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2336,7 +2389,7 @@ msgid ""
 "quit                             :: exit nmcli\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6257
+#: ../clients/cli/connections.c:6343
 #, c-format
 msgid ""
 "set []  :: set new value\n"
@@ -2344,7 +2397,7 @@ msgid ""
 "This command sets provided  to this property\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6261
+#: ../clients/cli/connections.c:6347
 #, c-format
 msgid ""
 "add []  :: append new value to the property\n"
@@ -2354,7 +2407,7 @@ msgid ""
 "(same as 'set').\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6267
+#: ../clients/cli/connections.c:6353
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -2362,7 +2415,7 @@ msgid ""
 "Displays current value and allows editing it.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6271
+#: ../clients/cli/connections.c:6357
 #, c-format
 msgid ""
 "remove [||