From 7514efc2f38c9ace4557d4e69d68e7d380389030 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 26 Aug 2016 02:18:32 +0200 Subject: Imported Upstream version 1.4.0 --- Makefile.in | 18 +- NEWS | 86 +- aclocal.m4 | 214 +- callouts/Makefile.am | 2 +- callouts/Makefile.in | 16 +- callouts/nm-dispatcher-api.h | 60 - callouts/nm-dispatcher-utils.c | 13 +- callouts/nm-dispatcher-utils.h | 3 +- callouts/nm-dispatcher.c | 3 + callouts/nm-dispatcher.xml | 2 + callouts/tests/Makefile.am | 2 + callouts/tests/Makefile.in | 16 +- callouts/tests/dispatcher-connectivity-full | 23 + callouts/tests/dispatcher-connectivity-unknown | 22 + callouts/tests/test-dispatcher-envp.c | 73 +- clients/Makefile.in | 14 +- clients/cli/Makefile.in | 14 +- clients/cli/agent.c | 53 +- clients/cli/common.c | 167 +- clients/cli/common.h | 22 +- clients/cli/connections.c | 6272 ++++++-------------- clients/cli/connections.h | 15 + clients/cli/devices.c | 1432 +++-- clients/cli/devices.h | 24 + clients/cli/general.c | 662 ++- clients/cli/general.h | 1 + clients/cli/nmcli-completion | 291 +- clients/cli/nmcli.c | 256 +- clients/cli/nmcli.h | 6 +- clients/cli/polkit-agent.c | 1 - clients/cli/settings-docs.c | 18 +- clients/cli/settings.c | 278 +- clients/cli/settings.h | 30 + clients/cli/utils.c | 4 +- clients/cli/utils.h | 2 +- clients/common/nm-polkit-listener.h | 6 - clients/common/nm-secret-agent-simple.h | 4 - clients/common/nm-vpn-helpers.c | 115 +- clients/common/nm-vpn-helpers.h | 13 +- clients/tui/Makefile.in | 14 +- clients/tui/newt/Makefile.in | 14 +- clients/tui/newt/nmt-newt-button-box.h | 4 - clients/tui/newt/nmt-newt-button.h | 4 - clients/tui/newt/nmt-newt-checkbox.h | 4 - clients/tui/newt/nmt-newt-component.h | 4 - clients/tui/newt/nmt-newt-container.h | 4 - clients/tui/newt/nmt-newt-entry-numeric.h | 4 - clients/tui/newt/nmt-newt-entry.h | 4 - clients/tui/newt/nmt-newt-form.h | 4 - clients/tui/newt/nmt-newt-grid.h | 4 - clients/tui/newt/nmt-newt-label.h | 4 - clients/tui/newt/nmt-newt-listbox.h | 4 - clients/tui/newt/nmt-newt-popup.h | 4 - clients/tui/newt/nmt-newt-section.h | 4 - clients/tui/newt/nmt-newt-separator.h | 4 - clients/tui/newt/nmt-newt-stack.h | 4 - clients/tui/newt/nmt-newt-textbox.h | 4 - clients/tui/newt/nmt-newt-toggle-button.h | 4 - clients/tui/newt/nmt-newt-types.h | 6 - clients/tui/newt/nmt-newt-utils.h | 10 +- clients/tui/newt/nmt-newt-widget.h | 4 - clients/tui/nm-editor-bindings.h | 4 - clients/tui/nm-editor-utils.c | 18 +- clients/tui/nm-editor-utils.h | 4 - clients/tui/nmt-address-list.h | 4 - clients/tui/nmt-connect-connection-list.h | 4 - clients/tui/nmt-device-entry.h | 4 - clients/tui/nmt-edit-connection-list.h | 4 - clients/tui/nmt-editor-grid.h | 4 - clients/tui/nmt-editor-page-device.h | 4 - clients/tui/nmt-editor-page.h | 4 - clients/tui/nmt-editor-section.h | 4 - clients/tui/nmt-editor.h | 4 - clients/tui/nmt-ip-entry.h | 4 - clients/tui/nmt-mac-entry.c | 43 +- clients/tui/nmt-mac-entry.h | 11 +- clients/tui/nmt-mtu-entry.h | 4 - clients/tui/nmt-page-bond.h | 4 - clients/tui/nmt-page-bridge-port.h | 4 - clients/tui/nmt-page-bridge.h | 4 - clients/tui/nmt-page-dsl.h | 5 - clients/tui/nmt-page-ethernet.c | 2 +- clients/tui/nmt-page-ethernet.h | 4 - clients/tui/nmt-page-infiniband.h | 4 - clients/tui/nmt-page-ip4.h | 4 - clients/tui/nmt-page-ip6.h | 4 - clients/tui/nmt-page-ppp.h | 4 - clients/tui/nmt-page-team-port.h | 4 - clients/tui/nmt-page-team.h | 5 - clients/tui/nmt-page-vlan.c | 2 +- clients/tui/nmt-page-vlan.h | 4 - clients/tui/nmt-page-wifi.c | 4 +- clients/tui/nmt-page-wifi.h | 4 - clients/tui/nmt-password-dialog.h | 4 - clients/tui/nmt-password-fields.h | 4 - clients/tui/nmt-route-editor.h | 4 - clients/tui/nmt-route-entry.h | 4 - clients/tui/nmt-route-table.h | 4 - clients/tui/nmt-slave-list.h | 4 - clients/tui/nmt-utils.h | 6 - clients/tui/nmt-widget-list.h | 4 - clients/tui/nmtui-connect.c | 8 +- clients/tui/nmtui-connect.h | 6 +- clients/tui/nmtui-edit.c | 8 +- clients/tui/nmtui-edit.h | 6 +- clients/tui/nmtui-hostname.c | 2 +- clients/tui/nmtui-hostname.h | 6 +- clients/tui/nmtui.c | 47 +- clients/tui/nmtui.h | 4 - config.h.in | 12 + configure | 960 ++- configure.ac | 111 +- data/Makefile.in | 14 +- docs/Makefile.in | 14 +- docs/api/Makefile.am | 1 + docs/api/Makefile.in | 28 +- docs/api/html/NetworkManager.conf.html | 210 +- docs/api/html/NetworkManager.devhelp2 | 17 + docs/api/html/NetworkManager.html | 40 +- docs/api/html/dbus-types.html | 8 +- ...org.freedesktop.NetworkManager.AccessPoint.html | 4 +- ...rg.freedesktop.NetworkManager.AgentManager.html | 4 +- ...eedesktop.NetworkManager.Connection.Active.html | 4 +- ...org.freedesktop.NetworkManager.DHCP4Config.html | 4 +- ...org.freedesktop.NetworkManager.DHCP6Config.html | 4 +- ...org.freedesktop.NetworkManager.Device.Adsl.html | 4 +- ...reedesktop.NetworkManager.Device.Bluetooth.html | 4 +- ...org.freedesktop.NetworkManager.Device.Bond.html | 4 +- ...g.freedesktop.NetworkManager.Device.Bridge.html | 4 +- ....freedesktop.NetworkManager.Device.Generic.html | 4 +- ...freedesktop.NetworkManager.Device.IPTunnel.html | 4 +- ...eedesktop.NetworkManager.Device.Infiniband.html | 4 +- ....freedesktop.NetworkManager.Device.Macvlan.html | 4 +- ...rg.freedesktop.NetworkManager.Device.Modem.html | 4 +- ...freedesktop.NetworkManager.Device.OlpcMesh.html | 4 +- ...eedesktop.NetworkManager.Device.Statistics.html | 110 + ...org.freedesktop.NetworkManager.Device.Team.html | 14 +- ...-org.freedesktop.NetworkManager.Device.Tun.html | 4 +- ...org.freedesktop.NetworkManager.Device.Veth.html | 4 +- ...org.freedesktop.NetworkManager.Device.Vlan.html | 4 +- ...rg.freedesktop.NetworkManager.Device.Vxlan.html | 4 +- ...rg.freedesktop.NetworkManager.Device.WiMax.html | 4 +- ...rg.freedesktop.NetworkManager.Device.Wired.html | 4 +- ...freedesktop.NetworkManager.Device.Wireless.html | 4 +- ...dbus-org.freedesktop.NetworkManager.Device.html | 4 +- ...s-org.freedesktop.NetworkManager.IP4Config.html | 4 +- ...s-org.freedesktop.NetworkManager.IP6Config.html | 4 +- .../gdbus-org.freedesktop.NetworkManager.PPP.html | 4 +- ...org.freedesktop.NetworkManager.SecretAgent.html | 8 +- ...desktop.NetworkManager.Settings.Connection.html | 4 +- ...us-org.freedesktop.NetworkManager.Settings.html | 4 +- ....freedesktop.NetworkManager.VPN.Connection.html | 4 +- ...-org.freedesktop.NetworkManager.VPN.Plugin.html | 4 +- .../html/gdbus-org.freedesktop.NetworkManager.html | 99 +- docs/api/html/index.html | 9 +- docs/api/html/index.sgml | 503 -- docs/api/html/ix01.html | 26 +- docs/api/html/license.html | 4 +- docs/api/html/manpages.html | 4 +- docs/api/html/nm-dbus-types.html | 134 +- docs/api/html/nm-online.html | 8 +- docs/api/html/nm-settings-ifcfg-rh.html | 106 +- docs/api/html/nm-settings-keyfile.html | 34 +- docs/api/html/nm-settings.html | 1059 ++-- docs/api/html/nm-vpn-dbus-types.html | 4 +- docs/api/html/nmcli-examples.html | 23 +- docs/api/html/nmcli.html | 2105 ++++--- docs/api/html/nmtui.html | 8 +- docs/api/html/ref-settings.html | 106 +- docs/api/html/secrets-flags.html | 4 +- docs/api/html/spec.html | 7 +- docs/api/network-manager-docs.xml | 1 + docs/api/settings-spec.xml | 12 +- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.in | 27 +- docs/libnm-glib/html/NMAccessPoint.html | 68 +- docs/libnm-glib/html/NMActiveConnection.html | 88 +- docs/libnm-glib/html/NMClient.html | 173 +- docs/libnm-glib/html/NMDHCP4Config.html | 16 +- docs/libnm-glib/html/NMDHCP6Config.html | 16 +- docs/libnm-glib/html/NMDevice.html | 176 +- docs/libnm-glib/html/NMDeviceAdsl.html | 16 +- docs/libnm-glib/html/NMDeviceBond.html | 26 +- docs/libnm-glib/html/NMDeviceBridge.html | 26 +- docs/libnm-glib/html/NMDeviceBt.html | 24 +- docs/libnm-glib/html/NMDeviceEthernet.html | 28 +- docs/libnm-glib/html/NMDeviceGeneric.html | 16 +- docs/libnm-glib/html/NMDeviceInfiniband.html | 20 +- docs/libnm-glib/html/NMDeviceModem.html | 16 +- docs/libnm-glib/html/NMDeviceOlpcMesh.html | 24 +- docs/libnm-glib/html/NMDeviceTeam.html | 26 +- docs/libnm-glib/html/NMDeviceVlan.html | 28 +- docs/libnm-glib/html/NMDeviceWifi.html | 52 +- docs/libnm-glib/html/NMDeviceWimax.html | 54 +- docs/libnm-glib/html/NMIP4Config.html | 42 +- docs/libnm-glib/html/NMIP6Config.html | 44 +- docs/libnm-glib/html/NMObject.html | 18 +- docs/libnm-glib/html/NMRemoteConnection.html | 62 +- docs/libnm-glib/html/NMRemoteSettings.html | 80 +- docs/libnm-glib/html/NMSecretAgent.html | 82 +- docs/libnm-glib/html/NMVPNConnection.html | 16 +- docs/libnm-glib/html/NMWimaxNsp.html | 38 +- docs/libnm-glib/html/annotation-glossary.html | 4 +- docs/libnm-glib/html/api-index-full.html | 4 +- docs/libnm-glib/html/ch02.html | 4 +- docs/libnm-glib/html/index.html | 6 +- docs/libnm-glib/html/index.sgml | 1082 ---- docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 8 +- .../html/libnm-glib-NMVpnPluginUiWidget.html | 24 +- docs/libnm-glib/html/libnm-glib-nm-types.html | 4 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 12 +- docs/libnm-glib/html/libnm-glib.devhelp2 | 6 +- docs/libnm-glib/html/object-tree.html | 6 +- docs/libnm-glib/html/ref-overview.html | 4 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.in | 27 +- docs/libnm-util/html/NMConnection.html | 230 +- docs/libnm-util/html/NMSetting.html | 160 +- docs/libnm-util/html/NMSetting8021x.html | 270 +- docs/libnm-util/html/NMSettingAdsl.html | 38 +- docs/libnm-util/html/NMSettingBluetooth.html | 18 +- docs/libnm-util/html/NMSettingBond.html | 62 +- docs/libnm-util/html/NMSettingBridge.html | 42 +- docs/libnm-util/html/NMSettingBridgePort.html | 22 +- docs/libnm-util/html/NMSettingCdma.html | 26 +- docs/libnm-util/html/NMSettingConnection.html | 98 +- docs/libnm-util/html/NMSettingDcb.html | 82 +- docs/libnm-util/html/NMSettingGeneric.html | 12 +- docs/libnm-util/html/NMSettingGsm.html | 88 +- docs/libnm-util/html/NMSettingIP4Config.html | 200 +- docs/libnm-util/html/NMSettingIP6Config.html | 194 +- docs/libnm-util/html/NMSettingInfiniband.html | 30 +- docs/libnm-util/html/NMSettingOlpcMesh.html | 8 +- docs/libnm-util/html/NMSettingPPP.html | 82 +- docs/libnm-util/html/NMSettingPPPOE.html | 26 +- docs/libnm-util/html/NMSettingSerial.html | 30 +- docs/libnm-util/html/NMSettingTeam.html | 18 +- docs/libnm-util/html/NMSettingTeamPort.html | 14 +- docs/libnm-util/html/NMSettingVPN.html | 56 +- docs/libnm-util/html/NMSettingVlan.html | 76 +- docs/libnm-util/html/NMSettingWimax.html | 18 +- docs/libnm-util/html/NMSettingWired.html | 94 +- docs/libnm-util/html/NMSettingWireless.html | 102 +- .../libnm-util/html/NMSettingWirelessSecurity.html | 118 +- docs/libnm-util/html/annotation-glossary.html | 4 +- docs/libnm-util/html/api-index-full.html | 4 +- docs/libnm-util/html/ch01.html | 4 +- docs/libnm-util/html/index.html | 6 +- docs/libnm-util/html/index.sgml | 1981 ------- .../libnm-util/html/libnm-util-NetworkManager.html | 32 +- .../html/libnm-util-NetworkManagerVPN.html | 12 +- docs/libnm-util/html/libnm-util-nm-utils.html | 192 +- docs/libnm-util/html/libnm-util.devhelp2 | 12 +- docs/libnm-util/html/object-tree.html | 4 +- docs/libnm-util/version.xml | 2 +- docs/libnm/Makefile.in | 27 +- docs/libnm/html/NMAccessPoint.html | 56 +- docs/libnm/html/NMActiveConnection.html | 68 +- docs/libnm/html/NMClient.html | 357 +- docs/libnm/html/NMConnection.html | 222 +- docs/libnm/html/NMDevice.html | 228 +- docs/libnm/html/NMDeviceAdsl.html | 8 +- docs/libnm/html/NMDeviceBond.html | 18 +- docs/libnm/html/NMDeviceBridge.html | 18 +- docs/libnm/html/NMDeviceBt.html | 16 +- docs/libnm/html/NMDeviceEthernet.html | 24 +- docs/libnm/html/NMDeviceGeneric.html | 8 +- docs/libnm/html/NMDeviceIPTunnel.html | 48 +- docs/libnm/html/NMDeviceInfiniband.html | 12 +- docs/libnm/html/NMDeviceMacvlan.html | 24 +- docs/libnm/html/NMDeviceModem.html | 12 +- docs/libnm/html/NMDeviceOlpcMesh.html | 16 +- docs/libnm/html/NMDeviceTeam.html | 78 +- docs/libnm/html/NMDeviceTun.html | 28 +- docs/libnm/html/NMDeviceVlan.html | 20 +- docs/libnm/html/NMDeviceVxlan.html | 76 +- docs/libnm/html/NMDeviceWifi.html | 58 +- docs/libnm/html/NMDeviceWimax.html | 46 +- docs/libnm/html/NMDhcpConfig.html | 16 +- docs/libnm/html/NMIPConfig.html | 38 +- docs/libnm/html/NMObject.html | 8 +- docs/libnm/html/NMRemoteConnection.html | 56 +- docs/libnm/html/NMSecretAgentOld.html | 42 +- docs/libnm/html/NMSetting.html | 124 +- docs/libnm/html/NMSetting8021x.html | 278 +- docs/libnm/html/NMSettingAdsl.html | 34 +- docs/libnm/html/NMSettingBluetooth.html | 14 +- docs/libnm/html/NMSettingBond.html | 38 +- docs/libnm/html/NMSettingBridge.html | 38 +- docs/libnm/html/NMSettingBridgePort.html | 18 +- docs/libnm/html/NMSettingCdma.html | 22 +- docs/libnm/html/NMSettingConnection.html | 178 +- docs/libnm/html/NMSettingDcb.html | 78 +- docs/libnm/html/NMSettingGeneric.html | 8 +- docs/libnm/html/NMSettingGsm.html | 54 +- docs/libnm/html/NMSettingIP4Config.html | 14 +- docs/libnm/html/NMSettingIP6Config.html | 79 +- docs/libnm/html/NMSettingIPConfig.html | 282 +- docs/libnm/html/NMSettingIPTunnel.html | 54 +- docs/libnm/html/NMSettingInfiniband.html | 30 +- docs/libnm/html/NMSettingMacvlan.html | 24 +- docs/libnm/html/NMSettingOlpcMesh.html | 10 +- docs/libnm/html/NMSettingPpp.html | 78 +- docs/libnm/html/NMSettingPppoe.html | 22 +- docs/libnm/html/NMSettingSerial.html | 28 +- docs/libnm/html/NMSettingTeam.html | 10 +- docs/libnm/html/NMSettingTeamPort.html | 10 +- docs/libnm/html/NMSettingTun.html | 32 +- docs/libnm/html/NMSettingVlan.html | 68 +- docs/libnm/html/NMSettingVpn.html | 56 +- docs/libnm/html/NMSettingVxlan.html | 70 +- docs/libnm/html/NMSettingWimax.html | 14 +- docs/libnm/html/NMSettingWired.html | 192 +- docs/libnm/html/NMSettingWireless.html | 200 +- docs/libnm/html/NMSettingWirelessSecurity.html | 114 +- docs/libnm/html/NMSimpleConnection.html | 14 +- docs/libnm/html/NMVpnConnection.html | 12 +- docs/libnm/html/NMVpnEditorPlugin.html | 245 +- docs/libnm/html/NMWimaxNsp.html | 28 +- docs/libnm/html/annotation-glossary.html | 4 +- docs/libnm/html/api-index-full.html | 130 +- docs/libnm/html/ch02.html | 4 +- docs/libnm/html/ch03.html | 4 +- docs/libnm/html/ch04.html | 4 +- docs/libnm/html/ch05.html | 4 +- docs/libnm/html/ch06.html | 4 +- docs/libnm/html/index.html | 6 +- docs/libnm/html/index.sgml | 3230 ---------- docs/libnm/html/libnm-nm-dbus-interface.html | 137 +- docs/libnm/html/libnm-nm-errors.html | 122 +- docs/libnm/html/libnm-nm-utils.html | 238 +- docs/libnm/html/libnm-nm-version.html | 72 +- docs/libnm/html/libnm-nm-vpn-dbus-interface.html | 32 +- docs/libnm/html/libnm.devhelp2 | 76 +- docs/libnm/html/object-tree.html | 4 +- docs/libnm/html/ref-overview.html | 4 +- docs/libnm/libnm-sections.txt | 26 +- docs/libnm/version.xml | 2 +- examples/C/Makefile.in | 14 +- examples/C/glib/Makefile.in | 14 +- examples/C/qt/Makefile.in | 14 +- examples/Makefile.in | 14 +- examples/dispatcher/Makefile.in | 14 +- examples/lua/Makefile.in | 14 +- examples/lua/lgi/Makefile.in | 14 +- examples/python/Makefile.in | 14 +- examples/python/dbus/Makefile.in | 14 +- examples/python/gi/Makefile.in | 14 +- examples/python/python-networkmanager/Makefile.in | 14 +- examples/ruby/Makefile.in | 14 +- examples/shell/Makefile.in | 14 +- gtk-doc.make | 13 +- introspection/Makefile.am | 10 +- introspection/Makefile.in | 50 +- introspection/nm-checkpoint.xml | 42 + introspection/nm-device-statistics.xml | 37 + introspection/nm-device-team.xml | 7 + introspection/nm-manager.xml | 41 + ...reedesktop.NetworkManager.Device.Statistics.xml | 77 + ...-org.freedesktop.NetworkManager.Device.Team.xml | 10 + ...dbus-manager-org.freedesktop.NetworkManager.xml | 78 + libnm-core/Makefile.am | 7 +- libnm-core/Makefile.in | 54 +- libnm-core/Makefile.libnm-core | 4 +- libnm-core/crypto.h | 2 - libnm-core/nm-connection.c | 101 + libnm-core/nm-core-internal.h | 38 +- libnm-core/nm-dbus-interface.h | 35 + libnm-core/nm-dbus-types.xml | 70 + libnm-core/nm-keyfile-internal.h | 1 - libnm-core/nm-keyfile-reader.c | 67 +- libnm-core/nm-keyfile-writer.c | 22 +- libnm-core/nm-property-compare.h | 2 - libnm-core/nm-setting-8021x.c | 10 +- libnm-core/nm-setting-bond.c | 67 +- libnm-core/nm-setting-connection.c | 57 +- libnm-core/nm-setting-connection.h | 3 + libnm-core/nm-setting-ip-config.c | 139 +- libnm-core/nm-setting-ip-config.h | 2 +- libnm-core/nm-setting-ip4-config.c | 11 + libnm-core/nm-setting-ip6-config.c | 115 + libnm-core/nm-setting-ip6-config.h | 4 + libnm-core/nm-setting-private.h | 1 - libnm-core/nm-setting-team-port.c | 56 +- libnm-core/nm-setting-team.c | 61 +- libnm-core/nm-setting-vpn.c | 20 +- libnm-core/nm-setting-wired.c | 183 +- libnm-core/nm-setting-wired.h | 4 + libnm-core/nm-setting-wireless-security.c | 6 +- libnm-core/nm-setting-wireless.c | 220 +- libnm-core/nm-setting-wireless.h | 4 + libnm-core/nm-utils-private.h | 26 + libnm-core/nm-utils.c | 466 +- libnm-core/nm-version.h | 14 +- libnm-core/nm-vpn-dbus-interface.h | 6 + libnm-core/nm-vpn-editor-plugin.c | 193 +- libnm-core/nm-vpn-editor-plugin.h | 29 + libnm-core/nm-vpn-plugin-info.c | 396 +- libnm-core/nm-vpn-plugin-info.h | 22 +- libnm-core/tests/Makefile.am | 4 +- libnm-core/tests/Makefile.in | 17 +- libnm-core/tests/test-compare.c | 2 +- libnm-core/tests/test-crypto.c | 2 +- libnm-core/tests/test-general.c | 364 +- libnm-core/tests/test-keyfile.c | 2 +- libnm-core/tests/test-secrets.c | 4 +- libnm-core/tests/test-setting-8021x.c | 2 +- libnm-core/tests/test-setting-bond.c | 2 +- libnm-core/tests/test-setting-dcb.c | 2 +- libnm-core/tests/test-settings-defaults.c | 2 +- libnm-glib/Makefile.am | 4 + libnm-glib/Makefile.in | 18 +- libnm-glib/nm-client.c | 4 + libnm-glib/nm-client.h | 7 +- libnm-glib/nm-dbus-helpers-private.h | 2 - libnm-glib/nm-glib-enum-types.c | 2 + libnm-glib/nm-object-cache.h | 1 - libnm-glib/nm-object-private.h | 1 - libnm-glib/nm-vpn-plugin.c | 2 +- libnm-glib/tests/Makefile.in | 14 +- libnm-util/Makefile.am | 8 +- libnm-util/Makefile.in | 34 +- libnm-util/crypto.h | 2 - libnm-util/nm-gvaluearray-compat.h | 22 +- libnm-util/nm-param-spec-specialized.h | 2 - libnm-util/nm-setting-8021x.c | 10 +- libnm-util/nm-setting-bond.c | 2 +- libnm-util/nm-setting-bond.h | 2 + libnm-util/nm-setting-private.h | 2 - libnm-util/nm-setting-wired.c | 10 +- libnm-util/nm-setting-wireless-security.c | 6 +- libnm-util/nm-setting-wireless.c | 4 +- libnm-util/nm-setting.c | 2 +- libnm-util/nm-utils-private.h | 3 - libnm-util/nm-utils.c | 14 +- libnm-util/nm-version.h | 14 + libnm-util/tests/Makefile.am | 2 +- libnm-util/tests/Makefile.in | 16 +- libnm-util/tests/test-crypto.c | 2 +- libnm-util/tests/test-general.c | 112 +- libnm-util/tests/test-secrets.c | 2 +- libnm-util/tests/test-setting-8021x.c | 2 +- libnm-util/tests/test-setting-dcb.c | 2 +- libnm-util/tests/test-settings-defaults.c | 2 +- libnm/Makefile.am | 21 +- libnm/Makefile.in | 38 +- libnm/libnm.ver | 21 + libnm/nm-client.c | 60 +- libnm/nm-client.h | 9 +- libnm/nm-dbus-helpers.h | 2 - libnm/nm-device-ethernet.c | 9 +- libnm/nm-device-team.c | 40 + libnm/nm-device-team.h | 3 + libnm/nm-enum-types.c | 2 + libnm/nm-ifcfg-rh-docs.xml | 14 +- libnm/nm-manager.c | 4 + libnm/nm-object-cache.h | 1 - libnm/nm-object-private.h | 1 - libnm/nm-property-docs.xml | 10 +- libnm/nm-setting-docs-overrides.xml | 14 + libnm/nm-setting-docs.xml | 12 +- libnm/nm-vpn-editor.h | 2 +- libnm/nm-vpn-service-plugin.c | 8 + libnm/tests/Makefile.am | 24 + libnm/tests/Makefile.in | 117 +- m4/attributes.m4 | 292 + m4/compiler_options.m4 | 111 + m4/compiler_warnings.m4 | 107 - man/Makefile.in | 14 +- man/NetworkManager.8 | 23 +- man/NetworkManager.conf.5 | 141 +- man/NetworkManager.conf.xml | 188 +- man/NetworkManager.xml | 36 +- man/nm-online.1 | 6 +- man/nm-online.xml | 4 +- man/nm-settings-ifcfg-rh.5 | 86 +- man/nm-settings-ifcfg-rh.xml | 38 +- man/nm-settings-ifcfg-rh.xsl | 19 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 16 +- man/nm-settings-keyfile.xsl | 14 +- man/nm-settings.5 | 72 +- man/nm-settings.xml | 642 +- man/nm-settings.xsl | 10 +- man/nmcli-examples.7 | 9 +- man/nmcli-examples.xml | 19 +- man/nmcli.1 | 1932 ++++-- man/nmcli.xml | 1733 ++---- man/nmtui.1 | 6 +- man/nmtui.xml | 4 +- po/POTFILES.in | 2 +- po/POTFILES.skip | 2 + po/ar.po | 3316 +++++------ po/as.po | 3782 +++++------- po/be@latin.po | 3092 +++++----- po/bg.po | 3544 +++++------ po/bn_IN.po | 3789 +++++------- po/bs.po | 3311 +++++------ po/ca.po | 3720 +++++------- po/cs.po | 3602 +++++------ po/da.po | 3525 +++++------ po/de.po | 2606 ++++---- po/dz.po | 3272 +++++----- po/el.po | 3700 +++++------- po/en_CA.po | 3290 +++++----- po/en_GB.po | 4139 +++++-------- po/eo.po | 3603 +++++------ po/es.po | 3780 +++++------- po/et.po | 3172 +++++----- po/eu.po | 3585 +++++------ po/fi.po | 3454 +++++------ po/fr.po | 3806 +++++------- po/gd.po | 3317 +++++------ po/gl.po | 3927 +++++------- po/gu.po | 3719 +++++------- po/he.po | 3114 +++++----- po/hi.po | 3776 +++++------- po/hr.po | 3618 +++++------ po/hu.po | 3811 +++++------- po/id.po | 3630 +++++------ po/it.po | 3768 +++++------- po/ja.po | 3767 +++++------- po/ka.po | 3737 +++++------- po/kn.po | 3791 +++++------- po/ko.po | 3752 +++++------- po/ku.po | 3223 +++++----- po/lt.po | 3690 +++++------- po/lv.po | 3775 +++++------- po/mk.po | 3122 +++++----- po/ml.po | 3748 +++++------- po/mr.po | 3947 +++++------- po/nb.po | 3145 +++++----- po/ne.po | 3334 +++++------ po/nl.po | 3154 +++++----- po/oc.po | 3319 +++++------ po/or.po | 3748 +++++------- po/pa.po | 3721 +++++------- po/pl.po | 4501 +++++++------- po/pt.po | 3272 +++++----- po/pt_BR.po | 3732 +++++------- po/ru.po | 3828 +++++------- po/rw.po | 3263 +++++----- po/sk.po | 3269 +++++----- po/sl.po | 3631 +++++------ po/sq.po | 3307 +++++------ po/sr.po | 3532 ++++++----- po/sr@latin.po | 3532 ++++++----- po/sv.po | 3452 +++++------ po/ta.po | 4114 +++++-------- po/te.po | 3779 +++++------- po/th.po | 3708 +++++------- po/tr.po | 3799 +++++------- po/uk.po | 4111 +++++-------- po/vi.po | 3159 +++++----- po/wa.po | 3141 +++++----- po/zh_CN.po | 5274 ++++++++-------- po/zh_HK.po | 3820 +++++------- po/zh_TW.po | 3725 +++++------- policy/Makefile.in | 14 +- policy/org.freedesktop.NetworkManager.policy.in.in | 19 + shared/Makefile.am | 20 +- shared/Makefile.in | 34 +- shared/gsystem-local-alloc.h | 208 - shared/nm-common-macros.h | 17 + shared/nm-default.h | 75 +- shared/nm-dispatcher-api.h | 61 + shared/nm-glib.h | 395 -- shared/nm-macros-internal.h | 563 -- shared/nm-shared-utils.c | 239 - shared/nm-shared-utils.h | 66 - shared/nm-test-libnm-utils.h | 2 +- shared/nm-test-utils.h | 2013 ------- shared/nm-utils/gsystem-local-alloc.h | 208 + shared/nm-utils/nm-glib.h | 452 ++ shared/nm-utils/nm-macros-internal.h | 643 ++ shared/nm-utils/nm-shared-utils.c | 239 + shared/nm-utils/nm-shared-utils.h | 66 + shared/nm-utils/nm-test-utils.h | 1753 ++++++ shared/nm-utils/nm-vpn-editor-plugin-call.h | 188 + shared/nm-utils/nm-vpn-plugin-macros.h | 61 + shared/nm-utils/nm-vpn-plugin-utils.c | 130 + shared/nm-utils/nm-vpn-plugin-utils.h | 42 + shared/nm-version-macros.h | 11 +- shared/nm-version-macros.h.in | 7 +- src/Makefile.am | 313 +- src/Makefile.in | 607 +- src/NetworkManager.ver | 3 +- src/NetworkManagerUtils.c | 10 +- src/devices/Makefile.in | 14 +- src/devices/adsl/Makefile.am | 1 + src/devices/adsl/Makefile.in | 15 +- src/devices/adsl/nm-atm-manager.h | 4 - src/devices/adsl/nm-device-adsl.h | 7 +- src/devices/bluetooth/Makefile.am | 1 + src/devices/bluetooth/Makefile.in | 15 +- src/devices/bluetooth/nm-bluez-device.c | 49 +- src/devices/bluetooth/nm-bluez-device.h | 3 +- src/devices/bluetooth/nm-bluez-manager.c | 17 +- src/devices/bluetooth/nm-bluez-manager.h | 4 - src/devices/bluetooth/nm-bluez4-adapter.c | 16 +- src/devices/bluetooth/nm-bluez4-adapter.h | 5 +- src/devices/bluetooth/nm-bluez4-manager.c | 18 +- src/devices/bluetooth/nm-bluez4-manager.h | 8 +- src/devices/bluetooth/nm-bluez5-dun.h | 2 - src/devices/bluetooth/nm-bluez5-manager.c | 22 +- src/devices/bluetooth/nm-bluez5-manager.h | 7 +- src/devices/bluetooth/nm-device-bt.c | 21 +- src/devices/bluetooth/nm-device-bt.h | 4 - src/devices/nm-arping-manager.h | 4 - src/devices/nm-device-bond.c | 154 +- src/devices/nm-device-bond.h | 6 +- src/devices/nm-device-bridge.h | 7 +- src/devices/nm-device-ethernet-utils.c | 28 +- src/devices/nm-device-ethernet-utils.h | 4 +- src/devices/nm-device-ethernet.c | 304 +- src/devices/nm-device-ethernet.h | 19 +- src/devices/nm-device-factory.h | 4 +- src/devices/nm-device-generic.h | 6 +- src/devices/nm-device-infiniband.c | 13 +- src/devices/nm-device-infiniband.h | 6 +- src/devices/nm-device-ip-tunnel.c | 9 +- src/devices/nm-device-ip-tunnel.h | 6 +- src/devices/nm-device-logging.h | 1 - src/devices/nm-device-macvlan.c | 36 +- src/devices/nm-device-macvlan.h | 6 +- src/devices/nm-device-private.h | 15 +- src/devices/nm-device-tun.c | 10 +- src/devices/nm-device-tun.h | 6 +- src/devices/nm-device-veth.c | 55 +- src/devices/nm-device-veth.h | 10 +- src/devices/nm-device-vlan.c | 62 +- src/devices/nm-device-vlan.h | 6 +- src/devices/nm-device-vxlan.c | 19 +- src/devices/nm-device-vxlan.h | 6 +- src/devices/nm-device.c | 1945 ++++-- src/devices/nm-device.h | 31 +- src/devices/nm-lldp-listener.c | 9 +- src/devices/nm-lldp-listener.h | 4 - src/devices/team/Makefile.am | 1 + src/devices/team/Makefile.in | 15 +- src/devices/team/nm-device-team.c | 118 +- src/devices/team/nm-device-team.h | 9 +- src/devices/team/nm-team-factory.h | 2 - src/devices/tests/Makefile.in | 14 +- src/devices/tests/test-lldp.c | 2 +- src/devices/wifi/Makefile.am | 1 + src/devices/wifi/Makefile.in | 15 +- src/devices/wifi/nm-device-olpc-mesh.h | 6 +- src/devices/wifi/nm-device-wifi.c | 451 +- src/devices/wifi/nm-device-wifi.h | 47 +- src/devices/wifi/nm-wifi-ap.c | 210 +- src/devices/wifi/nm-wifi-ap.h | 10 +- src/devices/wifi/tests/Makefile.in | 14 +- src/devices/wifi/tests/test-wifi-ap-utils.c | 2 +- src/devices/wwan/Makefile.am | 13 +- src/devices/wwan/Makefile.in | 51 +- src/devices/wwan/nm-device-modem.c | 33 +- src/devices/wwan/nm-modem-broadband.c | 158 +- src/devices/wwan/nm-modem-broadband.h | 6 - src/devices/wwan/nm-modem-enum-types.c | 1 + src/devices/wwan/nm-modem-manager.c | 372 +- src/devices/wwan/nm-modem-ofono.c | 1202 ++++ src/devices/wwan/nm-modem-ofono.h | 53 + src/devices/wwan/nm-modem.c | 8 +- src/devices/wwan/nm-modem.h | 5 - src/devices/wwan/nm-wwan-factory.c | 4 +- src/devices/wwan/nm-wwan-factory.h | 2 - src/dhcp-manager/Makefile.in | 14 +- src/dhcp-manager/nm-dhcp-client-logging.h | 24 +- src/dhcp-manager/nm-dhcp-client.c | 99 +- src/dhcp-manager/nm-dhcp-client.h | 2 - src/dhcp-manager/nm-dhcp-dhclient-utils.c | 2 +- src/dhcp-manager/nm-dhcp-dhclient-utils.h | 2 - src/dhcp-manager/nm-dhcp-dhclient.c | 6 +- src/dhcp-manager/nm-dhcp-dhclient.h | 1 - src/dhcp-manager/nm-dhcp-listener.c | 10 +- src/dhcp-manager/nm-dhcp-listener.h | 2 - src/dhcp-manager/nm-dhcp-manager.c | 10 +- src/dhcp-manager/nm-dhcp-manager.h | 2 - src/dhcp-manager/nm-dhcp-systemd.c | 28 +- src/dhcp-manager/nm-dhcp-utils.c | 150 +- src/dhcp-manager/nm-dhcp-utils.h | 2 - src/dhcp-manager/tests/Makefile.in | 14 +- src/dhcp-manager/tests/test-dhcp-dhclient.c | 2 +- src/dhcp-manager/tests/test-dhcp-utils.c | 2 +- src/dns-manager/nm-dns-manager.h | 5 - src/dns-manager/nm-dns-plugin.h | 2 - src/dnsmasq-manager/nm-dnsmasq-manager.c | 107 +- src/dnsmasq-manager/nm-dnsmasq-manager.h | 5 - src/dnsmasq-manager/nm-dnsmasq-utils.h | 1 - src/dnsmasq-manager/tests/Makefile.in | 14 +- src/dnsmasq-manager/tests/test-dnsmasq-utils.c | 2 +- src/main-utils.c | 3 +- src/main-utils.h | 2 - src/main.c | 95 +- src/nm-activation-request.c | 6 +- src/nm-activation-request.h | 2 - src/nm-active-connection.c | 15 +- src/nm-audit-manager.c | 11 +- src/nm-audit-manager.h | 32 +- src/nm-auth-manager.h | 7 - src/nm-auth-subject.c | 48 +- src/nm-auth-subject.h | 8 +- src/nm-auth-utils.c | 4 +- src/nm-bus-manager.c | 48 + src/nm-bus-manager.h | 10 +- src/nm-checkpoint-manager.c | 298 + src/nm-checkpoint-manager.h | 50 + src/nm-checkpoint.c | 433 ++ src/nm-checkpoint.h | 49 + src/nm-config-data.c | 201 +- src/nm-config-data.h | 11 + src/nm-config.c | 283 +- src/nm-config.h | 30 + src/nm-connection-provider.c | 126 - src/nm-connection-provider.h | 127 - src/nm-connectivity.c | 4 + src/nm-connectivity.h | 2 - src/nm-core-utils.c | 526 +- src/nm-core-utils.h | 45 +- src/nm-dcb.h | 1 - src/nm-default-route-manager.c | 14 +- src/nm-default-route-manager.h | 5 +- src/nm-dispatcher.c | 54 +- src/nm-dispatcher.h | 7 +- src/nm-enum-types.c | 116 +- src/nm-enum-types.h | 8 +- src/nm-exported-object.c | 20 +- src/nm-exported-object.h | 8 +- src/nm-firewall-manager.h | 5 - src/nm-iface-helper.c | 73 +- src/nm-ip4-config.c | 255 +- src/nm-ip4-config.h | 13 +- src/nm-ip6-config.c | 266 +- src/nm-ip6-config.h | 15 +- src/nm-logging.c | 247 +- src/nm-logging.h | 29 +- src/nm-manager.c | 520 +- src/nm-manager.h | 21 +- src/nm-multi-index.h | 7 - src/nm-policy.c | 67 +- src/nm-policy.h | 2 - src/nm-rfkill-manager.c | 4 +- src/nm-rfkill-manager.h | 5 +- src/nm-route-manager.c | 4 +- src/nm-route-manager.h | 3 - src/nm-session-monitor.c | 39 - src/nm-session-monitor.h | 13 - src/nm-sleep-monitor.h | 4 - src/nm-test-utils-core.h | 296 + src/nm-types.h | 25 +- src/platform/Makefile.in | 14 +- src/platform/nm-fake-platform.c | 27 +- src/platform/nm-linux-platform.c | 316 +- src/platform/nm-linux-platform.h | 6 + src/platform/nm-platform-utils.c | 134 +- src/platform/nm-platform-utils.h | 7 +- src/platform/nm-platform.c | 199 +- src/platform/nm-platform.h | 49 +- src/platform/nmp-object.c | 14 +- src/platform/nmp-object.h | 6 +- src/platform/tests/Makefile.am | 6 +- src/platform/tests/Makefile.in | 25 +- src/platform/tests/monitor.c | 2 +- src/platform/tests/test-common.h | 4 +- src/platform/tests/test-general.c | 2 +- src/platform/tests/test-link.c | 73 +- src/platform/tests/test-nmp-object.c | 2 +- src/platform/tests/test-route.c | 16 +- src/platform/wifi/wifi-utils-private.h | 2 - src/platform/wifi/wifi-utils.c | 21 +- src/platform/wifi/wifi-utils.h | 3 +- src/ppp-manager/Makefile.am | 3 +- src/ppp-manager/Makefile.in | 20 +- src/ppp-manager/nm-ppp-manager.c | 22 +- src/ppp-manager/nm-pppd-plugin.c | 2 +- src/rdisc/Makefile.in | 14 +- src/rdisc/nm-fake-rdisc.c | 44 +- src/rdisc/nm-lndp-rdisc.c | 135 +- src/rdisc/nm-lndp-rdisc.h | 23 +- src/rdisc/nm-rdisc-private.h | 30 +- src/rdisc/nm-rdisc.c | 581 +- src/rdisc/nm-rdisc.h | 68 +- src/rdisc/tests/Makefile.am | 2 +- src/rdisc/tests/Makefile.in | 18 +- src/rdisc/tests/test-rdisc-fake.c | 181 +- src/rdisc/tests/test-rdisc-linux.c | 3 +- src/settings/nm-inotify-helper.h | 2 - src/settings/nm-secret-agent.h | 1 - src/settings/nm-settings-connection.c | 78 +- src/settings/nm-settings-connection.h | 5 - src/settings/nm-settings-plugin.h | 8 +- src/settings/nm-settings.c | 236 +- src/settings/nm-settings.h | 29 +- src/settings/plugins/Makefile.in | 14 +- src/settings/plugins/ibft/Makefile.in | 14 +- src/settings/plugins/ibft/nm-ibft-connection.h | 4 - src/settings/plugins/ibft/plugin.h | 2 - src/settings/plugins/ibft/reader.h | 2 - src/settings/plugins/ibft/tests/Makefile.am | 3 + src/settings/plugins/ibft/tests/Makefile.in | 47 +- src/settings/plugins/ibft/tests/test-ibft.c | 2 +- src/settings/plugins/ifcfg-rh/Makefile.in | 14 +- src/settings/plugins/ifcfg-rh/common.h | 4 +- .../plugins/ifcfg-rh/nm-ifcfg-connection.c | 7 +- .../plugins/ifcfg-rh/nm-ifcfg-connection.h | 8 +- src/settings/plugins/ifcfg-rh/plugin.c | 23 +- src/settings/plugins/ifcfg-rh/plugin.h | 4 +- src/settings/plugins/ifcfg-rh/reader.c | 207 +- src/settings/plugins/ifcfg-rh/reader.h | 5 +- src/settings/plugins/ifcfg-rh/shvar.c | 20 +- src/settings/plugins/ifcfg-rh/shvar.h | 8 +- src/settings/plugins/ifcfg-rh/tests/Makefile.am | 3 + src/settings/plugins/ifcfg-rh/tests/Makefile.in | 46 +- .../ifcfg-rh/tests/network-scripts/Makefile.in | 14 +- .../plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c | 2 +- .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 66 +- src/settings/plugins/ifcfg-rh/utils.c | 3 +- src/settings/plugins/ifcfg-rh/utils.h | 5 +- src/settings/plugins/ifcfg-rh/writer.c | 93 +- src/settings/plugins/ifcfg-rh/writer.h | 6 +- src/settings/plugins/ifnet/Makefile.in | 14 +- src/settings/plugins/ifnet/connection_parser.c | 2 +- src/settings/plugins/ifnet/net_parser.c | 10 +- src/settings/plugins/ifnet/net_parser.h | 3 +- src/settings/plugins/ifnet/net_utils.h | 5 +- src/settings/plugins/ifnet/nm-ifnet-connection.h | 5 +- src/settings/plugins/ifnet/plugin.h | 2 - src/settings/plugins/ifnet/tests/Makefile.am | 5 +- src/settings/plugins/ifnet/tests/Makefile.in | 49 +- src/settings/plugins/ifnet/tests/test-ifnet.c | 4 +- src/settings/plugins/ifnet/wpa_parser.c | 13 +- src/settings/plugins/ifnet/wpa_parser.h | 2 - src/settings/plugins/ifupdown/Makefile.in | 14 +- src/settings/plugins/ifupdown/interface_parser.h | 2 - .../plugins/ifupdown/nm-ifupdown-connection.h | 6 +- src/settings/plugins/ifupdown/parser.h | 7 +- src/settings/plugins/ifupdown/plugin.h | 2 - src/settings/plugins/ifupdown/tests/Makefile.am | 6 +- src/settings/plugins/ifupdown/tests/Makefile.in | 49 +- .../plugins/ifupdown/tests/test-ifupdown.c | 5 +- src/settings/plugins/keyfile/Makefile.in | 14 +- .../plugins/keyfile/nm-keyfile-connection.h | 4 - src/settings/plugins/keyfile/plugin.c | 1 - src/settings/plugins/keyfile/plugin.h | 2 - src/settings/plugins/keyfile/reader.h | 2 - src/settings/plugins/keyfile/tests/Makefile.in | 14 +- .../plugins/keyfile/tests/keyfiles/Makefile.in | 14 +- src/settings/plugins/keyfile/tests/test-keyfile.c | 4 +- src/settings/plugins/keyfile/utils.h | 1 - src/settings/plugins/keyfile/writer.h | 2 - src/supplicant-manager/nm-supplicant-config.c | 47 - src/supplicant-manager/nm-supplicant-config.h | 12 +- src/supplicant-manager/nm-supplicant-interface.c | 26 +- src/supplicant-manager/nm-supplicant-interface.h | 3 - src/supplicant-manager/nm-supplicant-manager.c | 16 +- src/supplicant-manager/nm-supplicant-manager.h | 3 - src/supplicant-manager/tests/Makefile.am | 2 +- src/supplicant-manager/tests/Makefile.in | 16 +- src/supplicant-manager/tests/certs/Makefile.in | 14 +- .../tests/test-supplicant-config.c | 16 +- src/systemd/nm-sd-adapt.c | 34 - src/systemd/nm-sd-adapt.h | 177 - src/systemd/nm-sd.c | 7 + src/systemd/nm-sd.h | 11 + src/systemd/sd-adapt/build.h | 3 + src/systemd/sd-adapt/cgroup-util.h | 3 + src/systemd/sd-adapt/condition.h | 5 + src/systemd/sd-adapt/conf-parser.h | 3 + src/systemd/sd-adapt/def.h | 3 + src/systemd/sd-adapt/dirent-util.h | 3 + src/systemd/sd-adapt/formats-util.h | 3 + src/systemd/sd-adapt/gunicode.h | 3 + src/systemd/sd-adapt/libudev.h | 5 + src/systemd/sd-adapt/missing.h | 3 + src/systemd/sd-adapt/mkdir.h | 3 + src/systemd/sd-adapt/nm-sd-adapt.c | 34 + src/systemd/sd-adapt/nm-sd-adapt.h | 181 + src/systemd/sd-adapt/process-util.h | 3 + src/systemd/sd-adapt/sd-daemon.h | 3 + src/systemd/sd-adapt/stat-util.h | 3 + src/systemd/sd-adapt/udev-util.h | 3 + src/systemd/sd-adapt/udev.h | 5 + src/systemd/sd-adapt/user-util.h | 3 + src/systemd/sd-adapt/virt.h | 3 + src/systemd/src/basic/escape.h | 2 - src/systemd/src/basic/ether-addr-util.c | 69 + src/systemd/src/basic/ether-addr-util.h | 2 + src/systemd/src/basic/extract-word.c | 302 + src/systemd/src/basic/extract-word.h | 35 + src/systemd/src/basic/fd-util.c | 26 +- src/systemd/src/basic/fd-util.h | 3 + src/systemd/src/basic/fileio.c | 210 +- src/systemd/src/basic/fileio.h | 8 +- src/systemd/src/basic/fs-util.c | 112 +- src/systemd/src/basic/fs-util.h | 5 + src/systemd/src/basic/hashmap.c | 37 +- src/systemd/src/basic/hostname-util.c | 10 +- src/systemd/src/basic/in-addr-util.c | 105 +- src/systemd/src/basic/in-addr-util.h | 5 + src/systemd/src/basic/io-util.c | 5 + src/systemd/src/basic/macro.h | 9 + src/systemd/src/basic/parse-util.c | 46 +- src/systemd/src/basic/parse-util.h | 17 + src/systemd/src/basic/path-util.c | 79 +- src/systemd/src/basic/path-util.h | 20 +- src/systemd/src/basic/random-util.c | 4 +- src/systemd/src/basic/set.h | 10 +- src/systemd/src/basic/signal-util.h | 56 + src/systemd/src/basic/siphash24.c | 2 + src/systemd/src/basic/socket-util.c | 122 +- src/systemd/src/basic/socket-util.h | 17 + src/systemd/src/basic/string-table.h | 56 +- src/systemd/src/basic/string-util.c | 47 +- src/systemd/src/basic/string-util.h | 8 + src/systemd/src/basic/strv.c | 90 +- src/systemd/src/basic/strv.h | 9 +- src/systemd/src/basic/time-util.c | 258 +- src/systemd/src/basic/time-util.h | 32 +- src/systemd/src/basic/unaligned.h | 18 + src/systemd/src/basic/utf8.h | 2 - src/systemd/src/basic/util.c | 229 +- src/systemd/src/basic/util.h | 17 +- src/systemd/src/libsystemd-network/arp-util.c | 10 +- .../src/libsystemd-network/dhcp-identifier.c | 36 +- .../src/libsystemd-network/dhcp-identifier.h | 40 +- src/systemd/src/libsystemd-network/dhcp-internal.h | 3 +- src/systemd/src/libsystemd-network/dhcp-network.c | 4 +- src/systemd/src/libsystemd-network/dhcp-protocol.h | 2 +- .../src/libsystemd-network/dhcp6-internal.h | 3 +- src/systemd/src/libsystemd-network/lldp-internal.h | 2 + src/systemd/src/libsystemd-network/lldp-neighbor.c | 51 +- src/systemd/src/libsystemd-network/lldp-neighbor.h | 8 +- src/systemd/src/libsystemd-network/lldp-network.c | 3 +- .../src/libsystemd-network/network-internal.c | 186 +- .../src/libsystemd-network/network-internal.h | 6 - .../src/libsystemd-network/sd-dhcp-client.c | 270 +- .../src/libsystemd-network/sd-dhcp6-client.c | 171 +- src/systemd/src/libsystemd-network/sd-ipv4acd.c | 505 +- src/systemd/src/libsystemd-network/sd-ipv4ll.c | 180 +- src/systemd/src/libsystemd-network/sd-lldp.c | 105 +- src/systemd/src/libsystemd/sd-event/sd-event.c | 87 +- src/systemd/src/libsystemd/sd-id128/id128-util.c | 200 + src/systemd/src/libsystemd/sd-id128/id128-util.h | 45 + src/systemd/src/libsystemd/sd-id128/sd-id128.c | 122 +- src/systemd/src/systemd/sd-dhcp-client.h | 78 +- src/systemd/src/systemd/sd-dhcp6-client.h | 61 +- src/systemd/src/systemd/sd-event.h | 1 + src/systemd/src/systemd/sd-ipv4acd.h | 28 +- src/systemd/src/systemd/sd-ipv4ll.h | 6 +- src/systemd/src/systemd/sd-lldp.h | 90 +- src/systemd/src/systemd/sd-ndisc.h | 114 +- src/tests/Makefile.am | 12 +- src/tests/Makefile.in | 31 +- src/tests/config/Makefile.am | 7 +- src/tests/config/Makefile.in | 24 +- src/tests/config/NetworkManager.state | 4 + src/tests/config/nm-test-device.c | 14 +- src/tests/config/nm-test-device.h | 6 +- src/tests/config/test-config.c | 63 +- src/tests/test-dcb.c | 2 +- src/tests/test-general-with-expect.c | 2 +- src/tests/test-general.c | 2 +- src/tests/test-ip4-config.c | 42 +- src/tests/test-ip6-config.c | 42 +- src/tests/test-resolvconf-capture.c | 2 +- src/tests/test-route-manager.c | 101 +- src/tests/test-systemd.c | 56 +- src/tests/test-utils.c | 83 +- src/tests/test-wired-defname.c | 26 +- src/vpn-manager/nm-vpn-connection.c | 291 +- src/vpn-manager/nm-vpn-connection.h | 22 +- src/vpn-manager/nm-vpn-manager.h | 1 - tools/Makefile.in | 14 +- valgrind.suppressions | 8 + vapi/Makefile.in | 14 +- 976 files changed, 137332 insertions(+), 170755 deletions(-) delete mode 100644 callouts/nm-dispatcher-api.h create mode 100644 callouts/tests/dispatcher-connectivity-full create mode 100644 callouts/tests/dispatcher-connectivity-unknown create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html delete mode 100644 docs/api/html/index.sgml delete mode 100644 docs/libnm-glib/html/index.sgml delete mode 100644 docs/libnm-util/html/index.sgml delete mode 100644 docs/libnm/html/index.sgml create mode 100644 introspection/nm-checkpoint.xml create mode 100644 introspection/nm-device-statistics.xml create mode 100644 introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml create mode 100644 m4/attributes.m4 create mode 100644 m4/compiler_options.m4 delete mode 100644 m4/compiler_warnings.m4 delete mode 100644 shared/gsystem-local-alloc.h create mode 100644 shared/nm-dispatcher-api.h delete mode 100644 shared/nm-glib.h delete mode 100644 shared/nm-macros-internal.h delete mode 100644 shared/nm-shared-utils.c delete mode 100644 shared/nm-shared-utils.h delete mode 100644 shared/nm-test-utils.h create mode 100644 shared/nm-utils/gsystem-local-alloc.h create mode 100644 shared/nm-utils/nm-glib.h create mode 100644 shared/nm-utils/nm-macros-internal.h create mode 100644 shared/nm-utils/nm-shared-utils.c create mode 100644 shared/nm-utils/nm-shared-utils.h create mode 100644 shared/nm-utils/nm-test-utils.h create mode 100644 shared/nm-utils/nm-vpn-editor-plugin-call.h create mode 100644 shared/nm-utils/nm-vpn-plugin-macros.h create mode 100644 shared/nm-utils/nm-vpn-plugin-utils.c create mode 100644 shared/nm-utils/nm-vpn-plugin-utils.h create mode 100644 src/devices/wwan/nm-modem-ofono.c create mode 100644 src/devices/wwan/nm-modem-ofono.h create mode 100644 src/nm-checkpoint-manager.c create mode 100644 src/nm-checkpoint-manager.h create mode 100644 src/nm-checkpoint.c create mode 100644 src/nm-checkpoint.h delete mode 100644 src/nm-connection-provider.c delete mode 100644 src/nm-connection-provider.h create mode 100644 src/nm-test-utils-core.h delete mode 100644 src/systemd/nm-sd-adapt.c delete mode 100644 src/systemd/nm-sd-adapt.h create mode 100644 src/systemd/sd-adapt/build.h create mode 100644 src/systemd/sd-adapt/cgroup-util.h create mode 100644 src/systemd/sd-adapt/condition.h create mode 100644 src/systemd/sd-adapt/conf-parser.h create mode 100644 src/systemd/sd-adapt/def.h create mode 100644 src/systemd/sd-adapt/dirent-util.h create mode 100644 src/systemd/sd-adapt/formats-util.h create mode 100644 src/systemd/sd-adapt/gunicode.h create mode 100644 src/systemd/sd-adapt/libudev.h create mode 100644 src/systemd/sd-adapt/missing.h create mode 100644 src/systemd/sd-adapt/mkdir.h create mode 100644 src/systemd/sd-adapt/nm-sd-adapt.c create mode 100644 src/systemd/sd-adapt/nm-sd-adapt.h create mode 100644 src/systemd/sd-adapt/process-util.h create mode 100644 src/systemd/sd-adapt/sd-daemon.h create mode 100644 src/systemd/sd-adapt/stat-util.h create mode 100644 src/systemd/sd-adapt/udev-util.h create mode 100644 src/systemd/sd-adapt/udev.h create mode 100644 src/systemd/sd-adapt/user-util.h create mode 100644 src/systemd/sd-adapt/virt.h create mode 100644 src/systemd/src/basic/extract-word.c create mode 100644 src/systemd/src/basic/extract-word.h create mode 100644 src/systemd/src/basic/signal-util.h create mode 100644 src/systemd/src/libsystemd/sd-id128/id128-util.c create mode 100644 src/systemd/src/libsystemd/sd-id128/id128-util.h create mode 100644 src/tests/config/NetworkManager.state diff --git a/Makefile.in b/Makefile.in index 127c8d3d..d1937a9e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -94,8 +94,9 @@ host_triplet = @host@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ - $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -216,8 +217,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/NetworkManager.pc.in \ $(top_srcdir)/build-aux/tap-driver.sh ABOUT-NLS AUTHORS \ COPYING ChangeLog INSTALL NEWS README TODO build-aux/compile \ build-aux/config.guess build-aux/config.rpath \ - build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \ - build-aux/missing + build-aux/config.sub build-aux/depcomp build-aux/install-sh \ + build-aux/ltmain.sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -294,6 +295,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DNSMASQ_PATH = @DNSMASQ_PATH@ DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@ DSYMUTIL = @DSYMUTIL@ @@ -350,13 +352,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ -LIBDL = @LIBDL@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ @@ -368,6 +371,8 @@ LIBOBJS = @LIBOBJS@ 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@ @@ -428,6 +433,8 @@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ +SANITIZER_ENV = @SANITIZER_ENV@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -463,6 +470,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/NEWS b/NEWS index 7eac1f93..c5950d39 100644 --- a/NEWS +++ b/NEWS @@ -1,48 +1,56 @@ -============================================== -NetworkManager-1.2.4 -Overview of changes since NetworkManager-1.2.2 -============================================== - -This is a new stable release of NetworkManager. Notable changes include: - -* The timeout for requests of secrets to agents has been increased from 25 to - 120 seconds. -* NetworkManager now follows symlinks when accessing resolv.conf and - 'rc-manager=file'. -* Added new values 'symlink' and 'unmanaged' to rc-manager configuration option. -* It is now possible to configure the default rc-manager option at compile time. -* Name servers passed to dnsmasq now specify an egress interface to avoid - problems with multiple active connections. -* Reverse DNS entries for IPv6 are now added to dnsmasq, and IPv4 reverse - entries now honor the network prefix. -* A new 'dns-priority' property of ipv4 and ipv6 settings can be used to tweak - the order of servers in resolv.conf when multiple connections are active. -* Added a 'Reload' D-Bus method to reload configuration and reapply DNS - configuration. -* Now devices are disconnected before the system suspends, executing dispatcher - scripts. This allows external applications to be notified of the change in - connectivity. -* Devices without L3 configuration are not more put in DOWN state on shutdown. -* MTU settings are now applied also to devices without IPv4 configuration. -* Improved VPN support in nmcli. -* Many bug fixes. - ============================================ -NetworkManager-1.2.2 +NetworkManager-1.4 Overview of changes since NetworkManager-1.2 ============================================ This is a new stable release of NetworkManager. Notable changes include: -* The dnsmasq DNS management mode now uses D-Bus API of dnsmasq to make signal - nameserver changes. -* Hostname is now correctly read on Slackware. -* IPv6 addresses for default wired connections now stay stable. -* Reading portname on s390 systems on 4.4 kernels and newer has been corrected. -* nmcli no longer warns about version mismatches. -* Updated translations. -* Improved developer documentations. -* Multiple minor bugfixes. +* The MAC address assigned to a device can now be set according to + different policies: preserve, permanent, random, stable +* NetworkManager now waits for IPv6 DAD to terminate before completing + the activation +* Added support for setting IPv6 tokenized interface identifiers + through the 'ipv6.token' connection property +* Added a 'Reload' D-Bus method to reload configuration and reapply + DNS configuration +* Added ability to create a configuration checkpoints and rolling back + changes after a timeout. +* NetworkManager now follows symlinks when accessing resolv.conf and + rc-manager is set to 'file' +* Added support for oFono as modem manager +* The devices now exposes counters of transferred data +* The 'may-fail' property of ipv4 and ipv6 settings is now respected + more accurately +* The timeout for requests of secrets to agents has been increased + from 25 to 120 seconds +* Name servers passed to dnsmasq now specify an egress interface to + avoid problems with multiple active connections +* Reverse DNS entries for IPv6 are now added to dnsmasq, and IPv4 + reverse entries now honor the network prefix +* A new 'dns-priority' property of ipv4 and ipv6 settings can be used + to tweak the order of servers in resolv.conf when multiple + connections are active +* configure script accepts --enable-{address,undefined}-sanitizer + options to build NetworkManager with GCC sanitizers +* The default resolv.conf manager can now be specified at build time + using the --with-config-dns-rc-manager-default configure option +* NetworkManager is now compiled with --gc-sections to reduce + executable size +* Added a new 'VPN_PLUGIN' logging domain +* It is now possible to change the configuration currently applied on + a device with 'nmcli device modify' and 'nmcli device reapply' +* nmcli invoked without parameters shows an overview of the current + network configuration +* The 'nmcli connection add' syntax has been extended and is now + possible to pass properties (e.g. 'ipv4.dns') along with aliases +* nmtui now returns to initial menu after a sub-form exits +* Improved bash autocompletion for nmcli +* Now devices are disconnected before the system suspends, executing + dispatcher scripts. This allows external applications to be notified + of the change in connectivity +* Dispatcher scripts are now called also when connectivity status + changes +* Many other fixes and improvements ============================================ NetworkManager-1.2 diff --git a/aclocal.m4 b/aclocal.m4 index 73e1b3dd..a60453c5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -20,32 +20,63 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -67,18 +98,19 @@ if test -n "$PKG_CONFIG"; then PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -88,8 +120,10 @@ m4_ifvaln([$3], [else $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -101,10 +135,11 @@ m4_define([_PKG_CONFIG], else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -112,19 +147,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl @@ -178,16 +211,40 @@ else AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -198,16 +255,18 @@ AC_ARG_WITH([pkgconfigdir], AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -218,13 +277,15 @@ AC_ARG_WITH([noarch-pkgconfigdir], AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. AC_DEFUN([PKG_CHECK_VAR], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl @@ -233,7 +294,7 @@ _PKG_CONFIG([$1], [variable="][$3]["], [$2]) AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR +])dnl PKG_CHECK_VAR # Copyright (C) 2002-2014 Free Software Foundation, Inc. # @@ -1433,8 +1494,9 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/attributes.m4]) m4_include([m4/ax_lib_readline.m4]) -m4_include([m4/compiler_warnings.m4]) +m4_include([m4/compiler_options.m4]) m4_include([m4/gettext.m4]) m4_include([m4/gnome-code-coverage.m4]) m4_include([m4/gtk-doc.m4]) diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 5279b2f4..82d7e755 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -28,8 +28,8 @@ libexec_PROGRAMS = \ nm_dispatcher_SOURCES = \ + $(top_srcdir)/shared/nm-dispatcher-api.h \ nm-dispatcher.c \ - nm-dispatcher-api.h \ nm-dispatcher-utils.c \ nm-dispatcher-utils.h diff --git a/callouts/Makefile.in b/callouts/Makefile.in index 14c5dcb5..9543cf8b 100644 --- a/callouts/Makefile.in +++ b/callouts/Makefile.in @@ -93,8 +93,9 @@ host_triplet = @host@ libexec_PROGRAMS = nm-dispatcher$(EXEEXT) subdir = callouts ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ - $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -307,6 +308,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DNSMASQ_PATH = @DNSMASQ_PATH@ DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@ DSYMUTIL = @DSYMUTIL@ @@ -363,13 +365,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ -LIBDL = @LIBDL@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ @@ -381,6 +384,8 @@ LIBOBJS = @LIBOBJS@ 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@ @@ -441,6 +446,8 @@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ +SANITIZER_ENV = @SANITIZER_ENV@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -476,6 +483,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -562,8 +570,8 @@ dbusservice_DATA = \ nm-dispatcher.conf nm_dispatcher_SOURCES = \ + $(top_srcdir)/shared/nm-dispatcher-api.h \ nm-dispatcher.c \ - nm-dispatcher-api.h \ nm-dispatcher-utils.c \ nm-dispatcher-utils.h diff --git a/callouts/nm-dispatcher-api.h b/callouts/nm-dispatcher-api.h deleted file mode 100644 index d702ba68..00000000 --- a/callouts/nm-dispatcher-api.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * 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 (C) 2008 - 2012 Red Hat, Inc. - */ - -#define NMD_SCRIPT_DIR_DEFAULT NMCONFDIR "/dispatcher.d" -#define NMD_SCRIPT_DIR_PRE_UP NMD_SCRIPT_DIR_DEFAULT "/pre-up.d" -#define NMD_SCRIPT_DIR_PRE_DOWN NMD_SCRIPT_DIR_DEFAULT "/pre-down.d" -#define NMD_SCRIPT_DIR_NO_WAIT NMD_SCRIPT_DIR_DEFAULT "/no-wait.d" - -#define NM_DISPATCHER_DBUS_SERVICE "org.freedesktop.nm_dispatcher" -#define NM_DISPATCHER_DBUS_INTERFACE "org.freedesktop.nm_dispatcher" -#define NM_DISPATCHER_DBUS_PATH "/org/freedesktop/nm_dispatcher" - -#define NMD_CONNECTION_PROPS_PATH "path" -#define NMD_CONNECTION_PROPS_FILENAME "filename" -#define NMD_CONNECTION_PROPS_EXTERNAL "external" - -#define NMD_DEVICE_PROPS_INTERFACE "interface" -#define NMD_DEVICE_PROPS_IP_INTERFACE "ip-interface" -#define NMD_DEVICE_PROPS_TYPE "type" -#define NMD_DEVICE_PROPS_STATE "state" -#define NMD_DEVICE_PROPS_PATH "path" - -/* Actions */ -#define NMD_ACTION_HOSTNAME "hostname" -#define NMD_ACTION_PRE_UP "pre-up" -#define NMD_ACTION_UP "up" -#define NMD_ACTION_PRE_DOWN "pre-down" -#define NMD_ACTION_DOWN "down" -#define NMD_ACTION_VPN_PRE_UP "vpn-pre-up" -#define NMD_ACTION_VPN_UP "vpn-up" -#define NMD_ACTION_VPN_PRE_DOWN "vpn-pre-down" -#define NMD_ACTION_VPN_DOWN "vpn-down" -#define NMD_ACTION_DHCP4_CHANGE "dhcp4-change" -#define NMD_ACTION_DHCP6_CHANGE "dhcp6-change" - -typedef enum { - DISPATCH_RESULT_UNKNOWN = 0, - DISPATCH_RESULT_SUCCESS = 1, - DISPATCH_RESULT_EXEC_FAILED = 2, - DISPATCH_RESULT_FAILED = 3, - DISPATCH_RESULT_TIMEOUT = 4, -} DispatchResult; - diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c index 015bb070..78ef8dd2 100644 --- a/callouts/nm-dispatcher-utils.c +++ b/callouts/nm-dispatcher-utils.c @@ -327,6 +327,7 @@ nm_dispatcher_utils_construct_envp (const char *action, GVariant *device_ip6_props, GVariant *device_dhcp4_props, GVariant *device_dhcp6_props, + const char *connectivity_state, const char *vpn_ip_iface, GVariant *vpn_ip4_props, GVariant *vpn_ip6_props, @@ -352,9 +353,11 @@ nm_dispatcher_utils_construct_envp (const char *action, g_return_val_if_fail (out_iface != NULL, NULL); g_return_val_if_fail (*out_iface == NULL, NULL); - /* Hostname changes don't require a device nor contain a connection */ - if (!strcmp (action, NMD_ACTION_HOSTNAME)) + /* Hostname and connectivity changes don't require a device nor contain a connection */ + if ( !strcmp (action, NMD_ACTION_HOSTNAME) + || !strcmp (action, NMD_ACTION_CONNECTIVITY_CHANGE)) { goto done; + } /* Connection properties */ if (!g_variant_lookup (connection_props, NMD_CONNECTION_PROPS_PATH, "&o", &path)) { @@ -465,6 +468,12 @@ nm_dispatcher_utils_construct_envp (const char *action, *out_iface = g_strdup (iface); done: + /* The connectivity_state value will only be meaningful for 'connectivity-change' events + * (otherwise it will be "UNKNOWN"), so we only set the environment variable in those cases. + */ + if (connectivity_state && strcmp(connectivity_state, "UNKNOWN")) + items = g_slist_prepend (items, g_strdup_printf ("CONNECTIVITY_STATE=%s", connectivity_state)); + path = g_getenv ("PATH"); if (path) { path_item = g_strdup_printf ("PATH=%s", path); diff --git a/callouts/nm-dispatcher-utils.h b/callouts/nm-dispatcher-utils.h index 40a0d41f..6a10d4c3 100644 --- a/callouts/nm-dispatcher-utils.h +++ b/callouts/nm-dispatcher-utils.h @@ -21,8 +21,6 @@ #ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__ #define __NETWORKMANAGER_DISPATCHER_UTILS_H__ -#include "nm-default.h" - char ** nm_dispatcher_utils_construct_envp (const char *action, GVariant *connection_dict, @@ -32,6 +30,7 @@ nm_dispatcher_utils_construct_envp (const char *action, GVariant *device_ip6_props, GVariant *device_dhcp4_props, GVariant *device_dhcp6_props, + const char *connectivity_state, const char *vpn_ip_iface, GVariant *vpn_ip4_props, GVariant *vpn_ip6_props, diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c index 7ddffb04..94bd1324 100644 --- a/callouts/nm-dispatcher.c +++ b/callouts/nm-dispatcher.c @@ -80,6 +80,7 @@ handle_action (NMDBusDispatcher *dbus_dispatcher, GVariant *device_ip6_props, GVariant *device_dhcp4_props, GVariant *device_dhcp6_props, + const char *connectivity_state, const char *vpn_ip_iface, GVariant *vpn_ip4_props, GVariant *vpn_ip6_props, @@ -668,6 +669,7 @@ handle_action (NMDBusDispatcher *dbus_dispatcher, GVariant *device_ip6_props, GVariant *device_dhcp4_props, GVariant *device_dhcp6_props, + const char *connectivity_state, const char *vpn_ip_iface, GVariant *vpn_ip4_props, GVariant *vpn_ip6_props, @@ -699,6 +701,7 @@ handle_action (NMDBusDispatcher *dbus_dispatcher, device_ip6_props, device_dhcp4_props, device_dhcp6_props, + connectivity_state, vpn_ip_iface, vpn_ip4_props, vpn_ip6_props, diff --git a/callouts/nm-dispatcher.xml b/callouts/nm-dispatcher.xml index 27f15fe5..6268f970 100644 --- a/callouts/nm-dispatcher.xml +++ b/callouts/nm-dispatcher.xml @@ -13,6 +13,7 @@ @device_ip6_config: Properties of the device's IPv6 configuration. @device_dhcp4_config: Properties of the device's DHCPv4 configuration. @device_dhcp6_config: Properties of the device's DHCPv6 configuration. + @connectivity_state: Current connectivity state: unknown, none, limited, portal or full. @vpn_ip_iface: VPN interface name. @vpn_ip4_config: Properties of the VPN's IPv4 configuration. @vpn_ip6_config: Properties of the VPN's IPv6 configuration. @@ -30,6 +31,7 @@ + diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index 6ac15874..2450f372 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -32,6 +32,8 @@ TESTS = test-dispatcher-envp endif EXTRA_DIST= \ + dispatcher-connectivity-full \ + dispatcher-connectivity-unknown \ dispatcher-down \ dispatcher-external \ dispatcher-up \ diff --git a/callouts/tests/Makefile.in b/callouts/tests/Makefile.in index a4a80afb..9f79b951 100644 --- a/callouts/tests/Makefile.in +++ b/callouts/tests/Makefile.in @@ -92,8 +92,9 @@ host_triplet = @host@ @ENABLE_TESTS_TRUE@TESTS = test-dispatcher-envp$(EXEEXT) subdir = callouts/tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ - $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -427,6 +428,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DNSMASQ_PATH = @DNSMASQ_PATH@ DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@ DSYMUTIL = @DSYMUTIL@ @@ -483,13 +485,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ -LIBDL = @LIBDL@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ @@ -501,6 +504,8 @@ LIBOBJS = @LIBOBJS@ 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@ @@ -561,6 +566,8 @@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ +SANITIZER_ENV = @SANITIZER_ENV@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -596,6 +603,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -679,6 +687,8 @@ with_valgrind = @with_valgrind@ @ENABLE_TESTS_TRUE@ $(GLIB_LIBS) EXTRA_DIST = \ + dispatcher-connectivity-full \ + dispatcher-connectivity-unknown \ dispatcher-down \ dispatcher-external \ dispatcher-up \ diff --git a/callouts/tests/dispatcher-connectivity-full b/callouts/tests/dispatcher-connectivity-full new file mode 100644 index 00000000..c370bc35 --- /dev/null +++ b/callouts/tests/dispatcher-connectivity-full @@ -0,0 +1,23 @@ +[main] +action=connectiviy-change +expected-iface=wlan0 +uuid=3fd2a33a-d81b-423f-ae99-e6baba742311 +id=Random Connection +connectivity-state=FULL + +[device] +state=30 +ip-interface=wlan0 +type=2 +interface=wlan0 +path=/org/freedesktop/NetworkManager/Devices/0 + +[env] +PATH= +CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311 +CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 +CONNECTION_ID=Random Connection +CONNECTION_FILENAME=/callouts/tests/dispatcher-connectivity-full +DEVICE_IFACE=wlan0 +DEVICE_IP_IFACE=wlan0 +CONNECTIVITY_STATE=FULL diff --git a/callouts/tests/dispatcher-connectivity-unknown b/callouts/tests/dispatcher-connectivity-unknown new file mode 100644 index 00000000..9622d017 --- /dev/null +++ b/callouts/tests/dispatcher-connectivity-unknown @@ -0,0 +1,22 @@ +[main] +action=connectiviy-change +expected-iface=wlan0 +uuid=3fd2a33a-d81b-423f-ae99-e6baba742311 +id=Random Connection +connectivity-state=UNKNOWN + +[device] +state=30 +ip-interface=wlan0 +type=2 +interface=wlan0 +path=/org/freedesktop/NetworkManager/Devices/0 + +[env] +PATH= +CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311 +CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 +CONNECTION_ID=Random Connection +CONNECTION_FILENAME=/callouts/tests/dispatcher-connectivity-unknown +DEVICE_IFACE=wlan0 +DEVICE_IP_IFACE=wlan0 diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c index 9cdaa3b5..8636f097 100644 --- a/callouts/tests/test-dispatcher-envp.c +++ b/callouts/tests/test-dispatcher-envp.c @@ -28,7 +28,7 @@ #include "nm-dispatcher-utils.h" #include "nm-dispatcher-api.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" /*******************************************/ @@ -39,6 +39,7 @@ parse_main (GKeyFile *kf, GVariant **out_con_props, char **out_expected_iface, char **out_action, + char **out_connectivity_state, char **out_vpn_ip_iface, GError **error) { @@ -51,6 +52,7 @@ parse_main (GKeyFile *kf, if (*out_expected_iface == NULL) return FALSE; + *out_connectivity_state = g_key_file_get_string (kf, "main", "connectivity-state", NULL); *out_vpn_ip_iface = g_key_file_get_string (kf, "main", "vpn-ip-iface", NULL); *out_action = g_key_file_get_string (kf, "main", "action", error); @@ -359,6 +361,7 @@ get_dispatcher_file (const char *file, GVariant **out_device_ip6_props, GVariant **out_device_dhcp4_props, GVariant **out_device_dhcp6_props, + char **out_connectivity_state, char **out_vpn_ip_iface, GVariant **out_vpn_ip4_props, GVariant **out_vpn_ip6_props, @@ -379,6 +382,7 @@ get_dispatcher_file (const char *file, g_assert (out_device_ip6_props && !*out_device_ip6_props); g_assert (out_device_dhcp4_props && !*out_device_dhcp4_props); g_assert (out_device_dhcp6_props && !*out_device_dhcp6_props); + g_assert (out_connectivity_state && !*out_connectivity_state); g_assert (out_vpn_ip_iface && !*out_vpn_ip_iface); g_assert (out_vpn_ip4_props && !*out_vpn_ip4_props); g_assert (out_vpn_ip6_props && !*out_vpn_ip6_props); @@ -396,6 +400,7 @@ get_dispatcher_file (const char *file, out_con_props, out_expected_iface, out_action, + out_connectivity_state, out_vpn_ip_iface, error)) goto out; @@ -444,25 +449,27 @@ out: static void test_generic (const char *file, const char *override_vpn_ip_iface) { - GVariant *con_dict = NULL; - GVariant *con_props = NULL; - GVariant *device_props = NULL; - GVariant *device_ip4_props = NULL; - GVariant *device_ip6_props = NULL; - GVariant *device_dhcp4_props = NULL; - GVariant *device_dhcp6_props = NULL; - char *vpn_ip_iface = NULL; - GVariant *vpn_ip4_props = NULL; - GVariant *vpn_ip6_props = NULL; - char *expected_iface = NULL; - char *action = NULL; - char *out_iface = NULL; + gs_unref_variant GVariant *con_dict = NULL; + gs_unref_variant GVariant *con_props = NULL; + gs_unref_variant GVariant *device_props = NULL; + gs_unref_variant GVariant *device_ip4_props = NULL; + gs_unref_variant GVariant *device_ip6_props = NULL; + gs_unref_variant GVariant *device_dhcp4_props = NULL; + gs_unref_variant GVariant *device_dhcp6_props = NULL; + gs_free char *connectivity_change = NULL; + gs_free char *vpn_ip_iface = NULL; + gs_unref_variant GVariant *vpn_ip4_props = NULL; + gs_unref_variant GVariant *vpn_ip6_props = NULL; + gs_free char *expected_iface = NULL; + gs_free char *action = NULL; + gs_free char *out_iface = NULL; const char *error_message = NULL; - GHashTable *expected_env = NULL; + gs_unref_hashtable GHashTable *expected_env = NULL; GError *error = NULL; gboolean success; char *p; - char **denv, **iter; + gs_strfreev char **denv = NULL; + char **iter; /* Read in the test file */ p = g_build_filename (SRCDIR, file, NULL); @@ -474,6 +481,7 @@ test_generic (const char *file, const char *override_vpn_ip_iface) &device_ip6_props, &device_dhcp4_props, &device_dhcp6_props, + &connectivity_change, &vpn_ip_iface, &vpn_ip4_props, &vpn_ip6_props, @@ -494,6 +502,7 @@ test_generic (const char *file, const char *override_vpn_ip_iface) device_ip6_props, device_dhcp4_props, device_dhcp6_props, + connectivity_change, override_vpn_ip_iface ? override_vpn_ip_iface : vpn_ip_iface, vpn_ip4_props, vpn_ip6_props, @@ -545,28 +554,6 @@ test_generic (const char *file, const char *override_vpn_ip_iface) } g_assert_cmpstr (expected_iface, ==, out_iface); - - g_strfreev (denv); - g_free (out_iface); - g_free (vpn_ip_iface); - g_free (expected_iface); - g_free (action); - g_variant_unref (con_dict); - g_variant_unref (con_props); - g_variant_unref (device_props); - if (device_ip4_props) - g_variant_unref (device_ip4_props); - if (device_ip6_props) - g_variant_unref (device_ip6_props); - if (device_dhcp4_props) - g_variant_unref (device_dhcp4_props); - if (device_dhcp6_props) - g_variant_unref (device_dhcp6_props); - if (vpn_ip4_props) - g_variant_unref (vpn_ip4_props); - if (vpn_ip6_props) - g_variant_unref (vpn_ip6_props); - g_hash_table_destroy (expected_env); } /*******************************************/ @@ -601,6 +588,15 @@ test_external (void) test_generic ("dispatcher-external", NULL); } +static void +test_connectivity_changed (void) +{ + /* These tests will check that the CONNECTIVITY_STATE environment + * variable is only defined for known states, such as 'full'. */ + test_generic ("dispatcher-connectivity-unknown", NULL); + test_generic ("dispatcher-connectivity-full", NULL); +} + static void test_up_empty_vpn_iface (void) { @@ -624,6 +620,7 @@ main (int argc, char **argv) g_test_add_func ("/dispatcher/vpn_up", test_vpn_up); g_test_add_func ("/dispatcher/vpn_down", test_vpn_down); g_test_add_func ("/dispatcher/external", test_external); + g_test_add_func ("/dispatcher/connectivity_changed", test_connectivity_changed); g_test_add_func ("/dispatcher/up_empty_vpn_iface", test_up_empty_vpn_iface); diff --git a/clients/Makefile.in b/clients/Makefile.in index b9439b75..2d82a284 100644 --- a/clients/Makefile.in +++ b/clients/Makefile.in @@ -91,8 +91,9 @@ host_triplet = @host@ bin_PROGRAMS = nm-online$(EXEEXT) subdir = clients ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ - $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -261,6 +262,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DNSMASQ_PATH = @DNSMASQ_PATH@ DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@ DSYMUTIL = @DSYMUTIL@ @@ -317,13 +319,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ -LIBDL = @LIBDL@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ @@ -335,6 +338,8 @@ LIBOBJS = @LIBOBJS@ 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@ @@ -395,6 +400,8 @@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ +SANITIZER_ENV = @SANITIZER_ENV@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -430,6 +437,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/clients/cli/Makefile.in b/clients/cli/Makefile.in index 01b2433a..beb0d697 100644 --- a/clients/cli/Makefile.in +++ b/clients/cli/Makefile.in @@ -94,8 +94,9 @@ host_triplet = @host@ @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_3 = $(POLKIT_LIBS) subdir = clients/cli ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ - $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -242,6 +243,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DNSMASQ_PATH = @DNSMASQ_PATH@ DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@ DSYMUTIL = @DSYMUTIL@ @@ -298,13 +300,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ -LIBDL = @LIBDL@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ @@ -316,6 +319,8 @@ LIBOBJS = @LIBOBJS@ 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@ @@ -376,6 +381,8 @@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ +SANITIZER_ENV = @SANITIZER_ENV@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -411,6 +418,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/clients/cli/agent.c b/clients/cli/agent.c index b8a56d23..bc837c72 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -138,6 +138,9 @@ secrets_requested (NMSecretAgentSimple *agent, static NMCResultCode do_agent_secret (NmCli *nmc, int argc, char **argv) { + if (nmc->complete) + return nmc->return_value; + /* Create secret agent */ nmc->secret_agent = nm_secret_agent_simple_new ("nmcli-agent"); if (nmc->secret_agent) { @@ -160,6 +163,9 @@ do_agent_polkit (NmCli *nmc, int argc, char **argv) { GError *error = NULL; + if (nmc->complete) + return nmc->return_value; + /* Initialize polkit agent */ if (!nmc_polkit_agent_init (nmc, TRUE, &error)) { g_dbus_error_strip_remote_error (error); @@ -182,6 +188,9 @@ do_agent_all (NmCli *nmc, int argc, char **argv) { NMCResultCode secret_res; + if (nmc->complete) + return nmc->return_value; + /* Run both secret and polkit agent */ secret_res = do_agent_secret (nmc, argc, argv); if (secret_res != NMC_RESULT_SUCCESS) @@ -195,6 +204,14 @@ do_agent_all (NmCli *nmc, int argc, char **argv) return nmc->return_value; } +static const NMCCommand agent_cmds[] = { + {"secret", do_agent_secret, usage_agent_secret }, + {"polkit", do_agent_polkit, usage_agent_polkit }, + {"all", do_agent_all, usage_agent_all }, + {NULL, do_agent_all, usage } +}; + + NMCResultCode do_agent (NmCli *nmc, int argc, char **argv) { @@ -208,39 +225,5 @@ do_agent (NmCli *nmc, int argc, char **argv) return nmc->return_value; } - if (argc == 0) { - nmc->return_value = do_agent_all (nmc, 0, NULL); - } - - if (argc > 0) { - if (nmc_arg_is_help (*argv)) { - usage (); - goto usage_exit; - } else if (matches (*argv, "secret") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_agent_secret (); - goto usage_exit; - } - nmc->return_value = do_agent_secret (nmc, argc-1, argv+1); - } else if (matches (*argv, "polkit") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_agent_polkit (); - goto usage_exit; - } - nmc->return_value = do_agent_polkit (nmc, argc-1, argv+1); - } else if (matches (*argv, "all") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_agent_all (); - goto usage_exit; - } - nmc->return_value = do_agent_all (nmc, argc-1, argv+1); - } else { - usage (); - g_string_printf (nmc->return_text, _("Error: 'agent' command '%s' is not valid."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - } - } - -usage_exit: - return nmc->return_value; + return nmc_do_cmd (nmc, agent_cmds, *argv, argc, argv); } diff --git a/clients/cli/common.c b/clients/cli/common.c index 05b76564..f1ec46a1 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -872,6 +872,7 @@ nmc_team_check_config (const char *config, char **out_config, GError **error) * @filter_val: connection to find (connection name, UUID or path) * @start: where to start in @list. The location is updated so that the function * can be called multiple times (for connections with the same name). + * @complete: print possible completions * * Find a connection in @list according to @filter_val. @filter_type determines * what property is used for comparison. When @filter_type is NULL, compare @@ -885,7 +886,8 @@ NMConnection * nmc_find_connection (const GPtrArray *connections, const char *filter_type, const char *filter_val, - int *start) + int *start, + gboolean complete) { NMConnection *connection; NMConnection *found = NULL; @@ -907,20 +909,36 @@ nmc_find_connection (const GPtrArray *connections, * type. If 'path' filter type is specified, comparison against * numeric index (in addition to the whole path) is allowed. */ - if ( ( (!filter_type || strcmp (filter_type, "id") == 0) - && strcmp (filter_val, id) == 0) - || ( (!filter_type || strcmp (filter_type, "uuid") == 0) - && strcmp (filter_val, uuid) == 0) - || ( (!filter_type || strcmp (filter_type, "path") == 0) - && (g_strcmp0 (filter_val, path) == 0 || (filter_type && g_strcmp0 (filter_val, path_num) == 0)))) { - if (!start) - return connection; - if (found) { - *start = i; - return found; - } - found = connection; + if (!filter_type || strcmp (filter_type, "id") == 0) { + if (complete) + nmc_complete_strings (filter_val, id, NULL); + if (strcmp (filter_val, id) == 0) + goto found; + } + + if (!filter_type || strcmp (filter_type, "uuid") == 0) { + if (complete && (filter_type || *filter_val)) + nmc_complete_strings (filter_val, uuid, NULL); + if (strcmp (filter_val, uuid) == 0) + goto found; + } + + if (!filter_type || strcmp (filter_type, "path") == 0) { + if (complete && (filter_type || *filter_val)) + nmc_complete_strings (filter_val, path, filter_type ? path_num : NULL, NULL); + if (g_strcmp0 (filter_val, path) == 0 || (filter_type && g_strcmp0 (filter_val, path_num) == 0)) + goto found; + } + + continue; +found: + if (!start) + return connection; + if (found) { + *start = i; + return found; } + found = connection; } if (start) @@ -1041,7 +1059,8 @@ get_secrets_from_user (const char *request_id, } } g_print ("%s\n", msg); - pwd = nmc_readline_echo (echo_on, "%s (%s): ", secret->name, secret->prop_name); + pwd = nmc_readline_echo (secret->password ? echo_on : TRUE, + "%s (%s): ", secret->name, secret->prop_name); if (!pwd) pwd = g_strdup (""); } else { @@ -1096,7 +1115,7 @@ nmc_secrets_requested (NMSecretAgentSimple *agent, p = strrchr (path, '/'); if (p) *p = '\0'; - connection = nmc_find_connection (nmc->connections, "path", path, NULL); + connection = nmc_find_connection (nmc->connections, "path", path, NULL, FALSE); g_free (path); } @@ -1393,3 +1412,119 @@ nmc_parse_lldp_capabilities (guint value) return g_string_free (str, FALSE); } + +/** + * nmc_do_cmd: + * @nmc: Client instance + * @cmds: Command table + * @cmd: Command + * @argc: Argument count + * @argv: Arguments vector + * + * Picks the right callback to handle command from the command table. + * If --help argument follows and the usage callback is specified for the command + * it calls the usage callback. + * + * The command table is terminated with a %NULL command. The terminating + * entry's handlers are called if the command is empty. + * + * Returns: a nmcli return code + */ +NMCResultCode +nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char **argv) +{ + const NMCCommand *c; + + if (argc == 0 && nmc->complete) + return nmc->return_value; + + if (argc == 1 && nmc->complete) { + for (c = cmds; c->cmd; ++c) { + if (!*cmd || matches (cmd, c->cmd) == 0) + g_print ("%s\n", c->cmd); + } + return nmc->return_value; + } + + for (c = cmds; c->cmd; ++c) { + if (cmd && matches (cmd, c->cmd) == 0) + break; + } + + if (c->cmd) { + /* A valid command was specified. */ + if (c->usage && nmc_arg_is_help (*(argv+1))) + c->usage (); + else + nmc->return_value = c->func (nmc, argc-1, argv+1); + } else if (cmd) { + /* Not a known command. */ + if (nmc_arg_is_help (cmd) && c->usage) { + c->usage (); + } else { + g_string_printf (nmc->return_text, _("Error: argument '%s' not understood. Try passing --help instead."), cmd); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + } + } else if (c->func) { + /* No command, run the default handler. */ + nmc->return_value = c->func (nmc, argc, argv); + } else { + /* No command and no default handler. */ + g_string_printf (nmc->return_text, _("Error: missing argument. Try passing --help.")); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + } + + return nmc->return_value; +} + +/** + * nmc_complete_strings: + * @prefix: a string to match + * @...: a %NULL-terminated list of candidate strings + * + * Prints all the matching candidates for completion. Useful when there's + * no better way to suggest completion other than a hardcoded string list. + */ +void +nmc_complete_strings (const char *prefix, ...) +{ + va_list args; + const char *candidate; + + va_start (args, prefix); + while ((candidate = va_arg (args, const char *))) { + if (!*prefix || matches (prefix, candidate) == 0) + g_print ("%s\n", candidate); + } + va_end (args); +} + +/** + * nmc_complete_bool: + * @prefix: a string to match + * @...: a %NULL-terminated list of candidate strings + * + * Prints all the matching possible boolean values for completion. + */ +void +nmc_complete_bool (const char *prefix) +{ + nmc_complete_strings (prefix, "true", "yes", "on", + "false", "no", "off", NULL); +} + +/** + * nmc_error_get_simple_message: + * @error: a GError + * + * Returns a simplified message for some errors hard to understand. + */ +const char * +nmc_error_get_simple_message (GError *error) +{ + /* Return a clear message instead of the obscure D-Bus policy error */ + if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_ACCESS_DENIED)) + return _("access denied"); + else + return error->message; +} diff --git a/clients/cli/common.h b/clients/cli/common.h index 26459e4b..579c44a7 100644 --- a/clients/cli/common.h +++ b/clients/cli/common.h @@ -48,7 +48,8 @@ gboolean nmc_team_check_config (const char *config, char **out_config, GError ** NMConnection *nmc_find_connection (const GPtrArray *connections, const char *filter_type, const char *filter_val, - int *start); + int *start, + gboolean complete); void nmc_secrets_requested (NMSecretAgentSimple *agent, const char *request_id, @@ -73,4 +74,23 @@ int nmc_rl_set_deftext (void); char *nmc_parse_lldp_capabilities (guint value); +typedef struct { + const char *cmd; + NMCResultCode (*func) (NmCli *nmc, int argc, char **argv); + void (*usage) (void); +} NMCCommand; + +NMCResultCode nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *argv0, int argc, char **argv); + +void nmc_complete_strings (const char *prefix, ...) G_GNUC_NULL_TERMINATED; + +void nmc_complete_bool (const char *prefix); + +const char *nmc_error_get_simple_message (GError *error); + +extern NmcOutputField nmc_fields_ip4_config[]; +extern NmcOutputField nmc_fields_dhcp4_config[]; +extern NmcOutputField nmc_fields_ip6_config[]; +extern NmcOutputField nmc_fields_dhcp6_config[]; + #endif /* NMC_COMMON_H */ diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 0e9a18ed..ea7c8a79 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -33,28 +33,89 @@ #include "common.h" #include "settings.h" #include "connections.h" +#include "devices.h" #include "nm-secret-agent-simple.h" #include "polkit-agent.h" #include "nm-vpn-helpers.h" +typedef struct _OptionInfo OptionInfo; +struct _OptionInfo { + const char *setting_name; + const char *property; + const char *option; + enum { + OPTION_NONE = 0x00, + OPTION_REQD = 0x01, /* Don't ask to ask. */ + OPTION_DONT_ASK = 0x02, /* Don't ask interactively by default */ + OPTION_MULTI = 0x04, /* Ask multiple times, do an append instead of set. */ + + OPTION_DISABLED = 0x10, /* Don't ask due to runtime decision. */ + OPTION_ENABLED = 0x20, /* Override OPTION_DONT_ASK due to runtime decision. */ + } flags; + const char *prompt; + const char *def_hint; + gboolean (*check_and_set)(NmCli *nmc, NMConnection *connection, OptionInfo *option, const char *value, GError **error); + rl_compentry_func_t *generator_func; +}; + /* define some prompts for connection editor */ #define EDITOR_PROMPT_SETTING _("Setting name? ") #define EDITOR_PROMPT_PROPERTY _("Property name? ") #define EDITOR_PROMPT_CON_TYPE _("Enter connection type: ") /* define some other prompts */ -#define PROMPT_CON_TYPE _("Connection type: ") -#define PROMPT_VPN_TYPE _("VPN type: ") -#define PROMPT_MASTER _("Master: ") -#define PROMPT_CONNECTION _("Connection (name, UUID, or path): ") -#define PROMPT_VPN_CONNECTION _("VPN connection (name, UUID, or path): ") -#define PROMPT_CONNECTIONS _("Connection(s) (name, UUID, or path): ") -#define PROMPT_ACTIVE_CONNECTIONS _("Connection(s) (name, UUID, path or apath): ") -#define PROMPT_IP_TUNNEL_MODE _("Tunnel mode: ") -#define PROMPT_MACVLAN_MODE _("MACVLAN mode: ") +#define PROMPT_CON_TYPE N_("Connection type") +#define PROMPT_VPN_TYPE N_("VPN type") +#define PROMPT_MASTER N_("Master") + +#define PROMPT_IB_MODE N_("Transport mode") +#define WORD_DATAGRAM "datagram" +#define WORD_CONNECTED "connected" +#define PROMPT_IB_MODE_CHOICES "(" WORD_DATAGRAM "/" WORD_CONNECTED ") [" WORD_DATAGRAM "]" + +#define PROMPT_BT_TYPE N_("Bluetooth type") +#define WORD_PANU "panu" +#define WORD_DUN_GSM "dun-gsm" +#define WORD_DUN_CDMA "dun-cdma" +#define PROMPT_BT_TYPE_CHOICES "(" WORD_PANU "/" WORD_DUN_GSM "/" WORD_DUN_CDMA ") [" WORD_PANU "]" + +#define PROMPT_BOND_MODE N_("Bonding mode") + +#define PROMPT_BOND_MON_MODE N_("Bonding monitoring mode") +#define WORD_MIIMON "miimon" +#define WORD_ARP "arp" +#define PROMPT_BOND_MON_MODE_CHOICES "(" WORD_MIIMON "/" WORD_ARP ") [" WORD_MIIMON "]" + +#define PROMPT_ADSL_PROTO N_("Protocol") +#define PROMPT_ADSL_PROTO_CHOICES "(" NM_SETTING_ADSL_PROTOCOL_PPPOA "/" NM_SETTING_ADSL_PROTOCOL_PPPOE "/" NM_SETTING_ADSL_PROTOCOL_IPOATM ")" + +#define PROMPT_WIFI_MODE N_("Wi-Fi mode") +#define WORD_INFRA "infrastructure" +#define WORD_AP "ap" +#define WORD_ADHOC "adhoc" +#define PROMPT_WIFI_MODE_CHOICES "(" WORD_INFRA "/" WORD_AP "/" WORD_ADHOC ") [" WORD_INFRA "]" + +#define PROMPT_ADSL_ENCAP N_("ADSL encapsulation") +#define PROMPT_ADSL_ENCAP_CHOICES "(" NM_SETTING_ADSL_ENCAPSULATION_VCMUX "/" NM_SETTING_ADSL_ENCAPSULATION_LLC ") [none]" + +#define PROMPT_TUN_MODE N_("Tun mode") +#define WORD_TUN "tun" +#define WORD_TAP "tap" +#define PROMPT_TUN_MODE_CHOICES "(" WORD_TUN "/" WORD_TAP ") [" WORD_TUN "]" + +#define PROMPT_IP_TUNNEL_MODE N_("IP Tunnel mode") + +#define PROMPT_MACVLAN_MODE N_("MACVLAN mode") + +#define PROMPT_CONNECTION _("Connection (name, UUID, or path)") +#define PROMPT_VPN_CONNECTION _("VPN connection (name, UUID, or path)") +#define PROMPT_CONNECTIONS _("Connection(s) (name, UUID, or path)") +#define PROMPT_ACTIVE_CONNECTIONS _("Connection(s) (name, UUID, path or apath)") + +#define BASE_PROMPT "nmcli> " /* Available fields for 'connection show' */ -static NmcOutputField nmc_fields_con_show[] = { +NmcOutputField nmc_fields_con_show[] = { {"NAME", N_("NAME")}, /* 0 */ {"UUID", N_("UUID")}, /* 1 */ {"TYPE", N_("TYPE")}, /* 2 */ @@ -77,39 +138,8 @@ static NmcOutputField nmc_fields_con_show[] = { /* Helper macro to define fields */ #define SETTING_FIELD(setting, props) { setting, N_(setting), 0, props, NULL, FALSE, FALSE, 0 } -/* defined in settings.c */ -extern NmcOutputField nmc_fields_setting_connection[]; -extern NmcOutputField nmc_fields_setting_wired[]; -extern NmcOutputField nmc_fields_setting_8021X[]; -extern NmcOutputField nmc_fields_setting_wireless[]; -extern NmcOutputField nmc_fields_setting_wireless_security[]; -extern NmcOutputField nmc_fields_setting_ip4_config[]; -extern NmcOutputField nmc_fields_setting_ip6_config[]; -extern NmcOutputField nmc_fields_setting_serial[]; -extern NmcOutputField nmc_fields_setting_ppp[]; -extern NmcOutputField nmc_fields_setting_pppoe[]; -extern NmcOutputField nmc_fields_setting_adsl[]; -extern NmcOutputField nmc_fields_setting_gsm[]; -extern NmcOutputField nmc_fields_setting_cdma[]; -extern NmcOutputField nmc_fields_setting_bluetooth[]; -extern NmcOutputField nmc_fields_setting_olpc_mesh[]; -extern NmcOutputField nmc_fields_setting_vpn[]; -extern NmcOutputField nmc_fields_setting_wimax[]; -extern NmcOutputField nmc_fields_setting_infiniband[]; -extern NmcOutputField nmc_fields_setting_bond[]; -extern NmcOutputField nmc_fields_setting_vlan[]; -extern NmcOutputField nmc_fields_setting_bridge[]; -extern NmcOutputField nmc_fields_setting_bridge_port[]; -extern NmcOutputField nmc_fields_setting_team[]; -extern NmcOutputField nmc_fields_setting_team_port[]; -extern NmcOutputField nmc_fields_setting_dcb[]; -extern NmcOutputField nmc_fields_setting_tun[]; -extern NmcOutputField nmc_fields_setting_ip_tunnel[]; -extern NmcOutputField nmc_fields_setting_macvlan[]; -extern NmcOutputField nmc_fields_setting_vxlan[]; - /* Available settings for 'connection show ' - profile part */ -static NmcOutputField nmc_fields_settings_names[] = { +NmcOutputField nmc_fields_settings_names[] = { SETTING_FIELD (NM_SETTING_CONNECTION_SETTING_NAME, nmc_fields_setting_connection + 1), /* 0 */ SETTING_FIELD (NM_SETTING_WIRED_SETTING_NAME, nmc_fields_setting_wired + 1), /* 1 */ SETTING_FIELD (NM_SETTING_802_1X_SETTING_NAME, nmc_fields_setting_8021X + 1), /* 2 */ @@ -173,7 +203,7 @@ static NmcOutputField nmc_fields_settings_names[] = { /* Active connection data */ /* Available fields for GENERAL group */ -static NmcOutputField nmc_fields_con_active_details_general[] = { +NmcOutputField nmc_fields_con_active_details_general[] = { {"GROUP", N_("GROUP")}, /* 0 */ {"NAME", N_("NAME")}, /* 1 */ {"UUID", N_("UUID")}, /* 2 */ @@ -195,7 +225,7 @@ static NmcOutputField nmc_fields_con_active_details_general[] = { /* IP group is handled by common.c */ /* Available fields for VPN group */ -static NmcOutputField nmc_fields_con_active_details_vpn[] = { +NmcOutputField nmc_fields_con_active_details_vpn[] = { {"GROUP", N_("GROUP")}, /* 0 */ {"TYPE", N_("TYPE")}, /* 1 */ {"USERNAME", N_("USERNAME")}, /* 2 */ @@ -214,7 +244,7 @@ extern NmcOutputField nmc_fields_dhcp4_config[]; extern NmcOutputField nmc_fields_dhcp6_config[]; /* Available fields for 'connection show ' - active part */ -static NmcOutputField nmc_fields_con_active_details_groups[] = { +NmcOutputField nmc_fields_con_active_details_groups[] = { {"GENERAL", N_("GENERAL"), 0, nmc_fields_con_active_details_general + 1}, /* 0 */ {"IP4", N_("IP4"), 0, nmc_fields_ip4_config + 1 }, /* 1 */ {"DHCP4", N_("DHCP4"), 0, nmc_fields_dhcp4_config + 1 }, /* 2 */ @@ -252,7 +282,7 @@ static void usage (void) { g_printerr (_("Usage: nmcli connection { COMMAND | help }\n\n" - "COMMAND := { show | up | down | add | modify | edit | delete | monitor | reload | load }\n\n" + "COMMAND := { show | up | down | add | modify | clone | edit | delete | monitor | reload | load | import | export }\n\n" " show [--active] [--order ]\n" " show [--active] [id | uuid | path | apath] ...\n\n" " up [[id | uuid | path] ] [ifname ] [ap ] [passwd-file ]\n\n" @@ -553,42 +583,6 @@ usage_connection_export (void) "The data are directed to standard output or to a file if a name is given.\n\n")); } -static gboolean -usage_connection_second_level (const char *cmd) -{ - gboolean ret = TRUE; - - if (matches (cmd, "show") == 0) - usage_connection_show (); - else if (matches (cmd, "up") == 0) - usage_connection_up (); - else if (matches (cmd, "down") == 0) - usage_connection_down (); - else if (matches (cmd, "add") == 0) - usage_connection_add (); - else if (matches (cmd, "modify") == 0) - usage_connection_modify (); - else if (matches (cmd, "clone") == 0) - usage_connection_clone (); - else if (matches (cmd, "edit") == 0) - usage_connection_edit (); - else if (matches (cmd, "delete") == 0) - usage_connection_delete (); - else if (matches (cmd, "monitor") == 0) - usage_connection_monitor (); - else if (matches (cmd, "reload") == 0) - usage_connection_reload (); - else if (matches (cmd, "load") == 0) - usage_connection_load (); - else if (matches (cmd, "import") == 0) - usage_connection_import (); - else if (matches (cmd, "export") == 0) - usage_connection_export (); - else - ret = FALSE; - return ret; -} - /* quit main loop */ static void quit (void) @@ -804,7 +798,8 @@ find_active_connection (const GPtrArray *active_cons, const GPtrArray *cons, const char *filter_type, const char *filter_val, - int *idx) + int *idx, + gboolean complete) { int i; int start = (idx && *idx > 0) ? *idx : 0; @@ -831,22 +826,43 @@ find_active_connection (const GPtrArray *active_cons, * type. If 'path' or 'apath' filter types are specified, comparison * against numeric index (in addition to the whole path) is allowed. */ - if ( ( (!filter_type || strcmp (filter_type, "id") == 0) - && strcmp (filter_val, id) == 0) - || ( (!filter_type || strcmp (filter_type, "uuid") == 0) - && strcmp (filter_val, uuid) == 0) - || ( (!filter_type || strcmp (filter_type, "path") == 0) - && (g_strcmp0 (filter_val, path) == 0 || (filter_type && g_strcmp0 (filter_val, path_num) == 0))) - || ( (!filter_type || strcmp (filter_type, "apath") == 0) - && (g_strcmp0 (filter_val, a_path) == 0 || (filter_type && g_strcmp0 (filter_val, a_path_num) == 0)))) { - if (!idx) - return candidate; - if (found) { - *idx = i; - return found; - } - found = candidate; + if (!filter_type || strcmp (filter_type, "id") == 0) { + if (complete) + nmc_complete_strings (filter_val, id, NULL); + if (strcmp (filter_val, id) == 0) + goto found; + } + + if (!filter_type || strcmp (filter_type, "uuid") == 0) { + if (complete && (filter_type || *filter_val)) + nmc_complete_strings (filter_val, uuid, NULL); + if (strcmp (filter_val, uuid) == 0) + goto found; + } + + if (!filter_type || strcmp (filter_type, "path") == 0) { + if (complete && (filter_type || *filter_val)) + nmc_complete_strings (filter_val, path, filter_type ? path_num : NULL, NULL); + if (g_strcmp0 (filter_val, path) == 0 || (filter_type && g_strcmp0 (filter_val, path_num) == 0)) + goto found; + } + + if (!filter_type || strcmp (filter_type, "apath") == 0) { + if (complete && (filter_type || *filter_val)) + nmc_complete_strings (filter_val, a_path, filter_type ? a_path_num : NULL, NULL); + if (g_strcmp0 (filter_val, a_path) == 0 || (filter_type && g_strcmp0 (filter_val, a_path_num) == 0)) + goto found; + } + + continue; +found: + if (!idx) + return candidate; + if (found) { + *idx = i; + return found; } + found = candidate; } if (idx) @@ -854,6 +870,19 @@ find_active_connection (const GPtrArray *active_cons, return found; } +void +nmc_active_connection_state_to_color (NMActiveConnectionState state, NmcTermColor *color) +{ + *color = NMC_TERM_COLOR_NORMAL; + + if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING) + *color = NMC_TERM_COLOR_YELLOW; + else if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) + *color = NMC_TERM_COLOR_GREEN; + else if (state > NM_ACTIVE_CONNECTION_STATE_ACTIVATED) + *color = NMC_TERM_COLOR_RED; +} + static void fill_output_connection (NMConnection *connection, NmCli *nmc, gboolean active_only) { @@ -869,6 +898,7 @@ fill_output_connection (NMConnection *connection, NmCli *nmc, gboolean active_on const char *ac_state = NULL; NMActiveConnectionState ac_state_int = NM_ACTIVE_CONNECTION_STATE_UNKNOWN; char *ac_dev = NULL; + NmcTermColor color; s_con = nm_connection_get_setting_connection (connection); g_assert (s_con); @@ -897,15 +927,10 @@ fill_output_connection (NMConnection *connection, NmCli *nmc, gboolean active_on arr = nmc_dup_fields_array (nmc_fields_con_show, sizeof (nmc_fields_con_show), 0); + /* Show active connections in color */ - if (ac) { - if (ac_state_int == NM_ACTIVE_CONNECTION_STATE_ACTIVATING) - set_val_color_all (arr, NMC_TERM_COLOR_YELLOW); - else if (ac_state_int == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) - set_val_color_all (arr, NMC_TERM_COLOR_GREEN); - else if (ac_state_int > NM_ACTIVE_CONNECTION_STATE_ACTIVATED) - set_val_color_all (arr, NMC_TERM_COLOR_RED); - } + nmc_active_connection_state_to_color (ac_state_int, &color); + set_val_color_all (arr, color); set_val_strc (arr, 0, nm_setting_connection_get_id (s_con)); set_val_strc (arr, 1, nm_setting_connection_get_uuid (s_con)); @@ -1457,7 +1482,7 @@ compare_connections (gconstpointer a, gconstpointer b, gpointer user_data) } for (i = 0; i < order->len; i++) { - item = g_array_index (order, NmcSortOrder, i); + item = g_array_index (order, NmcSortOrder, i); switch (item) { case NMC_SORT_ACTIVE: case NMC_SORT_ACTIVE_INV: @@ -1580,13 +1605,150 @@ get_invisible_active_connections (NmCli *nmc) return invisibles; } +static GArray * +parse_preferred_connection_order (const char *order, GError **error) +{ + char **strv, **iter; + const char *str; + GArray *order_arr; + NmcSortOrder val; + gboolean inverse, unique; + int i; + + strv = nmc_strsplit_set (order, ":", -1); + if (!strv || !*strv) { + g_set_error (error, NMCLI_ERROR, 0, + _("incorrect string '%s' of '--order' option"), order); + g_strfreev (strv); + return NULL; + } + + order_arr = g_array_sized_new (FALSE, FALSE, sizeof (NmcSortOrder), 4); + for (iter = strv; iter && *iter; iter++) { + str = *iter; + inverse = FALSE; + if (str[0] == '-') + inverse = TRUE; + if (str[0] == '+' || str[0] == '-') + str++; + + if (matches (str, "active") == 0) + val = inverse ? NMC_SORT_ACTIVE_INV : NMC_SORT_ACTIVE; + else if (matches (str, "name") == 0) + val = inverse ? NMC_SORT_NAME_INV : NMC_SORT_NAME; + else if (matches (str, "type") == 0) + val = inverse ? NMC_SORT_TYPE_INV : NMC_SORT_TYPE; + else if (matches (str, "path") == 0) + val = inverse ? NMC_SORT_PATH_INV : NMC_SORT_PATH; + else { + g_array_unref (order_arr); + order_arr = NULL; + g_set_error (error, NMCLI_ERROR, 0, + _("incorrect item '%s' in '--order' option"), *iter); + break; + } + /* Check for duplicates and ignore them. */ + unique = TRUE; + for (i = 0; i < order_arr->len; i++) { + if (abs (g_array_index (order_arr, NmcSortOrder, i)) - abs (val) == 0) { + unique = FALSE; + break; + } + } + + /* Value is ok and unique, add it to the array */ + if (unique) + g_array_append_val (order_arr, val); + } + + g_strfreev (strv); + return order_arr; +} + +static NMConnection * +get_connection (NmCli *nmc, int *argc, char ***argv, int *pos, GError **error) +{ + NMConnection *connection = NULL; + const char *selector = NULL; + + if (*argc == 0) { + g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("No connection specified")); + return NULL; + } + + if (*argc == 1 && nmc->complete) + nmc_complete_strings (**argv, "id", "uuid", "path", NULL); + + if ( strcmp (**argv, "id") == 0 + || strcmp (**argv, "uuid") == 0 + || strcmp (**argv, "path") == 0) { + selector = **argv; + if (next_arg (argc, argv) != 0) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("%s argument is missing"), selector); + return NULL; + } + } + + connection = nmc_find_connection (nmc->connections, selector, **argv, pos, + *argc == 1 && nmc->complete); + if (!connection) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_NOT_FOUND, + _("unknown connection '%s'"), **argv); + } + + /* If the caller wants multiple results (pos is set) and there are any, + * don't switch to next argument. + */ + if (!pos || !*pos) + next_arg (argc, argv); + + return connection; +} + static NMCResultCode -do_connections_show (NmCli *nmc, gboolean active_only, gboolean show_secrets, - const GArray *order, int argc, char **argv) +do_connections_show (NmCli *nmc, int argc, char **argv) { GError *err = NULL; 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); + } + + if (!active_only && nmc_arg_is_option (*argv, "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) { + 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; + } + } + show_secrets = nmc->show_secrets || show_secrets; if (argc == 0) { char *fields_str; @@ -1594,7 +1756,9 @@ do_connections_show (NmCli *nmc, gboolean active_only, gboolean show_secrets, char *fields_common = NMC_FIELDS_CON_SHOW_COMMON; NmcOutputField *tmpl, *arr; size_t tmpl_len; - int i; + + if (nmc->complete) + goto finish; if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) fields_str = fields_common; @@ -1654,6 +1818,9 @@ do_connections_show (NmCli *nmc, gboolean active_only, gboolean show_secrets, NMActiveConnection *acon = NULL; const char *selector = NULL; + if (argc == 1 && nmc->complete) + nmc_complete_strings (*argv, "id", "uuid", "path", "apath", NULL); + if ( strcmp (*argv, "id") == 0 || strcmp (*argv, "uuid") == 0 || strcmp (*argv, "path") == 0 @@ -1666,10 +1833,13 @@ do_connections_show (NmCli *nmc, gboolean active_only, gboolean show_secrets, } } - /* Find connection by id, uuid, path or apath */ - con = nmc_find_connection (nmc->connections, selector, *argv, &pos); - if (!con) { - acon = find_active_connection (active_cons, nmc->connections, selector, *argv, NULL); + /* Try to find connection by id, uuid or path first */ + con = nmc_find_connection (nmc->connections, selector, *argv, &pos, + argc == 1 && nmc->complete); + if (!con && (!selector || strcmp (selector, "apath") == 0)) { + /* Try apath too */ + acon = find_active_connection (active_cons, nmc->connections, "apath", *argv, NULL, + argc == 1 && nmc->complete); if (acon) con = NM_CONNECTION (nm_active_connection_get_connection (acon)); } @@ -1694,6 +1864,11 @@ do_connections_show (NmCli *nmc, gboolean active_only, gboolean show_secrets, continue; } + if (nmc->complete) { + next_arg (&argc, &argv); + continue; + } + /* Show an empty line between connections */ if (new_line) g_print ("\n"); @@ -1740,6 +1915,8 @@ finish: } g_free (profile_flds); g_free (active_flds); + if (order) + g_array_unref (order); return nmc->return_value; } @@ -1854,17 +2031,22 @@ find_device_for_connection (NmCli *nmc, if (iface) { const char *dev_iface = nm_device_get_iface (dev); - if ( !g_strcmp0 (dev_iface, iface) - && nm_device_connection_compatible (dev, connection, NULL)) { - found_device = dev; + if (!nm_streq0 (dev_iface, iface)) + continue; + + if (!nm_device_connection_compatible (dev, connection, error)) { + g_prefix_error (error, _("device '%s' not compatible with connection '%s':"), + iface, nm_setting_connection_get_id (s_con)); + return FALSE; } + } else { - if (nm_device_connection_compatible (dev, connection, NULL)) { - found_device = dev; - } + if (!nm_device_connection_compatible (dev, connection, NULL)) + continue; } - if (found_device && ap && !strcmp (con_type, NM_SETTING_WIRELESS_SETTING_NAME) && NM_IS_DEVICE_WIFI (dev)) { + found_device = dev; + if (ap && !strcmp (con_type, NM_SETTING_WIRELESS_SETTING_NAME) && NM_IS_DEVICE_WIFI (dev)) { char *bssid_up = g_ascii_strup (ap, -1); const GPtrArray *aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (dev)); found_device = NULL; /* Mark as not found; set to the device again later, only if AP matches */ @@ -1899,6 +2081,14 @@ find_device_for_connection (NmCli *nmc, } } +typedef struct { + NmCli *nmc; + NMDevice *device; + NMActiveConnection *active; +} ActivateConnectionInfo; + +static void activate_connection_info_finish (ActivateConnectionInfo *info); + static const char * vpn_connection_state_reason_to_string (NMVpnConnectionStateReason reason) { @@ -1933,9 +2123,9 @@ vpn_connection_state_reason_to_string (NMVpnConnectionStateReason reason) } static void -device_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data) +device_state_cb (NMDevice *device, GParamSpec *pspec, ActivateConnectionInfo *info) { - NmCli *nmc = (NmCli *) user_data; + NmCli *nmc = info->nmc; NMActiveConnection *active; NMDeviceState state; NMActiveConnectionState ac_state; @@ -1950,7 +2140,7 @@ device_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data) nmc_terminal_erase_line (); g_print (_("Connection successfully activated (D-Bus active path: %s)\n"), nm_object_get_path (NM_OBJECT (active))); - quit (); + 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) { @@ -1958,24 +2148,26 @@ device_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data) 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))); - quit (); - } else if ( ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING - && state == NM_DEVICE_STATE_FAILED) { - if (nmc->print_output == NMC_PRINT_PRETTY) - nmc_terminal_erase_line (); - g_print (_("Error: Connection activation failed.\n")); - quit (); - } else if (active && ac_state != NM_ACTIVE_CONNECTION_STATE_ACTIVATING) { + activate_connection_info_finish (info); + } +} + +static void +active_connection_removed_cb (NMClient *client, NMActiveConnection *active, ActivateConnectionInfo *info) +{ + NmCli *nmc = info->nmc; + + if (active == info->active) { g_string_printf (nmc->return_text, _("Error: Connection activation failed.")); nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; - quit (); + activate_connection_info_finish (info); } } static void -active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, gpointer user_data) +active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, ActivateConnectionInfo *info) { - NmCli *nmc = (NmCli *) user_data; + NmCli *nmc = info->nmc; NMActiveConnectionState state; state = nm_active_connection_get_state (active); @@ -1985,13 +2177,7 @@ active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, gpoin nmc_terminal_erase_line (); g_print (_("Connection successfully activated (D-Bus active path: %s)\n"), nm_object_get_path (NM_OBJECT (active))); - g_object_unref (active); - quit (); - } 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; - g_object_unref (active); - quit (); + activate_connection_info_finish (info); } else if (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. @@ -2012,10 +2198,8 @@ active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, gpoin && ( NM_IS_DEVICE_BOND (device) || NM_IS_DEVICE_TEAM (device) || NM_IS_DEVICE_BRIDGE (device))) { - g_signal_handlers_disconnect_by_func (active, G_CALLBACK (active_connection_state_cb), nmc); - g_signal_connect (device, "notify::" NM_DEVICE_STATE, G_CALLBACK (device_state_cb), nmc); - - device_state_cb (device, NULL, nmc); + g_signal_connect (device, "notify::" NM_DEVICE_STATE, G_CALLBACK (device_state_cb), info); + device_state_cb (device, NULL, info); } } } @@ -2024,9 +2208,9 @@ static void vpn_connection_state_cb (NMVpnConnection *vpn, NMVpnConnectionState state, NMVpnConnectionStateReason reason, - gpointer user_data) + ActivateConnectionInfo *info) { - NmCli *nmc = (NmCli *) user_data; + NmCli *nmc = info->nmc; switch (state) { case NM_VPN_CONNECTION_STATE_PREPARE: @@ -2041,8 +2225,7 @@ vpn_connection_state_cb (NMVpnConnection *vpn, nmc_terminal_erase_line (); g_print (_("VPN connection successfully activated (D-Bus active path: %s)\n"), nm_object_get_path (NM_OBJECT (vpn))); - g_object_unref (vpn); - quit (); + activate_connection_info_finish (info); break; case NM_VPN_CONNECTION_STATE_FAILED: @@ -2050,8 +2233,7 @@ vpn_connection_state_cb (NMVpnConnection *vpn, 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; - g_object_unref (vpn); - quit (); + activate_connection_info_finish (info); break; default: @@ -2059,16 +2241,21 @@ vpn_connection_state_cb (NMVpnConnection *vpn, } } -static gboolean -timeout_cb (gpointer user_data) +static void +set_nmc_error_timeout (NmCli *nmc) { - /* Time expired -> exit nmcli */ + g_string_printf (nmc->return_text, _("Error: Timeout expired (%d seconds)"), nmc->timeout); + nmc->return_value = NMC_RESULT_ERROR_TIMEOUT_EXPIRED; +} - NmCli *nmc = (NmCli *) user_data; +static gboolean +activate_connection_timeout_cb (gpointer user_data) +{ + ActivateConnectionInfo *info = user_data; - g_string_printf (nmc->return_text, _("Error: Timeout %d sec expired."), nmc->timeout); - nmc->return_value = NMC_RESULT_ERROR_TIMEOUT_EXPIRED; - quit (); + /* Time expired -> exit nmcli */ + set_nmc_error_timeout (info->nmc); + activate_connection_info_finish (info); return FALSE; } @@ -2107,10 +2294,27 @@ progress_vpn_cb (gpointer user_data) return TRUE; } -typedef struct { - NmCli *nmc; - NMDevice *device; -} ActivateConnectionInfo; +static void +activate_connection_info_finish (ActivateConnectionInfo *info) +{ + if (info->device) { + g_signal_handlers_disconnect_by_func (info->device, G_CALLBACK (device_state_cb), info); + g_object_unref (info->device); + } + + 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_object_unref (info->active); + + } + g_signal_handlers_disconnect_by_func (info->nmc->client, G_CALLBACK (active_connection_removed_cb), info); + + g_free (info); + quit (); +} static void activate_connection_cb (GObject *client, GAsyncResult *result, gpointer user_data) @@ -2123,20 +2327,22 @@ activate_connection_cb (GObject *client, GAsyncResult *result, gpointer user_dat const GPtrArray *ac_devs; GError *error = NULL; - active = nm_client_activate_connection_finish (NM_CLIENT (client), result, &error); + info->active = active = nm_client_activate_connection_finish (NM_CLIENT (client), result, &error); if (error) { g_string_printf (nmc->return_text, _("Error: Connection activation failed: %s"), error->message); g_error_free (error); nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; - quit (); + activate_connection_info_finish (info); } else { state = nm_active_connection_get_state (active); if (!device) { /* device could be NULL for virtual devices. Fill it here. */ ac_devs = nm_active_connection_get_devices (active); - info->device = device = ac_devs->len > 0 ? g_ptr_array_index (ac_devs, 0) : NULL; + device = ac_devs->len > 0 ? g_ptr_array_index (ac_devs, 0) : NULL; + if (device) + info->device = g_object_ref (device); } if (nmc->nowait_flag || state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { @@ -2147,12 +2353,11 @@ activate_connection_cb (GObject *client, GAsyncResult *result, gpointer user_dat g_print (_("Connection successfully activated (D-Bus active path: %s)\n"), nm_object_get_path (NM_OBJECT (active))); } - g_object_unref (active); - quit (); + 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), nmc); + 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) { @@ -2161,8 +2366,8 @@ activate_connection_cb (GObject *client, GAsyncResult *result, gpointer user_dat 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), nmc); - active_connection_state_cb (active, NULL, nmc); + 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) { @@ -2173,10 +2378,13 @@ activate_connection_cb (GObject *client, GAsyncResult *result, gpointer user_dat } /* Start timer not to loop forever when signals are not emitted */ - g_timeout_add_seconds (nmc->timeout, timeout_cb, nmc); + 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); } } - g_free (info); } /** @@ -2331,7 +2539,8 @@ nmc_activate_connection (NmCli *nmc, info = g_malloc0 (sizeof (ActivateConnectionInfo)); info->nmc = nmc; - info->device = device; + if (device) + info->device = g_object_ref (device); nm_client_activate_connection_async (nmc->client, connection, @@ -2351,10 +2560,11 @@ do_connection_up (NmCli *nmc, int argc, char **argv) const char *ap = NULL; const char *nsp = NULL; const char *pwds = NULL; - GError *error = NULL; - const char *selector = NULL; - const char *name = NULL; - char *line = NULL; + gs_free_error GError *error = NULL; + char **arg_arr = NULL; + int arg_num; + char ***argv_ptr = &argv; + int *argc_ptr = &argc; /* * Set default timeout for connection activation. @@ -2363,66 +2573,63 @@ do_connection_up (NmCli *nmc, int argc, char **argv) if (nmc->timeout == -1) nmc->timeout = 90; - if (argc == 0) { - if (nmc->ask) { - line = nmc_readline (PROMPT_CONNECTION); - name = line ? line : ""; - } - } else if (strcmp (*argv, "ifname") != 0) { - if ( strcmp (*argv, "id") == 0 - || strcmp (*argv, "uuid") == 0 - || strcmp (*argv, "path") == 0) { + if (argc == 0 && nmc->ask) { + char *line; - selector = *argv; - if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), selector); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } - name = *argv; - } - name = *argv; - next_arg (&argc, &argv); + /* nmc_do_cmd() should not call this with argc=0. */ + g_assert (!nmc->complete); + + line = nmc_readline ("%s: ", PROMPT_CONNECTION); + nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num); + g_free (line); + argv_ptr = &arg_arr; + argc_ptr = &arg_num; } - if (name) { - connection = nmc_find_connection (nmc->connections, selector, name, NULL); + if (argc > 0 && strcmp (*argv, "ifname") != 0) { + connection = get_connection (nmc, argc_ptr, argv_ptr, NULL, &error); if (!connection) { - g_string_printf (nmc->return_text, _("Error: Connection '%s' does not exist."), name); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; + g_string_printf (nmc->return_text, _("Error: %s."), error->message); + return error->code; } } while (argc > 0) { + if (argc == 1 && nmc->complete) + nmc_complete_strings (*argv, "ifname", "ap", "passwd-file", NULL); + if (strcmp (*argv, "ifname") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } ifname = *argv; + if (argc == 1 && nmc->complete) + nmc_complete_device (nmc->client, ifname, ap != NULL); } else if (strcmp (*argv, "ap") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } ap = *argv; + if (argc == 1 && nmc->complete) + nmc_complete_bssid (nmc->client, ifname, ap); } else if (strcmp (*argv, "passwd-file") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } + if (argc == 1 && nmc->complete) + nmc->return_value = NMC_RESULT_COMPLETE_FILE; + pwds = *argv; } - else { + else if (!nmc->complete) { g_printerr (_("Unknown parameter: %s\n"), *argv); } @@ -2430,6 +2637,9 @@ do_connection_up (NmCli *nmc, int argc, char **argv) argv++; } + if (nmc->complete) + return nmc->return_value; + /* Use nowait_flag instead of should_wait because exiting has to be postponed till * active_connection_state_cb() is called. That gives NM time to check our permissions * and we can follow activation progress. @@ -2440,18 +2650,14 @@ do_connection_up (NmCli *nmc, int argc, char **argv) if (!nmc_activate_connection (nmc, connection, ifname, ap, nsp, pwds, activate_connection_cb, &error)) { g_string_printf (nmc->return_text, _("Error: %s."), error->message); - nmc->return_value = error->code; - g_clear_error (&error); nmc->should_wait--; - goto error; + return error->code; } /* Start progress indication */ if (nmc->print_output == NMC_PRINT_PRETTY) progress_id = g_timeout_add (120, progress_cb, _("preparing")); -error: - g_free (line); return nmc->return_value; } @@ -2499,7 +2705,7 @@ connection_op_timeout_cb (gpointer user_data) { ConnectionCbInfo *info = user_data; - timeout_cb (info->nmc); + set_nmc_error_timeout (info->nmc); connection_cb_info_finish (info, NULL); return G_SOURCE_REMOVE; } @@ -2549,6 +2755,9 @@ do_connection_down (NmCli *nmc, int argc, char **argv) nmc->timeout = 10; if (argc == 0) { + /* nmc_do_cmd() should not call this with argc=0. */ + g_assert (!nmc->complete); + if (nmc->ask) { char *line = nmc_readline (PROMPT_ACTIVE_CONNECTIONS); nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num); @@ -2558,7 +2767,7 @@ do_connection_down (NmCli *nmc, int argc, char **argv) if (arg_num == 0) { g_string_printf (nmc->return_text, _("Error: No connection specified.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } } @@ -2567,6 +2776,9 @@ do_connection_down (NmCli *nmc, int argc, char **argv) while (arg_num > 0) { const char *selector = NULL; + if (arg_num == 1) + nmc_complete_strings (*arg_ptr, "id", "uuid", "path", "apath", NULL); + if ( strcmp (*arg_ptr, "id") == 0 || strcmp (*arg_ptr, "uuid") == 0 || strcmp (*arg_ptr, "path") == 0 @@ -2576,11 +2788,12 @@ do_connection_down (NmCli *nmc, int argc, char **argv) if (next_arg (&arg_num, &arg_ptr) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), selector); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } } - active = find_active_connection (active_cons, nmc->connections, selector, *arg_ptr, &idx); + active = find_active_connection (active_cons, nmc->connections, selector, *arg_ptr, &idx, + arg_num == 1 && nmc->complete); if (active) { /* Check if the connection is unique. */ /* Calling down for the same connection repeatedly would result in @@ -2588,7 +2801,8 @@ do_connection_down (NmCli *nmc, int argc, char **argv) if (!g_slist_find (queue, active)) queue = g_slist_prepend (queue, g_object_ref (active)); } else { - g_printerr (_("Error: '%s' is not an active connection.\n"), *arg_ptr); + if (!nmc->complete) + g_printerr (_("Error: '%s' is not an active connection.\n"), *arg_ptr); g_string_printf (nmc->return_text, _("Error: not all active connections found.")); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; } @@ -2600,7 +2814,10 @@ do_connection_down (NmCli *nmc, int argc, char **argv) if (!queue) { g_string_printf (nmc->return_text, _("Error: no active connection provided.")); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; + goto finish; + } else if (nmc->complete) { + g_slist_free (queue); + goto finish; } queue = g_slist_reverse (queue); @@ -2626,7 +2843,7 @@ do_connection_down (NmCli *nmc, int argc, char **argv) nm_client_deactivate_connection (nmc->client, active, NULL, NULL); } -error: +finish: g_strfreev (arg_arr); return nmc->return_value; } @@ -2802,7 +3019,7 @@ static const NameItem nmc_vxlan_settings [] = { /* Available connection types */ static const NameItem nmc_valid_connection_types[] = { - { NM_SETTING_GENERIC_SETTING_NAME, NULL, nmc_generic_settings }, + { NM_SETTING_GENERIC_SETTING_NAME, NULL, nmc_generic_settings }, /* Needs to be first. */ { NM_SETTING_WIRED_SETTING_NAME, "ethernet", nmc_ethernet_settings }, { NM_SETTING_PPPOE_SETTING_NAME, NULL, nmc_pppoe_settings }, { NM_SETTING_WIRELESS_SETTING_NAME, "wifi", nmc_wifi_settings }, @@ -2830,26 +3047,37 @@ static const NameItem nmc_valid_connection_types[] = { }; /* - * Return an alias for the 'name' if exists, else return the 'name'. - * The returned string must not be freed. + * Return the most approopriate name for the connection of a type 'name' possibly with given 'slave_type' + * if exists, else return the 'name'. The returned string must not be freed. */ static const char * -get_name_alias (const char *name, const NameItem array[]) +get_name_alias (const char *name, const char *slave_type, const NameItem array[]) { const NameItem *iter = &array[0]; - if (!name) + if (slave_type) { + while (iter && iter->name) { + if ( g_str_has_prefix (iter->name, slave_type) + && g_str_has_suffix (iter->name, "-slave")) + break; + iter++; + } + } else if (name) { + while (iter && iter->name) { + if (!strcmp (name, iter->name)) + break; + iter++; + } + } else return NULL; - while (iter && iter->name) { - if (!strcmp (name, iter->name)) { - if (iter->alias) - return iter->alias; - else - return iter->name; - } - iter++; + if (iter) { + if (iter->alias) + return iter->alias; + else + return iter->name; } + return name; } @@ -2887,17 +3115,121 @@ get_valid_settings_array (const char *con_type) { guint i, num; + /* No connection type yet? Return settings for a generic connection + * (just the "connection" setting), which always makes sense. */ if (!con_type) - return NULL; + return nmc_valid_connection_types[0].settings; num = G_N_ELEMENTS (nmc_valid_connection_types); for (i = 0; i < num; i++) { if (nm_streq0 (con_type, nmc_valid_connection_types[i].name)) return nmc_valid_connection_types[i].settings; } + return NULL; } +/* get_valid_properties_string: + * @array: base properties for the current connection type + * @array_slv: slave properties (or ipv4/ipv6 ones) for the current connection type + * @modifier: to prepend to each element of the returned list + * @prefix: only properties matching the prefix will be returned + * @postfix: required prefix on the property args; if a empty string is passed, is + * assumed that the @prefix is a shortcut, so it should not be completed + * but left as is (and an additional check for shortcut ambiguity is performed) + * + * Returns a list of properties compatible with the current connection type + * for the shell autocompletion functionality. + * + * Returns: list of property.arg elements + */ +static char * +get_valid_properties_string (const NameItem *array, + const NameItem *array_slv, + char modifier, + const char *prefix, + const char *postfix) +{ + const NameItem *iter = array; + const NmcOutputField *field_iter; + const char *prop_name = NULL; + GString *str; + int i, j; + gboolean full_match = FALSE; + + g_return_val_if_fail (prefix, NULL); + + str = g_string_sized_new (1024); + + for (i = 0; i < 2; i++, iter = array_slv) { + while (!full_match && iter && iter->name) { + if ( !(g_str_has_prefix (iter->name, prefix)) + && (!(iter->alias) || !g_str_has_prefix (iter->alias, prefix))) { + iter++; + continue; + } + /* If postix (so prefix is terminated by a dot), check + * that prefix is not ambiguous */ + if (postfix) { + /* If we have a perfect match, no need to look for others + * prefix and no check on ambiguity should be performed. + * Moreover, erase previous matches from output string */ + if ( nm_streq (prefix, iter->name) + || nm_streq0 (prefix, iter->alias)) { + g_string_erase (str, 0, -1); + full_match = TRUE; + } else if (prop_name) { + return g_string_free (str, TRUE); + } + prop_name = prefix; + } else { + prop_name = iter->name; + } + + /* Search the array with the arguments of the current property */ + j = 0; + while (!nm_streq0 (iter->name, nmc_fields_settings_names[j].name)) { + g_assert (nmc_fields_settings_names[j].name); + j++; + } + field_iter = nmc_fields_settings_names[j].group; + + j = 0; + while (field_iter[j].name) { + gchar *new; + const char *arg_name = field_iter[j].name; + + /* If required, expand the alias too */ + if (!postfix && iter->alias) { + if (modifier) + g_string_append_c (str, modifier); + new = g_strdup_printf ("%s.%s\n", + iter->alias, + arg_name); + g_string_append (str, new); + g_free (new); + } + + if (postfix && !g_str_has_prefix (arg_name, postfix)) { + j++; + continue; + } + + if (modifier) + g_string_append_c (str, modifier); + new = g_strdup_printf ("%s.%s\n", + prop_name, + arg_name); + g_string_append (str, new); + g_free (new); + j++; + } + iter++; + } + } + return g_string_free (str, FALSE); +} + /* * Check if 'val' is valid string in either array->name or array->alias for * both array parameters (array & array_slv). @@ -2940,8 +3272,7 @@ check_valid_name (const char *val, const NameItem *array, const NameItem *array_ /* We want to handle aliases, so construct own error message */ char *err_str = get_valid_options_string (array, array_slv); - g_set_error (error, 1, 0, _("'%s' not among [%s]"), - val, err_str); + g_set_error (error, 1, 0, _("'%s' not among [%s]"), val, err_str); g_free (err_str); g_clear_error (&tmp_err); } @@ -3004,306 +3335,6 @@ is_setting_mandatory (NMConnection *connection, NMSetting *setting) /*----------------------------------------------------------------------------*/ -static gboolean -check_mac (const char *mac, - int type, - const char *keyword, - GError **error) -{ - g_return_val_if_fail (type == ARPHRD_ETHER || type == ARPHRD_INFINIBAND, FALSE); - - if (!mac) - return TRUE; - - if (!nm_utils_hwaddr_valid (mac, nm_utils_hwaddr_len (type))) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: '%s': '%s' is not a valid %s MAC address."), - keyword, mac, type == ARPHRD_INFINIBAND ? _("InfiniBand") : _("Ethernet")); - return FALSE; - } - - return TRUE; -} - -static gboolean -check_and_convert_mtu (const char *mtu, guint32 *mtu_int, GError **error) -{ - unsigned long local_mtu_int; - - if (mtu_int) - *mtu_int = 0; - - if (!mtu) - return TRUE; - - if (!nmc_string_to_uint (mtu, TRUE, 0, G_MAXUINT32, &local_mtu_int)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'mtu': '%s' is not a valid MTU."), mtu); - return FALSE; - } - if (mtu_int) - *mtu_int = (guint32) local_mtu_int; - return TRUE; -} - -static gboolean -check_infiniband_parent (const char *parent, GError **error) -{ - if (!parent) - return TRUE; - - if (!nm_utils_iface_valid_name (parent)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'parent': '%s' is not a valid interface name."), parent); - return FALSE; - } - return TRUE; -} - - -static gboolean -check_infiniband_p_key (const char *p_key, guint32 *p_key_int, GError **error) -{ - unsigned long local_p_key_int; - gboolean p_key_valid = FALSE; - if (!p_key) - return TRUE; - - if (!strncmp (p_key, "0x", 2)) - p_key_valid = nmc_string_to_uint_base (p_key + 2, 16, TRUE, 0, G_MAXUINT16, &local_p_key_int); - else - p_key_valid = nmc_string_to_uint (p_key, TRUE, 0, G_MAXUINT16, &local_p_key_int); - if (!p_key_valid) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."), p_key); - return FALSE; - } - if (p_key_int) - *p_key_int = (guint32) local_p_key_int; - return TRUE; -} - -static gboolean -check_user_group_id (const char *id, GError **error) -{ - unsigned long int value; - - if (!nmc_string_to_uint (id, FALSE, 0, 0, &value)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: '%s' is not a valid UID/GID."), id); - return FALSE; - } - - return TRUE; -} - -/** - * check_valid_enumeration: - * @str: string to check against string array @strings - * @strings: string array to check @str againt - * @what: what parameter @str belongs to (used in error message) - * @what_desc: longer description of @what parameter (used in error message) - * @error: location to store an error, or %NULL - * - * Check whether @str is one of the string of @strings array. It accepts - * shortcuts and normalizes them (@str argument is modified on success). - * - * Returns: %TRUE on success, %FALSE on failure - */ -static gboolean -check_valid_enumeration (char **str, - const char *strings[], - const char *what, - const char *what_desc, - GError **error) -{ - char *tmp; - const char *checked_str; - - if (!str || !*str) - return TRUE; - - tmp = g_strstrip (g_strdup (*str)); - checked_str = nmc_string_is_valid (tmp, strings, NULL); - g_free (tmp); - if (checked_str) { - g_free (*str); - *str = g_strdup (checked_str); - } else { - char *options; - - options = nmc_util_strv_for_display (strings, TRUE); - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: '%s': '%s' is not a valid %s %s."), - what, *str, what_desc, options); - g_free (options); - } - return !!checked_str; -} - -/* Checks Wi-Fi mode. */ -static gboolean -check_wifi_mode (char **mode, GError **error) -{ - const char *modes[] = { "infrastructure", "ap", "adhoc", NULL }; - - return check_valid_enumeration (mode, modes, "mode", _("Wi-Fi mode"), error); -} - -/* Checks InfiniBand mode. */ -static gboolean -check_infiniband_mode (char **mode, GError **error) -{ - const char *modes[] = { "datagram", "connected", NULL }; - - return check_valid_enumeration (mode, modes, "mode", _("InfiniBand transport mode"), error); -} - -/* Checks ADSL protocol */ -static gboolean -check_adsl_protocol (char **protocol, GError **error) -{ - const char *protos[] = { NM_SETTING_ADSL_PROTOCOL_PPPOA, - NM_SETTING_ADSL_PROTOCOL_PPPOE, - NM_SETTING_ADSL_PROTOCOL_IPOATM, - NULL }; - - return check_valid_enumeration (protocol, protos, "protocol", _("ADSL protocol"), error); -} - -/* Checks ADSL encapsulation */ -static gboolean -check_adsl_encapsulation (char **encapsulation, GError **error) -{ - const char *modes[] = { NM_SETTING_ADSL_ENCAPSULATION_VCMUX, - NM_SETTING_ADSL_ENCAPSULATION_LLC, - NULL }; - - return check_valid_enumeration (encapsulation, modes, "encapsulation", _("ADSL encapsulation"), error); -} - -/* Checks TUN mode. */ -static gboolean -check_tun_mode (char **mode, GError **error) -{ - const char *modes[] = { "tun", "tap", NULL }; - - return check_valid_enumeration (mode, modes, "mode", _("TUN device mode"), error); -} - -static gboolean -check_and_convert_vlan_flags (const char *flags, guint32 *flags_int, GError **error) -{ - unsigned long local_flags_int; - - if (!flags) - return TRUE; - - if (!nmc_string_to_uint (flags, TRUE, 0, 7, &local_flags_int)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'flags': '%s' is not valid; use <0-7>."), flags); - return FALSE; - } - if (flags_int) - *flags_int = (guint32) local_flags_int; - return TRUE; -} - -static gboolean -check_and_convert_vlan_prio_maps (const char *prio_map, - NMVlanPriorityMap type, - char ***prio_map_arr, - GError **error) -{ - char **local_prio_map_arr; - GError *local_err = NULL; - - if (!prio_map) - return TRUE; - - if (!(local_prio_map_arr = nmc_vlan_parse_priority_maps (prio_map, type, &local_err))) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: '%s': '%s' is not valid; %s "), - type == NM_VLAN_INGRESS_MAP ? "ingress" : "egress", - prio_map, local_err->message); - return FALSE; - } - - if (prio_map_arr) - *prio_map_arr = local_prio_map_arr; - return TRUE; -} - -static gboolean -add_ip4_address_to_connection (NMIPAddress *ip4addr, NMConnection *connection) -{ - NMSettingIPConfig *s_ip4; - gboolean ret; - - if (!ip4addr) - return TRUE; - - s_ip4 = nm_connection_get_setting_ip4_config (connection); - if (!s_ip4) { - s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new (); - nm_connection_add_setting (connection, NM_SETTING (s_ip4)); - g_object_set (s_ip4, - NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL, - NULL); - } - ret = nm_setting_ip_config_add_address (s_ip4, ip4addr); - nm_ip_address_unref (ip4addr); - - return ret; -} - -static gboolean -add_ip6_address_to_connection (NMIPAddress *ip6addr, NMConnection *connection) -{ - NMSettingIPConfig *s_ip6; - gboolean ret; - - if (!ip6addr) - return TRUE; - - s_ip6 = nm_connection_get_setting_ip6_config (connection); - if (!s_ip6) { - s_ip6 = (NMSettingIPConfig *) nm_setting_ip6_config_new (); - nm_connection_add_setting (connection, NM_SETTING (s_ip6)); - g_object_set (s_ip6, - NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_MANUAL, - NULL); - } - ret = nm_setting_ip_config_add_address (s_ip6, ip6addr); - nm_ip_address_unref (ip6addr); - - return ret; -} - -static char * -unique_master_iface_ifname (const GPtrArray *connections, - const char *try_name) -{ - NMConnection *connection; - char *new_name; - unsigned int num = 1; - int i = 0; - const char *ifname = NULL; - - 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; -} - static const char * _strip_master_prefix (const char *master, const char *(**func)(NMConnection *)) { @@ -3410,29 +3441,6 @@ normalized_master_for_slave (const GPtrArray *connections, return out_master; } -static gboolean -bridge_prop_string_to_uint (const char *str, - const char *nmc_arg, - GType bridge_type, - const char *propname, - unsigned long *out_val, - GError **error) -{ - GParamSpecUInt *pspec; - - pspec = (GParamSpecUInt *) g_object_class_find_property (g_type_class_peek (bridge_type), - propname); - g_assert (G_IS_PARAM_SPEC_UINT (pspec)); - - if (!nmc_string_to_uint (str, TRUE, pspec->minimum, pspec->maximum, out_val)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: '%s': '%s' is not valid; use <%u-%u>."), - nmc_arg, str, pspec->minimum, pspec->maximum); - return FALSE; - } - return TRUE; -} - #define WORD_YES "yes" #define WORD_NO "no" #define WORD_LOC_YES _("yes") @@ -3452,3192 +3460,1069 @@ prompt_yes_no (gboolean default_yes, char *delim) return prompt; } -static gboolean -normalize_yes_no (char **yes_no) +static NMSetting * +is_setting_valid (NMConnection *connection, const NameItem *valid_settings_main, const NameItem *valid_settings_slave, char *setting) { - char *tmp; - const char *checked_yes_no; - const char *strv[] = { WORD_LOC_YES, WORD_LOC_NO, NULL }; + const char *setting_name; - if (!yes_no || !*yes_no) - return FALSE; - - tmp = g_strstrip (g_strdup (*yes_no)); - checked_yes_no = nmc_string_is_valid (tmp, strv, NULL); - g_free (tmp); - if (g_strcmp0 (checked_yes_no, WORD_LOC_YES) == 0) { - g_free (*yes_no); - *yes_no = g_strdup (WORD_YES); - } else if (g_strcmp0 (checked_yes_no, WORD_LOC_NO) == 0) { - g_free (*yes_no); - *yes_no = g_strdup (WORD_NO); - } - return !!checked_yes_no; + if (!(setting_name = check_valid_name (setting, valid_settings_main, valid_settings_slave, NULL))) + return NULL; + return nm_connection_get_setting_by_name (connection, setting_name); } -static gboolean -want_provide_opt_args (const char *type, int num) +static char * +is_property_valid (NMSetting *setting, const char *property, GError **error) { - char *answer; - gboolean ret = TRUE; + char **valid_props = NULL; + const char *prop_name; + char *ret; - /* Ask for optional arguments. */ - g_print (ngettext ("There is %d optional argument for '%s' connection type.\n", - "There are %d optional arguments for '%s' connection type.\n", num), - num, type); - answer = nmc_readline (ngettext ("Do you want to provide it? %s", - "Do you want to provide them? %s", num), - prompt_yes_no (TRUE, NULL)); - answer = answer ? g_strstrip (answer) : NULL; - if (answer && matches (answer, WORD_LOC_YES) != 0) - ret = FALSE; - g_free (answer); + valid_props = nmc_setting_get_valid_properties (setting); + prop_name = nmc_string_is_valid (property, (const char **) valid_props, error); + ret = g_strdup (prop_name); + g_strfreev (valid_props); return ret; } -static void -do_questionnaire_ethernet (gboolean ethernet, char **mtu, char **mac, char **cloned_mac) +static char * +unique_master_iface_ifname (const GPtrArray *connections, + const char *try_name) { - gboolean once_more; - GError *error = NULL; - - /* Ask for optional arguments */ - if (ethernet && !want_provide_opt_args (_("ethernet"), 3)) - return; + NMConnection *connection; + char *new_name; + unsigned int num = 1; + int i = 0; + const char *ifname = NULL; - if (!*mtu) { - do { - *mtu = nmc_readline (_("MTU [auto]: ")); - once_more = !check_and_convert_mtu (*mtu, NULL, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*mtu); - } - } while (once_more); - } - if (!*mac) { - do { - *mac = nmc_readline (_("MAC [none]: ")); - once_more = !check_mac (*mac, ARPHRD_ETHER, "mac", &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*mac); - } - } while (once_more); - } - if (!*cloned_mac) { - do { - *cloned_mac = nmc_readline (_("Cloned MAC [none]: ")); - once_more = !check_mac (*cloned_mac, ARPHRD_ETHER, "cloned-mac", &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*cloned_mac); - } - } while (once_more); + 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; } -#define WORD_DATAGRAM "datagram" -#define WORD_CONNECTED "connected" -#define PROMPT_IB_MODE "(" WORD_DATAGRAM "/" WORD_CONNECTED ") [" WORD_DATAGRAM "]: " static void -do_questionnaire_infiniband (char **mtu, char **mac, char **mode, char **parent, char **p_key) +set_default_interface_name (NmCli *nmc, NMSettingConnection *s_con) { - gboolean once_more; - GError *error = NULL; + char *ifname = NULL; + const char *con_type = nm_setting_connection_get_connection_type (s_con); - /* Ask for optional arguments */ - if (!want_provide_opt_args (_("InfiniBand"), 5)) + if (nm_setting_connection_get_interface_name (s_con)) return; - if (!*mtu) { - do { - *mtu = nmc_readline (_("MTU [auto]: ")); - once_more = !check_and_convert_mtu (*mtu, NULL, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*mtu); - } - } while (once_more); - } - if (!*mac) { - do { - *mac = nmc_readline (_("MAC [none]: ")); - once_more = !check_mac (*mac, ARPHRD_INFINIBAND, "mac", &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*mac); - } - } while (once_more); - } - if (!*mode) { - do { - *mode = nmc_readline (_("Transport mode %s"), PROMPT_IB_MODE); - if (!*mode) - *mode = g_strdup ("datagram"); - once_more = !check_infiniband_mode (mode, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*mode); - } - } while (once_more); - } - if (!*parent) { - do { - *parent = nmc_readline (_("Parent interface [none]: ")); - once_more = !check_infiniband_parent (*parent, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*parent); - } - } while (once_more); - } - if (!*p_key) { - do { - *p_key = nmc_readline (_("P_KEY [none]: ")); - once_more = !check_infiniband_p_key (*p_key, NULL, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*p_key); - } - /* If parent is specified, so has to be P_KEY */ - if (!once_more && *parent && !*p_key) { - once_more = TRUE; - g_print (_("Error: 'p-key' is mandatory when 'parent' is specified.\n")); - } - } while (once_more); - } -} - -#define WORD_INFRA "infrastructure" -#define WORD_AP "ap" -#define WORD_ADHOC "adhoc" -#define PROMPT_WIFI_MODE "(" WORD_INFRA "/" WORD_AP "/" WORD_ADHOC ") [" WORD_INFRA "]: " -static void -do_questionnaire_wifi (char **mtu, char **mac, char **cloned_mac, char **mode) -{ - gboolean once_more; - GError *error = NULL; - - /* Ask for optional arguments */ - if (!want_provide_opt_args (_("Wi-Fi"), 4)) + /* Set a sensible bond/team/bridge interface name by default */ + if (g_strcmp0 (con_type, NM_SETTING_BOND_SETTING_NAME) == 0) + ifname = unique_master_iface_ifname (nmc->connections, "nm-bond"); + else if (g_strcmp0 (con_type, NM_SETTING_TEAM_SETTING_NAME) == 0) + ifname = unique_master_iface_ifname (nmc->connections, "nm-team"); + else if (g_strcmp0 (con_type, NM_SETTING_BRIDGE_SETTING_NAME) == 0) + ifname = unique_master_iface_ifname (nmc->connections, "nm-bridge"); + else return; - /* Most optional Wi-Fi arguments are the same as for ethernet. */ - do_questionnaire_ethernet (FALSE, mtu, mac, cloned_mac); - - if (!*mode) { - do { - *mode = nmc_readline (_("Mode %s"), PROMPT_WIFI_MODE); - if (!*mode) - *mode = g_strdup ("infrastructure"); - once_more = !check_wifi_mode (mode, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*mode); - } - } while (once_more); - } + g_object_set (s_con, NM_SETTING_CONNECTION_INTERFACE_NAME, ifname, NULL); + g_free (ifname); } -static void -do_questionnaire_wimax (char **mac) -{ - gboolean once_more; - GError *error = NULL; - - /* Ask for optional 'wimax' arguments. */ - if (!want_provide_opt_args (_("WiMAX"), 1)) - return; +/*----------------------------------------------------------------------------*/ - if (!*mac) { - do { - *mac = nmc_readline (_("MAC [none]: ")); - once_more = !check_mac (*mac, ARPHRD_ETHER, "mac", &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*mac); - } - } while (once_more); - } -} +static OptionInfo option_info[]; +/* + * Mark options in option_info as relevant. + * The questionnaire (for --ask) will ask for them. + */ static void -do_questionnaire_pppoe (gboolean echo, char **password, char **service, char **mtu, char **mac) +enable_options (const gchar *setting_name, const gchar *property, const gchar * const *opts) { - gboolean once_more; - GError *error = NULL; + OptionInfo *candidate; - /* Ask for optional 'pppoe' arguments. */ - if (!want_provide_opt_args (_("PPPoE"), 4)) - return; - - if (!*password) - *password = nmc_readline_echo (echo, _("Password [none]: ")); - if (!*service) - *service = nmc_readline (_("Service [none]: ")); - - if (!*mtu) { - do { - *mtu = nmc_readline (_("MTU [auto]: ")); - once_more = !check_and_convert_mtu (*mtu, NULL, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*mtu); - } - } while (once_more); - } - if (!*mac) { - do { - *mac = nmc_readline (_("MAC [none]: ")); - once_more = !check_mac (*mac, ARPHRD_ETHER, "mac", &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*mac); - } - } while (once_more); + for (candidate = option_info; candidate->setting_name; candidate++) { + if ( strcmp (candidate->setting_name, setting_name) == 0 + && strcmp (candidate->property, property) == 0 + && (candidate->flags & OPTION_DONT_ASK) + && candidate->option + && g_strv_contains (opts, candidate->option)) { + candidate->flags |= OPTION_ENABLED; + } } } +/* + * Mark options in option_info as irrelevant (because we learned they make no sense + * or they have been set via different means). + * The questionnaire (for --ask) will not ask for them. + */ static void -do_questionnaire_mobile (gboolean echo, char **user, char **password) -{ - /* Ask for optional 'gsm' or 'cdma' arguments. */ - if (!want_provide_opt_args (_("mobile broadband"), 2)) - return; - - if (!*user) - *user = nmc_readline (_("Username [none]: ")); - if (!*password) - *password = nmc_readline_echo (echo, _("Password [none]: ")); -} - -#define WORD_PANU "panu" -#define WORD_DUN_GSM "dun-gsm" -#define WORD_DUN_CDMA "dun-cdma" -#define PROMPT_BT_TYPE "(" WORD_PANU "/" WORD_DUN_GSM "/" WORD_DUN_CDMA ") [" WORD_PANU "]: " -static void -do_questionnaire_bluetooth (char **bt_type) +disable_options (const gchar *setting_name, const gchar *property) { - gboolean once_more; - - /* Ask for optional 'bluetooth' arguments. */ - if (!want_provide_opt_args (_("bluetooth"), 1)) - return; + OptionInfo *candidate; - if (!*bt_type) { - const char *types[] = { "dun", "dun-gsm", "dun-cdma", "panu", NULL }; - const char *tmp; - do { - *bt_type = nmc_readline (_("Bluetooth type %s"), PROMPT_BT_TYPE); - if (!*bt_type) - *bt_type = g_strdup ("panu"); - tmp = nmc_string_is_valid (*bt_type, types, NULL); - once_more = !tmp; - if (once_more) { - g_print (_("Error: 'bt-type': '%s' is not a valid bluetooth type.\n"), *bt_type); - g_free (*bt_type); - } - } while (once_more); - g_free (*bt_type); - *bt_type = g_strdup (tmp); + for (candidate = option_info; candidate->setting_name; candidate++) { + if ( strcmp (candidate->setting_name, setting_name) == 0 + && (!property || strcmp (candidate->property, property) == 0)) + candidate->flags |= OPTION_DISABLED; } } +/* + * Reset marks done with enable_options() and disable_options(). + * Ensures correct operation in case more than one connection is added in a single + * nmcli session. + */ static void -do_questionnaire_vlan (char **mtu, char **flags, char **ingress, char **egress) +reset_options (void) { - gboolean once_more; - GError *error = NULL; - - /* Ask for optional 'vlan' arguments. */ - if (!want_provide_opt_args (_("VLAN"), 4)) - return; + OptionInfo *candidate; - if (!*mtu) { - do { - *mtu = nmc_readline (_("MTU [auto]: ")); - once_more = !check_and_convert_mtu (*mtu, NULL, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*mtu); - } - } while (once_more); - } - if (!*flags) { - do { - *flags = nmc_readline (_("VLAN flags (<0-7>) [none]: ")); - once_more = !check_and_convert_vlan_flags (*flags, NULL, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*flags); - } - } while (once_more); - } - if (!*ingress) { - do { - *ingress = nmc_readline (_("Ingress priority maps [none]: ")); - once_more = !check_and_convert_vlan_prio_maps (*ingress, NM_VLAN_INGRESS_MAP, NULL, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*ingress); - } - } while (once_more); - } - if (!*egress) { - do { - *egress = nmc_readline (_("Egress priority maps [none]: ")); - once_more = !check_and_convert_vlan_prio_maps (*egress, NM_VLAN_EGRESS_MAP, NULL, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*egress); - } - } while (once_more); + for (candidate = option_info; candidate->setting_name; candidate++) { + candidate->flags &= ~OPTION_DISABLED; + candidate->flags &= ~OPTION_ENABLED; } } -#define PROMPT_BOND_MODE _("Bonding mode [balance-rr]: ") -#define WORD_MIIMON "miimon" -#define WORD_ARP "arp" -#define PROMPT_BOND_MON_MODE "(" WORD_MIIMON "/" WORD_ARP ") [" WORD_MIIMON "]: " -static void -do_questionnaire_bond (char **mode, char **primary, char **miimon, - char **downdelay, char **updelay, - char **arpinterval, char **arpiptarget, - char **lacp_rate) -{ - char *monitor_mode; - unsigned long tmp; - gboolean once_more; - GError *error = NULL; - - /* Ask for optional 'bond' arguments. */ - if (!want_provide_opt_args (_("bond"), 5)) - return; +static gboolean +set_property (NMConnection *connection, + const char *setting_name, const char *property, const char *value, + char modifier, GError **error) +{ + gs_free char *property_name = NULL, *value_free = NULL; + NMSetting *setting; + GError *local = NULL; - if (!*mode) { - const char *mode_tmp; - do { - *mode = nmc_readline (PROMPT_BOND_MODE); - if (!*mode) - *mode = g_strdup ("balance-rr"); - mode_tmp = nmc_bond_validate_mode (*mode, &error); - g_free (*mode); - if (mode_tmp) { - *mode = g_strdup (mode_tmp); - } else { - g_print ("%s\n", error->message); - g_clear_error (&error); - } - } while (!mode_tmp); + setting = nm_connection_get_setting_by_name (connection, setting_name); + if (!setting) { + setting = nmc_setting_new_for_name (setting_name); + if (!setting) { + /* This should really not happen */ + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_UNKNOWN, + _("Error: don't know how to create '%s' setting."), + setting_name); + return FALSE; + } + nmc_setting_custom_init (setting); + nm_connection_add_setting (connection, setting); } - if (g_strcmp0 (*mode, "active-backup") == 0 && !*primary) { - do { - *primary = nmc_readline (_("Bonding primary interface [none]: ")); - once_more = *primary && !nm_utils_iface_valid_name (*primary); - if (once_more) { - g_print (_("Error: 'primary': '%s' is not a valid interface name.\n"), - *primary); - g_free (*primary); - } - } while (once_more); + property_name = is_property_valid (setting, property, &local); + if (!property_name) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: invalid property '%s': %s."), + property, local->message); + g_clear_error (&local); + return FALSE; } - do { - monitor_mode = nmc_readline (_("Bonding monitoring mode %s"), PROMPT_BOND_MON_MODE); - if (!monitor_mode) - monitor_mode = g_strdup (WORD_MIIMON); - g_strstrip (monitor_mode); - once_more = matches (monitor_mode, WORD_MIIMON) != 0 && matches (monitor_mode, WORD_ARP) != 0; - if (once_more) { - g_print (_("Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"), - monitor_mode, WORD_MIIMON, WORD_ARP); - g_free (monitor_mode); - } - } while (once_more); - - if (matches (monitor_mode, WORD_MIIMON) == 0) { - if (!*miimon) { - do { - *miimon = nmc_readline (_("Bonding miimon [100]: ")); - once_more = *miimon && !nmc_string_to_uint (*miimon, TRUE, 0, G_MAXUINT32, &tmp); - if (once_more) { - g_print (_("Error: 'miimon': '%s' is not a valid number <0-%u>.\n"), - *miimon, G_MAXUINT32); - g_free (*miimon); - } - } while (once_more); - } - if (!*downdelay) { - do { - *downdelay = nmc_readline (_("Bonding downdelay [0]: ")); - once_more = *downdelay && !nmc_string_to_uint (*downdelay, TRUE, 0, G_MAXUINT32, &tmp); - if (once_more) { - g_print (_("Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"), - *downdelay, G_MAXUINT32); - g_free (*downdelay); - } - } while (once_more); + if (modifier != '-') { + /* Set/add value */ + if (modifier != '+') { + /* We allow the existing property value to be passed as parameter, + * so make a copy if we are going to free it. + */ + value = value_free = g_strdup (value); + nmc_setting_reset_property (setting, property_name, NULL); } - if (!*updelay) { - do { - *updelay = nmc_readline (_("Bonding updelay [0]: ")); - once_more = *updelay && !nmc_string_to_uint (*updelay, TRUE, 0, G_MAXUINT32, &tmp); - if (once_more) { - g_print (_("Error: 'updelay': '%s' is not a valid number <0-%u>.\n"), - *updelay, G_MAXUINT32); - g_free (*updelay); - } - } while (once_more); + if (!nmc_setting_set_property (setting, property_name, value, &local)) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: failed to modify %s.%s: %s."), + setting_name, property, local->message); + g_clear_error (&local); + return FALSE; } } else { - if (!*arpinterval) { - do { - *arpinterval = nmc_readline (_("Bonding arp-interval [0]: ")); - once_more = *arpinterval && !nmc_string_to_uint (*arpinterval, TRUE, 0, G_MAXUINT32, &tmp); - if (once_more) { - g_print (_("Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"), - *arpinterval, G_MAXUINT32); - g_free (*arpinterval); - } - } while (once_more); - } - if (!*arpiptarget) { - //FIXME: verify the string - *arpiptarget = nmc_readline (_("Bonding arp-ip-target [none]: ")); - } + /* Remove value + * - either empty: remove whole value + * - or specified by index <0-n>: remove item at the index + * - or option name: remove item with the option name + */ + if (value) { + unsigned long idx; + if (nmc_string_to_uint (value, TRUE, 0, G_MAXUINT32, &idx)) + nmc_setting_remove_property_option (setting, property_name, NULL, idx, &local); + else + nmc_setting_remove_property_option (setting, property_name, value, 0, &local); + if (local) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: failed to remove a value from %s.%s: %s."), + setting_name, property, local->message); + g_clear_error (&local); + return FALSE; + } + } else + nmc_setting_reset_property (setting, property_name, NULL); } - if ( !*lacp_rate - && (g_strcmp0 (*mode, "802.3ad") == 0 || g_strcmp0 (*mode, "4") == 0)) { - do { - *lacp_rate = nmc_readline (_("LACP rate ('slow' or 'fast') [slow]: ")); - once_more = *lacp_rate && (strcmp (*lacp_rate, "slow") && - strcmp (*lacp_rate, "0") && - strcmp (*lacp_rate, "fast") && - strcmp (*lacp_rate, "1")); - if (once_more) { - printf (_("Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"), - *lacp_rate); - g_free (*lacp_rate); - } - } while (once_more); + /* Don't ask for this property in interactive mode. */ + disable_options (setting_name, property_name); + + return TRUE; +} + +static gboolean +set_option (NmCli *nmc, NMConnection *connection, OptionInfo *option, const gchar *value, GError **error) +{ + option->flags |= OPTION_DISABLED; + if (option->check_and_set) { + return option->check_and_set (nmc, connection, option, value, error); + } else if (value) { + return set_property (connection, option->setting_name, option->property, + value, option->flags & OPTION_MULTI ? '+' : '\0', error); + } else if (option->flags & OPTION_REQD) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: '%s' is mandatory."), option->option); + return FALSE; } - g_free (monitor_mode); + return TRUE; } -static void -do_questionnaire_team_common (const char *type_name, char **config) +/* + * Return relevant NameItem[] tables for given connection (based on connection type + * and slave type. + */ +static gboolean +con_settings (NMConnection *connection, const NameItem **type_settings, const NameItem **slv_settings, GError **error) { - gboolean once_more; - char *json = NULL; - GError *error = NULL; + const char *con_type; + gs_free char *slv_type = NULL; + NMSettingConnection *s_con; - /* Ask for optional arguments. */ - if (!want_provide_opt_args (type_name, 1)) - return; + g_return_val_if_fail (type_settings, FALSE); + g_return_val_if_fail (slv_settings, FALSE); - if (!*config) { - do { - *config = nmc_readline (_("Team JSON configuration [none]: ")); - once_more = !nmc_team_check_config (*config, &json, &error); - if (once_more) { - g_print ("Error: %s\n", error->message); - g_clear_error (&error); - g_free (*config); - } - } while (once_more); + s_con = nm_connection_get_setting_connection (connection); + g_assert (s_con); + + con_type = nm_setting_connection_get_slave_type (s_con); + if (!con_type) + con_type = "no"; + slv_type = g_strdup_printf ("%s-slave", con_type); + if (slv_type) { + *slv_settings = get_valid_settings_array (slv_type); + if (!*slv_settings) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: invalid slave type; %s."), slv_type); + return FALSE; + } + } else { + *slv_settings = NULL; } - *config = json; -} + con_type = nm_setting_connection_get_connection_type (s_con); + if (!con_type) + con_type = NM_SETTING_GENERIC_SETTING_NAME; + *type_settings = get_valid_settings_array (con_type); + if (!*type_settings) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: invalid connection type; %s."), con_type); + return FALSE; + } -/* Both team and team-slave curently have just ithe same one optional argument */ -static void -do_questionnaire_team (char **config) -{ - do_questionnaire_team_common (_("team"), config); + return TRUE; } +/* + * Make sure all required settings are in place (should be called when + * it's possible that a type is aready set). + */ static void -do_questionnaire_team_slave (char **config) +ensure_settings (NMConnection *connection, const NameItem *item) { - do_questionnaire_team_common (_("team-slave"), config); -} + const NameItem *setting_item; + NMSetting *setting; -static void -do_questionnaire_bridge (char **stp, char **priority, char **fwd_delay, char **hello_time, - char **max_age, char **ageing_time, char **mcast_snoop, char **mac) -{ - unsigned long tmp; - gboolean once_more; - GError *error = NULL; - - /* Ask for optional 'bridge' arguments. */ - if (!want_provide_opt_args (_("bridge"), 8)) - return; - - if (!*stp) { - gboolean stp_bool; - do { - *stp = nmc_readline (_("Enable STP %s"), prompt_yes_no (TRUE, ":")); - *stp = *stp ? *stp : g_strdup ("yes"); - normalize_yes_no (stp); - once_more = !nmc_string_to_bool (*stp, &stp_bool, &error); - if (once_more) { - g_print (_("Error: 'stp': %s.\n"), error->message); - g_clear_error (&error); - g_free (*stp); - } - } while (once_more); - } - if (!*priority) { - do { - *priority = nmc_readline (_("STP priority [32768]: ")); - *priority = *priority ? *priority : g_strdup ("32768"); - once_more = !nmc_string_to_uint (*priority, TRUE, 0, G_MAXUINT16, &tmp); - if (once_more) { - g_print (_("Error: 'priority': '%s' is not a valid number <0-%d>.\n"), - *priority, G_MAXUINT16); - g_free (*priority); - } - } while (once_more); - } - if (!*fwd_delay) { - do { - *fwd_delay = nmc_readline (_("Forward delay [15]: ")); - *fwd_delay = *fwd_delay ? *fwd_delay : g_strdup ("15"); - once_more = !nmc_string_to_uint (*fwd_delay, TRUE, 2, 30, &tmp); - if (once_more) { - g_print (_("Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"), - *fwd_delay); - g_free (*fwd_delay); - } - } while (once_more); - } - - if (!*hello_time) { - do { - *hello_time = nmc_readline (_("Hello time [2]: ")); - *hello_time = *hello_time ? *hello_time : g_strdup ("2"); - once_more = !nmc_string_to_uint (*hello_time, TRUE, 1, 10, &tmp); - if (once_more) { - g_print (_("Error: 'hello-time': '%s' is not a valid number <1-10>.\n"), - *hello_time); - g_free (*hello_time); - } - } while (once_more); - } - if (!*max_age) { - do { - *max_age = nmc_readline (_("Max age [20]: ")); - *max_age = *max_age ? *max_age : g_strdup ("20"); - once_more = !nmc_string_to_uint (*max_age, TRUE, 6, 40, &tmp); - if (once_more) { - g_print (_("Error: 'max-age': '%s' is not a valid number <6-40>.\n"), - *max_age); - g_free (*max_age); - } - } while (once_more); - } - if (!*ageing_time) { - do { - *ageing_time = nmc_readline (_("MAC address ageing time [300]: ")); - *ageing_time = *ageing_time ? *ageing_time : g_strdup ("300"); - once_more = !nmc_string_to_uint (*ageing_time, TRUE, 0, 1000000, &tmp); - if (once_more) { - g_print (_("Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"), - *ageing_time); - g_free (*ageing_time); - } - } while (once_more); - } - if (!*mcast_snoop) { - gboolean mcast_snoop_bool; - do { - *mcast_snoop = nmc_readline (_("Enable IGMP snooping %s"), prompt_yes_no (TRUE, ":")); - *mcast_snoop = *mcast_snoop ? *mcast_snoop : g_strdup ("yes"); - normalize_yes_no (mcast_snoop); - once_more = !nmc_string_to_bool (*mcast_snoop, &mcast_snoop_bool, &error); - if (once_more) { - g_print (_("Error: 'multicast-snooping': %s.\n"), error->message); - g_clear_error (&error); - g_free (*mcast_snoop); - } - } while (once_more); - } - if (!*mac) { - do { - *mac = nmc_get_user_input (_("MAC [none]: ")); - once_more = !check_mac (*mac, ARPHRD_ETHER, "mac", &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*mac); - } - } while (once_more); - } -} - -static void -do_questionnaire_bridge_slave (char **priority, char **path_cost, char **hairpin) -{ - unsigned long tmp; - gboolean once_more; - GError *error = NULL; - - /* Ask for optional 'bridge-slave' arguments. */ - if (!want_provide_opt_args (_("bridge-slave"), 3)) - return; - - if (!*priority) { - do { - *priority = nmc_readline (_("Bridge port priority [32]: ")); - *priority = *priority ? *priority : g_strdup ("32"); - once_more = !bridge_prop_string_to_uint (*priority, "priority", NM_TYPE_SETTING_BRIDGE_PORT, - NM_SETTING_BRIDGE_PORT_PRIORITY, &tmp, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*priority); - } - } while (once_more); - } - if (!*path_cost) { - do { - *path_cost = nmc_readline (_("Bridge port STP path cost [100]: ")); - *path_cost = *path_cost ? *path_cost : g_strdup ("100"); - once_more = !bridge_prop_string_to_uint (*path_cost, "path-cost", NM_TYPE_SETTING_BRIDGE_PORT, - NM_SETTING_BRIDGE_PORT_PATH_COST, &tmp, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*path_cost); - } - } while (once_more); - } - if (!*hairpin) { - gboolean hairpin_bool; - do { - *hairpin = nmc_readline (_("Hairpin %s"), prompt_yes_no (TRUE, ":")); - *hairpin = *hairpin ? *hairpin : g_strdup ("yes"); - normalize_yes_no (hairpin); - once_more = !nmc_string_to_bool (*hairpin, &hairpin_bool, &error); - if (once_more) { - g_print (_("Error: 'hairpin': %s.\n"), error->message); - g_clear_error (&error); - g_free (*hairpin); - } - } while (once_more); - } -} - -static void -do_questionnaire_vpn (char **user) -{ - /* Ask for optional 'vpn' arguments. */ - if (!want_provide_opt_args (_("VPN"), 1)) - return; - - if (!*user) - *user = nmc_readline (_("Username [none]: ")); -} - -static void -do_questionnaire_olpc (char **channel, char **dhcp_anycast) -{ - unsigned long tmp; - gboolean once_more; - GError *error = NULL; - - /* Ask for optional 'olpc' arguments. */ - if (!want_provide_opt_args (_("OLPC Mesh"), 2)) - return; - - if (!*channel) { - do { - *channel = nmc_readline (_("OLPC Mesh channel [1]: ")); - once_more = *channel && !nmc_string_to_uint (*channel, TRUE, 1, 13, &tmp); - if (once_more) { - g_print (_("Error: 'channel': '%s' is not a valid number <1-13>.\n"), - *channel); - g_free (*channel); - } - } while (once_more); - } - if (!*dhcp_anycast) { - do { - *dhcp_anycast = nmc_readline (_("DHCP anycast MAC address [none]: ")); - once_more = !check_mac (*dhcp_anycast, ARPHRD_ETHER, "dhcp-anycast", &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*dhcp_anycast); - } - } while (once_more); - } -} - -#define PROMPT_ADSL_ENCAP "(" NM_SETTING_ADSL_ENCAPSULATION_VCMUX "/" NM_SETTING_ADSL_ENCAPSULATION_LLC ") [none]: " -static void -do_questionnaire_adsl (gboolean echo, char **password, char **encapsulation) -{ - gboolean once_more; - GError *error = NULL; - - /* Ask for optional 'adsl' arguments. */ - if (!want_provide_opt_args (_("ADSL"), 2)) - return; - - if (!*password) - *password = nmc_readline_echo (echo, _("Password [none]: ")); - - if (!*encapsulation) { - do { - *encapsulation = nmc_readline (_("ADSL encapsulation %s"), PROMPT_ADSL_ENCAP); - once_more = !check_adsl_encapsulation (encapsulation, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*encapsulation); - } - } while (once_more); - } -} - -static void -do_questionnaire_macvlan (char **tap) -{ - gboolean once_more; - GError *error = NULL; - - /* Ask for optional 'macvlan' arguments. */ - if (!want_provide_opt_args (_("macvlan"), 1)) - return; - - if (!*tap) { - gboolean tap_bool; - do { - *tap = nmc_readline (_("Tap %s"), prompt_yes_no (FALSE, ":")); - *tap = *tap ? *tap : g_strdup ("yes"); - normalize_yes_no (tap); - once_more = !nmc_string_to_bool (*tap, &tap_bool, &error); - if (once_more) { - g_print (_("Error: 'tap': %s.\n"), error->message); - g_clear_error (&error); - g_free (*tap); - } - } while (once_more); - } -} - -static void -do_questionnaire_vxlan (char **parent, char **local, char **src_port_min, - char **src_port_max, char **dst_port) -{ - unsigned long tmp; - gboolean once_more; - - /* Ask for optional 'vxlan' arguments. */ - if (!want_provide_opt_args (_("VXLAN"), 5)) - return; - - if (!*parent) { - do { - *parent = nmc_readline (_("Parent device [none]: ")); - once_more = *parent - && !nm_utils_is_uuid (*parent) - && !nm_utils_iface_valid_name (*parent); - if (once_more) { - g_print (_("Error: 'dev': '%s' is neither UUID nor interface name.\n"), - *parent); - g_free (*parent); - } - } while (once_more); - } - - if (!*local) { - do { - *local = nmc_readline (_("Local address [none]: ")); - once_more = *local - && !nm_utils_ipaddr_valid (AF_INET, *local) - && !nm_utils_ipaddr_valid (AF_INET6, *local); - if (once_more) { - g_print (_("Error: 'local': '%s' is not a valid IP address.\n"), - *local); - g_free (*local); - } - } while (once_more); - } - - if (!*src_port_min) { - do { - *src_port_min = nmc_readline (_("Minimum source port [0]: ")); - *src_port_min = *src_port_min ? *src_port_min : g_strdup ("0"); - once_more = !nmc_string_to_uint (*src_port_min, TRUE, 0, 65535, &tmp); - if (once_more) { - g_print (_("Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"), - *src_port_min); - g_free (*src_port_min); - } - } while (once_more); - } - - if (!*src_port_max) { - do { - *src_port_max = nmc_readline (_("Maximum source port [0]: ")); - *src_port_max = *src_port_max ? *src_port_max : g_strdup ("0"); - once_more = !nmc_string_to_uint (*src_port_max, TRUE, 0, 65535, &tmp); - if (once_more) { - g_print (_("Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"), - *src_port_max); - g_free (*src_port_max); - } - } while (once_more); - } - - if (!*dst_port) { - do { - *dst_port = nmc_readline (_("Destination port [8472]: ")); - *dst_port = *dst_port ? *dst_port : g_strdup ("8472"); - once_more = !nmc_string_to_uint (*dst_port, TRUE, 0, 65535, &tmp); - if (once_more) { - g_print (_("Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"), - *dst_port); - g_free (*dst_port); - } - } while (once_more); + for (setting_item = item; setting_item->name; setting_item++) { + if (!setting_item->mandatory) + continue; + if (nm_connection_get_setting_by_name (connection, setting_item->name)) + continue; + setting = nmc_setting_new_for_name (setting_item->name); + if (setting) { + nmc_setting_custom_init (setting); + nm_connection_add_setting (connection, setting); + } } } -static gboolean -split_address (char* str, char **ip, char **rest) -{ - size_t n1, n2, n3; - - *ip = *rest = NULL; - if (!str) - return FALSE; - - n1 = strspn (str, " \t"); - n2 = strcspn (str+n1, " \t\0") + n1; - n3 = strspn (str+n2, " \t") + n2; - - str[n2] = '\0'; - *ip = str[n1] ? str + n1 : NULL; - *rest = str[n3] ? str + n3 : NULL; - - return TRUE; -} - -static void -ask_for_ip_addresses (NMConnection *connection, int family) -{ - gboolean ip_loop; - GError *error = NULL; - char *str, *ip, *rest; - const char *prompt; - gboolean added; - NMIPAddress *ipaddr; - - if (family == AF_INET) - prompt =_("IPv4 address (IP[/plen]) [none]: "); - else - prompt =_("IPv6 address (IP[/plen]) [none]: "); - - ip_loop = TRUE; - do { - str = nmc_readline ("%s", prompt); - split_address (str, &ip, &rest); - if (ip) { - ipaddr = nmc_parse_and_build_address (family, ip, &error); - if (ipaddr) { - if (family == AF_INET) - added = add_ip4_address_to_connection (ipaddr, connection); - else - added = add_ip6_address_to_connection (ipaddr, connection); - if (added) - g_print (_(" Address successfully added: %s\n"), ip); - else - g_print (_(" Warning: address already present: %s\n"), ip); - if (rest) - g_print (_(" Warning: ignoring garbage at the end: '%s'\n"), rest); - } else { - g_prefix_error (&error, _("Error: ")); - g_print ("%s\n", error->message); - g_clear_error (&error); - } - } else - ip_loop = FALSE; +/*----------------------------------------------------------------------------*/ - g_free (str); - } while (ip_loop); -} -static void -maybe_ask_for_gateway (NMConnection *connection, int family) +static char * +gen_func_vpn_types (const char *text, int state) { - gboolean gw_loop; - char *str, *gw, *rest; - const char *prompt; - NMSettingIPConfig *s_ip; + gs_strfreev char **plugin_names = NULL; - if (family == AF_INET) { - prompt =_("IPv4 gateway [none]: "); - s_ip = nm_connection_get_setting_ip4_config (connection); - } else { - prompt =_("IPv6 gateway [none]: "); - s_ip = nm_connection_get_setting_ip6_config (connection); - } - if (s_ip == NULL) - return; - if ( nm_setting_ip_config_get_num_addresses (s_ip) == 0 - || nm_setting_ip_config_get_gateway (s_ip) != NULL) - return; - - gw_loop = TRUE; - do { - str = nmc_readline ("%s", prompt); - split_address (str, &gw, &rest); - if (gw) { - if (nm_utils_ipaddr_valid (family, gw)) { - g_object_set (s_ip, - NM_SETTING_IP_CONFIG_GATEWAY, gw, - NULL); - gw_loop = FALSE; - } else - g_print (_("Error: invalid gateway address '%s'\n"), gw); - } else - gw_loop = FALSE; - g_free (str); - } while (gw_loop); + plugin_names = nm_vpn_plugin_info_list_get_service_types (nm_vpn_get_plugin_infos (), FALSE, TRUE); + return nmc_rl_gen_func_basic (text, state, (const char **) plugin_names); } -static void -do_questionnaire_ip (NMConnection *connection) -{ - char *answer; - - /* Ask for IP addresses */ - answer = nmc_readline (_("Do you want to add IP addresses? %s"), prompt_yes_no (TRUE, NULL)); - answer = answer ? g_strstrip (answer) : NULL; - if (answer && matches (answer, WORD_LOC_YES) != 0) { - g_free (answer); - return; - } - g_free (answer); - - g_print (_("Press to finish adding addresses.\n")); - - ask_for_ip_addresses (connection, AF_INET); - maybe_ask_for_gateway (connection, AF_INET); - ask_for_ip_addresses (connection, AF_INET6); - maybe_ask_for_gateway (connection, AF_INET6); -} - -static NMSetting * -is_setting_valid (NMConnection *connection, const NameItem *valid_settings_main, const NameItem *valid_settings_slave, char *setting) +static char * +gen_func_bool_values_l10n (const char *text, int state) { - const char *setting_name; - - if (!(setting_name = check_valid_name (setting, valid_settings_main, valid_settings_slave, NULL))) - return NULL; - return nm_connection_get_setting_by_name (connection, setting_name); + const char *words[] = { WORD_LOC_YES, WORD_LOC_NO, NULL }; + return nmc_rl_gen_func_basic (text, state, words); } static char * -is_property_valid (NMSetting *setting, const char *property, GError **error) +gen_func_wifi_mode (const char *text, int state) { - char **valid_props = NULL; - const char *prop_name; - char *ret; - - valid_props = nmc_setting_get_valid_properties (setting); - prop_name = nmc_string_is_valid (property, (const char **) valid_props, error); - ret = g_strdup (prop_name); - g_strfreev (valid_props); - return ret; + const char *words[] = { "infrastructure", "ap", "adhoc", NULL }; + return nmc_rl_gen_func_basic (text, state, words); } -#define WORD_TUN "tun" -#define WORD_TAP "tap" -#define PROMPT_TUN_MODE "(" WORD_TUN "/" WORD_TAP ") [" WORD_TUN "]: " -static void -do_questionnaire_tun (char **user, char **group, - char **pi, char **vnet_hdr, char **multi_queue) +static char * +gen_func_ib_type (const char *text, int state) { - gboolean once_more; - GError *error = NULL; - gboolean b; - - /* Ask for optional 'tun' arguments. */ - if (!want_provide_opt_args (_("Tun"), 5)) - return; - - if (!*user) { - do { - *user = nmc_readline (_("User ID [none]: ")); - if (!*user) - break; - once_more = !check_user_group_id (*user, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*user); - } - } while (once_more); - } - if (!*group) { - do { - *group = nmc_readline (_("Group ID [none]: ")); - if (!*group) - break; - once_more = !check_user_group_id (*group, &error); - if (once_more) { - g_print ("%s\n", error->message); - g_clear_error (&error); - g_free (*group); - } - } while (once_more); - } - - if (!*pi) { - do { - *pi = nmc_readline (_("Enable PI %s"), prompt_yes_no (FALSE, ":")); - *pi = *pi ? *pi : g_strdup ("no"); - normalize_yes_no (pi); - once_more = !nmc_string_to_bool (*pi, &b, &error); - if (once_more) { - g_print (_("Error: 'pi': %s.\n"), error->message); - g_clear_error (&error); - g_free (*pi); - } - } while (once_more); - } - if (!*vnet_hdr) { - do { - *vnet_hdr = nmc_readline (_("Enable VNET header %s"), prompt_yes_no (FALSE, ":")); - *vnet_hdr = *vnet_hdr ? *vnet_hdr : g_strdup ("no"); - normalize_yes_no (vnet_hdr); - once_more = !nmc_string_to_bool (*vnet_hdr, &b, &error); - if (once_more) { - g_print (_("Error: 'vnet-hdr': %s.\n"), error->message); - g_clear_error (&error); - g_free (*vnet_hdr); - } - } while (once_more); - } - if (!*multi_queue) { - do { - *multi_queue = nmc_readline (_("Enable multi queue %s"), prompt_yes_no (FALSE, ":")); - *multi_queue = *multi_queue ? *multi_queue : g_strdup ("no"); - normalize_yes_no (multi_queue); - once_more = !nmc_string_to_bool (*multi_queue, &b, &error); - if (once_more) { - g_print (_("Error: 'multi-queue': %s.\n"), error->message); - g_clear_error (&error); - g_free (*multi_queue); - } - } while (once_more); - } + const char *words[] = { "datagram", "connected", NULL }; + return nmc_rl_gen_func_basic (text, state, words); } -static void -do_questionnaire_ip_tunnel (char **local, char **parent) +static char * +gen_func_bt_type (const char *text, int state) { - gboolean once_more; - - /* Ask for optional 'ip-tunnel' arguments. */ - if (!want_provide_opt_args (_("IP Tunnel"), 2)) - return; - - if (!*local) { - do { - *local = nmc_readline (_("Local endpoint [none]: ")); - if (!*local) - break; - once_more = !nm_utils_ipaddr_valid (AF_INET, *local) - && !nm_utils_ipaddr_valid (AF_INET6, *local); - if (once_more) { - g_print (_("Error: 'local': '%s' is not valid; must be an IP address\n"), - *local); - g_free (*local); - } - } while (once_more); - } - - if (!*parent) { - do { - *parent = nmc_readline (_("Parent device [none]: ")); - once_more = *parent - && !nm_utils_is_uuid (*parent) - && !nm_utils_iface_valid_name (*parent); - if (once_more) { - g_print (_("Error: 'dev': '%s' is neither UUID nor interface name.\n"), - *parent); - g_free (*parent); - } - } while (once_more); - } + const char *words[] = { "panu", "dun-gsm", "dun-cdma", NULL }; + return nmc_rl_gen_func_basic (text, state, words); } -static gboolean -read_connection_properties (NMConnection *connection, - int argc, - char **argv, - GError **error) +static char * +gen_func_bond_mode (const char *text, int state) { - NMSetting *setting; - NMSettingConnection *s_con; - const char *con_type; - const char *s_dot_p; - const char *value; - char **strv = NULL; - char *slv_type = NULL; - const char *setting_name; - gboolean append = FALSE; - gboolean remove = FALSE; - gboolean success = FALSE; - GError *local = NULL; - - s_con = nm_connection_get_setting_connection (connection); - g_assert (s_con); - - /* First check if we have a slave-type, as this would mean we will not - * have ip properties but possibly others, slave-type specific. - */ - con_type = nm_setting_connection_get_slave_type (s_con); - if (!con_type) - con_type = "no"; - - slv_type = g_strdup_printf ("%s-slave", con_type); - - con_type = nm_setting_connection_get_connection_type (s_con); - - /* Go through arguments and set properties */ - while (argc) { - gs_free char *property_name = NULL; - - s_dot_p = *argv; - next_arg (&argc, &argv); - value = *argv; - next_arg (&argc, &argv); - - if (!s_dot_p) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: . argument is missing.")); - goto finish; - } - if (!value) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: value for '%s' is missing."), s_dot_p); - goto finish; - } - /* Empty string will reset the value to default */ - if (value[0] == '\0') - value = NULL; - - if (s_dot_p[0] == '+') { - s_dot_p++; - append = TRUE; - } else if (s_dot_p[0] == '-') { - s_dot_p++; - remove = TRUE; - } - - strv = g_strsplit (s_dot_p, ".", 2); - if (g_strv_length (strv) != 2) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: invalid . '%s'."), s_dot_p); - goto finish; - } - - setting_name = check_valid_name (strv[0], get_valid_settings_array (con_type), - get_valid_settings_array (slv_type), &local); - if (!setting_name) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: invalid or not allowed setting '%s': %s."), - strv[0], local->message); - g_clear_error (&local); - goto finish; - } - setting = nm_connection_get_setting_by_name (connection, setting_name); - if (!setting) { - setting = nmc_setting_new_for_name (setting_name); - if (!setting) { - /* This should really not happen */ - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_UNKNOWN, - _("Error: don't know how to create '%s' setting."), - setting_name); - goto finish; - } - nm_connection_add_setting (connection, setting); - } - - property_name = is_property_valid (setting, strv[1], &local); - if (!property_name) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: invalid property '%s': %s."), - strv[1], local->message); - g_clear_error (&local); - goto finish; - } - - if (!remove) { - /* Set/add value */ - if (!append) - nmc_setting_reset_property (setting, property_name, NULL); - if (!nmc_setting_set_property (setting, property_name, value, &local)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: failed to modify %s.%s: %s."), - strv[0], strv[1], local->message); - g_clear_error (&local); - goto finish; - } - } else { - /* Remove value - * - either empty: remove whole value - * - or specified by index <0-n>: remove item at the index - * - or option name: remove item with the option name - */ - if (value) { - unsigned long idx; - if (nmc_string_to_uint (value, TRUE, 0, G_MAXUINT32, &idx)) - nmc_setting_remove_property_option (setting, property_name, NULL, idx, &local); - else - nmc_setting_remove_property_option (setting, property_name, value, 0, &local); - if (local) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: failed to remove a value from %s.%s: %s."), - strv[0], strv[1], local->message); - g_clear_error (&local); - goto finish; - } - } else - nmc_setting_reset_property (setting, property_name, NULL); - } - - g_strfreev (strv); - strv = NULL; - } - - success = TRUE; -finish: - if (strv) - g_strfreev (strv); - g_free (slv_type); - return success; -} - -static gboolean -complete_slave (NMSettingConnection *s_con, - const GPtrArray *all_connections, - const char *slave_type, - const char *master, - const char *type, - gboolean ask, - GError **error) -{ - char *master_ask = NULL; - const char *checked_master = NULL; - - if (type) - g_print (_("Warning: 'type' is ignored. " - "Use 'nmcli connection add \"%s\" ...' instead."), - type); - - if (nm_setting_connection_get_master (s_con)) { - /* Master already set. */ - if (master) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: redundant 'master' option.")); - return FALSE; - } - g_object_set (s_con, - NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type, - NULL); - return TRUE; - } - - if (!master && ask) - master = master_ask = nmc_readline (PROMPT_MASTER); - if (!master) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'master' is required.")); - return FALSE; - } - /* Verify master argument */ - checked_master = normalized_master_for_slave (all_connections, master, slave_type, NULL); - - /* Change properties in 'connection' setting */ - g_object_set (s_con, - NM_SETTING_CONNECTION_MASTER, checked_master, - NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type, - NULL); - - g_free (master_ask); - - return TRUE; + const char *words[] = { "balance-rr", "active-backup", "balance-xor", "broadcast", + "802.3ad", "balance-tlb", "balance-alb", NULL }; + return nmc_rl_gen_func_basic (text, state, words); } - -static gboolean -complete_connection_by_type (NMConnection *connection, - const char *con_type, - const GPtrArray *all_connections, - gboolean ask, - gboolean show_secrets, - int argc, - char **argv, - GError **error) +static char * +gen_func_bond_mon_mode (const char *text, int state) { - NMSettingConnection *s_con; - NMSettingGeneric *s_generic; - NMSettingWired *s_wired; - NMSettingInfiniband *s_infiniband; - NMSettingWireless *s_wifi; - NMSettingWimax *s_wimax; - NMSettingPppoe *s_pppoe; - NMSettingGsm *s_gsm; - NMSettingCdma *s_cdma; - NMSettingBluetooth *s_bt; - NMSettingVlan *s_vlan; - NMSettingBond *s_bond; - NMSettingTeam *s_team; - NMSettingTeamPort *s_team_port; - NMSettingBridge *s_bridge; - NMSettingBridgePort *s_bridge_port; - NMSettingVpn *s_vpn; - NMSettingOlpcMesh *s_olpc_mesh; - NMSettingAdsl *s_adsl; - NMSettingTun *s_tun; - NMSettingIPTunnel *s_ip_tunnel; - NMSettingMacvlan *s_macvlan; - NMSettingVxlan *s_vxlan; - - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - s_con = nm_connection_get_setting_connection (connection); - g_assert (s_con); - - if (!strcmp (con_type, NM_SETTING_WIRED_SETTING_NAME)) { - /* Build up the settings required for 'ethernet' */ - gboolean success = FALSE; - const char *mtu_c = NULL; - char *mtu = NULL; - guint32 mtu_int = 0; - const char *mac_c = NULL; - char *mac = NULL; - const char *cloned_mac_c = NULL; - char *cloned_mac = NULL; - nmc_arg_t exp_args[] = { {"mtu", TRUE, &mtu_c, FALSE}, - {"mac", TRUE, &mac_c, FALSE}, - {"cloned-mac", TRUE, &cloned_mac_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - /* Also ask for all optional arguments if '--ask' is specified. */ - mtu = g_strdup (mtu_c); - mac = g_strdup (mac_c); - cloned_mac = g_strdup (cloned_mac_c); - if (ask) - do_questionnaire_ethernet (TRUE, &mtu, &mac, &cloned_mac); - - if (!check_and_convert_mtu (mtu, &mtu_int, error)) - goto cleanup_wired; - if (!check_mac (mac, ARPHRD_ETHER, "mac", error)) - goto cleanup_wired; - if (!check_mac (cloned_mac, ARPHRD_ETHER, "cloned-mac", error)) - goto cleanup_wired; - - /* Add ethernet setting */ - s_wired = (NMSettingWired *) nm_setting_wired_new (); - nm_connection_add_setting (connection, NM_SETTING (s_wired)); - - if (mtu) - g_object_set (s_wired, NM_SETTING_WIRED_MTU, mtu_int, NULL); - if (mac) - g_object_set (s_wired, NM_SETTING_WIRED_MAC_ADDRESS, mac, NULL); - if (cloned_mac) - g_object_set (s_wired, NM_SETTING_WIRED_CLONED_MAC_ADDRESS, cloned_mac, NULL); - - success = TRUE; -cleanup_wired: - g_free (mtu); - g_free (mac); - g_free (cloned_mac); - if (!success) - return FALSE; - - } else if (!strcmp (con_type, NM_SETTING_INFINIBAND_SETTING_NAME)) { - /* Build up the settings required for 'infiniband' */ - gboolean success = FALSE; - const char *mtu_c = NULL; - char *mtu = NULL; - guint32 mtu_int = 0; - const char *mac_c = NULL; - char *mac = NULL; - const char *mode_c = NULL; - char *mode = NULL; - const char *parent_c = NULL; - char *parent = NULL; - const char *p_key_c = NULL; - char *p_key = NULL; - guint32 p_key_int = 0; - nmc_arg_t exp_args[] = { {"mtu", TRUE, &mtu_c, FALSE}, - {"mac", TRUE, &mac_c, FALSE}, - {"transport-mode", TRUE, &mode_c, FALSE}, - {"parent", TRUE, &parent_c, FALSE}, - {"p-key", TRUE, &p_key_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - /* Also ask for all optional arguments if '--ask' is specified. */ - mtu = g_strdup (mtu_c); - mac = g_strdup (mac_c); - mode = g_strdup (mode_c); - parent = g_strdup (parent_c); - p_key = g_strdup (p_key_c); - if (ask) - do_questionnaire_infiniband (&mtu, &mac, &mode, &parent, &p_key); - - if (!check_and_convert_mtu (mtu, &mtu_int, error)) - goto cleanup_ib; - if (!check_mac (mac, ARPHRD_INFINIBAND, "mac", error)) - goto cleanup_ib; - if (!check_infiniband_mode (&mode, error)) - goto cleanup_ib; - if (p_key) { - if (!check_infiniband_p_key (p_key, &p_key_int, error)) - goto cleanup_ib; - if (!check_infiniband_parent (parent, error)) - goto cleanup_ib; - } else if (parent) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'parent': not valid without 'p-key'.")); - goto cleanup_ib; - } - - /* Add 'infiniband' setting */ - s_infiniband = (NMSettingInfiniband *) nm_setting_infiniband_new (); - nm_connection_add_setting (connection, NM_SETTING (s_infiniband)); - - g_object_set (s_infiniband, NM_SETTING_INFINIBAND_TRANSPORT_MODE, mode ? mode : "datagram", NULL); - if (mtu) - g_object_set (s_infiniband, NM_SETTING_INFINIBAND_MTU, mtu_int, NULL); - if (mac) - g_object_set (s_infiniband, NM_SETTING_INFINIBAND_MAC_ADDRESS, mac, NULL); - if (p_key) - g_object_set (s_infiniband, NM_SETTING_INFINIBAND_P_KEY, p_key_int, NULL); - if (parent) - g_object_set (s_infiniband, NM_SETTING_INFINIBAND_PARENT, parent, NULL); - - - success = TRUE; -cleanup_ib: - g_free (mtu); - g_free (mac); - g_free (mode); - g_free (parent); - g_free (p_key); - if (!success) - return FALSE; - - } else if (!strcmp (con_type, NM_SETTING_WIRELESS_SETTING_NAME)) { - /* Build up the settings required for 'wifi' */ - gboolean success = FALSE; - char *ssid_ask = NULL; - const char *ssid = NULL; - GBytes *ssid_bytes; - const char *mtu_c = NULL; - char *mtu = NULL; - guint32 mtu_int = 0; - const char *mac_c = NULL; - char *mac = NULL; - const char *cloned_mac_c = NULL; - char *cloned_mac = NULL; - const char *mode_c = NULL; - char *mode = NULL; - nmc_arg_t exp_args[] = { {"ssid", TRUE, &ssid, !ask}, - {"mtu", TRUE, &mtu_c, FALSE}, - {"mac", TRUE, &mac_c, FALSE}, - {"cloned-mac", TRUE, &cloned_mac_c, FALSE}, - {"mode", TRUE, &mode_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - if (!ssid && ask) - ssid = ssid_ask = nmc_readline (_("SSID: ")); - if (!ssid) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'ssid' is required.")); - return FALSE; - } - - /* Also ask for all optional arguments if '--ask' is specified. */ - mtu = g_strdup (mtu_c); - mac = g_strdup (mac_c); - cloned_mac = g_strdup (cloned_mac_c); - mode = g_strdup (mode_c); - if (ask) - do_questionnaire_wifi (&mtu, &mac, &cloned_mac, &mode); - - if (!check_and_convert_mtu (mtu, &mtu_int, error)) - goto cleanup_wifi; - if (!check_mac (mac, ARPHRD_ETHER, "mac", error)) - goto cleanup_wifi; - if (!check_mac (cloned_mac, ARPHRD_ETHER, "cloned-mac", error)) - goto cleanup_wifi; - if (!check_wifi_mode (&mode, error)) - goto cleanup_wifi; - - /* Add wifi setting */ - s_wifi = (NMSettingWireless *) nm_setting_wireless_new (); - nm_connection_add_setting (connection, NM_SETTING (s_wifi)); - - ssid_bytes = g_bytes_new (ssid, strlen (ssid)); - g_object_set (s_wifi, NM_SETTING_WIRELESS_SSID, ssid_bytes, NULL); - - if (mtu) - g_object_set (s_wifi, NM_SETTING_WIRELESS_MTU, mtu_int, NULL); - if (mac) - g_object_set (s_wifi, NM_SETTING_WIRELESS_MAC_ADDRESS, mac, NULL); - if (cloned_mac) - g_object_set (s_wifi, NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, cloned_mac, NULL); - if (mode) - g_object_set (s_wifi, NM_SETTING_WIRELESS_MODE, mode, NULL); - - g_bytes_unref (ssid_bytes); - - success = TRUE; -cleanup_wifi: - g_free (ssid_ask); - g_free (mtu); - g_free (mac); - g_free (cloned_mac); - g_free (mode); - if (!success) - return FALSE; - - } else if (!strcmp (con_type, NM_SETTING_WIMAX_SETTING_NAME)) { - /* Build up the settings required for 'wimax' */ - gboolean success = FALSE; - const char *nsp_name = NULL; - char *nsp_name_ask = NULL; - const char *mac_c = NULL; - char *mac = NULL; - nmc_arg_t exp_args[] = { {"nsp", TRUE, &nsp_name, !ask}, - {"mac", TRUE, &mac_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - if (!nsp_name && ask) - nsp_name = nsp_name_ask = nmc_readline (_("WiMAX NSP name: ")); - if (!nsp_name) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'nsp' is required.")); - goto cleanup_wimax; - } - - /* Also ask for all optional arguments if '--ask' is specified. */ - mac = g_strdup (mac_c); - if (ask) - do_questionnaire_wimax (&mac); - - if (!check_mac (mac, ARPHRD_ETHER, "mac", error)) - goto cleanup_wimax; - - /* Add 'wimax' setting */ - s_wimax = (NMSettingWimax *) nm_setting_wimax_new (); - nm_connection_add_setting (connection, NM_SETTING (s_wimax)); - g_object_set (s_wimax, NM_SETTING_WIMAX_NETWORK_NAME, nsp_name, NULL); - - if (mac) - g_object_set (s_wimax, NM_SETTING_WIMAX_MAC_ADDRESS, mac, NULL); - - success = TRUE; -cleanup_wimax: - g_free (nsp_name_ask); - g_free (mac); - if (!success) - return FALSE; - - } else if (!strcmp (con_type, NM_SETTING_PPPOE_SETTING_NAME)) { - /* Build up the settings required for 'pppoe' */ - gboolean success = FALSE; - const char *username = NULL; - char *username_ask = NULL; - const char *password_c = NULL; - char *password = NULL; - const char *service_c = NULL; - char *service = NULL; - const char *mtu_c = NULL; - char *mtu = NULL; - guint32 mtu_int = 0; - const char *mac_c = NULL; - char *mac = NULL; - nmc_arg_t exp_args[] = { {"username", TRUE, &username, !ask}, - {"password", TRUE, &password_c, FALSE}, - {"service", TRUE, &service_c, FALSE}, - {"mtu", TRUE, &mtu_c, FALSE}, - {"mac", TRUE, &mac_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - if (!username && ask) - username = username_ask = nmc_readline (_("PPPoE username: ")); - if (!username) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'username' is required.")); - goto cleanup_pppoe; - } - - /* Also ask for all optional arguments if '--ask' is specified. */ - password = g_strdup (password_c); - service = g_strdup (service_c); - mtu = g_strdup (mtu_c); - mac = g_strdup (mac_c); - if (ask) - do_questionnaire_pppoe (show_secrets, &password, &service, &mtu, &mac); - - if (!check_and_convert_mtu (mtu, &mtu_int, error)) - goto cleanup_pppoe; - if (!check_mac (mac, ARPHRD_ETHER, "mac", error)) - goto cleanup_pppoe; - - /* Add 'pppoe' setting */ - s_pppoe = (NMSettingPppoe *) nm_setting_pppoe_new (); - nm_connection_add_setting (connection, NM_SETTING (s_pppoe)); - g_object_set (s_pppoe, NM_SETTING_PPPOE_USERNAME, username, NULL); - g_object_set (s_pppoe, NM_SETTING_PPPOE_PASSWORD, password, NULL); - g_object_set (s_pppoe, NM_SETTING_PPPOE_SERVICE, service, NULL); - - /* Add ethernet setting */ - s_wired = (NMSettingWired *) nm_setting_wired_new (); - nm_connection_add_setting (connection, NM_SETTING (s_wired)); - if (mtu) - g_object_set (s_wired, NM_SETTING_WIRED_MTU, mtu_int, NULL); - if (mac) - g_object_set (s_wired, NM_SETTING_WIRED_MAC_ADDRESS, mac, NULL); - - success = TRUE; -cleanup_pppoe: - g_free (username_ask); - g_free (password); - g_free (service); - g_free (mtu); - g_free (mac); - if (!success) - return FALSE; - - } else if ( !strcmp (con_type, NM_SETTING_GSM_SETTING_NAME) - || !strcmp (con_type, NM_SETTING_CDMA_SETTING_NAME)) { - /* Build up the settings required for 'gsm' or 'cdma' mobile broadband */ - gboolean success = FALSE; - const char *apn = NULL; - char *apn_ask = NULL; - const char *user_c = NULL; - char *user = NULL; - const char *password_c = NULL; - char *password = NULL; - gboolean is_gsm; - int i = 0; - nmc_arg_t gsm_args[] = { {NULL}, {NULL}, {NULL}, /* placeholders */ - {NULL} }; - - is_gsm = !strcmp (con_type, NM_SETTING_GSM_SETTING_NAME); - - if (is_gsm) - gsm_args[i++] = (nmc_arg_t) {"apn", TRUE, &apn, !ask}; - gsm_args[i++] = (nmc_arg_t) {"user", TRUE, &user_c, FALSE}; - gsm_args[i++] = (nmc_arg_t) {"password", TRUE, &password_c, FALSE}; - gsm_args[i++] = (nmc_arg_t) {NULL}; - - if (!nmc_parse_args (gsm_args, FALSE, &argc, &argv, error)) - return FALSE; - - if (!apn && ask && is_gsm) - apn = apn_ask = nmc_readline (_("APN: ")); - if (!apn && is_gsm) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'apn' is required.")); - goto cleanup_mobile; - } - - /* Also ask for all optional arguments if '--ask' is specified. */ - user = g_strdup (user_c); - password = g_strdup (password_c); - if (ask) - do_questionnaire_mobile (show_secrets, &user, &password); - - if (is_gsm) { - g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, NM_SETTING_GSM_SETTING_NAME, NULL); - - /* Add 'gsm' setting */ - s_gsm = (NMSettingGsm *) nm_setting_gsm_new (); - nm_connection_add_setting (connection, NM_SETTING (s_gsm)); - g_object_set (s_gsm, - NM_SETTING_GSM_NUMBER, "*99#", - NM_SETTING_GSM_APN, apn, - NM_SETTING_GSM_USERNAME, user, - NM_SETTING_GSM_PASSWORD, password, - NULL); - g_free (apn_ask); - } else { - g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, NM_SETTING_CDMA_SETTING_NAME, NULL); - - /* Add 'cdma' setting */ - s_cdma = (NMSettingCdma *) nm_setting_cdma_new (); - nm_connection_add_setting (connection, NM_SETTING (s_cdma)); - g_object_set (s_cdma, - NM_SETTING_CDMA_NUMBER, "#777", - NM_SETTING_CDMA_USERNAME, user, - NM_SETTING_CDMA_PASSWORD, password, - NULL); - } - - success = TRUE; -cleanup_mobile: - g_free (user); - g_free (password); - if (!success) - return FALSE; - - } else if (!strcmp (con_type, NM_SETTING_BLUETOOTH_SETTING_NAME)) { - /* Build up the settings required for 'bluetooth' */ - gboolean success = FALSE; - const char *addr = NULL; - char *addr_ask = NULL; - const char *bt_type_c = NULL; - char *bt_type = NULL; - nmc_arg_t exp_args[] = { {"addr", TRUE, &addr, !ask}, - {"bt-type", TRUE, &bt_type_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - if (!addr && ask) - addr = addr_ask = nmc_readline (_("Bluetooth device address: ")); - if (!addr) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'addr' is required.")); - return FALSE; - } - if (!check_mac (addr, ARPHRD_ETHER, "addr", error)) - goto cleanup_bt; - - /* Also ask for all optional arguments if '--ask' is specified. */ - bt_type = g_strdup (bt_type_c); - if (ask) - do_questionnaire_bluetooth (&bt_type); - - /* Default to 'panu' if bt-type is not provided. */ - if (!bt_type) - bt_type = g_strdup (NM_SETTING_BLUETOOTH_TYPE_PANU); - - /* Add 'bluetooth' setting */ - s_bt = (NMSettingBluetooth *) nm_setting_bluetooth_new (); - nm_connection_add_setting (connection, NM_SETTING (s_bt)); - - if (addr) - g_object_set (s_bt, NM_SETTING_BLUETOOTH_BDADDR, addr, NULL); - - /* 'dun' type requires adding 'gsm' or 'cdma' setting */ - if ( !strcmp (bt_type, NM_SETTING_BLUETOOTH_TYPE_DUN) - || !strcmp (bt_type, NM_SETTING_BLUETOOTH_TYPE_DUN"-gsm")) { - bt_type = g_strdup (NM_SETTING_BLUETOOTH_TYPE_DUN); - s_gsm = (NMSettingGsm *) nm_setting_gsm_new (); - nm_connection_add_setting (connection, NM_SETTING (s_gsm)); - g_object_set (s_gsm, NM_SETTING_GSM_NUMBER, "*99#", NULL); -// g_object_set (s_gsm, NM_SETTING_GSM_APN, "FIXME", NULL; - - } else if (!strcmp (bt_type, NM_SETTING_BLUETOOTH_TYPE_DUN"-cdma")) { - bt_type = g_strdup (NM_SETTING_BLUETOOTH_TYPE_DUN); - s_cdma = (NMSettingCdma *) nm_setting_cdma_new (); - nm_connection_add_setting (connection, NM_SETTING (s_cdma)); - g_object_set (s_cdma, NM_SETTING_CDMA_NUMBER, "#777", NULL); - - } else if (!strcmp (bt_type, NM_SETTING_BLUETOOTH_TYPE_PANU)) { - /* no op */ - } else { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."), - bt_type, NM_SETTING_BLUETOOTH_TYPE_PANU, NM_SETTING_BLUETOOTH_TYPE_DUN, - NM_SETTING_BLUETOOTH_TYPE_DUN"-gsm", NM_SETTING_BLUETOOTH_TYPE_DUN"-cdma"); - goto cleanup_bt; - } - g_object_set (s_bt, NM_SETTING_BLUETOOTH_TYPE, bt_type, NULL); - - success = TRUE; -cleanup_bt: - g_free (addr_ask); - g_free (bt_type); - if (!success) - return FALSE; - - } else if (!strcmp (con_type, NM_SETTING_VLAN_SETTING_NAME)) { - /* Build up the settings required for 'vlan' */ - gboolean success = FALSE; - const char *parent = NULL; - char *parent_ask = NULL; - const char *vlan_id = NULL; - char *vlan_id_ask = NULL; - unsigned long id = 0; - const char *flags_c = NULL; - char *flags = NULL; - guint32 flags_int = 0; - const char *ingress_c = NULL, *egress_c = NULL; - char *ingress = NULL, *egress = NULL; - char **ingress_arr = NULL, **egress_arr = NULL, **p; - const char *mtu_c = NULL; - char *mtu = NULL; - guint32 mtu_int; - gboolean valid_mac = FALSE; - nmc_arg_t exp_args[] = { {"dev", TRUE, &parent, !ask}, - {"id", TRUE, &vlan_id, !ask}, - {"flags", TRUE, &flags_c, FALSE}, - {"ingress", TRUE, &ingress_c, FALSE}, - {"egress", TRUE, &egress_c, FALSE}, - {"mtu", TRUE, &mtu_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - if (!parent && ask) - parent = parent_ask = nmc_readline (_("VLAN parent device or connection UUID: ")); - if (!parent) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'dev' is required.")); - return FALSE; - } - if (!vlan_id && ask) - vlan_id = vlan_id_ask = nmc_readline (_("VLAN ID <0-4094>: ")); - if (!vlan_id) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'id' is required.")); - goto cleanup_vlan; - } - if (vlan_id) { - if (!nmc_string_to_uint (vlan_id, TRUE, 0, 4094, &id)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'id': '%s' is not valid; use <0-4094>."), - vlan_id); - goto cleanup_vlan; - } - } - - if ( !(valid_mac = nm_utils_hwaddr_valid (parent, ETH_ALEN)) - && !nm_utils_is_uuid (parent) - && !nm_utils_iface_valid_name (parent)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'dev': '%s' is neither UUID, interface name, nor MAC."), - parent); - goto cleanup_vlan; - } - - /* Also ask for all optional arguments if '--ask' is specified. */ - mtu = g_strdup (mtu_c); - flags = g_strdup (flags_c); - ingress = g_strdup (ingress_c); - egress = g_strdup (egress_c); - if (ask) - do_questionnaire_vlan (&mtu, &flags, &ingress, &egress); - - if (!check_and_convert_mtu (mtu, &mtu_int, error)) - goto cleanup_vlan; - if (!check_and_convert_vlan_flags (flags, &flags_int, error)) - goto cleanup_vlan; - if (!check_and_convert_vlan_prio_maps (ingress, NM_VLAN_INGRESS_MAP, &ingress_arr, error)) - goto cleanup_vlan; - if (!check_and_convert_vlan_prio_maps (egress, NM_VLAN_EGRESS_MAP, &egress_arr, error)) - goto cleanup_vlan; - - /* Add 'vlan' setting */ - s_vlan = (NMSettingVlan *) nm_setting_vlan_new (); - nm_connection_add_setting (connection, NM_SETTING (s_vlan)); - - /* Add 'wired' setting if necessary */ - if (mtu || valid_mac) { - s_wired = (NMSettingWired *) nm_setting_wired_new (); - nm_connection_add_setting (connection, NM_SETTING (s_wired)); - - if (mtu) - g_object_set (s_wired, NM_SETTING_WIRED_MTU, mtu_int, NULL); - if (valid_mac) - g_object_set (s_wired, NM_SETTING_WIRED_MAC_ADDRESS, parent, NULL); - } - - /* Set 'vlan' properties */ - if (!valid_mac) - g_object_set (s_vlan, NM_SETTING_VLAN_PARENT, parent, NULL); - - g_object_set (s_vlan, NM_SETTING_VLAN_ID, id, NULL); - - if (flags) - g_object_set (s_vlan, NM_SETTING_VLAN_FLAGS, flags_int, NULL); - for (p = ingress_arr; p && *p; p++) - nm_setting_vlan_add_priority_str (s_vlan, NM_VLAN_INGRESS_MAP, *p); - for (p = egress_arr; p && *p; p++) - nm_setting_vlan_add_priority_str (s_vlan, NM_VLAN_EGRESS_MAP, *p); - - success = TRUE; -cleanup_vlan: - g_free (mtu); - g_free (flags); - g_free (ingress); - g_free (egress); - g_free (parent_ask); - g_free (vlan_id_ask); - g_strfreev (ingress_arr); - g_strfreev (egress_arr); - if (!success) - return FALSE; - - } else if (!strcmp (con_type, NM_SETTING_BOND_SETTING_NAME)) { - /* Build up the settings required for 'bond' */ - gboolean success = FALSE; - const char *ifname = NULL; - const char *bond_mode_c = NULL; - char *bond_mode = NULL; - const char *bond_primary_c = NULL; - char *bond_primary = NULL; - const char *bond_miimon_c = NULL; - char *bond_miimon = NULL; - const char *bond_downdelay_c = NULL; - char *bond_downdelay = NULL; - const char *bond_updelay_c = NULL; - char *bond_updelay = NULL; - const char *bond_arpinterval_c = NULL; - char *bond_arpinterval = NULL; - const char *bond_arpiptarget_c = NULL; - char *bond_arpiptarget = NULL; - const char *bond_lacp_rate_c = NULL; - char *bond_lacp_rate = NULL; - nmc_arg_t exp_args[] = { {"mode", TRUE, &bond_mode_c, FALSE}, - {"primary", TRUE, &bond_primary_c, FALSE}, - {"miimon", TRUE, &bond_miimon_c, FALSE}, - {"downdelay", TRUE, &bond_downdelay_c, FALSE}, - {"updelay", TRUE, &bond_updelay_c, FALSE}, - {"arp-interval", TRUE, &bond_arpinterval_c, FALSE}, - {"arp-ip-target", TRUE, &bond_arpiptarget_c, FALSE}, - {"lacp-rate", TRUE, &bond_lacp_rate_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - /* Also ask for all optional arguments if '--ask' is specified. */ - bond_mode = g_strdup (bond_mode_c); - bond_primary = g_strdup (bond_primary_c); - bond_miimon = g_strdup (bond_miimon_c); - bond_downdelay = g_strdup (bond_downdelay_c); - bond_updelay = g_strdup (bond_updelay_c); - bond_arpinterval = g_strdup (bond_arpinterval_c); - bond_arpiptarget = g_strdup (bond_arpiptarget_c); - bond_lacp_rate = g_strdup (bond_lacp_rate_c); - if (ask) - do_questionnaire_bond (&bond_mode, &bond_primary, &bond_miimon, - &bond_downdelay, &bond_updelay, - &bond_arpinterval, &bond_arpiptarget, - &bond_lacp_rate); - - /* Generate ifname if connection doesn't have one */ - ifname = nm_setting_connection_get_interface_name (s_con); - if (!ifname) { - char *bond_ifname = unique_master_iface_ifname (all_connections, "nm-bond"); - - g_object_set (s_con, - NM_SETTING_CONNECTION_INTERFACE_NAME, bond_ifname, - NULL); - g_free (bond_ifname); - } - - /* Add 'bond' setting */ - s_bond = (NMSettingBond *) nm_setting_bond_new (); - nm_connection_add_setting (connection, NM_SETTING (s_bond)); - - /* Set bond options */ - if (bond_mode) { - GError *err = NULL; - const char *bm; - if (!(bm = nmc_bond_validate_mode (bond_mode, &err))) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'mode': %s."), err->message); - g_clear_error (&err); - goto cleanup_bond; - } - nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_MODE, bm); - } - if (bond_primary) { - if (!nm_utils_iface_valid_name (bond_primary)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'primary': '%s' is not a valid interface name."), - bond_primary); - goto cleanup_bond; - } - nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_PRIMARY, bond_primary); - } - if (bond_miimon) - nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_MIIMON, bond_miimon); - if (bond_downdelay && strcmp (bond_downdelay, "0") != 0) - nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_DOWNDELAY, bond_downdelay); - if (bond_updelay && strcmp (bond_updelay, "0") != 0) - nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_UPDELAY, bond_updelay); - if (bond_arpinterval && strcmp (bond_arpinterval, "0") != 0) - nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_ARP_INTERVAL, bond_arpinterval); - if (bond_arpiptarget) - nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_ARP_IP_TARGET, bond_arpiptarget); - if (bond_lacp_rate) - nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_LACP_RATE, bond_lacp_rate); - - success = TRUE; -cleanup_bond: - g_free (bond_mode); - g_free (bond_primary); - g_free (bond_miimon); - g_free (bond_downdelay); - g_free (bond_updelay); - g_free (bond_arpinterval); - g_free (bond_arpiptarget); - g_free (bond_lacp_rate); - if (!success) - return FALSE; - - } else if (!strcmp (con_type, "bond-slave")) { - /* Slave types without any specific settings ('bond-slave') */ - const char *master = NULL; - const char *type = NULL; - nmc_arg_t exp_args[] = { {"master", TRUE, &master, FALSE}, - {"type", TRUE, &type, FALSE}, - {NULL} }; - - /* Set global variables for use in TAB completion */ - nmc_tab_completion.con_type = NM_SETTING_BOND_SETTING_NAME; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - if (!complete_slave (s_con, all_connections, NM_SETTING_BOND_SETTING_NAME, master, type, ask, error)) - return FALSE; - - /* Change properties in 'connection' setting */ - g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, NULL); - - /* Add ethernet setting */ - s_wired = (NMSettingWired *) nm_setting_wired_new (); - nm_connection_add_setting (connection, NM_SETTING (s_wired)); - - } else if (!strcmp (con_type, NM_SETTING_TEAM_SETTING_NAME)) { - /* Build up the settings required for 'team' */ - gboolean success = FALSE; - const char *ifname = NULL; - const char *config_c = NULL; - char *config = NULL; - char *json = NULL; - nmc_arg_t exp_args[] = { {"config", TRUE, &config_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - /* Also ask for all optional arguments if '--ask' is specified. */ - config = g_strdup (config_c); - if (ask) - do_questionnaire_team (&config); - - /* Generate ifname if conneciton doesn't have one */ - ifname = nm_setting_connection_get_interface_name (s_con); - if (!ifname) { - char *team_ifname = unique_master_iface_ifname (all_connections, "nm-team"); + const char *words[] = { "miimon", "arp", NULL }; + return nmc_rl_gen_func_basic (text, state, words); +} - g_object_set (s_con, - NM_SETTING_CONNECTION_INTERFACE_NAME, team_ifname, - NULL); - g_free (team_ifname); - } +static char * +gen_func_adsl_proto (const char *text, int state) +{ + const char *words[] = { "pppoe", "pppoa", "ipoatm", NULL }; + return nmc_rl_gen_func_basic (text, state, words); +} - /* Add 'team' setting */ - s_team = (NMSettingTeam *) nm_setting_team_new (); - nm_connection_add_setting (connection, NM_SETTING (s_team)); +static char * +gen_func_adsl_encap (const char *text, int state) +{ + const char *words[] = { "vcmux", "llc", NULL }; + return nmc_rl_gen_func_basic (text, state, words); +} - if (!nmc_team_check_config (config, &json, error)) { - g_prefix_error (error, _("Error: ")); - goto cleanup_team; - } +static char * +gen_func_tun_mode (const char *text, int state) +{ + const char *words[] = { "tun", "tap", NULL }; + return nmc_rl_gen_func_basic (text, state, words); +} - /* Set team options */ - g_object_set (s_team, NM_SETTING_TEAM_CONFIG, json, NULL); +static char * +gen_func_ip_tunnel_mode (const char *text, int state) +{ + gs_free const char **words = NULL; - success = TRUE; -cleanup_team: - g_free (config); - g_free (json); - if (!success) - return FALSE; + words = nm_utils_enum_get_values (nm_ip_tunnel_mode_get_type (), + NM_IP_TUNNEL_MODE_UNKNOWN + 1, + G_MAXINT); + return nmc_rl_gen_func_basic (text, state, words); +} - } else if (!strcmp (con_type, "team-slave")) { - /* Build up the settings required for 'team-slave' */ - gboolean success = FALSE; - const char *master = NULL; - char *master_ask = NULL; - const char *type = NULL; - const char *config_c = NULL; - char *config = NULL; - char *json = NULL; - nmc_arg_t exp_args[] = { {"master", TRUE, &master, FALSE}, - {"type", TRUE, &type, FALSE}, - {"config", TRUE, &config_c, FALSE}, - {NULL} }; - - /* Set global variables for use in TAB completion */ - nmc_tab_completion.con_type = NM_SETTING_TEAM_SETTING_NAME; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; +static char * +gen_func_macvlan_mode (const char *text, int state) +{ + gs_free const char **words = NULL; - if (!complete_slave (s_con, all_connections, NM_SETTING_TEAM_SETTING_NAME, master, type, ask, error)) - return FALSE; + words = nm_utils_enum_get_values (nm_setting_macvlan_mode_get_type(), + NM_SETTING_MACVLAN_MODE_UNKNOWN + 1, + G_MAXINT); + return nmc_rl_gen_func_basic (text, state, words); +} - /* Also ask for all optional arguments if '--ask' is specified. */ - config = g_strdup (config_c); - if (ask) - do_questionnaire_team_slave (&config); +static char * +gen_func_master_ifnames (const char *text, int state) +{ + int i; + GPtrArray *ifnames; + char *ret; + NMConnection *con; + NMSettingConnection *s_con; + const char *con_type, *ifname; - /* Add 'team-port' setting */ - s_team_port = (NMSettingTeamPort *) nm_setting_team_port_new (); - nm_connection_add_setting (connection, NM_SETTING (s_team_port)); + if (!nm_cli.connections) + return NULL; - if (!nmc_team_check_config (config, &json, error)) { - g_prefix_error (error, _("Error: ")); - goto cleanup_team_slave; - } + /* Disable appending space after completion */ + rl_completion_append_character = '\0'; - /* Set team-port options */ - g_object_set (s_team_port, NM_SETTING_TEAM_PORT_CONFIG, json, NULL); + ifnames = g_ptr_array_sized_new (20); + for (i = 0; i < nm_cli.connections->len; i++) { + con = NM_CONNECTION (nm_cli.connections->pdata[i]); + s_con = nm_connection_get_setting_connection (con); + g_assert (s_con); + con_type = nm_setting_connection_get_connection_type (s_con); + if (g_strcmp0 (con_type, nmc_tab_completion.con_type) != 0) + continue; + ifname = nm_connection_get_interface_name (con); + g_ptr_array_add (ifnames, (gpointer) ifname); + } + g_ptr_array_add (ifnames, (gpointer) NULL); - success = TRUE; -cleanup_team_slave: - g_free (master_ask); - g_free (config); - g_free (json); - if (!success) - return FALSE; + ret = nmc_rl_gen_func_basic (text, state, (const char **) ifnames->pdata); - /* Change properties in 'connection' setting */ - g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, NULL); - - /* Add ethernet setting */ - s_wired = (NMSettingWired *) nm_setting_wired_new (); - nm_connection_add_setting (connection, NM_SETTING (s_wired)); - - } else if (!strcmp (con_type, NM_SETTING_BRIDGE_SETTING_NAME)) { - /* Build up the settings required for 'bridge' */ - gboolean success = FALSE; - const char *ifname = NULL; - const char *stp_c = NULL; - char *stp = NULL; - const char *priority_c = NULL; - char *priority = NULL; - const char *fwd_delay_c = NULL; - char *fwd_delay = NULL; - const char *hello_time_c = NULL; - char *hello_time = NULL; - const char *max_age_c = NULL; - char *max_age = NULL; - const char *ageing_time_c = NULL; - char *ageing_time = NULL; - const char *mcast_snoop_c = NULL; - char *mcast_snoop = NULL; - gboolean stp_bool, mcast_snoop_bool; - unsigned long stp_prio_int, fwd_delay_int, hello_time_int, - max_age_int, ageing_time_int; - const char *mac_c = NULL; - char *mac = NULL; - nmc_arg_t exp_args[] = { {"stp", TRUE, &stp_c, FALSE}, - {"priority", TRUE, &priority_c, FALSE}, - {"forward-delay", TRUE, &fwd_delay_c, FALSE}, - {"hello-time", TRUE, &hello_time_c, FALSE}, - {"max-age", TRUE, &max_age_c, FALSE}, - {"ageing-time", TRUE, &ageing_time_c, FALSE}, - {"multicast-snooping", TRUE, &mcast_snoop_c, FALSE}, - {"mac", TRUE, &mac_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; + g_ptr_array_free (ifnames, TRUE); + return ret; +} - /* Also ask for all optional arguments if '--ask' is specified. */ - stp = g_strdup (stp_c); - priority = g_strdup (priority_c); - fwd_delay = g_strdup (fwd_delay_c); - hello_time = g_strdup (hello_time_c); - max_age = g_strdup (max_age_c); - ageing_time = g_strdup (ageing_time_c); - mcast_snoop = g_strdup (mcast_snoop_c); - mac = g_strdup (mac_c); - if (ask) - do_questionnaire_bridge (&stp, &priority, &fwd_delay, &hello_time, - &max_age, &ageing_time, &mcast_snoop, &mac); - - /* Generate ifname if conneciton doesn't have one */ - ifname = nm_setting_connection_get_interface_name (s_con); - if (!ifname) { - char *bridge_ifname = unique_master_iface_ifname (all_connections, "nm-bridge"); - - g_object_set (s_con, - NM_SETTING_CONNECTION_INTERFACE_NAME, bridge_ifname, - NULL); - g_free (bridge_ifname); - } - if (stp) { - GError *tmp_err = NULL; - if (!nmc_string_to_bool (stp, &stp_bool, &tmp_err)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'stp': %s."), tmp_err->message); - g_clear_error (&tmp_err); - goto cleanup_bridge; - } - } - if (mcast_snoop) { - GError *tmp_err = NULL; - if (!nmc_string_to_bool (mcast_snoop, &mcast_snoop_bool, &tmp_err)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'multicast-snooping': %s."), tmp_err->message); - g_clear_error (&tmp_err); - goto cleanup_bridge; - } - } +/*----------------------------------------------------------------------------*/ - /* Add 'bond' setting */ - /* Must be done *before* bridge_prop_string_to_uint() so that the type is known */ - s_bridge = (NMSettingBridge *) nm_setting_bridge_new (); - nm_connection_add_setting (connection, NM_SETTING (s_bridge)); - - if (priority) - if (!bridge_prop_string_to_uint (priority, "priority", NM_TYPE_SETTING_BRIDGE, - NM_SETTING_BRIDGE_PRIORITY, &stp_prio_int, error)) - goto cleanup_bridge; - if (fwd_delay) - if (!bridge_prop_string_to_uint (fwd_delay, "forward-delay", NM_TYPE_SETTING_BRIDGE, - NM_SETTING_BRIDGE_FORWARD_DELAY, &fwd_delay_int, error)) - goto cleanup_bridge; - if (hello_time) - if (!bridge_prop_string_to_uint (hello_time, "hello-time", NM_TYPE_SETTING_BRIDGE, - NM_SETTING_BRIDGE_HELLO_TIME, &hello_time_int, error)) - goto cleanup_bridge; - if (max_age) - if (!bridge_prop_string_to_uint (max_age, "max-age", NM_TYPE_SETTING_BRIDGE, - NM_SETTING_BRIDGE_MAX_AGE, &max_age_int, error)) - goto cleanup_bridge; - if (ageing_time) - if (!bridge_prop_string_to_uint (ageing_time, "ageing-time", NM_TYPE_SETTING_BRIDGE, - NM_SETTING_BRIDGE_AGEING_TIME, &ageing_time_int, error)) - goto cleanup_bridge; - if (!check_mac (mac, ARPHRD_ETHER, "mac", error)) - goto cleanup_bridge; - - /* Set bridge options */ - if (stp) - g_object_set (s_bridge, NM_SETTING_BRIDGE_STP, stp_bool, NULL); - if (priority) - g_object_set (s_bridge, NM_SETTING_BRIDGE_PRIORITY, stp_prio_int, NULL); - if (fwd_delay) - g_object_set (s_bridge, NM_SETTING_BRIDGE_FORWARD_DELAY, fwd_delay_int, NULL); - if (hello_time) - g_object_set (s_bridge, NM_SETTING_BRIDGE_HELLO_TIME, hello_time_int, NULL); - if (max_age) - g_object_set (s_bridge, NM_SETTING_BRIDGE_MAX_AGE, max_age_int, NULL); - if (ageing_time) - g_object_set (s_bridge, NM_SETTING_BRIDGE_AGEING_TIME, ageing_time_int, NULL); - if (mcast_snoop) - g_object_set (s_bridge, NM_SETTING_BRIDGE_MULTICAST_SNOOPING, mcast_snoop_bool, NULL); - if (mac) - g_object_set (s_bridge, NM_SETTING_BRIDGE_MAC_ADDRESS, mac, NULL); - - success = TRUE; -cleanup_bridge: - g_free (stp); - g_free (priority); - g_free (fwd_delay); - g_free (hello_time); - g_free (max_age); - g_free (ageing_time); - g_free (mcast_snoop); - g_free (mac); - if (!success) - return FALSE; +static gboolean +set_connection_type (NmCli *nmc, NMConnection *con, OptionInfo *option, const char *value, GError **error) +{ + const NameItem *type_settings, *slv_settings; + GError *local = NULL; + const gchar *master[] = { "master", NULL }; - } else if (!strcmp (con_type, "bridge-slave")) { - /* Build up the settings required for 'bridge-slave' */ - gboolean success = FALSE; - const char *master = NULL; - char *master_ask = NULL; - const char *type = NULL; - const char *priority_c = NULL; - char *priority = NULL; - const char *path_cost_c = NULL; - char *path_cost = NULL; - const char *hairpin_c = NULL; - char *hairpin = NULL; - unsigned long prio_int, path_cost_int; - gboolean hairpin_bool; - nmc_arg_t exp_args[] = { {"master", TRUE, &master, FALSE}, - {"type", TRUE, &type, FALSE}, - {"priority", TRUE, &priority_c, FALSE}, - {"path-cost", TRUE, &path_cost_c, FALSE}, - {"hairpin", TRUE, &hairpin_c, FALSE}, - {NULL} }; - - /* Set global variables for use in TAB completion */ - nmc_tab_completion.con_type = NM_SETTING_BRIDGE_SETTING_NAME; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; + value = check_valid_name (value, nmc_valid_connection_types, NULL, &local); + if (!value) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: bad connection type: %s."), local->message); + g_clear_error (&local); + return FALSE; + } - if (!complete_slave (s_con, all_connections, NM_SETTING_BRIDGE_SETTING_NAME, master, type, ask, error)) + if (g_strcmp0 (value, "bond-slave") == 0) { + value = NM_SETTING_WIRED_SETTING_NAME; + if (!set_property (con, NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_BOND_SETTING_NAME, + '\0', error)) { return FALSE; - - /* Add 'bridge-port' setting */ - /* Must be done *before* bridge_prop_string_to_uint() so that the type is known */ - s_bridge_port = (NMSettingBridgePort *) nm_setting_bridge_port_new (); - nm_connection_add_setting (connection, NM_SETTING (s_bridge_port)); - - /* Also ask for all optional arguments if '--ask' is specified. */ - priority = g_strdup (priority_c); - path_cost = g_strdup (path_cost_c); - hairpin = g_strdup (hairpin_c); - if (ask) - do_questionnaire_bridge_slave (&priority, &path_cost, &hairpin); - - if (priority) - if (!bridge_prop_string_to_uint (priority, "priority", NM_TYPE_SETTING_BRIDGE_PORT, - NM_SETTING_BRIDGE_PORT_PRIORITY, &prio_int, error)) - goto cleanup_bridge_slave; - if (path_cost) - if (!bridge_prop_string_to_uint (path_cost, "path-cost", NM_TYPE_SETTING_BRIDGE_PORT, - NM_SETTING_BRIDGE_PORT_PATH_COST, &path_cost_int, error)) - goto cleanup_bridge_slave; - if (hairpin) { - GError *tmp_err = NULL; - if (!nmc_string_to_bool (hairpin, &hairpin_bool, &tmp_err)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'hairpin': %s."), tmp_err->message); - g_clear_error (&tmp_err); - goto cleanup_bridge_slave; - } } - - if (priority) - g_object_set (s_bridge_port, NM_SETTING_BRIDGE_PORT_PRIORITY, prio_int, NULL); - if (path_cost) - g_object_set (s_bridge_port, NM_SETTING_BRIDGE_PORT_PATH_COST, path_cost_int, NULL); - if (hairpin) - g_object_set (s_bridge_port, NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, hairpin_bool, NULL); - - success = TRUE; -cleanup_bridge_slave: - g_free (master_ask); - g_free (priority); - g_free (path_cost); - g_free (hairpin); - if (!success) - return FALSE; - - /* Change properties in 'connection' setting */ - g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, NULL); - - /* Add ethernet setting */ - s_wired = (NMSettingWired *) nm_setting_wired_new (); - nm_connection_add_setting (connection, NM_SETTING (s_wired)); - - } else if (!strcmp (con_type, NM_SETTING_VPN_SETTING_NAME)) { - /* Build up the settings required for 'vpn' */ - gboolean success = FALSE; - const char *vpn_type = NULL; - char *vpn_type_ask = NULL; - const char *user_c = NULL; - char *user = NULL; - const char *st; - gs_free char *service_type_free = NULL; - const char *service_type = NULL; - nmc_arg_t exp_args[] = { {"vpn-type", TRUE, &vpn_type, !ask}, - {"user", TRUE, &user_c, FALSE}, - {NULL} }; - gs_free const char **plugin_names = NULL; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) + enable_options (NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_MASTER, master); + } else if (g_strcmp0 (value, "bridge-slave") == 0) { + value = NM_SETTING_WIRED_SETTING_NAME; + if (!set_property (con, NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_BRIDGE_SETTING_NAME, + '\0', error)) { return FALSE; - - if (!vpn_type && ask) - vpn_type = vpn_type_ask = nmc_readline (PROMPT_VPN_TYPE); - if (!vpn_type) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'vpn-type' is required.")); - goto cleanup_vpn; } - if (vpn_type_ask) - vpn_type = g_strstrip (vpn_type_ask); - - plugin_names = nm_vpn_get_plugin_names (FALSE); - if (!(st = nmc_string_is_valid (vpn_type, plugin_names, NULL))) { - g_print (_("Warning: 'vpn-type': %s not known.\n"), vpn_type); - st = vpn_type; + enable_options (NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_MASTER, master); + } else if (g_strcmp0 (value, "team-slave") == 0) { + value = NM_SETTING_WIRED_SETTING_NAME; + if (!set_property (con, NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_TEAM_SETTING_NAME, + '\0', error)) { + return FALSE; } + enable_options (NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_MASTER, master); + } - service_type = nm_vpn_get_service_for_name (st); - if (!service_type) - service_type = service_type_free = nm_vpn_get_service_for_name_default (st); + /* ifname is mandatory for all connection types except virtual ones (bond, team, bridge, vlan) */ + if ( (strcmp (value, NM_SETTING_BOND_SETTING_NAME) == 0) + || (strcmp (value, NM_SETTING_TEAM_SETTING_NAME) == 0) + || (strcmp (value, NM_SETTING_BRIDGE_SETTING_NAME) == 0) + || (strcmp (value, NM_SETTING_VLAN_SETTING_NAME) == 0)) { + disable_options (NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_INTERFACE_NAME); + } - /* Also ask for all optional arguments if '--ask' is specified. */ - user = g_strdup (user_c); - if (ask) - do_questionnaire_vpn (&user); + if (!set_property (con, option->setting_name, option->property, value, '\0', error)) + return FALSE; - /* Add 'vpn' setting */ - s_vpn = (NMSettingVpn *) nm_setting_vpn_new (); - nm_connection_add_setting (connection, NM_SETTING (s_vpn)); + if (!con_settings (con, &type_settings, &slv_settings, error)) + return FALSE; - g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, service_type, NULL); - g_object_set (s_vpn, NM_SETTING_VPN_USER_NAME, user, NULL); + ensure_settings (con, slv_settings); + ensure_settings (con, type_settings); - success = TRUE; -cleanup_vpn: - g_free (vpn_type_ask); - g_free (user); - if (!success) - return FALSE; + return TRUE; +} - } else if (!strcmp (con_type, NM_SETTING_OLPC_MESH_SETTING_NAME)) { - /* Build up the settings required for 'olpc' */ - gboolean success = FALSE; - char *ssid_ask = NULL; - const char *ssid = NULL; - GBytes *ssid_bytes; - const char *channel_c = NULL; - char *channel = NULL; - unsigned long chan; - const char *dhcp_anycast_c = NULL; - char *dhcp_anycast = NULL; - nmc_arg_t exp_args[] = { {"ssid", TRUE, &ssid, !ask}, - {"channel", TRUE, &channel_c, FALSE}, - {"dhcp-anycast", TRUE, &dhcp_anycast_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) +static gboolean +set_connection_iface (NmCli *nmc, NMConnection *con, OptionInfo *option, const char *value, GError **error) +{ + if (value) { + if (!nm_utils_iface_valid_name (value) && strcmp (value, "*") != 0) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: '%s' is not a valid interface nor '*'."), + value); return FALSE; - - if (!ssid && ask) - ssid = ssid_ask = nmc_readline (_("SSID: ")); - if (!ssid) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'ssid' is required.")); - goto cleanup_olpc; } + /* Special value of '*' means no specific interface name */ + if (strcmp (value, "*") == 0) + value = NULL; + } - /* Also ask for all optional arguments if '--ask' is specified. */ - channel = g_strdup (channel_c); - dhcp_anycast = g_strdup (dhcp_anycast_c); - if (ask) - do_questionnaire_olpc (&channel, &dhcp_anycast); + return set_property (con, option->setting_name, option->property, value, '\0', error); +} - if (channel) { - if (!nmc_string_to_uint (channel, TRUE, 1, 13, &chan)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'channel': '%s' is not valid; use <1-13>."), - channel); - goto cleanup_olpc; - } - } - if (!check_mac (dhcp_anycast, ARPHRD_ETHER, "dhcp-anycast", error)) - goto cleanup_olpc; +static gboolean +set_connection_master (NmCli *nmc, NMConnection *con, OptionInfo *option, const char *value, GError **error) +{ + NMSettingConnection *s_con; + const char *slave_type; - /* Add OLPC mesh setting */ - s_olpc_mesh = (NMSettingOlpcMesh *) nm_setting_olpc_mesh_new (); - nm_connection_add_setting (connection, NM_SETTING (s_olpc_mesh)); + s_con = nm_connection_get_setting_connection (con); + g_return_val_if_fail (s_con, FALSE); - ssid_bytes = g_bytes_new (ssid, strlen (ssid)); - g_object_set (s_olpc_mesh, NM_SETTING_OLPC_MESH_SSID, ssid_bytes, NULL); - if (channel) - g_object_set (s_olpc_mesh, NM_SETTING_OLPC_MESH_CHANNEL, chan, NULL); - else - g_object_set (s_olpc_mesh, NM_SETTING_OLPC_MESH_CHANNEL, 1, NULL); - if (dhcp_anycast) - g_object_set (s_olpc_mesh, NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS, dhcp_anycast, NULL); - g_bytes_unref (ssid_bytes); - - success = TRUE; -cleanup_olpc: - g_free (ssid_ask); - g_free (channel); - g_free (dhcp_anycast); - if (!success) - return FALSE; + if (!value) { + g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: master is required")); + return FALSE; + } - } else if (!strcmp (con_type, NM_SETTING_ADSL_SETTING_NAME)) { - /* Build up the settings required for 'adsl' */ - gboolean success = FALSE; - char *username_ask = NULL; - const char *username = NULL; - char *protocol_ask = NULL, *protocol = NULL; - const char *protocol_c = NULL; - const char *password_c = NULL; - char *password = NULL; - const char *encapsulation_c = NULL; - char *encapsulation = NULL; - nmc_arg_t exp_args[] = { {"username", TRUE, &username, !ask}, - {"protocol", TRUE, &protocol_c, !ask}, - {"password", TRUE, &password_c, FALSE}, - {"encapsulation", TRUE, &encapsulation_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; + slave_type = nm_setting_connection_get_slave_type (s_con); + value = normalized_master_for_slave (nmc->connections, value, slave_type, &slave_type); - if (!username && ask) - username = username_ask = nmc_readline (_("Username: ")); - if (!username) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'username' is required.")); - goto cleanup_adsl; - } + if (!set_property (con, NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type, + '\0', error)) { + return FALSE; + } -#define PROMPT_ADSL_PROTO "(" NM_SETTING_ADSL_PROTOCOL_PPPOA "/" NM_SETTING_ADSL_PROTOCOL_PPPOE "/" NM_SETTING_ADSL_PROTOCOL_IPOATM "): " - if (!protocol_c && ask) - protocol_c = protocol_ask = nmc_readline (_("Protocol %s"), PROMPT_ADSL_PROTO); - if (!protocol_c) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'protocol' is required.")); - goto cleanup_adsl; - } - protocol = g_strdup (protocol_c); - if (!check_adsl_protocol (&protocol, error)) - goto cleanup_adsl; - - /* Also ask for all optional arguments if '--ask' is specified. */ - password = g_strdup (password_c); - encapsulation = g_strdup (encapsulation_c); - if (ask) - do_questionnaire_adsl (show_secrets, &password, &encapsulation); - - if (!check_adsl_encapsulation (&encapsulation, error)) - goto cleanup_adsl; - - /* Add ADSL setting */ - s_adsl = (NMSettingAdsl *) nm_setting_adsl_new (); - nm_connection_add_setting (connection, NM_SETTING (s_adsl)); - - g_object_set (s_adsl, - NM_SETTING_ADSL_USERNAME, username, - NM_SETTING_ADSL_PROTOCOL, protocol, - NM_SETTING_ADSL_PASSWORD, password, - NM_SETTING_ADSL_ENCAPSULATION, encapsulation, - NULL); + return set_property (con, option->setting_name, option->property, value, '\0', error); +} - success = TRUE; -cleanup_adsl: - g_free (username_ask); - g_free (password); - g_free (protocol); - g_free (protocol_ask); - g_free (encapsulation); +static gboolean +set_bond_option (NmCli *nmc, NMConnection *con, OptionInfo *option, const char *value, GError **error) +{ + NMSettingBond *s_bond; + gboolean success; - if (!success) - return FALSE; + s_bond = nm_connection_get_setting_bond (con); + g_return_val_if_fail (s_bond, FALSE); - } else if (!strcmp (con_type, NM_SETTING_MACVLAN_SETTING_NAME)) { - /* Build up the settings required for 'macvlan' */ - gboolean success = FALSE; - const char *parent = NULL; - char *parent_ask = NULL; - const char *mode = NULL; - char *mode_ask = NULL; - const char *tap_c = NULL; - char *tap = NULL; - NMSettingMacvlanMode mode_enum; - gboolean valid_mac = FALSE; - gboolean tap_bool = FALSE; - nmc_arg_t exp_args[] = { {"dev", TRUE, &parent, !ask}, - {"mode", TRUE, &mode, !ask}, - {"tap", TRUE, &tap_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; + if (!value) + return TRUE; - if (!parent && ask) - parent = parent_ask = nmc_readline (_("MACVLAN parent device or connection UUID: ")); - if (!parent) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'dev' is required.")); + if (strcmp (option->option, "mode") == 0) { + value = nmc_bond_validate_mode (value, error); + if (!value) return FALSE; - } - if ( !(valid_mac = nm_utils_hwaddr_valid (parent, ETH_ALEN)) - && !nm_utils_is_uuid (parent) - && !nm_utils_iface_valid_name (parent)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'dev': '%s' is neither UUID, interface name, nor MAC."), - parent); - goto cleanup_macvlan; - } + if (g_strcmp0 (value, "active-backup") == 0) { + const gchar *primary[] = { "primary", NULL }; + enable_options (NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, primary); + } + + success = nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_MODE, value); + } else if (strcmp (option->option, "primary") == 0) + success = nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_PRIMARY, value); + else if (strcmp (option->option, "miimon") == 0) + success = nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_MIIMON, value); + else if (strcmp (option->option, "downdelay") == 0) + success = nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_DOWNDELAY, value); + else if (strcmp (option->option, "updelay") == 0) + success = nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_UPDELAY, value); + else if (strcmp (option->option, "arp-interval") == 0) + success = nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_ARP_INTERVAL, value); + else if (strcmp (option->option, "arp-ip-target") == 0) + success = nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_ARP_IP_TARGET, value); + else if (strcmp (option->option, "lacp-rate") == 0) + success = nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_LACP_RATE, value); + else + g_return_val_if_reached (FALSE); - if (!mode && ask) - mode = mode_ask = nmc_readline (PROMPT_MACVLAN_MODE); - if (!mode) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'mode' is required.")); - return FALSE; - } + if (!success) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: error adding bond option '%s=%s'."), + option->option, value); + } - if (!nm_utils_enum_from_str (nm_setting_macvlan_mode_get_type(), mode, (int *) &mode_enum, NULL)) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'mode' is not valid.")); - return FALSE; - } + return success; +} - /* Also ask for all optional arguments if '--ask' is specified. */ - tap = g_strdup (tap_c); - if (ask) - do_questionnaire_macvlan (&tap); +static gboolean +set_bond_monitoring_mode (NmCli *nmc, NMConnection *con, OptionInfo *option, const char *value, GError **error) +{ + NMSettingBond *s_bond; + gs_free gchar *monitor_mode = NULL; + const gchar *miimon_opts[] = { "miimon", "downdelay", "updelay", NULL }; + const gchar *arp_opts[] = { "arp-interval", "arp-ip-target", NULL }; - if (tap) { - GError *tmp_err = NULL; - if (!nmc_string_to_bool (tap, &tap_bool, &tmp_err)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'tap': %s."), tmp_err->message); - g_clear_error (&tmp_err); - goto cleanup_macvlan; - } - } + s_bond = nm_connection_get_setting_bond (con); + g_return_val_if_fail (s_bond, FALSE); - /* Add 'macvlan' setting */ - s_macvlan = (NMSettingMacvlan *) nm_setting_macvlan_new (); - nm_connection_add_setting (connection, NM_SETTING (s_macvlan)); + if (value) { + monitor_mode = g_strdup (value); + g_strstrip (monitor_mode); + } else { + monitor_mode = g_strdup (WORD_MIIMON); + } - /* Add 'wired' setting if necessary */ - if (valid_mac) { - s_wired = (NMSettingWired *) nm_setting_wired_new (); - nm_connection_add_setting (connection, NM_SETTING (s_wired)); - g_object_set (s_wired, NM_SETTING_WIRED_MAC_ADDRESS, parent, NULL); - } + if (matches (monitor_mode, WORD_MIIMON) == 0) + enable_options (NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, miimon_opts); + else if (matches (monitor_mode, WORD_ARP) == 0) + 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, + _("Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"), + monitor_mode, WORD_MIIMON, WORD_ARP); + return FALSE; + } - /* Set 'macvlan' properties */ - if (!valid_mac) - g_object_set (s_macvlan, NM_SETTING_MACVLAN_PARENT, parent, NULL); - g_object_set (s_macvlan, NM_SETTING_MACVLAN_MODE, mode_enum, NULL); - g_object_set (s_macvlan, NM_SETTING_MACVLAN_TAP, tap_bool, NULL); + return TRUE; +} - success = TRUE; -cleanup_macvlan: - g_free (parent_ask); - g_free (mode_ask); - g_free (tap); +static gboolean +set_bluetooth_type (NmCli *nmc, NMConnection *con, OptionInfo *option, const char *value, GError **error) +{ + NMSetting *setting; - if (!success) - return FALSE; + if (!value) + return TRUE; - } else if (!strcmp (con_type, NM_SETTING_TUN_SETTING_NAME)) { - /* Build up the settings required for 'tun' */ - gboolean success = FALSE; - const char *mode_c = NULL; - char *mode_ask = NULL, *mode = NULL; - NMSettingTunMode mode_enum; - const char *owner_c = NULL, *group_c = NULL; - char *owner = NULL, *group = NULL; - const char *pi_c = NULL, *vnet_hdr_c = NULL, *multi_queue_c = NULL; - char *pi = NULL, *vnet_hdr = NULL, *multi_queue = NULL; - gboolean pi_bool, vnet_hdr_bool, multi_queue_bool; - nmc_arg_t exp_args[] = { {"mode", TRUE, &mode_c, !ask}, - {"owner", TRUE, &owner_c, FALSE}, - {"group", TRUE, &group_c, FALSE}, - {"pi", TRUE, &pi_c, FALSE}, - {"vnet-hdr", TRUE, &vnet_hdr_c, FALSE}, - {"multi-queue", TRUE, &multi_queue_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; + /* 'dun' type requires adding 'gsm' or 'cdma' setting */ + if ( !strcmp (value, NM_SETTING_BLUETOOTH_TYPE_DUN) + || !strcmp (value, NM_SETTING_BLUETOOTH_TYPE_DUN"-gsm")) { + value = NM_SETTING_BLUETOOTH_TYPE_DUN; + setting = nm_setting_gsm_new (); + nmc_setting_custom_init (setting); + nm_connection_add_setting (con, setting); + } else if (!strcmp (value, NM_SETTING_BLUETOOTH_TYPE_DUN"-cdma")) { + value = NM_SETTING_BLUETOOTH_TYPE_DUN; + setting = nm_setting_cdma_new (); + nm_connection_add_setting (con, setting); + } else if (!strcmp (value, NM_SETTING_BLUETOOTH_TYPE_PANU)) { + /* no op */ + } else { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."), + value, NM_SETTING_BLUETOOTH_TYPE_PANU, NM_SETTING_BLUETOOTH_TYPE_DUN, + NM_SETTING_BLUETOOTH_TYPE_DUN"-gsm", NM_SETTING_BLUETOOTH_TYPE_DUN"-cdma"); + return FALSE; + } - if (!mode_c && ask) { - mode_ask = nmc_readline (_("Mode %s"), PROMPT_TUN_MODE); - mode_ask = mode_ask ? mode_ask : g_strdup ("tun"); - mode_c = mode_ask; - } - if (!mode_c) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'mode' is required.")); - goto cleanup_tun; - } - mode = g_strdup (mode_c); - if (!check_tun_mode (&mode, error)) - goto cleanup_tun; - - if (owner && !check_user_group_id (owner, error)) - goto cleanup_tun; - if (group && !check_user_group_id (group, error)) - goto cleanup_tun; - - owner = g_strdup (owner_c); - group = g_strdup (group_c); - pi = g_strdup (pi_c); - vnet_hdr = g_strdup (vnet_hdr_c); - multi_queue = g_strdup (multi_queue_c); - if (ask) - do_questionnaire_tun (&owner, &group, &pi, &vnet_hdr, &multi_queue); - - if (pi) { - GError *tmp_err = NULL; + return set_property (con, option->setting_name, option->property, value, '\0', error); +} - if (!nmc_string_to_bool (pi, &pi_bool, &tmp_err)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'pi': %s."), tmp_err->message); - g_clear_error (&tmp_err); - goto cleanup_tun; - } - } +static gboolean +set_yes_no (NmCli *nmc, NMConnection *con, OptionInfo *option, const char *value, GError **error) +{ + if (g_strcmp0 (value, _(WORD_LOC_YES))) + value = WORD_YES; + if (g_strcmp0 (value, _(WORD_LOC_NO))) + value = WORD_NO; - if (vnet_hdr) { - GError *tmp_err = NULL; + return set_property (con, option->setting_name, option->property, value, '\0', error); +} - if (!nmc_string_to_bool (vnet_hdr, &vnet_hdr_bool, &tmp_err)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'vnet-hdr': %s."), tmp_err->message); - g_clear_error (&tmp_err); - goto cleanup_tun; - } - } +static gboolean +set_ip4_address (NmCli *nmc, NMConnection *con, OptionInfo *option, const char *value, GError **error) +{ + NMSettingIPConfig *s_ip4; - if (multi_queue) { - GError *tmp_err = NULL; + if (!value) + return TRUE; - if (!nmc_string_to_bool (multi_queue, &multi_queue_bool, &tmp_err)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'multi-queue': %s."), tmp_err->message); - g_clear_error (&tmp_err); - goto cleanup_tun; - } - } - /* Add 'tun' setting */ - s_tun = (NMSettingTun *) nm_setting_tun_new (); - nm_connection_add_setting (connection, NM_SETTING (s_tun)); - mode_enum = !strcmp (mode, "tun") ? NM_SETTING_TUN_MODE_TUN : NM_SETTING_TUN_MODE_TAP; - - g_object_set (s_tun, - NM_SETTING_TUN_MODE, mode_enum, - NM_SETTING_TUN_OWNER, owner, - NM_SETTING_TUN_GROUP, group, + s_ip4 = nm_connection_get_setting_ip4_config (con); + if (!s_ip4) { + s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new (); + nm_connection_add_setting (con, NM_SETTING (s_ip4)); + g_object_set (s_ip4, + NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL, NULL); - if (pi) - g_object_set (s_tun, NM_SETTING_TUN_PI, pi_bool, NULL); - if (vnet_hdr) - g_object_set (s_tun, NM_SETTING_TUN_VNET_HDR, vnet_hdr_bool, NULL); - if (multi_queue) - g_object_set (s_tun, NM_SETTING_TUN_MULTI_QUEUE, multi_queue_bool, NULL); - - success = TRUE; -cleanup_tun: - g_free (mode_ask); - g_free (mode); - g_free (owner); - g_free (group); - g_free (pi); - g_free (vnet_hdr); - g_free (multi_queue); - if (!success) - return FALSE; - - } else if (!strcmp (con_type, NM_SETTING_IP_TUNNEL_SETTING_NAME)) { - /* Build up the settings required for 'ip-tunnel' */ - const char *mode_c = NULL, *local_c = NULL, *remote_c = NULL; - char *mode_ask = NULL, *remote_ask = NULL, *local = NULL; - const char *parent_c = NULL; - char *parent = NULL; - gboolean success = FALSE; - NMIPTunnelMode mode_enum; - nmc_arg_t exp_args[] = { {"mode", TRUE, &mode_c, !ask}, - {"local", TRUE, &local_c, FALSE}, - {"remote", TRUE, &remote_c, !ask}, - {"dev", TRUE, &parent_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - if (!mode_c && ask) - mode_c = mode_ask = nmc_readline (PROMPT_IP_TUNNEL_MODE); - if (!mode_c) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'mode' is required.")); - goto cleanup_tunnel; - } - - if (!nm_utils_enum_from_str (nm_ip_tunnel_mode_get_type (), - mode_c, (int *) &mode_enum, NULL)) { - gs_free const char **values = NULL; - gs_free char *values_str = NULL; - - values = nm_utils_enum_get_values (nm_ip_tunnel_mode_get_type (), - NM_IP_TUNNEL_MODE_UNKNOWN + 1, - G_MAXINT); - values_str = g_strjoinv (",", (char **) values); - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'mode': '%s' is not valid, use one of %s"), - mode_c, values_str); - goto cleanup_tunnel; - } - - if (!remote_c && ask) - remote_c = remote_ask = nmc_readline (_("Remote endpoint: ")); - if (!remote_c) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'remote' is required.")); - goto cleanup_tunnel; - } + } + return set_property (con, option->setting_name, option->property, value, '\0', error); +} - if ( !nm_utils_ipaddr_valid (AF_INET, remote_c) - && !nm_utils_ipaddr_valid (AF_INET6, remote_c)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'remote': '%s' is not valid; must be an IP address"), - remote_c); - goto cleanup_tunnel; - } +static gboolean +set_ip6_address (NmCli *nmc, NMConnection *con, OptionInfo *option, const char *value, GError **error) +{ + NMSettingIPConfig *s_ip6; - local = g_strdup (local_c); - parent = g_strdup (parent_c); - if (ask) - do_questionnaire_ip_tunnel (&local, &parent); + if (!value) + return TRUE; - if ( local - && !nm_utils_ipaddr_valid (AF_INET, local) - && !nm_utils_ipaddr_valid (AF_INET6, local)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'local': '%s' is not valid; must be an IP address"), - local); - goto cleanup_tunnel; - } + s_ip6 = nm_connection_get_setting_ip6_config (con); + if (!s_ip6) { + s_ip6 = (NMSettingIPConfig *) nm_setting_ip6_config_new (); + nm_connection_add_setting (con, NM_SETTING (s_ip6)); + g_object_set (s_ip6, + NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_MANUAL, + NULL); + } + return set_property (con, option->setting_name, option->property, value, '\0', error); +} - if (parent) { - if ( !nm_utils_is_uuid (parent) - && !nm_utils_iface_valid_name (parent)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'dev': '%s' is neither UUID nor interface name."), - parent); - goto cleanup_tunnel; - } - } - /* Add 'tunnel' setting */ - s_ip_tunnel = (NMSettingIPTunnel *) nm_setting_ip_tunnel_new (); - nm_connection_add_setting (connection, NM_SETTING (s_ip_tunnel)); - - /* Set 'tunnel' properties */ - g_object_set (s_ip_tunnel, NM_SETTING_IP_TUNNEL_MODE, mode_enum, NULL); - g_object_set (s_ip_tunnel, NM_SETTING_IP_TUNNEL_REMOTE, remote_c, NULL); - if (local) - g_object_set (s_ip_tunnel, NM_SETTING_IP_TUNNEL_LOCAL, local, NULL); - if (parent) - g_object_set (s_ip_tunnel, NM_SETTING_IP_TUNNEL_PARENT, parent, NULL); - - /* Set default values for IPv6 tunnels */ - if (nm_utils_ipaddr_valid (AF_INET6, remote_c)) { - g_object_set (s_ip_tunnel, NM_SETTING_IP_TUNNEL_TOS, 64, NULL); - g_object_set (s_ip_tunnel, NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT, 4, NULL); - } +/*----------------------------------------------------------------------------*/ - success = TRUE; -cleanup_tunnel: - g_free (remote_ask); - g_free (mode_ask); - g_free (parent); - g_free (local); - if (!success) - return FALSE; +static OptionInfo option_info[] = { + { NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_TYPE, "type", OPTION_REQD, PROMPT_CON_TYPE, NULL, + set_connection_type, gen_connection_types }, + { NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_ID, "con-name", OPTION_DONT_ASK, NULL, NULL, NULL, NULL }, + { NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_AUTOCONNECT, "autoconnect", OPTION_DONT_ASK, NULL, NULL, NULL, gen_func_bool_values_l10n }, + { NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_INTERFACE_NAME, "ifname", OPTION_REQD, N_("Interface name [*]"), NULL, set_connection_iface, NULL }, + { NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_MASTER, "master", OPTION_DONT_ASK, PROMPT_MASTER, NULL, + set_connection_master, gen_func_master_ifnames }, + { NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_SLAVE_TYPE, "slave-type", OPTION_DONT_ASK, NULL, NULL, NULL, NULL }, + { NM_SETTING_PPPOE_SETTING_NAME, NM_SETTING_PPPOE_USERNAME, "username", OPTION_REQD, N_("PPPoE username"), NULL, NULL, NULL }, + { NM_SETTING_PPPOE_SETTING_NAME, NM_SETTING_PPPOE_PASSWORD, "password", OPTION_NONE, N_("Password [none]"), NULL, NULL, NULL }, + { NM_SETTING_PPPOE_SETTING_NAME, NM_SETTING_PPPOE_SERVICE, "service", OPTION_NONE, N_("Service [none]"), NULL, NULL, NULL }, + { NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU, "mtu", OPTION_NONE, N_("MTU [auto]"), NULL, NULL, NULL }, + { NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS, "mac", OPTION_NONE, N_("MAC [none]"), NULL, NULL, NULL }, + { NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_CLONED_MAC_ADDRESS, "cloned-mac", OPTION_NONE, N_("Cloned MAC [none]"), NULL, NULL, NULL }, + { NM_SETTING_INFINIBAND_SETTING_NAME, NM_SETTING_INFINIBAND_MTU, "mtu", OPTION_NONE, N_("MTU [auto]"), NULL, NULL, NULL }, + { NM_SETTING_INFINIBAND_SETTING_NAME, NM_SETTING_INFINIBAND_MAC_ADDRESS, "mac", OPTION_NONE, N_("MAC [none]"), NULL, NULL, NULL }, + { NM_SETTING_INFINIBAND_SETTING_NAME, NM_SETTING_INFINIBAND_TRANSPORT_MODE, "transport-mode", OPTION_NONE, PROMPT_IB_MODE, PROMPT_IB_MODE_CHOICES, + NULL, gen_func_ib_type }, + { NM_SETTING_INFINIBAND_SETTING_NAME, NM_SETTING_INFINIBAND_PARENT, "parent", OPTION_NONE, N_("Parent interface [none]"), NULL, NULL, NULL }, + { NM_SETTING_INFINIBAND_SETTING_NAME, NM_SETTING_INFINIBAND_P_KEY, "p-key", OPTION_NONE, N_("P_KEY [none]"), NULL, NULL, NULL }, + { NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_SSID, "ssid", OPTION_REQD, N_("SSID"), NULL, NULL, NULL }, + { NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_MODE, "mode", OPTION_NONE, PROMPT_WIFI_MODE, PROMPT_WIFI_MODE_CHOICES, + NULL, gen_func_wifi_mode }, + { NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_MTU, "mtu", OPTION_NONE, N_("MTU [auto]"), NULL, NULL, NULL }, + { NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_MAC_ADDRESS, "mac", OPTION_NONE, N_("MAC [none]"), NULL, NULL, NULL }, + { NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, "cloned-mac", OPTION_NONE, N_("Cloned MAC [none]"), NULL, NULL, NULL }, + { NM_SETTING_WIMAX_SETTING_NAME, NM_SETTING_WIMAX_NETWORK_NAME, "nsp", OPTION_REQD, N_("WiMAX NSP name"), NULL, NULL, NULL }, + { NM_SETTING_WIMAX_SETTING_NAME, NM_SETTING_WIMAX_MAC_ADDRESS, "mac", OPTION_NONE, N_("MAC [none]"), NULL, NULL, NULL }, + { NM_SETTING_GSM_SETTING_NAME, NM_SETTING_GSM_APN, "apn", OPTION_REQD, N_("APN"), NULL, NULL, NULL }, + { NM_SETTING_GSM_SETTING_NAME, NM_SETTING_GSM_USERNAME, "user", OPTION_NONE, N_("Username [none]"), NULL, NULL, NULL }, + { NM_SETTING_GSM_SETTING_NAME, NM_SETTING_GSM_PASSWORD, "password", OPTION_NONE, N_("Password [none]"), NULL, NULL, NULL }, + { NM_SETTING_CDMA_SETTING_NAME, NM_SETTING_CDMA_USERNAME, "user", OPTION_NONE, N_("Username [none]"), NULL, NULL, NULL }, + { NM_SETTING_CDMA_SETTING_NAME, NM_SETTING_CDMA_PASSWORD, "password", OPTION_NONE, N_("Password [none]"), NULL, NULL, NULL }, + { NM_SETTING_BLUETOOTH_SETTING_NAME, NM_SETTING_BLUETOOTH_BDADDR, "addr", OPTION_REQD, N_("Bluetooth device address"), NULL, NULL, NULL }, + { NM_SETTING_BLUETOOTH_SETTING_NAME, NM_SETTING_BLUETOOTH_TYPE, "bt-type", OPTION_NONE, PROMPT_BT_TYPE, PROMPT_BT_TYPE_CHOICES, + set_bluetooth_type, gen_func_bt_type }, + { NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_PARENT, "dev", OPTION_REQD, N_("VLAN parent device or connection UUID"), NULL, + NULL, NULL }, + { NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_ID, "id", OPTION_REQD, N_("VLAN ID (<0-4094>)"), NULL, NULL, NULL }, + { NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_FLAGS, "flags", OPTION_NONE, N_("VLAN flags (<0-7>) [none]"), NULL, NULL, NULL }, + { NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, "ingress", OPTION_NONE, N_("Ingress priority maps [none]"), NULL, NULL, NULL }, + { NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, "egress", OPTION_NONE, N_("Egress priority maps [none]"), NULL, NULL, NULL }, + { NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, "mode", OPTION_NONE, PROMPT_BOND_MODE, "[balance-rr]", + set_bond_option, gen_func_bond_mode }, + { NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, "primary", OPTION_DONT_ASK, N_("Bonding primary interface [none]"), + NULL, set_bond_option, NULL }, + { NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, NULL, OPTION_NONE, N_("Bonding monitoring mode"), PROMPT_BOND_MON_MODE_CHOICES, + set_bond_monitoring_mode, gen_func_bond_mon_mode }, + { NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, "miimon", OPTION_DONT_ASK, N_("Bonding miimon [100]"), NULL, set_bond_option, NULL }, + { NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, "downdelay", OPTION_DONT_ASK, N_("Bonding downdelay [0]"), NULL, set_bond_option, NULL }, + { NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, "updelay", OPTION_DONT_ASK, N_("Bonding updelay [0]"), NULL, set_bond_option, NULL }, + { NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, "arp-interval", OPTION_DONT_ASK, N_("Bonding arp-interval [0]"), NULL, + set_bond_option, NULL }, + { NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, "arp-ip-target", OPTION_DONT_ASK, N_("Bonding arp-ip-target [none]"), + NULL, set_bond_option, NULL }, + { NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS, "lacp-rate", OPTION_DONT_ASK, N_("LACP rate ('slow' or 'fast') [slow]"), NULL, + set_bond_option, NULL }, + { NM_SETTING_TEAM_SETTING_NAME, NM_SETTING_TEAM_CONFIG, "config", OPTION_NONE, N_("Team JSON configuration [none]"), NULL, NULL, NULL }, + { NM_SETTING_TEAM_PORT_SETTING_NAME, NM_SETTING_TEAM_PORT_CONFIG, "config", OPTION_NONE, N_("Team JSON configuration [none]"), NULL, NULL, NULL }, + { NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_STP, "stp", OPTION_NONE, N_("Enable STP [no]"), NULL, + set_yes_no, gen_func_bool_values_l10n }, + { NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_PRIORITY, "priority", OPTION_NONE, N_("STP priority [32768]"), NULL, NULL, NULL }, + { NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_FORWARD_DELAY, "forward-delay", OPTION_NONE, N_("Forward delay [15]"), NULL, NULL, NULL }, + { NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_HELLO_TIME, "hello-time", OPTION_NONE, N_("Hello time [2]"), NULL, NULL, NULL }, + { NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_MAX_AGE, "max-age", OPTION_NONE, N_("Max age [20]"), NULL, NULL, NULL }, + { NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_AGEING_TIME, "ageing-time", OPTION_NONE, N_("MAC address ageing time [300]"), NULL, NULL, NULL }, + { NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_MULTICAST_SNOOPING, "multicast-snooping", OPTION_NONE, N_("Enable IGMP snooping %s [no]"), NULL, + set_yes_no, gen_func_bool_values_l10n }, + { NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_MAC_ADDRESS, "mac", OPTION_NONE, N_("MAC [none]"), NULL, NULL, NULL }, + { NM_SETTING_BRIDGE_PORT_SETTING_NAME, NM_SETTING_BRIDGE_PORT_PRIORITY, "priority", OPTION_NONE, N_("Bridge port priority [32]"), NULL, NULL, NULL }, + { NM_SETTING_BRIDGE_PORT_SETTING_NAME, NM_SETTING_BRIDGE_PORT_PATH_COST, "path-cost", OPTION_NONE, N_("Bridge port STP path cost [100]"), NULL, NULL, NULL }, + { NM_SETTING_BRIDGE_PORT_SETTING_NAME, NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "hairpin", OPTION_NONE, N_("Hairpin [no]"), NULL, + set_yes_no, gen_func_bool_values_l10n }, + { NM_SETTING_VPN_SETTING_NAME, NM_SETTING_VPN_SERVICE_TYPE, "vpn-type", OPTION_REQD, PROMPT_VPN_TYPE, NULL, NULL, gen_func_vpn_types }, + { NM_SETTING_VPN_SETTING_NAME, NM_SETTING_VPN_USER_NAME, "user", OPTION_NONE, N_("Username [none]"), NULL, NULL, NULL }, + { NM_SETTING_OLPC_MESH_SETTING_NAME, NM_SETTING_OLPC_MESH_SSID, "ssid", OPTION_REQD, N_("SSID"), NULL, NULL, NULL }, + { NM_SETTING_OLPC_MESH_SETTING_NAME, NM_SETTING_OLPC_MESH_CHANNEL, "channel", OPTION_NONE, N_("OLPC Mesh channel [1]"), NULL, NULL, NULL }, + { NM_SETTING_OLPC_MESH_SETTING_NAME, NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS, "dhcp-anycast", OPTION_NONE, N_("DHCP anycast MAC address [none]"), NULL, NULL, NULL }, + { NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_USERNAME, "username", OPTION_REQD, N_("Username"), NULL, NULL, NULL }, + { NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_PROTOCOL, "protocol", OPTION_REQD, PROMPT_ADSL_PROTO, PROMPT_ADSL_PROTO_CHOICES, + NULL, gen_func_adsl_proto }, + { NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_PASSWORD, "password", OPTION_NONE, N_("Password [none]"), NULL, NULL, NULL }, + { NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_ENCAPSULATION, "encapsulation", OPTION_NONE, PROMPT_ADSL_ENCAP, PROMPT_ADSL_ENCAP_CHOICES, + NULL, gen_func_adsl_encap }, + { NM_SETTING_MACVLAN_SETTING_NAME, NM_SETTING_MACVLAN_PARENT, "dev", OPTION_REQD, N_("MACVLAN parent device or connection UUID"), NULL, + NULL, NULL }, + { NM_SETTING_MACVLAN_SETTING_NAME, NM_SETTING_MACVLAN_MODE, "mode", OPTION_REQD, PROMPT_MACVLAN_MODE, NULL, NULL, gen_func_macvlan_mode }, + { NM_SETTING_MACVLAN_SETTING_NAME, NM_SETTING_MACVLAN_TAP, "tap", OPTION_NONE, N_("Tap [no]"), NULL, + set_yes_no, gen_func_bool_values_l10n }, + { NM_SETTING_VXLAN_SETTING_NAME, NM_SETTING_VXLAN_ID, "id", OPTION_REQD, N_("VXLAN ID"), NULL, NULL, NULL }, + { NM_SETTING_VXLAN_SETTING_NAME, NM_SETTING_VXLAN_REMOTE, "remote", OPTION_REQD, N_("Remote"), NULL, NULL, NULL }, + { NM_SETTING_VXLAN_SETTING_NAME, NM_SETTING_VXLAN_PARENT, "dev", OPTION_NONE, N_("Parent device [none]"), NULL, NULL, NULL }, + { NM_SETTING_VXLAN_SETTING_NAME, NM_SETTING_VXLAN_LOCAL, "local", OPTION_NONE, N_("Local address [none]"), NULL, NULL, NULL }, + { NM_SETTING_VXLAN_SETTING_NAME, NM_SETTING_VXLAN_SOURCE_PORT_MIN, "source-port-min", OPTION_NONE, N_("Minimum source port [0]"), NULL, NULL, NULL }, + { NM_SETTING_VXLAN_SETTING_NAME, NM_SETTING_VXLAN_SOURCE_PORT_MAX, "source-port-max", OPTION_NONE, N_("Maximum source port [0]"), NULL, NULL, NULL }, + { NM_SETTING_VXLAN_SETTING_NAME, NM_SETTING_VXLAN_DESTINATION_PORT, "destination-port", OPTION_NONE, N_("Destination port [8472]"), NULL, NULL, NULL }, + { NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_MODE, "mode", OPTION_NONE, PROMPT_TUN_MODE, PROMPT_TUN_MODE_CHOICES, + NULL, gen_func_tun_mode }, + { NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_OWNER, "owner", OPTION_NONE, N_("User ID [none]"), NULL, NULL, NULL }, + { NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_GROUP, "group", OPTION_NONE, N_("Group ID [none]"), NULL, NULL, NULL }, + { NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_PI, "pi", OPTION_NONE, N_("Enable PI [no]"), NULL, + set_yes_no, gen_func_bool_values_l10n }, + { NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_VNET_HDR, "vnet-hdr", OPTION_NONE, N_("Enable VNET header [no]"), NULL, + set_yes_no, gen_func_bool_values_l10n }, + { NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_MULTI_QUEUE, "multi-queue", OPTION_NONE, N_("Enable multi queue [no]"), NULL, + set_yes_no, gen_func_bool_values_l10n }, + { NM_SETTING_IP_TUNNEL_SETTING_NAME, NM_SETTING_IP_TUNNEL_MODE, "mode", OPTION_REQD, PROMPT_IP_TUNNEL_MODE, NULL, NULL, gen_func_ip_tunnel_mode }, + { NM_SETTING_IP_TUNNEL_SETTING_NAME, NM_SETTING_IP_TUNNEL_LOCAL, "local", OPTION_NONE, N_("Local endpoint [none]"), NULL, NULL, NULL }, + { NM_SETTING_IP_TUNNEL_SETTING_NAME, NM_SETTING_IP_TUNNEL_REMOTE, "remote", OPTION_REQD, N_("Remote"), NULL, NULL, NULL }, + { NM_SETTING_IP_TUNNEL_SETTING_NAME, NM_SETTING_IP_TUNNEL_PARENT, "dev", OPTION_NONE, N_("Parent device [none]"), NULL, NULL, NULL }, + { NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_ADDRESSES, "ip4", OPTION_MULTI, N_("IPv4 address (IP[/plen]) [none]"), NULL, + set_ip4_address, NULL }, + { NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_GATEWAY, "gw4", OPTION_NONE, N_("IPv4 gateway [none]"), NULL, NULL, NULL }, + { NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_ADDRESSES, "ip6", OPTION_MULTI, N_("IPv6 address (IP[/plen]) [none]"), NULL, + set_ip6_address, NULL }, + { NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_GATEWAY, "gw6", OPTION_NONE, N_("IPv6 gateway [none]"), NULL, NULL, NULL }, + { NULL, NULL, NULL, OPTION_NONE, NULL, NULL, NULL, NULL }, +}; - } else if (!strcmp (con_type, NM_SETTING_VXLAN_SETTING_NAME)) { - /* Build up the settings required for 'vxlan' */ - gboolean success = FALSE; - char *id_ask = NULL; - const char *id = NULL; - char *remote_ask = NULL; - const char *remote = NULL; - const char *parent_c = NULL, *local_c = NULL; - const char *src_port_min_c = NULL, *src_port_max_c = NULL; - const char *dst_port_c = NULL; - char *parent = NULL, *local = NULL; - char *src_port_min = NULL, *src_port_max = NULL, *dst_port = NULL; - unsigned long int vni; - unsigned long sport_min = G_MAXULONG, sport_max = G_MAXULONG; - unsigned long dport = G_MAXULONG; - nmc_arg_t exp_args[] = { {"id", TRUE, &id, !ask}, - {"remote", TRUE, &remote, !ask}, - {"dev", TRUE, &parent_c, FALSE}, - {"local", TRUE, &local_c, FALSE}, - {"source-port-min", TRUE, &src_port_min_c, FALSE}, - {"source-port-max", TRUE, &src_port_max_c, FALSE}, - {"destination-port", TRUE, &dst_port_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; +static gboolean +option_relevant (NMConnection *connection, OptionInfo *option) +{ + if (option->flags & OPTION_DONT_ASK && !(option->flags & OPTION_ENABLED)) + return FALSE; + if (option->flags & OPTION_DISABLED) + return FALSE; + if (!nm_connection_get_setting_by_name (connection, option->setting_name)) + return FALSE; + return TRUE; +} - if (!id && ask) - id = id_ask = nmc_readline (_("VXLAN ID: ")); - if (!id) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'id' is required.")); - goto cleanup_vxlan; - } +/*----------------------------------------------------------------------------*/ - if (!remote && ask) - remote = remote_ask = nmc_readline (_("Remote: ")); - if (!remote) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'remote' is required.")); - goto cleanup_vxlan; - } +static void +complete_property_name (NmCli *nmc, NMConnection *connection, + char modifier, + const gchar *prefix, + const gchar *postfix) +{ + NMSettingConnection *s_con; + const NameItem *valid_settings_main = NULL; + const NameItem *valid_settings_slave = NULL; + const char *connection_type = NULL; + const char *slave_type = NULL; + gs_free char *slv_type = NULL; + gs_free char *word_list = NULL; + OptionInfo *candidate; - if (!nmc_string_to_uint (id, TRUE, 0, (1UL << 24) - 1, &vni)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'id': '%s' is not valid; use <0-16777215>."), id); - goto cleanup_vxlan; - } + connection_type = nm_connection_get_connection_type (connection); + s_con = nm_connection_get_setting_connection (connection); + if (s_con) + slave_type = nm_setting_connection_get_slave_type (s_con); + slv_type = g_strdup_printf ("%s-slave", slave_type ? slave_type : "no"); + valid_settings_main = get_valid_settings_array (connection_type); + valid_settings_slave = get_valid_settings_array (slv_type); - parent = g_strdup (parent_c); - local = g_strdup (local_c); - src_port_min = g_strdup (src_port_min_c); - src_port_max = g_strdup (src_port_max_c); - dst_port = g_strdup (dst_port_c); + word_list = get_valid_properties_string (valid_settings_main, valid_settings_slave, modifier, prefix, postfix); + if (word_list) + g_print ("%s", word_list); - if (ask) - do_questionnaire_vxlan (&parent, &local, &src_port_min, &src_port_max, &dst_port); + if (modifier != '\0') + return; - if (parent) { - if ( !nm_utils_is_uuid (parent) - && !nm_utils_iface_valid_name (parent)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'dev': '%s' is neither UUID nor interface name."), - parent); - goto cleanup_vxlan; - } - } + for (candidate = option_info; candidate->setting_name; candidate++) { + if (!nm_connection_get_setting_by_name (connection, candidate->setting_name)) + continue; + if (!candidate->option) + continue; + if (!g_str_has_prefix (candidate->option, prefix)) + continue; + g_print ("%s\n", candidate->option); + } +} - if ( !nm_utils_ipaddr_valid (AF_INET, remote) - && !nm_utils_ipaddr_valid (AF_INET6, remote)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'remote': '%s' is not a valid IP address"), - remote); - goto cleanup_vxlan; - } +static void +run_rl_generator (rl_compentry_func_t *generator_func, const char *prefix) +{ + int state = 0; + char *str; - if (local) { - if ( !nm_utils_ipaddr_valid (AF_INET, local) - && !nm_utils_ipaddr_valid (AF_INET6, local)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'local': '%s' is not a valid IP address"), - local); - goto cleanup_vxlan; - } - } + while ((str = generator_func (prefix, state))) { + g_print ("%s\n", str); + g_free (str); + if (state == 0) + state = 1; + } +} - if (src_port_min) { - if (!nmc_string_to_uint (src_port_min, TRUE, 0, 65535, &sport_min)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'source-port-min': %s is not valid; use <0-65535>."), - src_port_min); - goto cleanup_vxlan; - } - } +static void +complete_option (OptionInfo *option, const gchar *prefix) +{ + if (option->generator_func) + run_rl_generator (option->generator_func, prefix); +} - if (src_port_max) { - if (!nmc_string_to_uint (src_port_max, TRUE, 0, 65535, &sport_max)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'source-port-max': %s is not valid; use <0-65535>."), - src_port_max); - goto cleanup_vxlan; - } - } +static void +complete_property (const gchar *setting_name, const gchar *property, const gchar *prefix) +{ + if (strcmp (setting_name, NM_SETTING_CONNECTION_SETTING_NAME) == 0) { + if (strcmp (property, NM_SETTING_CONNECTION_TYPE) == 0) + run_rl_generator (gen_connection_types, prefix); + else if (strcmp (property, NM_SETTING_CONNECTION_MASTER) == 0) + run_rl_generator (gen_func_master_ifnames, prefix); + } else if ( strcmp (setting_name, NM_SETTING_VPN_SETTING_NAME) == 0 + && strcmp (property, NM_SETTING_VPN_SERVICE_TYPE) == 0) + run_rl_generator (gen_func_vpn_types, prefix); + else if ( strcmp (setting_name, NM_SETTING_WIRELESS_SETTING_NAME) == 0 + && strcmp (property, NM_SETTING_WIRELESS_MODE) == 0) + run_rl_generator (gen_func_wifi_mode, prefix); + else if ( strcmp (setting_name, NM_SETTING_INFINIBAND_SETTING_NAME) == 0 + && strcmp (property, NM_SETTING_INFINIBAND_TRANSPORT_MODE) == 0) + run_rl_generator (gen_func_ib_type, prefix); + else if ( strcmp (setting_name, NM_SETTING_BLUETOOTH_SETTING_NAME) == 0 + && strcmp (property, NM_SETTING_BLUETOOTH_TYPE) == 0) + run_rl_generator (gen_func_bt_type, prefix); + else if (strcmp (setting_name, NM_SETTING_ADSL_SETTING_NAME) == 0) { + if (strcmp (property, NM_SETTING_ADSL_PROTOCOL) == 0) + run_rl_generator (gen_func_adsl_proto, prefix); + else if (strcmp (property, NM_SETTING_ADSL_ENCAPSULATION) == 0) + run_rl_generator (gen_func_adsl_encap, prefix); + } else if ( strcmp (setting_name, NM_SETTING_TUN_SETTING_NAME) == 0 + && strcmp (property, NM_SETTING_TUN_MODE) == 0) + run_rl_generator (gen_func_tun_mode, prefix); + else if ( strcmp (setting_name, NM_SETTING_IP_TUNNEL_SETTING_NAME) == 0 + && strcmp (property, NM_SETTING_IP_TUNNEL_MODE) == 0) + run_rl_generator (gen_func_ip_tunnel_mode, prefix); + else if ( strcmp (setting_name, NM_SETTING_MACVLAN_SETTING_NAME) == 0 + && strcmp (property, NM_SETTING_MACVLAN_MODE) == 0) + run_rl_generator (gen_func_macvlan_mode, prefix); - if (dst_port) { - if (!nmc_string_to_uint (dst_port, TRUE, 0, 65535, &dport)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'destination-port': %s is not valid; use <0-65535>."), - dst_port); - goto cleanup_vxlan; - } - } +} - /* Add 'vxlan' setting */ - s_vxlan = (NMSettingVxlan *) nm_setting_vxlan_new (); - nm_connection_add_setting (connection, NM_SETTING (s_vxlan)); - - g_object_set (s_vxlan, NM_SETTING_VXLAN_ID, (guint) vni, NULL); - g_object_set (s_vxlan, NM_SETTING_VXLAN_REMOTE, remote, NULL); - g_object_set (s_vxlan, NM_SETTING_VXLAN_LOCAL, local, NULL); - g_object_set (s_vxlan, NM_SETTING_VXLAN_PARENT, parent, NULL); - - if (sport_min != G_MAXULONG) - g_object_set (s_vxlan, NM_SETTING_VXLAN_SOURCE_PORT_MIN, sport_min, NULL); - if (sport_max != G_MAXULONG) - g_object_set (s_vxlan, NM_SETTING_VXLAN_SOURCE_PORT_MAX, sport_max, NULL); - if (dport != G_MAXULONG) - g_object_set (s_vxlan, NM_SETTING_VXLAN_DESTINATION_PORT, dport, NULL); - - success = TRUE; - -cleanup_vxlan: - g_free (id_ask); - g_free (remote_ask); - g_free (parent); - g_free (local); - g_free (src_port_min); - g_free (src_port_max); - if (!success) - return FALSE; +/*----------------------------------------------------------------------------*/ - } else if (!strcmp (con_type, NM_SETTING_GENERIC_SETTING_NAME)) { - /* Add 'generic' setting */ - s_generic = (NMSettingGeneric *) nm_setting_generic_new (); - nm_connection_add_setting (connection, NM_SETTING (s_generic)); - } else { +static gboolean +get_value (const char **value, int *argc, char ***argv, const char *option, GError **error) +{ + if (!**argv) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: '%s' is not a valid connection type."), - con_type); + _("Error: value for '%s' is missing."), option); return FALSE; } - if (!nm_setting_connection_get_slave_type (s_con)) { - /* Read and add IP configuration */ - NMIPAddress *ip4addr = NULL, *ip6addr = NULL; - const char *ip4 = NULL, *gw4 = NULL, *ip6 = NULL, *gw6 = NULL; - nmc_arg_t exp_args[] = { {"ip4", TRUE, &ip4, FALSE}, {"gw4", TRUE, &gw4, FALSE}, - {"ip6", TRUE, &ip6, FALSE}, {"gw6", TRUE, &gw6, FALSE}, - {NULL} }; + /* Empty string will reset the value to default */ + if (**argv[0] == '\0') + *value = NULL; + else + *value = *argv[0]; - while (argc) { - nmc_arg_t *p; + next_arg (argc, argv); + return TRUE; +} - /* reset 'found' flag */ - for (p = exp_args; p->name; p++) - p->found = FALSE; +gboolean +nmc_read_connection_properties (NmCli *nmc, + NMConnection *connection, + int *argc, + char ***argv, + GError **error) +{ + const char *option; + const char *value = NULL; + GError *local = NULL; - ip4 = gw4 = ip6 = gw6 = NULL; + /* First check if we have a slave-type, as this would mean we will not + * have ip properties but possibly others, slave-type specific. + */ + /* Go through arguments and set properties */ + do { + OptionInfo *candidate; + OptionInfo *chosen = NULL; + gs_strfreev gchar **strv = NULL; + const NameItem *type_settings, *slv_settings; + char modifier = '\0'; - if (!nmc_parse_args (exp_args, TRUE, &argc, &argv, NULL)) - break; + if (!con_settings (connection, &type_settings, &slv_settings, error)) + return FALSE; - /* coverity[dead_error_begin] */ - if (ip4) { - ip4addr = nmc_parse_and_build_address (AF_INET, ip4, error); - if (!ip4addr) { - g_prefix_error (error, _("Error: ")); - return FALSE; - } - add_ip4_address_to_connection (ip4addr, connection); - } + ensure_settings (connection, slv_settings); + ensure_settings (connection, type_settings); - /* coverity[dead_error_begin] */ - if (gw4) { - NMSettingIPConfig *s_ip = nm_connection_get_setting_ip4_config (connection); + option = **argv; + if (!option) { + g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: . argument is missing.")); + return FALSE; + } - if (!s_ip) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: IPv4 gateway specified without IPv4 addresses")); - return FALSE; - } else if (nm_setting_ip_config_get_gateway (s_ip)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: multiple IPv4 gateways specified")); - return FALSE; - } else if (!nm_utils_ipaddr_valid (AF_INET, gw4)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: Invalid IPv4 gateway '%s'"), - gw4); - } + if (option[0] == '+' || option[0] == '-') + modifier = *option; - g_object_set (s_ip, - NM_SETTING_IP_CONFIG_GATEWAY, gw4, - NULL); - } + strv = g_strsplit (option, ".", 2); + if (g_strv_length (strv) == 2) { + /* This seems like a . (such as "connection.id" or "bond.mode"), + * optionally prefixed with "+| or "-". */ + char *setting = strv[0]; + const char *setting_name; - /* coverity[dead_error_begin] */ - if (ip6) { - ip6addr = nmc_parse_and_build_address (AF_INET6, ip6, error); - if (!ip6addr) { - g_prefix_error (error, _("Error: ")); - return FALSE; - } - add_ip6_address_to_connection (ip6addr, connection); + if (modifier) + setting++; + + if (*argc == 1 && nmc->complete) + complete_property_name (nmc, connection, modifier, setting, strv[1]); + + setting_name = check_valid_name (setting, type_settings, slv_settings, &local); + if (!setting_name) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: invalid or not allowed setting '%s': %s."), + setting, local->message); + g_clear_error (&local); + return FALSE; } - /* coverity[dead_error_begin] */ - if (gw6) { - NMSettingIPConfig *s_ip = nm_connection_get_setting_ip6_config (connection); + next_arg (argc, argv); + if (!get_value (&value, argc, argv, option, error)) + return FALSE; + + if (!*argc && nmc->complete) + complete_property (setting, strv[1], value ? value : ""); - if (!s_ip) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: IPv6 gateway specified without IPv6 addresses")); - return FALSE; - } else if (nm_setting_ip_config_get_gateway (s_ip)) { + if (!set_property (connection, setting_name, strv[1], value, modifier, error)) + return FALSE; + } else { + /* Let's see if this is an property alias (such as "id", "mode", "type" or "con-name")*/ + for (candidate = option_info; candidate->setting_name; candidate++) { + if (g_strcmp0 (candidate->option, option)) + continue; + if (!check_valid_name (candidate->setting_name, type_settings, slv_settings, NULL)) + continue; + if (chosen) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: multiple IPv6 gateways specified")); + _("Error: '%s' is ambiguous (%s.%s or %s.%s)."), option, + chosen->setting_name, chosen->property, + candidate->setting_name, candidate->property); return FALSE; - } else if (!nm_utils_ipaddr_valid (AF_INET, gw6)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: Invalid IPv6 gateway '%s'"), - gw6); } + chosen = candidate; + } - g_object_set (s_ip, - NM_SETTING_IP_CONFIG_GATEWAY, gw6, - NULL); + if (!chosen) { + if (modifier) + option++; + if (*argc == 1 && nmc->complete) + complete_property_name (nmc, connection, modifier, option, NULL); + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: invalid . '%s'."), option); + return FALSE; } - } - /* Ask for addresses if '--ask' is specified. */ - if (ask) - do_questionnaire_ip (connection); - } + if (*argc == 1 && nmc->complete) + complete_property_name (nmc, connection, modifier, option, NULL); - if (argc) { - /* Set extra connection properties. */ - nmc_arg_t exp_args[] = { {"--", FALSE, NULL, TRUE}, - {NULL} }; + next_arg (argc, argv); + if (!get_value (&value, argc, argv, option, error)) + return FALSE; - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; + if (!*argc && nmc->complete) + complete_option (chosen, value ? value : ""); - if (!read_connection_properties (connection, argc, argv, error)) - return FALSE; - } + if (!set_option (nmc, connection, chosen, value, error)) + return FALSE; + } + + } while (*argc); return TRUE; } @@ -6684,146 +4569,17 @@ add_new_connection (gboolean persistent, gpointer user_data) { nm_client_add_connection_async (client, connection, persistent, - NULL, callback, user_data); -} - -static void -update_connection (gboolean persistent, - NMRemoteConnection *connection, - GAsyncReadyCallback callback, - gpointer user_data) -{ - nm_remote_connection_commit_changes_async (connection, persistent, - NULL, callback, user_data); -} - -static char * -gen_func_vpn_types (const char *text, int state) -{ - gs_free const char **plugin_names = NULL; - - plugin_names = nm_vpn_get_plugin_names (FALSE); - return nmc_rl_gen_func_basic (text, state, plugin_names); -} - -static char * -gen_func_bool_values_l10n (const char *text, int state) -{ - const char *words[] = { WORD_LOC_YES, WORD_LOC_NO, NULL }; - return nmc_rl_gen_func_basic (text, state, words); -} - -static char * -gen_func_wifi_mode (const char *text, int state) -{ - const char *words[] = { "infrastructure", "ap", "adhoc", NULL }; - return nmc_rl_gen_func_basic (text, state, words); -} - -static char * -gen_func_ib_type (const char *text, int state) -{ - const char *words[] = { "datagram", "connected", NULL }; - return nmc_rl_gen_func_basic (text, state, words); -} - -static char * -gen_func_bt_type (const char *text, int state) -{ - const char *words[] = { "panu", "dun-gsm", "dun-cdma", NULL }; - return nmc_rl_gen_func_basic (text, state, words); -} - -static char * -gen_func_bond_mode (const char *text, int state) -{ - const char *words[] = { "balance-rr", "active-backup", "balance-xor", "broadcast", - "802.3ad", "balance-tlb", "balance-alb", NULL }; - return nmc_rl_gen_func_basic (text, state, words); -} -static char * -gen_func_bond_mon_mode (const char *text, int state) -{ - const char *words[] = { "miimon", "arp", NULL }; - return nmc_rl_gen_func_basic (text, state, words); -} - -static char * -gen_func_adsl_proto (const char *text, int state) -{ - const char *words[] = { "pppoe", "pppoa", "ipoatm", NULL }; - return nmc_rl_gen_func_basic (text, state, words); -} - -static char * -gen_func_adsl_encap (const char *text, int state) -{ - const char *words[] = { "vcmux", "llc", NULL }; - return nmc_rl_gen_func_basic (text, state, words); -} - -static char * -gen_func_tun_mode (const char *text, int state) -{ - const char *words[] = { "tun", "tap", NULL }; - return nmc_rl_gen_func_basic (text, state, words); -} - -static char * -gen_func_ip_tunnel_mode (const char *text, int state) -{ - gs_free const char **words = NULL; - - words = nm_utils_enum_get_values (nm_ip_tunnel_mode_get_type (), - NM_IP_TUNNEL_MODE_UNKNOWN + 1, - G_MAXINT); - return nmc_rl_gen_func_basic (text, state, words); -} - -static char * -gen_func_macvlan_mode (const char *text, int state) -{ - gs_free const char **words = NULL; - - words = nm_utils_enum_get_values (nm_setting_macvlan_mode_get_type(), - NM_SETTING_MACVLAN_MODE_UNKNOWN + 1, - G_MAXINT); - return nmc_rl_gen_func_basic (text, state, words); -} - -static char * -gen_func_master_ifnames (const char *text, int state) -{ - int i; - GPtrArray *ifnames; - char *ret; - NMConnection *con; - NMSettingConnection *s_con; - const char *con_type, *ifname; - - if (!nm_cli.connections) - return NULL; - - /* Disable appending space after completion */ - rl_completion_append_character = '\0'; - - ifnames = g_ptr_array_sized_new (20); - for (i = 0; i < nm_cli.connections->len; i++) { - con = NM_CONNECTION (nm_cli.connections->pdata[i]); - s_con = nm_connection_get_setting_connection (con); - g_assert (s_con); - con_type = nm_setting_connection_get_connection_type (s_con); - if (g_strcmp0 (con_type, nmc_tab_completion.con_type) != 0) - continue; - ifname = nm_connection_get_interface_name (con); - g_ptr_array_add (ifnames, (gpointer) ifname); - } - g_ptr_array_add (ifnames, (gpointer) NULL); - - ret = nmc_rl_gen_func_basic (text, state, (const char **) ifnames->pdata); + NULL, callback, user_data); +} - g_ptr_array_free (ifnames, TRUE); - return ret; +static void +update_connection (gboolean persistent, + NMRemoteConnection *connection, + GAsyncReadyCallback callback, + gpointer user_data) +{ + nm_remote_connection_commit_changes_async (connection, persistent, + NULL, callback, user_data); } static gboolean @@ -6846,47 +4602,47 @@ nmcli_con_add_tab_completion (const char *text, int start, int end) { char **match_array = NULL; rl_compentry_func_t *generator_func = NULL; + gs_free char *no = g_strdup_printf (": [%s]", gettext ("no")); + gs_free char *yes = g_strdup_printf (": [%s]", gettext ("yes")); /* Disable readline's default filename completion */ rl_attempted_completion_over = 1; /* Restore standard append character to space */ - rl_completion_append_character = ' '; + rl_completion_append_character = '\x00'; if (!is_single_word (rl_line_buffer)) return NULL; - if (g_strcmp0 (rl_prompt, PROMPT_CON_TYPE) == 0) + if (g_str_has_prefix (rl_prompt, PROMPT_CON_TYPE)) generator_func = gen_connection_types; - else if (g_strcmp0 (rl_prompt, PROMPT_VPN_TYPE) == 0) + else if (g_str_has_prefix (rl_prompt, PROMPT_VPN_TYPE)) generator_func = gen_func_vpn_types; - else if (g_strcmp0 (rl_prompt, PROMPT_MASTER) == 0) + else if (g_str_has_prefix (rl_prompt, PROMPT_MASTER)) generator_func = gen_func_master_ifnames; - else if ( g_str_has_suffix (rl_prompt, prompt_yes_no (TRUE, NULL)) - || g_str_has_suffix (rl_prompt, prompt_yes_no (TRUE, ":")) - || g_str_has_suffix (rl_prompt, prompt_yes_no (FALSE, NULL)) - || g_str_has_suffix (rl_prompt, prompt_yes_no (FALSE, ":"))) - generator_func = gen_func_bool_values_l10n; - else if (g_str_has_suffix (rl_prompt, PROMPT_WIFI_MODE)) + else if (g_str_has_prefix (rl_prompt, PROMPT_WIFI_MODE)) generator_func = gen_func_wifi_mode; - else if (g_str_has_suffix (rl_prompt, PROMPT_IB_MODE)) + else if (g_str_has_prefix (rl_prompt, PROMPT_IB_MODE)) generator_func = gen_func_ib_type; - else if (g_str_has_suffix (rl_prompt, PROMPT_BT_TYPE)) + else if (g_str_has_prefix (rl_prompt, PROMPT_BT_TYPE)) generator_func = gen_func_bt_type; else if (g_str_has_prefix (rl_prompt, PROMPT_BOND_MODE)) generator_func = gen_func_bond_mode; - else if (g_str_has_suffix (rl_prompt, PROMPT_BOND_MON_MODE)) + else if (g_str_has_prefix (rl_prompt, PROMPT_BOND_MON_MODE)) generator_func = gen_func_bond_mon_mode; - else if (g_str_has_suffix (rl_prompt, PROMPT_ADSL_PROTO)) + else if (g_str_has_prefix (rl_prompt, PROMPT_ADSL_PROTO)) generator_func = gen_func_adsl_proto; - else if (g_str_has_suffix (rl_prompt, PROMPT_ADSL_ENCAP)) + else if (g_str_has_prefix (rl_prompt, PROMPT_ADSL_ENCAP)) generator_func = gen_func_adsl_encap; - else if (g_str_has_suffix (rl_prompt, PROMPT_TUN_MODE)) + else if (g_str_has_prefix (rl_prompt, PROMPT_TUN_MODE)) generator_func = gen_func_tun_mode; - else if (g_str_has_suffix (rl_prompt, PROMPT_IP_TUNNEL_MODE)) + else if (g_str_has_prefix (rl_prompt, PROMPT_IP_TUNNEL_MODE)) generator_func = gen_func_ip_tunnel_mode; - else if (g_str_has_suffix (rl_prompt, PROMPT_MACVLAN_MODE)) + else if (g_str_has_prefix (rl_prompt, PROMPT_MACVLAN_MODE)) generator_func = gen_func_macvlan_mode; + else if ( g_str_has_suffix (rl_prompt, yes) + || g_str_has_suffix (rl_prompt, no)) + generator_func = gen_func_bool_values_l10n; if (generator_func) match_array = rl_completion_matches (text, generator_func); @@ -6894,171 +4650,281 @@ nmcli_con_add_tab_completion (const char *text, int start, int end) return match_array; } -static NMCResultCode -do_connection_add (NmCli *nmc, int argc, char **argv) +static void +ask_option (NmCli *nmc, NMConnection *connection, OptionInfo *option) { - NMConnection *connection = NULL; - NMSettingConnection *s_con; - char *uuid; - char *default_name = NULL; - const char *type = NULL; - char *type_ask = NULL; - const char *con_name = NULL; - const char *autoconnect = NULL; - gboolean auto_bool = TRUE; - const char *ifname = NULL; - char *ifname_ask = NULL; - gboolean ifname_mandatory = TRUE; - const char *save = NULL; - gboolean save_bool = TRUE; - const char *master = NULL; - const char *checked_master = NULL; - const char *slave_type = NULL; - AddConnectionInfo *info = NULL; - const char *setting_name; + gchar *value; GError *error = NULL; - nmc_arg_t exp_args[] = { {"type", TRUE, &type, !nmc->ask}, - {"con-name", TRUE, &con_name, FALSE}, - {"autoconnect", TRUE, &autoconnect, FALSE}, - {"ifname", TRUE, &ifname, FALSE}, - {"save", TRUE, &save, FALSE}, - {"master", TRUE, &master, FALSE}, - {"slave-type", TRUE, &slave_type, FALSE}, - {NULL} }; - - rl_attempted_completion_function = (rl_completion_func_t *) nmcli_con_add_tab_completion; - - nmc->return_value = NMC_RESULT_SUCCESS; + gs_free gchar *prompt = NULL; + gboolean multi = option->flags & OPTION_MULTI; + + prompt = g_strjoin ("", + gettext (option->prompt), + option->def_hint ? " " : "", + option->def_hint ? option->def_hint : "", + ": ", + NULL); + + if (multi) + g_print (_("You can specify this option more than once. Press when you're done.\n")); + +again: + value = nmc_readline ("%s", prompt); + if (multi && !value) + return; - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, &error)) { - g_string_assign (nmc->return_text, error->message); - nmc->return_value = error->code; + if (!set_option (nmc, connection, option, value, &error)) { + g_printerr ("%s\n", error->message); g_clear_error (&error); - goto error; + goto again; } - if (!type && nmc->ask) { - char *types_tmp = get_valid_options_string (nmc_valid_connection_types, NULL); - g_print ("Valid types: [%s]\n", types_tmp); - type = type_ask = nmc_readline (PROMPT_CON_TYPE); - g_free (types_tmp); - } - if (!type) { - g_string_printf (nmc->return_text, _("Error: 'type' argument is required.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } - if (type_ask) - type = g_strstrip (type_ask); + if (multi && value) + goto again; +} - if (!(setting_name = check_valid_name (type, nmc_valid_connection_types, NULL, &error))) { - g_string_printf (nmc->return_text, _("Error: invalid connection type; %s."), - error->message); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - g_clear_error (&error); - goto error; - } - if (autoconnect) { - GError *tmp_err = NULL; - if (!nmc_string_to_bool (autoconnect, &auto_bool, &tmp_err)) { - g_string_printf (nmc->return_text, _("Error: 'autoconnect': %s."), - tmp_err->message); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - g_clear_error (&tmp_err); - goto error; - } - } - if (save) { - GError *tmp_err = NULL; - if (!nmc_string_to_bool (save, &save_bool, &tmp_err)) { - g_string_printf (nmc->return_text, _("Error: 'save': %s."), - tmp_err->message); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - g_clear_error (&tmp_err); - goto error; - } +static void +questionnaire_mandatory (NmCli *nmc, NMConnection *connection) +{ + OptionInfo *candidate; + + /* Mandatory settings. */ + for (candidate = option_info; candidate->setting_name; candidate++) { + if (!option_relevant (connection, candidate)) + continue; + if (candidate->flags & OPTION_REQD || candidate->flags & OPTION_ENABLED) + ask_option (nmc, connection, candidate); } +} - /* ifname is mandatory for all connection types except virtual ones (bond, team, bridge, vlan) */ - if ( strcmp (type, NM_SETTING_BOND_SETTING_NAME) == 0 - || strcmp (type, NM_SETTING_TEAM_SETTING_NAME) == 0 - || strcmp (type, NM_SETTING_BRIDGE_SETTING_NAME) == 0 - || strcmp (type, NM_SETTING_VLAN_SETTING_NAME) == 0) - ifname_mandatory = FALSE; +static gboolean +want_provide_opt_args (const char *type, int num) +{ + char *answer; + gboolean ret = TRUE; - if (!ifname && ifname_mandatory) { - if (nmc->ask) { - ifname = ifname_ask = nmc_readline (_("Interface name [*]: ")); - if (!ifname) - ifname = ifname_ask = g_strdup ("*"); - } else { - if (!*argv) - g_string_printf (nmc->return_text, _("Error: 'ifname' argument is required.")); - else - g_string_printf (nmc->return_text, _("Error: mandatory 'ifname' not seen before '%s'."), - *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } + /* Ask for optional arguments. */ + g_print (ngettext ("There is %d optional setting for %s.\n", + "There are %d optional settings for %s.\n", num), + num, type); + answer = nmc_readline (ngettext ("Do you want to provide it? %s", + "Do you want to provide them? %s", num), + prompt_yes_no (TRUE, NULL)); + answer = answer ? g_strstrip (answer) : NULL; + if (answer && matches (answer, WORD_LOC_YES) != 0) + ret = FALSE; + g_free (answer); + return ret; +} + +static const char * +setting_name_to_name (const char *name) +{ + if (strcmp (name, NM_SETTING_WIRED_SETTING_NAME) == 0) + return _("Wired Ethernet"); + if (strcmp (name, NM_SETTING_INFINIBAND_SETTING_NAME) == 0) + return _("InfiniBand connection"); + if (strcmp (name, NM_SETTING_WIRELESS_SETTING_NAME) == 0) + return _("Wi-Fi connection"); + if (strcmp (name, NM_SETTING_WIMAX_SETTING_NAME) == 0) + return _("WiMAX connection"); + if (strcmp (name, NM_SETTING_PPPOE_SETTING_NAME) == 0) + return _("PPPoE"); + if (strcmp (name, NM_SETTING_CDMA_SETTING_NAME) == 0) + return _("CDMA mobile broadband connection"); + if (strcmp (name, NM_SETTING_GSM_SETTING_NAME) == 0) + return _("GSM mobile broadband connection"); + if (strcmp (name, NM_SETTING_BLUETOOTH_SETTING_NAME) == 0) + return _("bluetooth connection"); + if (strcmp (name, NM_SETTING_VLAN_SETTING_NAME) == 0) + return _("VLAN connection"); + if (strcmp (name, NM_SETTING_BOND_SETTING_NAME) == 0) + return _("Bond device"); + if (strcmp (name, NM_SETTING_TEAM_SETTING_NAME) == 0) + return _("Team device"); + if (strcmp (name, NM_SETTING_TEAM_PORT_SETTING_NAME) == 0) + return _("Team port"); + if (strcmp (name, NM_SETTING_BRIDGE_SETTING_NAME) == 0) + return _("Bridge device"); + if (strcmp (name, NM_SETTING_BRIDGE_PORT_SETTING_NAME) == 0) + return _("Bridge port"); + if (strcmp (name, NM_SETTING_VPN_SETTING_NAME) == 0) + return _("VPN connection"); + if (strcmp (name, NM_SETTING_OLPC_MESH_SETTING_NAME) == 0) + return _("OLPC Mesh connection"); + if (strcmp (name, NM_SETTING_ADSL_SETTING_NAME) == 0) + return _("ADSL connection"); + if (strcmp (name, NM_SETTING_MACVLAN_SETTING_NAME) == 0) + return _("macvlan connection"); + if (strcmp (name, NM_SETTING_VXLAN_SETTING_NAME) == 0) + return _("VXLAN connection"); + if (strcmp (name, NM_SETTING_TUN_SETTING_NAME) == 0) + return _("Tun device"); + if (strcmp (name, NM_SETTING_IP4_CONFIG_SETTING_NAME) == 0) + return _("IPv4 protocol"); + if (strcmp (name, NM_SETTING_IP6_CONFIG_SETTING_NAME) == 0) + return _("IPv6 protocol"); + + /* Should not happen; but let's still try to be somewhat sensible. */ + return name; +} + +static gboolean +questionnaire_one_optional (NmCli *nmc, NMConnection *connection) +{ + OptionInfo *candidate; + + /* Optional settings. */ + const gchar *setting_name = NULL; + int count = 0; + + /* Find first setting with relevant options and count them. */ + for (candidate = option_info; candidate->setting_name; candidate++) { + if (!option_relevant (connection, candidate)) + continue; + if (!setting_name) + setting_name = candidate->setting_name; + else if (strcmp (setting_name, candidate->setting_name)) + break; + count++; } - if (ifname) { - if (!nm_utils_iface_valid_name (ifname) && strcmp (ifname, "*") != 0) { - g_string_printf (nmc->return_text, - _("Error: 'ifname': '%s' is not a valid interface nor '*'."), - ifname); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + if (!setting_name) + return FALSE; + + /* Now ask for the settings. */ + if (want_provide_opt_args (setting_name_to_name (setting_name), count)) { + for (candidate = option_info; candidate->setting_name; candidate++) { + if (!option_relevant (connection, candidate)) + continue; + if (strcmp (setting_name, candidate->setting_name)) + continue; + ask_option (nmc, connection, candidate); } - /* Special value of '*' means no specific interface name */ - if (strcmp (ifname, "*") == 0) - ifname = NULL; } + /* Make sure we won't ask again. */ + disable_options (setting_name, NULL); + + return TRUE; +} + +static NMCResultCode +do_connection_add (NmCli *nmc, int argc, char **argv) +{ + NMConnection *connection = NULL; + NMSettingConnection *s_con; + GError *error = NULL; + AddConnectionInfo *info = NULL; + gboolean save_bool = TRUE; + OptionInfo *candidate; + gboolean seen_dash_dash = FALSE; + + rl_attempted_completion_function = (rl_completion_func_t *) nmcli_con_add_tab_completion; + + nmc->return_value = NMC_RESULT_SUCCESS; + /* Create a new connection object */ connection = nm_simple_connection_new (); /* Build up the 'connection' setting */ s_con = (NMSettingConnection *) nm_setting_connection_new (); - uuid = nm_utils_uuid_generate (); - if (con_name) - default_name = g_strdup (con_name); - else { - char *try_name = ifname ? - g_strdup_printf ("%s-%s", get_name_alias (setting_name, nmc_valid_connection_types), ifname) - : g_strdup (get_name_alias (setting_name, nmc_valid_connection_types)); - default_name = nmc_unique_connection_name (nmc->connections, try_name); - g_free (try_name); - } - - if (master) - /* Verify master argument */ - checked_master = normalized_master_for_slave (nmc->connections, master, slave_type, &slave_type); - - g_object_set (s_con, - NM_SETTING_CONNECTION_ID, default_name, - NM_SETTING_CONNECTION_UUID, uuid, - NM_SETTING_CONNECTION_TYPE, setting_name, - NM_SETTING_CONNECTION_AUTOCONNECT, auto_bool, - NM_SETTING_CONNECTION_INTERFACE_NAME, ifname, - NM_SETTING_CONNECTION_MASTER, checked_master, - NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type, - NULL); - g_free (uuid); - g_free (default_name); nm_connection_add_setting (connection, NM_SETTING (s_con)); - if (!complete_connection_by_type (connection, - setting_name, - nmc->connections, - nmc->ask, - nmc->show_secrets, - argc, - argv, - &error)) { +read_properties: + /* Get the arguments from the command line if any */ + if (argc && !nmc_read_connection_properties (nmc, connection, &argc, &argv, &error)) { + if (g_strcmp0 (*argv, "--") == 0 && !seen_dash_dash) { + /* This is for compatibility with older nmcli that required + * options and properties to be separated with "--" */ + g_clear_error (&error); + seen_dash_dash = TRUE; + next_arg (&argc, &argv); + 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) { + g_string_printf (nmc->return_text, + _("Error: value for '%s' argument is required."), + "save"); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + goto finish; + } + if (!nmc_string_to_bool (*argv, &save_bool, &error)) { + g_string_printf (nmc->return_text, _("Error: 'save': %s."), + error->message); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + g_clear_error (&error); + goto finish; + } + next_arg (&argc, &argv); + goto read_properties; + } + g_string_assign (nmc->return_text, error->message); nmc->return_value = error->code; g_clear_error (&error); - goto error; + goto finish; + } + + if (nmc->complete) + goto finish; + + /* Now ask user for the rest of the mandatory options. */ + if (nmc->ask) + questionnaire_mandatory (nmc, connection); + + /* Traditionally, we didn't ask for these options for ethernet slaves. They don't + * make much sense, since these are likely to be set by the master anyway. */ + if (nm_setting_connection_get_slave_type (s_con)) { + disable_options (NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU); + disable_options (NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS); + disable_options (NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_CLONED_MAC_ADDRESS); + } + + /* Connection id is special in that it's required but we don't insist + * on getting it from the user -- we just make up something sensible. */ + if (!nm_setting_connection_get_id (s_con)) { + const char *ifname = nm_setting_connection_get_interface_name (s_con); + const char *type = nm_setting_connection_get_connection_type (s_con); + const char *slave_type = nm_setting_connection_get_slave_type (s_con); + char *try_name, *default_name; + + /* If only bother when there's a type, which is not guaranteed at this point. + * Otherwise the validation will fail anyway. */ + if (type) { + try_name = ifname ? g_strdup_printf ("%s-%s", get_name_alias (type, slave_type, nmc_valid_connection_types), ifname) + : g_strdup (get_name_alias (type, slave_type, nmc_valid_connection_types)); + default_name = nmc_unique_connection_name (nmc->connections, try_name); + g_free (try_name); + g_object_set (s_con, NM_SETTING_CONNECTION_ID, default_name, NULL); + g_free (default_name); + } + } + + /* For some software connection types we generate the interface name for the user. */ + set_default_interface_name (nmc, s_con); + + /* Now see if there's something optional that needs to be asked for. + * Keep asking until there's no more things to ask for. */ + do { + /* This ensures all settings that make sense are present. */ + nm_connection_normalize (connection, NULL, NULL, NULL); + } while (nmc->ask && questionnaire_one_optional (nmc, connection)); + + /* Mandatory settings. No good reason to check this other than guarding the user + * from doing something that's not likely to make sense (such as missing ifname + * on a bond/bridge/team, etc.). Added just to preserve traditional behavior, it + * perhaps is a good idea to just remove this. */ + for (candidate = option_info; candidate->setting_name; candidate++) { + if (!option_relevant (connection, candidate)) + continue; + if (candidate->flags & OPTION_REQD) { + g_string_printf (nmc->return_text, _("Error: '%s' argument is required."), candidate->option); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + goto finish; + } } nmc->should_wait++; @@ -7074,21 +4940,14 @@ do_connection_add (NmCli *nmc, int argc, char **argv) add_connection_cb, info); +finish: + reset_options (); if (connection) g_object_unref (connection); return nmc->return_value; - -error: - if (connection) - g_object_unref (connection); - g_free (type_ask); - g_free (ifname_ask); - - return nmc->return_value; } - /*----------------------------------------------------------------------------*/ /* Functions for readline TAB completion in editor */ @@ -7100,7 +4959,7 @@ uuid_display_hook (char **array, int len, int max_len) char *tmp; const char *id; for (i = 1; i <= len; i++) { - con = nmc_find_connection (nmc_tab_completion.nmc->connections, "uuid", array[i], NULL); + con = nmc_find_connection (nmc_tab_completion.nmc->connections, "uuid", array[i], NULL, FALSE); id = con ? nm_connection_get_id (con) : NULL; if (id) { tmp = g_strdup_printf ("%s (%s)", array[i], id); @@ -9006,7 +6865,6 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t gboolean cmd_loop = TRUE; char *cmd_arg = NULL; char *cmd_arg_s, *cmd_arg_p, *cmd_arg_v; - const char *BASE_PROMPT = "nmcli> "; const NameItem *valid_settings_main = NULL; const NameItem *valid_settings_slave = NULL; char *valid_settings_str = NULL; @@ -9187,6 +7045,14 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t break; } nmc_setting_custom_init (setting); + + if (NM_IS_SETTING_WIRELESS (setting)) + nmc_setting_wireless_connect_handlers (NM_SETTING_WIRELESS (setting)); + else if (NM_IS_SETTING_IP4_CONFIG (setting)) + nmc_setting_ip4_connect_handlers (NM_SETTING_IP_CONFIG (setting)); + else if (NM_IS_SETTING_IP6_CONFIG (setting)) + nmc_setting_ip6_connect_handlers (NM_SETTING_IP_CONFIG (setting)); + nm_connection_add_setting (connection, setting); } /* Set global variable for use in TAB completion */ @@ -9814,21 +7680,10 @@ editor_init_new_connection (NmCli *nmc, NMConnection *connection) base_setting = nmc_setting_new_for_name (con_type); if (!base_setting) return; + nmc_setting_custom_init (base_setting); nm_connection_add_setting (connection, base_setting); - /* Set a sensible bond/team/bridge interface name by default */ - if (g_strcmp0 (con_type, NM_SETTING_BOND_SETTING_NAME) == 0) - g_object_set (s_con, - NM_SETTING_CONNECTION_INTERFACE_NAME, "nm-bond", - NULL); - if (g_strcmp0 (con_type, NM_SETTING_TEAM_SETTING_NAME) == 0) - g_object_set (s_con, - NM_SETTING_CONNECTION_INTERFACE_NAME, "nm-team", - NULL); - if (g_strcmp0 (con_type, NM_SETTING_BRIDGE_SETTING_NAME) == 0) - g_object_set (s_con, - NM_SETTING_CONNECTION_INTERFACE_NAME, "nm-bridge", - NULL); + set_default_interface_name (nmc, s_con); /* Set sensible initial VLAN values */ if (g_strcmp0 (con_type, NM_SETTING_VLAN_SETTING_NAME) == 0) { @@ -9836,52 +7691,9 @@ editor_init_new_connection (NmCli *nmc, NMConnection *connection) g_object_set (NM_SETTING_VLAN (base_setting), NM_SETTING_VLAN_PARENT, dev_ifname ? dev_ifname : "eth0", - NM_SETTING_VLAN_ID, 1, - NULL); - g_object_set (s_con, - NM_SETTING_CONNECTION_MASTER, dev_ifname ? dev_ifname : "eth0", - NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_VLAN_SETTING_NAME, - NULL); - } - - /* Initialize 'transport-mode' so that 'infiniband' is valid */ - if (g_strcmp0 (con_type, NM_SETTING_INFINIBAND_SETTING_NAME) == 0) - g_object_set (NM_SETTING_INFINIBAND (base_setting), - NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram", - NULL); - - /* Initialize 'number' so that 'cdma' is valid */ - if (g_strcmp0 (con_type, NM_SETTING_CDMA_SETTING_NAME) == 0) - g_object_set (NM_SETTING_CDMA (base_setting), - NM_SETTING_CDMA_NUMBER, "#777", - NULL); - - /* Initialize 'number' so that 'gsm' is valid */ - if (g_strcmp0 (con_type, NM_SETTING_GSM_SETTING_NAME) == 0) - g_object_set (NM_SETTING_GSM (base_setting), - NM_SETTING_GSM_NUMBER, "*99#", - NULL); - - /* Wi-Fi */ - if (g_strcmp0 (con_type, NM_SETTING_WIRELESS_SETTING_NAME) == 0) { - /* For Wi-Fi set mode to "infrastructure". Even though mode == NULL - * is regarded as "infrastructure", explicit value makes no doubts. - */ - g_object_set (NM_SETTING_WIRELESS (base_setting), - NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_INFRA, NULL); - - /* Do custom initialization for wifi setting */ - nmc_setting_custom_init (base_setting); } - /* ADSL */ - if (g_strcmp0 (con_type, NM_SETTING_ADSL_SETTING_NAME) == 0) { - /* Initialize a protocol */ - g_object_set (NM_SETTING_ADSL (base_setting), - NM_SETTING_ADSL_PROTOCOL, NM_SETTING_ADSL_PROTOCOL_PPPOE, - NULL); - } /* Always add IPv4 and IPv6 settings for non-slave connections */ setting = nm_setting_ip4_config_new (); @@ -9917,7 +7729,7 @@ editor_init_existing_connection (NMConnection *connection) } static NMCResultCode -do_connection_edit (NmCli *nmc, int argc, char **argv) +do_connection_edit_func (NmCli *nmc, int argc, char **argv) { NMConnection *connection = NULL; NMSettingConnection *s_con; @@ -9942,6 +7754,10 @@ 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; + nmc->return_value = NMC_RESULT_SUCCESS; if (argc == 1) @@ -9985,7 +7801,7 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) /* Existing connection */ NMConnection *found_con; - found_con = nmc_find_connection (nmc->connections, selector, con, NULL); + found_con = nmc_find_connection (nmc->connections, selector, con, NULL, FALSE); if (!found_con) { g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), con); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; @@ -10044,7 +7860,7 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) default_name = g_strdup (con_name); else default_name = nmc_unique_connection_name (nmc->connections, - get_name_alias (connection_type, nmc_valid_connection_types)); + get_name_alias (connection_type, NULL, nmc_valid_connection_types)); g_object_set (s_con, NM_SETTING_CONNECTION_ID, default_name, @@ -10098,6 +7914,46 @@ error: return nmc->return_value; } +typedef struct { + NmCli *nmc; + int argc; + char **argv; +} NmcEditorThreadData; + +static GThread *editor_thread; +static NmcEditorThreadData editor_thread_data; + +/* + * We need to run do_connection_edit_func() in a thread so that + * glib main loop is not blocked and could receive and process D-Bus + * return messages. + */ +static gpointer +connection_editor_thread_func (gpointer data) +{ + NmcEditorThreadData *td = (NmcEditorThreadData *) data; + + /* run editor for editing/adding connections */ + td->nmc->return_value = do_connection_edit_func (td->nmc, td->argc, td->argv); + + /* quit glib main loop now that we are done with this thread */ + quit (); + + return NULL; +} + +static NMCResultCode +do_connection_edit (NmCli *nmc, int argc, char **argv) +{ + nmc->should_wait++; + editor_thread_data.nmc = nmc; + editor_thread_data.argc = argc; + editor_thread_data.argv = argv; + editor_thread = g_thread_new ("editor-thread", connection_editor_thread_func, &editor_thread_data); + g_thread_unref (editor_thread); + + return nmc->return_value; +} static void modify_connection_cb (GObject *connection, @@ -10126,72 +7982,50 @@ modify_connection_cb (GObject *connection, static NMCResultCode do_connection_modify (NmCli *nmc, - gboolean temporary, int argc, char **argv) { NMConnection *connection = NULL; NMRemoteConnection *rc = NULL; - const char *name; - const char *selector = NULL; GError *error = NULL; + gboolean temporary = FALSE; - nmc->return_value = NMC_RESULT_SUCCESS; - - if (argc == 0) { - g_string_printf (nmc->return_text, _("Error: No arguments provided.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } - if ( strcmp (*argv, "id") == 0 - || strcmp (*argv, "uuid") == 0 - || strcmp (*argv, "path") == 0) { - - selector = *argv; - if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), - selector); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + if (argc && nmc_arg_is_option (*argv, "temporary")) { + if (nmc->complete) goto finish; - } - name = *argv; - } - name = *argv; - if (!name) { - g_string_printf (nmc->return_text, _("Error: connection ID is missing.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; + temporary = TRUE; + next_arg (&argc, &argv); } - connection = nmc_find_connection (nmc->connections, selector, name, NULL); + + connection = get_connection (nmc, &argc, &argv, NULL, &error); if (!connection) { - g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), name); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + g_string_printf (nmc->return_text, _("Error: %s."), error->message); + nmc->return_value = error->code; goto finish; } + rc = nm_client_get_connection_by_uuid (nmc->client, nm_connection_get_uuid (connection)); if (!rc) { - g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), name); + g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), + nm_connection_get_uuid (connection)); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto finish; } - if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: . argument is missing.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } - - if (!read_connection_properties (NM_CONNECTION (rc), argc, argv, &error)) { + if (!nmc_read_connection_properties (nmc, NM_CONNECTION (rc), &argc, &argv, &error)) { g_string_assign (nmc->return_text, error->message); nmc->return_value = error->code; g_clear_error (&error); goto finish; } - update_connection (!temporary, rc, modify_connection_cb, nmc); + if (nmc->complete) + goto finish; + update_connection (!temporary, rc, modify_connection_cb, nmc); nmc->should_wait++; + finish: return nmc->return_value; } @@ -10237,70 +8071,64 @@ clone_connection_cb (GObject *client, } static NMCResultCode -do_connection_clone (NmCli *nmc, gboolean temporary, int argc, char **argv) +do_connection_clone (NmCli *nmc, int argc, char **argv) { NMConnection *connection = NULL; NMConnection *new_connection = NULL; NMSettingConnection *s_con; CloneConnectionInfo *info; - const char *name; const char *new_name; - char *name_ask = NULL; char *new_name_ask = NULL; - const char *selector = NULL; char *uuid; + gboolean temporary = FALSE; + char **arg_arr = NULL; + int arg_num; + char ***argv_ptr = &argv; + int *argc_ptr = &argc; + GError *error = NULL; - if (argc == 0) { - if (nmc->ask) { - name = name_ask = nmc_readline (PROMPT_CONNECTION); - new_name = new_name_ask = nmc_readline (_("New connection name: ")); - } else { - g_string_printf (nmc->return_text, _("Error: No arguments provided.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } - } else { - if ( strcmp (*argv, "id") == 0 - || strcmp (*argv, "uuid") == 0 - || strcmp (*argv, "path") == 0) { + if (argc == 1 && nmc->complete) + nmc_complete_strings (*argv, "temporary", NULL); - selector = *argv; - if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), - selector); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } - } - name = *argv; - if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: argument is missing.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } - new_name = *argv; - if (next_arg (&argc, &argv) == 0) { - g_string_printf (nmc->return_text, _("Error: unexpected extra argument '%s'."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } + if (argc == 0 && nmc->ask) { + char *line; + + /* nmc_do_cmd() should not call this with argc=0. */ + g_assert (!nmc->complete); + + line = nmc_readline ("%s: ", PROMPT_CONNECTION); + nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num); + g_free (line); + argv_ptr = &arg_arr; + argc_ptr = &arg_num; + } else if (nmc_arg_is_option (*argv, "temporary")) { + temporary = TRUE; + next_arg (&argc, &argv); } - if (!name) { - g_string_printf (nmc->return_text, _("Error: connection ID is missing.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + connection = get_connection (nmc, argc_ptr, argv_ptr, NULL, &error); + if (!connection) { + g_string_printf (nmc->return_text, _("Error: %s."), error->message); + nmc->return_value = error->code; goto finish; } - if (!new_name) { + + if (nmc->complete) + goto finish; + + if (argv[0]) + new_name = *argv; + else if (nmc->ask) + new_name = new_name_ask = nmc_readline (_("New connection name: ")); + else { g_string_printf (nmc->return_text, _("Error: argument is missing.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; } - connection = nmc_find_connection (nmc->connections, selector, name, NULL); - if (!connection) { - g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), name); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + if (next_arg (argc_ptr, argv_ptr) == 0) { + g_string_printf (nmc->return_text, _("Error: unknown extra argument: '%s'."), *argv); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; } @@ -10332,11 +8160,10 @@ do_connection_clone (NmCli *nmc, gboolean temporary, int argc, char **argv) clone_connection_cb, info); - nmc->should_wait = TRUE; + nmc->should_wait++; finish: if (new_connection) g_object_unref (new_connection); - g_free (name_ask); g_free (new_name_ask); return nmc->return_value; @@ -10367,44 +8194,38 @@ do_connection_delete (NmCli *nmc, int argc, char **argv) NMConnection *connection; ConnectionCbInfo *info = NULL; GSList *queue = NULL, *iter; - char **arg_arr = NULL; + char **arg_arr = NULL, *old_arg; char **arg_ptr = argv; int arg_num = argc; GString *invalid_cons = NULL; int pos = 0; + GError *error = NULL; if (nmc->timeout == -1) nmc->timeout = 10; if (argc == 0) { if (nmc->ask) { - char *line = nmc_readline (PROMPT_CONNECTIONS); + char *line; + + /* nmc_do_cmd() should not call this with argc=0. */ + g_assert (!nmc->complete); + + line = nmc_readline ("%s: ", PROMPT_CONNECTIONS); nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num); g_free (line); arg_ptr = arg_arr; } if (arg_num == 0) { g_string_printf (nmc->return_text, _("Error: No connection specified.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto finish; } } while (arg_num > 0) { - const char *selector = NULL; - - if ( strcmp (*arg_ptr, "id") == 0 - || strcmp (*arg_ptr, "uuid") == 0 - || strcmp (*arg_ptr, "path") == 0) { - selector = *arg_ptr; - if (next_arg (&arg_num, &arg_ptr) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), selector); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } - } - - connection = nmc_find_connection (nmc->connections, selector, *arg_ptr, &pos); + old_arg = *arg_ptr; + connection = get_connection (nmc, &arg_num, &arg_ptr, &pos, &error); if (connection) { /* Check if the connection is unique. */ /* Calling delete for the same connection repeatedly would result in @@ -10412,23 +8233,28 @@ do_connection_delete (NmCli *nmc, int argc, char **argv) if (!g_slist_find (queue, connection)) queue = g_slist_prepend (queue, g_object_ref (connection)); } else { - g_printerr (_("Error: unknown connection '%s'\n"), *arg_ptr); - g_string_printf (nmc->return_text, _("Error: not all active connections found.")); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + if (!nmc->complete) + g_printerr (_("Error: %s.\n"), error->message); + g_string_printf (nmc->return_text, _("Error: not all connections found.")); + nmc->return_value = error->code; + g_clear_error (&error); + + if (nmc->return_value != NMC_RESULT_ERROR_NOT_FOUND) + goto finish; + if (!invalid_cons) invalid_cons = g_string_new (NULL); - g_string_append_printf (invalid_cons, "'%s', ", *arg_ptr); + g_string_append_printf (invalid_cons, "'%s', ", old_arg); } - - /* Take next argument (if there's no other connection of the same name) */ - if (!pos) - next_arg (&arg_num, &arg_ptr); } if (!queue) { - g_string_printf (nmc->return_text, _("Error: no connection provided.")); + g_string_printf (nmc->return_text, _("Error: No connection specified.")); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto finish; + } else if (nmc->complete) { + g_slist_free (queue); + goto finish; } queue = g_slist_reverse (queue); @@ -10505,10 +8331,15 @@ connection_removed (NMClient *client, NMRemoteConnection *con, NmCli *nmc) static NMCResultCode do_connection_monitor (NmCli *nmc, int argc, char **argv) { + GError *error = NULL; + if (argc == 0) { /* No connections specified. Monitor all. */ int i; + /* nmc_do_cmd() should not call this with argc=0. */ + g_assert (!nmc->complete); + nmc->connections = nm_client_get_connections (nmc->client); for (i = 0; i < nmc->connections->len; i++) connection_watch (nmc, g_ptr_array_index (nmc->connections, i)); @@ -10519,38 +8350,26 @@ do_connection_monitor (NmCli *nmc, int argc, char **argv) } else { /* Look up the specified connections and watch them. */ NMConnection *connection; - char **arg_ptr = argv; - int arg_num = argc; int pos = 0; do { - const char *selector = NULL; - - if ( strcmp (*arg_ptr, "id") == 0 - || strcmp (*arg_ptr, "uuid") == 0 - || strcmp (*arg_ptr, "path") == 0) { - selector = *arg_ptr; - if (next_arg (&arg_num, &arg_ptr) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), selector); - return NMC_RESULT_ERROR_USER_INPUT; - } - } - - connection = nmc_find_connection (nmc->connections, selector, *arg_ptr, &pos); - if (connection) { - connection_watch (nmc, connection); - } else { - g_printerr (_("Error: unknown connection '%s'\n"), *arg_ptr); + connection = get_connection (nmc, &argc, &argv, &pos, &error); + if (!connection) { + if (!nmc->complete) + g_printerr (_("Error: %s.\n"), error->message); g_string_printf (nmc->return_text, _("Error: not all connections found.")); - return NMC_RESULT_ERROR_NOT_FOUND; + return error->code; } - /* Take next argument (if there's no other connection of the same name) */ - if (!pos) - next_arg (&arg_num, &arg_ptr); - } while (arg_num > 0); + if (nmc->complete) + continue; + + connection_watch (nmc, connection); + } while (argc > 0); } + if (nmc->complete) + return nmc->return_value; g_signal_connect (nmc->client, NM_CLIENT_CONNECTION_REMOVED, G_CALLBACK (connection_removed), nmc); return NMC_RESULT_SUCCESS; @@ -10561,11 +8380,12 @@ do_connection_reload (NmCli *nmc, int argc, char **argv) { GError *error = NULL; - nmc->return_value = NMC_RESULT_SUCCESS; + if (nmc->complete) + return nmc->return_value; if (!nm_client_reload_connections (nmc->client, NULL, &error)) { g_string_printf (nmc->return_text, _("Error: failed to reload connections: %s."), - error->message); + nmc_error_get_simple_message (error)); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; g_clear_error (&error); } @@ -10580,14 +8400,14 @@ do_connection_load (NmCli *nmc, int argc, char **argv) char **filenames, **failures = NULL; int i; - nmc->return_value = NMC_RESULT_SUCCESS; - if (argc == 0) { g_string_printf (nmc->return_text, _("Error: No connection specified.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - return nmc->return_value; + return NMC_RESULT_ERROR_USER_INPUT; } + if (nmc->complete) + return NMC_RESULT_COMPLETE_FILE; + filenames = g_new (char *, argc + 1); for (i = 0; i < argc; i++) filenames[i] = argv[i]; @@ -10597,7 +8417,7 @@ do_connection_load (NmCli *nmc, int argc, char **argv) g_free (filenames); if (error) { g_string_printf (nmc->return_text, _("Error: failed to load connection: %s."), - error->message); + nmc_error_get_simple_message (error)); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; g_error_free (error); } @@ -10612,11 +8432,11 @@ do_connection_load (NmCli *nmc, int argc, char **argv) } // FIXME: change the text when non-VPN connection types are supported -#define PROMPT_IMPORT_TYPE PROMPT_VPN_TYPE -#define PROMPT_IMPORT_FILE _("File to import: ") +#define PROMPT_IMPORT_TYPE PROMPT_VPN_TYPE +#define PROMPT_IMPORT_FILE N_("File to import: ") static NMCResultCode -do_connection_import (NmCli *nmc, gboolean temporary, int argc, char **argv) +do_connection_import (NmCli *nmc, int argc, char **argv) { GError *error = NULL; const char *type = NULL, *filename = NULL; @@ -10624,11 +8444,16 @@ do_connection_import (NmCli *nmc, gboolean temporary, int argc, char **argv) AddConnectionInfo *info; NMConnection *connection = NULL; NMVpnEditorPlugin *plugin; + gs_free char *service_type = NULL; + gboolean temporary = FALSE; if (argc == 0) { + /* nmc_do_cmd() should not call this with argc=0. */ + g_assert (!nmc->complete); + if (nmc->ask) { - type_ask = nmc_readline (PROMPT_IMPORT_TYPE); - filename_ask = nmc_readline (PROMPT_IMPORT_FILE); + type_ask = nmc_readline (gettext (PROMPT_IMPORT_TYPE)); + filename_ask = nmc_readline (gettext (PROMPT_IMPORT_FILE)); type = type_ask = type_ask ? g_strstrip (type_ask) : NULL; filename = filename_ask = filename_ask ? g_strstrip (filename_ask) : NULL; } else { @@ -10639,6 +8464,13 @@ do_connection_import (NmCli *nmc, gboolean temporary, 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); + } + if (strcmp (*argv, "type") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); @@ -10656,6 +8488,8 @@ do_connection_import (NmCli *nmc, gboolean temporary, int argc, char **argv) nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; } + if (argc == 1 && nmc->complete) + nmc->return_value = NMC_RESULT_COMPLETE_FILE; if (!filename) filename = *argv; else @@ -10670,6 +8504,9 @@ do_connection_import (NmCli *nmc, gboolean temporary, int argc, char **argv) argv++; } + if (nmc->complete) + goto finish; + if (!type) { g_string_printf (nmc->return_text, _("Error: 'type' argument is required.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; @@ -10681,8 +8518,15 @@ do_connection_import (NmCli *nmc, gboolean temporary, int argc, char **argv) goto finish; } + service_type = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), type); + if (!service_type) { + g_string_printf (nmc->return_text, _("Error: failed to find VPN plugin for %s."), type); + nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + goto finish; + } + /* Import VPN configuration */ - plugin = nm_vpn_lookup_plugin (type, NULL, &error); + plugin = nm_vpn_get_editor_plugin (service_type, &error); if (!plugin) { g_string_printf (nmc->return_text, _("Error: failed to load VPN plugin: %s."), error->message); @@ -10709,7 +8553,7 @@ do_connection_import (NmCli *nmc, gboolean temporary, int argc, char **argv) add_connection_cb, info); - nmc->should_wait = TRUE; + nmc->should_wait++; finish: if (connection) g_object_unref (connection); @@ -10723,60 +8567,50 @@ static NMCResultCode do_connection_export (NmCli *nmc, int argc, char **argv) { NMConnection *connection = NULL; - const char *name; const char *out_name = NULL; char *name_ask = NULL; char *out_name_ask = NULL; const char *path = NULL; - const char *selector = NULL; const char *type = NULL; NMVpnEditorPlugin *plugin; GError *error = NULL; char tmpfile[] = "/tmp/nmcli-export-temp-XXXXXX"; + char **arg_arr = NULL; + int arg_num; + char ***argv_ptr = &argv; + int *argc_ptr = &argc; - if (argc == 0) { - if (nmc->ask) { - name_ask = nmc_readline (PROMPT_VPN_CONNECTION); - name = name_ask = name_ask ? g_strstrip (name_ask) : NULL; - out_name = out_name_ask = nmc_readline (_("Output file name: ")); - } else { - g_string_printf (nmc->return_text, _("Error: No arguments provided.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } - } else { - if ( strcmp (*argv, "id") == 0 - || strcmp (*argv, "uuid") == 0 - || strcmp (*argv, "path") == 0) { + if (argc == 0 && nmc->ask) { + char *line; - selector = *argv; - if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), - selector); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } - } - name = *argv; - if (next_arg (&argc, &argv) == 0) - out_name = *argv; + /* nmc_do_cmd() should not call this with argc=0. */ + g_assert (!nmc->complete); - if (next_arg (&argc, &argv) == 0) { - g_string_printf (nmc->return_text, _("Error: unknown extra argument: '%s'."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } + line = nmc_readline ("%s: ", PROMPT_VPN_CONNECTION); + nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num); + g_free (line); + argv_ptr = &arg_arr; + argc_ptr = &arg_num; } - if (!name) { - g_string_printf (nmc->return_text, _("Error: connection ID is missing.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + connection = get_connection (nmc, argc_ptr, argv_ptr, NULL, &error); + if (!connection) { + g_string_printf (nmc->return_text, _("Error: %s."), error->message); + nmc->return_value = error->code; goto finish; } - connection = nmc_find_connection (nmc->connections, selector, name, NULL); - if (!connection) { - g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), name); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + + 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: ")); + + if (next_arg (argc_ptr, argv_ptr) == 0) { + g_string_printf (nmc->return_text, _("Error: unknown extra argument: '%s'."), *argv); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; } @@ -10789,7 +8623,7 @@ do_connection_export (NmCli *nmc, int argc, char **argv) type = nm_setting_vpn_get_service_type (nm_connection_get_setting_vpn (connection)); /* Export VPN configuration */ - plugin = nm_vpn_lookup_plugin (type, NULL, &error); + plugin = nm_vpn_get_editor_plugin (type, &error); if (!plugin) { g_string_printf (nmc->return_text, _("Error: failed to load VPN plugin: %s."), error->message); @@ -10841,35 +8675,6 @@ finish: return nmc->return_value; } - -typedef struct { - NmCli *nmc; - int argc; - char **argv; -} NmcEditorThreadData; - -static GThread *editor_thread; -static NmcEditorThreadData editor_thread_data; - -/* - * We need to run do_connection_edit() in a thread so that - * glib main loop is not blocked and could receive and process D-Bus - * return messages. - */ -static gpointer -connection_editor_thread_func (gpointer data) -{ - NmcEditorThreadData *td = (NmcEditorThreadData *) data; - - /* run editor for editing/adding connections */ - td->nmc->return_value = do_connection_edit (td->nmc, td->argc, td->argv); - - /* quit glib main loop now that we are done with this thread */ - quit (); - - return NULL; -} - static char * gen_func_connection_names (const char *text, int state) { @@ -10956,206 +8761,49 @@ nmcli_con_tab_completion (const char *text, int start, int end) return match_array; } -static GArray * -parse_preferred_connection_order (const char *order, GError **error) -{ - char **strv, **iter; - const char *str; - GArray *order_arr; - NmcSortOrder val; - gboolean inverse, unique; - int i; - - strv = nmc_strsplit_set (order, ":", -1); - if (!strv || !*strv) { - g_set_error (error, NMCLI_ERROR, 0, - _("incorrect string '%s' of '--order' option"), order); - g_strfreev (strv); - return NULL; - } - - order_arr = g_array_sized_new (FALSE, FALSE, sizeof (NmcSortOrder), 4); - for (iter = strv; iter && *iter; iter++) { - str = *iter; - inverse = FALSE; - if (str[0] == '-') - inverse = TRUE; - if (str[0] == '+' || str[0] == '-') - str++; - - if (matches (str, "active") == 0) - val = inverse ? NMC_SORT_ACTIVE_INV : NMC_SORT_ACTIVE; - else if (matches (str, "name") == 0) - val = inverse ? NMC_SORT_NAME_INV : NMC_SORT_NAME; - else if (matches (str, "type") == 0) - val = inverse ? NMC_SORT_TYPE_INV : NMC_SORT_TYPE; - else if (matches (str, "path") == 0) - val = inverse ? NMC_SORT_PATH_INV : NMC_SORT_PATH; - else { - g_array_unref (order_arr); - order_arr = NULL; - g_set_error (error, NMCLI_ERROR, 0, - _("incorrect item '%s' in '--order' option"), *iter); - break; - } - /* Check for duplicates and ignore them. */ - unique = TRUE; - for (i = 0; i < order_arr->len; i++) { - if (abs (g_array_index (order_arr, NmcSortOrder, i)) - abs (val) == 0) { - unique = FALSE; - break; - } - } - - /* Value is ok and unique, add it to the array */ - if (unique) - g_array_append_val (order_arr, val); - } - - g_strfreev (strv); - return order_arr; -} +static const NMCCommand connection_cmds[] = { + {"show", do_connections_show, usage_connection_show }, + {"up", do_connection_up, usage_connection_up }, + {"down", do_connection_down, usage_connection_down }, + {"add", do_connection_add, usage_connection_add }, + {"edit", do_connection_edit, usage_connection_edit }, + {"delete", do_connection_delete, usage_connection_delete }, + {"reload", do_connection_reload, usage_connection_reload }, + {"load", do_connection_load, usage_connection_load }, + {"modify", do_connection_modify, usage_connection_modify }, + {"clone", do_connection_clone, usage_connection_clone }, + {"import", do_connection_import, usage_connection_import }, + {"export", do_connection_export, usage_connection_export }, + {"monitor", do_connection_monitor, usage_connection_monitor }, + {NULL, do_connections_show, usage }, +}; /* Entry point function for connections-related commands: 'nmcli connection' */ NMCResultCode do_connections (NmCli *nmc, int argc, char **argv) { - GError *error = NULL; - /* Register polkit agent */ nmc_start_polkit_agent_start_try (nmc); /* Set completion function for 'nmcli con' */ rl_attempted_completion_function = (rl_completion_func_t *) nmcli_con_tab_completion; - /* Exit early on help */ - if (nmc_arg_is_help (*argv)) { - usage (); - return nmc->return_value; - } - if (argc != 0 && nmc_arg_is_help (*(argv+1))) { - if (usage_connection_second_level (*argv)) - return nmc->return_value; - } - /* Get NMClient object early */ nmc->get_client (nmc); /* Check whether NetworkManager is running */ if (!nm_client_get_nm_running (nmc->client)) { - g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); - nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; + if (!nmc->complete) { + g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); + nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; + } return nmc->return_value; } /* Get the connection list */ nmc->connections = nm_client_get_connections (nmc->client); - /* Now parse the command line and perform the required operation */ - if (argc == 0) { - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) - goto opt_error; - nmc->return_value = do_connections_show (nmc, FALSE, FALSE, NULL, argc, argv); - } else { - if (matches (*argv, "show") == 0) { - gboolean active = FALSE; - gboolean show_secrets = FALSE; - GArray *order = NULL; - int i; - - next_arg (&argc, &argv); - /* check connection show options [--active] [--show-secrets] */ - for (i = 0; i < 3; i++) { - if (!active && nmc_arg_is_option (*argv, "active")) { - active = TRUE; - next_arg (&argc, &argv); - } - /* --show-secrets is deprecated in favour of global --show-secrets */ - /* Keep it here for backwards compatibility */ - if (!show_secrets && nmc_arg_is_option (*argv, "show-secrets")) { - show_secrets = TRUE; - next_arg (&argc, &argv); - } - if (!order && nmc_arg_is_option (*argv, "order")) { - if (next_arg (&argc, &argv) != 0) { - g_set_error_literal (&error, NMCLI_ERROR, 0, - _("'--order' argument is missing")); - goto opt_error; - } - order = parse_preferred_connection_order (*argv, &error); - if (error) - goto opt_error; - next_arg (&argc, &argv); - } - } - show_secrets = nmc->show_secrets || show_secrets; - nmc->return_value = do_connections_show (nmc, active, show_secrets, order, argc, argv); - if (order) - g_array_unref (order); - } else if (matches(*argv, "up") == 0) { - nmc->return_value = do_connection_up (nmc, argc-1, argv+1); - } else if (matches(*argv, "down") == 0) { - nmc->return_value = do_connection_down (nmc, argc-1, argv+1); - } else if (matches(*argv, "add") == 0) { - nmc->return_value = do_connection_add (nmc, argc-1, argv+1); - } else if (matches(*argv, "edit") == 0) { - nmc->should_wait++; - editor_thread_data.nmc = nmc; - editor_thread_data.argc = argc - 1; - editor_thread_data.argv = argv + 1; - editor_thread = g_thread_new ("editor-thread", connection_editor_thread_func, &editor_thread_data); - g_thread_unref (editor_thread); - } else if (matches(*argv, "delete") == 0) { - nmc->return_value = do_connection_delete (nmc, argc-1, argv+1); - } else if (matches(*argv, "reload") == 0) { - nmc->return_value = do_connection_reload (nmc, argc-1, argv+1); - } else if (matches(*argv, "load") == 0) { - nmc->return_value = do_connection_load (nmc, argc-1, argv+1); - } else if (matches (*argv, "modify") == 0) { - gboolean temporary = FALSE; - - next_arg (&argc, &argv); - if (nmc_arg_is_option (*argv, "temporary")) { - temporary = TRUE; - next_arg (&argc, &argv); - } - nmc->return_value = do_connection_modify (nmc, temporary, argc, argv); - } else if (matches (*argv, "clone") == 0) { - gboolean temporary = FALSE; - - next_arg (&argc, &argv); - if (nmc_arg_is_option (*argv, "temporary")) { - temporary = TRUE; - next_arg (&argc, &argv); - } - nmc->return_value = do_connection_clone (nmc, temporary, argc, argv); - } else if (matches(*argv, "import") == 0) { - gboolean temporary = FALSE; - - next_arg (&argc, &argv); - if (nmc_arg_is_option (*argv, "temporary")) { - temporary = TRUE; - next_arg (&argc, &argv); - } - nmc->return_value = do_connection_import (nmc, temporary, argc, argv); - } else if (matches(*argv, "export") == 0) { - nmc->return_value = do_connection_export (nmc, argc-1, argv+1); - } else if (matches(*argv, "monitor") == 0) { - nmc->return_value = do_connection_monitor (nmc, argc-1, argv+1); - } else { - usage (); - g_string_printf (nmc->return_text, _("Error: '%s' is not valid 'connection' command."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - } - } - - return nmc->return_value; - -opt_error: - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - g_error_free (error); - return nmc->return_value; + return nmc_do_cmd (nmc, connection_cmds, *argv, argc, argv); } void diff --git a/clients/cli/connections.h b/clients/cli/connections.h index c158b634..c73178e2 100644 --- a/clients/cli/connections.h +++ b/clients/cli/connections.h @@ -26,4 +26,19 @@ NMCResultCode do_connections (NmCli *nmc, int argc, char **argv); void monitor_connections (NmCli *nmc); +gboolean +nmc_read_connection_properties (NmCli *nmc, + NMConnection *connection, + int *argc, + char ***argv, + GError **error); + +void nmc_active_connection_state_to_color (NMActiveConnectionState state, NmcTermColor *color); + +extern NmcOutputField nmc_fields_con_show[]; +extern NmcOutputField nmc_fields_settings_names[]; +extern NmcOutputField nmc_fields_con_active_details_general[]; +extern NmcOutputField nmc_fields_con_active_details_vpn[]; +extern NmcOutputField nmc_fields_con_active_details_groups[]; + #endif /* NMC_CONNECTIONS_H */ diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 1e3d9e42..afa769f6 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -30,13 +30,14 @@ #include "utils.h" #include "common.h" #include "devices.h" +#include "connections.h" /* define some prompts */ #define PROMPT_INTERFACE _("Interface: ") #define PROMPT_INTERFACES _("Interface(s): ") /* Available fields for 'device status' */ -static NmcOutputField nmc_fields_dev_status[] = { +NmcOutputField nmc_fields_dev_status[] = { {"DEVICE", N_("DEVICE")}, /* 0 */ {"TYPE", N_("TYPE")}, /* 1 */ {"STATE", N_("STATE")}, /* 2 */ @@ -51,7 +52,7 @@ static NmcOutputField nmc_fields_dev_status[] = { /* Available fields for 'device show' - GENERAL part */ -static NmcOutputField nmc_fields_dev_show_general[] = { +NmcOutputField nmc_fields_dev_show_general[] = { {"NAME", N_("NAME")}, /* 0 */ {"DEVICE", N_("DEVICE")}, /* 1 */ {"TYPE", N_("TYPE")}, /* 2 */ @@ -85,7 +86,7 @@ static NmcOutputField nmc_fields_dev_show_general[] = { #define NMC_FIELDS_DEV_SHOW_GENERAL_COMMON "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,HWADDR,STATE" /* Available fields for 'device show' - CONNECTIONS part */ -static NmcOutputField nmc_fields_dev_show_connections[] = { +NmcOutputField nmc_fields_dev_show_connections[] = { {"NAME", N_("NAME")}, /* 0 */ {"AVAILABLE-CONNECTION-PATHS", N_("AVAILABLE-CONNECTION-PATHS")}, /* 1 */ {"AVAILABLE-CONNECTIONS", N_("AVAILABLE-CONNECTIONS")}, /* 2 */ @@ -95,7 +96,7 @@ static NmcOutputField nmc_fields_dev_show_connections[] = { #define NMC_FIELDS_DEV_SHOW_CONNECTIONS_COMMON "AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS" /* Available fields for 'device show' - CAPABILITIES part */ -static NmcOutputField nmc_fields_dev_show_cap[] = { +NmcOutputField nmc_fields_dev_show_cap[] = { {"NAME", N_("NAME")}, /* 0 */ {"CARRIER-DETECT", N_("CARRIER-DETECT")}, /* 1 */ {"SPEED", N_("SPEED")}, /* 2 */ @@ -106,7 +107,7 @@ static NmcOutputField nmc_fields_dev_show_cap[] = { #define NMC_FIELDS_DEV_SHOW_CAP_COMMON "NAME,CARRIER-DETECT,SPEED,IS-SOFTWARE" /* Available fields for 'device show' - wired properties part */ -static NmcOutputField nmc_fields_dev_show_wired_prop[] = { +NmcOutputField nmc_fields_dev_show_wired_prop[] = { {"NAME", N_("NAME")}, /* 0 */ {"CARRIER", N_("CARRIER")}, /* 1 */ {"S390-SUBCHANNELS", N_("S390-SUBCHANNELS")}, /* 2 */ @@ -116,7 +117,7 @@ static NmcOutputField nmc_fields_dev_show_wired_prop[] = { #define NMC_FIELDS_DEV_SHOW_WIRED_PROP_COMMON "NAME,CARRIER,S390-SUBCHANNELS" /* Available fields for 'device show' - wireless properties part */ -static NmcOutputField nmc_fields_dev_show_wifi_prop[] = { +NmcOutputField nmc_fields_dev_show_wifi_prop[] = { {"NAME", N_("NAME")}, /* 0 */ {"WEP", N_("WEP")}, /* 1 */ {"WPA", N_("WPA")}, /* 2 */ @@ -133,7 +134,7 @@ static NmcOutputField nmc_fields_dev_show_wifi_prop[] = { #define NMC_FIELDS_DEV_SHOW_WIFI_PROP_COMMON "NAME,WEP,WPA,WPA2,TKIP,CCMP,AP,ADHOC" /* Available fields for 'device show' - wimax properties part */ -static NmcOutputField nmc_fields_dev_show_wimax_prop[] = { +NmcOutputField nmc_fields_dev_show_wimax_prop[] = { {"NAME", N_("NAME")}, /* 0 */ {"CTR-FREQ", N_("CTR-FREQ")}, /* 1 */ {"RSSI", N_("RSSI")}, /* 2 */ @@ -146,7 +147,7 @@ static NmcOutputField nmc_fields_dev_show_wimax_prop[] = { #define NMC_FIELDS_DEV_SHOW_WIMAX_PROP_COMMON "NAME,CTR-FREQ,RSSI,CINR,TX-POW,BSID" /* Available fields for 'device wifi list' */ -static NmcOutputField nmc_fields_dev_wifi_list[] = { +NmcOutputField nmc_fields_dev_wifi_list[] = { {"NAME", N_("NAME")}, /* 0 */ {"SSID", N_("SSID")}, /* 1 */ {"SSID-HEX", N_("SSID-HEX")}, /* 2 */ @@ -172,7 +173,7 @@ static NmcOutputField nmc_fields_dev_wifi_list[] = { #define NMC_FIELDS_DEV_WIFI_LIST_FOR_DEV_LIST "NAME,"NMC_FIELDS_DEV_WIFI_LIST_COMMON /* Available fields for 'device wimax list' */ -static NmcOutputField nmc_fields_dev_wimax_list[] = { +NmcOutputField nmc_fields_dev_wimax_list[] = { {"NAME", N_("NAME")}, /* 0 */ {"NSP", N_("NSP")}, /* 1 */ {"SIGNAL", N_("SIGNAL")}, /* 2 */ @@ -186,8 +187,8 @@ static NmcOutputField nmc_fields_dev_wimax_list[] = { #define NMC_FIELDS_DEV_WIMAX_LIST_COMMON "NSP,SIGNAL,TYPE,DEVICE,ACTIVE" #define NMC_FIELDS_DEV_WIMAX_LIST_FOR_DEV_LIST "NAME,"NMC_FIELDS_DEV_WIMAX_LIST_COMMON -/* Available fields for 'device show' - BOND, TEAM, BRIDGE part */ -static NmcOutputField nmc_fields_dev_show_master_prop[] = { +/* Available fields for 'device show' - BOND, BRIDGE part */ +NmcOutputField nmc_fields_dev_show_master_prop[] = { {"NAME", N_("NAME")}, /* 0 */ {"SLAVES", N_("SLAVES")}, /* 1 */ {NULL, NULL} @@ -195,8 +196,18 @@ static NmcOutputField nmc_fields_dev_show_master_prop[] = { #define NMC_FIELDS_DEV_SHOW_MASTER_PROP_ALL "NAME,SLAVES" #define NMC_FIELDS_DEV_SHOW_MASTER_PROP_COMMON "NAME,SLAVES" +/* Available fields for 'device show' - TEAM part */ +NmcOutputField nmc_fields_dev_show_team_prop[] = { + {"NAME", N_("NAME")}, /* 0 */ + {"SLAVES", N_("SLAVES")}, /* 1 */ + {"CONFIG", N_("CONFIG")}, /* 2 */ + {NULL, NULL} +}; +#define NMC_FIELDS_DEV_SHOW_TEAM_PROP_ALL "NAME,SLAVES,CONFIG" +#define NMC_FIELDS_DEV_SHOW_TEAM_PROP_COMMON "NAME,SLAVES,CONFIG" + /* Available fields for 'device show' - VLAN part */ -static NmcOutputField nmc_fields_dev_show_vlan_prop[] = { +NmcOutputField nmc_fields_dev_show_vlan_prop[] = { {"NAME", N_("NAME")}, /* 0 */ {"PARENT", N_("PARENT")}, /* 1 */ {"ID", N_("ID")}, /* 2 */ @@ -206,7 +217,7 @@ static NmcOutputField nmc_fields_dev_show_vlan_prop[] = { #define NMC_FIELDS_DEV_SHOW_VLAN_PROP_COMMON "NAME,PARENT,ID" /* Available fields for 'device show' - BLUETOOTH part */ -static NmcOutputField nmc_fields_dev_show_bluetooth[] = { +NmcOutputField nmc_fields_dev_show_bluetooth[] = { {"NAME", N_("NAME")}, /* 0 */ {"CAPABILITIES", N_("CAPABILITIES")}, /* 1 */ {NULL, NULL} @@ -221,7 +232,7 @@ extern NmcOutputField nmc_fields_dhcp4_config[]; extern NmcOutputField nmc_fields_dhcp6_config[]; /* Available sections for 'device show' */ -static NmcOutputField nmc_fields_dev_show_sections[] = { +NmcOutputField nmc_fields_dev_show_sections[] = { {"GENERAL", N_("GENERAL"), 0, nmc_fields_dev_show_general + 1 }, /* 0 */ {"CAPABILITIES", N_("CAPABILITIES"), 0, nmc_fields_dev_show_cap + 1 }, /* 1 */ {"WIFI-PROPERTIES", N_("WIFI-PROPERTIES"), 0, nmc_fields_dev_show_wifi_prop + 1 }, /* 2 */ @@ -234,7 +245,7 @@ static NmcOutputField nmc_fields_dev_show_sections[] = { {"IP6", N_("IP6"), 0, nmc_fields_ip6_config + 1 }, /* 9 */ {"DHCP6", N_("DHCP6"), 0, nmc_fields_dhcp6_config + 1 }, /* 10 */ {"BOND", N_("BOND"), 0, nmc_fields_dev_show_master_prop + 1 }, /* 11 */ - {"TEAM", N_("TEAM"), 0, nmc_fields_dev_show_master_prop + 1 }, /* 12 */ + {"TEAM", N_("TEAM"), 0, nmc_fields_dev_show_team_prop + 1 }, /* 12 */ {"BRIDGE", N_("BRIDGE"), 0, nmc_fields_dev_show_master_prop + 1 }, /* 13 */ {"VLAN", N_("VLAN"), 0, nmc_fields_dev_show_vlan_prop + 1 }, /* 14 */ {"BLUETOOTH", N_("BLUETOOTH"), 0, nmc_fields_dev_show_bluetooth + 1 }, /* 15 */ @@ -247,7 +258,7 @@ static NmcOutputField nmc_fields_dev_show_sections[] = { "GENERAL.CONNECTION,GENERAL.CON-PATH,WIRED-PROPERTIES,IP4,IP6" /* Available fields for 'device lldp' */ -static NmcOutputField nmc_fields_dev_lldp_list[] = { +NmcOutputField nmc_fields_dev_lldp_list[] = { {"NAME", N_("NAME")}, /* 0 */ {"DEVICE", N_("DEVICE")}, /* 1 */ {"CHASSIS-ID", N_("CHASSIS-ID")}, /* 2 */ @@ -281,12 +292,13 @@ static void usage (void) { g_printerr (_("Usage: nmcli device { COMMAND | help }\n\n" - "COMMAND := { status | show | connect | reapply | disconnect | delete | monitor | wifi | lldp }\n\n" + "COMMAND := { status | show | set | connect | reapply | modify | disconnect | delete | monitor | wifi | lldp }\n\n" " status\n\n" " show []\n\n" " set [ifname] [autoconnect yes|no] [managed yes|no]\n\n" " connect \n\n" " reapply \n\n" + " modify ([+|-]. )+\n\n" " disconnect ...\n\n" " delete ...\n\n" " monitor ...\n\n" @@ -348,6 +360,26 @@ usage_device_reapply (void) "made since it was last applied.\n\n")); } +static void +usage_device_modify (void) +{ + g_printerr (_("Usage: nmcli device modify { ARGUMENTS | --help }\n" + "\n" + "ARGUMENTS := ([+|-]. )+\n" + "\n" + "Modify one or more properties currently active on the device without modifying\n" + "the connection profile. The changes have immediate effect. For multi-valued\n" + "properties you can use optional '+' or '-' prefix to the property name.\n" + "The '+' sign allows appending items instead of overwriting the whole value.\n" + "The '-' sign allows removing selected items instead of the whole value.\n" + "\n" + "Examples:\n" + "nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/8\"\n" + "nmcli dev mod em1 +ipv4.dns 8.8.4.4\n" + "nmcli dev mod em1 -ipv4.dns 1\n" + "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n")); +} + static void usage_device_disconnect (void) { @@ -489,8 +521,8 @@ compare_devices (const void *a, const void *b) nm_device_get_iface (db)); } -static NMDevice ** -get_devices_sorted (NMClient *client) +NMDevice ** +nmc_get_devices_sorted (NMClient *client) { const GPtrArray *devs; NMDevice **sorted; @@ -505,8 +537,33 @@ get_devices_sorted (NMClient *client) return sorted; } +static void +complete_device (NMDevice **devices, const char *prefix, gboolean wifi_only) +{ + int i; + + for (i = 0; devices[i]; i++) { + const char *iface = nm_device_get_iface (devices[i]); + + if (wifi_only && !NM_IS_DEVICE_WIFI (devices[i])) + continue; + + if (g_str_has_prefix (iface, prefix)) + g_print ("%s\n", iface); + } +} + +void +nmc_complete_device (NMClient *client, const char *prefix, gboolean wifi_only) +{ + gs_free NMDevice **devices = NULL; + + devices = nmc_get_devices_sorted (client); + complete_device (devices, prefix, wifi_only); +} + static GSList * -device_list (NmCli *nmc, int argc, char **argv) +get_device_list (NmCli *nmc, int argc, char **argv) { int arg_num = argc; char **arg_arr = NULL; @@ -530,8 +587,11 @@ device_list (NmCli *nmc, int argc, char **argv) } } - devices = get_devices_sorted (nmc->client); + devices = nmc_get_devices_sorted (nmc->client); while (arg_num > 0) { + if (arg_num == 1 && nmc->complete) + complete_device (devices, *arg_ptr, FALSE); + device = NULL; for (i = 0; devices[i]; i++) { if (!g_strcmp0 (nm_device_get_iface (devices[i]), *arg_ptr)) { @@ -546,7 +606,8 @@ device_list (NmCli *nmc, int argc, char **argv) else g_printerr (_("Warning: argument '%s' is duplicated.\n"), *arg_ptr); } else { - g_printerr (_("Error: Device '%s' not found.\n"), *arg_ptr); + if (!nmc->complete) + g_printerr (_("Error: Device '%s' not found.\n"), *arg_ptr); g_string_printf (nmc->return_text, _("Error: not all devices found.")); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; } @@ -562,6 +623,45 @@ error: return queue; } +static NMDevice * +get_device (NmCli *nmc, int *argc, char ***argv, GError **error) +{ + gs_free NMDevice **devices = NULL; + gs_free char *ifname_ask = NULL; + const char *ifname = NULL; + int i; + + if (*argc == 0) { + if (nmc->ask) + ifname = ifname_ask = nmc_readline (PROMPT_INTERFACE); + + if (!ifname_ask) { + g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("No interface specified")); + return NULL; + } + } else { + ifname = **argv; + next_arg (argc, argv); + } + + devices = nmc_get_devices_sorted (nmc->client); + for (i = 0; devices[i]; i++) { + if (!g_strcmp0 (nm_device_get_iface (devices[i]), ifname)) + break; + } + + if (nmc->complete && !*argc) + complete_device (devices, ifname, FALSE); + + if (devices[i] == NULL) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_NOT_FOUND, + _("Device '%s' not found"), ifname); + } + + return devices[i]; +} + static int compare_aps (gconstpointer a, gconstpointer b, gpointer user_data) { @@ -595,27 +695,22 @@ sort_access_points (const GPtrArray *aps) return sorted; } -typedef struct { - NmcTermColor color; - NmcTermFormat color_fmt; -} ColorInfo; - -static ColorInfo -wifi_signal_to_color (guint8 strength) +static void +wifi_signal_to_color (guint8 strength, NmcTermColor *color, NmcTermFormat *color_fmt) { - ColorInfo color_info = { NMC_TERM_COLOR_NORMAL, NMC_TERM_FORMAT_NORMAL }; + *color = NMC_TERM_COLOR_NORMAL; + *color_fmt = NMC_TERM_FORMAT_NORMAL; if (strength > 80) - color_info.color = NMC_TERM_COLOR_GREEN; + *color = NMC_TERM_COLOR_GREEN; else if (strength > 55) - color_info.color = NMC_TERM_COLOR_YELLOW; + *color = NMC_TERM_COLOR_YELLOW; else if (strength > 30) - color_info.color = NMC_TERM_COLOR_MAGENTA; + *color = NMC_TERM_COLOR_MAGENTA; else if (strength > 5) - color_info.color = NMC_TERM_COLOR_CYAN; + *color = NMC_TERM_COLOR_CYAN; else - color_info.color_fmt = NMC_TERM_FORMAT_DIM; - return color_info; + *color_fmt = NMC_TERM_FORMAT_DIM; } static char * @@ -687,7 +782,8 @@ fill_output_access_point (gpointer data, gpointer user_data) GString *security_str; char *ap_name; const char *sig_bars; - ColorInfo color_info; + NmcTermColor color; + NmcTermFormat color_fmt; if (info->active_bssid) { const char *current_bssid = nm_access_point_get_bssid (ap); @@ -774,9 +870,9 @@ fill_output_access_point (gpointer data, gpointer user_data) set_val_strc (arr, 16, nm_object_get_path (NM_OBJECT (ap))); /* Set colors */ - color_info = wifi_signal_to_color (strength); - set_val_color_all (arr, color_info.color); - set_val_color_fmt_all (arr, color_info.color_fmt); + wifi_signal_to_color (strength, &color, &color_fmt); + set_val_color_all (arr, color); + set_val_color_fmt_all (arr, color_fmt); if (active) arr[15].color = NMC_TERM_COLOR_GREEN; @@ -840,10 +936,10 @@ get_active_connection_id (NMDevice *device) } static gboolean -print_bond_team_bridge_info (NMDevice *device, - NmCli *nmc, - const char *group_prefix, - const char *one_field) +print_bond_bridge_info (NMDevice *device, + NmCli *nmc, + const char *group_prefix, + const char *one_field) { const GPtrArray *slaves = NULL; GString *slaves_str; @@ -853,10 +949,10 @@ print_bond_team_bridge_info (NMDevice *device, if (NM_IS_DEVICE_BOND (device)) slaves = nm_device_bond_get_slaves (NM_DEVICE_BOND (device)); - else if (NM_IS_DEVICE_TEAM (device)) - slaves = nm_device_team_get_slaves (NM_DEVICE_TEAM (device)); else if (NM_IS_DEVICE_BRIDGE (device)) slaves = nm_device_bridge_get_slaves (NM_DEVICE_BRIDGE (device)); + else + g_return_val_if_reached (FALSE); slaves_str = g_string_new (NULL); for (idx = 0; slaves && idx < slaves->len; idx++) { @@ -891,6 +987,76 @@ print_bond_team_bridge_info (NMDevice *device, return TRUE; } +static char * +sanitize_team_config (const char *config) +{ + char *ret; + int i; + + if (!config) + return NULL; + + ret = g_strdup (config); + + for (i = 0; i < strlen (ret); i++) { + if (ret[i] == '\n') + ret[i] = ' '; + } + + return ret; +} + +static gboolean +print_team_info (NMDevice *device, + NmCli *nmc, + const char *group_prefix, + const char *one_field) +{ + const GPtrArray *slaves = NULL; + GString *slaves_str; + int idx; + NmcOutputField *tmpl, *arr; + size_t tmpl_len; + + if (NM_IS_DEVICE_TEAM (device)) + slaves = nm_device_team_get_slaves (NM_DEVICE_TEAM (device)); + else + g_return_val_if_reached (FALSE); + + slaves_str = g_string_new (NULL); + for (idx = 0; slaves && idx < slaves->len; idx++) { + NMDevice *slave = g_ptr_array_index (slaves, idx); + const char *iface = nm_device_get_iface (slave); + + if (iface) { + g_string_append (slaves_str, iface); + g_string_append_c (slaves_str, ' '); + } + } + if (slaves_str->len > 0) + g_string_truncate (slaves_str, slaves_str->len-1); /* Chop off last space */ + + tmpl = nmc_fields_dev_show_team_prop; + tmpl_len = sizeof (nmc_fields_dev_show_team_prop); + nmc->print_fields.indices = parse_output_fields (one_field ? one_field : NMC_FIELDS_DEV_SHOW_TEAM_PROP_ALL, + tmpl, FALSE, NULL, NULL); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); + + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); + set_val_strc (arr, 0, group_prefix); /* TEAM */ + set_val_str (arr, 1, slaves_str->str); + set_val_str (arr, 2, sanitize_team_config (nm_device_team_get_config (NM_DEVICE_TEAM (device)))); + g_ptr_array_add (nmc->output_data, arr); + + print_data (nmc); /* Print all data */ + + g_string_free (slaves_str, FALSE); + nmc_empty_output_fields (nmc); + + return TRUE; +} + static gboolean show_device_info (NMDevice *device, NmCli *nmc) { @@ -1146,19 +1312,19 @@ show_device_info (NMDevice *device, NmCli *nmc) /* Bond specific information */ if (NM_IS_DEVICE_BOND (device)) { if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[11].name)) - was_output = print_bond_team_bridge_info (device, nmc, nmc_fields_dev_show_sections[11].name, section_fld); + was_output = print_bond_bridge_info (device, nmc, nmc_fields_dev_show_sections[11].name, section_fld); } /* Team specific information */ if (NM_IS_DEVICE_TEAM (device)) { if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[12].name)) - was_output = print_bond_team_bridge_info (device, nmc, nmc_fields_dev_show_sections[12].name, section_fld); + was_output = print_team_info (device, nmc, nmc_fields_dev_show_sections[12].name, section_fld); } /* Bridge specific information */ if (NM_IS_DEVICE_BRIDGE (device)) { if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[13].name)) - was_output = print_bond_team_bridge_info (device, nmc, nmc_fields_dev_show_sections[13].name, section_fld); + was_output = print_bond_bridge_info (device, nmc, nmc_fields_dev_show_sections[13].name, section_fld); } /* VLAN-specific information */ @@ -1264,20 +1430,20 @@ show_device_info (NMDevice *device, NmCli *nmc) return TRUE; } -static ColorInfo -device_state_to_color (NMDeviceState state) +void +nmc_device_state_to_color (NMDeviceState state, NmcTermColor *color, NmcTermFormat *color_fmt) { - ColorInfo color_info = { NMC_TERM_COLOR_NORMAL, NMC_TERM_FORMAT_NORMAL }; + *color = NMC_TERM_COLOR_NORMAL; + *color_fmt = NMC_TERM_FORMAT_NORMAL; if (state <= NM_DEVICE_STATE_UNAVAILABLE) - color_info.color_fmt= NMC_TERM_FORMAT_DIM; + *color_fmt= NMC_TERM_FORMAT_DIM; else if (state == NM_DEVICE_STATE_DISCONNECTED) - color_info.color = NMC_TERM_COLOR_RED; + *color = NMC_TERM_COLOR_RED; else if (state >= NM_DEVICE_STATE_PREPARE && state <= NM_DEVICE_STATE_SECONDARIES) - color_info.color = NMC_TERM_COLOR_YELLOW; + *color = NMC_TERM_COLOR_YELLOW; else if (state == NM_DEVICE_STATE_ACTIVATED) - color_info.color = NMC_TERM_COLOR_GREEN; - return color_info; + *color = NMC_TERM_COLOR_GREEN; } static void @@ -1285,7 +1451,8 @@ fill_output_device_status (NMDevice *device, NmCli *nmc) { NMActiveConnection *ac; NMDeviceState state; - ColorInfo color_info; + NmcTermColor color; + NmcTermFormat color_fmt; NmcOutputField *arr = nmc_dup_fields_array (nmc_fields_dev_status, sizeof (nmc_fields_dev_status), 0); @@ -1294,9 +1461,9 @@ fill_output_device_status (NMDevice *device, NmCli *nmc) ac = nm_device_get_active_connection (device); /* Show devices in color */ - color_info = device_state_to_color (state); - set_val_color_all (arr, color_info.color); - set_val_color_fmt_all (arr, color_info.color_fmt); + nmc_device_state_to_color (state, &color, &color_fmt); + set_val_color_all (arr, color); + set_val_color_fmt_all (arr, color_fmt); set_val_strc (arr, 0, nm_device_get_iface (device)); set_val_strc (arr, 1, nm_device_get_type_description (device)); @@ -1321,6 +1488,16 @@ do_devices_status (NmCli *nmc, int argc, char **argv) NmcOutputField *tmpl, *arr; size_t tmpl_len; + /* 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--; @@ -1341,8 +1518,7 @@ do_devices_status (NmCli *nmc, int argc, char **argv) if (error) { g_string_printf (nmc->return_text, _("Error: 'device status': %s"), error->message); g_error_free (error); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } /* Add headers */ @@ -1350,7 +1526,7 @@ do_devices_status (NmCli *nmc, int argc, char **argv) arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add (nmc->output_data, arr); - devices = get_devices_sorted (nmc->client); + devices = nmc_get_devices_sorted (nmc->client); for (i = 0; devices[i]; i++) fill_output_device_status (devices[i], nmc); @@ -1360,59 +1536,53 @@ do_devices_status (NmCli *nmc, int argc, char **argv) g_free (devices); return NMC_RESULT_SUCCESS; - -error: - return nmc->return_value; } static NMCResultCode -do_devices_show (NmCli *nmc, int argc, char **argv) +do_device_show (NmCli *nmc, int argc, char **argv) { - NMDevice **devices = NULL; - NMDevice *device = NULL; - const char *ifname = NULL; - int i; - gboolean ret; + gs_free_error GError *error = NULL; - if (argc == 1) - ifname = *argv; - else if (argc > 1) { - g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *(argv+1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } + if (!nmc->mode_specified) + nmc->multiline_output = TRUE; /* multiline mode is default for 'device show' */ - devices = get_devices_sorted (nmc->client); - - if (ifname) { - /* Interface specified; show details only for the device */ - for (i = 0; devices[i]; i++) { - NMDevice *candidate = devices[i]; - const char *dev_iface = nm_device_get_iface (candidate); + if (argc) { + NMDevice *device; - if (!g_strcmp0 (dev_iface, ifname)) - device = candidate; - } + device = get_device (nmc, &argc, &argv, &error); if (!device) { - g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; + g_string_printf (nmc->return_text, _("Error: %s."), error->message); + return error->code; + } + + if (argc) { + g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *argv); + return NMC_RESULT_ERROR_USER_INPUT; } + + if (nmc->complete) + return nmc->return_value; + show_device_info (device, nmc); } else { + NMDevice **devices = nmc_get_devices_sorted (nmc->client); + int i; + + /* nmc_do_cmd() should not call this with argc=0. */ + g_assert (!nmc->complete); + /* Show details for all devices */ for (i = 0; devices[i]; i++) { nmc_empty_output_fields (nmc); - ret = show_device_info (devices[i], nmc); - if (!ret) + if (!show_device_info (devices[i], nmc)) break; if (devices[i + 1]) g_print ("\n"); /* Empty line */ } + + g_free (devices); } -error: - g_free (devices); return nmc->return_value; } @@ -1657,57 +1827,27 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data) static NMCResultCode do_device_connect (NmCli *nmc, int argc, char **argv) { - NMDevice **devices; NMDevice *device = NULL; - const char *ifname = NULL; - char *ifname_ask = NULL; - int i; AddAndActivateInfo *info; + gs_free_error GError *error = NULL; /* Set default timeout for connect operation. */ if (nmc->timeout == -1) nmc->timeout = 90; - if (argc == 0) { - if (nmc->ask) - ifname = ifname_ask = nmc_readline (PROMPT_INTERFACE); - - if (!ifname_ask) { - g_string_printf (nmc->return_text, _("Error: No interface specified.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } - } else { - ifname = *argv; - } - - if (!ifname) { - g_string_printf (nmc->return_text, _("Error: No interface specified.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + device = get_device (nmc, &argc, &argv, &error); + if (!device) { + g_string_printf (nmc->return_text, _("Error: %s."), error->message); + return error->code; } - if (next_arg (&argc, &argv) == 0) { + if (*argv) { g_string_printf (nmc->return_text, _("Error: extra argument not allowed: '%s'."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } - - devices = get_devices_sorted (nmc->client); - for (i = 0; devices[i]; i++) { - NMDevice *candidate = devices[i]; - const char *dev_iface = nm_device_get_iface (candidate); - - if (!g_strcmp0 (dev_iface, ifname)) - device = candidate; + return NMC_RESULT_ERROR_USER_INPUT; } - g_free (devices); - if (!device) { - g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; - } + if (nmc->complete) + return nmc->return_value; /* * Use nowait_flag instead of should_wait, because exiting has to be postponed @@ -1740,9 +1880,6 @@ do_device_connect (NmCli *nmc, int argc, char **argv) if (nmc->print_output == NMC_PRINT_PRETTY) progress_id = g_timeout_add (120, progress_cb, device); -error: - g_free (ifname_ask); - return nmc->return_value; } @@ -1856,55 +1993,30 @@ reapply_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) static NMCResultCode do_device_reapply (NmCli *nmc, int argc, char **argv) { - gs_free NMDevice **devices = NULL; - NMDevice *device = NULL; + NMDevice *device; DeviceCbInfo *info = NULL; - char **arg_ptr = argv; - int arg_num = argc; - int i; - gs_free char *device_name_free = NULL; - const char *device_name = NULL; + gs_free_error GError *error = NULL; /* Set default timeout for reapply operation. */ if (nmc->timeout == -1) nmc->timeout = 10; - if (argc == 0) { - if (nmc->ask) { - device_name_free = nmc_readline (PROMPT_INTERFACE); - device_name = device_name_free; - } - if (!device_name) { - g_string_printf (nmc->return_text, _("Error: No interface specified.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - return nmc->return_value; - } - } else if (argc == 1) { - device_name = arg_ptr[0]; - next_arg (&arg_num, &arg_ptr); - } else { - next_arg (&arg_num, &arg_ptr); - g_string_printf (nmc->return_text, _("Error: unsupported argument '%s'."), *arg_ptr); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - return nmc->return_value; + device = get_device (nmc, &argc, &argv, &error); + if (!device) { + g_string_printf (nmc->return_text, _("Error: %s."), error->message); + return error->code; } - devices = get_devices_sorted (nmc->client); - for (i = 0; devices[i]; i++) { - if (!g_strcmp0 (nm_device_get_iface (devices[i]), device_name)) { - device = devices[i]; - break; - } + if (argc) { + g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *argv); + return NMC_RESULT_ERROR_USER_INPUT; } - if (!device) { - g_string_printf (nmc->return_text, _("Error: device '%s' not found."), device_name); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + if (nmc->complete) return nmc->return_value; - } nmc->nowait_flag = (nmc->timeout == 0); - nmc->should_wait = TRUE; + nmc->should_wait++; info = g_slice_new0 (DeviceCbInfo); info->nmc = nmc; @@ -1916,53 +2028,157 @@ do_device_reapply (NmCli *nmc, int argc, char **argv) return nmc->return_value; } +typedef struct { + NmCli *nmc; + int argc; + char **argv; +} ModifyInfo; + static void -disconnect_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) +modify_reapply_cb (GObject *object, GAsyncResult *result, gpointer user_data) { NMDevice *device = NM_DEVICE (object); - DeviceCbInfo *info = (DeviceCbInfo *) user_data; + ModifyInfo *info = user_data; NmCli *nmc = info->nmc; - NMDeviceState state; GError *error = NULL; - if (!nm_device_disconnect_finish (device, result, &error)) { - g_string_printf (nmc->return_text, _("Error: not all devices disconnected.")); - g_printerr (_("Error: Device '%s' (%s) disconnecting failed: %s\n"), - nm_device_get_iface (device), - nm_object_get_path (NM_OBJECT (device)), - error->message); + if (!nm_device_reapply_finish (device, result, &error)) { + g_string_printf (nmc->return_text, _("Error: Reapplying connection to device '%s' (%s) failed: %s"), + nm_device_get_iface (device), + nm_object_get_path (NM_OBJECT (device)), + error->message); g_error_free (error); nmc->return_value = NMC_RESULT_ERROR_DEV_DISCONNECT; - device_cb_info_finish (info, device); } else { - state = nm_device_get_state (device); - if (nmc->nowait_flag || state <= NM_DEVICE_STATE_DISCONNECTED) { - /* Don't want to wait or device already disconnected */ - if (state <= NM_DEVICE_STATE_DISCONNECTED) { - if (nmc->print_output == NMC_PRINT_PRETTY) - nmc_terminal_erase_line (); - g_print (_("Device '%s' successfully disconnected.\n"), - nm_device_get_iface (device)); - } - device_cb_info_finish (info, device); - } + if (nmc->print_output == NMC_PRINT_PRETTY) + nmc_terminal_erase_line (); + g_print (_("Connection successfully reapplied to device '%s'.\n"), + nm_device_get_iface (device)); } + + g_slice_free (ModifyInfo, info); + quit (); } -static NMCResultCode -do_device_disconnect (NmCli *nmc, int argc, char **argv) +static void +modify_get_applied_cb (GObject *object, + GAsyncResult *result, + gpointer user_data) { - NMDevice *device; - DeviceCbInfo *info = NULL; - GSList *queue, *iter; - - /* Set default timeout for disconnect operation. */ - if (nmc->timeout == -1) - nmc->timeout = 10; - - queue = device_list (nmc, argc, argv); - if (!queue) - goto error; + NMDevice *device = NM_DEVICE (object); + ModifyInfo *info = user_data; + NmCli *nmc = info->nmc; + gs_free_error GError *error = NULL; + NMConnection *connection; + guint64 version_id; + + connection = nm_device_get_applied_connection_finish (device, + result, + &version_id, + &error); + if (!connection) { + g_string_printf (nmc->return_text, _("Error: Reading applied connection from device '%s' (%s) failed: %s"), + nm_device_get_iface (device), + nm_object_get_path (NM_OBJECT (device)), + error->message); + nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + g_slice_free (ModifyInfo, info); + quit (); + return; + } + + if (!nmc_read_connection_properties (info->nmc, connection, &info->argc, &info->argv, &error)) { + g_string_assign (nmc->return_text, error->message); + nmc->return_value = error->code; + g_slice_free (ModifyInfo, info); + quit (); + return; + } + + if (nmc->complete) + quit (); + else + nm_device_reapply_async (device, connection, version_id, 0, NULL, modify_reapply_cb, info); +} + +static NMCResultCode +do_device_modify (NmCli *nmc, int argc, char **argv) +{ + NMDevice *device = NULL; + ModifyInfo *info = NULL; + gs_free_error GError *error = NULL; + + device = get_device (nmc, &argc, &argv, &error); + if (!device) { + g_string_printf (nmc->return_text, _("Error: %s."), error->message); + return error->code; + } + + if (nmc->timeout == -1) + nmc->timeout = 10; + + nmc->nowait_flag = (nmc->timeout == 0); + nmc->should_wait++; + + info = g_slice_new0 (ModifyInfo); + info->nmc = nmc; + info->argc = argc; + info->argv = argv; + + nm_device_get_applied_connection_async (device, 0, NULL, modify_get_applied_cb, info); + + return nmc->return_value; +} + +static void +disconnect_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) +{ + NMDevice *device = NM_DEVICE (object); + DeviceCbInfo *info = (DeviceCbInfo *) user_data; + NmCli *nmc = info->nmc; + NMDeviceState state; + GError *error = NULL; + + if (!nm_device_disconnect_finish (device, result, &error)) { + g_string_printf (nmc->return_text, _("Error: not all devices disconnected.")); + g_printerr (_("Error: Device '%s' (%s) disconnecting failed: %s\n"), + nm_device_get_iface (device), + nm_object_get_path (NM_OBJECT (device)), + error->message); + g_error_free (error); + nmc->return_value = NMC_RESULT_ERROR_DEV_DISCONNECT; + device_cb_info_finish (info, device); + } else { + state = nm_device_get_state (device); + if (nmc->nowait_flag || state <= NM_DEVICE_STATE_DISCONNECTED) { + /* Don't want to wait or device already disconnected */ + if (state <= NM_DEVICE_STATE_DISCONNECTED) { + if (nmc->print_output == NMC_PRINT_PRETTY) + nmc_terminal_erase_line (); + g_print (_("Device '%s' successfully disconnected.\n"), + nm_device_get_iface (device)); + } + device_cb_info_finish (info, device); + } + } +} + +static NMCResultCode +do_devices_disconnect (NmCli *nmc, int argc, char **argv) +{ + NMDevice *device; + DeviceCbInfo *info = NULL; + GSList *queue, *iter; + + /* Set default timeout for disconnect operation. */ + if (nmc->timeout == -1) + nmc->timeout = 10; + + queue = get_device_list (nmc, argc, argv); + if (!queue) + return nmc->return_value; + if (nmc->complete) + goto out; queue = g_slist_reverse (queue); info = g_slice_new0 (DeviceCbInfo); @@ -1988,7 +2204,7 @@ do_device_disconnect (NmCli *nmc, int argc, char **argv) nm_device_disconnect_async (device, NULL, disconnect_device_cb, info); } -error: +out: g_slist_free (queue); return nmc->return_value; } @@ -2017,7 +2233,7 @@ delete_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) } static NMCResultCode -do_device_delete (NmCli *nmc, int argc, char **argv) +do_devices_delete (NmCli *nmc, int argc, char **argv) { NMDevice *device; DeviceCbInfo *info = NULL; @@ -2027,9 +2243,11 @@ do_device_delete (NmCli *nmc, int argc, char **argv) if (nmc->timeout == -1) nmc->timeout = 10; - queue = device_list (nmc, argc, argv); + queue = get_device_list (nmc, argc, argv); if (!queue) - goto error; + return nmc->return_value; + if (nmc->complete) + goto out; queue = g_slist_reverse (queue); info = g_slice_new0 (DeviceCbInfo); @@ -2052,7 +2270,7 @@ do_device_delete (NmCli *nmc, int argc, char **argv) nm_device_delete_async (device, NULL, delete_device_cb, info); } -error: +out: g_slist_free (queue); return nmc->return_value; } @@ -2062,9 +2280,7 @@ do_device_set (NmCli *nmc, int argc, char **argv) { #define DEV_SET_AUTOCONNECT 0 #define DEV_SET_MANAGED 1 - NMDevice **devices; NMDevice *device = NULL; - const char *ifname = NULL; int i; struct { int idx; @@ -2073,63 +2289,42 @@ do_device_set (NmCli *nmc, int argc, char **argv) [DEV_SET_AUTOCONNECT] = { -1 }, [DEV_SET_MANAGED] = { -1 }, }; + gs_free_error GError *error = NULL; if (argc >= 1 && g_strcmp0 (*argv, "ifname") == 0) { argc--; argv++; } - if (argc == 0) { - g_string_printf (nmc->return_text, _("Error: No interface specified.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } else - ifname = *argv; - - if (!ifname) { - g_string_printf (nmc->return_text, _("Error: No interface specified.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } - - devices = get_devices_sorted (nmc->client); - for (i = 0; devices[i]; i++) { - NMDevice *candidate = devices[i]; - const char *dev_iface = nm_device_get_iface (candidate); - - if (!g_strcmp0 (dev_iface, ifname)) - device = candidate; - } - g_free (devices); - + device = get_device (nmc, &argc, &argv, &error); if (!device) { - g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; + g_string_printf (nmc->return_text, _("Error: %s."), error->message); + return error->code; } - if (argc == 1) { + if (!argc) { g_string_printf (nmc->return_text, _("Error: No property specified.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } i = 0; - while (next_arg (&argc, &argv) == 0) { + do { gboolean flag; - gs_free_error GError *tmp_err = NULL; + + if (argc == 1 && nmc->complete) + nmc_complete_strings (*argv, "managed", "autoconnect", NULL); if (matches (*argv, "managed") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: '%s' argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } - if (!nmc_string_to_bool (*argv, &flag, &tmp_err)) { + if (argc == 1 && nmc->complete) + nmc_complete_bool (*argv); + if (!nmc_string_to_bool (*argv, &flag, &error)) { g_string_printf (nmc->return_text, _("Error: 'managed': %s."), - tmp_err->message); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + error->message); + return NMC_RESULT_ERROR_USER_INPUT; } values[DEV_SET_MANAGED].idx = ++i; values[DEV_SET_MANAGED].value = flag; @@ -2137,25 +2332,26 @@ do_device_set (NmCli *nmc, int argc, char **argv) else if (matches (*argv, "autoconnect") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: '%s' argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } - if (!nmc_string_to_bool (*argv, &flag, &tmp_err)) { + if (argc == 1 && nmc->complete) + nmc_complete_bool (*argv); + if (!nmc_string_to_bool (*argv, &flag, &error)) { g_string_printf (nmc->return_text, _("Error: 'autoconnect': %s."), - tmp_err->message); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + error->message); + return NMC_RESULT_ERROR_USER_INPUT; } values[DEV_SET_AUTOCONNECT].idx = ++i; values[DEV_SET_AUTOCONNECT].value = flag; } else { - usage_device_set (); g_string_printf (nmc->return_text, _("Error: property '%s' is not known."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } - } + } while (next_arg (&argc, &argv) == 0); + + if (nmc->complete) + return nmc->return_value; /* when multiple properties are specified, set them in the order as they * are specified on the command line. */ @@ -2170,8 +2366,6 @@ do_device_set (NmCli *nmc, int argc, char **argv) if (values[DEV_SET_MANAGED].idx >= 0) nm_device_set_managed (device, values[DEV_SET_MANAGED].value); -error: - quit (); return nmc->return_value; } @@ -2179,10 +2373,14 @@ static void device_state (NMDevice *device, GParamSpec *pspec, NmCli *nmc) { NMDeviceState state = nm_device_get_state (device); - ColorInfo color = device_state_to_color (state); - char *str = nmc_colorize (nmc, color.color, color.color_fmt, "%s: %s\n", - nm_device_get_iface (device), - nmc_device_state_to_string (state)); + NmcTermColor color; + NmcTermFormat color_fmt; + char *str; + + nmc_device_state_to_color (state, &color, &color_fmt); + str = nmc_colorize (nmc, color, color_fmt, "%s: %s\n", + nm_device_get_iface (device), + nmc_device_state_to_string (state)); g_print ("%s", str); g_free (str); @@ -2235,8 +2433,14 @@ device_removed (NMClient *client, NMDevice *device, NmCli *nmc) } static NMCResultCode -do_device_monitor (NmCli *nmc, int argc, char **argv) +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; + if (argc == 0) { /* No devices specified. Monitor all. */ const GPtrArray *devices = nm_client_get_devices (nmc->client); @@ -2249,21 +2453,14 @@ do_device_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 { - /* Monitor just the specified devices. */ - GSList *queue = device_list (nmc, argc, argv); - GSList *iter; - - if (!queue) - return nmc->return_value; - + /* Monitor the specified devices. */ for (iter = queue; iter; iter = g_slist_next (iter)) device_watch (nmc, NM_DEVICE (iter->data)); g_slist_free (queue); } g_signal_connect (nmc->client, NM_CLIENT_DEVICE_REMOVED, G_CALLBACK (device_removed), nmc); - - return NMC_RESULT_SUCCESS; + return nmc->return_value; } static void @@ -2299,6 +2496,118 @@ show_access_point_info (NMDevice *device, NmCli *nmc) g_free (info); } +/* + * Find a Wi-Fi device with 'iface' in 'devices' array. If 'iface' is NULL, + * the first Wi-Fi device is returned. 'idx' parameter is updated to the point + * where the function finished so that the function can be called repeatedly + * to get next matching device. + * Returns: found device or NULL + */ +static NMDevice * +find_wifi_device_by_iface (NMDevice **devices, const char *iface, int *idx) +{ + int i; + + for (i = idx ? *idx : 0; devices[i]; i++) { + const char *dev_iface = nm_device_get_iface (devices[i]); + + if (!NM_IS_DEVICE_WIFI (devices[i])) + continue; + + if (iface) { + /* If a iface was specified then use it. */ + if (g_strcmp0 (dev_iface, iface) == 0) + break; + } else { + /* Else return the first Wi-Fi device. */ + break; + } + } + + if (idx) + *idx = i + 1; + return devices[i]; +} + +/* + * Find AP on 'device' according to 'bssid' or 'ssid' parameter. + * Returns: found AP or NULL + */ +static NMAccessPoint * +find_ap_on_device (NMDevice *device, const char *bssid, const char *ssid, gboolean complete) +{ + const GPtrArray *aps; + NMAccessPoint *ap = NULL; + int i; + + g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL); + + aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device)); + for (i = 0; i < aps->len; i++) { + NMAccessPoint *candidate_ap = g_ptr_array_index (aps, i); + + if (bssid) { + /* Parameter is BSSID */ + const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap); + + /* Compare BSSIDs */ + if (complete) { + if (g_str_has_prefix (candidate_bssid, bssid)) + g_print ("%s\n", candidate_bssid); + } else if (strcmp (bssid, candidate_bssid) == 0) { + ap = candidate_ap; + break; + } + } + + if (ssid) { + /* Parameter is SSID */ + GBytes *candidate_ssid; + char *ssid_tmp; + + candidate_ssid = nm_access_point_get_ssid (candidate_ap); + if (!candidate_ssid) + continue; + + ssid_tmp = nm_utils_ssid_to_utf8 (g_bytes_get_data (candidate_ssid, NULL), + g_bytes_get_size (candidate_ssid)); + + /* Compare SSIDs */ + if (complete) { + if (g_str_has_prefix (ssid_tmp, ssid)) + g_print ("%s\n", ssid_tmp); + } else if (strcmp (ssid, ssid_tmp) == 0) { + ap = candidate_ap; + g_free (ssid_tmp); + break; + } + g_free (ssid_tmp); + } + } + + return ap; +} + +static void +complete_aps (NMDevice **devices, const char *ifname, + const char *bssid_prefix, const char *ssid_prefix) +{ + int devices_idx = 0; + NMDevice *device; + + while ((device = find_wifi_device_by_iface (devices, ifname, &devices_idx))) + find_ap_on_device (device, bssid_prefix, ssid_prefix, TRUE); +} + +void +nmc_complete_bssid (NMClient *client, const char *ifname, const char *bssid_prefix) +{ + gs_free NMDevice **devices = NULL; + + devices = nmc_get_devices_sorted (client); + complete_aps (devices, ifname, bssid_prefix, NULL); +} + static NMCResultCode do_device_wifi_list (NmCli *nmc, int argc, char **argv) { @@ -2307,7 +2616,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) NMAccessPoint *ap = NULL; const char *ifname = NULL; const char *bssid_user = NULL; - NMDevice **devices = NULL; + gs_free NMDevice **devices = NULL; const GPtrArray *aps; APInfo *info; int i, j; @@ -2318,23 +2627,29 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) size_t tmpl_len; const char *base_hdr = _("Wi-Fi scan list"); + devices = nmc_get_devices_sorted (nmc->client); + 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) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } ifname = *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) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } bssid_user = *argv; - } else { + if (argc == 1 && nmc->complete) + complete_aps (devices, NULL, bssid_user, NULL); + } else if (!nmc->complete) { g_printerr (_("Unknown parameter: %s\n"), *argv); } @@ -2356,28 +2671,18 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) if (error) { g_string_printf (nmc->return_text, _("Error: 'device wifi': %s"), error->message); g_error_free (error); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } - devices = get_devices_sorted (nmc->client); - if (ifname) { - /* Device specified - list only APs of this interface */ - for (i = 0; devices[i]; i++) { - NMDevice *candidate = devices[i]; - const char *dev_iface = nm_device_get_iface (candidate); + if (nmc->complete) + return nmc->return_value; - if (!g_strcmp0 (dev_iface, ifname)) { - device = candidate; - break; - } - } + if (ifname) { + device = find_wifi_device_by_iface (devices, ifname, NULL); if (!device) { g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; + return NMC_RESULT_ERROR_NOT_FOUND; } - /* Main header name */ nmc->print_fields.header_name = (char *) construct_header_name (base_hdr, ifname); @@ -2398,8 +2703,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) if (!ap) { g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), bssid_user); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; + return NMC_RESULT_ERROR_NOT_FOUND; } /* Add headers (field names) */ arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); @@ -2420,15 +2724,17 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) show_access_point_info (device, nmc); } } else { - const char *err_msg; if ( nm_device_get_device_type (device) == NM_DEVICE_TYPE_GENERIC - && g_strcmp0 (nm_device_get_type_description (device), "wifi") == 0) - err_msg = _("Error: Device '%s' was not recognized as a Wi-Fi device, check NetworkManager Wi-Fi plugin."); - else - err_msg = _("Error: Device '%s' is not a Wi-Fi device."); - g_string_printf (nmc->return_text, err_msg, ifname); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - goto error; + && g_strcmp0 (nm_device_get_type_description (device), "wifi") == 0) { + g_string_printf (nmc->return_text, + _("Error: Device '%s' was not recognized as a Wi-Fi device, check NetworkManager Wi-Fi plugin."), + ifname); + } else { + g_string_printf (nmc->return_text, + _("Error: Device '%s' is not a Wi-Fi device."), + ifname); + } + return NMC_RESULT_ERROR_UNKNOWN; } } else { gboolean empty_line = FALSE; @@ -2479,8 +2785,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) if (!ap) { g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), bssid_user); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; + return NMC_RESULT_ERROR_NOT_FOUND; } } else { for (i = 0; devices[i]; i++) { @@ -2501,101 +2806,9 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) } } -error: - g_free (devices); return nmc->return_value; } -/* - * Find a Wi-Fi device with 'iface' in 'devices' array. If 'iface' is NULL, - * the first Wi-Fi device is returned. 'idx' parameter is updated to the point - * where the function finished so that the function can be called repeatedly - * to get next matching device. - * Returns: found device or NULL - */ -static NMDevice * -find_wifi_device_by_iface (const GPtrArray *devices, const char *iface, int *idx) -{ - NMDevice *device = NULL; - int i; - - for (i = *idx; i < devices->len; i++) { - NMDevice *candidate = g_ptr_array_index (devices, i); - const char *dev_iface = nm_device_get_iface (candidate); - - if (!NM_IS_DEVICE_WIFI (candidate)) - continue; - - if (iface) { - /* If a iface was specified then use it. */ - if (g_strcmp0 (dev_iface, iface) == 0) { - device = candidate; - break; - } - } else { - /* Else return the first Wi-Fi device. */ - device = candidate; - break; - } - } - - *idx = i + 1; - return device; -} - -/* - * Find AP on 'device' according to 'bssid' or 'ssid' parameter. - * Returns: found AP or NULL - */ -static NMAccessPoint * -find_ap_on_device (NMDevice *device, GByteArray *bssid, const char *ssid) -{ - const GPtrArray *aps; - NMAccessPoint *ap = NULL; - int i; - - g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL); - g_return_val_if_fail ((bssid && !ssid) || (!bssid && ssid), NULL); - - aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device)); - for (i = 0; i < aps->len; i++) { - NMAccessPoint *candidate_ap = g_ptr_array_index (aps, i); - - if (ssid) { - /* Parameter is SSID */ - GBytes *candidate_ssid; - - candidate_ssid = nm_access_point_get_ssid (candidate_ap); - if (candidate_ssid) { - char *ssid_tmp = nm_utils_ssid_to_utf8 (g_bytes_get_data (candidate_ssid, NULL), - g_bytes_get_size (candidate_ssid)); - - /* Compare SSIDs */ - if (strcmp (ssid, ssid_tmp) == 0) { - ap = candidate_ap; - g_free (ssid_tmp); - break; - } - g_free (ssid_tmp); - } - } else if (bssid) { - /* Parameter is BSSID */ - const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap); - char *bssid_up = nm_utils_hwaddr_ntoa (bssid->data, bssid->len); - - /* Compare BSSIDs */ - if (strcmp (bssid_up, candidate_bssid) == 0) { - ap = candidate_ap; - g_free (bssid_up); - break; - } - g_free (bssid_up); - } - } - - return ap; -} - static NMCResultCode do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) { @@ -2619,7 +2832,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) gboolean wep_passphrase = FALSE; GByteArray *bssid1_arr = NULL; GByteArray *bssid2_arr = NULL; - const GPtrArray *devices; + gs_free NMDevice **devices = NULL; int devices_idx; char *ssid_ask = NULL; char *passwd_ask = NULL; @@ -2628,14 +2841,22 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) if (nmc->timeout == -1) nmc->timeout = 90; + devices = nmc_get_devices_sorted (nmc->client); + /* Get the first compulsory argument (SSID or BSSID) */ if (argc > 0) { param_user = *argv; bssid1_arr = nm_utils_hwaddr_atoba (param_user, ETH_ALEN); + if (argc == 1 && nmc->complete) + complete_aps (devices, NULL, param_user, param_user); + argc--; argv++; } else { + /* nmc_do_cmd() should not call this with argc=0. */ + g_assert (!nmc->complete); + if (nmc->ask) { ssid_ask = nmc_readline (_("SSID or BSSID: ")); param_user = ssid_ask ? ssid_ask : ""; @@ -2644,46 +2865,56 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) if (!ssid_ask) { g_string_printf (nmc->return_text, _("Error: SSID or BSSID are missing.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } } /* Get the rest of the parameters */ while (argc > 0) { + if (argc == 1 && nmc->complete) { + nmc_complete_strings (*argv, "ifname", "bssid", "password", "wep-key-type", + "name", "private", "hidden", NULL); + } + if (strcmp (*argv, "ifname") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } ifname = *argv; + complete_device (devices, ifname, TRUE); } else if (strcmp (*argv, "bssid") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } bssid = *argv; + if (argc == 1 && nmc->complete) + complete_aps (devices, NULL, bssid, NULL); bssid2_arr = nm_utils_hwaddr_atoba (bssid, ETH_ALEN); if (!bssid2_arr) { g_string_printf (nmc->return_text, _("Error: bssid argument value '%s' is not a valid BSSID."), bssid); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } } else if (strcmp (*argv, "password") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } password = *argv; } else if (strcmp (*argv, "wep-key-type") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } + if (argc == 1 && nmc->complete) + nmc_complete_strings (*argv, "key", "phrase", NULL); if (strcmp (*argv, "key") == 0) wep_passphrase = FALSE; else if (strcmp (*argv, "phrase") == 0) @@ -2693,13 +2924,13 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) _("Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."), *argv); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } } else if (strcmp (*argv, "name") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } con_name = *argv; } else if (strcmp (*argv, "private") == 0) { @@ -2707,28 +2938,32 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } + if (argc == 1 && nmc->complete) + nmc_complete_bool (*argv); if (!nmc_string_to_bool (*argv, &private, &err_tmp)) { g_string_printf (nmc->return_text, _("Error: %s: %s."), *(argv-1), err_tmp->message); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; g_clear_error (&err_tmp); - goto error; + goto finish; } } else if (strcmp (*argv, "hidden") == 0) { GError *err_tmp = NULL; if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } + if (argc == 1 && nmc->complete) + nmc_complete_bool (*argv); if (!nmc_string_to_bool (*argv, &hidden, &err_tmp)) { g_string_printf (nmc->return_text, _("Error: %s: %s."), *(argv-1), err_tmp->message); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; g_clear_error (&err_tmp); - goto error; + goto finish; } - } else { + } else if (!nmc->complete) { g_printerr (_("Unknown parameter: %s\n"), *argv); } @@ -2736,21 +2971,22 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) argv++; } + if (nmc->complete) + goto finish; + /* Verify SSID/BSSID parameters */ if (bssid1_arr && bssid2_arr && memcmp (bssid1_arr->data, bssid2_arr->data, ETH_ALEN)) { g_string_printf (nmc->return_text, _("Error: BSSID to connect to (%s) differs from bssid argument (%s)."), param_user, bssid); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } if (!bssid1_arr && strlen (param_user) > 32) { g_string_printf (nmc->return_text, _("Error: Parameter '%s' is neither SSID nor BSSID."), param_user); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } - devices = nm_client_get_devices (nmc->client); - /* Find a device to activate the connection on */ devices_idx = 0; device = find_wifi_device_by_iface (devices, ifname, &devices_idx); @@ -2761,7 +2997,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) else g_string_printf (nmc->return_text, _("Error: No Wi-Fi device found.")); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - goto error; + goto finish; } /* For hidden SSID first scan it so that NM learns about the AP */ @@ -2783,18 +3019,20 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) scan_err->message); g_clear_error (&scan_err); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; + goto finish; } } /* Find an AP to connect to */ - ap = find_ap_on_device (device, bssid1_arr, bssid1_arr ? NULL : param_user); + ap = find_ap_on_device (device, bssid1_arr ? param_user : NULL, + bssid1_arr ? NULL : param_user, FALSE); if (!ap && !ifname) { NMDevice *dev; /* AP not found, ifname was not specified, so try finding the AP on another device. */ while ((dev = find_wifi_device_by_iface (devices, NULL, &devices_idx)) != NULL) { - ap = find_ap_on_device (dev, bssid1_arr, bssid1_arr ? NULL : param_user); + ap = find_ap_on_device (dev, bssid1_arr ? param_user : NULL, + bssid1_arr ? NULL : param_user, FALSE); if (ap) { device = dev; break; @@ -2808,7 +3046,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) else g_string_printf (nmc->return_text, _("Error: No access point with BSSID '%s' found."), param_user); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; + goto finish; } /* If there are some connection data from user, create a connection and @@ -2911,7 +3149,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) add_and_activate_cb, info); -error: +finish: if (bssid1_arr) g_byte_array_free (bssid1_arr, TRUE); if (bssid2_arr) @@ -3064,8 +3302,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) const char *password = NULL; gboolean show_password = FALSE; NMDevice *device = NULL; - int devices_idx; - const GPtrArray *devices; + gs_free NMDevice **devices = NULL; NMDeviceWifiCapabilities caps; NMConnection *connection = NULL; NMSettingConnection *s_con; @@ -3079,58 +3316,61 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) if (nmc->timeout == -1) nmc->timeout = 60; + devices = nmc_get_devices_sorted (nmc->client); + while (argc > 0) { + if (argc == 1 && nmc->complete) { + nmc_complete_strings (*argv, "ifname", "con-name", "ssid", "band", + "channel", "password", NULL); + } + if (strcmp (*argv, "ifname") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } ifname = *argv; + if (argc == 1 && nmc->complete) + complete_device (devices, ifname, TRUE); } else if (strcmp (*argv, "con-name") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } con_name = *argv; } else if (strcmp (*argv, "ssid") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } ssid = *argv; if (strlen (ssid) > 32) { g_string_printf (nmc->return_text, _("Error: ssid is too long.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } } else if (strcmp (*argv, "band") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } band = *argv; + if (argc == 1 && nmc->complete) + nmc_complete_strings (band, "a", "bg", NULL); if (strcmp (band, "a") && strcmp (band, "bg")) { g_string_printf (nmc->return_text, _("Error: band argument value '%s' is invalid; use 'a' or 'bg'."), band); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } } else if (strcmp (*argv, "channel") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } channel = *argv; } else if (strcmp (*argv, "password") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } password = *argv; /* --show-password is deprecated in favour of global --show-secrets option */ @@ -3139,8 +3379,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) show_password = TRUE; } else { g_string_printf (nmc->return_text, _("Error: Unknown parameter %s."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } argc--; @@ -3148,6 +3387,9 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) } show_password = nmc->show_secrets || show_password; + if (nmc->complete) + return nmc->return_value; + /* Verify band and channel parameters */ if (!channel) { if (g_strcmp0 (band, "bg") == 0) @@ -3158,30 +3400,25 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) if (channel) { if (!band) { g_string_printf (nmc->return_text, _("Error: channel requires band too.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } if ( !nmc_string_to_uint (channel, TRUE, 1, 5825, &channel_int) || !nm_utils_wifi_is_channel_valid (channel_int, band)) { g_string_printf (nmc->return_text, _("Error: channel '%s' not valid for band '%s'."), channel, band); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } } /* Find Wi-Fi device. When no ifname is provided, the first Wi-Fi is used. */ - devices = nm_client_get_devices (nmc->client); - devices_idx = 0; - device = find_wifi_device_by_iface (devices, ifname, &devices_idx); + device = find_wifi_device_by_iface (devices, ifname, NULL); if (!device) { if (ifname) g_string_printf (nmc->return_text, _("Error: Device '%s' is not a Wi-Fi device."), ifname); else g_string_printf (nmc->return_text, _("Error: No Wi-Fi device found.")); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - goto error; + return NMC_RESULT_ERROR_UNKNOWN; } /* Check device supported mode */ @@ -3193,8 +3430,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) else { g_string_printf (nmc->return_text, _("Error: Device '%s' supports neither AP nor Ad-Hoc mode."), nm_device_get_iface (device)); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - goto error; + return NMC_RESULT_ERROR_UNKNOWN; } /* Create a connection with appropriate parameters */ @@ -3227,9 +3463,8 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) if (!set_wireless_security_for_hotspot (s_wsec, wifi_mode, caps, password, show_password, &error)) { g_object_unref (connection); g_string_printf (nmc->return_text, _("Error: Invalid 'password': %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; g_clear_error (&error); - goto error; + return NMC_RESULT_ERROR_UNKNOWN; } s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new (); @@ -3242,7 +3477,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) /* Activate the connection now */ nmc->nowait_flag = (nmc->timeout == 0); - nmc->should_wait = TRUE; + nmc->should_wait++; info = g_malloc0 (sizeof (AddAndActivateInfo)); info->nmc = nmc; @@ -3257,7 +3492,6 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) add_and_activate_cb, info); -error: return nmc->return_value; } @@ -3282,47 +3516,53 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv) NMDevice *device; const char *ifname = NULL; GPtrArray *ssids; - const GPtrArray *devices; - int devices_idx; + gs_free NMDevice **devices = NULL; GVariantBuilder builder, array_builder; GVariant *options; const char *ssid; int i; ssids = g_ptr_array_new (); + devices = nmc_get_devices_sorted (nmc->client); /* Get the parameters */ while (argc > 0) { + if (argc == 1 && nmc->complete) + nmc_complete_strings (*argv, "ifname", "ssid", NULL); + if (strcmp (*argv, "ifname") == 0) { if (ifname) { g_string_printf (nmc->return_text, _("Error: '%s' cannot repeat."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } ifname = *argv; + if (argc == 1 && nmc->complete) + complete_device (devices, ifname, TRUE); } else if (strcmp (*argv, "ssid") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + goto finish; } g_ptr_array_add (ssids, *argv); - } else + } else if (!nmc->complete) g_printerr (_("Unknown parameter: %s\n"), *argv); argc--; argv++; } + if (nmc->complete) + goto finish; + /* Find Wi-Fi device to scan on. When no ifname is provided, the first Wi-Fi is used. */ - devices = nm_client_get_devices (nmc->client); - devices_idx = 0; - device = find_wifi_device_by_iface (devices, ifname, &devices_idx); + device = find_wifi_device_by_iface (devices, ifname, NULL); if (!device) { if (ifname) @@ -3330,7 +3570,7 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv) else g_string_printf (nmc->return_text, _("Error: No Wi-Fi device found.")); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - goto error; + goto finish; } @@ -3353,35 +3593,32 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv) nm_device_wifi_request_scan_async (NM_DEVICE_WIFI (device), NULL, request_rescan_cb, nmc); - g_ptr_array_free (ssids, FALSE); - return nmc->return_value; -error: nmc->should_wait++; +finish: g_ptr_array_free (ssids, FALSE); return nmc->return_value; } +static NMCCommand device_wifi_cmds[] = { + {"list", do_device_wifi_list, NULL }, + {"connect", do_device_wifi_connect_network, NULL }, + {"hotspot", do_device_wifi_hotspot, NULL }, + {"rescan", do_device_wifi_rescan, NULL }, + {NULL, do_device_wifi_list, NULL } +}; + static NMCResultCode do_device_wifi (NmCli *nmc, int argc, char **argv) { - if (argc == 0) - nmc->return_value = do_device_wifi_list (nmc, argc-1, argv+1); - else if (argc > 0) { - if (matches (*argv, "list") == 0) { - nmc->return_value = do_device_wifi_list (nmc, argc-1, argv+1); - } else if (matches (*argv, "connect") == 0) { - nmc->return_value = do_device_wifi_connect_network (nmc, argc-1, argv+1); - } else if (matches (*argv, "hotspot") == 0) { - nmc->return_value = do_device_wifi_hotspot (nmc, argc-1, argv+1); - } else if (matches (*argv, "rescan") == 0) { - nmc->return_value = do_device_wifi_rescan (nmc, argc-1, argv+1); - } else { - g_string_printf (nmc->return_text, _("Error: 'device wifi' command '%s' is not valid."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - } + 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; } - return nmc->return_value; + return nmc_do_cmd (nmc, device_wifi_cmds, *argv, argc, argv); } static int @@ -3468,27 +3705,32 @@ show_device_lldp_list (NMDevice *device, NmCli *nmc, char *fields_str, int *coun return neighbors->len; } -static gboolean +static NMCResultCode do_device_lldp_list (NmCli *nmc, int argc, char **argv) { - NMDevice *device = NULL, **devices = NULL; - GError *error = NULL; - const char *ifname = NULL; + NMDevice *device = NULL; + gs_free_error GError *error = NULL; char *fields_str; - int i, counter = 0; + int counter = 0; 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) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; + } + + device = get_device (nmc, &argc, &argv, &error); + if (!device) { + g_string_printf (nmc->return_text, _("Error: %s."), error->message); + return error->code; } - ifname = *argv; } else { g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return NMC_RESULT_ERROR_USER_INPUT; } argc--; @@ -3506,57 +3748,50 @@ do_device_lldp_list (NmCli *nmc, int argc, char **argv) if (error) { g_string_printf (nmc->return_text, _("Error: 'device lldp list': %s"), error->message); - g_error_free (error); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - return nmc->return_value; + return NMC_RESULT_ERROR_USER_INPUT; } - devices = get_devices_sorted (nmc->client); - - if (ifname) { - for (i = 0; devices[i]; i++) { - NMDevice *candidate = devices[i]; - const char *dev_iface = nm_device_get_iface (candidate); - - if (!g_strcmp0 (dev_iface, ifname)) { - device = candidate; - break; - } - } - - if (!device) { - g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; - } + if (nmc->complete) + return nmc->return_value; + if (device) { nmc_empty_output_fields (nmc); show_device_lldp_list (device, nmc, fields_str, &counter); } else { + NMDevice **devices = nmc_get_devices_sorted (nmc->client); + int i; + for (i = 0; devices[i]; i++) { nmc_empty_output_fields (nmc); show_device_lldp_list (devices[i], nmc, fields_str, &counter); } + + g_free (devices); } -error: - g_free (devices); return nmc->return_value; } +static NMCCommand device_lldp_cmds[] = { + {"list", do_device_lldp_list, NULL }, + {NULL, do_device_lldp_list, NULL } +}; + static NMCResultCode do_device_lldp (NmCli *nmc, int argc, char **argv) { - if (argc == 0) - nmc->return_value = do_device_lldp_list (nmc, argc, argv); - else if (matches (*argv, "list") == 0) - nmc->return_value = do_device_lldp_list (nmc, argc-1, argv+1); - else { - g_string_printf (nmc->return_text, _("Error: 'device lldp' command '%s' is not valid."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + 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; } - return nmc->return_value; + if (!nmc->mode_specified) + nmc->multiline_output = TRUE; /* multiline mode is default for 'device lldp' */ + + return nmc_do_cmd (nmc, device_lldp_cmds, *argv, argc, argv); } static gboolean @@ -3628,11 +3863,24 @@ nmcli_device_tab_completion (const char *text, int start, int end) return match_array; } +static const NMCCommand device_cmds[] = { + {"status", do_devices_status, usage_device_status }, + {"show", do_device_show, usage_device_show }, + {"connect", do_device_connect, usage_device_connect }, + {"reapply", do_device_reapply, usage_device_reapply }, + {"disconnect", do_devices_disconnect, usage_device_disconnect }, + {"delete", do_devices_delete, usage_device_delete }, + {"set", do_device_set, usage_device_set }, + {"monitor", do_devices_monitor, usage_device_monitor }, + {"wifi", do_device_wifi, usage_device_wifi }, + {"lldp", do_device_lldp, usage_device_lldp }, + {"modify", do_device_modify, usage_device_modify }, + {NULL, do_devices_status, usage }, +}; + NMCResultCode do_devices (NmCli *nmc, int argc, char **argv) { - GError *error = NULL; - /* Register polkit agent */ nmc_start_polkit_agent_start_try (nmc); @@ -3644,120 +3892,14 @@ do_devices (NmCli *nmc, int argc, char **argv) /* Check whether NetworkManager is running */ if (!nm_client_get_nm_running (nmc->client)) { g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); - nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; - return nmc->return_value; - } - - if (argc == 0) { - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) - goto opt_error; - nmc->return_value = do_devices_status (nmc, 0, NULL); + return NMC_RESULT_ERROR_NM_NOT_RUNNING; } - if (argc > 0) { - if (nmc_arg_is_help (*argv)) { - usage (); - goto usage_exit; - } - else if (matches (*argv, "status") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_device_status (); - goto usage_exit; - } - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) - goto opt_error; - nmc->return_value = do_devices_status (nmc, argc-1, argv+1); - } - else if (matches (*argv, "show") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_device_show (); - goto usage_exit; - } - if (!nmc->mode_specified) - nmc->multiline_output = TRUE; /* multiline mode is default for 'device show' */ - nmc->return_value = do_devices_show (nmc, argc-1, argv+1); - } - else if (matches (*argv, "connect") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_device_connect (); - goto usage_exit; - } - nmc->return_value = do_device_connect (nmc, argc-1, argv+1); - } - else if (matches (*argv, "reapply") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_device_reapply (); - goto usage_exit; - } - nmc->return_value = do_device_reapply (nmc, argc-1, argv+1); - } - else if (matches (*argv, "disconnect") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_device_disconnect (); - goto usage_exit; - } - nmc->return_value = do_device_disconnect (nmc, argc-1, argv+1); - } - else if (matches (*argv, "delete") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_device_delete (); - goto usage_exit; - } - nmc->return_value = do_device_delete (nmc, argc-1, argv+1); - } - else if (matches (*argv, "set") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_device_set (); - goto usage_exit; - } - nmc->return_value = do_device_set (nmc, argc-1, argv+1); - } - else if (matches (*argv, "monitor") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_device_monitor (); - goto usage_exit; - } - nmc->return_value = do_device_monitor (nmc, argc-1, argv+1); - } - else if (matches (*argv, "wifi") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_device_wifi (); - goto usage_exit; - } - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) - goto opt_error; - nmc->return_value = do_device_wifi (nmc, argc-1, argv+1); - } - else if (matches (*argv, "lldp") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_device_lldp (); - goto usage_exit; - } - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) - goto opt_error; - if (!nmc->mode_specified) - nmc->multiline_output = TRUE; /* multiline mode is default for 'device lldp' */ - nmc->return_value = do_device_lldp (nmc, argc-1, argv+1); - } - else { - usage (); - g_string_printf (nmc->return_text, _("Error: 'dev' command '%s' is not valid."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - } - } - -usage_exit: - return nmc->return_value; - -opt_error: - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - g_error_free (error); - return nmc->return_value; + return nmc_do_cmd (nmc, device_cmds, *argv, argc, argv); } void monitor_devices (NmCli *nmc) { - do_device_monitor (nmc, 0, NULL); + do_devices_monitor (nmc, 0, NULL); } diff --git a/clients/cli/devices.h b/clients/cli/devices.h index 56fc9c2f..672944be 100644 --- a/clients/cli/devices.h +++ b/clients/cli/devices.h @@ -24,6 +24,30 @@ NMCResultCode do_devices (NmCli *nmc, int argc, char **argv); +void nmc_complete_device (NMClient *client, const char *prefix, gboolean wifi_only); + +void nmc_complete_bssid (NMClient *client, const char *ifname, const char *bssid_prefix); + void monitor_devices (NmCli *nmc); +NMDevice ** nmc_get_devices_sorted (NMClient *client); + +void nmc_device_state_to_color (NMDeviceState state, NmcTermColor *color, NmcTermFormat *color_fmt); + +extern NmcOutputField nmc_fields_dev_status[]; +extern NmcOutputField nmc_fields_dev_show_general[]; +extern NmcOutputField nmc_fields_dev_show_connections[]; +extern NmcOutputField nmc_fields_dev_show_cap[]; +extern NmcOutputField nmc_fields_dev_show_wired_prop[]; +extern NmcOutputField nmc_fields_dev_show_wifi_prop[]; +extern NmcOutputField nmc_fields_dev_show_wimax_prop[]; +extern NmcOutputField nmc_fields_dev_wifi_list[]; +extern NmcOutputField nmc_fields_dev_wimax_list[]; +extern NmcOutputField nmc_fields_dev_show_master_prop[]; +extern NmcOutputField nmc_fields_dev_show_team_prop[]; +extern NmcOutputField nmc_fields_dev_show_vlan_prop[]; +extern NmcOutputField nmc_fields_dev_show_bluetooth[]; +extern NmcOutputField nmc_fields_dev_show_sections[]; +extern NmcOutputField nmc_fields_dev_lldp_list[]; + #endif /* NMC_DEVICES_H */ diff --git a/clients/cli/general.c b/clients/cli/general.c index 280630c1..e9709125 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -24,7 +24,9 @@ #include "polkit-agent.h" #include "utils.h" +#include "common.h" #include "general.h" +#include "common.h" #include "nm-common-macros.h" #include "devices.h" @@ -388,6 +390,23 @@ show_nm_status (NmCli *nmc, const char *pretty_header_name, const char *print_fl return TRUE; } +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; + } + + if (nmc->complete) + return nmc->return_value; + + show_nm_status (nmc, NULL, NULL); + return nmc->return_value; +} + static const char * permission_to_string (NMClientPermission perm) { @@ -418,6 +437,10 @@ permission_to_string (NMClientPermission perm) return NM_AUTH_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS; case NM_CLIENT_PERMISSION_RELOAD: return NM_AUTH_PERMISSION_RELOAD; + case NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK: + return NM_AUTH_PERMISSION_CHECKPOINT_ROLLBACK; + case NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS: + return NM_AUTH_PERMISSION_ENABLE_DISABLE_STATISTICS; default: return _("unknown"); } @@ -492,6 +515,23 @@ show_nm_permissions (NmCli *nmc) return TRUE; } +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; + } + + if (nmc->complete) + return nmc->return_value; + + show_nm_permissions (nmc); + return nmc->return_value; +} + static gboolean show_general_logging (NmCli *nmc) { @@ -545,6 +585,51 @@ show_general_logging (NmCli *nmc) return TRUE; } +static NMCResultCode +do_general_logging (NmCli *nmc, int argc, char **argv) +{ + gs_free_error GError *error = 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; + + show_general_logging (nmc); + } else { + /* 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 */ + 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; + } + + nmc->get_client (nmc); /* create NMClient */ + nm_client_set_logging (nmc->client, level, domains, &error); + if (error) { + g_string_printf (nmc->return_text, _("Error: failed to set logging: %s"), + nmc_error_get_simple_message (error)); + return NMC_RESULT_ERROR_UNKNOWN; + } + } + + return nmc->return_value; +} + static void save_hostname_cb (GObject *object, GAsyncResult *result, gpointer user_data) { @@ -561,129 +646,55 @@ save_hostname_cb (GObject *object, GAsyncResult *result, gpointer user_data) quit (); } -/* - * Entry point function for general operations 'nmcli general' - */ -NMCResultCode -do_general (NmCli *nmc, int argc, char **argv) +static NMCResultCode +do_general_hostname (NmCli *nmc, int argc, char **argv) { - GError *error = NULL; - - /* Register polkit agent */ - nmc_start_polkit_agent_start_try (nmc); + if (nmc->complete) + return nmc->return_value; 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); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } - show_nm_status (nmc, NULL, NULL); - } + /* no arguments -> get hostname */ + char *hostname = NULL; + + nmc->get_client (nmc); /* create NMClient */ + g_object_get (nmc->client, NM_CLIENT_HOSTNAME, &hostname, NULL); + if (hostname) + g_print ("%s\n", hostname); + g_free (hostname); + } else { + /* hostname provided -> set it */ + const char *hostname = *argv; - if (argc > 0) { - if (nmc_arg_is_help (*argv)) { - usage_general (); - } - else if (matches (*argv, "status") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_general_status (); - goto finish; - } - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } - show_nm_status (nmc, NULL, NULL); - } - else if (matches (*argv, "hostname") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_general_hostname (); - goto finish; - } + if (next_arg (&argc, &argv) == 0) + g_print ("Warning: ignoring extra garbage after '%s' hostname\n", hostname); - if (next_arg (&argc, &argv) != 0) { - /* no arguments -> get hostname */ - char *hostname = NULL; + nmc->should_wait++; + nmc->get_client (nmc); /* create NMClient */ + nm_client_save_hostname_async (nmc->client, hostname, NULL, save_hostname_cb, nmc); + } - nmc->get_client (nmc); /* create NMClient */ - g_object_get (nmc->client, NM_CLIENT_HOSTNAME, &hostname, NULL); - if (hostname) - g_print ("%s\n", hostname); - g_free (hostname); - } else { - /* hostname provided -> set it */ - const char *hostname = *argv; + return nmc->return_value; - if (next_arg (&argc, &argv) == 0) - g_print ("Warning: ignoring extra garbage after '%s' hostname\n", hostname); +} - nmc->should_wait++; - nmc->get_client (nmc); /* create NMClient */ - nm_client_save_hostname_async (nmc->client, hostname, NULL, save_hostname_cb, nmc); - } - } - else if (matches (*argv, "permissions") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_general_permissions (); - goto finish; - } - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } - show_nm_permissions (nmc); - } - else if (matches (*argv, "logging") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_general_logging (); - goto finish; - } - if (next_arg (&argc, &argv) != 0) { - /* no arguments -> get logging level and domains */ - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; - } - show_general_logging (nmc); - } else { - /* 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} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, &error)) { - g_string_assign (nmc->return_text, error->message); - nmc->return_value = error->code; - goto finish; - } +static const NMCCommand general_cmds[] = { + {"status", do_general_status, usage_general_status }, + {"hostname", do_general_hostname, usage_general_hostname }, + {"permissions", do_general_permissions, usage_general_permissions }, + {"logging", do_general_logging, usage_general_logging }, + {NULL, do_general_status, usage_general } +}; - nmc->get_client (nmc); /* create NMClient */ - nm_client_set_logging (nmc->client, level, domains, &error); - if (error) { - g_string_printf (nmc->return_text, _("Error: failed to set logging: %s"), - error->message); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - goto finish; - } - } - } - else { - usage_general (); - g_string_printf (nmc->return_text, _("Error: 'general' command '%s' is not valid."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - } - } +/* + * Entry point function for general operations 'nmcli general' + */ +NMCResultCode +do_general (NmCli *nmc, int argc, char **argv) +{ + /* Register polkit agent */ + nmc_start_polkit_agent_start_try (nmc); -finish: - if (error) - g_error_free (error); - return nmc->return_value; + return nmc_do_cmd (nmc, general_cmds, *argv, argc, argv); } static gboolean @@ -743,12 +754,28 @@ do_networking (NmCli *nmc, int argc, char **argv) /* Register polkit agent */ nmc_start_polkit_agent_start_try (nmc); - if (argc == 0) + if (argc == 0) { + if (nmc->complete) + return nmc->return_value; nmc_switch_show (nmc, NMC_FIELDS_NM_NETWORKING, _("Networking")); - else if (argc > 0) { + } else if (argc > 0) { + + if (argc == 1 && nmc->complete) { + nmc_complete_strings (*argv, "connectivity", NULL); + nmc_complete_bool (*argv); + return nmc->return_value; + } + if (nmc_arg_is_help (*argv)) { + if (nmc->complete) + return nmc->return_value; usage_networking (); } else if (matches (*argv, "connectivity") == 0) { + if (nmc->complete) { + if (argc == 2) + nmc_complete_strings (*(argv+1), "check", NULL); + return nmc->return_value; + } if (nmc_arg_is_help (*(argv+1))) { usage_networking_connectivity (); goto finish; @@ -773,6 +800,8 @@ do_networking (NmCli *nmc, int argc, char **argv) nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; } } else if (nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag)) { + if (nmc->complete) + return nmc->return_value; if (nmc_arg_is_help (*(argv+1))) { if (enable_flag) usage_networking_on (); @@ -784,6 +813,8 @@ do_networking (NmCli *nmc, int argc, char **argv) nmc->get_client (nmc); /* create NMClient */ nm_client_networking_set_enabled (nmc->client, enable_flag, NULL); } else { + if (nmc->complete) + return nmc->return_value; usage_networking (); g_string_printf (nmc->return_text, _("Error: 'networking' command '%s' is not valid."), *argv); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; @@ -795,118 +826,125 @@ finish: return nmc->return_value; } -/* - * Entry point function for radio switch commands 'nmcli radio' - */ -NMCResultCode -do_radio (NmCli *nmc, int argc, char **argv) +static NMCResultCode +do_radio_all (NmCli *nmc, int argc, char **argv) { - GError *error = NULL; gboolean enable_flag; - - /* Register polkit agent */ - nmc_start_polkit_agent_start_try (nmc); + gs_free_error GError *error = 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); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - g_error_free (error); - goto finish; + return NMC_RESULT_ERROR_USER_INPUT; } show_nm_status (nmc, _("Radio switches"), NMC_FIELDS_NM_STATUS_RADIO); + } else { + if (nmc->complete) { + if (argc == 1) + nmc_complete_bool (*argv); + return nmc->return_value; + } + + if (!nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag)) + return nmc->return_value; + + nmc->get_client (nmc); /* create NMClient */ + nm_client_wireless_set_enabled (nmc->client, enable_flag); + nm_client_wimax_set_enabled (nmc->client, enable_flag); + nm_client_wwan_set_enabled (nmc->client, enable_flag); } - if (argc > 0) { - if (nmc_arg_is_help (*argv)) { - usage_radio (); - } - else if (matches (*argv, "all") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_radio_all (); - goto finish; - } - if (next_arg (&argc, &argv) != 0) { - /* 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); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - g_error_free (error); - goto finish; - } - show_nm_status (nmc, _("Radio switches"), NMC_FIELDS_NM_STATUS_RADIO); - } else { - if (!nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag)) - goto finish; + return nmc->return_value; +} - nmc->get_client (nmc); /* create NMClient */ - nm_client_wireless_set_enabled (nmc->client, enable_flag); - nm_client_wimax_set_enabled (nmc->client, enable_flag); - nm_client_wwan_set_enabled (nmc->client, enable_flag); - } - } - else if (matches (*argv, "wifi") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_radio_wifi (); - goto finish; - } - if (next_arg (&argc, &argv) != 0) { - /* no argument, show current WiFi state */ - nmc_switch_show (nmc, NMC_FIELDS_NM_WIFI, _("Wi-Fi radio switch")); - } else { - if (!nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag)) - goto finish; - - nmc->get_client (nmc); /* create NMClient */ - nm_client_wireless_set_enabled (nmc->client, enable_flag); - } - } - else if (matches (*argv, "wwan") == 0) { - if (nmc_arg_is_help (*(argv+1))) { - usage_radio_wwan (); - goto finish; - } - if (next_arg (&argc, &argv) != 0) { - /* no argument, show current WWAN (mobile broadband) state */ - nmc_switch_show (nmc, NMC_FIELDS_NM_WWAN, _("WWAN radio switch")); - } else { - if (!nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag)) - goto finish; +static NMCResultCode +do_radio_wifi (NmCli *nmc, int argc, char **argv) +{ + gboolean enable_flag; - nmc->get_client (nmc); /* create NMClient */ - nm_client_wwan_set_enabled (nmc->client, enable_flag); - } + if (argc == 0) { + if (nmc->complete) + return nmc->return_value; + + /* no argument, show current WiFi state */ + nmc_switch_show (nmc, NMC_FIELDS_NM_WIFI, _("Wi-Fi radio switch")); + } else { + if (nmc->complete) { + if (argc == 1) + nmc_complete_bool (*argv); + return nmc->return_value; } - else { - usage_radio (); - g_string_printf (nmc->return_text, _("Error: 'radio' command '%s' is not valid."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + if (!nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag)) + return nmc->return_value; + + nmc->get_client (nmc); /* create NMClient */ + nm_client_wireless_set_enabled (nmc->client, enable_flag); + } + + return nmc->return_value; +} + +static NMCResultCode +do_radio_wwan (NmCli *nmc, int argc, char **argv) +{ + gboolean enable_flag; + + if (argc == 0) { + if (nmc->complete) + return nmc->return_value; + + /* no argument, show current WWAN (mobile broadband) state */ + nmc_switch_show (nmc, NMC_FIELDS_NM_WWAN, _("WWAN radio switch")); + } else { + if (nmc->complete) { + if (argc == 1) + nmc_complete_bool (*argv); + return nmc->return_value; } + if (!nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag)) + return nmc->return_value; + + nmc->get_client (nmc); /* create NMClient */ + nm_client_wwan_set_enabled (nmc->client, enable_flag); } -finish: - quit (); return nmc->return_value; } +static const NMCCommand radio_cmds[] = { + {"all", do_radio_all, usage_radio_all }, + {"wifi", do_radio_wifi, usage_radio_wifi }, + {"wwan", do_radio_wwan, usage_radio_wwan }, + {NULL, do_radio_all, usage_radio } +}; + +/* + * Entry point function for radio switch commands 'nmcli radio' + */ +NMCResultCode +do_radio (NmCli *nmc, int argc, char **argv) +{ + /* Register polkit agent */ + nmc_start_polkit_agent_start_try (nmc); + + return nmc_do_cmd (nmc, radio_cmds, *argv, argc, argv); +} + static void networkmanager_running (NMClient *client, GParamSpec *param, NmCli *nmc) { gboolean running; - NmcTermColor color; - const char *message; char *str; running = nm_client_get_nm_running (client); - if (running) { - color = NMC_TERM_COLOR_GREEN; - message = _("NetworkManager has started"); - } else { - color = NMC_TERM_COLOR_RED; - message = _("NetworkManager has stopped"); - } - - str = nmc_colorize (nmc, color, NMC_TERM_FORMAT_NORMAL, message); + str = nmc_colorize (nmc, + running ? NMC_TERM_COLOR_GREEN : NMC_TERM_COLOR_RED, + NMC_TERM_FORMAT_NORMAL, + running ? _("NetworkManager has started") : _("NetworkManager has stopped")); g_print ("%s\n", str); g_free (str); } @@ -965,9 +1003,231 @@ client_state (NMClient *client, GParamSpec *param, NmCli *nmc) g_free (str); } + +static void +device_overview (NmCli *nmc, NMDevice *device) +{ + GString *outbuf = g_string_sized_new (80); + char *tmp; + const GPtrArray *activatable; + + activatable = nm_device_get_available_connections (device); + + g_string_append_printf (outbuf, "%s", nm_device_get_type_description (device)); + + if (nm_device_get_state (device) == NM_DEVICE_STATE_DISCONNECTED) { + if (activatable) { + if (activatable->len == 1) + g_print ("\t%d %s\n", activatable->len, _("connection available")); + else if (activatable->len > 1) + g_print ("\t%d %s\n", activatable->len, _("connections available")); + } + } + + if ( nm_device_get_driver (device) + && strcmp (nm_device_get_driver (device), "") + && strcmp (nm_device_get_driver (device), nm_device_get_type_description (device))) { + g_string_append_printf (outbuf, " (%s)", nm_device_get_driver (device)); + } + + g_string_append_printf (outbuf, ", "); + + if ( nm_device_get_hw_address (device) + && strcmp (nm_device_get_hw_address (device), "")) { + g_string_append_printf (outbuf, "%s, ", nm_device_get_hw_address (device)); + } + + if (!nm_device_get_autoconnect (device)) + g_string_append_printf (outbuf, "%s, ", _("autoconnect")); + if (nm_device_get_firmware_missing (device)) { + tmp = nmc_colorize (nmc, NMC_TERM_COLOR_RED, NMC_TERM_FORMAT_NORMAL, _("fw missing")); + g_string_append_printf (outbuf, "%s, ", tmp); + g_free (tmp); + } + if (nm_device_get_nm_plugin_missing (device)) { + tmp = nmc_colorize (nmc, NMC_TERM_COLOR_RED, NMC_TERM_FORMAT_NORMAL, _("plugin missing")); + g_string_append_printf (outbuf, "%s, ", tmp); + g_free (tmp); + } + if (nm_device_is_software (device)) + g_string_append_printf (outbuf, "%s, ", _("sw")); + else + g_string_append_printf (outbuf, "%s, ", _("hw")); + + if ( nm_device_get_ip_iface (device) + && g_strcmp0 (nm_device_get_ip_iface (device), nm_device_get_iface (device)) + && g_strcmp0 (nm_device_get_ip_iface (device), "")) + g_string_append_printf (outbuf, "%s %s,", _("iface"), nm_device_get_ip_iface (device)); + + if (nm_device_get_physical_port_id (device)) + g_string_append_printf (outbuf, "%s %s, ", _("port"), nm_device_get_physical_port_id (device)); + + if (nm_device_get_mtu (device)) + g_string_append_printf (outbuf, "%s %d, ", _("mtu"), nm_device_get_mtu (device)); + + if (outbuf->len >= 2) { + g_string_truncate (outbuf, outbuf->len - 2); + g_print ("\t%s\n", outbuf->str); + } + + g_string_free (outbuf, TRUE); +} + +static void +ac_overview (NmCli *nmc, NMActiveConnection *ac) +{ + GString *outbuf = g_string_sized_new (80); + NMIPConfig *ip; + + if (nm_active_connection_get_master (ac)) { + 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)) + g_string_append_printf (outbuf, "%s, ", _("VPN")); + if (nm_active_connection_get_default (ac)) + g_string_append_printf (outbuf, "%s, ", _("ip4 default")); + if (nm_active_connection_get_default6 (ac)) + g_string_append_printf (outbuf, "%s, ", _("ip6 default")); + if (outbuf->len >= 2) { + g_string_truncate (outbuf, outbuf->len - 2); + g_print ("\t%s\n", outbuf->str); + } + + ip = nm_active_connection_get_ip4_config (ac); + if (ip) { + const GPtrArray *p; + int i; + + p = nm_ip_config_get_addresses (ip); + for (i = 0; i < p->len; i++) { + NMIPAddress *a = p->pdata[i]; + g_print ("\tinet4 %s/%d\n", nm_ip_address_get_address (a), + nm_ip_address_get_prefix (a)); + } + + p = nm_ip_config_get_routes (ip); + for (i = 0; i < p->len; i++) { + NMIPRoute *a = p->pdata[i]; + g_print ("\troute4 %s/%d\n", nm_ip_route_get_dest (a), + nm_ip_route_get_prefix (a)); + } + } + + ip = nm_active_connection_get_ip6_config (ac); + if (ip) { + const GPtrArray *p; + int i; + + p = nm_ip_config_get_addresses (ip); + for (i = 0; i < p->len; i++) { + NMIPAddress *a = p->pdata[i]; + g_print ("\tinet6 %s/%d\n", nm_ip_address_get_address (a), + nm_ip_address_get_prefix (a)); + } + + p = nm_ip_config_get_routes (ip); + for (i = 0; i < p->len; i++) { + NMIPRoute *a = p->pdata[i]; + g_print ("\troute6 %s/%d\n", nm_ip_route_get_dest (a), + nm_ip_route_get_prefix (a)); + } + } + + g_string_free (outbuf, TRUE); +} + +/* + * Entry point function for 'nmcli' without arguments. + */ +NMCResultCode +do_overview (NmCli *nmc, int argc, char **argv) +{ + NMDevice **devices; + const GPtrArray *p; + NMActiveConnection *ac; + NmcTermColor color; + char *tmp; + int i; + + /* Register polkit agent */ + nmc_start_polkit_agent_start_try (nmc); + + /* Get NMClient object early */ + nmc->get_client (nmc); + + /* Check whether NetworkManager is running */ + if (!nm_client_get_nm_running (nmc->client)) { + g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); + return NMC_RESULT_ERROR_NM_NOT_RUNNING; + } + + /* The VPN connections don't have devices (yet?). */ + p = nm_client_get_active_connections (nmc->client); + for (i = 0; i < p->len; i++) { + NMActiveConnectionState state; + + ac = p->pdata[i]; + + if (!nm_active_connection_get_vpn (ac)) + continue; + + state = nm_active_connection_get_state (ac); + nmc_active_connection_state_to_color (state, &color); + tmp = nmc_colorize (nmc, color, NMC_TERM_FORMAT_NORMAL, _("%s VPN connection"), + nm_active_connection_get_id (ac)); + g_print ("%s\n", tmp); + g_free (tmp); + + ac_overview (nmc, ac); + g_print ("\n"); + } + + devices = nmc_get_devices_sorted (nmc->client); + for (i = 0; devices[i]; i++) { + NmcTermFormat color_fmt; + NMDeviceState state; + + ac = nm_device_get_active_connection (devices[i]); + + state = nm_device_get_state (devices[i]); + nmc_device_state_to_color (state, &color, &color_fmt); + tmp = nmc_colorize (nmc, color, color_fmt, "%s: %s%s%s", + nm_device_get_iface (devices[i]), + nmc_device_state_to_string (state), + ac ? " to " : "", + ac ? nm_active_connection_get_id (ac) : ""); + g_print ("%s\n", tmp); + g_free (tmp); + + if (nm_device_get_description (devices[i]) && strcmp (nm_device_get_description (devices[i]), "")) + g_print ("\t\"%s\"\n", nm_device_get_description (devices[i])); + + + device_overview (nmc, devices[i]); + if (ac) + ac_overview (nmc, ac); + g_print ("\n"); + } + g_free (devices); + + g_print (_("Use \"nmcli device show\" to get complete information about known devices and\n" + "\"nmcli connection show\" to get an overview on active connection profiles.\n" + "\n" + "Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details.\n")); + + return NMC_RESULT_SUCCESS; +} + +/* + * Entry point function for 'nmcli monitor' + */ NMCResultCode do_monitor (NmCli *nmc, int argc, char **argv) { + if (nmc->complete) + return nmc->return_value; + if (argc > 0) { if (!nmc_arg_is_help (*argv)) { g_string_printf (nmc->return_text, _("Error: 'monitor' command '%s' is not valid."), *argv); diff --git a/clients/cli/general.h b/clients/cli/general.h index 40dddb20..05caffea 100644 --- a/clients/cli/general.h +++ b/clients/cli/general.h @@ -26,5 +26,6 @@ NMCResultCode do_general (NmCli *nmc, int argc, char **argv); NMCResultCode do_networking (NmCli *nmc, int argc, char **argv); NMCResultCode do_radio (NmCli *nmc, int argc, char **argv); NMCResultCode do_monitor (NmCli *nmc, int argc, char **argv); +NMCResultCode do_overview (NmCli *nmc, int argc, char **argv); #endif /* NMC_GENERAL_H */ diff --git a/clients/cli/nmcli-completion b/clients/cli/nmcli-completion index ffab7d8b..e78ab85c 100644 --- a/clients/cli/nmcli-completion +++ b/clients/cli/nmcli-completion @@ -123,6 +123,8 @@ _nmcli_compl_match_option() S="${S:2}" elif [[ "${S:0:1}" == "-" ]]; then S="${S:1}" + else + return 1 fi for V; do case "$V" in @@ -231,14 +233,14 @@ _nmcli_compl_OPTIONS() mode) if [[ "${#words[@]}" -eq 2 ]]; then _nmcli_list "tabular multiline" - return 0 + return 0 fi _nmcli_array_delete_at words 0 1 ;; colors) if [[ "${#words[@]}" -eq 2 ]]; then _nmcli_list "yes no auto" - return 0 + return 0 fi _nmcli_array_delete_at words 0 1 ;; @@ -249,21 +251,21 @@ _nmcli_compl_OPTIONS() 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 + return 0 fi _nmcli_array_delete_at words 0 1 ;; escape) if [[ "${#words[@]}" -eq 2 ]]; then _nmcli_list "no yes" - return 0 + return 0 fi _nmcli_array_delete_at words 0 1 ;; wait) if [[ "${#words[@]}" -eq 2 ]]; then _nmcli_list "" - return 0 + return 0 fi _nmcli_array_delete_at words 0 1 ;; @@ -328,13 +330,13 @@ _nmcli_compl_ARGS() case "${WORD0}" in level) if [[ "${#words[@]}" -eq 2 ]]; then - _nmcli_list "OFF ERR WARN INFO DEBUG TRACE" + _nmcli_list "OFF ERR WARN INFO DEBUG TRACE KEEP" return 0 fi ;; domains) if [[ "${#words[@]}" -eq 2 ]]; then - local OPTIONS_DOM=(ALL DEFAULT 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) + 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 @@ -761,21 +763,14 @@ _nmcli_compl_COMMAND_nl() { _nmcli_compl_PROPERTIES() { - while [[ "${#words[@]}" -gt 0 ]]; do - if [[ ${#words[@]} -le 1 ]]; then - local PREFIX="" - - if [[ "${words[0]:0:1}" == [+-] ]]; then - PREFIX="${words[0]:0:1}" - fi - _nmcli_list_nl "$(echo -e 'print\nquit\nyes' |nmcli c edit "$@" 2>/dev/null |awk -F: '/\..*:/ {print "'$PREFIX'"$1}')" - return 0 - elif [[ ${#words[@]} -le 2 ]]; then + 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 - _nmcli_list_nl "$(echo -e 'print\nquit\nyes' |nmcli c edit "$@" 2>/dev/null |awk -F: '/\..*:/ {print $1}')" + return 0 } _nmcli() @@ -802,22 +797,18 @@ _nmcli() cur='' fi - local OPTIONS_UNKNOWN_OPTION OPTIONS_TYPE OPTIONS_TYPED OPTIONS OPTIONS_MANDATORY COMMAND_ARGS_WAIT_OPTIONS OPTIONS_IP OPTIONS_MANDATORY OPTIONS_NEXT_GROUP OPTIONS_SEP OPTIONS_REPEATABLE - local COMMAND_CONNECTION_TYPE COMMAND_CONNECTION_ID OPTIONS_MANDATORY_IFNAME HELP_ONLY_AS_FIRST - local COMMAND_CONNECTION_ACTIVE="" + 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) - HELP_ONLY_AS_FIRST= - local LONG_OPTIONS=(terse pretty mode fields colors escape ask show-secrets wait version help) _nmcli_compl_OPTIONS i=$? - if [[ "$HELP_ONLY_AS_FIRST" == '0' ]]; then - # got a --help. No more completion. - return 0 - fi - case $i in 0) + # We have just completed an option or got an --help: terminate. return 0 ;; 1) @@ -1005,238 +996,10 @@ _nmcli() ;; a|ad|add) if [[ ${#words[@]} -eq 3 ]]; then - _nmcli_compl_COMMAND "${words[2]}" type ifname con-name autoconnect master slave-type - elif [[ ${#words[@]} -gt 3 ]]; then + _nmcli_compl_COMMAND_nl "${words[2]}" "$(nmcli --complete-args connection add "" 2>/dev/null)" + else _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 "${words[2]}" type ifname con-name autoconnect master slave-type - fi - return 0 - ;; - esac - - OPTIONS_TYPE= - OPTIONS=(type ifname con-name autoconnect save master slave-type) - OPTIONS_MANDATORY=(type ifname) - COMMAND_ARGS_WAIT_OPTIONS=1 - OPTIONS_MANDATORY_IFNAME=1 - _nmcli_compl_ARGS && return 0 - - OPTIONS_MANDATORY_IFNAME= - if _nmcli_array_has_value OPTIONS "${OPTIONS_MANDATORY[@]}"; then - # we still have some missing mandatory options... - if [[ "$OPTIONS_UNKNOWN_OPTION" != '' ]]; then - if ! _nmcli_array_has_value OPTIONS "${OPTIONS_UNKNOWN_OPTION:1}"; then - # if we encountered an unknown option while having mandatory - # options, just return. - return 0 - fi - fi - _nmcli_list "$(echo "${OPTIONS[@]}")" - return 0 - fi - - OPTIONS_IP=(ip4 ip6 gw4 gw6) - OPTIONS_SEP=(--) - OPTIONS_MANDATORY=() - case "$OPTIONS_TYPE" in - 802-3|802-3-|802-3-e|802-3-et|802-3-eth|802-3-ethe|802-3-ether|802-3-ethern|802-3-etherne|802-3-ethernet| \ - e|et|eth|ethe|ether|ethern|etherne|ethernet) - OPTIONS_TYPE=ethernet - OPTIONS_TYPED=(mac cloned-mac mtu) - ;; - 802-11-w|802-11-wi|802-11-wir|802-11-wire|802-11-wirel|802-11-wirele|802-11-wireles|802-11-wireless| \ - wif|wifi) - OPTIONS_TYPE=wifi - OPTIONS_TYPED=(ssid mac cloned-mac mtu mode) - OPTIONS_MANDATORY=(ssid) - ;; - wim|wima|wimax) - OPTIONS_TYPE=wimax - OPTIONS_TYPED=(mac nsp) - ;; - g|gs|gsm) - OPTIONS_TYPE=gsm - OPTIONS_TYPED=(apn user password) - OPTIONS_MANDATORY=(apn) - ;; - c|cd|cdm|cdma) - OPTIONS_TYPE=cdma - OPTIONS_TYPED=(user password) - ;; - i|in|inf|infi|infin|infini|infinib|infiniba|infiniban|infiniband) - OPTIONS_TYPE=infiniband - OPTIONS_TYPED=(mac mtu transport-mode parent p-key) - ;; - bl|blu|blue|bluet|blueto|bluetoo|bluetoot|bluetooth) - OPTIONS_TYPE=bluetooth - OPTIONS_TYPED=(addr bt-type) - ;; - vl|vla|vlan) - OPTIONS_TYPE=vlan - OPTIONS_TYPED=(dev id flags ingress egress mtu) - OPTIONS_MANDATORY=(dev) - ;; - bond) - OPTIONS_TYPE=bond - OPTIONS_TYPED=(mode miimon downdelay updelay arp-interval arp-ip-target primary lacp-rate) - ;; - team) - OPTIONS_TYPE=team - OPTIONS_TYPED=(config) - ;; - bridge) - OPTIONS_TYPE=bridge - OPTIONS_TYPED=(stp priority forward-delay hello-time max-age ageing-time mac) - ;; - vp|vpn) - OPTIONS_TYPE=vpn - OPTIONS_TYPED=(vpn-type user) - OPTIONS_MANDATORY=(vpn-type) - ;; - 802-11-o|802-11-ol|802-11-olp|802-11-olpc|802-11-olpc-|802-11-olpc-m|802-11-olpc-me|802-11-olpc-mes|802-11-olpc-mesh| \ - o|ol|olp|olpc|olpc-|olpc-m|olpc-me|olpc-mes|olpc-mesh) - OPTIONS_TYPE=olpc-mesh - OPTIONS_TYPED=(ssid channel dhcp-anycast) - OPTIONS_MANDATORY=(ssid) - ;; - p|pp|ppp|pppo|pppoe) - OPTIONS_TYPE=pppoe - OPTIONS_TYPED=(username password service mtu mac) - OPTIONS_MANDATORY=(username) - ;; - a|ad|ads|adsl) - OPTIONS_TYPE=adsl - OPTIONS_TYPED=(username password protocol encapsulation) - OPTIONS_MANDATORY=(username protocol) - ;; - tu|tun) - OPTIONS_TYPE=tun - OPTIONS_TYPED=(mode owner group pi vnet-hdr multi-queue) - OPTIONS_MANDATORY=(mode) - ;; - ip|ip-|ip-t|ip-tu|ip-tun|ip-tunn|ip-tunne|ip-tunnel) - OPTIONS_TYPE=ip-tunnel - OPTIONS_TYPED=(mode remote local dev) - OPTIONS_MANDATORY=(mode remote) - ;; - m|ma|mac|macv|macvl|macvla|macvlan) - OPTIONS_TYPE=macvlan - OPTIONS_TYPED=(dev mode tap) - OPTIONS_MANDATORY=(dev mode) - ;; - vx|vxl|vxla|vxlan) - OPTIONS_TYPE=vxlan - OPTIONS_TYPED=(id remote local dev source-port-min source-port-max destination-port) - OPTIONS_MANDATORY=(id remote) - ;; - *) - # for an unknown connection type, we stop completion here - return 0 - ;; - esac - if [[ "$COMMAND_ARGS_WAIT_OPTIONS" -ne 1 ]]; then - # means, we are at the end of options. Nothing more to parse, just show - # what are the options now. - if [[ "${#OPTIONS_MANDATORY[@]}" -gt 0 ]]; then - _nmcli_list "$(echo "${OPTIONS[@]}") $(echo "${OPTIONS_TYPED[@]}")" - else - _nmcli_list "$(echo "${OPTIONS[@]}") $(echo "${OPTIONS_TYPED[@]}") $(echo "${OPTIONS_IP[@]}") $(echo "${OPTIONS_SEP[@]}")" - fi - return 0 - fi - if [[ "${#OPTIONS[@]}" -gt 0 ]]; then - # we still have some options from before, but no mandatory ones. Mix them with OPTIONS_TYPED - # and continue parsing the options... - OPTIONS=("${OPTIONS[@]}" "${OPTIONS_TYPED[@]}") - OPTIONS_NEXT_GROUP=("${OPTIONS_TYPED[@]}") - _nmcli_compl_ARGS && return 0 - - if [[ "$COMMAND_ARGS_WAIT_OPTIONS" -ne 1 ]]; then - # means, we are at the end of options. Nothing more to parse, just show - # what are the options now. - if [[ "${#OPTIONS_MANDATORY[@]}" -gt 0 ]]; then - _nmcli_list "$(echo "${OPTIONS[@]}")" - else - _nmcli_list "$(echo "${OPTIONS[@]}") $(echo "${OPTIONS_IP[@]}") $(echo "${OPTIONS_SEP[@]}")" - fi - return 0 - fi - - if [[ "$OPTIONS_UNKNOWN_OPTION" != "" ]]; then - # there was an unknown option specified. Maybe we have to stop with the completion. - if [[ "${#OPTIONS_MANDATORY[@]}" -gt 0 ]]; then - # we have an unknown option, but still mandatory ones that must be fullfiled first. - return 0 - fi - if ! (_nmcli_array_has_value OPTIONS_IP "${OPTIONS_UNKNOWN_OPTION:1}" || - _nmcli_array_has_value OPTIONS_SEP "${OPTIONS_UNKNOWN_OPTION:1}"); then - # the unknown option is neither an IP option nor a separator. - return 0 - fi - # The unknown option is an IP option or a separator, which is fine... continue... - fi - - fi - OPTIONS=("${OPTIONS_TYPED[@]}") - OPTIONS_NEXT_GROUP=() - - if [[ "${#OPTIONS_MANDATORY[@]}" -ge 1 ]]; then - # we have some mandatory options... don't check for IP options yet... - _nmcli_compl_ARGS && return 0 - - if _nmcli_array_has_value OPTIONS "${OPTIONS_MANDATORY[@]}"; then - _nmcli_list "$(echo "${OPTIONS[@]}")" - return 0 - fi - - if [[ "$OPTIONS_UNKNOWN_OPTION" != "" ]]; then - if ! (_nmcli_array_has_value OPTIONS_IP "${OPTIONS_UNKNOWN_OPTION:1}" || - _nmcli_array_has_value OPTIONS_SEP "${OPTIONS_UNKNOWN_OPTION:1}"); then - # the unknown option is neither an IP option nor a separator. - return 0 - fi - fi - fi - - - # no mandatory options... do final completion including IP options - OPTIONS=("${OPTIONS[@]}" "${OPTIONS_IP[@]}" "${OPTIONS_SEP[@]}") - OPTIONS_NEXT_GROUP=("${OPTIONS_IP[@]}" "${OPTIONS_SEP[@]}") - _nmcli_compl_ARGS && return 0 - - if [[ "$OPTIONS_UNKNOWN_OPTION" != "" ]]; then - return 0 - fi - - if [[ "$COMMAND_ARGS_WAIT_OPTIONS" -ne 1 ]]; then - # means, we are at the end of options. Nothing more to parse, just show - # what are the options now. - _nmcli_list "$(echo "${OPTIONS[@]}")" - return 0 - fi - - - # process the last group of options, as the OPTIONS_TYPED are already handled... - OPTIONS=("${OPTIONS_IP[@]}" "${OPTIONS_SEP[@]}") - OPTIONS_NEXT_GROUP=("${OPTIONS_SEP[@]}") - COMMAND_ARGS_WAIT_OPTIONS=0 - _nmcli_compl_ARGS && return 0 - - _nmcli_array_delete_at words 0 - _nmcli_compl_PROPERTIES type "$OPTIONS_TYPE" - - return 0 - + _nmcli_list_nl "$(nmcli --complete-args connection add "${words[@]}" 2>/dev/null)" fi ;; e|ed|edi|edit) @@ -1421,7 +1184,7 @@ _nmcli() ;; d|de|dev|devi|devic|device) if [[ ${#words[@]} -eq 2 ]]; then - _nmcli_compl_COMMAND "$command" status show connect reapply disconnect delete monitor wifi set lldp + _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) @@ -1436,6 +1199,14 @@ _nmcli() _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) diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 7e788654..8bc8828b 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -19,7 +19,6 @@ * Copyright 2010 - 2015 Red Hat, Inc. */ -/* Generated configuration file */ #include "nm-default.h" #include @@ -41,6 +40,7 @@ #include "devices.h" #include "general.h" #include "agent.h" +#include "settings.h" #if defined(NM_DIST_VERSION) # define NMCLI_VERSION NM_DIST_VERSION @@ -64,6 +64,105 @@ GMainLoop *loop = NULL; static sigset_t signal_set; struct termios termios_orig; +static void +complete_field (GHashTable *h, const char *setting, NmcOutputField field[]) +{ + int i; + + for (i = 0; field[i].name; i++) { + if (setting) + g_hash_table_add (h, g_strdup_printf ("%s.%s", setting, field[i].name)); + else + g_hash_table_add (h, g_strdup (field[i].name)); + } +} + +static void +complete_one (gpointer key, gpointer value, gpointer user_data) +{ + const char *prefix = user_data; + const char *name = key; + const char *last; + + last = strrchr (prefix, ','); + if (last) + last++; + else + last = prefix; + + if ((!*last && !strchr (name, '.')) || matches (last, name) == 0) { + g_print ("%.*s%s%s\n", (int)(last-prefix), prefix, name, + strcmp (last, name) == 0 ? "," : ""); + } +} + +static void +complete_fields (const char *prefix) +{ + + GHashTable *h; + + h = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + + complete_field (h, NULL, nmc_fields_ip4_config); + complete_field (h, NULL, nmc_fields_dhcp4_config); + complete_field (h, NULL, nmc_fields_ip6_config); + complete_field (h, NULL, nmc_fields_dhcp6_config); + complete_field (h, NULL, nmc_fields_con_show); + complete_field (h, NULL, nmc_fields_settings_names); + complete_field (h, NULL, nmc_fields_con_active_details_general); + complete_field (h, NULL, nmc_fields_con_active_details_vpn); + complete_field (h, NULL, nmc_fields_con_active_details_groups); + complete_field (h, NULL, nmc_fields_dev_status); + complete_field (h, NULL, nmc_fields_dev_show_general); + complete_field (h, NULL, nmc_fields_dev_show_connections); + complete_field (h, NULL, nmc_fields_dev_show_cap); + complete_field (h, NULL, nmc_fields_dev_show_wired_prop); + complete_field (h, NULL, nmc_fields_dev_show_wifi_prop); + complete_field (h, NULL, nmc_fields_dev_show_wimax_prop); + complete_field (h, NULL, nmc_fields_dev_wifi_list); + complete_field (h, NULL, nmc_fields_dev_wimax_list); + complete_field (h, NULL, nmc_fields_dev_show_master_prop); + complete_field (h, NULL, nmc_fields_dev_show_team_prop); + complete_field (h, NULL, nmc_fields_dev_show_vlan_prop); + complete_field (h, NULL, nmc_fields_dev_show_bluetooth); + complete_field (h, NULL, nmc_fields_dev_show_sections); + 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, "serial", nmc_fields_setting_serial); + complete_field (h, "ppp", nmc_fields_setting_ppp); + complete_field (h, "pppoe", nmc_fields_setting_pppoe); + complete_field (h, "adsl", nmc_fields_setting_adsl); + 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, "vpn", nmc_fields_setting_vpn); + complete_field (h, "wimax", nmc_fields_setting_wimax); + complete_field (h, "infiniband", nmc_fields_setting_infiniband); + complete_field (h, "bond", nmc_fields_setting_bond); + complete_field (h, "vlan", nmc_fields_setting_vlan); + 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, "dcb", nmc_fields_setting_dcb); + complete_field (h, "tun", nmc_fields_setting_tun); + complete_field (h, "ip-tunnel", nmc_fields_setting_ip_tunnel); + complete_field (h, "macvlan", nmc_fields_setting_macvlan); + complete_field (h, "vxlan", nmc_fields_setting_vxlan); + + g_hash_table_foreach (h, complete_one, (gpointer) prefix); + g_hash_table_destroy (h); +} + /* Get an error quark for use with GError */ GQuark @@ -78,9 +177,9 @@ nmcli_error_quark (void) } static void -usage (const char *prog_name) +usage (void) { - g_printerr (_("Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" + g_printerr (_("Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n" "\n" "OPTIONS\n" " -t[erse] terse output\n" @@ -103,47 +202,20 @@ usage (const char *prog_name) " d[evice] devices managed by NetworkManager\n" " a[gent] NetworkManager secret agent or polkit agent\n" " m[onitor] monitor NetworkManager changes\n" - "\n"), - prog_name); -} - -static NMCResultCode -do_help (NmCli *nmc, int argc, char **argv) -{ - usage ("nmcli"); - return NMC_RESULT_SUCCESS; + "\n")); } -static const struct cmd { - const char *cmd; - NMCResultCode (*func) (NmCli *nmc, int argc, char **argv); -} nmcli_cmds[] = { - { "general", do_general }, - { "monitor", do_monitor }, - { "networking", do_networking }, - { "radio", do_radio }, - { "connection", do_connections }, - { "device", do_devices }, - { "agent", do_agent }, - { "help", do_help }, - { 0 } +static const NMCCommand nmcli_cmds[] = { + { "general", do_general, NULL }, + { "monitor", do_monitor, NULL }, + { "networking", do_networking, NULL }, + { "radio", do_radio, NULL }, + { "connection", do_connections, NULL }, + { "device", do_devices, NULL }, + { "agent", do_agent, NULL }, + { NULL, do_overview, usage } }; -static NMCResultCode -do_cmd (NmCli *nmc, const char *argv0, int argc, char **argv) -{ - const struct cmd *c; - - for (c = nmcli_cmds; c->cmd; ++c) { - if (matches (argv0, c->cmd) == 0) - return c->func (nmc, argc-1, argv+1); - } - - g_string_printf (nmc->return_text, _("Error: Object '%s' is unknown, try 'nmcli help'."), argv0); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - return nmc->return_value; -} - static NMCResultCode parse_command_line (NmCli *nmc, int argc, char **argv) { @@ -154,19 +226,34 @@ parse_command_line (NmCli *nmc, int argc, char **argv) base = argv[0]; else base++; + if (argc > 1 && nm_streq (argv[1], "--complete-args")) { + nmc->complete = TRUE; + argv[1] = argv[0]; + argc--; argv++; + } + argc--; argv++; /* parse options */ - while (argc > 1) { - char *opt = argv[1]; - /* '--' ends options */ - if (strcmp (opt, "--") == 0) { - argc--; argv++; - break; - } + while (argc) { + char *opt = argv[0]; if (opt[0] != '-') break; - if (opt[1] == '-') + + if (argc == 1 && nmc->complete) { + nmc_complete_strings (opt, "--terse", "--pretty", "--mode", "--colors", "--escape", + "--fields", "--nocheck", "--ask", "--show-secrets", + "--wait", "--version", "--help", NULL); + } + + if (opt[1] == '-') { opt++; + /* '--' ends options */ + if (opt[1] == '\0') { + argc--; argv++; + break; + } + } + if (matches (opt, "-terse") == 0) { if (nmc->print_output == NMC_PRINT_TERSE) { g_string_printf (nmc->return_text, _("Error: Option '--terse' is specified the second time.")); @@ -195,63 +282,67 @@ parse_command_line (NmCli *nmc, int argc, char **argv) nmc->print_output = NMC_PRINT_PRETTY; } else if (matches (opt, "-mode") == 0) { nmc->mode_specified = TRUE; - next_arg (&argc, &argv); - if (argc <= 1) { + if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return nmc->return_value; } - if (matches (argv[1], "tabular") == 0) + if (argc == 1 && nmc->complete) + nmc_complete_strings (argv[0], "tabular", "multiline", NULL); + if (matches (argv[0], "tabular") == 0) nmc->multiline_output = FALSE; - else if (matches (argv[1], "multiline") == 0) + else if (matches (argv[0], "multiline") == 0) nmc->multiline_output = TRUE; else { - g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[1], opt); + 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 nmc->return_value; } } else if (matches (opt, "-colors") == 0) { - next_arg (&argc, &argv); - if (argc <= 1) { + if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return nmc->return_value; } - if (matches (argv[1], "auto") == 0) + if (argc == 1 && nmc->complete) + nmc_complete_strings (argv[0], "yes", "no", "auto", NULL); + if (matches (argv[0], "auto") == 0) nmc->use_colors = NMC_USE_COLOR_AUTO; - else if (matches (argv[1], "yes") == 0) + else if (matches (argv[0], "yes") == 0) nmc->use_colors = NMC_USE_COLOR_YES; - else if (matches (argv[1], "no") == 0) + else if (matches (argv[0], "no") == 0) nmc->use_colors = NMC_USE_COLOR_NO; else { - g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[1], opt); + 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 nmc->return_value; } } else if (matches (opt, "-escape") == 0) { - next_arg (&argc, &argv); - if (argc <= 1) { + if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return nmc->return_value; } - if (matches (argv[1], "yes") == 0) + if (argc == 1 && nmc->complete) + nmc_complete_strings (argv[0], "yes", "no", NULL); + if (matches (argv[0], "yes") == 0) nmc->escape_values = TRUE; - else if (matches (argv[1], "no") == 0) + else if (matches (argv[0], "no") == 0) nmc->escape_values = FALSE; else { - g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[1], opt); + 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 nmc->return_value; } } else if (matches (opt, "-fields") == 0) { - next_arg (&argc, &argv); - if (argc <= 1) { + if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: fields for '%s' options are missing."), opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return nmc->return_value; } - nmc->required_fields = g_strdup (argv[1]); + if (argc == 1 && nmc->complete) + complete_fields (argv[0]); + nmc->required_fields = g_strdup (argv[0]); } else if (matches (opt, "-nocheck") == 0) { /* ignore for backward compatibility */ } else if (matches (opt, "-ask") == 0) { @@ -260,24 +351,25 @@ parse_command_line (NmCli *nmc, int argc, char **argv) nmc->show_secrets = TRUE; } else if (matches (opt, "-wait") == 0) { unsigned long timeout; - next_arg (&argc, &argv); - if (argc <= 1) { + if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return nmc->return_value; } - if (!nmc_string_to_uint (argv[1], TRUE, 0, G_MAXINT, &timeout)) { + if (!nmc_string_to_uint (argv[0], TRUE, 0, G_MAXINT, &timeout)) { g_string_printf (nmc->return_text, _("Error: '%s' is not a valid timeout for '%s' option."), - argv[1], opt); + argv[0], opt); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return nmc->return_value; } nmc->timeout = (int) timeout; } else if (matches (opt, "-version") == 0) { - g_print (_("nmcli tool, version %s\n"), NMCLI_VERSION); + if (!nmc->complete) + g_print (_("nmcli tool, version %s\n"), NMCLI_VERSION); return NMC_RESULT_SUCCESS; } else if (matches (opt, "-help") == 0) { - usage (base); + if (!nmc->complete) + usage (); return NMC_RESULT_SUCCESS; } else { g_string_printf (nmc->return_text, _("Error: Option '%s' is unknown, try 'nmcli -help'."), opt); @@ -288,13 +380,8 @@ parse_command_line (NmCli *nmc, int argc, char **argv) argv++; } - if (argc > 1) { - /* Now run the requested command */ - return do_cmd (nmc, argv[1], argc-1, argv+1); - } - - usage (base); - return nmc->return_value; + /* Now run the requested command */ + return nmc_do_cmd (nmc, nmcli_cmds, *argv, argc, argv); } static gboolean nmcli_sigint = FALSE; @@ -545,6 +632,7 @@ nmc_init (NmCli *nmc) nmc->output_data = g_ptr_array_new_full (20, g_free); memset (&nmc->print_fields, '\0', sizeof (NmcPrintFields)); nmc->ask = FALSE; + nmc->complete = FALSE; nmc->show_secrets = FALSE; nmc->use_colors = NMC_USE_COLOR_AUTO; nmc->in_editor = FALSE; @@ -628,8 +716,12 @@ main (int argc, char *argv[]) loop = g_main_loop_new (NULL, FALSE); /* create main loop */ g_main_loop_run (loop); /* run main loop */ - /* Print result descripting text */ - if (nm_cli.return_value != NMC_RESULT_SUCCESS) { + if (nm_cli.complete) { + /* Remove error statuses from command completion runs. */ + if (nm_cli.return_value < NMC_RESULT_COMPLETE_FILE) + nm_cli.return_value = NMC_RESULT_SUCCESS; + } else if (nm_cli.return_value != NMC_RESULT_SUCCESS) { + /* Print result descripting text */ g_printerr ("%s\n", nm_cli.return_text->str); } diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index 34100f00..a8908685 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -63,7 +63,10 @@ typedef enum { NMC_RESULT_ERROR_VERSIONS_MISMATCH = 9, /* Connection/Device/AP not found */ - NMC_RESULT_ERROR_NOT_FOUND = 10 + NMC_RESULT_ERROR_NOT_FOUND = 10, + + /* --complete-args signals a file name may follow */ + NMC_RESULT_COMPLETE_FILE = 65, } NMCResultCode; typedef enum { @@ -153,6 +156,7 @@ typedef struct _NmCli { GPtrArray *output_data; /* GPtrArray of arrays of NmcOutputField structs - accumulates data for output */ NmcPrintFields print_fields; /* Structure with field indices to print */ gboolean ask; /* Ask for missing parameters: option '--ask' */ + gboolean complete; /* Autocomplete the command line */ gboolean show_secrets; /* Whether to display secrets (both input and output): option '--show-secrets' */ gboolean in_editor; /* Whether running the editor - nmcli con edit' */ gboolean editor_status_line; /* Whether to display status line in connection editor */ diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c index 8b56e953..086851de 100644 --- a/clients/cli/polkit-agent.c +++ b/clients/cli/polkit-agent.c @@ -126,7 +126,6 @@ nmc_start_polkit_agent_start_try (NmCli *nmc) #else /* polkit agent is not avalable; implement stub functions. */ -#include "nm-default.h" #include "nmcli.h" #include "polkit-agent.h" diff --git a/clients/cli/settings-docs.c b/clients/cli/settings-docs.c index 3616ff87..c376fd7a 100644 --- a/clients/cli/settings-docs.c +++ b/clients/cli/settings-docs.c @@ -16,11 +16,12 @@ NmcPropertyDesc setting_802_11_wireless[] = { { "band", "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", "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", "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", "If specified, request that the Wi-Fi device use this MAC address instead of its permanent MAC address. This is known as MAC cloning or spoofing." }, + { "cloned-mac-address", "If specified, request that the device use this MAC address instead of its permanent MAC address. This is known as MAC cloning or spoofing. Beside explicitly specifing a MAC address, the special values \"preserve\", \"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means not to touch the MAC address on activation. \"permanent\" means to use the permanent hardware address of the device. \"random\" creates a random MAC address on each connect. \"stable\" creates a hashed MAC address based on connection.stable-id (or the connection's UUID) and a machine dependent key. If unspecified, the value can be overwritten via global defaults, see manual of NetworkManager.conf. If still unspecified, it defaults to \"permanent\". On D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address\"." }, + { "generate-mac-address-mask", "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", "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", "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", "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", "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)." }, + { "mac-address-randomization", "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). Deprecated: 1" }, { "mode", "Wi-Fi network mode; one of \"infrastructure\", \"adhoc\" or \"ap\". If blank, infrastructure is assumed." }, { "mtu", "If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet 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\"." }, @@ -92,8 +93,9 @@ NmcPropertyDesc setting_802_1x[] = { NmcPropertyDesc setting_802_3_ethernet[] = { { "auto-negotiate", "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." }, - { "cloned-mac-address", "If specified, request that the device use this MAC address instead of its permanent MAC address. This is known as MAC cloning or spoofing." }, + { "cloned-mac-address", "If specified, request that the device use this MAC address instead of its permanent MAC address. This is known as MAC cloning or spoofing. Beside explicitly specifing a MAC address, the special values \"preserve\", \"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means not to touch the MAC address on activation. \"permanent\" means to use the permanent hardware address of the device. \"random\" creates a random MAC address on each connect. \"stable\" creates a hashed MAC address based on connection.stable-id (or the connection's UUID) and a machine dependent key. If unspecified, the value can be overwritten via global defaults, see manual of NetworkManager.conf. If still unspecified, it defaults to \"permanent\". On D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address\"." }, { "duplex", "If specified, request that the device only use the specified duplex mode. Either \"half\" or \"full\"." }, + { "generate-mac-address-mask", "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", "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", "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", "If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames." }, @@ -171,6 +173,7 @@ NmcPropertyDesc setting_connection[] = { { "read-only", "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", "List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported." }, { "slave-type", "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", "This token to generate stable IDs for the connection. If unset, the UUID will be used instead. The stable-id is used instead of the connection UUID 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." }, { "timestamp", "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", "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", "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 \"-\")." }, @@ -285,6 +288,7 @@ NmcPropertyDesc setting_ipv6[] = { { "never-default", "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-metric", "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 IP routes." }, + { "token", "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode." }, }; NmcPropertyDesc setting_macvlan[] = { @@ -409,24 +413,24 @@ typedef struct { NmcSettingDesc all_settings[] = { { "802-11-olpc-mesh", setting_802_11_olpc_mesh, 4 }, - { "802-11-wireless", setting_802_11_wireless, 16 }, + { "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-3-ethernet", setting_802_3_ethernet, 14 }, + { "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 }, - { "connection", setting_connection, 18 }, + { "connection", setting_connection, 19 }, { "dcb", setting_dcb, 16 }, { "generic", setting_generic, 1 }, { "gsm", setting_gsm, 13 }, { "infiniband", setting_infiniband, 6 }, { "ip-tunnel", setting_ip_tunnel, 13 }, { "ipv4", setting_ipv4, 20 }, - { "ipv6", setting_ipv6, 20 }, + { "ipv6", setting_ipv6, 21 }, { "macvlan", setting_macvlan, 5 }, { "ppp", setting_ppp, 19 }, { "pppoe", setting_pppoe, 5 }, diff --git a/clients/cli/settings.c b/clients/cli/settings.c index f2a504cc..ee167d2c 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -24,8 +24,10 @@ #include #include +#include "nm-common-macros.h" #include "utils.h" #include "common.h" +#include "nm-vpn-helpers.h" /* Forward declarations */ static char *wep_key_type_to_string (NMWepKeyType type); @@ -43,26 +45,28 @@ NmcOutputField nmc_fields_setting_connection[] = { SETTING_FIELD ("name"), /* 0 */ SETTING_FIELD (NM_SETTING_CONNECTION_ID), /* 1 */ SETTING_FIELD (NM_SETTING_CONNECTION_UUID), /* 2 */ - SETTING_FIELD (NM_SETTING_CONNECTION_INTERFACE_NAME), /* 3 */ - SETTING_FIELD (NM_SETTING_CONNECTION_TYPE), /* 4 */ - SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT), /* 5 */ - SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY), /* 6 */ - SETTING_FIELD (NM_SETTING_CONNECTION_TIMESTAMP), /* 7 */ - SETTING_FIELD (NM_SETTING_CONNECTION_READ_ONLY), /* 8 */ - SETTING_FIELD (NM_SETTING_CONNECTION_PERMISSIONS), /* 9 */ - SETTING_FIELD (NM_SETTING_CONNECTION_ZONE), /* 10 */ - SETTING_FIELD (NM_SETTING_CONNECTION_MASTER), /* 11 */ - SETTING_FIELD (NM_SETTING_CONNECTION_SLAVE_TYPE), /* 12 */ - SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES), /* 13 */ - SETTING_FIELD (NM_SETTING_CONNECTION_SECONDARIES), /* 14 */ - SETTING_FIELD (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT), /* 15 */ - SETTING_FIELD (NM_SETTING_CONNECTION_METERED), /* 16 */ - SETTING_FIELD (NM_SETTING_CONNECTION_LLDP), /* 17 */ + SETTING_FIELD (NM_SETTING_CONNECTION_STABLE_ID), /* 3 */ + SETTING_FIELD (NM_SETTING_CONNECTION_INTERFACE_NAME), /* 4 */ + SETTING_FIELD (NM_SETTING_CONNECTION_TYPE), /* 5 */ + SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT), /* 6 */ + SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY), /* 7 */ + SETTING_FIELD (NM_SETTING_CONNECTION_TIMESTAMP), /* 8 */ + SETTING_FIELD (NM_SETTING_CONNECTION_READ_ONLY), /* 9 */ + SETTING_FIELD (NM_SETTING_CONNECTION_PERMISSIONS), /* 10 */ + SETTING_FIELD (NM_SETTING_CONNECTION_ZONE), /* 11 */ + SETTING_FIELD (NM_SETTING_CONNECTION_MASTER), /* 12 */ + SETTING_FIELD (NM_SETTING_CONNECTION_SLAVE_TYPE), /* 13 */ + SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES), /* 14 */ + SETTING_FIELD (NM_SETTING_CONNECTION_SECONDARIES), /* 15 */ + SETTING_FIELD (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT), /* 16 */ + SETTING_FIELD (NM_SETTING_CONNECTION_METERED), /* 17 */ + SETTING_FIELD (NM_SETTING_CONNECTION_LLDP), /* 18 */ {NULL, NULL, 0, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTING_CONNECTION_ALL "name"","\ NM_SETTING_CONNECTION_ID","\ NM_SETTING_CONNECTION_UUID","\ + NM_SETTING_CONNECTION_STABLE_ID","\ NM_SETTING_CONNECTION_INTERFACE_NAME","\ NM_SETTING_CONNECTION_TYPE","\ NM_SETTING_CONNECTION_AUTOCONNECT","\ @@ -88,13 +92,14 @@ NmcOutputField nmc_fields_setting_wired[] = { SETTING_FIELD (NM_SETTING_WIRED_AUTO_NEGOTIATE), /* 4 */ SETTING_FIELD (NM_SETTING_WIRED_MAC_ADDRESS), /* 5 */ SETTING_FIELD (NM_SETTING_WIRED_CLONED_MAC_ADDRESS), /* 6 */ - SETTING_FIELD (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST), /* 7 */ - SETTING_FIELD (NM_SETTING_WIRED_MTU), /* 8 */ - SETTING_FIELD (NM_SETTING_WIRED_S390_SUBCHANNELS), /* 9 */ - SETTING_FIELD (NM_SETTING_WIRED_S390_NETTYPE), /* 10 */ - SETTING_FIELD (NM_SETTING_WIRED_S390_OPTIONS), /* 11 */ - SETTING_FIELD (NM_SETTING_WIRED_WAKE_ON_LAN), /* 12 */ - SETTING_FIELD (NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD), /* 13 */ + SETTING_FIELD (NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK), /* 7 */ + SETTING_FIELD (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST), /* 8 */ + SETTING_FIELD (NM_SETTING_WIRED_MTU), /* 9 */ + SETTING_FIELD (NM_SETTING_WIRED_S390_SUBCHANNELS), /* 10 */ + SETTING_FIELD (NM_SETTING_WIRED_S390_NETTYPE), /* 11 */ + SETTING_FIELD (NM_SETTING_WIRED_S390_OPTIONS), /* 12 */ + SETTING_FIELD (NM_SETTING_WIRED_WAKE_ON_LAN), /* 13 */ + SETTING_FIELD (NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD), /* 14 */ {NULL, NULL, 0, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTING_WIRED_ALL "name"","\ @@ -104,6 +109,7 @@ NmcOutputField nmc_fields_setting_wired[] = { NM_SETTING_WIRED_AUTO_NEGOTIATE","\ NM_SETTING_WIRED_MAC_ADDRESS","\ NM_SETTING_WIRED_CLONED_MAC_ADDRESS","\ + NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK","\ NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST","\ NM_SETTING_WIRED_MTU","\ NM_SETTING_WIRED_S390_SUBCHANNELS","\ @@ -199,12 +205,13 @@ NmcOutputField nmc_fields_setting_wireless[] = { SETTING_FIELD (NM_SETTING_WIRELESS_TX_POWER), /* 7 */ SETTING_FIELD (NM_SETTING_WIRELESS_MAC_ADDRESS), /* 8 */ SETTING_FIELD (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS), /* 9 */ - SETTING_FIELD (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST), /* 10 */ - SETTING_FIELD (NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION), /* 11 */ - SETTING_FIELD (NM_SETTING_WIRELESS_MTU), /* 12 */ - SETTING_FIELD (NM_SETTING_WIRELESS_SEEN_BSSIDS), /* 13 */ - SETTING_FIELD (NM_SETTING_WIRELESS_HIDDEN), /* 14 */ - SETTING_FIELD (NM_SETTING_WIRELESS_POWERSAVE), /* 15 */ + SETTING_FIELD (NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK), /* 10 */ + SETTING_FIELD (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST), /* 11 */ + SETTING_FIELD (NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION), /* 12 */ + SETTING_FIELD (NM_SETTING_WIRELESS_MTU), /* 13 */ + SETTING_FIELD (NM_SETTING_WIRELESS_SEEN_BSSIDS), /* 14 */ + SETTING_FIELD (NM_SETTING_WIRELESS_HIDDEN), /* 15 */ + SETTING_FIELD (NM_SETTING_WIRELESS_POWERSAVE), /* 16 */ {NULL, NULL, 0, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTING_WIRELESS_ALL "name"","\ @@ -217,6 +224,7 @@ NmcOutputField nmc_fields_setting_wireless[] = { NM_SETTING_WIRELESS_TX_POWER","\ NM_SETTING_WIRELESS_MAC_ADDRESS","\ NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS","\ + NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK","\ NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST","\ NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION","\ NM_SETTING_WIRELESS_MTU","\ @@ -330,6 +338,7 @@ NmcOutputField nmc_fields_setting_ip6_config[] = { SETTING_FIELD (NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE), /* 15 */ SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME), /* 16 */ SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME), /* 17 */ + SETTING_FIELD (NM_SETTING_IP6_CONFIG_TOKEN), /* 18 */ {NULL, NULL, 0, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTING_IP6_CONFIG_ALL "name"","\ @@ -349,7 +358,8 @@ NmcOutputField nmc_fields_setting_ip6_config[] = { NM_SETTING_IP6_CONFIG_IP6_PRIVACY","\ NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE","\ NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME","\ - NM_SETTING_IP_CONFIG_DHCP_HOSTNAME + NM_SETTING_IP_CONFIG_DHCP_HOSTNAME","\ + NM_SETTING_IP6_CONFIG_TOKEN /* Available fields for NM_SETTING_SERIAL_SETTING_NAME */ NmcOutputField nmc_fields_setting_serial[] = { @@ -1249,6 +1259,7 @@ DEFINE_SECRET_FLAGS_GETTER (nmc_property_cdma_get_password_flags, NM_SETTING_CDM /* --- NM_SETTING_CONNECTION_SETTING_NAME property get functions --- */ DEFINE_GETTER (nmc_property_connection_get_id, NM_SETTING_CONNECTION_ID) DEFINE_GETTER (nmc_property_connection_get_uuid, NM_SETTING_CONNECTION_UUID) +DEFINE_GETTER (nmc_property_connection_get_stable_id, NM_SETTING_CONNECTION_STABLE_ID) DEFINE_GETTER (nmc_property_connection_get_interface_name, NM_SETTING_CONNECTION_INTERFACE_NAME) DEFINE_GETTER (nmc_property_connection_get_type, NM_SETTING_CONNECTION_TYPE) DEFINE_GETTER (nmc_property_connection_get_autoconnect, NM_SETTING_CONNECTION_AUTOCONNECT) @@ -1629,6 +1640,7 @@ DEFINE_GETTER (nmc_property_ipv6_get_never_default, NM_SETTING_IP_CONFIG_NEVER_D DEFINE_GETTER (nmc_property_ipv6_get_may_fail, NM_SETTING_IP_CONFIG_MAY_FAIL) DEFINE_GETTER (nmc_property_ipv6_get_dhcp_send_hostname, NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME) DEFINE_GETTER (nmc_property_ipv6_get_dhcp_hostname, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME) +DEFINE_GETTER (nmc_property_ipv6_get_token, NM_SETTING_IP6_CONFIG_TOKEN) static char * nmc_property_ipv6_get_ip6_privacy (NMSetting *setting, NmcPropertyGetType get_type) @@ -1757,6 +1769,7 @@ DEFINE_GETTER (nmc_property_wired_get_duplex, NM_SETTING_WIRED_DUPLEX) DEFINE_GETTER (nmc_property_wired_get_auto_negotiate, NM_SETTING_WIRED_AUTO_NEGOTIATE) DEFINE_GETTER (nmc_property_wired_get_mac_address, NM_SETTING_WIRED_MAC_ADDRESS) DEFINE_GETTER (nmc_property_wired_get_cloned_mac_address, NM_SETTING_WIRED_CLONED_MAC_ADDRESS) +DEFINE_GETTER (nmc_property_wired_get_generate_mac_address_mask, NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK) DEFINE_GETTER (nmc_property_wired_get_mac_address_blacklist, NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST) DEFINE_GETTER (nmc_property_wired_get_s390_subchannels, NM_SETTING_WIRED_S390_SUBCHANNELS) DEFINE_GETTER (nmc_property_wired_get_s390_nettype, NM_SETTING_WIRED_S390_NETTYPE) @@ -1883,6 +1896,7 @@ DEFINE_GETTER (nmc_property_wireless_get_rate, NM_SETTING_WIRELESS_RATE) DEFINE_GETTER (nmc_property_wireless_get_tx_power, NM_SETTING_WIRELESS_TX_POWER) DEFINE_GETTER (nmc_property_wireless_get_mac_address, NM_SETTING_WIRELESS_MAC_ADDRESS) DEFINE_GETTER (nmc_property_wireless_get_cloned_mac_address, NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS) +DEFINE_GETTER (nmc_property_wireless_get_generate_mac_address_mask, NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK) DEFINE_GETTER (nmc_property_wireless_get_mac_address_blacklist, NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST) DEFINE_GETTER (nmc_property_wireless_get_seen_bssids, NM_SETTING_WIRELESS_SEEN_BSSIDS) DEFINE_GETTER (nmc_property_wireless_get_hidden, NM_SETTING_WIRELESS_HIDDEN) @@ -2402,21 +2416,58 @@ nmc_setting_custom_init (NMSetting *setting) { g_return_if_fail (NM_IS_SETTING (setting)); - if (NM_IS_SETTING_IP4_CONFIG (setting)) { + if (NM_IS_SETTING_VLAN (setting)) { + /* Set sensible initial VLAN values */ + g_object_set (NM_SETTING_VLAN (setting), + NM_SETTING_VLAN_ID, 1, + NULL); + } else if (NM_IS_SETTING_INFINIBAND (setting)) { + /* Initialize 'transport-mode' so that 'infiniband' is valid */ + g_object_set (NM_SETTING_INFINIBAND (setting), + NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram", + NULL); + } else if (NM_IS_SETTING_CDMA (setting)) { + /* Initialize 'number' so that 'cdma' is valid */ + g_object_set (NM_SETTING_CDMA (setting), + NM_SETTING_CDMA_NUMBER, "#777", + NULL); + } else if (NM_IS_SETTING_GSM (setting)) { + /* Initialize 'number' so that 'gsm' is valid */ + g_object_set (NM_SETTING_GSM (setting), + NM_SETTING_GSM_NUMBER, "*99#", + NULL); + } else if (NM_IS_SETTING_OLPC_MESH (setting)) { + g_object_set (NM_SETTING_OLPC_MESH (setting), + NM_SETTING_OLPC_MESH_CHANNEL, 1, + NULL); + } else if (NM_IS_SETTING_WIRELESS (setting)) { + /* For Wi-Fi set mode to "infrastructure". Even though mode == NULL + * is regarded as "infrastructure", explicit value makes no doubts. + */ + g_object_set (NM_SETTING_WIRELESS (setting), + NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_INFRA, + NULL); + } else if (NM_IS_SETTING_ADSL (setting)) { + /* Initialize a protocol */ + g_object_set (NM_SETTING_ADSL (setting), + NM_SETTING_ADSL_PROTOCOL, NM_SETTING_ADSL_PROTOCOL_PPPOE, + NULL); + } else if (NM_IS_SETTING_IP4_CONFIG (setting)) { g_object_set (NM_SETTING_IP_CONFIG (setting), NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL); - nmc_setting_ip4_connect_handlers (NM_SETTING_IP_CONFIG (setting)); } else if (NM_IS_SETTING_IP6_CONFIG (setting)) { g_object_set (NM_SETTING_IP_CONFIG (setting), NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO, NULL); - nmc_setting_ip6_connect_handlers (NM_SETTING_IP_CONFIG (setting)); - } else if (NM_IS_SETTING_WIRELESS (setting)) { - g_object_set (NM_SETTING_WIRELESS (setting), - NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_INFRA, + } else if (NM_IS_SETTING_TUN (setting)) { + g_object_set (NM_SETTING_TUN (setting), + NM_SETTING_TUN_MODE, NM_SETTING_TUN_MODE_TUN, + NULL); + } else if (NM_IS_SETTING_BLUETOOTH (setting)) { + g_object_set (NM_SETTING_BLUETOOTH (setting), + NM_SETTING_BLUETOOTH_TYPE, NM_SETTING_BLUETOOTH_TYPE_PANU, NULL); - nmc_setting_wireless_connect_handlers (NM_SETTING_WIRELESS (setting)); } } @@ -2842,11 +2893,12 @@ nmc_property_set_ssid (NMSetting *setting, const char *prop, const char *val, GE } static gboolean -nmc_property_set_mac (NMSetting *setting, const char *prop, const char *val, GError **error) +_property_set_mac (NMSetting *setting, const char *prop, const char *val, gboolean cloned_mac_addr, GError **error) { g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - if (!nm_utils_hwaddr_valid (val, ETH_ALEN)) { + if ( (!cloned_mac_addr || !NM_CLONED_MAC_IS_SPECIAL (val)) + && !nm_utils_hwaddr_valid (val, ETH_ALEN)) { g_set_error (error, 1, 0, _("'%s' is not a valid Ethernet MAC"), val); return FALSE; } @@ -2855,6 +2907,18 @@ nmc_property_set_mac (NMSetting *setting, const char *prop, const char *val, GEr return TRUE; } +static gboolean +nmc_property_set_mac (NMSetting *setting, const char *prop, const char *val, GError **error) +{ + return _property_set_mac (setting, prop, val, FALSE, error); +} + +static gboolean +nmc_property_set_mac_cloned (NMSetting *setting, const char *prop, const char *val, GError **error) +{ + return _property_set_mac (setting, prop, val, TRUE, error); +} + static gboolean nmc_property_set_mtu (NMSetting *setting, const char *prop, const char *val, GError **error) { @@ -2915,6 +2979,16 @@ nmc_property_set_secret_flags (NMSetting *setting, const char *prop, const char return TRUE; } +static gboolean +nmc_property_set_vpn_service (NMSetting *setting, const char *prop, const char *val, GError **error) +{ + gs_free char *service_name = NULL; + + service_name = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), val); + g_object_set (setting, prop, service_name ? : val, NULL); + return TRUE; +} + static gboolean nmc_util_is_domain (const char *domain) { @@ -2994,6 +3068,32 @@ done: } /* --- NM_SETTING_CONNECTION_SETTING_NAME property setter functions --- */ +static gboolean +nmc_property_connection_set_type (NMSetting *setting, const char *prop, const char *val, GError **error) +{ + gs_free char *uuid = NULL; + + if (nm_setting_connection_get_uuid (NM_SETTING_CONNECTION (setting))) { + /* Don't allow setting type unless the connection is brand new. + * Just because it's a bad idea and the user wouldn't probably want that. + * No technical reason, really. + * Also, using uuid to see if the connection is brand new is a bit + * hacky: we can not see if the type is already set, because + * nmc_setting_set_property() is called only after the property + * we're setting (type) has been removed. */ + g_set_error (error, 1, 0, _("Can not change the connection type")); + return FALSE; + } + + uuid = nm_utils_uuid_generate (); + g_object_set (G_OBJECT (setting), + NM_SETTING_CONNECTION_UUID, uuid, + NULL); + + g_object_set (G_OBJECT (setting), prop, val, NULL); + return TRUE; +} + #if 0 /* * Setting/removing UUID has been forbidden. @@ -3144,8 +3244,7 @@ nmc_property_connection_set_secondaries (NMSetting *setting, const char *prop, c continue; if (nm_utils_is_uuid (*iter)) { - con = nmc_find_connection (nm_cli.connections, - "uuid", *iter, NULL); + con = nmc_find_connection (nm_cli.connections, "uuid", *iter, NULL, FALSE); if (!con) g_print (_("Warning: %s is not an UUID of any existing connection profile\n"), *iter); else { @@ -3157,8 +3256,7 @@ nmc_property_connection_set_secondaries (NMSetting *setting, const char *prop, c } } } else { - con = nmc_find_connection (nm_cli.connections, - "id", *iter, NULL); + con = nmc_find_connection (nm_cli.connections, "id", *iter, NULL, FALSE); if (!con) { g_set_error (error, 1, 0, _("'%s' is not a name of any exiting profile"), *iter); g_strfreev (strv); @@ -6137,6 +6235,13 @@ nmc_properties_init (void) NULL, NULL, NULL); + nmc_add_prop_funcs (GLUE (CONNECTION, STABLE_ID), + nmc_property_connection_get_stable_id, + nmc_property_set_string, + NULL, + NULL, + NULL, + NULL); nmc_add_prop_funcs (GLUE (CONNECTION, INTERFACE_NAME), nmc_property_connection_get_interface_name, nmc_property_set_ifname, @@ -6146,7 +6251,7 @@ nmc_properties_init (void) NULL); nmc_add_prop_funcs (GLUE (CONNECTION, TYPE), nmc_property_connection_get_type, - NULL, /* read-only */ + nmc_property_connection_set_type, NULL, NULL, NULL, @@ -6728,6 +6833,13 @@ nmc_properties_init (void) NULL, NULL, NULL); + nmc_add_prop_funcs (GLUE (IP6_CONFIG, TOKEN), + nmc_property_ipv6_get_token, + nmc_property_set_string, + NULL, + NULL, + NULL, + NULL); /* Add editable properties for NM_SETTING_OLPC_MESH_SETTING_NAME */ nmc_add_prop_funcs (GLUE (OLPC_MESH, SSID), @@ -7005,7 +7117,7 @@ nmc_properties_init (void) /* Add editable properties for NM_SETTING_VPN_SETTING_NAME */ nmc_add_prop_funcs (GLUE (VPN, SERVICE_TYPE), nmc_property_vpn_get_service_type, - nmc_property_set_string, + nmc_property_set_vpn_service, NULL, NULL, NULL, @@ -7101,7 +7213,14 @@ nmc_properties_init (void) NULL); nmc_add_prop_funcs (GLUE (WIRED, CLONED_MAC_ADDRESS), nmc_property_wired_get_cloned_mac_address, - nmc_property_set_mac, + nmc_property_set_mac_cloned, + NULL, + NULL, + NULL, + NULL); + nmc_add_prop_funcs (GLUE (WIRED, GENERATE_MAC_ADDRESS_MASK), + nmc_property_wired_get_generate_mac_address_mask, + nmc_property_set_string, NULL, NULL, NULL, @@ -7219,7 +7338,14 @@ nmc_properties_init (void) NULL); nmc_add_prop_funcs (GLUE (WIRELESS, CLONED_MAC_ADDRESS), nmc_property_wireless_get_cloned_mac_address, - nmc_property_set_mac, + nmc_property_set_mac_cloned, + NULL, + NULL, + NULL, + NULL); + nmc_add_prop_funcs (GLUE (WIRELESS, GENERATE_MAC_ADDRESS_MASK), + nmc_property_wireless_get_generate_mac_address_mask, + nmc_property_set_string, NULL, NULL, NULL, @@ -7976,21 +8102,22 @@ setting_connection_details (NMSetting *setting, NmCli *nmc, const char *one_pro 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_interface_name (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 4, nmc_property_connection_get_type (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 5, nmc_property_connection_get_autoconnect (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 6, nmc_property_connection_get_autoconnect_priority (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 7, nmc_property_connection_get_timestamp (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_connection_get_read_only (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_connection_get_permissions (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_connection_get_zone (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_connection_get_master (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_connection_get_slave_type (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_connection_get_autoconnect_slaves (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 14, nmc_property_connection_get_secondaries (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 15, nmc_property_connection_get_gateway_ping_timeout (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 16, nmc_property_connection_get_metered (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 17, nmc_property_connection_get_lldp (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_timestamp (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 9, nmc_property_connection_get_read_only (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 10, nmc_property_connection_get_permissions (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 11, nmc_property_connection_get_zone (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 12, nmc_property_connection_get_master (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 13, nmc_property_connection_get_slave_type (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 14, nmc_property_connection_get_autoconnect_slaves (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 15, nmc_property_connection_get_secondaries (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 16, nmc_property_connection_get_gateway_ping_timeout (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 17, nmc_property_connection_get_metered (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 18, nmc_property_connection_get_lldp (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8022,13 +8149,14 @@ setting_wired_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb 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_mac_address_blacklist (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 8, nmc_property_wired_get_mtu (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 9, nmc_property_wired_get_s390_subchannels (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 10, nmc_property_wired_get_s390_nettype (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_wired_get_s390_options (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_wired_get_wake_on_lan (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_wired_get_wake_on_lan_password (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)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8122,12 +8250,13 @@ setting_wireless_details (NMSetting *setting, NmCli *nmc, const char *one_prop, 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_mac_address_blacklist (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 11, nmc_property_wireless_get_mac_address_randomization (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 12, nmc_property_wireless_get_mtu (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 13, nmc_property_wireless_get_seen_bssids (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 14, nmc_property_wireless_get_hidden (setting, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 15, nmc_property_wireless_get_powersave (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)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -8256,6 +8385,7 @@ setting_ip6_config_details (NMSetting *setting, NmCli *nmc, const char *one_pro 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)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ diff --git a/clients/cli/settings.h b/clients/cli/settings.h index bab00ee9..33900510 100644 --- a/clients/cli/settings.h +++ b/clients/cli/settings.h @@ -63,4 +63,34 @@ gboolean nmc_property_set_gvalue (NMSetting *setting, const char *prop, GValue * gboolean setting_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets); +extern NmcOutputField nmc_fields_setting_connection[]; +extern NmcOutputField nmc_fields_setting_wired[]; +extern NmcOutputField nmc_fields_setting_8021X[]; +extern NmcOutputField nmc_fields_setting_wireless[]; +extern NmcOutputField nmc_fields_setting_wireless_security[]; +extern NmcOutputField nmc_fields_setting_ip4_config[]; +extern NmcOutputField nmc_fields_setting_ip6_config[]; +extern NmcOutputField nmc_fields_setting_serial[]; +extern NmcOutputField nmc_fields_setting_ppp[]; +extern NmcOutputField nmc_fields_setting_pppoe[]; +extern NmcOutputField nmc_fields_setting_adsl[]; +extern NmcOutputField nmc_fields_setting_gsm[]; +extern NmcOutputField nmc_fields_setting_cdma[]; +extern NmcOutputField nmc_fields_setting_bluetooth[]; +extern NmcOutputField nmc_fields_setting_olpc_mesh[]; +extern NmcOutputField nmc_fields_setting_vpn[]; +extern NmcOutputField nmc_fields_setting_wimax[]; +extern NmcOutputField nmc_fields_setting_infiniband[]; +extern NmcOutputField nmc_fields_setting_bond[]; +extern NmcOutputField nmc_fields_setting_vlan[]; +extern NmcOutputField nmc_fields_setting_bridge[]; +extern NmcOutputField nmc_fields_setting_bridge_port[]; +extern NmcOutputField nmc_fields_setting_team[]; +extern NmcOutputField nmc_fields_setting_team_port[]; +extern NmcOutputField nmc_fields_setting_dcb[]; +extern NmcOutputField nmc_fields_setting_tun[]; +extern NmcOutputField nmc_fields_setting_ip_tunnel[]; +extern NmcOutputField nmc_fields_setting_macvlan[]; +extern NmcOutputField nmc_fields_setting_vxlan[]; + #endif /* NMC_SETTINGS_H */ diff --git a/clients/cli/utils.c b/clients/cli/utils.c index a406eee4..ff98276a 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -17,8 +17,6 @@ * Copyright 2010 - 2015 Red Hat, Inc. */ -/* Generated configuration file */ - #include "nm-default.h" #include @@ -1005,7 +1003,7 @@ colorize_string (NmCli *nmc, if ( use_colors (nmc) && (color != NMC_TERM_COLOR_NORMAL || color_fmt != NMC_TERM_FORMAT_NORMAL)) { - out = nmc_colorize (nmc, color, color_fmt, str); + out = nmc_colorize (nmc, color, color_fmt, "%s", str); *dealloc = TRUE; } else { out = (char *) str; diff --git a/clients/cli/utils.h b/clients/cli/utils.h index eab60d3a..5adbd2be 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -74,7 +74,7 @@ void nmc_terminal_show_progress (const char *str); const char *nmc_term_color_sequence (NmcTermColor color); const char *nmc_term_format_sequence (NmcTermFormat format); NmcTermColor nmc_term_color_parse_string (const char *str, GError **error); -char *nmc_colorize (NmCli *nmc, NmcTermColor color, NmcTermFormat format, const char * fmt, ...); +char *nmc_colorize (NmCli *nmc, NmcTermColor color, NmcTermFormat format, const char * fmt, ...) _nm_printf (4, 5); void nmc_filter_out_colors_inplace (char *str); char *nmc_filter_out_colors (const char *str); char *nmc_get_user_input (const char *ask_str); diff --git a/clients/common/nm-polkit-listener.h b/clients/common/nm-polkit-listener.h index 22c436c1..a8256460 100644 --- a/clients/common/nm-polkit-listener.h +++ b/clients/common/nm-polkit-listener.h @@ -22,10 +22,6 @@ #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE #include -#include "nm-default.h" - -G_BEGIN_DECLS - #define NM_TYPE_POLKIT_LISTENER (nm_polkit_listener_get_type ()) #define NM_POLKIT_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_POLKIT_LISTENER, NMPolkitListener)) #define NM_POLKIT_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_POLKIT_LISTENER, NMPolkitListenerClass)) @@ -99,6 +95,4 @@ void nm_polkit_listener_set_show_error_callback (NMPolkitListener *self, void nm_polkit_listener_set_completed_callback (NMPolkitListener *self, NMPolkitListenerOnCompletedFunc completed_callback); -G_END_DECLS - #endif /* __NM_POLKIT_LISTENER_H__ */ diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h index d2c58822..ba819ae3 100644 --- a/clients/common/nm-secret-agent-simple.h +++ b/clients/common/nm-secret-agent-simple.h @@ -22,8 +22,6 @@ #include #include -G_BEGIN_DECLS - #define NM_TYPE_SECRET_AGENT_SIMPLE (nm_secret_agent_simple_get_type ()) #define NM_SECRET_AGENT_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple)) #define NM_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass)) @@ -59,6 +57,4 @@ void nm_secret_agent_simple_response (NMSecretAgentSimpl void nm_secret_agent_simple_enable (NMSecretAgentSimple *self, const char *path); -G_END_DECLS - #endif /* __NM_SECRET_AGENT_SIMPLE_H__ */ diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index fe777ef5..f6f12176 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -19,8 +19,6 @@ /** * SECTION:nm-vpn-helpers * @short_description: VPN-related utilities - * - * Some functions should probably eventually move into libnm. */ #include "nm-default.h" @@ -28,34 +26,26 @@ #include "nm-vpn-helpers.h" #include -#include #include "nm-utils.h" -static gboolean plugins_loaded; -static GSList *plugins = NULL; +/*****************************************************************************/ NMVpnEditorPlugin * -nm_vpn_lookup_plugin (const char *name, const char *service, GError **error) +nm_vpn_get_editor_plugin (const char *service_type, GError **error) { NMVpnEditorPlugin *plugin = NULL; NMVpnPluginInfo *plugin_info; gs_free_error GError *local = NULL; - g_return_val_if_fail (!service ^ !name, NULL); + g_return_val_if_fail (service_type, NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - if (G_UNLIKELY (!plugins_loaded)) - nm_vpn_get_plugins (); - - if (service) - plugin_info = nm_vpn_plugin_info_list_find_by_service (plugins, service); - else - plugin_info = nm_vpn_plugin_info_list_find_by_name (plugins, name); + plugin_info = nm_vpn_plugin_info_list_find_by_service (nm_vpn_get_plugin_infos (), service_type); if (!plugin_info) { g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_FAILED, - _("unknown VPN plugin \"%s\""), service ?: name); + _("unknown VPN plugin \"%s\""), service_type); return NULL; } plugin = nm_vpn_plugin_info_get_editor_plugin (plugin_info); @@ -87,8 +77,11 @@ nm_vpn_lookup_plugin (const char *name, const char *service, GError **error) } GSList * -nm_vpn_get_plugins (void) +nm_vpn_get_plugin_infos (void) { + static bool plugins_loaded; + static GSList *plugins = NULL; + if (G_LIKELY (plugins_loaded)) return plugins; plugins_loaded = TRUE; @@ -96,80 +89,6 @@ nm_vpn_get_plugins (void) return plugins; } -static int -_strcmp_data (gconstpointer a, gconstpointer b, gpointer unused) -{ - return strcmp (a, b); -} - -const char ** -nm_vpn_get_plugin_names (gboolean only_available_plugins) -{ - GSList *p; - const char **list; - const char *known_names[] = { - "openvpn", - "vpnc", - "pptp", - "openconnect", - "openswan", - "libreswan", - "strongswan", - "ssh", - "l2tp", - "iodine", - "fortisslvpn", - }; - guint i, j, k; - - p = nm_vpn_get_plugins (); - list = g_new0 (const char *, g_slist_length (p) + G_N_ELEMENTS (known_names) + 1); - - i = 0; - for (i = 0; p; p = p->next) - list[i++] = nm_vpn_plugin_info_get_name (p->data); - if (!only_available_plugins) { - for (j = 0; j < G_N_ELEMENTS (known_names); j++) - list[i++] = known_names[j]; - } - - g_qsort_with_data (list, i, sizeof (gpointer), _strcmp_data, NULL); - - /* remove duplicates */ - for (k = 0, j = 1; j < i; j++) { - if (nm_streq (list[k], list[j])) - continue; - list[k++] = list[j]; - } - list[k++] = NULL; - - return list; -} - -const char * -nm_vpn_get_service_for_name (const char *name) -{ - NMVpnPluginInfo *plugin_info; - - g_return_val_if_fail (name, NULL); - - plugin_info = nm_vpn_plugin_info_list_find_by_name (nm_vpn_get_plugins (), name); - if (plugin_info) { - /* this only means we have a .name file (NMVpnPluginInfo). Possibly the - * NMVpnEditorPlugin is not loadable. */ - return nm_vpn_plugin_info_lookup_property (plugin_info, - NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION, - "service"); - } - return NULL; -} - -char * -nm_vpn_get_service_for_name_default (const char *name) -{ - return g_strdup_printf ("%s.%s", NM_DBUS_INTERFACE, name); -} - gboolean nm_vpn_supports_ipv6 (NMConnection *connection) { @@ -185,7 +104,7 @@ nm_vpn_supports_ipv6 (NMConnection *connection) if (!service_type) return FALSE; - plugin = nm_vpn_lookup_plugin (NULL, service_type, NULL); + plugin = nm_vpn_get_editor_plugin (service_type, NULL); if (!plugin) return FALSE; @@ -194,7 +113,7 @@ nm_vpn_supports_ipv6 (NMConnection *connection) } const VpnPasswordName * -nm_vpn_get_secret_names (const char *vpn_type) +nm_vpn_get_secret_names (const char *service_type) { const char *type; static VpnPasswordName generic_vpn_secrets[] = { {"password", N_("Password")}, {NULL, NULL} }; @@ -213,14 +132,16 @@ nm_vpn_get_secret_names (const char *vpn_type) {"gwcert", N_("Gateway certificate hash")}, {NULL, NULL} }; - if (!vpn_type) + if (!service_type) return NULL; - if (g_str_has_prefix (vpn_type, NM_DBUS_INTERFACE)) - type = vpn_type + strlen (NM_DBUS_INTERFACE) + 1; - else - type = vpn_type; + if ( !g_str_has_prefix (service_type, NM_DBUS_INTERFACE) + || service_type[NM_STRLEN (NM_DBUS_INTERFACE)] != '.') { + /* all our well-known, hard-coded vpn-types start with NM_DBUS_INTERFACE. */ + return NULL; + } + type = service_type + (NM_STRLEN (NM_DBUS_INTERFACE) + 1); if ( !g_strcmp0 (type, "pptp") || !g_strcmp0 (type, "iodine") || !g_strcmp0 (type, "ssh") diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h index 79fc94e9..9c23f37c 100644 --- a/clients/common/nm-vpn-helpers.h +++ b/clients/common/nm-vpn-helpers.h @@ -21,25 +21,18 @@ #include -#include "nm-default.h" - struct { const char *name; const char *ui_name; } typedef VpnPasswordName; -GSList *nm_vpn_get_plugins (void); - -const char **nm_vpn_get_plugin_names (gboolean only_available_plugins); - -const char *nm_vpn_get_service_for_name (const char *name); -char * nm_vpn_get_service_for_name_default (const char *name); +GSList *nm_vpn_get_plugin_infos (void); -NMVpnEditorPlugin *nm_vpn_lookup_plugin (const char *name, const char *service, GError **error); +NMVpnEditorPlugin *nm_vpn_get_editor_plugin (const char *service_type, GError **error); gboolean nm_vpn_supports_ipv6 (NMConnection *connection); -const VpnPasswordName * nm_vpn_get_secret_names (const char *vpn_type); +const VpnPasswordName * nm_vpn_get_secret_names (const char *service_type); gboolean nm_vpn_openconnect_authenticate_helper (const char *host, char **cookie, diff --git a/clients/tui/Makefile.in b/clients/tui/Makefile.in index d7773283..0aaf339a 100644 --- a/clients/tui/Makefile.in +++ b/clients/tui/Makefile.in @@ -91,8 +91,9 @@ host_triplet = @host@ @BUILD_NMTUI_TRUE@bin_PROGRAMS = nmtui$(EXEEXT) subdir = clients/tui ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ - $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -330,6 +331,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DNSMASQ_PATH = @DNSMASQ_PATH@ DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@ DSYMUTIL = @DSYMUTIL@ @@ -386,13 +388,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ -LIBDL = @LIBDL@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ @@ -404,6 +407,8 @@ LIBOBJS = @LIBOBJS@ 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@ @@ -464,6 +469,8 @@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ +SANITIZER_ENV = @SANITIZER_ENV@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -499,6 +506,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/clients/tui/newt/Makefile.in b/clients/tui/newt/Makefile.in index 3042089f..12583516 100644 --- a/clients/tui/newt/Makefile.in +++ b/clients/tui/newt/Makefile.in @@ -90,8 +90,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = clients/tui/newt ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ - $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -231,6 +232,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DNSMASQ_PATH = @DNSMASQ_PATH@ DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@ DSYMUTIL = @DSYMUTIL@ @@ -287,13 +289,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ -LIBDL = @LIBDL@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ @@ -305,6 +308,8 @@ LIBOBJS = @LIBOBJS@ 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@ @@ -365,6 +370,8 @@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ +SANITIZER_ENV = @SANITIZER_ENV@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -400,6 +407,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/clients/tui/newt/nmt-newt-button-box.h b/clients/tui/newt/nmt-newt-button-box.h index 970588a4..dec2c347 100644 --- a/clients/tui/newt/nmt-newt-button-box.h +++ b/clients/tui/newt/nmt-newt-button-box.h @@ -21,8 +21,6 @@ #include "nmt-newt-grid.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_BUTTON_BOX (nmt_newt_button_box_get_type ()) #define NMT_NEWT_BUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_BUTTON_BOX, NmtNewtButtonBox)) #define NMT_NEWT_BUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_BUTTON_BOX, NmtNewtButtonBoxClass)) @@ -60,6 +58,4 @@ void nmt_newt_button_box_add_widget_end (NmtNewtButtonBox *bbox, NmtNewtWidget *widget); -G_END_DECLS - #endif /* NMT_NEWT_BUTTON_BOX_H */ diff --git a/clients/tui/newt/nmt-newt-button.h b/clients/tui/newt/nmt-newt-button.h index 52e95c5d..646d0053 100644 --- a/clients/tui/newt/nmt-newt-button.h +++ b/clients/tui/newt/nmt-newt-button.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_BUTTON (nmt_newt_button_get_type ()) #define NMT_NEWT_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_BUTTON, NmtNewtButton)) #define NMT_NEWT_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_BUTTON, NmtNewtButtonClass)) @@ -48,6 +46,4 @@ void nmt_newt_button_set_label (NmtNewtButton *button, const char *label); const char *nmt_newt_button_get_label (NmtNewtButton *button); -G_END_DECLS - #endif /* NMT_NEWT_BUTTON_H */ diff --git a/clients/tui/newt/nmt-newt-checkbox.h b/clients/tui/newt/nmt-newt-checkbox.h index c277386b..e46e3ec2 100644 --- a/clients/tui/newt/nmt-newt-checkbox.h +++ b/clients/tui/newt/nmt-newt-checkbox.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_CHECKBOX (nmt_newt_checkbox_get_type ()) #define NMT_NEWT_CHECKBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_CHECKBOX, NmtNewtCheckbox)) #define NMT_NEWT_CHECKBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_CHECKBOX, NmtNewtCheckboxClass)) @@ -48,6 +46,4 @@ void nmt_newt_checkbox_set_active (NmtNewtCheckbox *checkbox, gboolean active); gboolean nmt_newt_checkbox_get_active (NmtNewtCheckbox *checkbox); -G_END_DECLS - #endif /* NMT_NEWT_CHECKBOX_H */ diff --git a/clients/tui/newt/nmt-newt-component.h b/clients/tui/newt/nmt-newt-component.h index 2ffa018e..bf8f2bb8 100644 --- a/clients/tui/newt/nmt-newt-component.h +++ b/clients/tui/newt/nmt-newt-component.h @@ -21,8 +21,6 @@ #include "nmt-newt-widget.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_COMPONENT (nmt_newt_component_get_type ()) #define NMT_NEWT_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_COMPONENT, NmtNewtComponent)) #define NMT_NEWT_COMPONENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_COMPONENT, NmtNewtComponentClass)) @@ -52,6 +50,4 @@ gboolean nmt_newt_component_get_sensitive (NmtNewtComponent *component); void nmt_newt_component_set_sensitive (NmtNewtComponent *component, gboolean sensitive); -G_END_DECLS - #endif /* NMT_NEWT_COMPONENT_H */ diff --git a/clients/tui/newt/nmt-newt-container.h b/clients/tui/newt/nmt-newt-container.h index 6f182925..32d6abcc 100644 --- a/clients/tui/newt/nmt-newt-container.h +++ b/clients/tui/newt/nmt-newt-container.h @@ -21,8 +21,6 @@ #include "nmt-newt-widget.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_CONTAINER (nmt_newt_container_get_type ()) #define NMT_NEWT_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_CONTAINER, NmtNewtContainer)) #define NMT_NEWT_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_CONTAINER, NmtNewtContainerClass)) @@ -56,6 +54,4 @@ void nmt_newt_container_remove (NmtNewtContainer *container, GSList *nmt_newt_container_get_children (NmtNewtContainer *container); -G_END_DECLS - #endif /* NMT_NEWT_CONTAINER_H */ diff --git a/clients/tui/newt/nmt-newt-entry-numeric.h b/clients/tui/newt/nmt-newt-entry-numeric.h index 43ac3449..00e19739 100644 --- a/clients/tui/newt/nmt-newt-entry-numeric.h +++ b/clients/tui/newt/nmt-newt-entry-numeric.h @@ -21,8 +21,6 @@ #include "nmt-newt-entry.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_ENTRY_NUMERIC (nmt_newt_entry_numeric_get_type ()) #define NMT_NEWT_ENTRY_NUMERIC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_ENTRY_NUMERIC, NmtNewtEntryNumeric)) #define NMT_NEWT_ENTRY_NUMERIC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_ENTRY_NUMERIC, NmtNewtEntryNumericClass)) @@ -46,6 +44,4 @@ NmtNewtWidget *nmt_newt_entry_numeric_new (int width, int min, int max); -G_END_DECLS - #endif /* NMT_NEWT_ENTRY_NUMERIC_H */ diff --git a/clients/tui/newt/nmt-newt-entry.h b/clients/tui/newt/nmt-newt-entry.h index 8df0b137..36bd9d51 100644 --- a/clients/tui/newt/nmt-newt-entry.h +++ b/clients/tui/newt/nmt-newt-entry.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_ENTRY (nmt_newt_entry_get_type ()) #define NMT_NEWT_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_ENTRY, NmtNewtEntry)) #define NMT_NEWT_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_ENTRY, NmtNewtEntryClass)) @@ -69,6 +67,4 @@ void nmt_newt_entry_set_width (NmtNewtEntry *entry, int width); int nmt_newt_entry_get_width (NmtNewtEntry *entry); -G_END_DECLS - #endif /* NMT_NEWT_ENTRY_H */ diff --git a/clients/tui/newt/nmt-newt-form.h b/clients/tui/newt/nmt-newt-form.h index be95eb68..2cae5b5e 100644 --- a/clients/tui/newt/nmt-newt-form.h +++ b/clients/tui/newt/nmt-newt-form.h @@ -21,8 +21,6 @@ #include "nmt-newt-container.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_FORM (nmt_newt_form_get_type ()) #define NMT_NEWT_FORM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_FORM, NmtNewtForm)) #define NMT_NEWT_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_FORM, NmtNewtFormClass)) @@ -61,6 +59,4 @@ void nmt_newt_form_quit (NmtNewtForm *form); void nmt_newt_form_set_focus (NmtNewtForm *form, NmtNewtWidget *widget); -G_END_DECLS - #endif /* NMT_NEWT_FORM_H */ diff --git a/clients/tui/newt/nmt-newt-grid.h b/clients/tui/newt/nmt-newt-grid.h index f36a38ee..11bfdec3 100644 --- a/clients/tui/newt/nmt-newt-grid.h +++ b/clients/tui/newt/nmt-newt-grid.h @@ -21,8 +21,6 @@ #include "nmt-newt-container.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_GRID (nmt_newt_grid_get_type ()) #define NMT_NEWT_GRID(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_GRID, NmtNewtGrid)) #define NMT_NEWT_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_GRID, NmtNewtGridClass)) @@ -67,6 +65,4 @@ void nmt_newt_grid_set_flags (NmtNewtGrid *grid, NmtNewtWidget *widget, NmtNewtGridFlags flags); -G_END_DECLS - #endif /* NMT_NEWT_GRID_H */ diff --git a/clients/tui/newt/nmt-newt-label.h b/clients/tui/newt/nmt-newt-label.h index a4e0dcca..ef894d91 100644 --- a/clients/tui/newt/nmt-newt-label.h +++ b/clients/tui/newt/nmt-newt-label.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_LABEL (nmt_newt_label_get_type ()) #define NMT_NEWT_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_LABEL, NmtNewtLabel)) #define NMT_NEWT_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_LABEL, NmtNewtLabelClass)) @@ -61,6 +59,4 @@ void nmt_newt_label_set_highlight (NmtNewtLabel *label, gboolean highlight); gboolean nmt_newt_label_get_highlight (NmtNewtLabel *label); -G_END_DECLS - #endif /* NMT_NEWT_LABEL_H */ diff --git a/clients/tui/newt/nmt-newt-listbox.h b/clients/tui/newt/nmt-newt-listbox.h index c18c9f8e..eba17a7c 100644 --- a/clients/tui/newt/nmt-newt-listbox.h +++ b/clients/tui/newt/nmt-newt-listbox.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_LISTBOX (nmt_newt_listbox_get_type ()) #define NMT_NEWT_LISTBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_LISTBOX, NmtNewtListbox)) #define NMT_NEWT_LISTBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_LISTBOX, NmtNewtListboxClass)) @@ -66,6 +64,4 @@ void nmt_newt_listbox_set_active_key (NmtNewtListbox *listbox, int nmt_newt_listbox_get_active (NmtNewtListbox *listbox); gpointer nmt_newt_listbox_get_active_key (NmtNewtListbox *listbox); -G_END_DECLS - #endif /* NMT_NEWT_LISTBOX_H */ diff --git a/clients/tui/newt/nmt-newt-popup.h b/clients/tui/newt/nmt-newt-popup.h index 643ea2d8..be2bc34c 100644 --- a/clients/tui/newt/nmt-newt-popup.h +++ b/clients/tui/newt/nmt-newt-popup.h @@ -21,8 +21,6 @@ #include "nmt-newt-button.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_POPUP (nmt_newt_popup_get_type ()) #define NMT_NEWT_POPUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_POPUP, NmtNewtPopup)) #define NMT_NEWT_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_POPUP, NmtNewtPopupClass)) @@ -57,6 +55,4 @@ const char *nmt_newt_popup_get_active_id (NmtNewtPopup *popup); void nmt_newt_popup_set_active_id (NmtNewtPopup *popup, const char *active_id); -G_END_DECLS - #endif /* NMT_NEWT_POPUP_H */ diff --git a/clients/tui/newt/nmt-newt-section.h b/clients/tui/newt/nmt-newt-section.h index 6bf59ebb..569e86e5 100644 --- a/clients/tui/newt/nmt-newt-section.h +++ b/clients/tui/newt/nmt-newt-section.h @@ -21,8 +21,6 @@ #include "nmt-newt-container.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_SECTION (nmt_newt_section_get_type ()) #define NMT_NEWT_SECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_SECTION, NmtNewtSection)) #define NMT_NEWT_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_SECTION, NmtNewtSectionClass)) @@ -52,6 +50,4 @@ void nmt_newt_section_set_body (NmtNewtSection *section, NmtNewtWidget *body); NmtNewtWidget *nmt_newt_section_get_body (NmtNewtSection *section); -G_END_DECLS - #endif /* NMT_NEWT_SECTION_H */ diff --git a/clients/tui/newt/nmt-newt-separator.h b/clients/tui/newt/nmt-newt-separator.h index 3f4183d5..71503099 100644 --- a/clients/tui/newt/nmt-newt-separator.h +++ b/clients/tui/newt/nmt-newt-separator.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_SEPARATOR (nmt_newt_separator_get_type ()) #define NMT_NEWT_SEPARATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_SEPARATOR, NmtNewtSeparator)) #define NMT_NEWT_SEPARATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_SEPARATOR, NmtNewtSeparatorClass)) @@ -44,6 +42,4 @@ GType nmt_newt_separator_get_type (void); NmtNewtWidget *nmt_newt_separator_new (void); -G_END_DECLS - #endif /* NMT_NEWT_SEPARATOR_H */ diff --git a/clients/tui/newt/nmt-newt-stack.h b/clients/tui/newt/nmt-newt-stack.h index 09afe4ba..c9bb5a07 100644 --- a/clients/tui/newt/nmt-newt-stack.h +++ b/clients/tui/newt/nmt-newt-stack.h @@ -21,8 +21,6 @@ #include "nmt-newt-container.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_STACK (nmt_newt_stack_get_type ()) #define NMT_NEWT_STACK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_STACK, NmtNewtStack)) #define NMT_NEWT_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_STACK, NmtNewtStackClass)) @@ -56,6 +54,4 @@ void nmt_newt_stack_set_active_id (NmtNewtStack *stack, const char *id); const char * nmt_newt_stack_get_active_id (NmtNewtStack *stack); -G_END_DECLS - #endif /* NMT_NEWT_STACK_H */ diff --git a/clients/tui/newt/nmt-newt-textbox.h b/clients/tui/newt/nmt-newt-textbox.h index b3743aea..31a159e2 100644 --- a/clients/tui/newt/nmt-newt-textbox.h +++ b/clients/tui/newt/nmt-newt-textbox.h @@ -21,8 +21,6 @@ #include "nmt-newt-component.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_TEXTBOX (nmt_newt_textbox_get_type ()) #define NMT_NEWT_TEXTBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_TEXTBOX, NmtNewtTextbox)) #define NMT_NEWT_TEXTBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_TEXTBOX, NmtNewtTextboxClass)) @@ -54,6 +52,4 @@ void nmt_newt_textbox_set_text (NmtNewtTextbox *textbox, const char *text); const char *nmt_newt_textbox_get_text (NmtNewtTextbox *textbox); -G_END_DECLS - #endif /* NMT_NEWT_TEXTBOX_H */ diff --git a/clients/tui/newt/nmt-newt-toggle-button.h b/clients/tui/newt/nmt-newt-toggle-button.h index e54c6d3f..69c0b7d1 100644 --- a/clients/tui/newt/nmt-newt-toggle-button.h +++ b/clients/tui/newt/nmt-newt-toggle-button.h @@ -21,8 +21,6 @@ #include "nmt-newt-button.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_TOGGLE_BUTTON (nmt_newt_toggle_button_get_type ()) #define NMT_NEWT_TOGGLE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_TOGGLE_BUTTON, NmtNewtToggleButton)) #define NMT_NEWT_TOGGLE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_TOGGLE_BUTTON, NmtNewtToggleButtonClass)) @@ -49,6 +47,4 @@ gboolean nmt_newt_toggle_button_get_active (NmtNewtToggleButton *button); void nmt_newt_toggle_button_set_active (NmtNewtToggleButton *button, gboolean active); -G_END_DECLS - #endif /* NMT_NEWT_TOGGLE_BUTTON_H */ diff --git a/clients/tui/newt/nmt-newt-types.h b/clients/tui/newt/nmt-newt-types.h index 4ea0a7b8..af550ca0 100644 --- a/clients/tui/newt/nmt-newt-types.h +++ b/clients/tui/newt/nmt-newt-types.h @@ -21,10 +21,6 @@ #include -#include "nm-default.h" - -G_BEGIN_DECLS - typedef struct _NmtNewtButton NmtNewtButton; typedef struct _NmtNewtButtonBox NmtNewtButtonBox; typedef struct _NmtNewtCheckbox NmtNewtCheckbox; @@ -45,6 +41,4 @@ typedef struct _NmtNewtTextbox NmtNewtTextbox; typedef struct _NmtNewtToggleButton NmtNewtToggleButton; typedef struct _NmtNewtWidget NmtNewtWidget; -G_END_DECLS - #endif /* NMT_NEWT_COMPONENT_H */ diff --git a/clients/tui/newt/nmt-newt-utils.h b/clients/tui/newt/nmt-newt-utils.h index 706f10d3..49d717d2 100644 --- a/clients/tui/newt/nmt-newt-utils.h +++ b/clients/tui/newt/nmt-newt-utils.h @@ -21,10 +21,6 @@ #include -#include "nm-default.h" - -G_BEGIN_DECLS - void nmt_newt_init (void); void nmt_newt_finished (void); @@ -41,14 +37,12 @@ char *nmt_newt_locale_from_utf8 (const char *str_utf8); int nmt_newt_text_width (const char *str); void nmt_newt_message_dialog (const char *message, - ...); + ...) _nm_printf (1, 2); int nmt_newt_choice_dialog (const char *button1, const char *button2, const char *message, - ...); + ...) _nm_printf (3, 4); char *nmt_newt_edit_string (const char *data); -G_END_DECLS - #endif /* NMT_NEWT_UTILS_H */ diff --git a/clients/tui/newt/nmt-newt-widget.h b/clients/tui/newt/nmt-newt-widget.h index a526a674..34ce943c 100644 --- a/clients/tui/newt/nmt-newt-widget.h +++ b/clients/tui/newt/nmt-newt-widget.h @@ -21,8 +21,6 @@ #include "nmt-newt-types.h" -G_BEGIN_DECLS - #define NMT_TYPE_NEWT_WIDGET (nmt_newt_widget_get_type ()) #define NMT_NEWT_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_WIDGET, NmtNewtWidget)) #define NMT_NEWT_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_WIDGET, NmtNewtWidgetClass)) @@ -113,6 +111,4 @@ void nmt_newt_widget_needs_rebuild (NmtNewtWidget *widget); void nmt_newt_widget_set_valid (NmtNewtWidget *widget, gboolean valid); -G_END_DECLS - #endif /* NMT_NEWT_WIDGET_H */ diff --git a/clients/tui/nm-editor-bindings.h b/clients/tui/nm-editor-bindings.h index c4ed95d5..fd4fcd30 100644 --- a/clients/tui/nm-editor-bindings.h +++ b/clients/tui/nm-editor-bindings.h @@ -21,8 +21,6 @@ #include -G_BEGIN_DECLS - void nm_editor_bindings_init (void); void nm_editor_bind_ip_addresses_with_prefix_to_strv (int family, @@ -71,6 +69,4 @@ void nm_editor_bind_wireless_security_wep_key (NMSettingWirelessSecurity void nm_editor_bind_vlan_name (NMSettingVlan *s_vlan, NMSettingConnection *s_con); -G_END_DECLS - #endif /* NM_EDITOR_BINDINGS_H */ diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index e582d41f..0ec55f3d 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -223,7 +223,7 @@ nm_editor_utils_get_connection_type_list (void) #if 0 /* Add "VPN" only if there are plugins */ - vpn_plugins_hash = nm_vpn_get_plugins (); + vpn_plugins_hash = nm_vpn_get_plugin_infos (); have_vpn_plugins = vpn_plugins_hash && g_hash_table_size (vpn_plugins_hash); if (have_vpn_plugins) { GHashTableIter iter; @@ -252,6 +252,18 @@ nm_editor_utils_get_connection_type_list (void) return list; } +static gboolean +_assert_format_int (const char *format) +{ + g_assert (format); + format = strchr (format, '%'); + g_assert (format); + format++; + g_assert (!strchr (format, '%')); + g_assert (format[0] == 'd'); + return TRUE; +} + static char * get_available_connection_name (const char *format, NMClient *client) @@ -261,6 +273,8 @@ get_available_connection_name (const char *format, char *cname = NULL; int i = 0; + nm_assert (_assert_format_int (format)); + conns = nm_client_get_connections (client); for (i = 0; i < conns->len; i++) { const char *id; @@ -275,7 +289,9 @@ get_available_connection_name (const char *format, char *temp; gboolean found = FALSE; + NM_PRAGMA_WARNING_DISABLE("-Wformat-nonliteral") temp = g_strdup_printf (format, i); + NM_PRAGMA_WARNING_REENABLE for (iter = names; iter; iter = g_slist_next (iter)) { if (!strcmp (iter->data, temp)) { found = TRUE; diff --git a/clients/tui/nm-editor-utils.h b/clients/tui/nm-editor-utils.h index 5e402ce7..15a16cd2 100644 --- a/clients/tui/nm-editor-utils.h +++ b/clients/tui/nm-editor-utils.h @@ -21,8 +21,6 @@ #include -G_BEGIN_DECLS - typedef struct { const char *name; GType setting_type; @@ -38,6 +36,4 @@ NMConnection *nm_editor_utils_create_connection (GType type, NMConnection *master, NMClient *client); -G_END_DECLS - #endif /* NM_EDITOR_UTILS_H */ diff --git a/clients/tui/nmt-address-list.h b/clients/tui/nmt-address-list.h index df7a4f79..f82f2181 100644 --- a/clients/tui/nmt-address-list.h +++ b/clients/tui/nmt-address-list.h @@ -21,8 +21,6 @@ #include "nmt-widget-list.h" -G_BEGIN_DECLS - #define NMT_TYPE_ADDRESS_LIST (nmt_address_list_get_type ()) #define NMT_ADDRESS_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_ADDRESS_LIST, NmtAddressList)) #define NMT_ADDRESS_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_ADDRESS_LIST, NmtAddressListClass)) @@ -52,6 +50,4 @@ typedef enum { NmtNewtWidget *nmt_address_list_new (NmtAddressListType list_type); -G_END_DECLS - #endif /* NMT_ADDRESS_LIST_H */ diff --git a/clients/tui/nmt-connect-connection-list.h b/clients/tui/nmt-connect-connection-list.h index d4790043..bf4721b9 100644 --- a/clients/tui/nmt-connect-connection-list.h +++ b/clients/tui/nmt-connect-connection-list.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_CONNECT_CONNECTION_LIST (nmt_connect_connection_list_get_type ()) #define NMT_CONNECT_CONNECTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_CONNECT_CONNECTION_LIST, NmtConnectConnectionList)) #define NMT_CONNECT_CONNECTION_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_CONNECT_CONNECTION_LIST, NmtConnectConnectionListClass)) @@ -56,6 +54,4 @@ gboolean nmt_connect_connection_list_get_selection (NmtConnectConnectionList * NMObject **specific_object, NMActiveConnection **active); -G_END_DECLS - #endif /* NMT_CONNECT_CONNECTION_LIST_H */ diff --git a/clients/tui/nmt-device-entry.h b/clients/tui/nmt-device-entry.h index 05d5d40f..4945e7c2 100644 --- a/clients/tui/nmt-device-entry.h +++ b/clients/tui/nmt-device-entry.h @@ -23,8 +23,6 @@ #include -G_BEGIN_DECLS - #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)) #define NMT_DEVICE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_DEVICE_ENTRY, NmtDeviceEntryClass)) @@ -55,6 +53,4 @@ void nmt_device_entry_set_device_filter (NmtDeviceEntry *deventry, NmtDeviceEntryDeviceFilter filter, gpointer user_data); -G_END_DECLS - #endif /* NMT_DEVICE_ENTRY_H */ diff --git a/clients/tui/nmt-edit-connection-list.h b/clients/tui/nmt-edit-connection-list.h index c31c0a8c..fd492bce 100644 --- a/clients/tui/nmt-edit-connection-list.h +++ b/clients/tui/nmt-edit-connection-list.h @@ -23,8 +23,6 @@ #include -G_BEGIN_DECLS - #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)) #define NMT_EDIT_CONNECTION_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDIT_CONNECTION_LIST, NmtEditConnectionListClass)) @@ -54,6 +52,4 @@ typedef gboolean (*NmtEditConnectionListFilter) (NmtEditConnectionList *list, NMConnection *connection, gpointer user_data); -G_END_DECLS - #endif /* NMT_EDIT_CONNECTION_LIST_H */ diff --git a/clients/tui/nmt-editor-grid.h b/clients/tui/nmt-editor-grid.h index 2ae01d71..48676896 100644 --- a/clients/tui/nmt-editor-grid.h +++ b/clients/tui/nmt-editor-grid.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_EDITOR_GRID (nmt_editor_grid_get_type ()) #define NMT_EDITOR_GRID(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR_GRID, NmtEditorGrid)) #define NMT_EDITOR_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR_GRID, NmtEditorGridClass)) @@ -57,6 +55,4 @@ void nmt_editor_grid_set_row_flags (NmtEditorGrid *grid, NmtNewtWidget *widget, NmtEditorGridRowFlags flags); -G_END_DECLS - #endif /* NMT_EDITOR_GRID_H */ diff --git a/clients/tui/nmt-editor-page-device.h b/clients/tui/nmt-editor-page-device.h index f911602c..75aecd01 100644 --- a/clients/tui/nmt-editor-page-device.h +++ b/clients/tui/nmt-editor-page-device.h @@ -22,8 +22,6 @@ #include "nmt-editor-page.h" #include "nmt-device-entry.h" -G_BEGIN_DECLS - #define NMT_TYPE_EDITOR_PAGE_DEVICE (nmt_editor_page_device_get_type ()) #define NMT_EDITOR_PAGE_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR_PAGE_DEVICE, NmtEditorPageDevice)) #define NMT_EDITOR_PAGE_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR_PAGE_DEVICE, NmtEditorPageDeviceClass)) @@ -45,6 +43,4 @@ GType nmt_editor_page_device_get_type (void); NmtDeviceEntry *nmt_editor_page_device_get_device_entry (NmtEditorPageDevice *page); -G_END_DECLS - #endif /* NMT_EDITOR_PAGE_DEVICE_H */ diff --git a/clients/tui/nmt-editor-page.h b/clients/tui/nmt-editor-page.h index bbc0d9e3..8da5ea9f 100644 --- a/clients/tui/nmt-editor-page.h +++ b/clients/tui/nmt-editor-page.h @@ -24,8 +24,6 @@ #include "nmt-editor-grid.h" #include "nmt-editor-section.h" -G_BEGIN_DECLS - #define NMT_TYPE_EDITOR_PAGE (nmt_editor_page_get_type ()) #define NMT_EDITOR_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR_PAGE, NmtEditorPage)) #define NMT_EDITOR_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR_PAGE, NmtEditorPageClass)) @@ -53,6 +51,4 @@ GSList *nmt_editor_page_get_sections (NmtEditorPage *page); void nmt_editor_page_add_section (NmtEditorPage *page, NmtEditorSection *section); -G_END_DECLS - #endif /* NMT_EDITOR_PAGE_H */ diff --git a/clients/tui/nmt-editor-section.h b/clients/tui/nmt-editor-section.h index 67410c71..3c2537be 100644 --- a/clients/tui/nmt-editor-section.h +++ b/clients/tui/nmt-editor-section.h @@ -22,8 +22,6 @@ #include "nmt-newt-section.h" #include "nmt-editor-grid.h" -G_BEGIN_DECLS - #define NMT_TYPE_EDITOR_SECTION (nmt_editor_section_get_type ()) #define NMT_EDITOR_SECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR_SECTION, NmtEditorSection)) #define NMT_EDITOR_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR_SECTION, NmtEditorSectionClass)) @@ -51,6 +49,4 @@ const char *nmt_editor_section_get_title (NmtEditorSection *sectio NmtNewtWidget *nmt_editor_section_get_header_widget (NmtEditorSection *section); NmtEditorGrid *nmt_editor_section_get_body (NmtEditorSection *section); -G_END_DECLS - #endif /* NMT_EDITOR_SECTION_H */ diff --git a/clients/tui/nmt-editor.h b/clients/tui/nmt-editor.h index db10b82a..b000f64e 100644 --- a/clients/tui/nmt-editor.h +++ b/clients/tui/nmt-editor.h @@ -23,8 +23,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_EDITOR (nmt_editor_get_type ()) #define NMT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR, NmtEditor)) #define NMT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR, NmtEditorClass)) @@ -46,6 +44,4 @@ GType nmt_editor_get_type (void); NmtNewtForm *nmt_editor_new (NMConnection *connection); -G_END_DECLS - #endif /* NMT_EDITOR_H */ diff --git a/clients/tui/nmt-ip-entry.h b/clients/tui/nmt-ip-entry.h index ceb355ef..2338a873 100644 --- a/clients/tui/nmt-ip-entry.h +++ b/clients/tui/nmt-ip-entry.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_IP_ENTRY (nmt_ip_entry_get_type ()) #define NMT_IP_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_IP_ENTRY, NmtIPEntry)) #define NMT_IP_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_IP_ENTRY, NmtIPEntryClass)) @@ -47,6 +45,4 @@ NmtNewtWidget *nmt_ip_entry_new (int width, gboolean prefix, gboolean optional); -G_END_DECLS - #endif /* NMT_IP_ENTRY_H */ diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c index d0f07e12..da7f55fa 100644 --- a/clients/tui/nmt-mac-entry.c +++ b/clients/tui/nmt-mac-entry.c @@ -28,11 +28,13 @@ #include "nm-default.h" +#include "nmt-mac-entry.h" + #include #include "NetworkManager.h" +#include "nm-common-macros.h" -#include "nmt-mac-entry.h" G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY) @@ -41,6 +43,7 @@ G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY) typedef struct { int mac_length; int mac_str_length; + NmtMacEntryType entry_type; } NmtMacEntryPrivate; @@ -48,6 +51,7 @@ enum { PROP_0, PROP_MAC_LENGTH, PROP_MAC_ADDRESS, + PROP_ENTRY_TYPE, LAST_PROP }; @@ -57,6 +61,7 @@ enum { * @width: the width in characters of the entry * @mac_length: the length in bytes of the hardware address * (either %ETH_ALEN or %INFINIBAND_ALEN) + * @entry_type: the type of the entry. * * Creates a new #NmtMacEntry. * @@ -64,11 +69,13 @@ enum { */ NmtNewtWidget * nmt_mac_entry_new (int width, - int mac_length) + int mac_length, + NmtMacEntryType entry_type) { return g_object_new (NMT_TYPE_MAC_ENTRY, "width", width, "mac-length", mac_length, + "entry-type", (int) entry_type, NULL); } @@ -81,6 +88,9 @@ mac_filter (NmtNewtEntry *entry, { NmtMacEntryPrivate *priv = NMT_MAC_ENTRY_GET_PRIVATE (entry); + if (priv->entry_type != NMT_MAC_ENTRY_TYPE_MAC) + return TRUE; + if (position >= priv->mac_str_length) return FALSE; @@ -98,6 +108,11 @@ mac_validator (NmtNewtEntry *entry, if (!*text) return TRUE; + if (priv->entry_type == NMT_MAC_ENTRY_TYPE_CLONED) { + if (NM_CLONED_MAC_IS_SPECIAL (text)) + return TRUE; + } + p = text; while ( g_ascii_isxdigit (p[0]) && g_ascii_isxdigit (p[1]) @@ -112,7 +127,9 @@ mac_validator (NmtNewtEntry *entry, if (!*p) return (p - text == priv->mac_str_length); - if (g_ascii_isxdigit (p[0]) && !p[1]) { + if ( g_ascii_isxdigit (p[0]) + && !p[1] + && p - text < priv->mac_str_length) { char *fixed = g_strdup_printf ("%.*s:%c", (int)(p - text), text, *p); nmt_newt_entry_set_text (entry, fixed); @@ -161,6 +178,10 @@ nmt_mac_entry_set_property (GObject *object, case PROP_MAC_ADDRESS: nmt_newt_entry_set_text (NMT_NEWT_ENTRY (object), g_value_get_string (value)); break; + case PROP_ENTRY_TYPE: + /* construct-only */ + priv->entry_type = g_value_get_int (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -182,6 +203,9 @@ nmt_mac_entry_get_property (GObject *object, case PROP_MAC_ADDRESS: g_value_set_string (value, nmt_newt_entry_get_text (NMT_NEWT_ENTRY (object))); break; + case PROP_ENTRY_TYPE: + g_value_set_int (value, priv->entry_type); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -224,4 +248,17 @@ nmt_mac_entry_class_init (NmtMacEntryClass *entry_class) NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** + * NmtMacEntry:entry-type: + * + * The type of the #NmtMacEntry. Can be either used for plain + * MAC addresses or for the extended format for cloned MAC addresses. + */ + g_object_class_install_property + (object_class, PROP_ENTRY_TYPE, + g_param_spec_int ("entry-type", "", "", + NMT_MAC_ENTRY_TYPE_MAC, NMT_MAC_ENTRY_TYPE_CLONED, NMT_MAC_ENTRY_TYPE_MAC, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); } diff --git a/clients/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h index 099bacb7..68d9a208 100644 --- a/clients/tui/nmt-mac-entry.h +++ b/clients/tui/nmt-mac-entry.h @@ -19,11 +19,13 @@ #ifndef NMT_MAC_ENTRY_H #define NMT_MAC_ENTRY_H -#include "nm-default.h" #include "nm-utils.h" #include "nmt-newt.h" -G_BEGIN_DECLS +typedef enum { /*< skip >*/ + NMT_MAC_ENTRY_TYPE_MAC, + NMT_MAC_ENTRY_TYPE_CLONED, +} NmtMacEntryType; #define NMT_TYPE_MAC_ENTRY (nmt_mac_entry_get_type ()) #define NMT_MAC_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_MAC_ENTRY, NmtMacEntry)) @@ -45,8 +47,7 @@ typedef struct { GType nmt_mac_entry_get_type (void); NmtNewtWidget *nmt_mac_entry_new (int width, - int mac_length); - -G_END_DECLS + int mac_length, + NmtMacEntryType type); #endif /* NMT_MAC_ENTRY_H */ diff --git a/clients/tui/nmt-mtu-entry.h b/clients/tui/nmt-mtu-entry.h index dfe416d0..b7b2cf46 100644 --- a/clients/tui/nmt-mtu-entry.h +++ b/clients/tui/nmt-mtu-entry.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_MTU_ENTRY (nmt_mtu_entry_get_type ()) #define NMT_MTU_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_MTU_ENTRY, NmtMtuEntry)) #define NMT_MTU_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_MTU_ENTRY, NmtMtuEntryClass)) @@ -44,6 +42,4 @@ GType nmt_mtu_entry_get_type (void); NmtNewtWidget *nmt_mtu_entry_new (void); -G_END_DECLS - #endif /* NMT_MTU_ENTRY_H */ diff --git a/clients/tui/nmt-page-bond.h b/clients/tui/nmt-page-bond.h index b77477db..d9b071ef 100644 --- a/clients/tui/nmt-page-bond.h +++ b/clients/tui/nmt-page-bond.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_BOND (nmt_page_bond_get_type ()) #define NMT_PAGE_BOND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_BOND, NmtPageBond)) #define NMT_PAGE_BOND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_BOND, NmtPageBondClass)) @@ -45,6 +43,4 @@ GType nmt_page_bond_get_type (void); NmtEditorPage *nmt_page_bond_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_BOND_H */ diff --git a/clients/tui/nmt-page-bridge-port.h b/clients/tui/nmt-page-bridge-port.h index c566dbc0..95689fff 100644 --- a/clients/tui/nmt-page-bridge-port.h +++ b/clients/tui/nmt-page-bridge-port.h @@ -21,8 +21,6 @@ #include "nmt-editor-page.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_BRIDGE_PORT (nmt_page_bridge_port_get_type ()) #define NMT_PAGE_BRIDGE_PORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_BRIDGE_PORT, NmtPageBridgePort)) #define NMT_PAGE_BRIDGE_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_BRIDGE_PORT, NmtPageBridgePortClass)) @@ -44,6 +42,4 @@ GType nmt_page_bridge_port_get_type (void); NmtEditorPage *nmt_page_bridge_port_new (NMConnection *conn); -G_END_DECLS - #endif /* NMT_PAGE_BRIDGE_PORT_H */ diff --git a/clients/tui/nmt-page-bridge.h b/clients/tui/nmt-page-bridge.h index 60cbdea2..21d850af 100644 --- a/clients/tui/nmt-page-bridge.h +++ b/clients/tui/nmt-page-bridge.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_BRIDGE (nmt_page_bridge_get_type ()) #define NMT_PAGE_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_BRIDGE, NmtPageBridge)) #define NMT_PAGE_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_BRIDGE, NmtPageBridgeClass)) @@ -45,6 +43,4 @@ GType nmt_page_bridge_get_type (void); NmtEditorPage *nmt_page_bridge_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_BRIDGE_H */ diff --git a/clients/tui/nmt-page-dsl.h b/clients/tui/nmt-page-dsl.h index dc84ca07..aa436e71 100644 --- a/clients/tui/nmt-page-dsl.h +++ b/clients/tui/nmt-page-dsl.h @@ -19,11 +19,8 @@ #ifndef NMT_PAGE_DSL_H #define NMT_PAGE_DSL_H -#include "nm-default.h" #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_DSL (nmt_page_dsl_get_type ()) #define NMT_PAGE_DSL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_DSL, NmtPageDsl)) #define NMT_PAGE_DSL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_DSL, NmtPageDslClass)) @@ -46,6 +43,4 @@ GType nmt_page_dsl_get_type (void); NmtEditorPage *nmt_page_dsl_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_DSL_H */ diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c index dfe2e440..6b924327 100644 --- a/clients/tui/nmt-page-ethernet.c +++ b/clients/tui/nmt-page-ethernet.c @@ -70,7 +70,7 @@ nmt_page_ethernet_constructed (GObject *object) section = nmt_editor_section_new (_("ETHERNET"), NULL, FALSE); grid = nmt_editor_section_get_body (section); - widget = nmt_mac_entry_new (40, ETH_ALEN); + widget = nmt_mac_entry_new (40, ETH_ALEN, NMT_MAC_ENTRY_TYPE_CLONED); g_object_bind_property (s_wired, NM_SETTING_WIRED_CLONED_MAC_ADDRESS, widget, "mac-address", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); diff --git a/clients/tui/nmt-page-ethernet.h b/clients/tui/nmt-page-ethernet.h index bdf3d677..56d917e1 100644 --- a/clients/tui/nmt-page-ethernet.h +++ b/clients/tui/nmt-page-ethernet.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_ETHERNET (nmt_page_ethernet_get_type ()) #define NMT_PAGE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_ETHERNET, NmtPageEthernet)) #define NMT_PAGE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_ETHERNET, NmtPageEthernetClass)) @@ -45,6 +43,4 @@ GType nmt_page_ethernet_get_type (void); NmtEditorPage *nmt_page_ethernet_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_ETHERNET_H */ diff --git a/clients/tui/nmt-page-infiniband.h b/clients/tui/nmt-page-infiniband.h index f51e0874..e2e0fbbc 100644 --- a/clients/tui/nmt-page-infiniband.h +++ b/clients/tui/nmt-page-infiniband.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_INFINIBAND (nmt_page_infiniband_get_type ()) #define NMT_PAGE_INFINIBAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_INFINIBAND, NmtPageInfiniband)) #define NMT_PAGE_INFINIBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_INFINIBAND, NmtPageInfinibandClass)) @@ -45,6 +43,4 @@ GType nmt_page_infiniband_get_type (void); NmtEditorPage *nmt_page_infiniband_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_INFINIBAND_H */ diff --git a/clients/tui/nmt-page-ip4.h b/clients/tui/nmt-page-ip4.h index e3c5a003..f120e57d 100644 --- a/clients/tui/nmt-page-ip4.h +++ b/clients/tui/nmt-page-ip4.h @@ -21,8 +21,6 @@ #include "nmt-editor-page.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_IP4 (nmt_page_ip4_get_type ()) #define NMT_PAGE_IP4(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_IP4, NmtPageIP4)) #define NMT_PAGE_IP4_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_IP4, NmtPageIP4Class)) @@ -44,6 +42,4 @@ GType nmt_page_ip4_get_type (void); NmtEditorPage *nmt_page_ip4_new (NMConnection *conn); -G_END_DECLS - #endif /* NMT_PAGE_IP4_H */ diff --git a/clients/tui/nmt-page-ip6.h b/clients/tui/nmt-page-ip6.h index 498261e1..3a471447 100644 --- a/clients/tui/nmt-page-ip6.h +++ b/clients/tui/nmt-page-ip6.h @@ -21,8 +21,6 @@ #include "nmt-editor-page.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_IP6 (nmt_page_ip6_get_type ()) #define NMT_PAGE_IP6(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_IP6, NmtPageIP6)) #define NMT_PAGE_IP6_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_IP6, NmtPageIP6Class)) @@ -44,6 +42,4 @@ GType nmt_page_ip6_get_type (void); NmtEditorPage *nmt_page_ip6_new (NMConnection *conn); -G_END_DECLS - #endif /* NMT_PAGE_IP6_H */ diff --git a/clients/tui/nmt-page-ppp.h b/clients/tui/nmt-page-ppp.h index 79103232..634323d4 100644 --- a/clients/tui/nmt-page-ppp.h +++ b/clients/tui/nmt-page-ppp.h @@ -21,8 +21,6 @@ #include "nmt-editor-page.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_PPP (nmt_page_ppp_get_type ()) #define NMT_PAGE_PPP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_PPP, NmtPagePpp)) #define NMT_PAGE_PPP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_PPP, NmtPagePppClass)) @@ -44,6 +42,4 @@ GType nmt_page_ppp_get_type (void); NmtEditorPage *nmt_page_ppp_new (NMConnection *conn); -G_END_DECLS - #endif /* NMT_PAGE_PPP_H */ diff --git a/clients/tui/nmt-page-team-port.h b/clients/tui/nmt-page-team-port.h index 2d8fa121..75c42849 100644 --- a/clients/tui/nmt-page-team-port.h +++ b/clients/tui/nmt-page-team-port.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_TEAM_PORT (nmt_page_team_port_get_type ()) #define NMT_PAGE_TEAM_PORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_TEAM_PORT, NmtPageTeamPort)) #define NMT_PAGE_TEAM_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_TEAM_PORT, NmtPageTeamPortClass)) @@ -44,6 +42,4 @@ GType nmt_page_team_port_get_type (void); NmtEditorPage *nmt_page_team_port_new (NMConnection *conn); -G_END_DECLS - #endif /* NMT_PAGE_TEAM_PORT_H */ diff --git a/clients/tui/nmt-page-team.h b/clients/tui/nmt-page-team.h index 994b63d3..a04c2a95 100644 --- a/clients/tui/nmt-page-team.h +++ b/clients/tui/nmt-page-team.h @@ -19,11 +19,8 @@ #ifndef NMT_PAGE_TEAM_H #define NMT_PAGE_TEAM_H -#include "nm-default.h" #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_TEAM (nmt_page_team_get_type ()) #define NMT_PAGE_TEAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_TEAM, NmtPageTeam)) #define NMT_PAGE_TEAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_TEAM, NmtPageTeamClass)) @@ -46,6 +43,4 @@ GType nmt_page_team_get_type (void); NmtEditorPage *nmt_page_team_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_TEAM_H */ diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c index c63b1904..9cd65421 100644 --- a/clients/tui/nmt-page-vlan.c +++ b/clients/tui/nmt-page-vlan.c @@ -115,7 +115,7 @@ nmt_page_vlan_constructed (GObject *object) nmt_editor_grid_append (grid, NULL, nmt_newt_separator_new (), NULL); - widget = nmt_mac_entry_new (40, ETH_ALEN); + widget = nmt_mac_entry_new (40, ETH_ALEN, NMT_MAC_ENTRY_TYPE_CLONED); g_object_bind_property (s_wired, NM_SETTING_WIRED_CLONED_MAC_ADDRESS, widget, "mac-address", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); diff --git a/clients/tui/nmt-page-vlan.h b/clients/tui/nmt-page-vlan.h index db7c4098..043c3bc0 100644 --- a/clients/tui/nmt-page-vlan.h +++ b/clients/tui/nmt-page-vlan.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_VLAN (nmt_page_vlan_get_type ()) #define NMT_PAGE_VLAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_VLAN, NmtPageVlan)) #define NMT_PAGE_VLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_VLAN, NmtPageVlanClass)) @@ -45,6 +43,4 @@ GType nmt_page_vlan_get_type (void); NmtEditorPage *nmt_page_vlan_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_VLAN_H */ diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c index cd9b60e1..35625fe4 100644 --- a/clients/tui/nmt-page-wifi.c +++ b/clients/tui/nmt-page-wifi.c @@ -351,13 +351,13 @@ nmt_page_wifi_constructed (GObject *object) nmt_editor_grid_append (grid, NULL, nmt_newt_separator_new (), NULL); - widget = nmt_mac_entry_new (40, ETH_ALEN); + widget = nmt_mac_entry_new (40, ETH_ALEN, NMT_MAC_ENTRY_TYPE_MAC); g_object_bind_property (s_wireless, NM_SETTING_WIRELESS_BSSID, widget, "mac-address", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); nmt_editor_grid_append (grid, _("BSSID"), widget, NULL); - widget = nmt_mac_entry_new (40, ETH_ALEN); + widget = nmt_mac_entry_new (40, ETH_ALEN, NMT_MAC_ENTRY_TYPE_CLONED); g_object_bind_property (s_wireless, NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, widget, "mac-address", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); diff --git a/clients/tui/nmt-page-wifi.h b/clients/tui/nmt-page-wifi.h index 7ce50584..ed16bdc5 100644 --- a/clients/tui/nmt-page-wifi.h +++ b/clients/tui/nmt-page-wifi.h @@ -21,8 +21,6 @@ #include "nmt-editor-page-device.h" -G_BEGIN_DECLS - #define NMT_TYPE_PAGE_WIFI (nmt_page_wifi_get_type ()) #define NMT_PAGE_WIFI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_WIFI, NmtPageWifi)) #define NMT_PAGE_WIFI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_WIFI, NmtPageWifiClass)) @@ -45,6 +43,4 @@ GType nmt_page_wifi_get_type (void); NmtEditorPage *nmt_page_wifi_new (NMConnection *conn, NmtDeviceEntry *deventry); -G_END_DECLS - #endif /* NMT_PAGE_WIFI_H */ diff --git a/clients/tui/nmt-password-dialog.h b/clients/tui/nmt-password-dialog.h index 36c9f51e..efdab7ec 100644 --- a/clients/tui/nmt-password-dialog.h +++ b/clients/tui/nmt-password-dialog.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_PASSWORD_DIALOG (nmt_password_dialog_get_type ()) #define NMT_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PASSWORD_DIALOG, NmtPasswordDialog)) #define NMT_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PASSWORD_DIALOG, NmtPasswordDialogClass)) @@ -52,6 +50,4 @@ gboolean nmt_password_dialog_succeeded (NmtPasswordDialog *dialog); const char *nmt_password_dialog_get_request_id (NmtPasswordDialog *dialog); GPtrArray *nmt_password_dialog_get_secrets (NmtPasswordDialog *dialog); -G_END_DECLS - #endif /* NMT_PASSWORD_DIALOG_H */ diff --git a/clients/tui/nmt-password-fields.h b/clients/tui/nmt-password-fields.h index 2ef830aa..6a6017ba 100644 --- a/clients/tui/nmt-password-fields.h +++ b/clients/tui/nmt-password-fields.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_PASSWORD_FIELDS (nmt_password_fields_get_type ()) #define NMT_PASSWORD_FIELDS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PASSWORD_FIELDS, NmtPasswordFields)) #define NMT_PASSWORD_FIELDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PASSWORD_FIELDS, NmtPasswordFieldsClass)) @@ -50,6 +48,4 @@ typedef enum { NmtNewtWidget *nmt_password_fields_new (int width, NmtPasswordFieldsExtras extras); -G_END_DECLS - #endif /* NMT_PASSWORD_FIELDS_H */ diff --git a/clients/tui/nmt-route-editor.h b/clients/tui/nmt-route-editor.h index 9882c713..febcb402 100644 --- a/clients/tui/nmt-route-editor.h +++ b/clients/tui/nmt-route-editor.h @@ -23,8 +23,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_ROUTE_EDITOR (nmt_route_editor_get_type ()) #define NMT_ROUTE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_ROUTE_EDITOR, NmtRouteEditor)) #define NMT_ROUTE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_ROUTE_EDITOR, NmtRouteEditorClass)) @@ -46,6 +44,4 @@ GType nmt_route_editor_get_type (void); NmtNewtForm *nmt_route_editor_new (NMSetting *setting); -G_END_DECLS - #endif /* NMT_ROUTE_EDITOR_H */ diff --git a/clients/tui/nmt-route-entry.h b/clients/tui/nmt-route-entry.h index d37b14cd..fa76fa7b 100644 --- a/clients/tui/nmt-route-entry.h +++ b/clients/tui/nmt-route-entry.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_ROUTE_ENTRY (nmt_route_entry_get_type ()) #define NMT_ROUTE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_ROUTE_ENTRY, NmtRouteEntry)) #define NMT_ROUTE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_ROUTE_ENTRY, NmtRouteEntryClass)) @@ -46,6 +44,4 @@ NmtNewtWidget *nmt_route_entry_new (int family, int ip_entry_width, int metric_entry_width); -G_END_DECLS - #endif /* NMT_ROUTE_ENTRY_H */ diff --git a/clients/tui/nmt-route-table.h b/clients/tui/nmt-route-table.h index 217bf40d..1aa92e6b 100644 --- a/clients/tui/nmt-route-table.h +++ b/clients/tui/nmt-route-table.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - #define NMT_TYPE_ROUTE_TABLE (nmt_route_table_get_type ()) #define NMT_ROUTE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_ROUTE_TABLE, NmtRouteTable)) #define NMT_ROUTE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_ROUTE_TABLE, NmtRouteTableClass)) @@ -44,6 +42,4 @@ GType nmt_route_table_get_type (void); NmtNewtWidget *nmt_route_table_new (int family); -G_END_DECLS - #endif /* NMT_ROUTE_TABLE_H */ diff --git a/clients/tui/nmt-slave-list.h b/clients/tui/nmt-slave-list.h index d10cd3a7..e0d836c7 100644 --- a/clients/tui/nmt-slave-list.h +++ b/clients/tui/nmt-slave-list.h @@ -22,8 +22,6 @@ #include "nmt-edit-connection-list.h" #include "nmtui-edit.h" -G_BEGIN_DECLS - #define NMT_TYPE_SLAVE_LIST (nmt_slave_list_get_type ()) #define NMT_SLAVE_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_SLAVE_LIST, NmtSlaveList)) #define NMT_SLAVE_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_SLAVE_LIST, NmtSlaveListClass)) @@ -47,6 +45,4 @@ NmtNewtWidget *nmt_slave_list_new (NMConnection *master, NmtAddConnectionTypeFilter type_filter, gpointer type_filter_data); -G_END_DECLS - #endif /* NMT_SLAVE_LIST_H */ diff --git a/clients/tui/nmt-utils.h b/clients/tui/nmt-utils.h index 5531dbeb..067c6512 100644 --- a/clients/tui/nmt-utils.h +++ b/clients/tui/nmt-utils.h @@ -19,10 +19,6 @@ #ifndef NMT_UTILS_H #define NMT_UTILS_H -#include "nm-default.h" - -G_BEGIN_DECLS - typedef struct { gpointer private[3]; } NmtSyncOp; @@ -41,6 +37,4 @@ void nmt_sync_op_complete_pointer (NmtSyncOp *op, gpointer result, GError *error); -G_END_DECLS - #endif /* NMT_UTILS_H */ diff --git a/clients/tui/nmt-widget-list.h b/clients/tui/nmt-widget-list.h index 7dbeb215..b7bf0151 100644 --- a/clients/tui/nmt-widget-list.h +++ b/clients/tui/nmt-widget-list.h @@ -21,8 +21,6 @@ #include "nmt-newt-grid.h" -G_BEGIN_DECLS - #define NMT_TYPE_WIDGET_LIST (nmt_widget_list_get_type ()) #define NMT_WIDGET_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_WIDGET_LIST, NmtWidgetList)) #define NMT_WIDGET_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_WIDGET_LIST, NmtWidgetListClass)) @@ -64,6 +62,4 @@ int nmt_widget_list_get_length (NmtWidgetList *list); void nmt_widget_list_set_length (NmtWidgetList *list, int length); -G_END_DECLS - #endif /* NMT_WIDGET_LIST_H */ diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c index 46e33617..ae9dd43e 100644 --- a/clients/tui/nmtui-connect.c +++ b/clients/tui/nmtui-connect.c @@ -378,7 +378,7 @@ listbox_active_changed (GObject *object, } static NmtNewtForm * -nmt_connect_connection_list (void) +nmt_connect_connection_list (gboolean is_top) { int screen_width, screen_height; NmtNewtForm *form; @@ -410,7 +410,7 @@ nmt_connect_connection_list (void) listbox_active_changed (G_OBJECT (list), NULL, activate); g_signal_connect (activate, "clicked", G_CALLBACK (activate_clicked), list); - quit = nmt_newt_button_box_add_end (NMT_NEWT_BUTTON_BOX (bbox), _("Quit")); + quit = nmt_newt_button_box_add_end (NMT_NEWT_BUTTON_BOX (bbox), is_top ? _("Quit") : _("Back")); nmt_newt_widget_set_exit_on_activate (quit, TRUE); nmt_newt_form_set_content (form, grid); @@ -444,10 +444,10 @@ nmt_connect_connection (const char *identifier) } NmtNewtForm * -nmtui_connect (int argc, char **argv) +nmtui_connect (gboolean is_top, int argc, char **argv) { if (argc == 2) return nmt_connect_connection (argv[1]); else - return nmt_connect_connection_list (); + return nmt_connect_connection_list (is_top); } diff --git a/clients/tui/nmtui-connect.h b/clients/tui/nmtui-connect.h index 8310ac38..569d191a 100644 --- a/clients/tui/nmtui-connect.h +++ b/clients/tui/nmtui-connect.h @@ -19,10 +19,6 @@ #ifndef NMTUI_CONNECT_H #define NMTUI_CONNECT_H -G_BEGIN_DECLS - -NmtNewtForm *nmtui_connect (int argc, char **argv); - -G_END_DECLS +NmtNewtForm *nmtui_connect (gboolean is_top, int argc, char **argv); #endif /* NMTUI_CONNECT_H */ diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c index 96c17245..a92e45a3 100644 --- a/clients/tui/nmtui-edit.c +++ b/clients/tui/nmtui-edit.c @@ -103,7 +103,7 @@ edit_connection_list_filter (NmtEditConnectionList *list, } static NmtNewtForm * -nmt_edit_main_connection_list (void) +nmt_edit_main_connection_list (gboolean is_top) { int screen_width, screen_height; NmtNewtForm *form; @@ -117,7 +117,7 @@ nmt_edit_main_connection_list (void) "escape-exits", TRUE, NULL); - quit = nmt_newt_button_new (_("Quit")); + quit = nmt_newt_button_new (is_top ? _("Quit") : _("Back")); nmt_newt_widget_set_exit_on_activate (quit, TRUE); list = g_object_new (NMT_TYPE_EDIT_CONNECTION_LIST, @@ -560,7 +560,7 @@ nmt_remove_connection (NMRemoteConnection *connection) } NmtNewtForm * -nmtui_edit (int argc, char **argv) +nmtui_edit (gboolean is_top, int argc, char **argv) { NMConnection *conn = NULL; @@ -577,5 +577,5 @@ nmtui_edit (int argc, char **argv) return nmt_editor_new (conn); } else - return nmt_edit_main_connection_list (); + return nmt_edit_main_connection_list (is_top); } diff --git a/clients/tui/nmtui-edit.h b/clients/tui/nmtui-edit.h index dae91cfa..041e7859 100644 --- a/clients/tui/nmtui-edit.h +++ b/clients/tui/nmtui-edit.h @@ -21,12 +21,10 @@ #include "nmt-newt.h" -G_BEGIN_DECLS - typedef gboolean (*NmtAddConnectionTypeFilter) (GType connection_type, gpointer user_data); -NmtNewtForm *nmtui_edit (int argc, char **argv); +NmtNewtForm *nmtui_edit (gboolean is_top, int argc, char **argv); void nmt_add_connection (void); void nmt_add_connection_full (const char *primary_text, @@ -39,6 +37,4 @@ void nmt_edit_connection (NMConnection *connection); void nmt_remove_connection (NMRemoteConnection *connection); -G_END_DECLS - #endif /* NMTUI_EDIT_H */ diff --git a/clients/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c index ada2393f..f8005502 100644 --- a/clients/tui/nmtui-hostname.c +++ b/clients/tui/nmtui-hostname.c @@ -96,7 +96,7 @@ hostname_set (GObject *object, } NmtNewtForm * -nmtui_hostname (int argc, char **argv) +nmtui_hostname (gboolean is_top, int argc, char **argv) { const char *hostname; char *tmp = NULL; diff --git a/clients/tui/nmtui-hostname.h b/clients/tui/nmtui-hostname.h index a14bc699..772d9a72 100644 --- a/clients/tui/nmtui-hostname.h +++ b/clients/tui/nmtui-hostname.h @@ -19,10 +19,6 @@ #ifndef NMTUI_HOSTNAME_H #define NMTUI_HOSTNAME_H -G_BEGIN_DECLS - -NmtNewtForm *nmtui_hostname (int argc, char **argv); - -G_END_DECLS +NmtNewtForm *nmtui_hostname (gboolean is_top, int argc, char **argv); #endif /* NMTUI_HOSTNAME_H */ diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index 47ba5bf5..70cad5d6 100644 --- a/clients/tui/nmtui.c +++ b/clients/tui/nmtui.c @@ -43,7 +43,7 @@ NMClient *nm_client; static GMainLoop *loop; -typedef NmtNewtForm * (*NmtuiSubprogram) (int argc, char **argv); +typedef NmtNewtForm * (*NmtuiSubprogram) (gboolean is_top, int argc, char **argv); static const struct { const char *name, *shortcut, *arg; @@ -61,22 +61,43 @@ static const struct { nmtui_hostname } }; static const int num_subprograms = G_N_ELEMENTS (subprograms); +static NmtNewtForm *toplevel_form; -static void +static NmtNewtForm * quit_func (int argc, char **argv) { + if (toplevel_form) + nmt_newt_form_quit (toplevel_form); + nmtui_quit (); + + return NULL; +} + +static void +main_list_activated (NmtNewtWidget *widget, NmtNewtListbox *listbox) +{ + NmtNewtForm *form; + NmtuiSubprogram sub; + + sub = nmt_newt_listbox_get_active_key (listbox); + if (sub) { + form = sub (FALSE, 0, NULL); + if (form) { + nmt_newt_form_show (form); + g_object_unref (form); + } + } } static NmtNewtForm * -nmtui_main (int argc, char **argv) +nmtui_main (gboolean is_top, int argc, char **argv) { NmtNewtForm *form; NmtNewtWidget *widget, *ok; NmtNewtGrid *grid; NmtNewtListbox *listbox; NmtNewtButtonBox *bbox; - NmtuiSubprogram subprogram = NULL; int i; form = g_object_new (NMT_TYPE_NEWT_FORM, @@ -97,8 +118,9 @@ nmtui_main (int argc, char **argv) NULL); nmt_newt_grid_add (grid, widget, 0, 1); nmt_newt_widget_set_padding (widget, 0, 1, 0, 1); - nmt_newt_widget_set_exit_on_activate (widget, TRUE); listbox = NMT_NEWT_LISTBOX (widget); + g_signal_connect (widget, "activated", + G_CALLBACK (main_list_activated), listbox); for (i = 0; i < num_subprograms; i++) { nmt_newt_listbox_append (listbox, _(subprograms[i].display_name), @@ -112,17 +134,12 @@ nmtui_main (int argc, char **argv) bbox = NMT_NEWT_BUTTON_BOX (widget); ok = nmt_newt_button_box_add_end (bbox, _("OK")); - nmt_newt_widget_set_exit_on_activate (ok, TRUE); + g_signal_connect (ok, "activated", + G_CALLBACK (main_list_activated), listbox); - widget = nmt_newt_form_run_sync (form); - if (widget) - subprogram = nmt_newt_listbox_get_active_key (listbox); - g_object_unref (form); + toplevel_form = form; - if (subprogram) - return subprogram (argc, argv); - else - return NULL; + return form; } /** @@ -179,7 +196,7 @@ idle_run_subprogram (gpointer user_data) NmtuiStartupData *data = user_data; NmtNewtForm *form; - form = data->subprogram (data->argc, data->argv); + form = data->subprogram (TRUE, data->argc, data->argv); if (form) { g_signal_connect (form, "quit", G_CALLBACK (toplevel_form_quit), NULL); nmt_newt_form_show (form); diff --git a/clients/tui/nmtui.h b/clients/tui/nmtui.h index aada9719..53c20cb4 100644 --- a/clients/tui/nmtui.h +++ b/clients/tui/nmtui.h @@ -21,12 +21,8 @@ #include -G_BEGIN_DECLS - extern NMClient *nm_client; void nmtui_quit (void); -G_END_DECLS - #endif /* NMTUI_H */ diff --git a/config.h.in b/config.h.in index 8f8fa7c0..db8c135f 100644 --- a/config.h.in +++ b/config.h.in @@ -62,6 +62,9 @@ /* Define if you have libaudit support */ #undef HAVE_LIBAUDIT +/* Define to 1 if libsystemd is available */ +#undef HAVE_LIBSYSTEMD + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -216,6 +219,9 @@ /* Define to 1 to use systemd suspend api */ #undef SUSPEND_RESUME_SYSTEMD +/* Define to 1 to use UPower suspend api */ +#undef SUSPEND_RESUME_UPOWER + /* Define to 1 if libsystemd-journald is available */ #undef SYSTEMD_JOURNAL @@ -259,12 +265,18 @@ /* Define if you have dhcpcd */ #undef WITH_DHCPCD +/* Define if JANSSON is enabled */ +#undef WITH_JANSSON + /* Define if you have libsoup */ #undef WITH_LIBSOUP /* Define if you have ModemManager1 support */ #undef WITH_MODEM_MANAGER_1 +/* Define if you have oFono support (experimental) */ +#undef WITH_OFONO + /* whether to compile polkit support */ #undef WITH_POLKIT diff --git a/configure b/configure index 21340a82..a290af83 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.2.4. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.4.0. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.2.4' -PACKAGE_STRING='NetworkManager 1.2.4' +PACKAGE_VERSION='1.4.0' +PACKAGE_STRING='NetworkManager 1.4.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -678,6 +678,8 @@ ENABLE_VAPIGEN_TRUE VAPIGEN_MAKEFILE VAPIGEN_VAPIDIR VAPIGEN +SANITIZERS +SANITIZER_ENV BUILD_NMTUI_FALSE BUILD_NMTUI_TRUE NEWT_LIBS @@ -705,6 +707,8 @@ DHCPCD_PATH DHCLIENT_PATH with_dhcpcd with_dhclient +WITH_OFONO_FALSE +WITH_OFONO_TRUE WITH_BLUEZ5_DUN_FALSE WITH_BLUEZ5_DUN_TRUE BLUEZ5_LIBS @@ -735,6 +739,8 @@ WITH_POLKIT_AGENT_TRUE POLKIT_LIBS POLKIT_CFLAGS NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT +JANSSON_LIBS +JANSSON_CFLAGS WITH_TEAMDCTL_FALSE WITH_TEAMDCTL_TRUE LIBTEAMDCTL_LIBS @@ -748,12 +754,6 @@ LIBAUDIT_LIBS LIBAUDIT_CFLAGS SELINUX_LIBS SELINUX_CFLAGS -SUSPEND_RESUME_CONSOLEKIT_FALSE -SUSPEND_RESUME_CONSOLEKIT_TRUE -SUSPEND_RESUME_SYSTEMD_FALSE -SUSPEND_RESUME_SYSTEMD_TRUE -SUSPEND_RESUME_UPOWER_FALSE -SUSPEND_RESUME_UPOWER_TRUE SYSTEMD_INHIBIT_LIBS SYSTEMD_INHIBIT_CFLAGS SYSTEMD_LOGIN_LIBS @@ -761,6 +761,8 @@ SYSTEMD_LOGIN_CFLAGS NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT SYSTEMD_JOURNAL_LIBS SYSTEMD_JOURNAL_CFLAGS +LIBSYSTEMD_LIBS +LIBSYSTEMD_CFLAGS HAVE_SYSTEMD_200_FALSE HAVE_SYSTEMD_200_TRUE SYSTEMD_200_LIBS @@ -799,7 +801,7 @@ GLIB_CFLAGS PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG -LIBDL +DL_LIBS LIBM WITH_WEXT_FALSE WITH_WEXT_TRUE @@ -889,9 +891,6 @@ LIPO NMEDIT DSYMUTIL MANIFEST_TOOL -RANLIB -ac_ct_AR -AR DLLTOOL OBJDUMP NM @@ -909,6 +908,10 @@ build_vendor build_cpu build LIBTOOL +ac_ct_RANLIB +RANLIB +ac_ct_AR +AR LN_S am__fastdepCXX_FALSE am__fastdepCXX_TRUE @@ -1047,6 +1050,7 @@ with_suspend_resume with_selinux with_libaudit enable_teamdctl +enable_json_validation enable_polkit enable_polkit_agent enable_modify_system @@ -1057,6 +1061,7 @@ with_pppd_plugin_dir with_pppd with_modem_manager_1 enable_bluez5_dun +with_ofono with_dhclient with_dhcpcd with_resolvconf @@ -1076,6 +1081,9 @@ enable_more_asserts with_more_asserts enable_more_logging enable_lto +enable_ld_gc +enable_address_sanitizer +enable_undefined_sanitizer enable_vala enable_tests with_valgrind @@ -1113,6 +1121,8 @@ QT_CFLAGS QT_LIBS SYSTEMD_200_CFLAGS SYSTEMD_200_LIBS +LIBSYSTEMD_CFLAGS +LIBSYSTEMD_LIBS SYSTEMD_JOURNAL_CFLAGS SYSTEMD_JOURNAL_LIBS SYSTEMD_LOGIN_CFLAGS @@ -1129,6 +1139,8 @@ UUID_CFLAGS UUID_LIBS LIBTEAMDCTL_CFLAGS LIBTEAMDCTL_LIBS +JANSSON_CFLAGS +JANSSON_LIBS POLKIT_CFLAGS POLKIT_LIBS NSS_CFLAGS @@ -1687,7 +1699,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.2.4 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1757,7 +1769,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.2.4:";; + short | recursive ) echo "Configuration of NetworkManager 1.4.0:";; esac cat <<\_ACEOF @@ -1794,6 +1806,8 @@ Optional Features: Enable introspection for this build --enable-qt enable Qt examples --enable-teamdctl enable Teamd control support + --enable-json-validation + Enable JSON validation in libnm --enable-polkit=yes|no|disabled set default value for auth-polkit configuration option. This value can be overwritten by NM @@ -1810,6 +1824,13 @@ Optional Features: --enable-more-logging Enable more debug logging (default: no) --enable-lto Enable Link Time Optimization for smaller size (default: no) + --enable-ld-gc Enable garbage collection of unused symbols on + linking (default: auto) + --enable-address-sanitizer + Compile with address sanitizer (default: no) + --enable-undefined-sanitizer + Compile with undefined behavior sanitizer (default: + no) --enable-vala=[no/auto/yes] build Vala bindings [[default=auto]] --enable-tests=root|yes|no @@ -1850,7 +1871,7 @@ Optional Packages: Hostname persist method --with-systemd-journal=yes|no Use systemd journal for logging - --with-logging-backend-default=backend + --with-config-logging-backend-default=backend Default value for logging.backend --with-systemd-logind=yes|no Support systemd session tracking @@ -1878,6 +1899,7 @@ Optional Packages: --with-pppd=/path/to/pppd path to pppd binary --with-modem-manager-1 Enable new ModemManager1 interface support + --with-ofono Enable oFono support (experimental) --with-dhclient=yes|no|path Enable dhclient 4.x support --with-dhcpcd=yes|no|path @@ -1942,6 +1964,10 @@ Some influential environment variables: C compiler flags for SYSTEMD_200, overriding pkg-config SYSTEMD_200_LIBS linker flags for SYSTEMD_200, overriding pkg-config + LIBSYSTEMD_CFLAGS + C compiler flags for LIBSYSTEMD, overriding pkg-config + LIBSYSTEMD_LIBS + linker flags for LIBSYSTEMD, overriding pkg-config SYSTEMD_JOURNAL_CFLAGS C compiler flags for SYSTEMD_JOURNAL, overriding pkg-config SYSTEMD_JOURNAL_LIBS @@ -1971,6 +1997,10 @@ Some influential environment variables: 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 POLKIT_CFLAGS C compiler flags for POLKIT, overriding pkg-config POLKIT_LIBS linker flags for POLKIT, overriding pkg-config @@ -2066,7 +2096,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.2.4 +NetworkManager configure 1.4.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2793,7 +2823,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 1.2.4, which was +It was created by NetworkManager $as_me 1.4.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3663,7 +3693,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.2.4' + VERSION='1.4.0' cat >>confdefs.h <<_ACEOF @@ -6560,6 +6590,208 @@ $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 + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$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_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # 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_AR="$ac_tool_prefix$ac_prog" + $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 +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in gcc-ar ar +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_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_ac_ct_AR="$ac_prog" + $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 +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="false" + 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 + AR=$ac_ct_AR + fi +fi + +if test -n "$ac_tool_prefix"; then + for ac_prog in gcc-ranlib ranlib + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$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_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="$ac_tool_prefix$ac_prog" + $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 +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$RANLIB" && break + done +fi +if test -z "$RANLIB"; then + ac_ct_RANLIB=$RANLIB + for ac_prog in gcc-ranlib ranlib +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_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_ac_ct_RANLIB="$ac_prog" + $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 +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_RANLIB" && break +done + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + 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 + RANLIB=$ac_ct_RANLIB + fi +fi + + case `pwd` in *\ * | *\ *) @@ -17543,10 +17775,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 -NM_MINOR_VERSION=2 -NM_MICRO_VERSION=4 -NM_VERSION=1.2.4 -NM_GIT_SHA=54a84c6b3bd04123ee0831ae371d795ddd694cf9 +NM_MINOR_VERSION=4 +NM_MICRO_VERSION=0 +NM_VERSION=1.4.0 +NM_GIT_SHA=93b4119a81af57c274ac58210a8776afecf2a252 @@ -21140,13 +21372,12 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladdr in -ldl" >&5 -$as_echo_n "checking for dladdr in -ldl... " >&6; } -if ${ac_cv_lib_dl_dladdr+:} false; then : +{ $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 : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21156,32 +21387,50 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char dladdr (); +char dlopen (); int main () { -return dladdr (); +return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dladdr=yes -else - ac_cv_lib_dl_dladdr=no +for ac_lib in '' dl dld; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_dlopen=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if ${ac_cv_search_dlopen+:} false; then : + break +fi +done +if ${ac_cv_search_dlopen+:} false; then : + +else + ac_cv_search_dlopen=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dladdr" >&5 -$as_echo "$ac_cv_lib_dl_dladdr" >&6; } -if test "x$ac_cv_lib_dl_dladdr" = xyes; then : - LIBDL="-ldl" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +$as_echo "$ac_cv_search_dlopen" >&6; } +ac_res=$ac_cv_search_dlopen +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + else - LIBDL="" + ac_cv_search_dlopen= fi +DL_LIBS="$ac_cv_search_dlopen" @@ -22184,20 +22433,12 @@ $as_echo "#define HOSTNAME_PERSIST_SLACKWARE 1" >>confdefs.h fi -# Check whether --with-systemd-journal was given. -if test "${with_systemd_journal+set}" = set; then : - withval=$with_systemd_journal; -fi - -have_systemd_journal=no -if test "$with_systemd_journal" != "no"; then - pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5 -$as_echo_n "checking for SYSTEMD_JOURNAL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSYSTEMD" >&5 +$as_echo_n "checking for LIBSYSTEMD... " >&6; } -if test -n "$SYSTEMD_JOURNAL_CFLAGS"; then - pkg_cv_SYSTEMD_JOURNAL_CFLAGS="$SYSTEMD_JOURNAL_CFLAGS" +if test -n "$LIBSYSTEMD_CFLAGS"; then + pkg_cv_LIBSYSTEMD_CFLAGS="$LIBSYSTEMD_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 @@ -22205,7 +22446,7 @@ if test -n "$SYSTEMD_JOURNAL_CFLAGS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_JOURNAL_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` + pkg_cv_LIBSYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -22213,8 +22454,8 @@ fi else pkg_failed=untried fi -if test -n "$SYSTEMD_JOURNAL_LIBS"; then - pkg_cv_SYSTEMD_JOURNAL_LIBS="$SYSTEMD_JOURNAL_LIBS" +if test -n "$LIBSYSTEMD_LIBS"; then + pkg_cv_LIBSYSTEMD_LIBS="$LIBSYSTEMD_LIBS" 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 @@ -22222,7 +22463,7 @@ if test -n "$SYSTEMD_JOURNAL_LIBS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_JOURNAL_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` + pkg_cv_LIBSYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -22243,12 +22484,98 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` + LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` else - SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` + LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_JOURNAL_PKG_ERRORS" >&5 + echo "$LIBSYSTEMD_PKG_ERRORS" >&5 + + +$as_echo "#define HAVE_LIBSYSTEMD 0" >>confdefs.h + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +$as_echo "#define HAVE_LIBSYSTEMD 0" >>confdefs.h + +else + LIBSYSTEMD_CFLAGS=$pkg_cv_LIBSYSTEMD_CFLAGS + LIBSYSTEMD_LIBS=$pkg_cv_LIBSYSTEMD_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_LIBSYSTEMD 1" >>confdefs.h + +fi + + +# Check whether --with-systemd-journal was given. +if test "${with_systemd_journal+set}" = set; then : + withval=$with_systemd_journal; +fi + +have_systemd_journal=no +if test "$with_systemd_journal" != "no"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5 +$as_echo_n "checking for SYSTEMD_JOURNAL... " >&6; } + +if test -n "$SYSTEMD_JOURNAL_CFLAGS"; then + pkg_cv_SYSTEMD_JOURNAL_CFLAGS="$SYSTEMD_JOURNAL_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 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_JOURNAL_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$SYSTEMD_JOURNAL_LIBS"; then + pkg_cv_SYSTEMD_JOURNAL_LIBS="$SYSTEMD_JOURNAL_LIBS" + 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 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_JOURNAL_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 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_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` + else + SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_JOURNAL_PKG_ERRORS" >&5 pkg_failed=no @@ -22426,6 +22753,7 @@ else nm_config_logging_backend_default="" fi + if test "$nm_config_logging_backend_default" != 'debug' \ -a "$nm_config_logging_backend_default" != 'syslog' \ -a "$nm_config_logging_backend_default" != 'journal' \ @@ -22776,7 +23104,11 @@ fi fi case $with_suspend_resume in - upower) ;; + upower) + +$as_echo "#define SUSPEND_RESUME_UPOWER 1" >>confdefs.h + + ;; systemd) pkg_failed=no @@ -23042,30 +23374,6 @@ $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 - if test "x$with_suspend_resume" = "xupower"; then - SUSPEND_RESUME_UPOWER_TRUE= - SUSPEND_RESUME_UPOWER_FALSE='#' -else - SUSPEND_RESUME_UPOWER_TRUE='#' - SUSPEND_RESUME_UPOWER_FALSE= -fi - - if test "x$with_suspend_resume" = "xsystemd"; then - SUSPEND_RESUME_SYSTEMD_TRUE= - SUSPEND_RESUME_SYSTEMD_FALSE='#' -else - SUSPEND_RESUME_SYSTEMD_TRUE='#' - SUSPEND_RESUME_SYSTEMD_FALSE= -fi - - if test "x$with_suspend_resume" = "xconsolekit"; then - SUSPEND_RESUME_CONSOLEKIT_TRUE= - SUSPEND_RESUME_CONSOLEKIT_FALSE='#' -else - SUSPEND_RESUME_CONSOLEKIT_TRUE='#' - SUSPEND_RESUME_CONSOLEKIT_FALSE= -fi - # SELinux support @@ -23565,6 +23873,97 @@ else fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5 +$as_echo_n "checking for JANSSON... " >&6; } + +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 \"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_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +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 \"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_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson" 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 + JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson" 2>&1` + else + 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 "$JANSSON_PKG_ERRORS" >&5 + + have_jansson=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_jansson=no +else + 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_jansson=yes +fi +# 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}" = "yes"); then + if test x"$have_jansson" = x"no"; then + as_fn_error $? "Jansson is required for JSON validation" "$LINENO" 5 + fi + +$as_echo "#define WITH_JANSSON 1" >>confdefs.h + +else + +$as_echo "#define WITH_JANSSON 0" >>confdefs.h + +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 @@ -24291,6 +24690,33 @@ else fi +# OFONO + +# Check whether --with-ofono was given. +if test "${with_ofono+set}" = set; then : + withval=$with_ofono; +else + with_ofono=no +fi + +if (test "${with_ofono}" = "yes"); then + +$as_echo "#define WITH_OFONO 1" >>confdefs.h + +else + +$as_echo "#define WITH_OFONO 0" >>confdefs.h + +fi + if test "${with_ofono}" = "yes"; then + WITH_OFONO_TRUE= + WITH_OFONO_FALSE='#' +else + WITH_OFONO_TRUE='#' + WITH_OFONO_FALSE= +fi + + # DHCP client support # Check whether --with-dhclient was given. @@ -24477,7 +24903,10 @@ if test "${with_config_dns_rc_manager_default+set}" = set; then : withval=$with_config_dns_rc_manager_default; config_dns_rc_manager_default=$withval fi -if test "$config_dns_rc_manager_default" != symlink -a "$config_dns_rc_manager_default" != file -a "$config_dns_rc_manager_default" != netconfig -a "$config_dns_rc_manager_default" != resolvconf; then +if test "$config_dns_rc_manager_default" != symlink -a \ + "$config_dns_rc_manager_default" != file -a \ + "$config_dns_rc_manager_default" != netconfig -a \ + "$config_dns_rc_manager_default" != resolvconf; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting." >&5 $as_echo "$as_me: WARNING: Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting." >&2;} config_dns_rc_manager_default= @@ -25398,10 +25827,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext unset CFLAGS_SAVED + CFLAGS_SAVED="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Wunknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunknown-warning-option works" >&5 -$as_echo_n "checking whether -Wunknown-warning-option works... " >&6; } + CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wunknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunknown-warning-option works as expected" >&5 +$as_echo_n "checking whether -Wunknown-warning-option works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25417,13 +25847,15 @@ 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 -Wunknown-warning-option" + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wunknown-warning-option" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - CFLAGS="$CFLAGS_SAVED -Wno-unknown-warning-option" + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wno-unknown-warning-option" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -25438,7 +25870,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS_SAVED="$CFLAGS" + CFLAGS_MORE_WARNINGS="-Wall -std=gnu89" if test "x$set_more_warnings" = xerror; then @@ -25450,48 +25882,63 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \ -Wno-duplicate-decl-specifier \ -Wstrict-prototypes \ - -fno-strict-aliasing -Wno-unused-but-set-variable \ + -Wno-unused-but-set-variable \ + -Wno-format-y2k \ -Wundef -Wimplicit-function-declaration \ - -Wpointer-arith -Winit-self \ + -Wpointer-arith -Winit-self -Wformat-nonliteral \ -Wmissing-include-dirs -Wno-pragmas; do - CFLAGS="-Werror $CFLAGS_MORE_WARNINGS $(printf '%s' "$option" | sed 's/^-Wno-/-W/') $CFLAGS_SAVED" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler understands $option" >&5 -$as_echo_n "checking whether compiler understands $option... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + CFLAGS_SAVED="$CFLAGS" + CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror $(printf '%s' "$option" | sed 's/^-Wno-/-W/')" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $(printf '%s' \"$option\" | sed 's/^-Wno-/-W/') works as expected" >&5 +$as_echo_n "checking whether $(printf '%s' \"$option\" | sed 's/^-Wno-/-W/') works as expected... " >&6; } + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int -main () -{ +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ; - return 0; -} _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - has_option=yes + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CFLAGS="$CFLAGS_SAVED" + CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option" + else - has_option=no + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + CFLAGS="$CFLAGS_SAVED" + + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $has_option != no; then - CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 -$as_echo "$has_option" >&6; } - unset has_option + +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 + done unset option - CFLAGS="$CFLAGS_SAVED" - unset CFLAGS_SAVED CFLAGS_SAVED="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Wunknown-attributes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunknown-attributes works" >&5 -$as_echo_n "checking whether -Wunknown-attributes works... " >&6; } + CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wunknown-attributes" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunknown-attributes works as expected" >&5 +$as_echo_n "checking whether -Wunknown-attributes works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25507,13 +25954,15 @@ 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 -Wunknown-attributes" + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wunknown-attributes" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - CFLAGS="$CFLAGS_SAVED -Wno-unknown-attributes" + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wno-unknown-attributes" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -25529,10 +25978,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS_SAVED="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Wtypedef-redefinition" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wtypedef-redefinition works" >&5 -$as_echo_n "checking whether -Wtypedef-redefinition works... " >&6; } + CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wtypedef-redefinition" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wtypedef-redefinition works as expected" >&5 +$as_echo_n "checking whether -Wtypedef-redefinition works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25548,13 +25999,15 @@ 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 -Wtypedef-redefinition" + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wtypedef-redefinition" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - CFLAGS="$CFLAGS_SAVED -Wno-typedef-redefinition" + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wno-typedef-redefinition" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -25570,10 +26023,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS_SAVED="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Warray-bounds" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Warray-bounds works" >&5 -$as_echo_n "checking whether -Warray-bounds works... " >&6; } + CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Warray-bounds" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Warray-bounds works as expected" >&5 +$as_echo_n "checking whether -Warray-bounds works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25591,13 +26046,15 @@ 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 -Warray-bounds" + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Warray-bounds" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - CFLAGS="$CFLAGS_SAVED -Wno-array-bounds" + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wno-array-bounds" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -25613,10 +26070,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS_SAVED="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Wparentheses-equality" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wparentheses-equality works" >&5 -$as_echo_n "checking whether -Wparentheses-equality works... " >&6; } + CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wparentheses-equality" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wparentheses-equality works as expected" >&5 +$as_echo_n "checking whether -Wparentheses-equality works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25634,13 +26093,15 @@ 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 -Wparentheses-equality" + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wparentheses-equality" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - CFLAGS="$CFLAGS_SAVED -Wno-parentheses-equality" + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wno-parentheses-equality" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -25656,10 +26117,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS_SAVED="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Wunused-value" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunused-value works" >&5 -$as_echo_n "checking whether -Wunused-value works... " >&6; } + CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wunused-value" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunused-value works as expected" >&5 +$as_echo_n "checking whether -Wunused-value works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25677,13 +26140,15 @@ 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 -Wunused-value" + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wunused-value" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - CFLAGS="$CFLAGS_SAVED -Wno-unused-value" + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wno-unused-value" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -25698,6 +26163,7 @@ 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 @@ -25705,6 +26171,43 @@ $as_echo "no" >&6; } fi + + for flag in \ + -fno-strict-aliasing \ +; do + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 +$as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } +if { as_var=`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + eval "cc_save_CFLAGS='${CFLAGS}'" + eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "$flag" | 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 "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='yes'" +else + eval "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='no'" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + eval "CFLAGS='$cc_save_CFLAGS'" +fi +eval ac_res=\$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if eval test x$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` = xyes; then : + eval "with_cflags='${with_cflags} $flag'" +fi + + done + +CFLAGS="$CFLAGS $with_cflags" + # Check whether --enable-more-asserts was given. if test "${enable_more_asserts+set}" = set; then : enableval=$enable_more_asserts; @@ -25755,6 +26258,158 @@ else enable_lto='no' fi +# Check whether --enable-ld-gc was given. +if test "${enable_ld_gc+set}" = set; then : + enableval=$enable_ld_gc; +fi + +if (test "${enable_ld_gc}" != "no"); then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag -fdata-sections -ffunction-sections -Wl,--gc-sections in envvar CFLAGS" >&5 +$as_echo_n "checking if $CC supports flag -fdata-sections -ffunction-sections -Wl,--gc-sections in envvar CFLAGS... " >&6; } +if ${cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "cc_save_CFLAGS='${CFLAGS}'" + eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "-fdata-sections -ffunction-sections -Wl,--gc-sections" | 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__fdata_sections__ffunction_sections__Wl___gc_sections='yes'" +else + eval "cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections='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__fdata_sections__ffunction_sections__Wl___gc_sections" >&5 +$as_echo "$cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections" >&6; } + + if eval test x$cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections = xyes; then : + eval "ld_gc_flags='${ld_gc_flags} -fdata-sections -ffunction-sections -Wl,--gc-sections'" +fi + + if (test -n "${ld_gc_flags}"); then + enable_ld_gc="yes" + CFLAGS="$CFLAGS $ld_gc_flags" + else + if (test "${enable_ld_gc}" = "yes"); then + as_fn_error $? "Unused symbol eviction requested but not supported." "$LINENO" 5 + else + enable_ld_gc="no" + fi + fi +fi + +# Check whether --enable-address-sanitizer was given. +if test "${enable_address_sanitizer+set}" = set; then : + enableval=$enable_address_sanitizer; +fi + +if (test "${enable_address_sanitizer}" = "yes"); then + + for flag in -fsanitize=address; do + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 +$as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } +if { as_var=`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + eval "cc_save_CFLAGS='${CFLAGS}'" + eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "$flag" | 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 "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='yes'" +else + eval "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='no'" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + eval "CFLAGS='$cc_save_CFLAGS'" +fi +eval ac_res=\$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if eval test x$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` = xyes; then : + eval "asan_cflags='${asan_cflags} $flag'" +fi + + done + + if test -z "$asan_cflags"; then : + as_fn_error $? "*** -fsanitize=address is not supported" "$LINENO" 5 +fi + + sanitizer_cflags="$sanitizer_cflags -fsanitize=address" + sanitizer_ldflags="$sanitizer_ldflags -Wc,-fsanitize=address" + sanitizers="${sanitizers}asan " +fi + +# Check whether --enable-undefined-sanitizer was given. +if test "${enable_undefined_sanitizer+set}" = set; then : + enableval=$enable_undefined_sanitizer; +fi + +if (test "${enable_undefined_sanitizer}" = "yes"); then + + for flag in -fsanitize=undefined; do + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 +$as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } +if { as_var=`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + eval "cc_save_CFLAGS='${CFLAGS}'" + eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "$flag" | 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 "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='yes'" +else + eval "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='no'" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + eval "CFLAGS='$cc_save_CFLAGS'" +fi +eval ac_res=\$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if eval test x$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` = xyes; then : + eval "ubsan_cflags='${ubsan_cflags} $flag'" +fi + + done + + if test -z "$ubsan_cflags"; then : + as_fn_error $? "*** -fsanitize=undefined is not supported" "$LINENO" 5 +fi + + sanitizer_cflags="$sanitizer_cflags -fsanitize=undefined" + sanitizer_ldflags="$sanitizer_ldflags -Wc,-fsanitize=undefined" + sanitizers="${sanitizers}ubsan " +fi + +if test -n "$sanitizers"; then + CFLAGS="$CFLAGS $sanitizer_cflags -DVALGRIND=1 -fno-omit-frame-pointer" + LDFLAGS="$LDFLAGS $sanitizer_ldflags" + sanitizers="${sanitizers% }" + SANITIZER_ENV=ASAN_OPTIONS=detect_leaks=0 + +fi + +SANITIZERS=$sanitizers + @@ -26619,7 +27274,6 @@ else fi - ac_config_files="$ac_config_files Makefile shared/Makefile shared/nm-version-macros.h src/Makefile src/tests/Makefile src/tests/config/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/dnsmasq-manager/tests/Makefile src/supplicant-manager/tests/Makefile src/supplicant-manager/tests/certs/Makefile src/ppp-manager/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ibft/Makefile src/settings/plugins/ibft/tests/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/platform/Makefile src/platform/tests/Makefile src/rdisc/Makefile src/rdisc/tests/Makefile src/devices/Makefile src/devices/tests/Makefile src/devices/adsl/Makefile src/devices/bluetooth/Makefile src/devices/team/Makefile src/devices/wifi/Makefile src/devices/wifi/tests/Makefile src/devices/wwan/Makefile libnm-core/Makefile libnm-core/tests/Makefile libnm/libnm.pc libnm/Makefile libnm/tests/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile clients/Makefile clients/cli/Makefile clients/tui/Makefile clients/tui/newt/Makefile introspection/Makefile man/Makefile man/common.ent po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile 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 examples/Makefile examples/shell/Makefile examples/python/Makefile examples/python/dbus/Makefile examples/python/gi/Makefile examples/python/python-networkmanager/Makefile examples/ruby/Makefile examples/lua/Makefile examples/lua/lgi/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile" @@ -26828,18 +27482,6 @@ if test -z "${HAVE_SYSTEMD_200_TRUE}" && test -z "${HAVE_SYSTEMD_200_FALSE}"; th as_fn_error $? "conditional \"HAVE_SYSTEMD_200\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${SUSPEND_RESUME_UPOWER_TRUE}" && test -z "${SUSPEND_RESUME_UPOWER_FALSE}"; then - as_fn_error $? "conditional \"SUSPEND_RESUME_UPOWER\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${SUSPEND_RESUME_SYSTEMD_TRUE}" && test -z "${SUSPEND_RESUME_SYSTEMD_FALSE}"; then - as_fn_error $? "conditional \"SUSPEND_RESUME_SYSTEMD\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${SUSPEND_RESUME_CONSOLEKIT_TRUE}" && test -z "${SUSPEND_RESUME_CONSOLEKIT_FALSE}"; then - as_fn_error $? "conditional \"SUSPEND_RESUME_CONSOLEKIT\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi 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 @@ -26868,6 +27510,10 @@ if test -z "${WITH_BLUEZ5_DUN_TRUE}" && test -z "${WITH_BLUEZ5_DUN_FALSE}"; then as_fn_error $? "conditional \"WITH_BLUEZ5_DUN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +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. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -27333,7 +27979,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.2.4, which was +This file was extended by NetworkManager $as_me 1.4.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27399,7 +28045,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.2.4 +NetworkManager config.status 1.4.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -29759,8 +30405,9 @@ echo echo "Features:" echo " wext: $ac_with_wext" echo " wifi: $enable_wifi" -echo " ppp: $enable_ppp" +echo " ppp: $enable_ppp ${PPPD_PLUGIN_DIR}" echo " modemmanager-1: $with_modem_manager_1" +echo " ofono: $with_ofono" echo " concheck: $enable_concheck" echo " libteamdctl: $enable_teamdctl" echo " libnm-glib: $with_libnm_glib" @@ -29793,4 +30440,7 @@ echo " more-asserts: $more_asserts" 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 " sanitizers: $sanitizers" echo diff --git a/configure.ac b/configure.ac index 4c56e14e..8659fdc5 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], [2]) -m4_define([nm_micro_version], [4]) +m4_define([nm_minor_version], [4]) +m4_define([nm_micro_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])]) @@ -35,6 +35,10 @@ AC_PROG_CXX AC_PROG_LN_S +# Prefer gcc-* variants; the ones libtool would choose don't work with LTO +AC_CHECK_TOOLS(AR, [gcc-ar ar], false) +AC_CHECK_TOOLS(RANLIB, [gcc-ranlib ranlib], :) + dnl Initialize libtool LT_PREREQ([2.2]) LT_INIT([disable-static]) @@ -271,8 +275,8 @@ LT_LIB_M dnl dnl Checks for libdl - on certain platforms its part of libc dnl -AC_CHECK_LIB([dl], [dladdr], LIBDL="-ldl", LIBDL="") -AC_SUBST(LIBDL) +AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=]) +AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen") PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0], [AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/tap-driver.sh') @@ -371,6 +375,10 @@ elif test "$hostname_persist" = slackware; then AC_DEFINE(HOSTNAME_PERSIST_SLACKWARE, 1, [Enable Slackware hostname persist method]) fi +PKG_CHECK_MODULES(LIBSYSTEMD, [libsystemd >= 209], + [AC_DEFINE([HAVE_LIBSYSTEMD], 1, [Define to 1 if libsystemd is available])], + [AC_DEFINE([HAVE_LIBSYSTEMD], 0, [Define to 1 if libsystemd is available])]) + AC_ARG_WITH(systemd-journal, AS_HELP_STRING([--with-systemd-journal=yes|no], [Use systemd journal for logging])) have_systemd_journal=no if test "$with_systemd_journal" != "no"; then @@ -393,7 +401,8 @@ else AC_DEFINE([SYSTEMD_JOURNAL], 0, [Define to 1 if libsystemd-journald is available]) fi -AC_ARG_WITH(config-logging-backend-default, AS_HELP_STRING([--with-logging-backend-default=backend], [Default value for logging.backend]), nm_config_logging_backend_default="$withval", nm_config_logging_backend_default="") +AC_ARG_WITH(config-logging-backend-default, AS_HELP_STRING([--with-config-logging-backend-default=backend], [Default value for logging.backend]), nm_config_logging_backend_default="$withval", nm_config_logging_backend_default="") + if test "$nm_config_logging_backend_default" != 'debug' \ -a "$nm_config_logging_backend_default" != 'syslog' \ -a "$nm_config_logging_backend_default" != 'journal' \ @@ -472,7 +481,9 @@ if test "z$with_suspend_resume" = "z"; then fi case $with_suspend_resume in - upower) ;; + upower) + AC_DEFINE([SUSPEND_RESUME_UPOWER], 1, [Define to 1 to use UPower suspend api]) + ;; systemd) PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd >= 209],, [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183])]) @@ -485,9 +496,6 @@ case $with_suspend_resume in AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd, consolekit]) ;; esac -AM_CONDITIONAL(SUSPEND_RESUME_UPOWER, test "x$with_suspend_resume" = "xupower") -AM_CONDITIONAL(SUSPEND_RESUME_SYSTEMD, test "x$with_suspend_resume" = "xsystemd") -AM_CONDITIONAL(SUSPEND_RESUME_CONSOLEKIT, test "x$with_suspend_resume" = "xconsolekit") # SELinux support AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux=yes|no|auto], [Build with SELinux (default: auto)]),,[with_selinux=auto]) @@ -553,6 +561,18 @@ else fi AM_CONDITIONAL(WITH_TEAMDCTL, test "${enable_teamdctl}" = "yes") +PKG_CHECK_MODULES(JANSSON, jansson, [have_jansson=yes], [have_jansson=no]) +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}" = "yes"); then + if test x"$have_jansson" = x"no"; then + AC_MSG_ERROR(Jansson is required for JSON validation) + fi + AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) +else + AC_DEFINE(WITH_JANSSON, 0, [Define if JANSSON is enabled]) +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 @@ -714,6 +734,15 @@ else fi AM_CONDITIONAL(WITH_BLUEZ5_DUN, test "${enable_bluez5_dun}" = "yes") +# OFONO +AC_ARG_WITH(ofono, AS_HELP_STRING([--with-ofono], [Enable oFono support (experimental)]),,[with_ofono=no]) +if (test "${with_ofono}" = "yes"); then + AC_DEFINE(WITH_OFONO, 1, [Define if you have oFono support (experimental)]) +else + AC_DEFINE(WITH_OFONO, 0, [Define if you have oFono support (experimental)]) +fi +AM_CONDITIONAL(WITH_OFONO, test "${with_ofono}" = "yes") + # DHCP client support AC_ARG_WITH([dhclient], AS_HELP_STRING([--with-dhclient=yes|no|path], [Enable dhclient 4.x support])) AC_ARG_WITH([dhcpcd], AS_HELP_STRING([--with-dhcpcd=yes|no|path], [Enable dhcpcd 4.x support])) @@ -764,7 +793,10 @@ fi AC_ARG_WITH(resolvconf, AS_HELP_STRING([--with-resolvconf=yes|no|path], [Enable resolvconf support])) AC_ARG_WITH(netconfig, AS_HELP_STRING([--with-netconfig=yes|no], [Enable SUSE netconfig support])) AC_ARG_WITH(config-dns-rc-manager-default, AS_HELP_STRING([--with-config-dns-rc-manager-default=symlink|file|netconfig|resolvconf], [Configure default value for main.rc-manager setting]), [config_dns_rc_manager_default=$withval]) -if test "$config_dns_rc_manager_default" != symlink -a "$config_dns_rc_manager_default" != file -a "$config_dns_rc_manager_default" != netconfig -a "$config_dns_rc_manager_default" != resolvconf; then +if test "$config_dns_rc_manager_default" != symlink -a \ + "$config_dns_rc_manager_default" != file -a \ + "$config_dns_rc_manager_default" != netconfig -a \ + "$config_dns_rc_manager_default" != resolvconf; then AC_MSG_WARN([Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting.]) config_dns_rc_manager_default= fi @@ -901,6 +933,11 @@ AM_CONDITIONAL(BUILD_NMTUI, test "$build_nmtui" = yes) NM_COMPILER_WARNINGS +CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ + -fno-strict-aliasing \ +]) +CFLAGS="$CFLAGS $with_cflags" + AC_ARG_ENABLE(more-asserts, AS_HELP_STRING([--enable-more-asserts], [Enable more assertions for debugging (default: no). Deprecated option. Use --with-more-asserts=level])) more_asserts=0 @@ -933,6 +970,53 @@ 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 + +AC_ARG_ENABLE(address-sanitizer, AS_HELP_STRING([--enable-address-sanitizer], + [Compile with address sanitizer (default: no)])) +if (test "${enable_address_sanitizer}" = "yes"); then + CC_CHECK_FLAGS_APPEND([asan_cflags], [CFLAGS], [-fsanitize=address]) + AS_IF([test -z "$asan_cflags"], + [AC_MSG_ERROR([*** -fsanitize=address is not supported])]) + + sanitizer_cflags="$sanitizer_cflags -fsanitize=address" + sanitizer_ldflags="$sanitizer_ldflags -Wc,-fsanitize=address" + sanitizers="${sanitizers}asan " +fi + +AC_ARG_ENABLE(undefined-sanitizer, AS_HELP_STRING([--enable-undefined-sanitizer], + [Compile with undefined behavior sanitizer (default: no)])) +if (test "${enable_undefined_sanitizer}" = "yes"); then + CC_CHECK_FLAGS_APPEND([ubsan_cflags], [CFLAGS], [-fsanitize=undefined]) + AS_IF([test -z "$ubsan_cflags"], + [AC_MSG_ERROR([*** -fsanitize=undefined is not supported])]) + + sanitizer_cflags="$sanitizer_cflags -fsanitize=undefined" + sanitizer_ldflags="$sanitizer_ldflags -Wc,-fsanitize=undefined" + sanitizers="${sanitizers}ubsan " +fi + +if test -n "$sanitizers"; then + CFLAGS="$CFLAGS $sanitizer_cflags -DVALGRIND=1 -fno-omit-frame-pointer" + LDFLAGS="$LDFLAGS $sanitizer_ldflags" + sanitizers="${sanitizers% }" + AC_SUBST(SANITIZER_ENV, [ASAN_OPTIONS=detect_leaks=0]) +fi + +AC_SUBST(SANITIZERS, [$sanitizers]) dnl ------------------------- dnl Vala bindings @@ -1030,7 +1114,6 @@ 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") - AC_CONFIG_FILES([ Makefile shared/Makefile @@ -1159,8 +1242,9 @@ echo echo "Features:" echo " wext: $ac_with_wext" echo " wifi: $enable_wifi" -echo " ppp: $enable_ppp" +echo " ppp: $enable_ppp ${PPPD_PLUGIN_DIR}" echo " modemmanager-1: $with_modem_manager_1" +echo " ofono: $with_ofono" echo " concheck: $enable_concheck" echo " libteamdctl: $enable_teamdctl" echo " libnm-glib: $with_libnm_glib" @@ -1193,4 +1277,7 @@ echo " more-asserts: $more_asserts" 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 " sanitizers: $sanitizers" echo diff --git a/data/Makefile.in b/data/Makefile.in index 9bdf8fbb..736509b1 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -90,8 +90,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = data ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ - $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -198,6 +199,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DNSMASQ_PATH = @DNSMASQ_PATH@ DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@ DSYMUTIL = @DSYMUTIL@ @@ -254,13 +256,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ -LIBDL = @LIBDL@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ @@ -272,6 +275,8 @@ LIBOBJS = @LIBOBJS@ 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@ @@ -332,6 +337,8 @@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ +SANITIZER_ENV = @SANITIZER_ENV@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -367,6 +374,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/docs/Makefile.in b/docs/Makefile.in index a91f4190..88955891 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -93,8 +93,9 @@ host_triplet = @host@ subdir = docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ - $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -229,6 +230,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DNSMASQ_PATH = @DNSMASQ_PATH@ DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@ DSYMUTIL = @DSYMUTIL@ @@ -285,13 +287,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ -LIBDL = @LIBDL@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ @@ -303,6 +306,8 @@ LIBOBJS = @LIBOBJS@ 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@ @@ -363,6 +368,8 @@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ +SANITIZER_ENV = @SANITIZER_ENV@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -398,6 +405,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 5aafc262..afe5d384 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -73,6 +73,7 @@ content_files = \ $(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \ $(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \ $(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \ + $(top_builddir)/introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml \ $(top_builddir)/libnm-core/nm-dbus-types.xml \ $(top_builddir)/libnm-core/nm-vpn-dbus-types.xml \ $(top_builddir)/man/nmcli.xml \ diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index bc388a41..cc8ed051 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -98,8 +98,9 @@ host_triplet = @host@ @BUILD_SETTING_DOCS_TRUE@am__append_3 = settings-spec.xml subdir = docs/api ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ - $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -175,6 +176,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DNSMASQ_PATH = @DNSMASQ_PATH@ DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@ DSYMUTIL = @DSYMUTIL@ @@ -231,13 +233,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@ LIBAUDIT_LIBS = @LIBAUDIT_LIBS@ -LIBDL = @LIBDL@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ @@ -249,6 +252,8 @@ LIBOBJS = @LIBOBJS@ 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@ @@ -309,6 +314,8 @@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ +SANITIZER_ENV = @SANITIZER_ENV@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -344,6 +351,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_RANLIB = @ac_ct_RANLIB@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -462,6 +470,7 @@ content_files = $(top_builddir)/introspection/nmdbus-access-point-org.freedeskto $(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \ $(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \ $(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \ + $(top_builddir)/introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml \ $(top_builddir)/libnm-core/nm-dbus-types.xml \ $(top_builddir)/libnm-core/nm-vpn-dbus-types.xml \ $(top_builddir)/man/nmcli.xml $(top_builddir)/man/nmtui.xml \ @@ -817,7 +826,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -828,6 +837,17 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO sgml.stamp: sgml-build.stamp @true +xml/gtkdocentities.ent: Makefile + $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + ) > $@ + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index 828776ff..f9327a60 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -8,7 +8,7 @@ - + @@ -219,34 +219,14 @@ no-auto-default=*

ignore-carrier

- -

- Specify devices for which NetworkManager will (partially) - ignore the carrier state. Normally, for - device types that support carrier-detect, such as Ethernet - and InfiniBand, NetworkManager will only allow a - connection to be activated on the device if carrier is - present (ie, a cable is plugged in), and it will - deactivate the device if carrier drops for more than a few - seconds. -

-

- Listing a device here will allow activating connections on - that device even when it does not have carrier, provided - that the connection uses only statically-configured IP - addresses. Additionally, it will allow any active - connection (whether static or dynamic) to remain active on - the device when carrier is lost. -

-

- Note that the "carrier" property of NMDevices and device D-Bus - interfaces will still reflect the actual device state; it's just - that NetworkManager will not make use of that information. -

-

See the section called “Device List Format” for the syntax how to - specify a device. -

- +

+ This setting is deprecated for the per-device setting + ignore-carrier which overwrites this setting + if specified (See ???). + Otherwise, it is a list of matches to specify for which device + carrier should be ignored. See the section called “Device List Format” for the + syntax how to specify a device. +

assume-ipv6ll-only

@@ -300,8 +280,8 @@ no-auto-default=* configuration with DNSSEC support. The /etc/resolv.conf will be managed by dnssec-trigger daemon.

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

+ modify resolv.conf. This implies + rc-manager unmanaged

@@ -315,7 +295,12 @@ no-auto-default=* 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.

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

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

netconfig: NetworkManager will run netconfig to update the DNS configuration.

unmanaged: don't touch - resolv.conf.

+ /etc/resolv.conf.

none: deprecated alias for symlink.

@@ -376,7 +361,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/conf.d".

@@ -474,7 +459,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth 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.

+ TEAM, CONCHECK, DCB, DISPATCH, AUDIT, SYSTEMD, VPN_PLUGIN.

In addition, these special domains can be used: NONE, ALL, DEFAULT, DHCP, IP.

You can specify per-domain log level overrides by @@ -530,7 +515,7 @@ ipv6.ip6-privacy=0

Not all properties can be overwritten, only the following properties are supported to have their default values configured - (see nm-settings(5) for details). + (see nm-settings(5) for details). A default value is only consulted if the corresponding per-connection value explicitly allows for that.

@@ -549,6 +534,14 @@ ipv6.ip6-privacy=0 +

ethernet.cloned-mac-address

+

If left unspecified, it defaults to "permanent".

+ + +

ethernet.generate-mac-address-mask

+ + +

ethernet.wake-on-lan

@@ -580,8 +573,18 @@ ipv6.ip6-privacy=0

If left unspecified, default value of 60 seconds is used.

+

wifi.cloned-mac-address

+

If left unspecified, it defaults to "permanent".

+ + +

wifi.generate-mac-address-mask

+ + +

wifi.mac-address-randomization

-

If left unspecified, MAC address randomization is disabled.

+

If left unspecified, MAC address randomization is disabled. + This setting is deprecated for wifi.cloned-mac-address. +

wifi.powersave

@@ -595,7 +598,7 @@ ipv6.ip6-privacy=0
-

Sections

+

Sections

You can configure multiple connection sections, by having different sections with a name that all start @@ -676,6 +679,106 @@ ipv6.ip6-privacy=1

+device section

+

Contains per-device persistent configuration. +

+

+ Example: +

+
+[device]
+match-device=interface-name:eth3
+unmanaged=1
+
+

+

+
+

Supported Properties

+

+ The following properties can be configured per-device. +

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

ignore-carrier

 +

+ Specify devices for which NetworkManager will (partially) + ignore the carrier state. Normally, for + device types that support carrier-detect, such as Ethernet + and InfiniBand, NetworkManager will only allow a + connection to be activated on the device if carrier is + present (ie, a cable is plugged in), and it will + deactivate the device if carrier drops for more than a few + seconds. +

+

+ A device with carrier ignored will allow activating connections on + that device even when it does not have carrier, provided + that the connection uses only statically-configured IP + addresses. Additionally, it will allow any active + connection (whether static or dynamic) to remain active on + the device when carrier is lost. +

+

+ Note that the "carrier" property of NMDevices and device D-Bus + interfaces will still reflect the actual device state; it's just + that NetworkManager will not make use of that information. +

+

+ This setting overwrites the deprecated main.ignore-carrier + setting above. +

+

wifi.scan-rand-mac-address

+ Configures MAC address randomization of a Wi-Fi device during + scanning. This defaults to yes in which case + a random, locally-administered MAC address will be used. + The setting wifi.scan-generate-mac-address-mask + allows to influence the generated MAC address to use certain vendor + OUIs. + If disabled, the MAC address during scanning is left unchanged to + whatever is configured. + For the configured MAC address while the device is associated, see instead + the per-connection setting wifi.cloned-mac-address. +

wifi.scan-generate-mac-address-mask

+ Like the per-connection settings ethernet.generate-mac-address-mask + and wifi.generate-mac-address-mask, this allows to configure the + generated MAC addresses during scanning. See nm-settings(5) + for details. +

+

+

+
+
+
+

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. + The settings "match-device" and "stop-match" are available to match a device section + on a device. The order of multiple sections is also top-down within the file and + later files overwrite previous settings. See the section called “Sections” + for details. +

+
+
+
+

connectivity section

This section controls NetworkManager's optional connectivity checking functionality. This allows NetworkManager to detect @@ -721,7 +824,7 @@ ipv6.ip6-privacy=1

-

+

global-dns section

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

@@ -751,7 +854,7 @@ ipv6.ip6-privacy=1

-

+

global-dns-domain sections

Sections with a name starting with the "global-dns-domain-" prefix allow to define global DNS configuration for specific @@ -787,7 +890,7 @@ ipv6.ip6-privacy=1

-

+

.config sections

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

-

Plugins

+

Plugins

@@ -974,12 +1077,13 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
-

Appendix

+

Appendix

Device List Format

The configuration options main.no-auto-default, main.ignore-carrier, - and keyfile.unmanaged-devices select devices based on a list of matchings. + keyfile.unmanaged-devices, connection*.match-device and + device*.match-device select devices based on a list of matchings. Devices can be specified using the following format:

@@ -1000,7 +1104,7 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16

HWADDR

-

Match the MAC address of the device. Globbing is not supported

+

Match the permanent MAC address of the device. Globbing is not supported

interface-name:IFNAME, interface-name:~IFNAME

@@ -1014,7 +1118,7 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16

mac:HWADDR

-

Match the MAC address of the device. Globbing is not supported

+

Match the permanent MAC address of the device. Globbing is not supported

s390-subchannels:HWADDR

@@ -1063,19 +1167,19 @@ interface-name:vboxnet*,except:interface-name:vboxnet2
-

See Also

+

See Also

- NetworkManager(8), - nmcli(1), - nmcli-examples(7), - nm-online(1), - nm-settings(5), + NetworkManager(8), + nmcli(1), + nmcli-examples(7), + nm-online(1), + nm-settings(5), nm-applet(1), nm-connection-editor(1)

-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index c0e6a7af..b2de4be6 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -47,6 +47,7 @@ + @@ -75,6 +76,9 @@ + + + @@ -246,6 +250,7 @@ + @@ -352,6 +357,10 @@ + + + + @@ -370,6 +379,8 @@ + + @@ -557,6 +568,12 @@ + + + + + + diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html index 5467a3a8..10704589 100644 --- a/docs/api/html/NetworkManager.html +++ b/docs/api/html/NetworkManager.html @@ -8,7 +8,7 @@ - + @@ -61,7 +61,8 @@ device an operation just happened on, and second the action. For device actions, the interface is the name of the kernel interface suitable for IP configuration. Thus it is either VPN_IP_IFACE, DEVICE_IP_IFACE, or DEVICE_IFACE, as applicable. - For the hostname action it is always "none". + For the hostname and connectivity-change + actions it is always "none".

The actions are:

@@ -155,6 +156,12 @@ The DHCPv6 lease has changed (renewed, rebound, etc).

+ + + +

connectivity-change

+ The network connectivity state has changed (no connectivity, went online, etc). +

@@ -275,6 +282,15 @@ and DHCP6_ instead.

+ +

CONNECTIVITY_STATE

+

The network connectivity state, which can + take the values defined by the NMConnectivityState type, + from the org.freedesktop.NetworkManager D-Bus API: unknown, + none, portal, limited or full. Note: this variable will only + be set for connectivity-change actions. +

+

@@ -346,7 +362,7 @@ value of /etc/NetworkManager/NetworkManager.conf is used with a fallback to the older 'nm-system-settings.conf' if located in the same directory. See - NetworkManager.conf(5) + NetworkManager.conf(5) for more information on configuration file.

@@ -365,7 +381,7 @@ Sets how much information NetworkManager sends to the log destination (usually syslog's "daemon" facility). By default, only informational, warning, and error messages are logged. See the section on logging in - NetworkManager.conf(5) + NetworkManager.conf(5) for more information.

@@ -375,7 +391,7 @@ A comma-separated list specifying which operations are logged to the log destination (usually syslog). By default, most domains are logging-enabled. See the section on logging in - NetworkManager.conf(5) + NetworkManager.conf(5) for more information.

@@ -498,18 +514,18 @@

See Also

- NetworkManager.conf(5), - nmcli(1), - nmcli-examples(7), - nm-online(1), - nm-settings(5), + NetworkManager.conf(5), + nmcli(1), + nmcli-examples(7), + nm-online(1), + nm-settings(5), nm-applet(1), - nm-connection-editor(1) + nm-connection-editor(1), udev(7)

-
Generated by GTK-Doc V1.24
+
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 e63be172..23789e20 100644 --- a/docs/api/html/dbus-types.html +++ b/docs/api/html/dbus-types.html @@ -6,9 +6,9 @@ - + - + @@ -16,12 +16,12 @@ Home Up -Prev +Prev Next

Types

-
Generated by GTK-Doc V1.24
+
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 25c4e853..787424df 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html @@ -8,7 +8,7 @@ - + @@ -185,6 +185,6 @@ LastSeen readable i
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html index 81414d7f..61b2cbe9 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html @@ -8,7 +8,7 @@ - + @@ -105,6 +105,6 @@ Unregister ();
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html index 71956c75..097bb998 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html @@ -8,7 +8,7 @@ - + @@ -254,6 +254,6 @@ Master readable o
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html index 8c99d193..742daaa1 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@ Options readable a{sv}
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html index 916d8629..d2cbae9b 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@ Options readable a{sv}
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html index bc446feb..a5d808cf 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html @@ -8,7 +8,7 @@ - + @@ -82,6 +82,6 @@ Carrier readable b
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html index e675f1ad..55360642 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html @@ -8,7 +8,7 @@ - + @@ -104,6 +104,6 @@ BtCapabilities readable u
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html index 14383a24..a0e53737 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html @@ -8,7 +8,7 @@ - + @@ -104,6 +104,6 @@ Slaves readable ao
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html index fb550a69..852e87bc 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html @@ -8,7 +8,7 @@ - + @@ -104,6 +104,6 @@ Slaves readable ao
-
Generated by GTK-Doc V1.24
+
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 d53d727d..992b19a5 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html @@ -8,7 +8,7 @@ - + @@ -92,6 +92,6 @@ TypeDescription readable s
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html index d7e5dbfb..c97fddde 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html @@ -8,7 +8,7 @@ - + @@ -186,6 +186,6 @@ FlowLabel readable u
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html index 5f43e63c..7355ad40 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html @@ -8,7 +8,7 @@ - + @@ -93,6 +93,6 @@ Carrier readable b
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html index 72b5df8d..3011841b 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html @@ -8,7 +8,7 @@ - + @@ -112,6 +112,6 @@ Tap readable b
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html index b56f2acb..0c6ab35e 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html @@ -8,7 +8,7 @@ - + @@ -100,6 +100,6 @@ CurrentCapabilities readable u
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html index c51bca47..ab9bc101 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html @@ -8,7 +8,7 @@ - + @@ -103,6 +103,6 @@ ActiveChannel readable u
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html new file mode 100644 index 00000000..cdb6dd2b --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html @@ -0,0 +1,110 @@ + + + + +org.freedesktop.NetworkManager.Device.Statistics: NetworkManager Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Statistics

+

org.freedesktop.NetworkManager.Device.Statistics

+
+
+

Signals

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

Properties

+
+RefreshRateMs  readwrite  u
+TxBytes        readable   t
+RxBytes        readable   t
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

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

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "RefreshRateMs" property

+
+RefreshRateMs  readwrite  u
+
+

Refresh rate of the rest of properties of this interface. The properties + are guaranteed to be refreshed each RefreshRateMs milliseconds in case + the underlying counter has changed too. + If zero, there is no guaranteed refresh rate of the properties. +

+
+
+
+

The "TxBytes" property

+
+TxBytes  readable   t
+
+

Number of transmitted bytes +

+
+
+
+

The "RxBytes" property

+
+RxBytes  readable   t
+
+

Number of received bytes +

+
+
+
+
+
Generated by GTK-Doc V1.25
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html index ffa7061a..eeb3ac25 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html @@ -8,7 +8,7 @@ - + @@ -45,6 +45,7 @@ HwAddress readable s Carrier readable b Slaves readable ao +Config readable s
@@ -101,9 +102,18 @@ Slaves readable ao this device.

+
+
+

The "Config" property

+
+Config  readable   s
+
+

The JSON configuration currently applied on the device. +

+
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html index 67282411..3fa87ff5 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html @@ -8,7 +8,7 @@ - + @@ -145,6 +145,6 @@ HwAddress readable s
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html index 892e396b..8f66ee0a 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html @@ -8,7 +8,7 @@ - + @@ -82,6 +82,6 @@ Peer readable o
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html index bf54392a..0b965269 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html @@ -8,7 +8,7 @@ - + @@ -113,6 +113,6 @@ VlanId readable u
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html index 97ca5850..6e9b82cc 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html @@ -8,7 +8,7 @@ - + @@ -249,6 +249,6 @@ L3miss readable b
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file 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 345ec7e2..5dc50721 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html @@ -8,7 +8,7 @@ - + @@ -231,6 +231,6 @@ ActiveNsp readable o
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html index 240ff74f..7e951a70 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html @@ -8,7 +8,7 @@ - + @@ -123,6 +123,6 @@ Carrier readable b
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html index 9dda293d..98a07a41 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html @@ -8,7 +8,7 @@ - + @@ -259,6 +259,6 @@ WirelessCapabilities readable u
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html index c0a8a22d..ed34dc9c 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html @@ -8,7 +8,7 @@ - + @@ -521,6 +521,6 @@ Real readable b
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html index 5f2615cf..70c0aef2 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html @@ -8,7 +8,7 @@ - + @@ -194,6 +194,6 @@ WinsServers readable au
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html index 65995603..9a2656fc 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html @@ -8,7 +8,7 @@ - + @@ -178,6 +178,6 @@ DnsPriority readable i
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html index 0768f315..99994305 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html @@ -8,7 +8,7 @@ - + @@ -128,6 +128,6 @@ SetState (IN u state);
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html index 2b116264..552d941f 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html @@ -7,8 +7,8 @@ - - + + @@ -20,7 +20,7 @@ Home Up Prev -Next +Next
@@ -197,6 +197,6 @@ DeleteSecrets (IN a{sa{sv}} connection,
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html index 6d33c280..5a594547 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html @@ -8,7 +8,7 @@ - + @@ -255,6 +255,6 @@ Unsaved readable b
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html index 5f601e51..2b0dc6c1 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html @@ -8,7 +8,7 @@ - + @@ -358,6 +358,6 @@ CanModify readable b
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html index 848a0d63..15994c30 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html @@ -8,7 +8,7 @@ - + @@ -123,6 +123,6 @@ Banner readable s
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html index 5868c7ac..c657a71f 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html @@ -8,7 +8,7 @@ - + @@ -415,6 +415,6 @@ State readable u
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html index f97d5301..018d4ae1 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html @@ -8,7 +8,7 @@ - + @@ -60,6 +60,13 @@ OUT s domains); CheckConnectivity (OUT u connectivity); state (OUT u state); +CheckpointCreate (IN ao devices, + IN u rollback_timeout, + IN u flags, + OUT o checkpoint); +CheckpointDestroy (IN o checkpoint); +CheckpointRollback (IN o checkpoint, + OUT a{su} result);
@@ -460,6 +467,94 @@ state (OUT u state);
+
+
+

The CheckpointCreate() method

+
+CheckpointCreate (IN  ao devices,
+                  IN  u  rollback_timeout,
+                  IN  u  flags,
+                  OUT o  checkpoint);
+
+

devices: a list of device paths for which a checkpoint should be created. An empty list means all managed devices. + rollback_timeout: the time in seconds until NetworkManager will automatically rollback to the checkpoint. Set to zero for infinite. + flags: optional flags that influence the creation. + checkpoint: on success, returns the path of the checkpoint. +

+

Create a checkpoint of the current networking configuration + for given interfaces. If rollback_timeout is not zero, a + rollback is automatically performed after the given timeout. +

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

IN ao devices:

IN u rollback_timeout:

IN u flags:

OUT o checkpoint:

+
+
+
+

The CheckpointDestroy() method

+
+CheckpointDestroy (IN  o checkpoint);
+
+

Destroy a previously created checkpoint. +

+
++++ + + + + +

IN o checkpoint:

the checkpoint to be destroyed. Set to empty to cancel all pending checkpoints.

+
+
+
+

The CheckpointRollback() method

+
+CheckpointRollback (IN  o     checkpoint,
+                    OUT a{su} result);
+
+

Rollback a checkpoint before the timeout is reached. +

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

IN o checkpoint:

the checkpoint to be rolled back.

OUT a{su} result:

on return, a dictionary of devices and results. Devices are represented by their original D-Bus path; each result is a RollbackResult.

+

Signal Details

@@ -756,6 +851,6 @@ GlobalDnsConfiguration readwrite a{sv}
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 59c5412e..84dcc838 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@
-

Version 1.2.4 +

Version 1.4.0

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

-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25
\ No newline at end of file diff --git a/docs/api/html/index.sgml b/docs/api/html/index.sgml deleted file mode 100644 index 3ffc813b..00000000 --- a/docs/api/html/index.sgml +++ /dev/null @@ -1,503 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 9b0fe805..49f669bf 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -8,7 +8,7 @@ - + @@ -176,12 +176,24 @@
org.freedesktop.NetworkManager.Device.Reapply(), The Reapply() method
+
org.freedesktop.NetworkManager.Device.Statistics, org.freedesktop.NetworkManager.Device.Statistics +
+
org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Statistics:RefreshRateMs, The "RefreshRateMs" property +
+
org.freedesktop.NetworkManager.Device.Statistics:RxBytes, The "RxBytes" property +
+
org.freedesktop.NetworkManager.Device.Statistics:TxBytes, The "TxBytes" property +
org.freedesktop.NetworkManager.Device.Team, org.freedesktop.NetworkManager.Device.Team
org.freedesktop.NetworkManager.Device.Team::PropertiesChanged, The "PropertiesChanged" signal
org.freedesktop.NetworkManager.Device.Team:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Team:Config, The "Config" property +
org.freedesktop.NetworkManager.Device.Team:HwAddress, The "HwAddress" property
org.freedesktop.NetworkManager.Device.Team:Slaves, The "Slaves" property @@ -563,6 +575,12 @@
org.freedesktop.NetworkManager.CheckConnectivity(), The CheckConnectivity() method
+
org.freedesktop.NetworkManager.CheckpointCreate(), The CheckpointCreate() method +
+
org.freedesktop.NetworkManager.CheckpointDestroy(), The CheckpointDestroy() method +
+
org.freedesktop.NetworkManager.CheckpointRollback(), The CheckpointRollback() method +
org.freedesktop.NetworkManager.DeactivateConnection(), The DeactivateConnection() method
org.freedesktop.NetworkManager.Enable(), The Enable() method @@ -648,6 +666,8 @@
NMBluetoothCapabilities, enum NMBluetoothCapabilities
+
NMCheckpointCreateFlags, enum NMCheckpointCreateFlags +
NMConnectivityState, enum NMConnectivityState
NMDeviceCapabilities, enum NMDeviceCapabilities @@ -666,6 +686,8 @@
NMMetered, enum NMMetered
+
NMRollbackResult, enum NMRollbackResult +
NMSecretAgentCapabilities, enum NMSecretAgentCapabilities
NMSecretAgentGetSecretsFlags, enum NMSecretAgentGetSecretsFlags @@ -753,6 +775,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/license.html b/docs/api/html/license.html index d7ed9e1c..211b7445 100644 --- a/docs/api/html/license.html +++ b/docs/api/html/license.html @@ -7,7 +7,7 @@ - + @@ -379,6 +379,6 @@ Public License instead of this License.

-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/manpages.html b/docs/api/html/manpages.html index a81ed762..8ad2e97e 100644 --- a/docs/api/html/manpages.html +++ b/docs/api/html/manpages.html @@ -8,7 +8,7 @@ - + @@ -53,6 +53,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html index 6d044dd3..b85cc306 100644 --- a/docs/api/html/nm-dbus-types.html +++ b/docs/api/html/nm-dbus-types.html @@ -8,7 +8,7 @@ - + @@ -3113,8 +3113,138 @@ +
+
+

enum NMCheckpointCreateFlags

+

The flags for CheckpointCreate call

+

Since: 1.4

+

+
+

Values

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

NM_CHECKPOINT_CREATE_FLAG_NONE

+

+		 +

= 0

+

+		 +

no flags

+

+		 
+

NM_CHECKPOINT_CREATE_FLAG_DESTROY_ALL

+

+		 +

= 0x01

+

+		 +

when creating a new checkpoint, destroy all existing ones.

+

+		 
+
+
+
+
+

enum NMRollbackResult

+

The result of a checkpoint Rollback() operation for a specific device.

+

Since: 1.4

+

+
+

Values

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

NM_ROLLBACK_RESULT_OK

+

+		 +

= 0

+

+		 +

the rollback succeeded.

+

+		 
+

NM_ROLLBACK_RESULT_ERR_NO_DEVICE

+

+		 +

= 1

+

+		 +

the device no longer exists.

+

+		 
+

NM_ROLLBACK_RESULT_ERR_DEVICE_UNMANAGED

+

+		 +

= 2

+

+		 +

the device is now unmanaged.

+

+		 
+

NM_ROLLBACK_RESULT_ERR_FAILED

+

+		 +

= 3

+

+		 +

other errors during rollback.

+

+		 
+
+
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/nm-online.html b/docs/api/html/nm-online.html index d2181325..06ff88d8 100644 --- a/docs/api/html/nm-online.html +++ b/docs/api/html/nm-online.html @@ -8,7 +8,7 @@ - + @@ -110,11 +110,11 @@

See Also

-

nmcli(1), - NetworkManager(8).

+

nmcli(1), + NetworkManager(8).

-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html index 338cd158..e188551a 100644 --- a/docs/api/html/nm-settings-ifcfg-rh.html +++ b/docs/api/html/nm-settings-ifcfg-rh.html @@ -8,7 +8,7 @@ - + @@ -46,7 +46,7 @@ The plugin currently supports reading and writing Ethernet, Wi-Fi, InfiniBand, VLAN, Bond, Bridge, and Team connections. Unsupported connection types (such as WWAN, PPPoE, VPN, or ADSL) are handled by keyfile plugin - (nm-settings-keyfile(5)). + (nm-settings-keyfile(5)). The main reason for using ifcfg-rh plugin is the compatibility with legacy configurations for ifup and ifdown (initscripts). @@ -232,6 +232,9 @@ DEVICETYPE=TeamPort connection sharing. When shared is used, NetworkManager assigns the interface 10.42.0.1, or it uses the first static address, if configured.

+

  • HWADDR - + initscripts compare the currently set hardware address of a device, while + NetworkManager considers the permanent one.

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

    -

    Table 39. 802-1x setting

    +

    Table 62. 802-1x setting

    @@ -524,7 +527,7 @@ Example: IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12

    -

    Table 40. bond setting

    +

    Table 63. bond setting

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

    -

    Table 41. bridge-port setting

    +

    Table 64. bridge-port setting

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

    -

    Table 42. bridge setting

    +

    Table 65. bridge setting

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

    -

    Table 43. connection setting

    +

    Table 66. connection setting

    @@ -697,7 +700,14 @@ Allowed values: 0 or 1 - + + + + + + + @@ -809,7 +819,7 @@ Allowed values: boolean value or 'rx'
    UUID(+)  UUID for the connection profile. When missing, NetworkManager creates the UUID itself (by hashing the file).UUID for the connection profile. When missing, NetworkManager creates the UUID itself (by hashing the filename).
    stable-idSTABLE_ID(+) + Token to generate stable IDs.
    interface-name

    -

    Table 44. dcb setting

    +

    Table 67. dcb setting

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

    -

    Table 45. infiniband setting

    +

    Table 68. infiniband setting

    @@ -999,7 +1009,7 @@ Example: PHYSDEV=ib0

    -

    Table 46. ip-tunnel setting

    +

    Table 69. ip-tunnel setting

    @@ -1017,7 +1027,7 @@ Example: PHYSDEV=ib0

    -

    Table 47. ipv4 setting

    +

    Table 70. ipv4 setting

    @@ -1123,6 +1133,15 @@ Example: GATEWAY=10.5.5.1 + + + + + + @@ -1160,7 +1179,7 @@ Example: DHCP_FQDN=foo.bar.com
    IPV4_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=20
    dhcp-client-id DHCP_CLIENT_ID(+)

    -

    Table 48. ipv6 setting

    +

    Table 71. ipv6 setting

    @@ -1256,6 +1275,15 @@ Example: IPV6_DEFAULTGW=abbe::1 + + + + + + @@ -1276,11 +1304,19 @@ Example: IPV6_ADDR_GEN_MODE=stable-privacyIPV6_ADDR_GEN_MODE: eui64, stable-privacy + + + + + +
    IPV6_ROUTE_METRIC is the default IPv6 metric for routes on this connection. If set to -1, a default metric based on the device type is used.
    dns-priorityIPV6_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: IPV6_DNS_PRIORITY=20
    ip6-privacy IPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP(+)
    tokenIPV6_TOKEN The IPv6 tokenized interface identifier token + +Example: IPV6_TOKEN=::53

    -

    Table 49. macvlan setting

    +

    Table 72. macvlan setting

    @@ -1298,7 +1334,7 @@ Allowed values: IPV6_ADDR_GEN_MODE: eui64, stable-privacy

    -

    Table 50. team-port setting

    +

    Table 73. team-port setting

    @@ -1321,7 +1357,7 @@ Allowed values: IPV6_ADDR_GEN_MODE: eui64, stable-privacy

    -

    Table 51. team setting

    +

    Table 74. team setting

    @@ -1344,7 +1380,7 @@ Allowed values: IPV6_ADDR_GEN_MODE: eui64, stable-privacy

    -

    Table 52. tun setting

    +

    Table 75. tun setting

    @@ -1362,7 +1398,7 @@ Allowed values: IPV6_ADDR_GEN_MODE: eui64, stable-privacy

    -

    Table 53. vlan setting

    +

    Table 76. vlan setting

    @@ -1425,7 +1461,7 @@ Example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12

    -

    Table 54. vxlan setting

    +

    Table 77. vxlan setting

    @@ -1443,7 +1479,7 @@ Example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12

    -

    Table 55. 802-3-ethernet setting

    +

    Table 78. 802-3-ethernet setting

    @@ -1495,6 +1531,12 @@ Example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12 + + + + + + @@ -1537,7 +1579,7 @@ Allowed values: "qeth", "lcs" or "ctc"
    Cloned (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-blacklist HWADDR_BLACKLIST(+)

    -

    Table 56. 802-11-wireless-security setting

    +

    Table 79. 802-11-wireless-security setting

    @@ -1689,7 +1731,7 @@ Example: KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysuperse

    -

    Table 57. 802-11-wireless setting

    +

    Table 80. 802-11-wireless setting

    @@ -1773,6 +1815,12 @@ Example: BSSID=00:1E:BD:64:83:21 + + + + + + @@ -1862,15 +1910,15 @@ Allowed values: default, never, always

    See Also

    -

    nm-settings(5), - nm-settings-keyfile(5), - NetworkManager(8), - NetworkManager.conf(5), - nmcli(1), - nmcli-examples(7)

    +

    nm-settings(5), + nm-settings-keyfile(5), + NetworkManager(8), + NetworkManager.conf(5), + nmcli(1), + nmcli-examples(7)

    -
    Generated by GTK-Doc V1.24
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html index 24188009..809d7cd1 100644 --- a/docs/api/html/nm-settings-keyfile.html +++ b/docs/api/html/nm-settings-keyfile.html @@ -8,7 +8,7 @@ - + @@ -174,7 +174,7 @@ id=4 There are several exceptions to this rule, mainly for making keyfile syntax easier for humans. The exceptions handled specially by keyfile plugin are listed below. Refer to - nm-settings(5) + nm-settings(5) for all available settings and properties and their description.

    Name aliases.  @@ -188,7 +188,7 @@ id=4

    Cloned (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-blacklist HWADDR_BLACKLIST(+)
    802-11-wireless-security = wifi-security
    -

    Table 31. bridge setting (section)

    +

    Table 54. bridge setting (section)

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

    -

    Table 32. infiniband setting (section)

    +

    Table 55. 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 33. ipv4 setting (section)

    +

    Table 56. 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 34. ipv6 setting (section)

    +

    Table 57. ipv6 setting (section)

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

    -

    Table 35. serial setting (section)

    +

    Table 58. serial setting (section)

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

    -

    Table 36. vpn setting (section)

    +

    Table 59. vpn setting (section)

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

    -

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

    +

    Table 60. 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 38. 802-11-wireless setting (section)

    +

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

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

    See Also

    -

    nm-settings(5), - nm-settings-ifcfg-rh(5), - NetworkManager(8), - NetworkManager.conf(5), - nmcli(1), - nmcli-examples(7)

    +

    nm-settings(5), + nm-settings-ifcfg-rh(5), + NetworkManager(8), + NetworkManager.conf(5), + nmcli(1), + nmcli-examples(7)

    -
    Generated by GTK-Doc V1.24
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html index 4b300bc7..6d729dde 100644 --- a/docs/api/html/nm-settings.html +++ b/docs/api/html/nm-settings.html @@ -8,7 +8,7 @@ - + @@ -94,7 +94,7 @@
    -

    Table 1. 802-1x setting

    +

    Table 24. 802-1x setting

    @@ -110,211 +110,246 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -323,7 +358,7 @@
    altsubject-matches +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 +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 +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 +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 +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 +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 +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 +identity string   Identity string for EAP authentication methods. Often the user's user or login name.
    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 +pac-file string   UTF-8 encoded file path containing PAC for EAP-FAST.
    password +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 +password-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "password" property. (see the section called “Secret flag types:” for flag values)
    password-raw +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 +password-raw-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "password-raw" property. (see the section called “Secret flag types:” for flag values)
    phase1-fast-provisioning +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +phase2-private-key-password-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "phase2-private-key-password" property. (see the section called “Secret flag types:” for flag values)
    phase2-subject-match +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 +pin string   PIN used for EAP authentication methods.
    pin-flags +pin-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "pin" property. (see the section called “Secret flag types:” for flag values)
    private-key +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 +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 +private-key-password-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "private-key-password" property. (see the section called “Secret flag types:” for flag values)
    subject-match +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 +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 2. adsl setting

    +

    Table 25. adsl setting

    @@ -339,49 +374,57 @@ - + - + - + - + - + - + - + - + @@ -390,7 +433,7 @@
    encapsulation +encapsulation string   Encapsulation of ADSL connection. Can be "vcmux" or "llc".
    name +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 +password string   Password used to authenticate with the ADSL service.
    password-flags +password-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "password" property. (see the section called “Secret flag types:” for flag values)
    protocol +protocol string   ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm".
    username +username string   Username used to authenticate with the ADSL service.
    vci +vci uint32 0 VCI of ADSL connection
    vpi +vpi uint32 0 VPI of ADSL connection

    -

    Table 3. bluetooth setting

    +

    Table 26. bluetooth setting

    @@ -406,19 +449,22 @@ - + - + - + @@ -427,7 +473,7 @@
    bdaddr +bdaddr byte array   The Bluetooth address of the device.
    name +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 +type string   Either "dun" for Dial-Up Networking connections or "panu" for Personal Area Networking connections to devices supporting the NAP profile.

    -

    Table 4. bond setting

    +

    Table 27. bond setting

    @@ -443,19 +489,22 @@ - + - + - + @@ -464,7 +513,7 @@
    interface-name +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 +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 +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 5. bridge setting

    +

    Table 28. bridge setting

    @@ -480,61 +529,71 @@ - + - + - + - + - + - + - + - + - + - + @@ -543,7 +602,7 @@
    ageing-time +ageing-time uint32 300 The Ethernet MAC address aging time, in seconds.
    forward-delay +forward-delay uint32 15 The Spanning Tree Protocol (STP) forwarding delay, in seconds.
    hello-time +hello-time uint32 2 The Spanning Tree Protocol (STP) hello time, in seconds.
    interface-name +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 +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 +max-age uint32 20 The Spanning Tree Protocol (STP) maximum message age, in seconds.
    multicast-snooping +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 +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 +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 +stp boolean TRUE Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.

    -

    Table 6. bridge-port setting

    +

    Table 29. bridge-port setting

    @@ -559,25 +618,29 @@ - + - + - + - + @@ -586,7 +649,7 @@
    hairpin-mode +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 +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 +path-cost uint32 100 The Spanning Tree Protocol (STP) port cost for destinations via this port.
    priority +priority uint32 32 The Spanning Tree Protocol (STP) priority of this bridge port.

    -

    Table 7. cdma setting

    +

    Table 30. cdma setting

    @@ -602,31 +665,36 @@ - + - + - + - + - + @@ -635,7 +703,7 @@
    name +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 +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 +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 +password-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "password" property. (see the section called “Secret flag types:” for flag values)
    username +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 8. connection setting

    +

    Table 31. connection setting

    @@ -651,109 +719,134 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - + - + - + @@ -762,7 +855,7 @@
    autoconnect +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 +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-slaves +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 +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 +id string   A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".
    interface-name +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 +lldp int32 -1 Whether LLDP is enabled for the connection.
    master +master string   Interface name of the master device or UUID of the master connection.
    metered +metered NMMetered (int32)   Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.
    name +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 +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 +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 +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 +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.
    timestamp +stable-idstring This token to generate stable IDs for the connection. If unset, the UUID will be used instead. The stable-id is used instead of the connection UUID 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.
    +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 +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 +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 +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 9. dcb setting

    +

    Table 32. dcb setting

    @@ -778,97 +871,113 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -877,7 +986,7 @@
    app-fcoe-flags +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 +app-fcoe-mode string "fabric" The FCoE controller mode; either "fabric" (default) or "vn2vn".
    app-fcoe-priority +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 10. generic setting

    +

    Table 33. generic setting

    @@ -892,7 +1001,8 @@ - + @@ -900,7 +1010,7 @@
    Value Description
    name +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 11. gsm setting

    +

    Table 34. gsm setting

    @@ -916,79 +1026,92 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -997,7 +1120,7 @@
    apn +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 +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 +home-only boolean FALSE When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.
    name +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 +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 +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 +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 +password-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "password" property. (see the section called “Secret flag types:” for flag values)
    pin +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 +pin-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "pin" property. (see the section called “Secret flag types:” for flag values)
    sim-id +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 +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 +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 12. infiniband setting

    +

    Table 35. infiniband setting

    @@ -1013,37 +1136,43 @@ - + - + - + - + - + - + @@ -1052,7 +1181,7 @@
    mac-address +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 +mtu uint32 0 If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
    name +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 +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 +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 +transport-mode string   The IP-over-InfiniBand transport mode. Either "datagram" or "connected".

    -

    Table 13. ipv4 setting

    +

    Table 36. ipv4 setting

    @@ -1068,133 +1197,155 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1203,7 +1354,7 @@
    address-data +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 +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 +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 +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 +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 +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 +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 +dhcp-timeout int32 0 A timeout for a DHCP transaction in seconds.
    dns +dns array of uint32 [] Array of IP addresses of DNS servers (as network-byte-order integers)
    dns-options +dns-options array of string [] Array of DNS options. 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 +dns-priority int32 0 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. 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 configurations with the lowest priority value will be used.
    dns-search +dns-search array of string [] Array of DNS search domains.
    gateway +gateway string   The gateway associated with this configuration. This is only meaningful if "addresses" is also set.
    ignore-auto-dns +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 +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 +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 +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 +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 +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 +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 +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 +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 14. ipv6 setting

    +

    Table 37. ipv6 setting

    @@ -1219,142 +1370,171 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + +
    addr-gen-mode +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 identification 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 +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 +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 +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 +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 +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 +dhcp-timeout int32 0 A timeout for a DHCP transaction in seconds.
    dns +dns array of byte array [] Array of IP addresses of DNS servers (in network byte order)
    dns-options +dns-options array of string [] Array of DNS options. 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 +dns-priority int32 0 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. 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 configurations with the lowest priority value will be used.
    dns-search +dns-search array of string [] Array of DNS search domains.
    gateway +gateway string   The gateway associated with this configuration. This is only meaningful if "addresses" is also set.
    ignore-auto-dns +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 +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 +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 +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 +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 +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 +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 +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 +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 +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.
    +tokenstring Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.

    -

    Table 15. ip-tunnel setting

    +

    Table 38. ip-tunnel setting

    @@ -1370,79 +1550,92 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1451,7 +1644,7 @@
    encapsulation-limit +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 +flow-label uint32 0 The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.
    input-key +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 +local string   The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.
    mode +mode uint32 0 The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).
    mtu +mtu uint32 0 None
    name +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 +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 +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 +path-mtu-discovery boolean TRUE Whether to enable Path MTU Discovery on this tunnel.
    remote +remote string   The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.
    tos +tos uint32 0 The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.
    ttl +ttl uint32 0 The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.

    -

    Table 16. macvlan setting

    +

    Table 39. macvlan setting

    @@ -1467,31 +1660,36 @@ - + - + - + - + - + @@ -1500,7 +1698,7 @@
    mode +mode uint32 0 The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.
    name +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 +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 +promiscuous boolean TRUE Whether the interface should be put in promiscuous mode.
    tap +tap boolean FALSE Whether the interface should be a MACVTAP.

    -

    Table 17. 802-11-olpc-mesh setting

    +

    Table 40. 802-11-olpc-mesh setting

    @@ -1516,25 +1714,29 @@ - + - + - + - + @@ -1543,7 +1745,7 @@
    channel +channel uint32 0 Channel on which the mesh network to join is located.
    dhcp-anycast-address +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 +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 +ssid byte array   SSID of the mesh network to join.

    -

    Table 18. ppp setting

    +

    Table 41. ppp setting

    @@ -1559,115 +1761,134 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1676,7 +1897,7 @@
    baud +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 +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 +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 +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 +mppe-stateful boolean FALSE If TRUE, stateful MPPE is used. See pppd documentation for more information on stateful MPPE.
    mru +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 +mtu uint32 0 If non-zero, instruct pppd to send packets no larger than the specified size.
    name +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 +no-vj-comp boolean FALSE If TRUE, Van Jacobsen TCP header compression will not be requested.
    noauth +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 +nobsdcomp boolean FALSE If TRUE, BSD compression will not be requested.
    nodeflate +nodeflate boolean FALSE If TRUE, "deflate" compression will not be requested.
    refuse-chap +refuse-chap boolean FALSE If TRUE, the CHAP authentication method will not be used.
    refuse-eap +refuse-eap boolean FALSE If TRUE, the EAP authentication method will not be used.
    refuse-mschap +refuse-mschap boolean FALSE If TRUE, the MSCHAP authentication method will not be used.
    refuse-mschapv2 +refuse-mschapv2 boolean FALSE If TRUE, the MSCHAPv2 authentication method will not be used.
    refuse-pap +refuse-pap boolean FALSE If TRUE, the PAP authentication method will not be used.
    require-mppe +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 +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 19. pppoe setting

    +

    Table 42. pppoe setting

    @@ -1692,31 +1913,36 @@ - + - + - + - + - + @@ -1725,7 +1951,7 @@
    name +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 +password string   Password used to authenticate with the PPPoE service.
    password-flags +password-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "password" property. (see the section called “Secret flag types:” for flag values)
    service +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 +username string   Username used to authenticate with the PPPoE service.

    -

    Table 20. serial setting

    +

    Table 43. serial setting

    @@ -1741,37 +1967,43 @@ - + - + - + - + - + - + @@ -1780,7 +2012,7 @@
    baud +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 +bits uint32 8 Byte-width of the serial communication. The 8 in "8n1" for example.
    name +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 +parity byte   The connection parity: 69 (ASCII 'E') for even parity, 111 (ASCII 'o') for odd, 110 (ASCII 'n') for none.
    send-delay +send-delay uint64 0 Time to delay between each byte sent to the modem, in microseconds.
    stopbits +stopbits uint32 1 Number of stop bits for communication on the serial port. Either 1 or 2. The 1 in "8n1" for example.

    -

    Table 21. team setting

    +

    Table 44. team setting

    @@ -1796,19 +2028,22 @@ - + - + - + @@ -1817,7 +2052,7 @@
    config +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 +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 +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 22. team-port setting

    +

    Table 45. team-port setting

    @@ -1833,13 +2068,15 @@ - + - + @@ -1848,7 +2085,7 @@
    config +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 +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 23. tun setting

    +

    Table 46. tun setting

    @@ -1864,43 +2101,50 @@ - + - + - + - + - + - + - + @@ -1909,7 +2153,7 @@
    group +group string   The group ID which will own the device. If set to NULL everyone will be able to use the device.
    mode +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 +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 +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 +owner string   The user ID which will own the device. If set to NULL everyone will be able to use the device.
    pi +pi boolean FALSE If TRUE the interface will prepend a 4 byte header describing the physical interface to the packets.
    vnet-hdr +vnet-hdr boolean FALSE If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network header.

    -

    Table 24. vlan setting

    +

    Table 47. vlan setting

    @@ -1925,43 +2169,50 @@ - + - + - + - + - + - + - + @@ -1970,7 +2221,7 @@
    egress-priority-map +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 +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 +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 +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 +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 +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 +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 25. vpn setting

    +

    Table 48. vpn setting

    @@ -1986,43 +2237,50 @@ - + - + - + - + - + - + - + @@ -2031,7 +2289,7 @@
    data +data dict of string to string {} Dictionary of key/value pairs of VPN plugin specific data. Both keys and values must be strings.
    name +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 +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 +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 +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 +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 +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 26. vxlan setting

    +

    Table 49. vxlan setting

    @@ -2047,103 +2305,120 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2152,7 +2427,7 @@
    ageing +ageing uint32 300 Specifies the lifetime in seconds of FDB entries learnt by the kernel.
    destination-port +destination-port uint32 8472 Specifies the UDP destination port to communicate to the remote VXLAN tunnel endpoint.
    id +id uint32 0 Specifies the VXLAN Network Identifer (or VXLAN Segment Identifier) to use.
    l2-miss +l2-miss boolean FALSE Specifies whether netlink LL ADDR miss notifications are generated.
    l3-miss +l3-miss boolean FALSE Specifies whether netlink IP ADDR miss notifications are generated.
    learning +learning boolean TRUE Specifies whether unknown source link layer addresses and IP addresses are entered into the VXLAN device forwarding database.
    limit +limit uint32 0 Specifies the maximum number of FDB entries. A value of zero means that the kernel will store unlimited entries.
    local +local string   If given, specifies the source IP address to use in outgoing packets.
    name +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 +parent string   If given, specifies the parent interface name or parent connection UUID.
    proxy +proxy boolean FALSE Specifies whether ARP proxy is turned on.
    remote +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 +rsc boolean FALSE Specifies whether route short circuit is turned on.
    source-port-max +source-port-max uint32 0 Specifies the maximum UDP source port to communicate to the remote VXLAN tunnel endpoint.
    source-port-min +source-port-min uint32 0 Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.
    tos +tos uint32 0 Specifies the TOS value to use in outgoing packets.
    ttl +ttl uint32 0 Specifies the time-to-live value to use in outgoing packets.

    -

    Table 27. wimax setting

    +

    Table 50. wimax setting

    @@ -2168,19 +2443,22 @@ - + - + - + @@ -2189,7 +2467,7 @@
    mac-address +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 +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 +network-name string   Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1

    -

    Table 28. 802-3-ethernet setting

    +

    Table 51. 802-3-ethernet setting

    @@ -2205,85 +2483,113 @@ - + + + + + + + - + - + - + - + + + + + + + - + - + - + - + - + - + - + - + - + - + @@ -2292,7 +2598,7 @@
    auto-negotiate +assigned-mac-addressstring 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.
    +auto-negotiate boolean TRUE 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.
    cloned-mac-address +cloned-mac-address byte array  If specified, request that the device use this MAC address instead of its permanent MAC address. This is known as MAC cloning or spoofing.This D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random".
    duplex +duplex string   If specified, request that the device only use the specified duplex mode. Either "half" or "full".
    mac-address +generate-mac-address-maskstring 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 +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 +mtu uint32 0 If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
    name +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 +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 +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 +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 +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 +speed uint32 0 If non-zero, request that the device use only the specified speed. In Mbit/s, ie 100 == 100Mbit/s.
    wake-on-lan +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 +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 29. 802-11-wireless setting

    +

    Table 52. 802-11-wireless setting

    @@ -2308,103 +2614,134 @@ - + + + + + + + - + - + - + - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2413,7 +2750,7 @@
    band +assigned-mac-addressstring 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.
    +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 +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 +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 +cloned-mac-address byte array  If specified, request that the Wi-Fi device use this MAC address instead of its permanent MAC address. This is known as MAC cloning or spoofing.This D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random".
    +generate-mac-address-maskstring 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 +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 +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 +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 +mac-address-randomization uint32 0One 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).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). Deprecated: 1
    mode +mode string   Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap". If blank, infrastructure is assumed.
    mtu +mtu uint32 0 If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
    name +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 +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 +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 +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 +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 +ssid byte array   SSID of the Wi-Fi network. Must be specified.
    tx-power +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 30. 802-11-wireless-security setting

    +

    Table 53. 802-11-wireless-security setting

    @@ -2429,109 +2766,127 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2564,13 +2919,13 @@

    See Also

    -

    NetworkManager(8), - nmcli(1), - nmcli-examples(7), - NetworkManager.conf(5)

    +

    NetworkManager(8), + nmcli(1), + nmcli-examples(7), + NetworkManager.conf(5)

    -
    Generated by GTK-Doc V1.24
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/nm-vpn-dbus-types.html b/docs/api/html/nm-vpn-dbus-types.html index 8e1ac031..34dd9730 100644 --- a/docs/api/html/nm-vpn-dbus-types.html +++ b/docs/api/html/nm-vpn-dbus-types.html @@ -8,7 +8,7 @@ - + @@ -555,6 +555,6 @@
    -
    Generated by GTK-Doc V1.24
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html index 41c3cac7..6200c1f0 100644 --- a/docs/api/html/nmcli-examples.html +++ b/docs/api/html/nmcli-examples.html @@ -8,7 +8,7 @@ - + @@ -37,7 +37,7 @@

    nmcli is a command-line client for NetworkManager. It allows controlling NetworkManager and reporting its status. For more information - please refer to nmcli(1) + please refer to nmcli(1) manual page.

    @@ -128,7 +128,8 @@ org.freedesktop.NetworkManager.wifi.share.open yes org.freedesktop.NetworkManager.settings.modify.system yes org.freedesktop.NetworkManager.settings.modify.own yes org.freedesktop.NetworkManager.settings.modify.hostname auth -org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.settings.modify.global-dns auth +org.freedesktop.NetworkManager.reload auth

    This command shows configured polkit permissions for various NetworkManager operations. These permissions or actions (using polkit language) are configured @@ -166,7 +167,7 @@ B,DISPATCH

    The first command makes NetworkManager log in DEBUG level, and only for CORE, ETHER and IP domains. The second command restores the default logging state. Please refer to the - NetworkManager.conf(5) manual page + NetworkManager.conf(5) manual page for available logging levels and domains.

    @@ -304,7 +305,7 @@ fi Wi-Fi will be turned back on. Name this script e.g. 70-wifi-wired-exclusive.sh and put it into /etc/NetworkManager/dispatcher.d/ directory. - See NetworkManager(8) + See NetworkManager(8) manual page for more information about NetworkManager dispatcher scripts.

    @@ -551,17 +552,17 @@ Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully

    See Also

    - nmcli(1), - NetworkManager(8), - NetworkManager.conf(5), - nm-settings(5), - nm-online(1), + nmcli(1), + NetworkManager(8), + NetworkManager.conf(5), + nm-settings(5), + nm-online(1), nm-applet(1), nm-connection-editor(1)

    -
    Generated by GTK-Doc V1.24
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html index d66bcb34..4a280e99 100644 --- a/docs/api/html/nmcli.html +++ b/docs/api/html/nmcli.html @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@ terse output format which is better suited for script processing. Note that NetworkManager can also execute scripts, called "dispatcher scripts", in response to network events. See - NetworkManager(8) + NetworkManager(8) for details about these dispatcher scripts.

  • Servers, headless machines, and terminals: nmcli can be used to control NetworkManager without a GUI, including creating, editing, @@ -113,7 +113,7 @@ to a terminal. The default value is auto.

    • - + - + + + + + @@ -216,13 +226,13 @@ @@ -338,7 +348,7 @@

    Connection Management Commands

    -

    nmcli connection { show | up | down | add | edit | modify | delete | monitor | reload | load } [ARGUMENTS...]

    +

    nmcli connection { show | up | down | modify | add | edit | clone | delete | monitor | reload | load | import | export } [ARGUMENTS...]

    NetworkManager stores all network configuration as "connections", which are collections of data (Layer2 details, IP addressing, etc.) that describe how to create or connect to a network. A connection is "active" @@ -463,7 +473,7 @@

    + + + + - - + + - - - - - + + - + + - + + + - - + + + + - + + + + - - - - - - - - - - + + - - - - - - + + - - - - - - - - - - - - - - - - - - + + - - - - - - + + + - - + + - - + + - - + +
    auth-alg +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 +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 +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 +leap-password string   The login password for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").
    leap-password-flags +leap-password-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "leap-password" property. (see the section called “Secret flag types:” for flag values)
    leap-username +leap-username string   The login username for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").
    name +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 +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 +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 +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 +psk-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "psk" property. (see the section called “Secret flag types:” for flag values)
    wep-key-flags +wep-key-flags NMSettingSecretFlags (uint32)   Flags indicating how to handle the "wep-key0", "wep-key1", "wep-key2", and "wep-key3" properties. (see the section called “Secret flag types:” for flag values)
    wep-key-type +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 +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 +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 +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 +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 +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.

    -f | --fields {[field...] | all | common }

    -f | --fields { field1,field2... | all | common }

    This option is used to specify what fields (column names) should be printed. Valid field names differ for specific commands. List available fields @@ -149,10 +149,9 @@ also influences echoing passwords typed by user as an input.

    [ - -w | --wait - seconds... - ]

    -w | --wait + seconds +

    This option sets a timeout period for which nmcli will wait for NetworkManager to finish operations. It is @@ -164,6 +163,17 @@

    --complete-args

    		+

    Instead of conducting the desired action, nmcli + will list possible completions for the last argument. This is useful to implement + argument completion in shell.

    +

    The exit status will indicate success + or return a code 65 to indicate the last argument is a file name.

    +

    NetworkManager ships with command completion support for GNU Bash.

    +

    -v | --version

    Show nmcli version.

    logging [level level] - [domain domains...] + [domains domains...]

    Get and change NetworkManager logging level and domains. Without any argument current logging level and domains are shown. In order to change logging state, provide level and, or, domain parameters. See - NetworkManager.conf(5) + NetworkManager.conf(5) for available level and domain values.

    up [ id | uuid | path ] - ID... + ID [ifname ifname] [ap BSSID] [passwd-file file] @@ -563,36 +573,82 @@

    + modify + [--temporary] + [ id | uuid | path ] + ID + + { option value | [+|-]setting.property value } + ... +

    		+

    Add, modify or remove properties in the connection profile.

    +

    To set the property just specify the property name followed by the + value. An empty value ("") removes the property value.

    +

    In addition to the properties, you can also use short names for some of + the properties. Consult the Property Aliases + section for details.

    +

    If you want to append an item to the existing value, use + + prefix for the property name. If you want to remove just + one item from container-type property, use - prefix for + the property name and specify a value or an zero-based index of the item to + remove (or option name for properties with named options) as + value. The + and - + modifies only have a real effect for multi-value (container) + properties like ipv4.dns, ipv4.addresses, + bond.options, etc.

    +

    See nm-settings(5) for complete reference of setting and property names, their descriptions + and default values. The setting and + property can be abbreviated provided they are unique.

    +

    The connection is identified by its name, UUID or D-Bus path. If + ID is ambiguous, a keyword id, + uuid or path can be used.

    +

    add - ifname ifname - [con-name name] - [ - autoconnect - { yes | no } - ] - [ - save - { yes | no } - ] - [master master] - [slave-type type] - [type type] - [ARGUMENTS...] - [ip4 addr] - [gw4 addr] - [ip6 addr] - [gw6 addr] - [ - -- - - [+|-]setting.property - value - ... - ] + [save { yes | no }] + + { option value | [+|-]setting.property value } + ...

    		-

    Add a connection for NetworkManager. Arguments differ according to connection types, see below.

    +

    Create a new connection using specified properties.

    +

    You need to describe the newly created connections with the property and value pairs. + See nm-settings(5) for the complete reference. You can also use the aliases described in + Property Aliases section. The syntax is + the same as of the nmcli connection modify command.

    +

    To construct a meaningful connection you at the very least need to set the + connection.type property (or use the type alias) + to one of known NetworkManager connection types:

    +
      +

    • ethernet

      • +

    • wifi

      • +

    • wimax

      • +

    • pppoe

      • +

    • gsm

      • +

    • cdma

      • +

    • infiniband

      • +

    • bluetooth

      • +

    • vlan

      • +

    • bond

      • +

    • bond-slave

      • +

    • team

      • +

    • team-slave

      • +

    • bridge

      • +

    • bridge-slave

      • +

    • vpn

      • +

    • olpc-mesh

      • +

    • adsl

      • +

    • tun

      • +

    • ip-tunnel

      • +

    • macvlan

      • +

    • vxlan

      • +
    +

    The most typical uses are described in the Examples section.

    +

    Aside from the properties and values two special options are accepted:

    @@ -600,1384 +656,1271 @@ - - - - - - - - - - - - - - - - - - - + + - - - + +

    ifname

    interface to bind the connection to. The connection will only be - applicable to this interface name. A special value of * - can be used for interface-independent connections. The - ifname argument is mandatory for all connection types - except bond, team, bridge and vlan. Note: use quotes around - * to suppress shell expansion.

    con-name

    connection name (when not provided a default name is generated: - <type>[-<ifname>][-<num>]).

    autoconnect

    whether the connection profile can be automatically activated (default: - yes).

    save

    whether the connection should be persistent, i.e. NetworkManager should +

    Controls whether the connection should be persistent, i.e. NetworkManager should store it on disk (default: yes).

    master

    master interface name, or connection UUID or ID of master connection - profile. The value can be prefixed with ifname/, - uuid/ or id/ to disambiguate it.

    slave-type

    type of master connection. Only required when it can not be inferred - (i.e. the master connection does - not exist yet).

    --

    If a single -- argument is encountered it is ignored. + This is for compatibility with older versions on nmcli.

    type

    connection type; see below for allowed values. Note that types - bond-slave, team-slave and - bridge-slave create ethernet connection - profiles. Their use is discouraged in favor of using a specific type with - master option.

    +

    - type ethernet - [mac addr] - [cloned-mac addr] - [mtu mtu] -

    + edit + { + [ id | uuid | path ] + ID + | + [typetype] + [con-namename] + } +

    + +
    +

    Edit an existing connection or add a new one, using an interactive editor.

    +

    The existing connection is identified by its name, UUID or D-Bus path. If + ID is ambiguous, a keyword id, + uuid, or path can be used. See + connection show above for the description of the + ID-specifying keywords. Not providing an + ID means that a new connection will be added.

    +

    The interactive editor will guide you through the connection editing and + allow you to change connection parameters according to your needs by means of + a simple menu-driven interface. The editor indicates what settings and + properties can be modified and provides in-line help.

    +

    Available options:

    +
    - - - - - - + + - - + + -

    mac

    MAC address of the device this connection is locked to.

    cloned-mac

    cloned MAC.

    type

    type of the new connection; valid types are the same as for + connection add command.

    mtu

    MTU.

    con-name

    name for the new connection. It can be changed later in the editor.
    +

    See also + nm-settings(5) for all NetworkManager settings and property names, and their + descriptions; and + nmcli-examples(7) + for sample editor sessions.

    +

    - type wifi - ssid SSID - [mac addr] - [cloned-mac addr] - [ - mode - { infrastructure | ap | adhoc } - ] - [mtu mtu] -

    ---- - - - - + clone + [--temporary] + [ id | uuid | path ] + ID + new_name +

    + - - + + - - + + - - + + - - - - -

    ssid

    SSID.

    		 +

    Clone a connection. The connection to be cloned is identified by its + name, UUID or D-Bus path. If ID is ambiguous, a keyword + id, uuid or path + can be used. See connection show above for the description + of the ID-specifying keywords. new_name is + the name of the new cloned connection. The new connection will be the exact + copy except the connection.id (new_name) and + connection.uuid (generated) properties.

    +

    The new connection profile will be saved as persistent unless + --temporary option is specified, in which case the new profile + won't exist after NetworkManager restart.

    +

    mac

    MAC address of the device this connection is locked to.

    + delete + [ id | uuid | path ] + ID... +

    		+

    Delete a configured connection. The connection to be deleted is + identified by its name, UUID or D-Bus path. If ID is ambiguous, a + keyword id, uuid or path can be used. + See connection show above for the description of + the ID-specifying keywords.

    +

    If --wait option is not specified, the default timeout will be 10 + seconds.

    +

    cloned-mac

    cloned MAC.

    + monitor + [ id | uuid | path ] + ID... +

    		+

    Monitor connection profile activity. This command prints a line whenever + the specified connection changes. The connection to be monitored is identified + by its name, UUID or D-Bus path. If ID is ambiguous, a keyword + id, uuid or path + can be used. See connection show above for the description of the + ID-specifying keywords.

    +

    Monitors all connection profiles in case none is specified. The command + terminates when all monitored connections disappear. If you want to monitor + connection creation consider using the global monitor with nmcli + monitor command.

    +

    mode

    Wi-Fi network mode. If blank, infrastructure - is assumed.

    + reload +

    Reload all connection files from disk. + NetworkManager does not monitor changes to connection + files by default. So you need to use this command in order to tell + NetworkManager to re-read the connection profiles from + disk when a change was made to them. However, the auto-loading feature can be + enabled and then NetworkManager will reload connection + files any time they change (monitor-connection-files=true in + NetworkManager.conf(5)). +

    mtu

    MTU.

    + load + filename... +

    Load/reload one or more connection files from disk. Use this after + manually editing a connection file to ensure that + NetworkManager is aware of its latest state.

    - type wimax - [mac addr] - [nsp nsp] -

    ---- - - - - + import + [--temporary] + typetype + filefile +

    + - - + + -

    mac

    MAC address of the device this connection is locked to.

    		 +

    Import an external/foreign configuration as a NetworkManager connection + profile. The type of the input file is specified by type + option.

    +

    Only VPN configurations are supported at the moment. The configuration is + imported by NetworkManager VPN plugins. type values are + the same as for vpn-type option in nmcli + connection add. VPN configurations are imported by VPN plugins. + Therefore the proper VPN plugin has to be installed so that nmcli could import + the data.

    +

    The imported connection profile will be saved as persistent unless + --temporary option is specified, in which case the new profile + won't exist after NetworkManager restart.

    +

    nsp

    Network Service Provider name.

    + export + [ id | uuid | path ] + ID + [file] +

    		+

    Export a connection.

    +

    Only VPN connections are supported at the moment. A proper VPN plugin has + to be installed so that nmcli could export a connection. If no + file is provided, the VPN configuration + data will be printed to standard output.

    +

    - type pppoe - username user - [password passwd] - [service name] - [mtu mtu] - [mac addr] -

    +
    + +
    +

    Device Management Commands

    +

    nmcli device { status | show | set | connect | reapply | modify | disconnect | delete | monitor | wifi | lldp } [ARGUMENTS...]

    +

    Show and manage network interfaces.

    +
    - - - - - - + + - - + + - - + + - - - - -

    username

    PPPoE username.

    password

    Password for the PPPoE username.

    status

    		 +

    Print status of devices.

    +

    This is the default action if no command is specified to + nmcli device.

    +

    service

    PPPoE service name (if required by concentrator).

    + show + [ifname] +

    Show detailed information about devices. Without an argument, all + devices are examined. To get information for a specific device, the interface + name has to be provided.

    mtu

    MTU.

    + set + [ifname] + ifname + [ + autoconnect + { yes | no } + ] + [ + managed + { yes | no } + ] +

    Set device properties.

    mac

    MAC address of the device this connection is locked to.

    + connect + ifname +

    		+

    Connect the device. NetworkManager will try to find a suitable connection + that will be activated. It will also consider connections that are not set to + auto connect.

    +

    If --wait option is not specified, the default timeout will be 90 + seconds.

    +

    - type gsm - [apn APN] - [username user] - [password passwd] -

    ---- - - - - + reapply + ifname +

    + - - + + - - - - -

    apn

    APN - GSM Access Point Name.

    Attempt to update device with changes to the currently active connection + made since it was last applied.

    user

    user name.

    + modify + ifname + + { option value | [+|-]setting.property value } + ... +

    		+

    Modify the settings currently active on the device.

    +

    This command lets you do temporary changes to a configuration active on + a particular device. The changes are not preserved in the connection profile.

    +

    See nm-settings(5) for the list of available properties. Please note that some + properties can't be changed on an already connected device.

    +

    You can also use the aliases described in + Property Aliases section. The syntax is + the same as of the nmcli connection modify command.

    +

    password

    password.

    + disconnect + ifname... +

    		+

    Disconnect a device and prevent the device from automatically activating + further connections without user/manual intervention. Note that disconnecting + software devices may mean that the devices will disappear.

    +

    If --wait option is not specified, the default timeout + will be 10 seconds.

    +

    - type cdma - [username user] - [password passwd] -

    ---- - - - - + delete + ifname... +

    + - - + + - -

    user

    user name.

    		 +

    Delete a device. The command removes the interface from the system. Note + that this only works for software devices like bonds, bridges, teams, etc. + Hardware devices (like Ethernet) cannot be deleted by the command.

    +

    If --wait option is not specified, the default timeout will be 10 + seconds.

    +

    password

    password.

    + monitor + [ifname...] +

    		+

    Monitor device activity. This command prints a line whenever the + specified devices change state.

    +

    Monitors all devices in case no interface is specified. The monitor + terminates when all specified devices disappear. If you want to monitor device + addition consider using the global monitor with nmcli + monitor command.

    +

    + wifi + [ + list + [ifname ifname] + [bssid BSSID] + ] +

    List available Wi-Fi access points. The ifname and + bssid options can be used to list APs for a particular + interface or with a specific BSSID, respectively.

    - type infiniband - [mac addr] - [mtu mtu] - [ - transport-mode - { datagram | connected } - ] - [parent device] - [p-key key] -

    + wifi + connect + (B)SSID + [passwordpassword] + [ + wep-key-type + { key | phrase } + ] + [ifnameifname] + [bssidBSSID] + [namename] + [ + private + { yes | no } + ] + [ + hidden + { yes | no } + ] +

    + + + - - +
    +

    Connect to a Wi-Fi network specified by SSID or BSSID. The command + creates a new connection and then activates it on a device. This is a + command-line counterpart of clicking an SSID in a GUI client. The command + always creates a new connection and thus it is mainly useful for connecting to + new Wi-Fi networks. If a connection for the network already exists, it is + better to bring up (activate) the existing connection as follows: + nmcli con up id name. Note that + only open, WEP and WPA-PSK networks are supported at the moment. It is also + supposed that IP configuration is obtained via DHCP.

    +

    If --wait option is not specified, the default timeout will be 90 + seconds.

    +

    Available options are:

    +
    - - + + - - + + - - + + - - + + - - - - -

    mac

    MAC address of the device this connection is locked to - (InfiniBand MAC is 20 bytes).

    password

    password for secured networks (WEP or WPA).

    mtu

    MTU.

    wep-key-type

    type of WEP secret, either key for ASCII/HEX key or + phrase for passphrase.

    transport-mode

    InfiniBand transport mode.

    ifname

    interface that will be used for activation.

    parent

    the interface name of the parent device (if any).

    bssid

    if specified, the created connection will be restricted just for the + BSSID.

    p-key

    the InfiniBand P_Key (16-bit unsigned integer).

    name

    if specified, the connection will use the name (else NM creates a name + itself).

    - type bluetooth - [addr addr] - [ - bt-type - { panu | dun-gsm | dun-cdma } - ] -

    ---- - - - - + + - - + + -

    addr

    Bluetooth device address (MAC).

    private

    if set to yes, the connection will only be visible + to the user who created it. Otherwise the connection is system-wide, which is + the default.

    bt-type

    Bluetooth connection type.

    hidden

    set to yes when connecting for the first time to an + AP not broadcasting its SSID. Otherwise the SSID would not be found and the + connection attempt would fail.
    +

    - type vlan - dev device - id id - [flags flags] - [ingress mapping] - [egress mapping] - [mtu mtu] -

    + wifi + hotspot + [ifnameifname] + [con-namename] + [ssidSSID] + [ + band + { a | bg } + ] + [channelchannel] + [passwordpassword] +

    + +
    +

    Create a Wi-Fi hotspot. The command creates a hotspot connection profile + according to Wi-Fi device capabilities and activates it on the device. The + hotspot is secured with WPA if device/driver supports that, otherwise WEP is + used. Use connection down or device + disconnect to stop the hotspot.

    +

    Parameters of the hotspot can be influenced by the optional + parameters:

    +
    - - + + - - + + - - + + - - + + - - + + - - + + -

    dev

    parent device this VLAN is on.

    ifname

    what Wi-Fi device is used.

    id

    VLAN ID in range 0-4095.

    con-name

    name of the created hotspot connection profile.

    flags

    flags.

    ssid

    SSID of the hotspot.

    ingress

    VLAN ingress priority mapping.

    band

    Wi-Fi band to use.

    egress

    VLAN egress priority mapping.

    channel

    Wi-Fi channel to use.

    mtu

    MTU.

    password

    		 +

    password to use for the created hotspot. If not provided, nmcli will + generate a password. The password is either WPA pre-shared key or WEP + key.

    +

    Note that --show-secrets global option can be used to + print the hotspot password. It is useful especially when the password was + generated.

    +
    +

    + wifi + rescan + [ifname ifname] + [ssid SSID...] +

    		+

    Request that NetworkManager immediately re-scan for + available access points. NetworkManager scans Wi-Fi networks periodically, but + in some cases it can be useful to start scanning manually (e.g. after resuming + the computer). By using ssid, it is possible to scan for a + specific SSID, which is useful for APs with hidden SSIDs. You can provide + multiple ssid parameters in order to scan more + SSIDs.

    +

    This command does not show the APs, use nmcli device wifi list + for that.

    +

    - type bond - [ - mode - { active-backup | balance-xor | broadcast | 802.3ad | balance-tlb | balance-alb | num } - ] - [primary ifname] - [miimon num] - [downdelay num] - [updelay num] - [arp-interval num] - [arp-ip-target num] -

    + lldp + [ + list + [ifnameifname] + ] +

    + + + +

    Display information about neighboring devices learned through the Link + Layer Discovery Protocol (LLDP). The ifname option can be + used to list neighbors only for a given interface. The protocol must be enabled + in the connection settings.

    + +
    +

    Secret Agent

    +

    nmcli agent { secret | polkit | all }

    +

    Run nmcli as a NetworkManager secret agent, or polkit agent.

    +
    - - + + - - + + - - + + + +

    mode

    bonding mode (default: balance-rr).

    secret

    Register nmcli as a NetworkManager secret agent and listen for secret + requests. You do usually not need this command, because nmcli can handle + secrets when connecting to networks. However, you may find the command useful + when you use another tool for activating connections and you do not have a + secret agent available (like nm-applet).

    primary

    primary interface name (for active-backup mode).

    + polkit +

    Register nmcli as a polkit agent for the user session and listen for + authorization requests. You do not usually need this command, because nmcli can + handle polkit actions related to NetworkManager operations (when run with + --ask). However, you may find the command useful when you want + to run a simple text based polkit agent and you do not have an agent of a desktop + environment. Note that running this command makes nmcli handle all polkit requests, + not only NetworkManager related ones, because only one polkit agent can run for the + session.

    miimon

    miimon (default: 100).

    + all +

    Runs nmcli as both NetworkManager secret and a polkit agent.
    +
    +
    +

    Property Aliases

    +

    Apart from the property-value pairs, connection add, + connection modify and device modify also + accept short forms of some properties. They exist for convenience and compatiblity + with older versions of nmcli that could not accept the raw + properties.

    +

    The overview of the aliases is below. An actual connection type is used to + 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

    +
    +++++ + + + + + + - - + + + - - + + + - - + + + - - + + + - -
    AliasPropertyNote

    downdelay

    downdelay (default: 0).

    		typeconnection.typeThis option also accepts values of bond-slave, +team-slave and bridge-slave. They create +ethernet connection profiles. Their use is discouraged in +favor of using a specific type with master option.

    updelay

    updelay (default: 0).

    		con-nameconnection.idWhen not provided a default name is generated: <type>[-<ifname>][-<num>]).

    arp-interval

    ARP interval (default: 0).

    		autoconnectconnection.autoconnect 

    arp-ip-target

    ARP IP target.

    		ifnameconnection.interface-nameA value of * will be interpreted as +no value, making the connection profile interface-independent. +Note: use quotes around * to suppress shell expansion. +For bond, team and bridge connections a default name will be generated if not set.
    masterconnection.masterValue specified here will be canonicalized. +It can be prefixed with ifname/, uuid/ +or id/ to disambiguate it.

    - type bond-slave - [master master] -

    + + + + + +
    slave-typeconnection.slave-type 
    + +
    +

    Table 2. PPPoE options

    +
    -- - - - - -

    master

    master bond interface name, or connection UUID or - ID of bond master connection profile. The value can be - prefixed with ifname/, - uuid/ or id/ to - disambiguate it.

    - type team - [ - config - { file | JSON } - ] -

    ---- - - - - -

    config

    JSON configuration for team.

    - type team-slave - [ - config - JSON - ] -

    -- + + + + - - + + - - - - -
    AliasProperty

    master

    master team interface name, or connection UUID or - ID of team master connection profile. The value can be - prefixed with ifname/, - uuid/ or id/to - disambiguate it.

    		usernamepppoe.username

    config

    JSON configuration for team.

    		passwordpppoe.password

    - type bridge - [ - stp - { yes | no } - ] - [priority num] - [forward-delay 2-30] - [hello-time 1-10] - [max-age 6-42] - [ageing-time 0-1000000] - [ - multicast-snooping - { yes | no } - ] - [mac addr] -

    + + + + +
    servicepppoe.service
    + +
    +

    Table 3. Wired Ethernet options

    +
    -+ + + + + - - + + - - + + - - + + + +
    AliasProperty

    stp

    controls whether Spanning Tree Protocol (STP) is enabled for this bridge - (default: yes).

    		mtuwired.mtu

    priority

    sets STP priority (default: 128).

    		macwired.mac-address

    forward-delay

    STP forwarding delay, in seconds (default: 15).

    		cloned-macwired.cloned-mac-address
    +
    +
    +

    Table 4. Infiniband options

    +
    ++++ + + + + + - - + + - - + + - - + + - - + + - - + + -
    AliasProperty

    hello-time

    STP hello time, in seconds (default: 2).

    		mtuinfiniband.mtu

    max-age

    STP maximum message age, in seconds (default: 20).

    		macinfiniband.mac-address

    ageing-time

    the Ethernet MAC address aging time, in seconds (default: 300).

    		transport-modeinfiniband.transport-mode

    multicast-snooping

    controls whether IGMP snooping is enabled (default: yes).

    		parentinfiniband.parent

    mac

    MAC address of the bridge (note: this requires a recent kernel feature, - originally introduced in 3.15 upstream kernel).

    		p-keyinfiniband.p-key

    - type bridge-slave - [master master] - [priority num] - [path-cost 1-65535] - [ - hairpin - { yes | no } - ] -

    +
    + +
    +

    Table 5. Wi-Fi options

    +
    -+ + + + + - - + + - - + + - - + + - - - - -
    AliasProperty

    master

    master bridge interface name, or connection UUID - or ID of bridge master connection profile. The value - can be prefixed with ifname/, - uuid/ or id/ - to disambiguate it.

    		ssidwireless.ssid

    priority

    STP priority of this slave (default: 32).

    		modewireless.mode

    path-cost

    STP port cost for destinations via this slave (default: 100).

    		mtuwireless.mtu

    hairpin

    'hairpin mode' for the slave, which allows frames to be sent back out - through the slave the frame was received on (default: yes).

    		macwireless.mac-address

    - type vpn - [type type] - [user username] -

    + + + + +
    cloned-macwireless.cloned-mac-address
    + +
    +

    Table 6. WiMax options

    +
    -+ + + + + - - + + - - + + -
    AliasProperty

    vpn-type

    VPN type.

    		nspwimax.network-name

    user

    VPN username.

    		macwimax.mac-address

    - type olpc-mesh - ssid SSID - [channel 1-13] - [dhcp-anycast MAC] -

    +
    + +
    +

    Table 7. GSM options

    +
    -+ + + + + - - + + - - + + - - + + -
    AliasProperty

    ssid

    SSID.

    		apngsm.apn

    channel

    channel to use for the network.

    		usergsm.username

    dhcp-anycast

    anycast DHCP MAC address used when requesting an IP address via DHCP.

    		passwordgsm.password

    - type adsl - username username - - protocol - { pppoa | pppoe | ipoatm } - - [password passwd] - [ - encapsulation - { vcmux | llc } - ] -

    +
    + +
    +

    Table 8. CDMA options

    +
    -+ + + + + - - + + - - - - - - - - - - + + -
    AliasProperty

    username

    ADSL user name.

    		usercdma.username

    protocol

    ADSL protocol.

    password

    ADSL password.

    encapsulation

    ADSL encapsulation.

    		passwordcdma.password

    - type tun - - mode - { tun | tap } - - [owner UID] - [group GID] - [ - pi - { yes | no } - ] - [ - vnet-hdr - { yes | no } - ] - [ - multi-queue - { yes | no } - ] -

    +
    + +
    +

    Table 9. Bluetooth options

    +
    -++ + + + + + - - - - - - - - - - + + + - - - - - - - - - - + + + -
    AliasPropertyNote

    mode

    Mode for the device.

    owner

    UID of the owner.

    group

    GID of the group.

    		addrbluetooth.bdaddr 

    pi

    include packet information (~IFF_NO_PI flag).

    vnet-hdr

    send and receive large (i.e. GSO) packets and packets with partial - checksums (IFF_VNET_HDR flag).

    multi-queue

    multi-queue support for tun/tap device (IFF_MULTI_QUEUE flag).

    		bt-typebluetooth.typeApart from the usual dun and +panu options, the values of dun-gsm +and dun-cdma can be used for compatibility with older +versions. They are equivalent to using dun and setting +appropriate gsm.* or cdma.* properties.

    - type ip-tunnel - - mode - { ipip | gre | sit | isatap | vti | ip6ip6 | ipip6 | ip6gre | vti6 | tun } - - remote addr - [local addr] - [dev device] -

    +
    + +
    +

    Table 10. VLAN options

    +
    -+ + + + + - - + + - - + + - - + + - - - - -
    AliasProperty

    mode

    tunnel mode.

    		devvlan.parent

    remote

    IPv4 or IPv6 address of the remote tunnel endpoint.

    		idvlan.id

    local

    IPv4 or IPv6 address of the local tunnel endpoint.

    		flagsvlan.flags

    dev

    device to use for tunnel endpoint communication.

    		ingressvlan.ingress-priority-map

    - type macvlan - dev device - - mode - { vepa | bridge | private | passthru | source } - - [ - tap - { yes | no } - ] -

    + + + + +
    egressvlan.egress-priority-map
    + +
    +

    Table 11. Bonding options

    +
    -++ + + + + + - - - - - - - - - - - + + + + + + + + + + + -
    AliasPropertyNote

    dev

    parent device this MACVLAN is on.

    mode

    MACVLAN mode, which specifies the communication mechanism between - multiple MACVLANs on the same lower device.

    tap

    controls the device type. If set to 'yes' a MACVTAP will be created - (default: no).

    modebond.optionsSetting each of these adds the option to bond.options property. +It's equivalent of using the +bond.options 'option=value' syntax.
    primary
    miimon
    downdelay
    updelay
    arp-interval
    arp-ip-target
    lacp-rate

    - type vxlan - id id - remote addr - [dev parent device (ifname or connection UUID)] - [local addr] - [source-port-min 0-65535] - [source-port-max 0-65535] - [destination-port 0-65535] -

    +
    + +
    +

    Table 12. Team options

    +
    ++++ + + + + + + + + +
    AliasProperty
    configteam.config
    +
    +
    +

    Table 13. Team port options

    +
    ++++ + + + + + + + + +
    AliasProperty
    configteam-port.config
    +
    +
    +

    Table 14. Bridge options

    +
    -+ + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - -
    AliasProperty

    id

    VXLAN Network Identifer to use.

    		stpbridge.stp

    remote

    unicast destination IP address or multicast IP address to join.

    		prioritybridge.priority

    dev

    device to use for tunnel endpoint communication.

    		forward-delaybridge.forward-delay

    local

    source IP address.

    		hello-timebridge.hello-time

    source-port-min

    minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.

    		max-agebridge.max-age

    source-port-max

    maximum UDP source port to communicate to the remote VXLAN tunnel endpoint.

    		ageing-timebridge.ageing-time

    destination-port

    UDP destination port to communicate to the remote VXLAN tunnel endpoint.

    		multicast-snoopingbridge.multicast-snooping
    macbridge.mac-address

    ip4, gw4

    IPv4 addresses.

    		prioritybridge-port.priority

    ip6, gw6

    IPv6 addresses.

    		path-costbridge-port.path-cost

    --

    If a -- argument is encountered, the rest of command - line is interpreted as property list in the same format as connection - modify command accepts. This makes it possible to adjust the - connection properties before it's added.

    		hairpinbridge-port.hairpin-mode
    - - - -

    - edit - { - [ id | uuid | path ] - ID... - | - [type type] - [con-name name] - } -

    - -

    Edit an existing connection or add a new one, using an interactive editor.

    -

    The existing connection is identified by its name, UUID or D-Bus path. If - ID is ambiguous, a keyword id, - uuid, or path can be used. See - connection show above for the description of the - ID-specifying keywords. Not providing an - ID means that a new connection will be added.

    -

    The interactive editor will guide you through the connection editing and - allow you to change connection parameters according to your needs by means of - a simple menu-driven interface. The editor indicates what settings and - properties can be modified and provides in-line help.

    -

    Available options:

    -
    + +
    +

    Table 15. VPN options

    +
    -+ + + + + - - + + - - - - -
    AliasProperty

    type

    type of the new connection; valid types are the same as for - connection add command.

    		vpn-typevpn.service-type

    con-name

    name for the new connection. It can be changed later in the editor.

    -

    See also - nm-settings(5) for all NetworkManager settings and property names, and their - descriptions; and - nmcli-examples(7) - for sample editor sessions.

    - - - -

    - modify - [--temporary] - [ id | uuid | path ] - ID - - [+|-]setting.property - value - ... -

    - -

    Modify one or more properties in the connection profile.

    -

    The connection is identified by its name, UUID or D-Bus path. If - ID is ambiguous, a keyword id, - uuid or path can be used. See - nm-settings(5) for setting and property names, their descriptions and default - values. This command supports abbreviations for setting - and property provided they are unique. Empty - value ("") removes the property value (sets - the property to the default value). The provided value overwrites the existing - property value.

    -

    If you want to append an item to the existing value, use - + prefix for the property name. If you want to remove just - one item from container-type property, use - prefix for - the property name and specify a value or an zero-based index of the item to - remove (or option name for properties with named options) as - value. Of course, + and - - only have a real effect for multi-value (container) - properties like ipv4.dns, ipv4.addresses, - bond.options, etc.

    - - - -

    - clone - [--temporary] - [ id | uuid | path ] - ID... - new name -

    - -

    Clone a connection. The connection to be cloned is identified by its - name, UUID or D-Bus path. If ID is ambiguous, a keyword - id, uuid or path - can be used. See connection show above for the description - of the ID-specifying keywords. name is - the name of the new cloned connection. The new connection will be the exact - copy except the connection.id (name) and - connection.uuid (generated) properties.

    -

    The new connection profile will be saved as persistent unless - --temporary option is specified, in which case the new profile - won't exist after NetworkManager restart.

    - - - -

    - delete - [ id | uuid | path ] - ID... -

    - -

    Delete a configured connection. The connection to be deleted is - identified by its name, UUID or D-Bus path. If ID is ambiguous, a - keyword id, uuid or path can be used. - See connection show above for the description of - the ID-specifying keywords.

    -

    If --wait option is not specified, the default timeout will be 10 - seconds.

    - - - -

    - monitor - [ id | uuid | path ] - ID... -

    - -

    Monitor connection profile activity. This command prints a line whenever - the specified connection changes. The connection to be monitored is identified - by its name, UUID or D-Bus path. If ID is ambiguous, a keyword - id, uuid or path - can be used. See connection show above for the description of the - ID-specifying keywords.

    -

    Monitors all connection profiles in case none is specified. The command - terminates when all monitored connections disappear. If you want to monitor - connection creation consider using the global monitor with nmcli - monitor command.

    - - - -

    - reload -

    -

    Reload all connection files from disk. - NetworkManager does not monitor changes to connection - files by default. So you need to use this command in order to tell - NetworkManager to re-read the connection profiles from - disk when a change was made to them. However, the auto-loading feature can be - enabled and then NetworkManager will reload connection - files any time they change (monitor-connection-files=true in - NetworkManager.conf(5)). -

    - - -

    - load - filename... -

    -

    Load/reload one or more connection files from disk. Use this after - manually editing a connection file to ensure that - NetworkManager is aware of its latest state.

    - - -

    - import - [--temporary] - [type type] - [file file] -

    - -

    Import an external/foreign configuration as a NetworkManager connection - profile. The type of the input file is specified by type - option.

    -

    Only VPN configurations are supported at the moment. The configuration is - imported by NetworkManager VPN plugins. type values are - the same as for vpn-type option in nmcli - connection add. VPN configurations are imported by VPN plugins. - Therefore the proper VPN plugin has to be installed so that nmcli could import - the data.

    -

    The imported connection profile will be saved as persistent unless - --temporary option is specified, in which case the new profile - won't exist after NetworkManager restart.

    - - - -

    - export - [ id | uuid | path ] - ID - [file] -

    - -

    Export a connection.

    -

    Only VPN connections are supported at the moment. A proper VPN plugin has - to be installed so that nmcli could export a connection. If no - file is provided, the VPN configuration - data will be printed to standard output.

    - +user +vpn.user-name
    -
    -

    Device Management Commands

    -

    nmcli device { status | show | set | connect | reapply | disconnect | delete | monitor | wifi | lldp } [ARGUMENTS...]

    -

    Show and manage network interfaces.

    -
    +
    +

    Table 16. OLPC Mesh options

    +
    -+ + + + + - - + + - - + + - - + + - - - + +
    AliasProperty

    status

    		 -

    Print status of devices.

    -

    This is the default action if no command is specified to - nmcli device.

    -    		ssidolpc-mesh.ssid

    - show - [ifname] -

    Show detailed information about devices. Without an argument, all - devices are examined. To get information for a specific device, the interface - name has to be provided.

    		channelolpc-mesh.channel

    - set - [ifname] - ifname - [ - autoconnect - { yes | no } - ] - [ - managed - { yes | no } - ] -

    Set device properties.

    		dhcp-anycastolpc-mesh.dhcp-anycast-address

    - connect - [ifname] -

    		-

    Connect the device. NetworkManager will try to find a suitable connection - that will be activated. It will also consider connections that are not set to - auto connect.

    -

    If --wait option is not specified, the default timeout will be 90 - seconds.

    -
    +
    +
    +

    Table 17. ADSL options

    +
    ++++ + + + + + + + + - - + + - - + + - - + + + +
    AliasProperty
    usernameadsl.username

    - reapply - [ifname] -

    Attempt to update device with changes to the currently active connection - made since it was last applied.

    		protocoladsl.protocol

    - disconnect - [ifname...] -

    		-

    Disconnect a device and prevent the device from automatically activating - further connections without user/manual intervention. Note that disconnecting - software devices may mean that the devices will disappear.

    -

    If --wait option is not specified, the default timeout - will be 10 seconds.

    -    		passwordadsl.password

    - delete - [ifname...] -

    		-

    Delete a device. The command removes the interface from the system. Note - that this only works for software devices like bonds, bridges, teams, etc. - Hardware devices (like Ethernet) cannot be deleted by the command.

    -

    If --wait option is not specified, the default timeout will be 10 - seconds.

    -    		encapsulationadsl.encapsulation
    +
    +
    +

    Table 18. MACVLAN options

    +
    ++++ + + + + + - - + + - - + + - - - - - - + +
    +

    Table 21. IP tunneling options

    +
    AliasProperty

    - monitor - [ifname...] -

    		-

    Monitor device activity. This command prints a line whenever the - specified devices change state.

    -

    Monitors all devices in case no interface is specified. The monitor - terminates when all specified devices disappear. If you want to monitor device - addition consider using the global monitor with nmcli - monitor command.

    -    		devmacvlan.parent

    - wifi - [ - list - [ifname ifname] - [bssid BSSID] - ] -

    List available Wi-Fi access points. The ifname and - bssid options can be used to list APs for a particular - interface or with a specific BSSID, respectively.

    		modemacvlan.mode

    - wifi - connect - (B)SSID - [password password] - [ - wep-key-type - { key | phrase } - ] - [ifname ifname] - [bssid BSSID] - [name name] - [ - private - { yes | no } - ] - [ - hidden - { yes | no } - ] -

    		-

    Connect to a Wi-Fi network specified by SSID or BSSID. The command - creates a new connection and then activates it on a device. This is a - command-line counterpart of clicking an SSID in a GUI client. The command - always creates a new connection and thus it is mainly useful for connecting to - new Wi-Fi networks. If a connection for the network already exists, it is - better to bring up (activate) the existing connection as follows: - nmcli con up id name. Note that - only open, WEP and WPA-PSK networks are supported at the moment. It is also - supposed that IP configuration is obtained via DHCP.

    -

    If --wait option is not specified, the default timeout will be 90 - seconds.

    -

    Available options are:

    -
    + + + + +
    tapmacvlan.tap
    + +
    +

    Table 19. VxLAN options

    +
    -+ + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
    AliasProperty

    password

    password for secured networks (WEP or WPA).

    		idvxlan.id

    wep-key-type

    type of WEP secret, either key for ASCII/HEX key or - phrase for passphrase.

    		remotevxlan.remote

    ifname

    interface that will be used for activation.

    		devvxlan.parent

    bssid

    if specified, the created connection will be restricted just for the - BSSID.

    		localvxlan.local

    name

    if specified, the connection will use the name (else NM creates a name - itself).

    		source-port-minvxlan.source-port-min

    private

    if set to yes, the connection will only be visible - to the user who created it. Otherwise the connection is system-wide, which is - the default.

    		source-port-maxvxlan.source-port-max

    hidden

    set to yes when connecting for the first time to an - AP not broadcasting its SSID. Otherwise the SSID would not be found and the - connection attempt would fail.

    		destination-portvxlan.destination-port
    -

    - wifi - hotspot - [ifname ifname] - [con-name name] - [ssid SSID] - [ - band - { a | bg } - ] - [channel channel] - [password password] -

    		-

    Create a Wi-Fi hotspot. The command creates a hotspot connection profile - according to Wi-Fi device capabilities and activates it on the device. The - hotspot is secured with WPA if device/driver supports that, otherwise WEP is - used. Use connection down or device - disconnect to stop the hotspot.

    -

    Parameters of the hotspot can be influenced by the optional - parameters:

    -
    + +
    +

    Table 20. Tun options

    +
    -+ + + + + - - + + - - + + - - + + - - + + - - + + - - + +
    AliasProperty

    ifname

    what Wi-Fi device is used.

    		modetun.mode

    con-name

    name of the created hotspot connection profile.

    		ownertun.owner

    ssid

    SSID of the hotspot.

    		grouptun.group

    band

    Wi-Fi band to use.

    		pitun.pi

    channel

    Wi-Fi channel to use.

    		vnet-hdrtun.vnet-hdr

    password

    		 -

    password to use for the created hotspot. If not provided, nmcli will - generate a password. The password is either WPA pre-shared key or WEP - key.

    -

    Note that --show-secrets global option can be used to - print the hotspot password. It is useful especially when the password was - generated.

    -    		multi-queuetun.multi-queue
    -
    ++++ + + + + + + + + - - + + - - + + + + + +
    AliasProperty
    modeip-tunnel.mode

    - wifi - rescan - [ifname ifname] - [ssid SSID...] -

    		-

    Request that NetworkManager immediately re-scan for - available access points. NetworkManager scans Wi-Fi networks periodically, but - in some cases it can be useful to start scanning manually (e.g. after resuming - the computer). By using ssid, it is possible to scan for a - specific SSID, which is useful for APs with hidden SSIDs. You can provide - multiple ssid parameters in order to scan more - SSIDs.

    -

    This command does not show the APs, use nmcli device wifi list - for that.

    -    		localip-tunnel.local

    - lldp - [ - list - [ifname ifname] - ] -

    Display information about neighboring devices learned through the Link - Layer Discovery Protocol (LLDP). The ifname option can be - used to list neighbors only for a given interface. The protocol must be enabled - in the connection settings.

    		remoteip-tunnel.remote
    devip-tunnel.parent
    -
    -

    Secret Agent

    -

    nmcli agent { secret | polkit | all }

    -

    Run nmcli as a NetworkManager secret agent, or polkit agent.

    -
    +
    +

    Table 22. IPv4 options

    +
    -++ + + + + + - - + + + - - + + + + + +
    AliasPropertyNote

    secret

    Register nmcli as a NetworkManager secret agent and listen for secret - requests. You do usually not need this command, because nmcli can handle - secrets when connecting to networks. However, you may find the command useful - when you use another tool for activating connections and you do not have a - secret agent available (like nm-applet).

    		ip4ipv4.addressesThis option can be specified multiple times. +It's equivalent of using +ipv4.addresses syntax.

    - polkit -

    Register nmcli as a polkit agent for the user session and listen for - authorization requests. You do not usually need this command, because nmcli can - handle polkit actions related to NetworkManager operations (when run with - --ask). However, you may find the command useful when you want - to run a simple text based polkit agent and you do not have an agent of a desktop - environment. Note that running this command makes nmcli handle all polkit requests, - not only NetworkManager related ones, because only one polkit agent can run for the - session.

    		gw4ipv4.gateway 
    +
    +
    +

    Table 23. IPv6 options

    +
    +++++ + + + + + + + + + + - - + + +
    AliasPropertyNote
    ip6ipv6.addressesThis option can be specified multiple times. +It's equivalent of using +ipv6.addresses syntax.

    - all -

    Runs nmcli as both NetworkManager secret and a polkit agent.

    		gw6ipv6.gateway 
    +
    +

    Environment Variables

    nmcli's behavior is affected by the following @@ -2069,6 +2012,10 @@

    10

    Connection, device, or access point does not exist.

    + +

    65

    +

    When used with --complete-args option, a file name is expected to follow.

    +
    @@ -2076,7 +2023,7 @@

    Examples

    This section presents various examples of nmcli usage. If you want even more, please refer to - nmcli-examples(7) + nmcli-examples(7) manual page.

    @@ -2183,6 +2130,16 @@ the user should use to connect to the hotspot from other devices.

    + + + + + + + + - + @@ -2255,16 +2212,16 @@

    See Also

    -

    nmcli-examples(7), - nm-online(1), - NetworkManager(8), - NetworkManager.conf(5), - nm-settings(5), +

    nmcli-examples(7), + nm-online(1), + NetworkManager(8), + NetworkManager.conf(5), + nm-settings(5), nm-applet(1), nm-connection-editor(1).

    -
    Generated by GTK-Doc V1.24
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff --git a/docs/api/html/nmtui.html b/docs/api/html/nmtui.html index 80e5c700..ee67dbbb 100644 --- a/docs/api/html/nmtui.html +++ b/docs/api/html/nmtui.html @@ -8,7 +8,7 @@ - + @@ -76,13 +76,13 @@

    See Also

    -

    nmcli(1), +

    nmcli(1), nm-applet(1), nm-connection-editor(1), - NetworkManager(8).

    + NetworkManager(8).

    -
    Generated by GTK-Doc V1.24
    +
    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 fe268fe0..dd29c91c 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -8,7 +8,7 @@ - + @@ -37,7 +37,7 @@

    Configuration Settings

    -

    Table 58. 802-1x setting

    +

    Table 81. 802-1x setting

    nmcli dev modify em1 ipv4.method shared

    starts IPv4 connection sharing using em1 device. The sharing will be active + until the device is disconnected.

    nmcli dev modify em1 ipv6.address 2001:db8::a:bad:c0de

    temporarily adds an IP address to a device. The address will be removed + when the same connection is activated again.

    nmcli connection add type ethernet autoconnect no ifname eth0

    non-interactively adds an Ethernet connection tied to eth0 interface with automatic IP configuration (DHCP), and disables the connection's autoconnect @@ -2194,7 +2151,7 @@ use eth0 and the VLAN interface will be named Maxipes-fik.

    nmcli c a ifname eth0 type ethernet -- ipv4.method disabled ipv6.method link-local

    nmcli c a ifname eth0 type ethernet ipv4.method disabled ipv6.method link-local

    non-interactively adds a connection that will use eth0 Ethernet interface and only have an IPv6 link-local address configured.
    @@ -267,7 +267,7 @@


    -

    Table 59. adsl setting

    +

    Table 82. adsl setting

    @@ -335,7 +335,7 @@


    -

    Table 60. bluetooth setting

    +

    Table 83. bluetooth setting

    @@ -373,7 +373,7 @@


    -

    Table 61. bond setting

    +

    Table 84. bond setting

    @@ -411,7 +411,7 @@


    -

    Table 62. bridge setting

    +

    Table 85. bridge setting

    @@ -491,7 +491,7 @@


    -

    Table 63. bridge-port setting

    +

    Table 86. bridge-port setting

    @@ -535,7 +535,7 @@


    -

    Table 64. cdma setting

    +

    Table 87. cdma setting

    @@ -585,7 +585,7 @@


    -

    Table 65. connection setting

    +

    Table 88. connection setting

    @@ -685,6 +685,12 @@ + + + + + + @@ -713,7 +719,7 @@


    -

    Table 66. dcb setting

    +

    Table 89. dcb setting

    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
    		This token to generate stable IDs for the connection. If unset, the UUID will be used instead. The stable-id is used instead of the connection UUID 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.
    
 
    timestamp
    		
 
    uint64
    		
 
    0
    		
 
 
    @@ -829,7 +835,7 @@
 

    
-
    Table 67. generic setting
    
+
    Table 90. generic setting
    
 
    
 
 

 
 
    @@ -853,7 +859,7 @@
 

    
-
    Table 68. gsm setting
    
+
    Table 91. gsm setting
    
 
    
 
 

 
 
    @@ -951,7 +957,7 @@
 

    
-
    Table 69. infiniband setting
    
+
    Table 92. infiniband setting
    
 
    
 
 

 
 
    @@ -1007,7 +1013,7 @@
 

    
-
    Table 70. ipv4 setting
    
+
    Table 93. ipv4 setting
    
 
    
 
 

 
 
    @@ -1159,7 +1165,7 @@
 

    
-
    Table 71. ipv6 setting
    
+
    Table 94. ipv6 setting
    
 
    
 
 

 
 
    @@ -1306,12 +1312,18 @@
 
+
+
+
+
+
+
    
 
 

    []
    		
 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 72. ip-tunnel setting
    
+
    Table 95. ip-tunnel setting
    
 
    @@ -1409,7 +1421,7 @@
 

    
-
    Table 73. macvlan setting
    
+
    Table 96. macvlan setting
    
 
    
 
 

 
 
    @@ -1459,7 +1471,7 @@
 

    
-
    Table 74. 802-11-olpc-mesh setting
    
+
    Table 97. 802-11-olpc-mesh setting
    
 
    
 
 

 
 
    @@ -1503,7 +1515,7 @@
 

    
-
    Table 75. ppp setting
    
+
    Table 98. ppp setting
    
 
    
 
 

 
 
    @@ -1637,7 +1649,7 @@
 

    
-
    Table 76. pppoe setting
    
+
    Table 99. pppoe setting
    
 
    
 
 

 
 
    @@ -1687,7 +1699,7 @@
 

    
-
    Table 77. serial setting
    
+
    Table 100. serial setting
    
 
    
 
 

 
 
    @@ -1743,7 +1755,7 @@
 

    
-
    Table 78. team setting
    
+
    Table 101. team setting
    
 
    
 
 

 
 
    @@ -1781,7 +1793,7 @@
 

    
-
    Table 79. team-port setting
    
+
    Table 102. team-port setting
    
 
    
 
 

 
 
    @@ -1813,7 +1825,7 @@
 

    
-
    Table 80. tun setting
    
+
    Table 103. tun setting
    
 
    
 
 

 
 
    @@ -1875,7 +1887,7 @@
 

    
-
    Table 81. vlan setting
    
+
    Table 104. vlan setting
    
 
    
 
 

 
 
    @@ -1937,7 +1949,7 @@
 

    
-
    Table 82. vpn setting
    
+
    Table 105. vpn setting
    
 
    
 
 

 
 
    @@ -1999,7 +2011,7 @@
 

    
-
    Table 83. vxlan setting
    
+
    Table 106. vxlan setting
    
 
    
 
 

 
 
    @@ -2121,7 +2133,7 @@
 

    
-
    Table 84. wimax setting
    
+
    Table 107. wimax setting
    
 
    
 
 

 
 
    @@ -2159,7 +2171,7 @@
 

    
-
    Table 85. 802-3-ethernet setting
    
+
    Table 108. 802-3-ethernet setting
    
 
    
 
 

 
 
    @@ -2175,6 +2187,12 @@
 
+
+
+
+
+
+
@@ -2184,7 +2202,7 @@
 
-
+
@@ -2193,6 +2211,12 @@
 
+
+
+
+
+
+
@@ -2263,7 +2287,7 @@
 

    
-
    Table 86. 802-11-wireless setting
    
+
    Table 109. 802-11-wireless setting
    
 
    
 
 

 
 
    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.
    
 
    auto-negotiate
    		
 
    boolean
    		
 
    TRUE
    cloned-mac-address
    		
 
    byte array
    		
 
    		If specified, request that the device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.This D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random".
 
    
 
    
 
    duplex
    		If specified, request that the device only use the specified duplex mode. Either "half" or "full".
 
    
 
    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
    		
 
    		
 
 
    @@ -2279,6 +2303,12 @@
 
+
+
+
+
+
+
@@ -2300,7 +2330,13 @@
 
-
+
+
+
+
+
+
+
@@ -2324,7 +2360,7 @@
 
-
+
@@ -2385,7 +2421,7 @@
 

    
-
    Table 87. 802-11-wireless-security setting
    
+
    Table 110. 802-11-wireless-security setting
    
 
    
 
 

 
 
    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.
    
 
    band
    		
 
    string
    		
 
    cloned-mac-address
    		
 
    byte array
    		
 
    		If specified, request that the Wi-Fi device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.This D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random".
    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
    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).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). Deprecated: 1
 
    
 
    
 
    mode
    		
 
 
    @@ -2515,6 +2551,6 @@
 
    
-
    Generated by GTK-Doc V1.24
    
+
    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 fcaba3b3..d27eb23f 100644
--- a/docs/api/html/secrets-flags.html
+++ b/docs/api/html/secrets-flags.html
@@ -8,7 +8,7 @@
 
-
+
@@ -58,6 +58,6 @@
       
    
-
    Generated by GTK-Doc V1.24
    
+
    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 641e217c..20919a47 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -8,7 +8,7 @@
 
-
+
@@ -124,6 +124,9 @@
 
    
 org.freedesktop.NetworkManager.SecretAgent
 
    
+
    
+org.freedesktop.NetworkManager.Device.Statistics
+
    Types
    
@@ -143,6 +146,6 @@
 Interfaces
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    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 722e33fd..bb5ab004 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -98,6 +98,7 @@
       
       
       
+      
     
     
    
       Types
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index 22398ad1..7a3d2b4c 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -98,6 +98,7 @@
     read-onlybooleanFALSEFALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.
     secondariesarray of string[]List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.
     slave-typestringSetting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
+    stable-idstringThis token to generate stable IDs for the connection. If unset, the UUID will be used instead. The stable-id is used instead of the connection UUID 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.
     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 "-").
@@ -194,6 +195,7 @@
     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 Descriptionencapsulation-limituint320How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.
@@ -320,9 +322,11 @@
     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.auto-negotiatebooleanTRUEIf 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.
-    cloned-mac-addressbyte arrayIf specified, request that the device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.
+    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".duplexstringIf specified, request that the device only use the specified duplex mode. Either "half" or "full".
+    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.
@@ -336,14 +340,16 @@
     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.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 arrayIf specified, request that the Wi-Fi device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.
+    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".
+    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).
+    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). Deprecated: 1modestringWi-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".
diff --git a/docs/api/version.xml b/docs/api/version.xml
index e8ea05db..88c5fb89 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.2.4
+1.4.0
diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in
index 3d57fc8e..2251ce07 100644
--- a/docs/libnm-glib/Makefile.in
+++ b/docs/libnm-glib/Makefile.in
@@ -95,8 +95,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = docs/libnm-glib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -172,6 +173,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -228,13 +230,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -246,6 +249,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -306,6 +311,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -341,6 +348,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -806,7 +814,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
 	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -817,6 +825,17 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO
 sgml.stamp: sgml-build.stamp
 	@true
 
+xml/gtkdocentities.ent: Makefile
+	$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+	) > $@
+
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index 9b26174f..1233c3b4 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -8,7 +8,7 @@
 
-
+
@@ -297,7 +297,7 @@ nm_access_point_new (const char *path);
 
    Creates a new NMAccessPoint.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
     
     
     
     
     
     
     
     
     
 
 
 
 
 
    @@ -319,7 +319,7 @@ nm_access_point_new (
-
    Returns
    
+
    Returns
    
 
     a new access point. 
    
 
    [transfer full]
    
 
@@ -331,7 +331,7 @@ nm_access_point_new (NMAccessPoint *ap);
 
    Gets the flags of the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -346,7 +346,7 @@ nm_access_point_get_flags (
-
    Returns
    
+
    Returns
    
 
     the flags
    
 
 
@@ -357,7 +357,7 @@ nm_access_point_get_flags (NMAccessPoint *ap);
 
    Gets the WPA (version 1) flags of the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -372,7 +372,7 @@ nm_access_point_get_wpa_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the WPA flags
    
 
    
 
@@ -384,7 +384,7 @@ nm_access_point_get_rsn_flags (Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access
 point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -399,7 +399,7 @@ point.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the RSN flags
    
 
    
 
@@ -410,7 +410,7 @@ point.
    
 nm_access_point_get_ssid (NMAccessPoint *ap);
 
    Gets the SSID of the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -425,7 +425,7 @@ nm_access_point_get_ssid (
-
    Returns
    
+
    Returns
    
 
     the GByteArray containing the SSID. This is the internal copy used by the
 access point, and must not be modified.
    
 
@@ -437,7 +437,7 @@ access point, and must not be modified.
    
 nm_access_point_get_bssid (NMAccessPoint *ap);
 
    Gets the Basic Service Set ID (BSSID) of the Wi-Fi access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -452,7 +452,7 @@ nm_access_point_get_bssid (
-
    Returns
    
+
    Returns
    
 
     the BSSID of the access point. This is an internal string and must
 not be modified or freed.
    
 
@@ -464,7 +464,7 @@ not be modified or freed.
    
 nm_access_point_get_frequency (NMAccessPoint *ap);
 
    Gets the frequency of the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -479,7 +479,7 @@ nm_access_point_get_frequency (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the frequency
    
 
    
 
@@ -490,7 +490,7 @@ nm_access_point_get_frequency (NMAccessPoint *ap);
 
    Gets the mode of the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -505,7 +505,7 @@ nm_access_point_get_mode (
-
    Returns
    
+
    Returns
    
 
     the mode
    
 
 
@@ -516,7 +516,7 @@ nm_access_point_get_mode (NMAccessPoint *ap);
 
    Gets the maximum bit rate of the access point in kbit/s.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -531,7 +531,7 @@ nm_access_point_get_max_bitrate (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the maximum bit rate (kbit/s)
    
 
    
 
@@ -542,7 +542,7 @@ nm_access_point_get_max_bitrate (NMAccessPoint *ap);
 
    Gets the current signal strength of the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -557,7 +557,7 @@ nm_access_point_get_strength (
-
    Returns
    
+
    Returns
    
 
     the signal strength
    
 
 
@@ -570,7 +570,7 @@ nm_access_point_get_last_seen (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -585,7 +585,7 @@ point has not been found in a scan.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the last seen time in seconds
    
 
    
 
    Since: 1.2
    
@@ -606,7 +606,7 @@ use NMDevice using nm_device_filter_connections() and finally
 filter that list with this function.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -622,16 +622,16 @@ filter that list with this function.
    
+NMConnection objects to filter. 
    
 
 

 
    
 
    connections
    		
 
     a list of
-NMConnection objects to filter. 
    		
 [element-type NMConnection]
 
    
     
 
    
 
    
 
    
-
    Returns
    
+
    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
@@ -644,14 +644,14 @@ be freed with g_slist_free() when it is no longer
 
    nm_access_point_connection_valid ()
    
 
    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
 's SSID, (if given) BSSID, and other attributes like security settings,
 channel, band, etc.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -667,7 +667,7 @@ against
    
-
@@ -675,7 +675,7 @@ against
    
 
 

 
 
    
 
    connection
    an NMConnection to validate against ap
+
    an NMConnection to validate against ap
 
    		
  
 
    
 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection may be activated with this Wi-Fi AP,
 FALSE if it cannot be.
    
 
    
@@ -691,7 +691,7 @@ nm_access_point_get_hw_address (
 
    Gets the hardware (MAC) address of the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -706,7 +706,7 @@ nm_access_point_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address of the access point. This is the internal string used by the
 access point and must not be modified.
    
 
    
@@ -880,6 +880,6 @@ coordinator of the wireless network allowing clients to connect) or
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index 895f4e7b..ce4d852e 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -354,7 +354,7 @@ nm_active_connection_new (const char *path);
 
    Creates a new NMActiveConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -376,7 +376,7 @@ nm_active_connection_new (
-
    Returns
    
+
    Returns
    
 
     a new active connection. 
    
 
    [transfer full]
    
 
@@ -386,11 +386,11 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -405,8 +405,8 @@ nm_active_connection_get_connection (
 
 
    
-
    Returns
    
-
     the object path of the NMConnection which this NMActiveConnection
+
    Returns
    
+
     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,9 +416,9 @@ 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
    
+
    Parameters
    
 
    
 
 

    @@ -433,8 +433,8 @@ nm_active_connection_get_id (
-
    Returns
    
-
     the ID of the NMConnection that backs the NMActiveConnection.
+
    Returns
    
+
     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,9 +444,9 @@ 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
    
+
    Parameters
    
 
    
 
 

    @@ -461,8 +461,8 @@ nm_active_connection_get_uuid (
 
 
    
-
    Returns
    
-
     the UUID of the NMConnection that backs the NMActiveConnection.
+
    Returns
    
+
     the UUID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.
    
 
    
 
@@ -472,9 +472,9 @@ 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
    
+
    Parameters
    
 
    
 
 

    @@ -489,8 +489,8 @@ nm_active_connection_get_connection_type
 
    
 
 

    
 
    
 
    
-
    Returns
    
-
     the type of the NMConnection that backs the NMActiveConnection.
+
    Returns
    
+
     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
    
@@ -503,7 +503,7 @@ nm_active_connection_get_specific_object
                                (NMActiveConnection *connection);
 
    Gets the "specific object" used at the activation.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -518,7 +518,7 @@ nm_active_connection_get_specific_object
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the specific object's DBus path. This is the internal string used by the
 connection, and must not be modified.
    
 
    
@@ -528,9 +528,9 @@ connection, and must not be modified.
    
 
    nm_active_connection_get_devices ()
    
 
    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
    
+
    Parameters
    
 
    @@ -545,8 +545,8 @@ nm_active_connection_get_devices (
 
 
    
-
    Returns
    
-
     the GPtrArray containing NMDevices.
+
    Returns
    
+
     the GPtrArray containing NMDevices.
 This is the internal copy used by the connection, and must not be modified. 
    
 
    [element-type NMDevice]
    
 
    
@@ -558,7 +558,7 @@ This is the internal copy used by the connection, and must not be modified. 
    
 nm_active_connection_get_state (NMActiveConnection *connection);
 
    Gets the active connection's state.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -573,7 +573,7 @@ nm_active_connection_get_state (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the state
    
 
    
 
@@ -584,7 +584,7 @@ nm_active_connection_get_state (NMActiveConnection *connection);
 
    Gets the path to the master NMDevice of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -599,7 +599,7 @@ nm_active_connection_get_master (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the path of the master NMDevice of the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.
    
 
    
@@ -612,7 +612,7 @@ nm_active_connection_get_default (Whether the active connection is the default IPv4 one (that is, is used for
 the default IPv4 route and DNS information).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -627,7 +627,7 @@ the default IPv4 route and DNS information).
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the active connection is the default IPv4 connection
    
 
    
 
    
@@ -638,7 +638,7 @@ the default IPv4 route and DNS information).
    
 nm_active_connection_get_ip4_config (NMActiveConnection *connection);
 
    Gets the current NMIP4Config associated with the NMActiveConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -653,7 +653,7 @@ nm_active_connection_get_ip4_config (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMIP4Config, or NULL if the
 connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 
    
@@ -669,7 +669,7 @@ nm_active_connection_get_dhcp4_config (NMDHCP4Config (if any) associated with the
 NMActiveConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -684,7 +684,7 @@ nm_active_connection_get_dhcp4_config (
-
    Returns
    
+
    Returns
    
 
     the NMDHCP4Config, or NULL if the
 connection does not use DHCP, or is not in the
 NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 
    
@@ -700,7 +700,7 @@ nm_active_connection_get_default6 (Whether the active connection is the default IPv6 one (that is, is used for
 the default IPv6 route and DNS information).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -715,7 +715,7 @@ the default IPv6 route and DNS information).
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the active connection is the default IPv6 connection
    
 
    
 
@@ -726,7 +726,7 @@ the default IPv6 route and DNS information).
    
 nm_active_connection_get_ip6_config (NMActiveConnection *connection);
 
    Gets the current NMIP6Config associated with the NMActiveConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -741,7 +741,7 @@ nm_active_connection_get_ip6_config (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMIP6Config, or NULL if the
 connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 
    
@@ -757,7 +757,7 @@ nm_active_connection_get_dhcp6_config (NMDHCP6Config (if any) associated with the
 NMActiveConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -772,7 +772,7 @@ nm_active_connection_get_dhcp6_config (
-
    Returns
    
+
    Returns
    
 
     the NMDHCP6Config, or NULL if the
 connection does not use DHCPv6, or is not in the
 NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 
    
@@ -787,7 +787,7 @@ connection does not use DHCPv6, or is not in the
 nm_active_connection_get_vpn (NMActiveConnection *connection);
 
    Whether the active connection is a VPN connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -802,7 +802,7 @@ nm_active_connection_get_vpn (
-
    Returns
    
+
    Returns
    
 
     TRUE if the active connection is a VPN connection
    
 
 
    Since: 0.9.10
    
@@ -1026,6 +1026,6 @@ nm_active_connection_get_vpn (
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 141c56ba..30f6f640 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -606,7 +606,7 @@
 nm_client_error_quark (void);
 
    Registers an error quark for NMClient if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMClient errors.
    
 
    
 
    Since: 0.9.10
    
@@ -624,7 +624,7 @@ that.
    
 control them.  To access and modify network configuration data, use the
 NMRemoteSettings object.
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new NMClient or NULL on an error
    
 
    
 
@@ -644,7 +644,7 @@ the callback can be invoked with two first parameters as NULL.
    
 control them.  To access and modify network configuration data, use the
 NMRemoteSettings object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -680,7 +680,7 @@ nm_client_new_finish (GAsyncResul
                       GError **error);
 
    Gets the result of an nm_client_new_async() call.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -702,7 +702,7 @@ nm_client_new_finish (GAsyncResul
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new NMClient, or NULL on error
    
 
    
 
@@ -716,7 +716,7 @@ nm_client_get_devices (nm_device_ethernet_get_hw_address().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -731,9 +731,9 @@ methods such as 
-
    Returns
    
+
    Returns
     a GPtrArray
-containing all the NMDevices.  The returned array is owned by the
+containing all the NMDevices.  The returned array is owned by the
 NMClient object and should not be modified. 
    [transfer none][element-type NMDevice]
    
@@ -752,7 +752,7 @@ a placeholder.
    
 what kind of device each member of the returned array is, and then you may
 use device-specific methods such as nm_device_ethernet_get_hw_address().
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
    @@ -767,9 +767,9 @@ use device-specific methods such as 
-
    Returns
    
+
    Returns
     a GPtrArray
-containing all the NMDevices.  The returned array is owned by the
+containing all the NMDevices.  The returned array is owned by the
 NMClient object and should not be modified. 
    [transfer none][element-type NMDevice]
    
@@ -783,7 +783,7 @@ nm_client_get_device_by_path (const char *object_path);
 
    Gets a NMDevice from a NMClient.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
    @@ -805,7 +805,7 @@ nm_client_get_device_by_path (
-
    Returns
    
+
    Returns
    
 
     the NMDevice for the given object_path
 or NULL if none is found. 
    
 
    [transfer none]
    
@@ -819,7 +819,7 @@ nm_client_get_device_by_iface (const char *iface);
 
    Gets a NMDevice from a NMClient.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -841,7 +841,7 @@ nm_client_get_device_by_iface (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMDevice for the given iface
 or NULL if none is found. 
    
 
    [transfer none]
    
@@ -861,7 +861,7 @@ or NULL if none is found. 
    
 
    nm_client_activate_connection ()
    
 
    void
 nm_client_activate_connection (NMClient *client,
-                               NMConnection *connection,
+                               NMConnection *connection,
                                NMDevice *device,
                                const char *specific_object,
                                NMClientActivateFn callback,
@@ -884,7 +884,7 @@ the new connection, not when it finishes. You can used the returned
 NMActiveConnection object (in particular, “state”) to
 track the activation to its completion.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -899,7 +899,7 @@ track the activation to its completion.
    
 
     
-
+
@@ -948,7 +948,7 @@ details of the newly added connection. 
    
 
    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,
@@ -962,7 +962,7 @@ the new connection, not when it finishes. You can used the returned
 NMActiveConnection object (in particular, “state”) to
 track the activation to its completion.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    
 
    connection
     an NMConnection. 
     an NMConnection. 
    		
 [allow-none]
 
    
 
    @@ -977,7 +977,7 @@ track the activation to its completion.
    
 
     
-
    enum NMRemoteSettingsError
    
 
    Describes errors that may result from operations involving a NMRemoteSettings.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    
 
    partial
     an NMConnection to add; the connection may be
+
     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
@@ -1023,7 +1023,7 @@ nm_client_deactivate_connection (NMActiveConnection *active);
 
    Deactivates an active NMActiveConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1052,7 +1052,7 @@ nm_client_deactivate_connection (NMClient *client);
 
    Whether networking is enabled or disabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1067,7 +1067,7 @@ nm_client_networking_get_enabled (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if networking is enabled, FALSE if networking is disabled
    
 
    
 
@@ -1081,7 +1081,7 @@ nm_client_networking_set_enabled (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1110,7 +1110,7 @@ all controlled interfaces are available for activation.
    
 nm_client_wireless_get_enabled (NMClient *client);
 
    Determines whether the wireless is enabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1125,7 +1125,7 @@ nm_client_wireless_get_enabled (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if wireless is enabled
    
 
    
 
@@ -1137,7 +1137,7 @@ nm_client_wireless_set_enabled (gboolean enabled);
 
    Enables or disables wireless devices.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1167,7 +1167,7 @@ nm_client_wireless_hardware_get_enabled
                                (NMClient *client);
 
    Determines whether the wireless hardware is enabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1182,7 +1182,7 @@ nm_client_wireless_hardware_get_enabled
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the wireless hardware is enabled
    
 
    
 
@@ -1193,7 +1193,7 @@ nm_client_wireless_hardware_get_enabled
 nm_client_wwan_get_enabled (NMClient *client);
 
    Determines whether WWAN is enabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1208,7 +1208,7 @@ nm_client_wwan_get_enabled (
-
    Returns
    
+
    Returns
    
 
     TRUE if WWAN is enabled
    
 
 
@@ -1220,7 +1220,7 @@ nm_client_wwan_set_enabled (gboolean enabled);
 
    Enables or disables WWAN devices.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1249,7 +1249,7 @@ nm_client_wwan_set_enabled (NMClient *client);
 
    Determines whether the WWAN hardware is enabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1264,7 +1264,7 @@ nm_client_wwan_hardware_get_enabled (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the WWAN hardware is enabled
    
 
    
 
@@ -1275,7 +1275,7 @@ nm_client_wwan_hardware_get_enabled (NMClient *client);
 
    Determines whether WiMAX is enabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1290,7 +1290,7 @@ nm_client_wimax_get_enabled (
-
    Returns
    
+
    Returns
    
 
     TRUE if WiMAX is enabled
    
 
 
@@ -1302,7 +1302,7 @@ nm_client_wimax_set_enabled (gboolean enabled);
 
    Enables or disables WiMAX devices.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1331,7 +1331,7 @@ nm_client_wimax_set_enabled (NMClient *client);
 
    Determines whether the WiMAX hardware is enabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1346,7 +1346,7 @@ nm_client_wimax_hardware_get_enabled (
-
    Returns
    
+
    Returns
    
 
     TRUE if the WiMAX hardware is enabled
    
 
 
@@ -1357,7 +1357,7 @@ nm_client_wimax_hardware_get_enabled (NMClient *client);
 
    Gets NetworkManager version.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1372,7 +1372,7 @@ nm_client_get_version (
-
    Returns
    
+
    Returns
    
 
     string with the version
    
 
 
@@ -1383,7 +1383,7 @@ nm_client_get_version (NMClient *client);
 
    Gets the current daemon state.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1398,7 +1398,7 @@ nm_client_get_state (
-
    Returns
    
+
    Returns
    
 
     the current NMState
    
 
 
@@ -1410,7 +1410,7 @@ nm_client_get_startup (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1425,7 +1425,7 @@ connections at startup.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     whether the daemon is still starting up
    
 
    
 
    Since: 0.9.10
    
@@ -1437,7 +1437,7 @@ connections at startup.
    
 nm_client_get_manager_running (NMClient *client);
 
    Determines whether the daemon is running.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1452,7 +1452,7 @@ nm_client_get_manager_running (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the daemon is running
    
 
    
 
@@ -1463,7 +1463,7 @@ nm_client_get_manager_running (NMClient *client);
 
    Gets the active connections.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1478,9 +1478,9 @@ nm_client_get_active_connections (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a GPtrArray
-containing all the active NMActiveConnections.
+containing all the active NMActiveConnections.
 The returned array is owned by the client and should not be modified. 
    
 
    [transfer none][element-type NMActiveConnection]
    
 
    
@@ -1493,7 +1493,7 @@ nm_client_sleep (gboolean sleep_);
 
    Deprecated; use nm_client_networking_set_enabled() instead.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1524,7 +1524,7 @@ nm_client_get_permission_result (Requests the result of a specific permission, which indicates whether the
 client can or cannot perform the action the permission represents
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1546,7 +1546,7 @@ client can or cannot perform the action the permission represents
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the permission's result, one of NMClientPermissionResult
    
 
    
 
@@ -1560,7 +1560,7 @@ nm_client_get_logging (GError **error);
 
    Gets NetworkManager current logging level and domains.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1593,7 +1593,7 @@ a list of domains separated by ",". 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE otherwise
    
 
    
 
    Since: 0.9.8
    
@@ -1608,7 +1608,7 @@ nm_client_set_logging (GError **error);
 
    Sets NetworkManager logging level and/or domains.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1641,7 +1641,7 @@ domains separated by ",". (NULL or an empty string
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE otherwise
    
 
    
 
    Since: 0.9.8
    
@@ -1656,7 +1656,7 @@ nm_client_get_connectivity (nm_client_check_connectivity_async(), which re-check the
 connectivity state first before returning any information.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1671,7 +1671,7 @@ connectivity state first before returning any information.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the current connectivity state
    
 
    
 
    Since: 0.9.8.6
    
@@ -1689,7 +1689,7 @@ the most recent known state without re-checking.
    
 
    This is a blocking call; use nm_client_check_connectivity_async()
 if you do not want to block.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1716,7 +1716,7 @@ if you do not want to block.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the (new) current connectivity state
    
 
    
 
    Since: 0.9.8.6
    
@@ -1735,7 +1735,7 @@ nm_client_check_connectivity_async (nm_client_check_connectivity(), which blocks.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1779,7 +1779,7 @@ nm_client_check_connectivity_finish (Retrieves the result of an nm_client_check_connectivity_async()
 call.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1806,7 +1806,7 @@ call.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the (new) current connectivity state
    
 
    
 
    Since: 0.9.8.6
    
@@ -1826,7 +1826,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1841,7 +1841,7 @@ non-NetworkManager-recognized device, this will return NUL
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the appropriate NMActiveConnection, if
 any. 
    
 
    [transfer none]
    
@@ -1857,7 +1857,7 @@ nm_client_get_activating_connection (“primary-connection” upon successful activation.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1872,7 +1872,7 @@ currently-activating connection that is expected to become the new
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the appropriate NMActiveConnection, if
 any. 
    
 
    [transfer none]
    
@@ -1989,7 +1989,7 @@ any. 
    
 
    NMClientPermission values indicate various permissions that NetworkManager
 clients can obtain to perform certain tasks on behalf of the current user.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -2109,6 +2109,21 @@ clients can obtain to perform certain tasks on behalf of the current user.
    
+
+
+
+
+
+
+
+
+
+
    gboolean
 nm_remote_settings_add_connection_unsaved
                                (NMRemoteSettings *settings,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 NMRemoteSettingsAddConnectionFunc callback,
                                 gpointer user_data);
    Requests that the remote settings service add the given settings to a new
@@ -793,7 +793,7 @@ 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()
 method.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
     
 
    
 
    NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK
    		
+
    permission to create checkpoints.
    
+    		 
    NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS
    		
+
    controls whether device
+ statistics can be globally enabled or disabled
    
+    		 
    
 
    NM_CLIENT_PERMISSION_LAST
    		
 
 
    a reserved boundary value
    
@@ -2125,7 +2140,7 @@ clients can obtain to perform certain tasks on behalf of the current user.
    
 
    NMClientPermissionResult values indicate what authorizations and permissions
 the user requires to obtain a given NMClientPermission
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -2172,7 +2187,7 @@ the user requires to obtain a given 
    enum NMClientError
    Describes errors that may result from operations involving a NMClient.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -2361,7 +2376,7 @@ user_function (Notifies that a NMDevice is added.  This signal is emitted for both
 regular devices and placeholder devices.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2399,7 +2414,7 @@ user_function (Notifies that a NMDevice is removed.  This signal is emitted for both
 regular devices and placeholder devices.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2437,7 +2452,7 @@ user_function (Notifies that a NMDevice is added.  This signal is not emitted for
 placeholder devices.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2475,7 +2490,7 @@ user_function (Notifies that a NMDevice is removed.  This signal is not emitted for
 placeholder devices.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2513,7 +2528,7 @@ user_function (gpointer  user_data)
 
    Notifies that a permission has changed
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2549,6 +2564,6 @@ user_function (
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html
index 87c74fef..2de212cd 100644
--- a/docs/libnm-glib/html/NMDHCP4Config.html
+++ b/docs/libnm-glib/html/NMDHCP4Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -115,7 +115,7 @@ nm_dhcp4_config_new (    const char *object_path);
 
    Creates a new NMDHCP4Config.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -137,7 +137,7 @@ nm_dhcp4_config_new (
-
    Returns
    
+
    Returns
    
 
     a new configuration. 
    
 
    [transfer full]
    
 
@@ -149,7 +149,7 @@ nm_dhcp4_config_new (NMDHCP4Config *config);
 
    Gets all the options contained in the configuration.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -164,7 +164,7 @@ nm_dhcp4_config_get_options (
-
    Returns
    
+
    Returns
    
 
     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]
    
@@ -178,7 +178,7 @@ nm_dhcp4_config_get_one_option (const char *option);
 
    Gets one option by option name.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -200,7 +200,7 @@ nm_dhcp4_config_get_one_option (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the configuration option's value. This is the internal string used by the
 configuration, and must not be modified.
    
 
    
@@ -226,6 +226,6 @@ configuration, and must not be modified.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html
index 7b322c5e..0781de73 100644
--- a/docs/libnm-glib/html/NMDHCP6Config.html
+++ b/docs/libnm-glib/html/NMDHCP6Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -115,7 +115,7 @@ nm_dhcp6_config_new (const char *object_path);
 
    Creates a new NMDHCP6Config.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -137,7 +137,7 @@ nm_dhcp6_config_new (
-
    Returns
    
+
    Returns
    
 
     a new configuration. 
    
 
    [transfer full]
    
 
@@ -149,7 +149,7 @@ nm_dhcp6_config_new (NMDHCP6Config *config);
 
    Gets all the options contained in the configuration.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -164,7 +164,7 @@ nm_dhcp6_config_get_options (
-
    Returns
    
+
    Returns
    
 
     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]
    
@@ -178,7 +178,7 @@ nm_dhcp6_config_get_one_option (const char *option);
 
    Gets one option by option name.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -200,7 +200,7 @@ nm_dhcp6_config_get_one_option (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the configuration option's value. This is the internal string used by the
 configuration, and must not be modified.
    
 
    
@@ -226,6 +226,6 @@ configuration, and must not be modified.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index f92c1585..2ea3996f 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -668,7 +668,7 @@
 nm_device_error_quark (void);
 
    Registers an error quark for NMDevice if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDevice errors.
    
 
    
 
    Since: 0.9.10
    
@@ -681,7 +681,7 @@ nm_device_new (const char *path);
 
    Creates a new NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -703,7 +703,7 @@ nm_device_new (
-
    Returns
    
+
    Returns
    
 
     a new device. 
    
 
    [transfer full]
    
 
@@ -715,7 +715,7 @@ nm_device_new (NMDevice *device);
 
    Gets the interface name of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -730,7 +730,7 @@ nm_device_get_iface (
-
    Returns
    
+
    Returns
    
 
     the interface of the device. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -743,7 +743,7 @@ nm_device_get_ip_iface (NMDevice over which IP traffic flows
 when the device is in the ACTIVATED state.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -758,7 +758,7 @@ when the device is in the ACTIVATED state.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IP traffic interface of the device. This is the internal string
 used by the device, and must not be modified.
    
 
    
@@ -770,7 +770,7 @@ used by the device, and must not be modified.
    
 nm_device_get_device_type (NMDevice *device);
 
    Returns the numeric type of the NMDevice, ie Ethernet, Wi-Fi, etc.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -785,7 +785,7 @@ nm_device_get_device_type (
-
    Returns
    
+
    Returns
    
 
     the device type
    
 
 
@@ -796,7 +796,7 @@ nm_device_get_device_type (NMDevice *device);
 
    Gets the Unique Device Identifier of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -811,7 +811,7 @@ nm_device_get_udi (
-
    Returns
    
+
    Returns
    
 
     the Unique Device Identifier of the device.  This identifier may be
 used to gather more information about the device from various operating
 system services like udev or sysfs.
    
@@ -824,7 +824,7 @@ system services like udev or sysfs.
    
 nm_device_get_driver (NMDevice *device);
 
    Gets the driver of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -839,7 +839,7 @@ nm_device_get_driver (
-
    Returns
    
+
    Returns
    
 
     the driver of the device. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -851,7 +851,7 @@ device, and must not be modified.
    
 nm_device_get_driver_version (NMDevice *device);
 
    Gets the driver version of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -866,7 +866,7 @@ nm_device_get_driver_version (
-
    Returns
    
+
    Returns
    
 
     the version of the device driver. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -878,7 +878,7 @@ device, and must not be modified.
    
 nm_device_get_firmware_version (NMDevice *device);
 
    Gets the firmware version of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -893,7 +893,7 @@ nm_device_get_firmware_version (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the firmware version of the device. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -907,7 +907,7 @@ nm_device_get_type_description (device
  is.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -922,7 +922,7 @@ nm_device_get_type_description (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the type description of the device. This is the internal
 string used by the device, and must not be modified.
    
 
    
@@ -936,7 +936,7 @@ nm_device_get_hw_address (device
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -951,7 +951,7 @@ nm_device_get_hw_address (
-
    Returns
    
+
    Returns
    
 
     the current MAC of the device, or NULL.
 This is the internal string used by the device, and must not be modified.
    
 
@@ -964,7 +964,7 @@ This is the internal string used by the device, and must not be modified.
    
 nm_device_get_capabilities (NMDevice *device);
 
    Gets the device' capabilities.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -979,7 +979,7 @@ nm_device_get_capabilities (
-
    Returns
    
+
    Returns
    
 
     the capabilities
    
 
 
@@ -990,7 +990,7 @@ nm_device_get_capabilities (NMDevice *device);
 
    Whether the NMDevice is managed by NetworkManager.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1005,7 +1005,7 @@ nm_device_get_managed (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device is managed by NetworkManager
    
 
 
@@ -1017,7 +1017,7 @@ nm_device_set_managed (gboolean managed);
 
    Enables or disables management of  NMDevice by NetworkManager.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1047,7 +1047,7 @@ nm_device_set_managed (NMDevice *device);
 
    Whether the NMDevice can be autoconnected.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1062,7 +1062,7 @@ nm_device_get_autoconnect (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device is allowed to be autoconnected
    
 
 
@@ -1074,7 +1074,7 @@ nm_device_set_autoconnect (gboolean autoconnect);
 
    Enables or disables automatic activation of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1104,7 +1104,7 @@ nm_device_get_firmware_missing (Indicates that firmware required for the device's operation is likely
 to be missing.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1119,7 +1119,7 @@ to be missing.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if firmware required for the device's operation is likely
 to be missing.
    
 
    
@@ -1134,7 +1134,7 @@ nm_device_get_ip4_config (nm_active_connection_get_ip4_config(), which also works with VPN
 connections.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1149,7 +1149,7 @@ connections.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMIP4Config or NULL if the device is not activated. 
    
 
    [transfer none]
    
 
    
@@ -1164,7 +1164,7 @@ nm_device_get_dhcp4_config (nm_active_connection_get_dhcp4_config(), which also works with VPN
 connections.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1179,7 +1179,7 @@ connections.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMDHCP4Config or NULL if the device is not activated or not
 using DHCP. 
    
 
    [transfer none]
    
@@ -1195,7 +1195,7 @@ nm_device_get_ip6_config (nm_active_connection_get_ip6_config(), which also works with VPN
 connections.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1210,7 +1210,7 @@ connections.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMIP6Config or NULL if the device is not activated. 
    
 
    [transfer none]
    
 
    
@@ -1225,7 +1225,7 @@ nm_device_get_dhcp6_config (nm_active_connection_get_dhcp6_config(), which also works with VPN
 connections.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1240,7 +1240,7 @@ connections.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMDHCP6Config or NULL if the device is not activated or not
 using DHCP. 
    
 
    [transfer none]
    
@@ -1253,7 +1253,7 @@ using DHCP. 
    
 nm_device_get_state (NMDevice *device);
 
    Gets the current NMDevice state.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1268,7 +1268,7 @@ nm_device_get_state (
-
    Returns
    
+
    Returns
    
 
     the current device state
    
 
 
@@ -1282,7 +1282,7 @@ nm_device_get_state_reason (reason
  argument).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1304,7 +1304,7 @@ the state (reason
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the current device state
    
 
    
 
    
@@ -1315,7 +1315,7 @@ the state (reason
 nm_device_get_active_connection (NMDevice *device);
 
    Gets the NMActiveConnection object which owns this device during activation.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1330,7 +1330,7 @@ nm_device_get_active_connection (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMActiveConnection or NULL if the device is
 not part of an active connection. 
    
 
    [transfer none]
    
@@ -1341,11 +1341,11 @@ not part of an active connection. 
    
 
    nm_device_get_available_connections ()
    
 
    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
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1360,9 +1360,9 @@ be activated on device
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the GPtrArray
-containing NMRemoteConnections. This is the internal copy used by
+containing NMRemoteConnections. This is the internal copy used by
 the connection, and must not be modified. 
    
 
    [element-type NMRemoteConnection]
    
 
    
@@ -1375,10 +1375,10 @@ the connection, and must not be modified. 
    
 nm_device_get_physical_port_id (NMDevice *device);
 
    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
    
+
    Parameters
    
 
    @@ -1393,7 +1393,7 @@ ports on a single physical port. (Eg, NPAR / SR-IOV.)
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     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.
    
@@ -1407,7 +1407,7 @@ must not be modified.
    
 nm_device_get_mtu (NMDevice *device);
 
    Gets the  MTU of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1422,7 +1422,7 @@ nm_device_get_mtu (
-
    Returns
    
+
    Returns
    
 
     the MTU of the device.
    
 
 
    Since: 0.9.10
    
@@ -1434,7 +1434,7 @@ nm_device_get_mtu (NMDevice *device);
 
    Whether the device is a software device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1449,7 +1449,7 @@ nm_device_is_software (
-
    Returns
    
+
    Returns
    
 
     TRUE if device
 is a software device, FALSE if it is a hardware device.
    
 
@@ -1461,7 +1461,7 @@ is a software device, FALSE if it is a hardware dev
 
    gboolean
 nm_device_is_real (NMDevice *device);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1476,7 +1476,7 @@ nm_device_is_real (
-
    Returns
    
+
    Returns
    
 
     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.
    
@@ -1490,7 +1490,7 @@ that could be automatically created by NetworkManager if one of its
 nm_device_get_product (NMDevice *device);
 
    Gets the product string of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1505,7 +1505,7 @@ nm_device_get_product (
-
    Returns
    
+
    Returns
    
 
     the product name of the device. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -1517,7 +1517,7 @@ device, and must not be modified.
    
 nm_device_get_vendor (NMDevice *device);
 
    Gets the vendor string of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1532,7 +1532,7 @@ nm_device_get_vendor (
-
    Returns
    
+
    Returns
    
 
     the vendor name of the device. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -1545,7 +1545,7 @@ nm_device_get_description (device
 , based on its vendor and product names.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1560,7 +1560,7 @@ nm_device_get_description (
-
    Returns
    
+
    Returns
    
 
     a description of device
 . If either the vendor or the
 product name is unknown, this returns the interface name.
    
@@ -1577,7 +1577,7 @@ nm_device_disambiguate_names (devices
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1600,7 +1600,7 @@ devices in devices
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the device names. 
    
 
    [transfer full][array zero-terminated=1]
    
 
    
@@ -1625,7 +1625,7 @@ nm_device_disconnect (
-
    Parameters
    
+
    Parameters
    
 
    @@ -1663,7 +1663,7 @@ nm_device_delete (gpointer user_data);
 
    Deletes the software device. Hardware devices can't be deleted.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1710,7 +1710,7 @@ Ethernet, Bluetooth, Wi-Fi WPA connections, or any other connection that is
 incompatible with the device. To get the full list of connections see
 nm_remote_settings_list_connections().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1725,16 +1725,16 @@ 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]
 
    
     
 
    
 
    
 
    
-
    Returns
    
+
    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
@@ -1747,7 +1747,7 @@ be freed with g_slist_free() when it is no longer
 
    nm_device_connection_valid ()
    
 
    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
@@ -1757,7 +1757,7 @@ network, and will not be valid if it describes a WPA network, or if it is
 an Ethernet, Bluetooth, WWAN, etc connection that is incompatible with the
 device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1773,7 +1773,7 @@ against
    
-
@@ -1781,7 +1781,7 @@ against
    
 
 

 
 
    
 
    connection
    an NMConnection to validate against device
+
    an NMConnection to validate against device
 
    		
  
 
    
 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection may be activated with this device, FALSE
 if is incompatible with the device's capabilities and characteristics.
    
 
    
@@ -1791,7 +1791,7 @@ if is incompatible with the device's capabilities and characteristics.
    
 
    nm_device_connection_compatible ()
    
 
    gboolean
 nm_device_connection_compatible (NMDevice *device,
-                                 NMConnection *connection,
+                                 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
@@ -1805,7 +1805,7 @@ device.
    
 compatibility of the given device and connection. But, in addition, it sets
 GError when FALSE is returned.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1821,7 +1821,7 @@ against
    
-
@@ -1834,7 +1834,7 @@ against
    
 
 

 
 
    
 
    connection
    an NMConnection to validate against device
+
    an NMConnection to validate against device
 
    		
  
 
    
 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection may be activated with this device, FALSE
 if is incompatible with the device's capabilities and characteristics.
    
 
    
@@ -1844,11 +1844,11 @@ if is incompatible with the device's capabilities and characteristics.
    
 
    nm_device_get_setting_type ()
    
 
    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
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1863,9 +1863,9 @@ that can be used on device
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     device
-'s associated NMSetting type
    
+'s associated NMSetting type
    
 
    
 
    Since: 0.9.10
    
 
    
@@ -1884,7 +1884,7 @@ that can be used on device
 
    
 
    enum NMDeviceError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -2275,7 +2275,7 @@ user_function (gpointer  user_data)
 
    Notifies the state change of a NMDevice.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2316,6 +2316,6 @@ user_function (
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceAdsl.html b/docs/libnm-glib/html/NMDeviceAdsl.html
index 3f108475..5d2f6c20 100644
--- a/docs/libnm-glib/html/NMDeviceAdsl.html
+++ b/docs/libnm-glib/html/NMDeviceAdsl.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -125,7 +125,7 @@
 nm_device_adsl_error_quark (void);
 
    Registers an error quark for NMDeviceAdsl if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceAdsl errors.
    
 
    
@@ -137,7 +137,7 @@ nm_device_adsl_new (const char *path);
 
    Creates a new NMDeviceAdsl.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -159,7 +159,7 @@ nm_device_adsl_new (
-
    Returns
    
+
    Returns
    
 
     a new device. 
    
 
    [transfer full]
    
 
@@ -171,7 +171,7 @@ nm_device_adsl_new (NMDeviceAdsl *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -186,7 +186,7 @@ nm_device_adsl_get_carrier (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
 
@@ -196,7 +196,7 @@ nm_device_adsl_get_carrier (
 
    enum NMDeviceAdslError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -254,6 +254,6 @@ nm_device_adsl_get_carrier (
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html
index 7659084c..7a0324d7 100644
--- a/docs/libnm-glib/html/NMDeviceBond.html
+++ b/docs/libnm-glib/html/NMDeviceBond.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -161,7 +161,7 @@
 nm_device_bond_error_quark (void);
 
    Registers an error quark for NMDeviceBond if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceBond errors.
    
 
    
 
@@ -173,7 +173,7 @@ nm_device_bond_new (const char *path);
 
    Creates a new NMDeviceBond.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -195,7 +195,7 @@ nm_device_bond_new (
-
    Returns
    
+
    Returns
    
 
     a new device. 
    
 
    [transfer full]
    
 
@@ -207,7 +207,7 @@ nm_device_bond_new (NMDeviceBond *device);
 
    Gets the hardware (MAC) address of the NMDeviceBond
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -222,7 +222,7 @@ nm_device_bond_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -234,7 +234,7 @@ device, and must not be modified.
    
 nm_device_bond_get_carrier (NMDeviceBond *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -249,7 +249,7 @@ nm_device_bond_get_carrier (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
 
@@ -261,7 +261,7 @@ nm_device_bond_get_slaves (device
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -276,9 +276,9 @@ nm_device_bond_get_slaves (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray containing
-NMDevices that are slaves of device
+NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 
    
 
    [element-type NMDevice]
    
@@ -291,7 +291,7 @@ copy used by the device, and must not be modified. 
    
 
    
 
    enum NMDeviceBondError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -384,6 +384,6 @@ copy used by the device, and must not be modified. 
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html
index f0af6d6a..01410536 100644
--- a/docs/libnm-glib/html/NMDeviceBridge.html
+++ b/docs/libnm-glib/html/NMDeviceBridge.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -161,7 +161,7 @@
 nm_device_bridge_error_quark (void);
 
    Registers an error quark for NMDeviceBridge if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceBridge errors.
    
 
    
 
    Since: 0.9.8
    
@@ -174,7 +174,7 @@ nm_device_bridge_new (const char *path);
 
    Creates a new NMDeviceBridge.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -196,7 +196,7 @@ nm_device_bridge_new (
-
    Returns
    
+
    Returns
    
 
     a new device. 
    
 
    [transfer full]
    
 
@@ -209,7 +209,7 @@ nm_device_bridge_new (NMDeviceBridge *device);
 
    Gets the hardware (MAC) address of the NMDeviceBridge
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -224,7 +224,7 @@ nm_device_bridge_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -237,7 +237,7 @@ device, and must not be modified.
    
 nm_device_bridge_get_carrier (NMDeviceBridge *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -252,7 +252,7 @@ nm_device_bridge_get_carrier (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
 
    Since: 0.9.8
    
@@ -265,7 +265,7 @@ nm_device_bridge_get_slaves (device
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -280,9 +280,9 @@ nm_device_bridge_get_slaves (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray containing
-NMDevices that are slaves of device
+NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 
    
 
    [element-type NMDevice]
    
@@ -295,7 +295,7 @@ copy used by the device, and must not be modified. 
    
 
    
 
    enum NMDeviceBridgeError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -391,6 +391,6 @@ copy used by the device, and must not be modified. 
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index 75e07531..5ac77ae3 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -161,7 +161,7 @@
 nm_device_bt_error_quark (void);
 
    Registers an error quark for NMDeviceBt if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceBt errors.
    
 
    
 
@@ -173,7 +173,7 @@ nm_device_bt_new (const char *path);
 
    Creates a new NMDeviceBt.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -195,7 +195,7 @@ nm_device_bt_new (
-
    Returns
    
+
    Returns
    
 
     a new device. 
    
 
    [transfer full]
    
 
@@ -207,7 +207,7 @@ nm_device_bt_new (NMDeviceBt *device);
 
    Gets the hardware (MAC) address of the NMDeviceBt
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -222,7 +222,7 @@ nm_device_bt_get_hw_address (
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -234,7 +234,7 @@ device, and must not be modified.
    
 nm_device_bt_get_name (NMDeviceBt *device);
 
    Gets the name of the NMDeviceBt.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -249,7 +249,7 @@ nm_device_bt_get_name (
-
    Returns
    
+
    Returns
    
 
     the name of the device
    
 
 
@@ -260,7 +260,7 @@ nm_device_bt_get_name (NMDeviceBt *device);
 
    Returns the Bluetooth device's usable capabilities.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -275,7 +275,7 @@ nm_device_bt_get_capabilities (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a combination of NMBluetoothCapabilities
    
 
    
 
@@ -285,7 +285,7 @@ nm_device_bt_get_capabilities (
 
    enum NMDeviceBtError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -392,6 +392,6 @@ nm_device_bt_get_capabilities (
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html
index 655a0441..693d60eb 100644
--- a/docs/libnm-glib/html/NMDeviceEthernet.html
+++ b/docs/libnm-glib/html/NMDeviceEthernet.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -178,7 +178,7 @@
 nm_device_ethernet_error_quark (void);
 
    Registers an error quark for NMDeviceEthernet if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceEthernet errors.
    
 
    
 
@@ -190,7 +190,7 @@ nm_device_ethernet_new (const char *path);
 
    Creates a new NMDeviceEthernet.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -212,7 +212,7 @@ nm_device_ethernet_new (
-
    Returns
    
+
    Returns
    
 
     a new device. 
    
 
    [transfer full]
    
 
@@ -224,7 +224,7 @@ nm_device_ethernet_new (NMDeviceEthernet *device);
 
    Gets the active hardware (MAC) address of the NMDeviceEthernet
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -239,7 +239,7 @@ nm_device_ethernet_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the active hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -252,7 +252,7 @@ nm_device_ethernet_get_permanent_hw_address
                                (NMDeviceEthernet *device);
 
    Gets the permanent hardware (MAC) address of the NMDeviceEthernet
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -267,7 +267,7 @@ nm_device_ethernet_get_permanent_hw_address
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the permanent hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -279,7 +279,7 @@ device, and must not be modified.
    
 nm_device_ethernet_get_speed (NMDeviceEthernet *device);
 
    Gets the speed of the NMDeviceEthernet.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -294,7 +294,7 @@ nm_device_ethernet_get_speed (
-
    Returns
    
+
    Returns
    
 
     the speed of the device
    
 
 
@@ -305,7 +305,7 @@ nm_device_ethernet_get_speed (NMDeviceEthernet *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -320,7 +320,7 @@ nm_device_ethernet_get_carrier (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
    
 
@@ -330,7 +330,7 @@ nm_device_ethernet_get_carrier (
 
    enum NMDeviceEthernetError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -444,6 +444,6 @@ nm_device_ethernet_get_carrier (
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceGeneric.html b/docs/libnm-glib/html/NMDeviceGeneric.html
index 58b7c9ca..154ac5e0 100644
--- a/docs/libnm-glib/html/NMDeviceGeneric.html
+++ b/docs/libnm-glib/html/NMDeviceGeneric.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -137,7 +137,7 @@
 nm_device_generic_error_quark (void);
 
    Registers an error quark for NMDeviceGeneric if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceGeneric errors.
    
 
    
 
    Since: 0.9.10
    
@@ -150,7 +150,7 @@ nm_device_generic_new (const char *path);
 
    Creates a new NMDeviceGeneric.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -172,7 +172,7 @@ nm_device_generic_new (
-
    Returns
    
+
    Returns
    
 
     a new device. 
    
 
    [transfer full]
    
 
@@ -185,7 +185,7 @@ nm_device_generic_new (NMDeviceGeneric *device);
 
    Gets the hardware address of the NMDeviceGeneric
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -200,7 +200,7 @@ nm_device_generic_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -212,7 +212,7 @@ device, and must not be modified.
    
 
    
 
    enum NMDeviceGenericError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -285,6 +285,6 @@ if not known.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html
index bb9523d5..41a2fec8 100644
--- a/docs/libnm-glib/html/NMDeviceInfiniband.html
+++ b/docs/libnm-glib/html/NMDeviceInfiniband.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -144,7 +144,7 @@
 nm_device_infiniband_error_quark (void);
 
    Registers an error quark for NMDeviceInfiniband if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceInfiniband errors.
    
 
    
 
@@ -156,7 +156,7 @@ nm_device_infiniband_new (const char *path);
 
    Creates a new NMDeviceInfiniband.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -178,7 +178,7 @@ nm_device_infiniband_new (
-
    Returns
    
+
    Returns
    
 
     a new device. 
    
 
    [transfer full]
    
 
@@ -190,7 +190,7 @@ nm_device_infiniband_new (NMDeviceInfiniband *device);
 
    Gets the hardware (MAC) address of the NMDeviceInfiniband
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -205,7 +205,7 @@ nm_device_infiniband_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -217,7 +217,7 @@ device, and must not be modified.
    
 nm_device_infiniband_get_carrier (NMDeviceInfiniband *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -232,7 +232,7 @@ nm_device_infiniband_get_carrier (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
    
 
@@ -242,7 +242,7 @@ nm_device_infiniband_get_carrier (
 
    enum NMDeviceInfinibandError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -328,6 +328,6 @@ nm_device_infiniband_get_carrier (
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index 2c05df00..2fb335a1 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -136,7 +136,7 @@
 nm_device_modem_error_quark (void);
 
    Registers an error quark for NMDeviceModem if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceModem errors.
    
 
    
 
@@ -150,7 +150,7 @@ nm_device_modem_get_modem_capabilities
 supports.  Not all capabilities are available concurrently however; some
 may require a firmware reload or reinitialization.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -165,7 +165,7 @@ may require a firmware reload or reinitialization.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the generic access technology families the modem supports
    
 
    
 
    
@@ -179,7 +179,7 @@ nm_device_modem_get_current_capabilities
 supports without a firmware reload or reinitialization.  This value
 represents the network types the modem can immediately connect to.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -194,7 +194,7 @@ represents the network types the modem can immediately connect to.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the generic access technology families the modem supports without
 a firmware reload or other reinitialization
    
 
    
@@ -205,7 +205,7 @@ a firmware reload or other reinitialization
    
 
    
 
    enum NMDeviceModemError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -288,6 +288,6 @@ CDMA/EVDO and GSM/UMTS.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceOlpcMesh.html b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
index c48c4e36..bc958e4c 100644
--- a/docs/libnm-glib/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
@@ -8,7 +8,7 @@
 
-
+
@@ -162,7 +162,7 @@
 nm_device_olpc_mesh_error_quark (void);
    Registers an error quark for NMDeviceOlpcMesh if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceOlpcMesh errors.
    
 
    
@@ -174,7 +174,7 @@ nm_device_olpc_mesh_new (const char *path);
 
    Creates a new NMDeviceOlpcMesh.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -196,7 +196,7 @@ nm_device_olpc_mesh_new (
-
    Returns
    
+
    Returns
    
 
     a new OlpcMesh device. 
    
 
    [transfer full]
    
 
@@ -208,7 +208,7 @@ nm_device_olpc_mesh_new (NMDeviceOlpcMesh *device);
 
    Gets the hardware (MAC) address of the NMDeviceOlpcMesh
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -223,7 +223,7 @@ nm_device_olpc_mesh_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -235,7 +235,7 @@ device, and must not be modified.
    
 nm_device_olpc_mesh_get_companion (NMDeviceOlpcMesh *device);
 
    Gets the companion device of the NMDeviceOlpcMesh.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -250,7 +250,7 @@ nm_device_olpc_mesh_get_companion (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the companion of the device of NULL. 
    
 
    [transfer none]
    
 
    
@@ -263,7 +263,7 @@ nm_device_olpc_mesh_get_active_channel
                                (NMDeviceOlpcMesh *device);
 
    Returns the active channel of the NMDeviceOlpcMesh device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -278,7 +278,7 @@ nm_device_olpc_mesh_get_active_channel
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     active channel of the device
    
 
    
 
    
@@ -288,7 +288,7 @@ nm_device_olpc_mesh_get_active_channel
 
    
 
    enum NMDeviceOlpcMeshError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -373,6 +373,6 @@ nm_device_olpc_mesh_get_active_channel
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceTeam.html b/docs/libnm-glib/html/NMDeviceTeam.html
index 2195f9aa..b329e8a4 100644
--- a/docs/libnm-glib/html/NMDeviceTeam.html
+++ b/docs/libnm-glib/html/NMDeviceTeam.html
@@ -8,7 +8,7 @@
 
-
+
@@ -161,7 +161,7 @@
 nm_device_team_error_quark (void);
    Registers an error quark for NMDeviceTeam if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceTeam errors.
    
 
    Since: 0.9.10
    
@@ -174,7 +174,7 @@ nm_device_team_new (const char *path);
 
    Creates a new NMDeviceTeam.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
    @@ -196,7 +196,7 @@ nm_device_team_new (
-
    Returns
    
+
    Returns
    
 
     a new device. 
    
 
    [transfer full]
    
 
@@ -209,7 +209,7 @@ nm_device_team_new (NMDeviceTeam *device);
 
    Gets the hardware (MAC) address of the NMDeviceTeam
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -224,7 +224,7 @@ nm_device_team_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -237,7 +237,7 @@ device, and must not be modified.
    
 nm_device_team_get_carrier (NMDeviceTeam *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -252,7 +252,7 @@ nm_device_team_get_carrier (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
 
    Since: 0.9.10
    
@@ -265,7 +265,7 @@ nm_device_team_get_slaves (device
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -280,9 +280,9 @@ nm_device_team_get_slaves (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray containing
-NMDevices that are slaves of device
+NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 
    
 
    [element-type NMDevice]
    
@@ -295,7 +295,7 @@ copy used by the device, and must not be modified. 
    
 
    
 
    enum NMDeviceTeamError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -387,6 +387,6 @@ copy used by the device, and must not be modified. 
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceVlan.html b/docs/libnm-glib/html/NMDeviceVlan.html
index 51c89f0d..b3e89dc8 100644
--- a/docs/libnm-glib/html/NMDeviceVlan.html
+++ b/docs/libnm-glib/html/NMDeviceVlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -179,7 +179,7 @@
 nm_device_vlan_error_quark (void);
 
    Registers an error quark for NMDeviceVlan if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceVlan errors.
    
 
    
 
@@ -191,7 +191,7 @@ nm_device_vlan_new (const char *path);
 
    Creates a new NMDeviceVlan.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -213,7 +213,7 @@ nm_device_vlan_new (
-
    Returns
    
+
    Returns
    
 
     a new device. 
    
 
    [transfer full]
    
 
@@ -225,7 +225,7 @@ nm_device_vlan_new (NMDeviceVlan *device);
 
    Gets the hardware (MAC) address of the NMDeviceVlan
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -240,7 +240,7 @@ nm_device_vlan_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -252,7 +252,7 @@ device, and must not be modified.
    
 nm_device_vlan_get_carrier (NMDeviceVlan *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -267,7 +267,7 @@ nm_device_vlan_get_carrier (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
 
@@ -277,7 +277,7 @@ nm_device_vlan_get_carrier (NMDevice *
 nm_device_vlan_get_parent (NMDeviceVlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -292,7 +292,7 @@ nm_device_vlan_get_parent (
-
    Returns
    
+
    Returns
    
 
     the device's parent device. 
    
 
    [transfer none]
    
 
@@ -304,7 +304,7 @@ nm_device_vlan_get_parent (guint
 nm_device_vlan_get_vlan_id (NMDeviceVlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -319,7 +319,7 @@ nm_device_vlan_get_vlan_id (
-
    Returns
    
+
    Returns
    
 
     the device's VLAN ID
    
 
 
@@ -329,7 +329,7 @@ nm_device_vlan_get_vlan_id (
 
    enum NMDeviceVlanError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -451,6 +451,6 @@ nm_device_vlan_get_vlan_id (
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index 1c0223aa..43848792 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -277,7 +277,7 @@
 nm_device_wifi_error_quark (void);
 
    Registers an error quark for NMDeviceWifi if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceWifi errors.
    
 
    
 
@@ -289,7 +289,7 @@ nm_device_wifi_new (const char *path);
 
    Creates a new NMDeviceWifi.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -311,7 +311,7 @@ nm_device_wifi_new (
-
    Returns
    
+
    Returns
    
 
     a new Wi-Fi device. 
    
 
    [transfer full]
    
 
@@ -323,7 +323,7 @@ nm_device_wifi_new (NMDeviceWifi *device);
 
    Gets the actual hardware (MAC) address of the NMDeviceWifi
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -338,7 +338,7 @@ nm_device_wifi_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the actual hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -351,7 +351,7 @@ nm_device_wifi_get_permanent_hw_address
                                (NMDeviceWifi *device);
 
    Gets the permanent hardware (MAC) address of the NMDeviceWifi
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -366,7 +366,7 @@ nm_device_wifi_get_permanent_hw_address
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the permanent hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -378,7 +378,7 @@ device, and must not be modified.
    
 nm_device_wifi_get_mode (NMDeviceWifi *device);
 
    Gets the NMDeviceWifi mode.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -393,7 +393,7 @@ nm_device_wifi_get_mode (
-
    Returns
    
+
    Returns
    
 
     the mode
    
 
 
@@ -404,7 +404,7 @@ nm_device_wifi_get_mode (NMDeviceWifi *device);
 
    Gets the bit rate of the NMDeviceWifi in kbit/s.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -419,7 +419,7 @@ nm_device_wifi_get_bitrate (
-
    Returns
    
+
    Returns
    
 
     the bit rate (kbit/s)
    
 
 
@@ -430,7 +430,7 @@ nm_device_wifi_get_bitrate (NMDeviceWifi *device);
 
    Gets the Wi-Fi capabilities of the NMDeviceWifi.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -445,7 +445,7 @@ nm_device_wifi_get_capabilities (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the capabilities
    
 
    
 
@@ -457,7 +457,7 @@ nm_device_wifi_get_active_access_point
                                (NMDeviceWifi *device);
 
    Gets the active NMAccessPoint.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -472,7 +472,7 @@ nm_device_wifi_get_active_access_point
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the access point or NULL if none is active. 
    
 
    [transfer none]
    
 
    
@@ -486,7 +486,7 @@ nm_device_wifi_get_access_point_by_path
                                 const char *path);
 
    Gets a NMAccessPoint by path.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -508,7 +508,7 @@ nm_device_wifi_get_access_point_by_path
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the access point or NULL if none is found. 
    
 
    [transfer none]
    
 
    
@@ -520,7 +520,7 @@ nm_device_wifi_get_access_point_by_path
 nm_device_wifi_get_access_points (NMDeviceWifi *device);
 
    Gets all the scanned access points of the NMDeviceWifi.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -535,9 +535,9 @@ nm_device_wifi_get_access_points (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a GPtrArray containing all the
-scanned NMAccessPoints.
+scanned NMAccessPoints.
 The returned array is owned by the client and should not be modified. 
    
 
    [element-type NMAccessPoint]
    
 
    
@@ -561,7 +561,7 @@ nm_device_wifi_request_scan_simple (nm_device_wifi_get_access_points()
 to get available access points.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -595,7 +595,7 @@ to get available access points.
    
 
    
 
    enum NMDeviceWifiError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -775,7 +775,7 @@ user_function (gpointer      user_data)
 
    Notifies that a NMAccessPoint is added to the Wi-Fi device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -812,7 +812,7 @@ user_function (gpointer      user_data)
 
    Notifies that a NMAccessPoint is removed from the Wi-Fi device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -843,6 +843,6 @@ user_function (
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html
index 93148ed9..bf6ef3f3 100644
--- a/docs/libnm-glib/html/NMDeviceWimax.html
+++ b/docs/libnm-glib/html/NMDeviceWimax.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -282,7 +282,7 @@ nm_device_wimax_error_quark (void
 
 
    Registers an error quark for NMDeviceWimax if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMDeviceWimax errors.
    
 
    
 
@@ -298,7 +298,7 @@ nm_device_wimax_new (NMDeviceWimax.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -320,7 +320,7 @@ nm_device_wimax_new (
-
    Returns
    
+
    Returns
    
 
     a new WiMAX device. 
    
 
    [transfer full]
    
 
@@ -336,7 +336,7 @@ nm_device_wimax_get_hw_address (
 
    Gets the hardware (MAC) address of the NMDeviceWimax
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -351,7 +351,7 @@ nm_device_wimax_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -367,7 +367,7 @@ nm_device_wimax_get_active_nsp (
 
    Gets the active NMWimaxNsp.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -382,7 +382,7 @@ nm_device_wimax_get_active_nsp (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the access point or NULL if none is active. 
    
 
    [transfer full]
    
 
    
@@ -399,7 +399,7 @@ nm_device_wimax_get_nsp_by_path (
 
    Gets a NMWimaxNsp by path.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -421,7 +421,7 @@ nm_device_wimax_get_nsp_by_path (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the access point or NULL if none is found. 
    
 
    [transfer none]
    
 
    
@@ -437,7 +437,7 @@ nm_device_wimax_get_nsps (NMDeviceWimax.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -452,9 +452,9 @@ nm_device_wimax_get_nsps (
-
    Returns
    
+
    Returns
    
 
     a GPtrArray containing
-all the scanned NMWimaxNsps.
+all the scanned NMWimaxNsps.
 The returned array is owned by the client and should not be modified. 
    
 
    [element-type NMWimaxNsp]
    
 
@@ -472,7 +472,7 @@ nm_device_wimax_get_center_frequency (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -487,7 +487,7 @@ device is not connected.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the center frequency in KHz, or 0
    
 
    
 
    
@@ -505,7 +505,7 @@ 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
 device is not connected.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -520,7 +520,7 @@ device is not connected.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the RSSI in dBm, or 0
    
 
    
 
    
@@ -537,7 +537,7 @@ nm_device_wimax_get_cinr (
-
    Parameters
    
+
    Parameters
    
 
    @@ -552,7 +552,7 @@ meaning when the device is not connected.
    
 
 

 
    
 
 
    
-
    Returns
    
+
    Returns
    
 
     the CINR in dB, or 0
    
 
    
 
@@ -569,7 +569,7 @@ nm_device_wimax_get_tx_power (
-
    Parameters
    
+
    Parameters
    
 
    @@ -584,7 +584,7 @@ nm_device_wimax_get_tx_power (
-
    Returns
    
+
    Returns
    
 
     the TX power in dBm, or 0
    
 
 
@@ -599,7 +599,7 @@ nm_device_wimax_get_bsid (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -614,7 +614,7 @@ nm_device_wimax_get_bsid (
-
    Returns
    
+
    Returns
    
 
     the ID of the serving Base Station, or NULL
    
 
 
@@ -624,7 +624,7 @@ nm_device_wimax_get_bsid (
 
    enum NMDeviceWimaxError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -847,7 +847,7 @@ user_function (<
 
    WiMAX is no longer supported.
    
 
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -888,7 +888,7 @@ user_function (<
 
    WiMAX is no longer supported.
    
 
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -919,6 +919,6 @@ user_function (<
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index edc746b6..8c5bfdac 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -211,7 +211,7 @@ nm_ip4_config_new (    const char *object_path);
 
    Creates a new NMIP4Config.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -233,7 +233,7 @@ nm_ip4_config_new (
-
    Returns
    
+
    Returns
    
 
     a new IP4 configuration. 
    
 
    [transfer full]
    
 
@@ -245,7 +245,7 @@ nm_ip4_config_new (NMIP4Config *config);
 
    Gets the IP4 gateway address.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -260,7 +260,7 @@ nm_ip4_config_get_gateway (
-
    Returns
    
+
    Returns
    
 
     the IP4 address of the gateway.
    
 
 
    Since: 0.9.10
    
@@ -272,7 +272,7 @@ nm_ip4_config_get_gateway (NMIP4Config *config);
 
    Gets the IP4 addresses (containing the address, prefix, and gateway).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -287,8 +287,8 @@ nm_ip4_config_get_addresses (
-
    Returns
    
-
     the GSList containing NMIP4Addresses.
+
    Returns
    
+
     the GSList containing NMIP4Addresses.
 This is the internal copy used by the configuration and must not be modified. 
    
 
    [element-type NMIP4Address]
    
 
@@ -300,7 +300,7 @@ This is the internal copy used by the configuration and must not be modified. NMIP4Config *config    );
 
    Gets the routes.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -315,9 +315,9 @@ nm_ip4_config_get_routes (
-
    Returns
    
+
    Returns
    
 
     the GSList containing
-NMIP4Routes. This is the internal copy used by the configuration,
+NMIP4Routes. This is the internal copy used by the configuration,
 and must not be modified. 
    
 
    [element-type NMIP4Route]
    
 
@@ -329,7 +329,7 @@ and must not be modified. 
    
 nm_ip4_config_get_nameservers (NMIP4Config *config);
 
    Gets the domain name servers (DNS).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -344,7 +344,7 @@ nm_ip4_config_get_nameservers (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the GArray containing guint32s.
 This is the internal copy used by the configuration and must not be
 modified. 
    
@@ -358,7 +358,7 @@ modified. 
    
 nm_ip4_config_get_domains (NMIP4Config *config);
 
    Gets the domain names.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -373,7 +373,7 @@ nm_ip4_config_get_domains (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray containing domains as strings. This is the
 internal copy used by the configuration, and must not be modified. 
    
 
    [element-type utf8]
    
@@ -386,7 +386,7 @@ internal copy used by the configuration, and must not be modified. 
    
 nm_ip4_config_get_searches (NMIP4Config *config);
 
    Gets the dns searches.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -401,7 +401,7 @@ nm_ip4_config_get_searches (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray containing dns searches as strings. This is the
 internal copy used by the configuration, and must not be modified. 
    
 
    [element-type utf8]
    
@@ -415,7 +415,7 @@ internal copy used by the configuration, and must not be modified. 
    
 nm_ip4_config_get_wins_servers (NMIP4Config *config);
 
    Gets the Windows Internet Name Service servers (WINS).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -430,7 +430,7 @@ nm_ip4_config_get_wins_servers (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the GArray containing guint32s.
 This is the internal copy used by the configuration and must not be
 modified. 
    
@@ -487,7 +487,7 @@ modified. 
    
 
    
 
    The “addresses” property
    
 
      “addresses”                gpointer
    
-
    The GPtrArray containing NMIP4Addresses of the configuration.
    
+
    The GPtrArray containing NMIP4Addresses of the configuration.
    
 
    Flags: Read
    
 
    
 
    
@@ -538,6 +538,6 @@ modified. 
    
 
    
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index 53718105..1cf5f9be 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -211,7 +211,7 @@ nm_ip6_config_new (const char *object_path);
 
    Creates a new NMIP6Config.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -233,7 +233,7 @@ nm_ip6_config_new (
-
    Returns
    
+
    Returns
    
 
     a new IP6 configuration. 
    
 
    [transfer full]
    
 
@@ -245,7 +245,7 @@ nm_ip6_config_new (NMIP6Config *config);
 
    Gets the IP6 gateway.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -260,7 +260,7 @@ nm_ip6_config_get_gateway (
-
    Returns
    
+
    Returns
    
 
     the IPv6 gateway of the configuration.
    
 
 
    Since: 0.9.10
    
@@ -272,7 +272,7 @@ nm_ip6_config_get_gateway (NMIP6Config *config);
 
    Gets the IP6 addresses (containing the address, prefix, and gateway).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -287,9 +287,9 @@ nm_ip6_config_get_addresses (
-
    Returns
    
+
    Returns
    
 
     the GSList containing
-NMIP6Addresses. This is the internal copy used by the configuration
+NMIP6Addresses. This is the internal copy used by the configuration
 and must not be modified. 
    
 
    [element-type NMIP6Address]
    
 
@@ -301,7 +301,7 @@ and must not be modified. 
    
 nm_ip6_config_get_routes (NMIP6Config *config);
 
    Gets the routes.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -316,9 +316,9 @@ nm_ip6_config_get_routes (
-
    Returns
    
+
    Returns
    
 
     the GSList containing
-NMIP6Routes. This is the internal copy used by the configuration,
+NMIP6Routes. This is the internal copy used by the configuration,
 and must not be modified. 
    
 
    [element-type NMIP6Route]
    
 
@@ -330,7 +330,7 @@ and must not be modified. 
    
 nm_ip6_config_get_num_nameservers (NMIP6Config *config);
 
    Gets the number of the domain name servers in the configuration.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -345,7 +345,7 @@ nm_ip6_config_get_num_nameservers (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the number of domain name servers
    
 
    
 
    Since: 0.9.10
    
@@ -359,7 +359,7 @@ nm_ip6_config_get_nameserver (idx
  in the configuration.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -381,7 +381,7 @@ nm_ip6_config_get_nameserver (
-
    Returns
    
+
    Returns
    
 
             the IPv6 address of domain name server at index iidx
 . 
    
 
    [array fixed-size=16][element-type guint8][transfer none]
    
@@ -396,7 +396,7 @@ nm_ip6_config_get_nameservers (Gets the domain name servers (DNS).
    
 
    [skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -411,7 +411,7 @@ nm_ip6_config_get_nameservers (
 
 
    
-
    Returns
    
+
    Returns
    
 
     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.
    
@@ -424,7 +424,7 @@ internal copy used by the configuration and must not be modified.
    
 nm_ip6_config_get_domains (NMIP6Config *config);
 
    Gets the domain names.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -439,7 +439,7 @@ nm_ip6_config_get_domains (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray containing domains as strings.
 This is the internal copy used by the configuration, and must not be modified. 
    
 
    [element-type utf8]
    
@@ -452,7 +452,7 @@ This is the internal copy used by the configuration, and must not be modified. <
 nm_ip6_config_get_searches (NMIP6Config *config);
 
    Gets the dns searches.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -467,7 +467,7 @@ nm_ip6_config_get_searches (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray containing dns searches as strings.
 This is the internal copy used by the configuration, and must not be modified. 
    
 
    [element-type utf8]
    
@@ -567,6 +567,6 @@ contain the addresses of nameservers of the configuration.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index 296e0b0c..d81ab988 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -160,7 +160,7 @@
 nm_object_error_quark (void);
 
    Registers an error quark for NMObject if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMObject errors.
    
 
    
 
@@ -171,7 +171,7 @@ nm_object_error_quark (voidNMObject *object);
 
    Gets the NMObject's DBusGConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -186,7 +186,7 @@ nm_object_get_connection (
-
    Returns
    
+
    Returns
    
 
     the connection. 
    
 
    [transfer none]
    
 
@@ -198,7 +198,7 @@ nm_object_get_connection (NMObject *object);
 
    Gets the DBus path of the NMObject.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -213,7 +213,7 @@ nm_object_get_path (
-
    Returns
    
+
    Returns
    
 
     the object's path. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -225,7 +225,7 @@ device, and must not be modified.
    
 
    enum NMObjectError
    
 
    Describes errors that may result from operations involving a NMObject.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -300,7 +300,7 @@ during property handling of master_objectNote: Be aware that the signal is private for libnm-glib's internal
       use.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -336,6 +336,6 @@ during property handling of master_object
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index ee5bfa0c..62a40365 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -43,10 +43,6 @@
 
     
-
-
-
-
@@ -205,6 +201,10 @@
 
+
+
+
+
@@ -229,7 +229,7 @@
 
    
 
    Object Hierarchy
    
 
        GObject
-    ╰── NMConnection
+    ╰── NMConnection
         ╰── NMRemoteConnection
 
    
 
    
@@ -239,18 +239,12 @@
 
    
 
    Functions
    
 
    
-
    NM_REMOTE_CONNECTION_ERROR
    
-
    #define NM_REMOTE_CONNECTION_ERROR (nm_remote_connection_error_quark ())
-
    
-
    
-
    
-
    
 
    nm_remote_connection_error_quark ()
    
 
    GQuark
 nm_remote_connection_error_quark (void);
    
 
    Registers an error quark for NMRemoteConnection if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMRemoteConnection errors.
    
 
    
 
    
@@ -264,7 +258,7 @@ nm_remote_connection_error_quark (Called when NetworkManager has finished an asynchronous operation on a
 connection, like commit changes, deleting, saving, etc.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    #defineNM_REMOTE_CONNECTION_ERROR
    
 
 GQuark
 
    
 
    
 #defineNM_REMOTE_CONNECTION_ERROR
    #define
 NM_REMOTE_CONNECTION_UNSAVED
 
    
 
    @@ -302,7 +296,7 @@ connection, like commit changes, deleting, saving, etc.
    
 
    Called when NetworkManager returns secrets in response to a request for
 secrets via nm_remote_connection_get_secrets().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -344,7 +338,7 @@ nm_remote_connection_new (const char *path);
 
    Creates a new object representing the remote connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -366,7 +360,7 @@ nm_remote_connection_new (
-
    Returns
    
+
    Returns
    
 
     the new remote connection object on success, or NULL on failure
    
 
 
@@ -380,7 +374,7 @@ nm_remote_connection_commit_changes (Send any local changes to the settings and properties of this connection to
 NetworkManager, which will immediately save them to disk.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -422,7 +416,7 @@ NetworkManager.  The changes are not saved to disk until either
 nm_remote_connection_save() or nm_remote_connection_commit_changes() is
 called.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -462,7 +456,7 @@ nm_remote_connection_save (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -501,7 +495,7 @@ nm_remote_connection_delete (gpointer user_data);
 
    Delete the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -539,7 +533,7 @@ nm_remote_connection_get_secrets (gpointer user_data);
 
    Request the connection's secrets.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -554,7 +548,7 @@ nm_remote_connection_get_secrets (
 
-
+
@@ -579,7 +573,7 @@ must not be NULL. 
    
 
    gboolean
 nm_remote_connection_get_unsaved (NMRemoteConnection *connection);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    
 
    setting_name
    the NMSetting object name to get secrets for
    the NMSetting object name to get secrets for
    		
  
 
    
 
    @@ -594,7 +588,7 @@ nm_remote_connection_get_unsaved (
 
 
    
-
    Returns
    
+
    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
 representation.
    
@@ -607,7 +601,7 @@ representation.
    
 
    
 
    enum NMRemoteConnectionError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -635,6 +629,12 @@ representation.
    
 
 
    
 
    
+
    NM_REMOTE_CONNECTION_ERROR
    
+
    #define NM_REMOTE_CONNECTION_ERROR (nm_remote_connection_error_quark ())
+
    
+
    
+
    
+
    
 
    NM_REMOTE_CONNECTION_UNSAVED
    
 
    #define NM_REMOTE_CONNECTION_UNSAVED         "unsaved"
 
    
@@ -706,7 +706,7 @@ user_function (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -716,7 +716,7 @@ invisible to the current user.
    
     
-
+
@@ -738,7 +738,7 @@ user_function (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    
 
    connection
    a NMConnection
    a NMConnection
    		
  
 
    
 
    @@ -748,7 +748,7 @@ still visible to the user.
    
     
-
+
@@ -773,6 +773,6 @@ user_function (
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index 0e1a4139..ef5bff8c 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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
@@ -377,16 +377,16 @@ the stored object known to NetworkManager.
    
 static gboolean
 add_wired_connection (const char *human_name)
 {
-   NMConnection *connection;
+   NMConnection *connection;
    NMSettingConnection *s_con;
    NMSettingWired *s_wired;
    char *uuid;
    gboolean success;
 
-   connection = nm_connection_new ();
+   connection = nm_connection_new ();
 
    /* Build up the 'connection' setting */
-   s_con = (NMSettingConnection *) nm_setting_connection_new ();
+   s_con = (NMSettingConnection *) nm_setting_connection_new ();
    uuid = nm_utils_uuid_generate ();
    g_object_set (G_OBJECT (s_con),
                  NM_SETTING_CONNECTION_UUID, uuid,
@@ -394,24 +394,24 @@ the stored object known to NetworkManager.
    
                  NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
                  NULL);
    g_free (uuid);
-   nm_connection_add_setting (connection, NM_SETTING (s_con));
+   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 ();
+   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));
+   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);
+   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. */
@@ -433,7 +433,7 @@ the stored object known to NetworkManager.
    
 nm_remote_settings_error_quark (void);
 
    Registers an error quark for NMRemoteSettings if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMRemoteSettings errors.
    
 
    
 
@@ -474,7 +474,7 @@ nm_remote_settings_new (nm_remote_settings_new_async() if you
 want to avoid that.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    
 
    connection
    a NMConnection
    a NMConnection
    		
  
 
    
 
    @@ -489,7 +489,7 @@ want to avoid that.
    
 
    
 
 

    
 
 
    
-
    Returns
    
+
    Returns
    
 
     the new remote settings object on success, or NULL on failure
    
 
    
 
@@ -507,7 +507,7 @@ begins asynchronously initializing it. callbacknm_remote_settings_new_finish() to get the
 result.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -548,7 +548,7 @@ nm_remote_settings_new_finish (GA
                                GError **error);
 
    Gets the result of an nm_remote_settings_new_async() call.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -570,7 +570,7 @@ nm_remote_settings_new_finish (GA
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new NMRemoteSettings object, or NULL on error
    
 
    
 
@@ -580,7 +580,7 @@ nm_remote_settings_new_finish (GA
 
    GSList *
 nm_remote_settings_list_connections (NMRemoteSettings *settings);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -595,7 +595,7 @@ nm_remote_settings_list_connections (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a
 list containing all connections provided by the remote settings service.
 Each element of the returned list is a NMRemoteConnection instance, which is
@@ -615,7 +615,7 @@ nm_remote_settings_get_connection_by_id
 
    Returns the first matching NMRemoteConnection matching a given id
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -637,7 +637,7 @@ nm_remote_settings_get_connection_by_id
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the remote connection object on success, or NULL if no
 matching object was found. 
    
 
    [transfer none]
    
@@ -654,7 +654,7 @@ nm_remote_settings_get_connection_by_path
 
    Returns the NMRemoteConnection representing the connection at path
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -676,7 +676,7 @@ nm_remote_settings_get_connection_by_path
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the remote connection object on success, or NULL if the object was
 not known. 
    
 
    [transfer none]
    
@@ -692,7 +692,7 @@ nm_remote_settings_get_connection_by_uuid
 
    Returns the NMRemoteConnection identified by uuid
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -714,7 +714,7 @@ nm_remote_settings_get_connection_by_uuid
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the remote connection object on success, or NULL if the object was
 not known. 
    
 
    [transfer none]
    
@@ -725,7 +725,7 @@ not known. 
    
 
    nm_remote_settings_add_connection ()
    
 
    gboolean
 nm_remote_settings_add_connection (NMRemoteSettings *settings,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    NMRemoteSettingsAddConnectionFunc callback,
                                    gpointer user_data);
    
 
    Requests that the remote settings service add the given settings to a new
@@ -741,7 +741,7 @@ identical settings to connection
  as NetworkManager may perform automatic
 completion and/or normalization of connection properties.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -775,7 +775,7 @@ added, not the object itself
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the request was successful, FALSE if it failed
    
 
    
 
    
@@ -785,7 +785,7 @@ added, not the object itself
    		
 
 
 
    @@ -827,7 +827,7 @@ added, not the object itself
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the request was successful, FALSE if it failed
    
 
    
 
    Since: 0.9.10
    
@@ -853,7 +853,7 @@ then failures
  will be set to a NULL-terminated array of the
 filenames that failed to load.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -886,7 +886,7 @@ filenames that failed to load. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if NetworkManager at least tried to load filenames
 ,
 FALSE if an error occurred (eg, permission denied).
    
@@ -903,7 +903,7 @@ nm_remote_settings_reload_connections (
-
    Parameters
    
+
    Parameters
    
 
    @@ -925,7 +925,7 @@ the in-memory state matches the on-disk state.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on failure
    
 
    
 
    Since: 0.9.10
    
@@ -941,7 +941,7 @@ nm_remote_settings_save_hostname (Requests that the machine's persistent hostname be set to the specified value
 or cleared.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -976,7 +976,7 @@ hostname operation completes. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the request was successful, FALSE if it failed
    
 
    
 
    
@@ -987,7 +987,7 @@ hostname operation completes. 
    		
 
    @@ -1133,6 +1133,6 @@ user_function (
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index ebb7e858..44e102f4 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -43,10 +43,6 @@
 
     
-
-
-
-
@@ -186,6 +182,10 @@
 
 
+
+
+
+
@@ -232,12 +232,6 @@
 
    
 
    Functions
    
 
    
-
    NM_SECRET_AGENT_ERROR
    
-
    #define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
-
    
-
    
-
    
-
    
 
    nm_secret_agent_error_quark ()
    
 
    GQuark
 nm_secret_agent_error_quark (void);
    
@@ -247,7 +241,7 @@ nm_secret_agent_error_quark (void
 
    NMSecretAgentGetSecretsFunc ()
    
 
    void
 (*NMSecretAgentGetSecretsFunc) (NMSecretAgent *agent,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 GHashTable *secrets,
                                 GError *error,
                                 gpointer user_data);
    
@@ -258,7 +252,7 @@ those secrets or the error.
    
 
    To easily create the hash table to return the Wi-Fi PSK, you could do
 something like this:
    
 
    
-
    Example 1. Creating a secrets hash
    
+
    Example 1. Creating a secrets hash
    
 
    
   
    
 
 

 
    #defineNM_SECRET_AGENT_ERROR
    
 
 GQuark
 
    
 
    #defineNM_SECRET_AGENT_ERROR
    
 enum
 NMSecretAgentError
 
    
@@ -284,7 +278,7 @@ something like this:
    
 GHashTable *secrets_hash;
 
 secrets = nm_connection_new ();
-s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_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);
@@ -302,7 +296,7 @@ something like this:
    
 
 
 
    
-
    Parameters
    
+
    Parameters
    
 
    
     
    @@ -326,9 +320,9 @@ has returned. 
    
     
@@ -353,14 +347,14 @@ is the secret. 
    
 
    NMSecretAgentSaveSecretsFunc ()
    
 
    void
 (*NMSecretAgentSaveSecretsFunc) (NMSecretAgent *agent,
-                                 NMConnection *connection,
+                                 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    
 
    secrets
    		
 
     the GHashTable containing
-the requested secrets in the same format as an NMConnection hash (as
+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")
+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. 
    @@ -400,14 +394,14 @@ has returned. 
    
 
    NMSecretAgentDeleteSecretsFunc ()
    
 
    void
 (*NMSecretAgentDeleteSecretsFunc) (NMSecretAgent *agent,
-                                   NMConnection *connection,
+                                   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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -453,7 +447,7 @@ secrets for connections on behalf of its user.  Registration is an
 asynchronous operation and its success or failure is indicated via the
 'registration-result' signal.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -468,7 +462,7 @@ asynchronous operation and its success or failure is indicated via the
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new TRUE if registration was successfully requested (this does
 not mean registration itself was successful), FALSE if registration was not
 successfully requested.
    
@@ -483,7 +477,7 @@ nm_secret_agent_unregister (
-
    Parameters
    
+
    Parameters
    
 
    @@ -498,7 +492,7 @@ store secrets on behalf of this user.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new TRUE if unregistration was successful, FALSE if it was not.
    
 
    
 
@@ -508,7 +502,7 @@ store secrets on behalf of this user.
    
 
    gboolean
 nm_secret_agent_get_registered (NMSecretAgent *self);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -523,7 +517,7 @@ nm_secret_agent_get_registered (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a TRUE if the agent is registered, FALSE if it is not.
    
 
    
 
@@ -532,7 +526,7 @@ 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,
@@ -548,7 +542,7 @@ existing secrets without user interaction, or requesting entirely new
 secrets from the user.
    
 
    Virtual: get_secrets
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -563,7 +557,7 @@ secrets from the user.
    
 
     
-
+
@@ -601,7 +595,7 @@ 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);
    
 
    Asyncronously ensure that all secrets inside connection
@@ -609,7 +603,7 @@ nm_secret_agent_save_secrets (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    
 
    connection
    the NMConnection for which we're asked secrets
    the NMConnection for which we're asked secrets
    		
  
 
    
 
    @@ -624,7 +618,7 @@ are stored to disk.
    
 
     
-
+
@@ -647,7 +641,7 @@ 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);
    
 
    Asynchronously ask the agent to delete all saved secrets belonging to
@@ -655,7 +649,7 @@ nm_secret_agent_delete_secrets (
 
    Virtual: delete_secrets
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    
 
    connection
    a NMConnection
    a NMConnection
    		
  
 
    
 
    @@ -670,7 +664,7 @@ nm_secret_agent_delete_secrets (
 
-
+
@@ -692,11 +686,17 @@ nm_secret_agent_delete_secrets (
 
    Types and Values
    
 
    
+
    NM_SECRET_AGENT_ERROR
    
+
    #define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
+
    
+
    
+
    
+
    
 
    enum NMSecretAgentError
    
 
    NMSecretAgentError values are passed by secret agents back to NetworkManager
 when they encounter problems retrieving secrets on behalf of NM.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    
 
    connection
    a NMConnection
    a NMConnection
    		
  
 
    
 
    @@ -760,7 +760,7 @@ when they encounter problems retrieving secrets on behalf of NM.
    
 
    enum NMSecretAgentCapabilities
    
 
    NMSecretAgentCapabilities indicate various capabilities of the agent.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -801,7 +801,7 @@ authentication dialogs.
    
 
    enum NMSecretAgentGetSecretsFlags
    
 
    NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -939,7 +939,7 @@ user_function (<
  is NULL the
 request was successful.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -970,6 +970,6 @@ request was successful.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index 8be2954c..a12cd61d 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -145,7 +145,7 @@ nm_vpn_connection_new (const char *path);
 
    Creates a new NMVPNConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -167,7 +167,7 @@ nm_vpn_connection_new (
-
    Returns
    
+
    Returns
    
 
     a new connection object. 
    
 
    [transfer full]
    
 
@@ -179,7 +179,7 @@ nm_vpn_connection_new (NMVPNConnection *vpn);
 
    Gets the current NMVPNConnection state.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -194,7 +194,7 @@ nm_vpn_connection_get_vpn_state (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the VPN state of the active VPN connection.
    
 
    
 
@@ -205,7 +205,7 @@ nm_vpn_connection_get_vpn_state (NMVPNConnection *vpn);
 
    Gets the VPN login banner of the active NMVPNConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -220,7 +220,7 @@ nm_vpn_connection_get_banner (
-
    Returns
    
+
    Returns
    
 
     the VPN login banner of the VPN connection. This is the internal
 string used by the connection, and must not be modified.
    
 
@@ -273,6 +273,6 @@ user_function (
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index d473ec6c..5a596f22 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -165,7 +165,7 @@ nm_wimax_nsp_new (    const char *path);
 
    Creates a new NMWimaxNsp.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -187,7 +187,7 @@ nm_wimax_nsp_new (
-
    Returns
    
+
    Returns
    
 
     a new WiMAX NSP. 
    
 
    [transfer full]
    
 
@@ -199,7 +199,7 @@ nm_wimax_nsp_new (NMWimaxNsp *nsp);
 
    Gets the name of the wimax NSP
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -214,7 +214,7 @@ nm_wimax_nsp_get_name (
-
    Returns
    
+
    Returns
    
 
     the name
    
 
 
@@ -225,7 +225,7 @@ nm_wimax_nsp_get_name (NMWimaxNsp *nsp);
 
    Gets the WPA signal quality of the wimax NSP.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -240,7 +240,7 @@ nm_wimax_nsp_get_signal_quality (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the signal quality
    
 
    
 
@@ -251,7 +251,7 @@ nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp);
 
    Gets the network type of the wimax NSP.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -266,7 +266,7 @@ nm_wimax_nsp_get_network_type (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the network type
    
 
    
 
@@ -281,7 +281,7 @@ return connections which may be activated with the access point.  Any
 returned connections will match the nsp
 's network name and other attributes.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -297,16 +297,16 @@ returned connections will match the nsp
 
+NMConnection objects to filter. 
    
 
    
 
 

    
 
    connections
    		
 
     a list of
-NMConnection objects to filter. 
    		[element-type NMConnection]
 
    
     
 
    
 
    
 
    
-
    Returns
    
+
    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
@@ -319,13 +319,13 @@ be freed with g_slist_free() when it is no longer
 
    nm_wimax_nsp_connection_valid ()
    
 
    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
 's network name and other attributes.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -341,7 +341,7 @@ against
    
-
@@ -349,7 +349,7 @@ against
    
 
 

 
 
    
 
    connection
    an NMConnection to validate against nsp
+
    an NMConnection to validate against nsp
 
    		
  
 
    
 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection may be activated with this WiMAX NSP,
 FALSE if it cannot be.
    
 
    
@@ -379,7 +379,7 @@ against
    
 
    enum NMWimaxNspNetworkType
    
 
    WiMAX network type.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -449,6 +449,6 @@ against
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-glib/html/annotation-glossary.html b/docs/libnm-glib/html/annotation-glossary.html
index 52e56c4d..e902553a 100644
--- a/docs/libnm-glib/html/annotation-glossary.html
+++ b/docs/libnm-glib/html/annotation-glossary.html
@@ -7,7 +7,7 @@
 
-
+
@@ -61,6 +61,6 @@
 
    Override the parsed C type with given type.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
index edb606f8..b327be1d 100644
--- a/docs/libnm-glib/html/api-index-full.html
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -8,7 +8,7 @@
 
-
+
@@ -2704,6 +2704,6 @@
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
index 18b6b1ab..93b8eb43 100644
--- a/docs/libnm-glib/html/ch02.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -8,7 +8,7 @@
 
-
+
@@ -119,6 +119,6 @@
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index bd1af8ee..768e94f9 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -6,7 +6,7 @@
 
-
+
@@ -15,7 +15,7 @@
 
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
    
 
    
-      for libnm-glib 1.2.4
+      for libnm-glib 1.4.0
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm-glib/stable/.
@@ -150,6 +150,6 @@
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
    
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
deleted file mode 100644
index dbe88019..00000000
--- a/docs/libnm-glib/html/index.sgml
+++ /dev/null
@@ -1,1082 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index a3f3fadc..7a82eb3a 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -195,7 +195,7 @@ request new secrets when the secrets originally provided by NetworkManager
 are insufficient, or the VPN process indicates that it needs additional
 information to complete the request.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -284,7 +284,7 @@ nm_vpn_plugin_disconnect (NMVPNPl
 
    enum NMVPNPluginError
    
 
    Returned by the VPN service plugin to indicate errors.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -381,6 +381,6 @@ nm_vpn_plugin_disconnect (NMVPNPl
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
index cd633c5d..664f3540 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -73,7 +73,7 @@
 
 
    const char *
 nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    
 
-NMConnection *
+NMConnection *
 
 
 nm_vpn_plugin_ui_interface_import ()
@@ -262,7 +262,7 @@ nm_vpn_plugin_ui_factory (GError<
 
    nm_vpn_plugin_ui_interface_ui_factory ()
    
 
    NMVpnPluginUiWidgetInterface *
 nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface,
-                                       NMConnection *connection,
+                                       NMConnection *connection,
                                        GError **error);
    
 
 
    
@@ -275,7 +275,7 @@ nm_vpn_plugin_ui_interface_get_capabilities
 
    
 
    
 
    nm_vpn_plugin_ui_interface_import ()
    
-
    NMConnection *
+
    NMConnection *
 nm_vpn_plugin_ui_interface_import (NMVpnPluginUiInterface *iface,
                                    const char *path,
                                    GError **error);
    
@@ -286,7 +286,7 @@ nm_vpn_plugin_ui_interface_import (gboolean
 nm_vpn_plugin_ui_interface_export (NMVpnPluginUiInterface *iface,
                                    const char *path,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    GError **error);
    
 
    
 
    
@@ -295,7 +295,7 @@ nm_vpn_plugin_ui_interface_export (char *
 nm_vpn_plugin_ui_interface_get_suggested_name
                                (NMVpnPluginUiInterface *iface,
-                                NMConnection *connection);
+                                NMConnection *connection);
 
 
    
 
    
@@ -303,7 +303,7 @@ nm_vpn_plugin_ui_interface_get_suggested_name
 
    gboolean
 nm_vpn_plugin_ui_interface_delete_connection
                                (NMVpnPluginUiInterface *iface,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 GError **error);
    
 
    nm_vpn_plugin_ui_interface_delete_connection is deprecated and should not be used in newly-written code.
    
 
    
@@ -320,7 +320,7 @@ nm_vpn_plugin_ui_widget_interface_get_widget
 
    gboolean
 nm_vpn_plugin_ui_widget_interface_update_connection
                                (NMVpnPluginUiWidgetInterface *iface,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 GError **error);
    
 
 
    
@@ -329,7 +329,7 @@ nm_vpn_plugin_ui_widget_interface_update_connection
 
    gboolean
 nm_vpn_plugin_ui_widget_interface_save_secrets
                                (NMVpnPluginUiWidgetInterface *iface,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 GError **error);
    
 
    nm_vpn_plugin_ui_widget_interface_save_secrets is deprecated and should not be used in newly-written code.
    
 
@@ -340,7 +340,7 @@ nm_vpn_plugin_ui_widget_interface_save_secrets
 
    enum NMVpnPluginUiCapability
    
 
    Flags that indicate to UI programs certain capabilities of the plugin.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -404,7 +404,7 @@ nm_vpn_plugin_ui_widget_interface_save_secrets
 
    GObject property numbers that plugins should override to provide certain
 information to UI programs.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -567,6 +567,6 @@ plugin's VPN service daemon
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-types.html b/docs/libnm-glib/html/libnm-glib-nm-types.html
index 9c3dce35..7b811487 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-types.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-types.html
@@ -8,7 +8,7 @@
 
-
+
@@ -43,6 +43,6 @@
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
index 83f198f6..604f5980 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
@@ -8,7 +8,7 @@
 
-
+
@@ -72,7 +72,7 @@ nm_vpn_plugin_utils_read_vpn_details (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -101,7 +101,7 @@ an applet when the applet calls the authentication dialog of the VPN plugin.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if reading values was successful, FALSE if not
    
 
    
 
@@ -117,7 +117,7 @@ item in data
 .  If found, converts the flags data item to
 NMSettingSecretFlags and returns it.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -145,7 +145,7 @@ item in data
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the flag data item was found and successfully converted
 to flags, FALSE if not
    
 
    
@@ -156,6 +156,6 @@ to flags, FALSE if not
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index 47a930bd..620939d0 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -565,7 +565,6 @@
     
     
     
-    
     
     
     
@@ -577,6 +576,7 @@
     
     
     
+    
     
     
     
@@ -619,7 +619,6 @@
     
     
     
-    
     
     
     
@@ -630,6 +629,7 @@
     
     
     
+    
     
     
     
@@ -717,6 +717,8 @@
     
     
     
+    
+    
     
     
     
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index acd89edf..5f2f369f 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -49,12 +49,12 @@
     │   ├── NMDHCP4Config
     │   ╰── NMDHCP6Config
     ├── NMRemoteSettings
-    ├── NMConnection
+    ├── NMConnection
     │   ╰── NMRemoteConnection
     ╰── NMSecretAgent
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ref-overview.html b/docs/libnm-glib/html/ref-overview.html
index fcd4ec99..51c7f86f 100644
--- a/docs/libnm-glib/html/ref-overview.html
+++ b/docs/libnm-glib/html/ref-overview.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,6 +41,6 @@
     
    
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index e8ea05db..88c5fb89 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.2.4
+1.4.0
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index 3c0cecd9..f2f0dd47 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -95,8 +95,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = docs/libnm-util
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -172,6 +173,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -228,13 +230,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -246,6 +249,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -306,6 +311,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -341,6 +348,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -802,7 +810,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
 	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -813,6 +821,17 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO
 sgml.stamp: sgml-build.stamp
 	@true
 
+xml/gtkdocentities.ent: Makefile
+	$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+	) > $@
+
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 7572c017..2b57f263 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -631,7 +631,7 @@ parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
 nm_connection_error_quark (void);
 
    Registers an error quark for NMConnection if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMConnection errors.
    
 
    
 
@@ -642,7 +642,7 @@ nm_connection_error_quark (voidvoid);
 
    Creates a new NMConnection object with no NMSetting objects.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMConnection object
    
 
    
 
@@ -655,7 +655,7 @@ nm_connection_new_from_hash (GHas
 
    Creates a new NMConnection from a hash table describing the connection.  See
 nm_connection_to_hash() for a description of the expected hash table.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -678,7 +678,7 @@ the connection. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new NMConnection object, populated with settings created
 from the values in the hash table, or NULL if the connection failed to
 validate
    
@@ -691,7 +691,7 @@ validate
    
 nm_connection_duplicate (NMConnection *connection);
 
    Duplicates a NMConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -706,7 +706,7 @@ nm_connection_duplicate (
-
    Returns
    
+
    Returns
    
 
     a new NMConnection containing the same settings and properties
 as the source NMConnection. 
    
 
    [transfer full]
    
@@ -719,7 +719,7 @@ as the source const char *name    );
 
    Create a new NMSetting object of the desired type, given a setting name.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -734,7 +734,7 @@ nm_connection_create_setting (const 
-
    Returns
    
+
    Returns
    
 
     the new setting object, or NULL if the setting name was unknown. 
    
 
    [transfer full]
    
 
@@ -750,7 +750,7 @@ same name which has previously been added to the NMSetting object and does not increase
 the setting object's reference count.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -781,7 +781,7 @@ nm_connection_remove_setting (NMSetting with the given GType from the NMConnection.  This
 operation dereferences the NMSetting object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -812,7 +812,7 @@ nm_connection_get_setting (NMSetting with the given GType, if one has been previously added
 to the NMConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -834,7 +834,7 @@ to the 
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSetting, or NULL if no setting of that type was previously
 added to the NMConnection. 
    
 
    [transfer none]
    
@@ -849,7 +849,7 @@ nm_connection_get_setting_by_name (Gets the NMSetting with the given name, if one has been previously added
 the NMConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -871,7 +871,7 @@ the 
-
    Returns
    
+
    Returns
    
 
     the NMSetting, or NULL if no setting with that name was previously
 added to the NMConnection. 
    
 
    [transfer none]
    
@@ -885,7 +885,7 @@ nm_connection_replace_settings (GHashTable *new_settings,
                                 GError **error);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -912,7 +912,7 @@ nm_connection_replace_settings (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the settings were valid and added to the connection, FALSE
 if they were not
    
 
    
@@ -930,7 +930,7 @@ nm_connection_replace_settings_from_connection
 
 with the copied settings.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -958,7 +958,7 @@ with
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    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
@@ -977,7 +977,7 @@ nm_connection_compare (nm_setting_compare() for a description of
 each flag's behavior.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1004,7 +1004,7 @@ each flag's behavior.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the comparison succeeds, FALSE if it does not
    
 
    
 
    
@@ -1023,7 +1023,7 @@ each setting that differ are added to the returned o
  hash table.
 No values are returned, only key names.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1058,7 +1058,7 @@ differ mapped to one or more of 
-
    Returns
    
+
    Returns
     TRUE if the connections contain the same values, FALSE if they do
 not
    
@@ -1079,7 +1079,7 @@ connection for the connection to be valid.  As another example, the
 MAC address.  The returned GError contains information about which
 setting and which property failed validation, and how it failed validation.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
    @@ -1101,7 +1101,7 @@ setting and which property failed validation, and how it failed validation.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection is valid, FALSE if it is not
    
 
    
 
    
@@ -1122,7 +1122,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1159,7 +1159,7 @@ why the connection is invalid, if the function returns an error.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection is valid, FALSE if it is not
    
 
    
 
    Since: 1.0
    
@@ -1176,7 +1176,7 @@ intended as a guide to what secrets may be required, because in some
 circumstances, there is no way to conclusively determine exactly which
 secrets are needed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1202,7 +1202,7 @@ elements. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the setting name of the NMSetting object which has invalid or
 missing secrets
    
 
    
@@ -1215,7 +1215,7 @@ nm_connection_clear_secrets (
-
    Parameters
    
+
    Parameters
    
 
    @@ -1241,7 +1241,7 @@ nm_connection_clear_secrets_with_flags
 
    Clears and frees secrets determined by func
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1287,7 +1287,7 @@ a fully serialized secrets
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1321,7 +1321,7 @@ string:GValue of setting property names and secrets of
 
    
 
 

    
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the secrets were successfully updated, FALSE if the update
 failed (tried to update secrets for a setting that doesn't exist, etc)
    
 
    
@@ -1336,7 +1336,7 @@ nm_connection_set_path (“path”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1366,7 +1366,7 @@ which provides the connection
    
 nm_connection_get_path (NMConnection *connection);
    Returns the connection's D-Bus path.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -1381,7 +1381,7 @@ nm_connection_get_path (
-
    Returns
    
+
    Returns
    
 
     the D-Bus path of the connection, previously set by a call to
 nm_connection_set_path().
    
 
@@ -1396,7 +1396,7 @@ needs to use if specified in the settings. This function abstracts all
 connection types which require this functionality. For all other
 connection types, this function will return NULL.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1411,7 +1411,7 @@ connection types, this function will return NULL.
 
 
    
-
    Returns
    
+
    Returns
    
 
     Name of the kernel interface or NULL
    
 
    
 
@@ -1426,7 +1426,7 @@ If the connection contains no NMSettingConnection, it will return 
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1441,7 +1441,7 @@ NetworkManager, this is the name of the created interface.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     Name of the kernel interface or NULL
    
 
    
 
    Since: 1.0
    
@@ -1458,7 +1458,7 @@ type (ie wired, Wi-Fi, ppp, etc). Checks the type    
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1481,7 +1481,7 @@ property of the connection and matches that against 
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection is of the given type
 , FALSE if not
    
 
    
@@ -1496,7 +1496,7 @@ nm_connection_for_each_setting_value (NMSetting object in the NMConnection,
 calling the supplied user function for each property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1537,7 +1537,7 @@ a NMS
 are GHashTables mapping string:GValue, each of which represents the
 properties of the NMSetting object.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1559,7 +1559,7 @@ properties of the 
 
 
    
-
    Returns
    
+
    Returns
    
 
     a new
 GHashTable describing the connection, its settings, and each setting's
 properties.  The caller owns the hash table and must unref the hash table
@@ -1576,7 +1576,7 @@ nm_connection_dump (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1598,7 +1598,7 @@ output format is not guaranteed to be stable and may change at any time.
    
 nm_connection_lookup_setting_type (const char *name);
 
    Returns the GType of the setting's class for a given setting name.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1613,7 +1613,7 @@ nm_connection_lookup_setting_type (const 
 
 
    
-
    Returns
    
+
    Returns
    
 
     the GType of the setting's class
    
 
    
 
@@ -1626,7 +1626,7 @@ nm_connection_lookup_setting_type_by_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
    
+
    Parameters
    
 
    
 
 

    @@ -1641,7 +1641,7 @@ Useful for figuring out which setting a returned error is for.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the GType of the setting's class
    
 
    
 
@@ -1652,7 +1652,7 @@ Useful for figuring out which setting a returned error is for.
    
 nm_connection_get_uuid (NMConnection *connection);
 
    A shortcut to return the UUID from the connection's NMSettingConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1667,7 +1667,7 @@ nm_connection_get_uuid (
-
    Returns
    
+
    Returns
    
 
     the UUID from the connection's 'connection' setting
    
 
 
@@ -1678,7 +1678,7 @@ nm_connection_get_uuid (NMConnection *connection);
 
    A shortcut to return the ID from the connection's NMSettingConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1693,7 +1693,7 @@ nm_connection_get_id (
-
    Returns
    
+
    Returns
    
 
     the ID from the connection's 'connection' setting
    
 
 
@@ -1704,7 +1704,7 @@ nm_connection_get_id (NMConnection *connection);
 
    A shortcut to return the type from the connection's NMSettingConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1719,7 +1719,7 @@ nm_connection_get_connection_type (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the type from the connection's 'connection' setting
    
 
    
 
    Since: 0.9.10
    
@@ -1735,7 +1735,7 @@ return for the virtual device that would be created for 
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1750,7 +1750,7 @@ Eg, "VLAN (eth1.1)".
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the name of connection
 's device,
 or NULL if connection
@@ -1766,7 +1766,7 @@ is not a virtual connection type. 
    
 nm_connection_get_setting_802_1x (NMConnection *connection);
 
    A shortcut to return any NMSetting8021x the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1781,7 +1781,7 @@ nm_connection_get_setting_802_1x (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSetting8021x if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1793,7 +1793,7 @@ nm_connection_get_setting_802_1x (NMConnection *connection);
 
    A shortcut to return any NMSettingBluetooth the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1808,7 +1808,7 @@ nm_connection_get_setting_bluetooth (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingBluetooth if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1820,7 +1820,7 @@ nm_connection_get_setting_bluetooth (NMConnection *connection);
 
    A shortcut to return any NMSettingBond the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1835,7 +1835,7 @@ nm_connection_get_setting_bond (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingBond if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1847,7 +1847,7 @@ nm_connection_get_setting_bond (NMConnection *connection);
 
    A shortcut to return any NMSettingTeam the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1862,7 +1862,7 @@ nm_connection_get_setting_team (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingTeam if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1875,7 +1875,7 @@ nm_connection_get_setting_team (NMConnection *connection);
 
    A shortcut to return any NMSettingTeamPort the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1890,7 +1890,7 @@ nm_connection_get_setting_team_port (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingTeamPort if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1903,7 +1903,7 @@ nm_connection_get_setting_team_port (NMConnection *connection);
 
    A shortcut to return any NMSettingBridge the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1918,7 +1918,7 @@ nm_connection_get_setting_bridge (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingBridge if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1930,7 +1930,7 @@ nm_connection_get_setting_bridge (NMConnection *connection);
 
    A shortcut to return any NMSettingBridgePort the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1945,7 +1945,7 @@ nm_connection_get_setting_bridge_port (
-
    Returns
    
+
    Returns
    
 
     an NMSettingBridgePort if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
@@ -1957,7 +1957,7 @@ nm_connection_get_setting_bridge_port (NMConnection *connection);
 
    A shortcut to return any NMSettingCdma the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1972,7 +1972,7 @@ nm_connection_get_setting_cdma (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingCdma if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1984,7 +1984,7 @@ nm_connection_get_setting_cdma (NMConnection *connection);
 
    A shortcut to return any NMSettingConnection the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1999,7 +1999,7 @@ nm_connection_get_setting_connection (
-
    Returns
    
+
    Returns
    
 
     an NMSettingConnection if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
@@ -2011,7 +2011,7 @@ nm_connection_get_setting_connection (NMConnection *connection);
 
    A shortcut to return any NMSettingDcb the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2026,7 +2026,7 @@ nm_connection_get_setting_dcb (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingDcb if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2039,7 +2039,7 @@ nm_connection_get_setting_dcb (NMConnection *connection);
 
    A shortcut to return any NMSettingGeneric the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2054,7 +2054,7 @@ nm_connection_get_setting_generic (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingGeneric if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2067,7 +2067,7 @@ nm_connection_get_setting_generic (NMConnection *connection);
 
    A shortcut to return any NMSettingGsm the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2082,7 +2082,7 @@ nm_connection_get_setting_gsm (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingGsm if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2094,7 +2094,7 @@ nm_connection_get_setting_gsm (NMConnection *connection);
 
    A shortcut to return any NMSettingInfiniband the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2109,7 +2109,7 @@ nm_connection_get_setting_infiniband (
-
    Returns
    
+
    Returns
    
 
     an NMSettingInfiniband if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
@@ -2121,7 +2121,7 @@ nm_connection_get_setting_infiniband (NMConnection *connection);
 
    A shortcut to return any NMSettingIP4Config the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2136,7 +2136,7 @@ nm_connection_get_setting_ip4_config (
-
    Returns
    
+
    Returns
    
 
     an NMSettingIP4Config if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
@@ -2148,7 +2148,7 @@ nm_connection_get_setting_ip4_config (NMConnection *connection);
 
    A shortcut to return any NMSettingIP6Config the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2163,7 +2163,7 @@ nm_connection_get_setting_ip6_config (
-
    Returns
    
+
    Returns
    
 
     an NMSettingIP6Config if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
@@ -2175,7 +2175,7 @@ nm_connection_get_setting_ip6_config (NMConnection *connection);
 
    A shortcut to return any NMSettingOlpcMesh the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2190,7 +2190,7 @@ nm_connection_get_setting_olpc_mesh (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingOlpcMesh if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2202,7 +2202,7 @@ nm_connection_get_setting_olpc_mesh (NMConnection *connection);
 
    A shortcut to return any NMSettingPPP the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2217,7 +2217,7 @@ nm_connection_get_setting_ppp (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingPPP if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2229,7 +2229,7 @@ nm_connection_get_setting_ppp (NMConnection *connection);
 
    A shortcut to return any NMSettingPPPOE the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2244,7 +2244,7 @@ nm_connection_get_setting_pppoe (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingPPPOE if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2256,7 +2256,7 @@ nm_connection_get_setting_pppoe (NMConnection *connection);
 
    A shortcut to return any NMSettingSerial the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2271,7 +2271,7 @@ nm_connection_get_setting_serial (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingSerial if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2283,7 +2283,7 @@ nm_connection_get_setting_serial (NMConnection *connection);
 
    A shortcut to return any NMSettingVPN the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2298,7 +2298,7 @@ nm_connection_get_setting_vpn (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingVPN if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2310,7 +2310,7 @@ nm_connection_get_setting_vpn (NMConnection *connection);
 
    A shortcut to return any NMSettingWimax the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2325,7 +2325,7 @@ nm_connection_get_setting_wimax (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingWimax if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2337,7 +2337,7 @@ nm_connection_get_setting_wimax (NMConnection *connection);
 
    A shortcut to return any NMSettingAdsl the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2352,7 +2352,7 @@ nm_connection_get_setting_adsl (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingAdsl if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2364,7 +2364,7 @@ nm_connection_get_setting_adsl (NMConnection *connection);
 
    A shortcut to return any NMSettingWired the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2379,7 +2379,7 @@ nm_connection_get_setting_wired (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingWired if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2391,7 +2391,7 @@ nm_connection_get_setting_wired (NMConnection *connection);
 
    A shortcut to return any NMSettingWireless the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2406,7 +2406,7 @@ nm_connection_get_setting_wireless (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingWireless if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2419,7 +2419,7 @@ nm_connection_get_setting_wireless_security
                                (NMConnection *connection);
 
    A shortcut to return any NMSettingWirelessSecurity the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2434,7 +2434,7 @@ nm_connection_get_setting_wireless_security
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2446,7 +2446,7 @@ nm_connection_get_setting_wireless_security
 nm_connection_get_setting_vlan (NMConnection *connection);
 
    A shortcut to return any NMSettingVlan the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2461,7 +2461,7 @@ nm_connection_get_setting_vlan (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingVlan if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2497,7 +2497,7 @@ nm_connection_get_setting_vlan (
    enum NMConnectionError
    
 
    Describes errors that may result from operations involving a NMConnection.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -2593,7 +2593,7 @@ user_function (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2626,7 +2626,7 @@ user_function (The ::secrets-cleared signal is emitted when the secrets of a connection
 are cleared.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2659,7 +2659,7 @@ user_function (The ::secrets-updated signal is emitted when the secrets of a setting
 have been changed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2691,6 +2691,6 @@ updated
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 3ce89683..fe956fc8 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -50,22 +50,6 @@
 
 
     
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -244,6 +228,22 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -329,36 +329,12 @@ of properties and allowed values.
    
 nm_setting_error_quark (void);
 
    Registers an error quark for NMSetting if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSetting errors.
    
 
    
 
 
    
 
    
-
    NM_SETTING_PARAM_SERIALIZE
    
-
    #define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
-
    
-
    
-
    
-
    
-
    NM_SETTING_PARAM_REQUIRED
    
-
    #define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
-
    
-
    
-
    
-
    
-
    NM_SETTING_PARAM_SECRET
    
-
    #define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
-
    
-
    
-
    
-
    
-
    NM_SETTING_PARAM_FUZZY_IGNORE
    
-
    #define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
-
    
-
    
-
    
-
    
 
    NMSettingClearSecretsWithFlagsFn ()
    
 
    gboolean
 (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
@@ -366,7 +342,7 @@ nm_setting_error_quark (voidNMSettingSecretFlags flags,
                                      gpointer user_data);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    #defineNM_SETTING_PARAM_SERIALIZE
    #defineNM_SETTING_PARAM_REQUIRED
    #defineNM_SETTING_PARAM_SECRET
    #defineNM_SETTING_PARAM_FUZZY_IGNORE
    
 
 gboolean
 
    
 
    
 #defineNM_SETTING_PARAM_SERIALIZE
    #defineNM_SETTING_PARAM_REQUIRED
    #defineNM_SETTING_PARAM_SECRET
    #defineNM_SETTING_PARAM_FUZZY_IGNORE
    #define
 NM_SETTING_NAME
 
    
 
    @@ -398,7 +374,7 @@ nm_setting_error_quark (void
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE to clear the secret, FALSE to not clear the secret
    
 
    
 
@@ -412,7 +388,7 @@ nm_setting_error_quark (voidGParamFlags flags,
                          gpointer user_data);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -460,7 +436,7 @@ nm_setting_to_hash (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -482,7 +458,7 @@ D-Bus or serializing.  The mapping is string to GValue.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new GHashTable
 describing the setting's properties. 
    
 
    [transfer full][element-type utf8 GObject.Value]
    
@@ -501,7 +477,7 @@ are strongly typed, thus the GValue type of the hash value must be correct.
 See the documentation on each NMSetting object subclass for the correct
 property names and value types.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -524,7 +500,7 @@ string to GValue mapping of properties that apply to the setting. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new NMSetting object populated with the properties from the
 hash table, or NULL on failure
    
 
    
@@ -536,7 +512,7 @@ hash table, or NULL on failure
    
 nm_setting_duplicate (NMSetting *setting);
 
    Duplicates a NMSetting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -551,7 +527,7 @@ nm_setting_duplicate (
-
    Returns
    
+
    Returns
    
 
     a new NMSetting containing the same properties and values as the
 source NMSetting. 
    
 
    [transfer full]
    
@@ -564,7 +540,7 @@ source NMSetting *setting    );
 
    Returns the type name of the NMSetting object
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -579,7 +555,7 @@ nm_setting_get_name (
-
    Returns
    
+
    Returns
    
 
     a string containing the type name of the NMSetting object,
 like 'ppp' or 'wireless' or 'wired'.
    
 
@@ -597,7 +573,7 @@ some are dependent on other values (hence the need for GError contains information about which property of the setting
 failed validation, and in what way that property failed validation.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -626,7 +602,7 @@ came. 
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the setting is valid, FALSE if it is not
    
 
    
 
    
@@ -641,7 +617,7 @@ nm_setting_compare (NMSettingCompareFlags
 for a description of each flag's behavior.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -668,7 +644,7 @@ for a description of each flag's behavior.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the comparison succeeds, FALSE if it does not
    
 
    
 
    
@@ -688,7 +664,7 @@ of each setting that differ from the other are added to NMSettingDiffResult values.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -730,7 +706,7 @@ in and the settings differ, a new one is created and returned. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the settings contain the same values, FALSE if they do not
    
 
    
 
@@ -744,7 +720,7 @@ nm_setting_enumerate_values (NMSetting object, calling the supplied
 user function for each property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -781,7 +757,7 @@ nm_setting_to_string (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -796,7 +772,7 @@ output format is not guaranteed to be stable and may change at any time.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    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()
    
@@ -811,7 +787,7 @@ nm_setting_clear_secrets (
-
    Parameters
    
+
    Parameters
    
 
    @@ -836,7 +812,7 @@ nm_setting_clear_secrets_with_flags (Clears and frees secrets determined by func
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -875,7 +851,7 @@ to make a successful connection.  The returned hints are only intended as a
 guide to what secrets may be required, because in some circumstances, there
 is no way to conclusively determine exactly which secrets are needed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -890,7 +866,7 @@ is no way to conclusively determine exactly which secrets are needed.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     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
@@ -908,7 +884,7 @@ nm_setting_update_secrets (
-
    Parameters
    
+
    Parameters
    
 
    @@ -936,7 +912,7 @@ string to GValue of setting property names and secrets
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the secrets were successfully updated, FALSE on failure to
 update one or more of the secrets.
    
 
    
@@ -952,7 +928,7 @@ nm_setting_get_secret_flags (NMSettingSecretFlags describing how to
 handle that secret.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -984,7 +960,7 @@ handle that secret.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    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
    
 
    
@@ -1000,7 +976,7 @@ nm_setting_set_secret_flags (NMSettingSecretFlags describing how to
 handle that secret.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1032,7 +1008,7 @@ handle that secret.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    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
    
 
    
@@ -1045,7 +1021,7 @@ nm_setting_get_virtual_iface_name (Returns the name of the virtual kernel interface which the connection
 needs to use if specified in the settings.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1060,7 +1036,7 @@ needs to use if specified in the settings.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     Name of the virtual interface or NULL if the setting does not
 support this feature
    
 
    
@@ -1072,7 +1048,7 @@ support this feature
    
 
    enum NMSettingError
    
 
    Describes errors that may result from operations involving a NMSetting.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -1124,6 +1100,30 @@ support this feature
    
+
    NM_SETTING_PARAM_SERIALIZE
    
+
    #define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
+
    
+
    
+
    
+
    
+
    NM_SETTING_PARAM_REQUIRED
    
+
    #define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
+
    
+
    
+
    
+
    
+
    NM_SETTING_PARAM_SECRET
    
+
    #define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
+
    
+
    
+
    
+
    
+
    NM_SETTING_PARAM_FUZZY_IGNORE
    
+
    #define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
+
    
+
    
+
    
+
    
 
    NM_SETTING_NAME
    
 
    #define NM_SETTING_NAME "name"
 
    
@@ -1135,7 +1135,7 @@ support this feature
    
 secret has a corresponding set of these flags which indicate how the secret
 is to be stored and/or requested when it is needed.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -1188,7 +1188,7 @@ secret is not required
    These flags modify the comparison behavior when comparing two settings or
 two connections.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -1295,7 +1295,7 @@ It should only be accessed through the functions described below.
    These flags determine which properties are added to the resulting hash
 when calling nm_setting_to_hash().
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -1333,7 +1333,7 @@ when calling 
    enum NMSettingDiffResult
    These values indicate the result of a setting difference operation.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -1399,6 +1399,6 @@ example "ppp" or "wireless" or "wired".
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index 05d9516c..6713ef28 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -8,7 +8,7 @@
 
-
+
@@ -966,7 +966,7 @@ following books.
    
 nm_setting_802_1x_error_quark (void);
    Registers an error quark for NMSetting8021x if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSetting8021x errors.
    
 
    
@@ -977,7 +977,7 @@ nm_setting_802_1x_error_quark (vo
 nm_setting_802_1x_new (void);
 
    Creates a new NMSetting8021x object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSetting8021x object
    
 
    
 
@@ -992,7 +992,7 @@ network.  Generally only one EAP method is used.  Use the functions
 and nm_setting_802_1x_remove_eap_method() for adding, removing, and retrieving
 allowed EAP methods.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -1007,7 +1007,7 @@ allowed EAP methods.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of allowed EAP methods
    
 
    
 
@@ -1020,7 +1020,7 @@ nm_setting_802_1x_get_eap_method (Returns the name of the allowed EAP method at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1042,7 +1042,7 @@ nm_setting_802_1x_get_eap_method (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the name of the allowed EAP method at index i
 
    
 
    
@@ -1057,7 +1057,7 @@ nm_setting_802_1x_add_eap_method (“eap” property for a list of
 allowed EAP methods.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1079,7 +1079,7 @@ allowed EAP methods.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the EAP method was successfully added, FALSE if it was
 not a valid method or if it was already allowed.
    
 
    
@@ -1092,7 +1092,7 @@ nm_setting_802_1x_remove_eap_method (guint32 i);
 
    Removes the allowed EAP method at the specified index.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1124,7 +1124,7 @@ nm_setting_802_1x_remove_eap_method_by_value
 
    Removes the allowed EAP method method
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1146,7 +1146,7 @@ nm_setting_802_1x_remove_eap_method_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the EAP method was founs and removed, FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -1158,7 +1158,7 @@ nm_setting_802_1x_remove_eap_method_by_value
 nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);
 
    Clears all allowed EAP methods.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1181,7 +1181,7 @@ nm_setting_802_1x_get_identity (Returns the identifier used by some EAP methods (like TLS) to
 authenticate the user.  Often this is a username or login name.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1196,7 +1196,7 @@ authenticate the user.  Often this is a username or login name.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the user identifier
    
 
    
 
@@ -1211,7 +1211,7 @@ authenticate the user in the outer unencrypted "phase 1" authentication.  The
 inner "phase 2" authentication will use the “identity” in
 a secure form, if applicable for that EAP method.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1226,7 +1226,7 @@ a secure form, if applicable for that EAP method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the anonymous identifier
    
 
    
 
@@ -1237,7 +1237,7 @@ a secure form, if applicable for that EAP method.
    
 nm_setting_802_1x_get_pac_file (NMSetting8021x *setting);
 
    Returns the file containing PAC credentials used by EAP-FAST method.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1252,7 +1252,7 @@ nm_setting_802_1x_get_pac_file (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the PAC file
    
 
    
 
@@ -1268,7 +1268,7 @@ properties are ignored if the 
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1283,7 +1283,7 @@ of these properties.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if a system CA certificate path should be used, FALSE if not
    
 
    
 
@@ -1298,7 +1298,7 @@ which the supplicant can then add to the verification chain.  This may be
 used in addition to the “ca-cert” property to add more CA
 certificates for verifying the network to client.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1313,7 +1313,7 @@ certificates for verifying the network to client.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the CA certificate directory path
    
 
    
 
@@ -1328,7 +1328,7 @@ certificates which the supplicant can then add to the verification chain.
 This may be used in addition to the “phase2-ca-cert” property
 to add more CA certificates for verifying the network to client.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1343,7 +1343,7 @@ to add more CA certificates for verifying the network to client.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the "phase 2" CA certificate directory path
    
 
    
 
@@ -1356,7 +1356,7 @@ nm_setting_802_1x_get_ca_cert_scheme (NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
 if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1371,7 +1371,7 @@ if 
-
    Returns
    
+
    Returns
     scheme used to store the CA certificate (blob or path)
    
@@ -1387,7 +1387,7 @@ CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
 of the network cannot be confirmed by the client.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
    @@ -1402,7 +1402,7 @@ of the network cannot be confirmed by the client.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the CA certificate data
    
 
    
 
@@ -1418,7 +1418,7 @@ CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
 of the network cannot be confirmed by the client.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1433,7 +1433,7 @@ of the network cannot be confirmed by the client.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     path to the CA certificate file
    
 
    
 
@@ -1451,7 +1451,7 @@ with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1493,7 +1493,7 @@ clears the CA certificate.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
@@ -1503,7 +1503,7 @@ clears the CA certificate.
    		
 
 
    @@ -1518,7 +1518,7 @@ nm_setting_802_1x_get_subject_match (
 
 
    
-
    Returns
    
+
    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
@@ -1534,7 +1534,7 @@ nm_setting_802_1x_get_num_altsubject_matches
 
    Returns the number of entries in the
 “altsubject-matches” property of this setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1549,7 +1549,7 @@ nm_setting_802_1x_get_num_altsubject_matches
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of altsubject-matches entries.
    
 
    
 
@@ -1563,7 +1563,7 @@ nm_setting_802_1x_get_altsubject_match
 
    Returns the altSubjectName match at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1585,7 +1585,7 @@ nm_setting_802_1x_get_altsubject_match
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the altSubjectName match at index i
 
    
 
    
@@ -1601,7 +1601,7 @@ nm_setting_802_1x_add_altsubject_match
 match is added, the altSubjectName of the remote authentication
 server is not verified.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1623,7 +1623,7 @@ server is not verified.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the alternative subject name match was
 successfully added, FALSE if it was already allowed.
    
 
    
@@ -1637,7 +1637,7 @@ nm_setting_802_1x_remove_altsubject_match
                                 guint32 i);
 
    Removes the allowed altSubjectName at the specified index.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1669,7 +1669,7 @@ nm_setting_802_1x_remove_altsubject_match_by_value
 
    Removes the allowed altSubjectName altsubject_match
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1691,7 +1691,7 @@ nm_setting_802_1x_remove_altsubject_match_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the alternative subject name match was found and removed,
 FALSE if it was not.
    
 
    
@@ -1705,7 +1705,7 @@ nm_setting_802_1x_clear_altsubject_matches
                                (NMSetting8021x *setting);
 
    Clears all altSubjectName matches.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1730,7 +1730,7 @@ nm_setting_802_1x_get_client_cert_scheme
 is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
 if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1745,7 +1745,7 @@ if 
-
    Returns
    
+
    Returns
     scheme used to store the client certificate (blob or path)
    
@@ -1759,7 +1759,7 @@ nm_setting_802_1x_get_client_cert_blob
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
    @@ -1774,7 +1774,7 @@ authentication method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the client certificate data
    
 
    
 
@@ -1788,7 +1788,7 @@ nm_setting_802_1x_get_client_cert_path
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1803,7 +1803,7 @@ authentication method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     path to the client certificate file
    
 
    
 
@@ -1824,7 +1824,7 @@ file if using the 
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1867,7 +1867,7 @@ clears the client certificate.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
@@ -1877,7 +1877,7 @@ clears the client certificate.
    
 
    const char *
 nm_setting_802_1x_get_phase1_peapver (NMSetting8021x *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1892,7 +1892,7 @@ nm_setting_802_1x_get_phase1_peapver (
-
    Returns
    
+
    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).
    
@@ -1905,7 +1905,7 @@ values are NULL (unset), "0" (PEAP version 0), and
 nm_setting_802_1x_get_phase1_peaplabel
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1920,7 +1920,7 @@ nm_setting_802_1x_get_phase1_peaplabel
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    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),
@@ -1935,7 +1935,7 @@ wpa_supplicant documentation for more details.
    
 nm_setting_802_1x_get_phase1_fast_provisioning
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1950,7 +1950,7 @@ nm_setting_802_1x_get_phase1_fast_provisioning
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     whether "phase 1" PEAP fast provisioning should be used, as specified
 by the “phase1-fast-provisioning” property.  See the
 wpa_supplicant documentation for more details.
    
@@ -1962,7 +1962,7 @@ wpa_supplicant documentation for more details.
    
 
    const char *
 nm_setting_802_1x_get_phase2_auth (NMSetting8021x *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1977,7 +1977,7 @@ nm_setting_802_1x_get_phase2_auth (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the "phase 2" non-EAP (ex MD5) allowed authentication method as
 specified by the “phase2-auth” property.
    
 
    
@@ -1988,7 +1988,7 @@ specified by the const char *
 nm_setting_802_1x_get_phase2_autheap (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2003,7 +2003,7 @@ nm_setting_802_1x_get_phase2_autheap (
-
    Returns
    
+
    Returns
    
 
     the "phase 2" EAP-based (ex TLS) allowed authentication method as
 specified by the “phase2-autheap” property.
    
 
@@ -2019,7 +2019,7 @@ returned scheme is nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
 use nm_setting_802_1x_get_ca_cert_path().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2034,7 +2034,7 @@ use 
-
    Returns
    
+
    Returns
    
 
     scheme used to store the "phase 2" CA certificate (blob or path)
    
 
 
@@ -2051,7 +2051,7 @@ CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
 of the network cannot be confirmed by the client.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2066,7 +2066,7 @@ of the network cannot be confirmed by the client.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the "phase 2" CA certificate data
    
 
    
 
    
@@ -2083,7 +2083,7 @@ CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
 of the network cannot be confirmed by the client.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2098,7 +2098,7 @@ of the network cannot be confirmed by the client.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     path to the "phase 2" CA certificate file
    
 
    
 
    
@@ -2116,7 +2116,7 @@ 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 NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2158,7 +2158,7 @@ clears the "phase2" CA certificate.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
@@ -2169,7 +2169,7 @@ clears the "phase2" CA certificate.
    
 nm_setting_802_1x_get_phase2_subject_match
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2184,7 +2184,7 @@ nm_setting_802_1x_get_phase2_subject_match
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    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
@@ -2200,7 +2200,7 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 
    Returns the number of entries in the
 “phase2-altsubject-matches” property of this setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2215,7 +2215,7 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of phase2-altsubject-matches entries.
    
 
    
 
    
@@ -2229,7 +2229,7 @@ nm_setting_802_1x_get_phase2_altsubject_match
 
    Returns the "phase 2" altSubjectName match at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2251,7 +2251,7 @@ nm_setting_802_1x_get_phase2_altsubject_match
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the "phase 2" altSubjectName match at index i
 
    
 
    
@@ -2267,7 +2267,7 @@ nm_setting_802_1x_add_phase2_altsubject_match
 at least one match is added, the altSubjectName of the "phase 2"
 remote authentication server is not verified.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2290,7 +2290,7 @@ connection
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the "phase 2" alternative subject name match was
 successfully added, FALSE if it was already allowed.
    
 
    
@@ -2304,7 +2304,7 @@ nm_setting_802_1x_remove_phase2_altsubject_match
                                 guint32 i);
 
    Removes the allowed "phase 2" altSubjectName at the specified index.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2336,7 +2336,7 @@ nm_setting_802_1x_remove_phase2_altsubject_match_by_value
 
    Removes the allowed "phase 2" altSubjectName phase2_altsubject_match
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2358,7 +2358,7 @@ nm_setting_802_1x_remove_phase2_altsubject_match_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the alternative subject name match for "phase 2" was found and removed,
 FALSE if it was not.
    
 
    
@@ -2372,7 +2372,7 @@ nm_setting_802_1x_clear_phase2_altsubject_matches
                                (NMSetting8021x *setting);
 
    Clears all "phase 2" altSubjectName matches.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2399,7 +2399,7 @@ returned scheme is NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2414,7 +2414,7 @@ returned scheme is 
-
    Returns
    
+
    Returns
     scheme used to store the "phase 2" client certificate (blob or path)
    
@@ -2428,7 +2428,7 @@ nm_setting_802_1x_get_phase2_client_cert_blob
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
    @@ -2443,7 +2443,7 @@ authentication method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the "phase 2" client certificate data
    
 
    
 
@@ -2457,7 +2457,7 @@ nm_setting_802_1x_get_phase2_client_cert_path
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2472,7 +2472,7 @@ authentication method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     path to the "phase 2" client certificate file
    
 
    
 
@@ -2494,7 +2494,7 @@ file if using the 
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2537,7 +2537,7 @@ clears the "phase2" client certificate.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
@@ -2547,7 +2547,7 @@ clears the "phase2" client certificate.
    
 
    const char *
 nm_setting_802_1x_get_password (NMSetting8021x *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2562,7 +2562,7 @@ nm_setting_802_1x_get_password (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the password used by the authentication method, if any, as specified
 by the “password” property
    
 
    
@@ -2573,7 +2573,7 @@ by the NMSettingSecretFlags
 nm_setting_802_1x_get_password_flags (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2588,7 +2588,7 @@ nm_setting_802_1x_get_password_flags (
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the “password”
    
 
 
@@ -2598,7 +2598,7 @@ nm_setting_802_1x_get_password_flags (const GByteArray *
 nm_setting_802_1x_get_password_raw (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2613,7 +2613,7 @@ nm_setting_802_1x_get_password_raw (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the password used by the authentication method as a
 UTF-8-encoded array of bytes, as specified by the
 “password-raw” property
    
@@ -2626,7 +2626,7 @@ UTF-8-encoded array of bytes, as specified by the
 nm_setting_802_1x_get_password_raw_flags
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2641,7 +2641,7 @@ nm_setting_802_1x_get_password_raw_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the
 “password-raw”
    
 
    
@@ -2652,7 +2652,7 @@ nm_setting_802_1x_get_password_raw_flags
 
    const char *
 nm_setting_802_1x_get_pin (NMSetting8021x *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2667,7 +2667,7 @@ nm_setting_802_1x_get_pin (
-
    Returns
    
+
    Returns
    
 
     the PIN used by the authentication method, if any, as specified
 by the “pin” property
    
 
@@ -2678,7 +2678,7 @@ by the NMSettingSecretFlags
 nm_setting_802_1x_get_pin_flags (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2693,7 +2693,7 @@ nm_setting_802_1x_get_pin_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the
 “pin”
    
 
    
@@ -2710,7 +2710,7 @@ nm_setting_802_1x_get_private_key_scheme
 NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2725,7 +2725,7 @@ nm_setting_802_1x_get_private_key_scheme
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     scheme used to store the private key (blob or path)
    
 
    
 
@@ -2742,7 +2742,7 @@ authentication method.
    
 unencrypted private key data may be readable by unprivileged users.  Private
 keys should always be encrypted with a private key password.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2757,7 +2757,7 @@ keys should always be encrypted with a private key password.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the private key data
    
 
    
 
@@ -2771,7 +2771,7 @@ nm_setting_802_1x_get_private_key_path
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2786,7 +2786,7 @@ authentication method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     path to the private key file
    
 
    
 
@@ -2824,7 +2824,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2873,7 +2873,7 @@ an error is returned.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
@@ -2884,7 +2884,7 @@ an error is returned.
    
 nm_setting_802_1x_get_private_key_password
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2899,7 +2899,7 @@ nm_setting_802_1x_get_private_key_password
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the private key password used to decrypt the private key if
 previously set with nm_setting_802_1x_set_private_key(), or the
 “private-key-password” property.
    
@@ -2912,7 +2912,7 @@ previously set with NMSetting8021x *setting    );
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2927,7 +2927,7 @@ nm_setting_802_1x_get_private_key_password_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the
 “private-key-password”
    
 
    
@@ -2939,7 +2939,7 @@ nm_setting_802_1x_get_private_key_password_flags
 nm_setting_802_1x_get_private_key_format
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2954,7 +2954,7 @@ nm_setting_802_1x_get_private_key_format
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the data format of the private key data stored in the
 “private-key” property
    
 
    
@@ -2971,7 +2971,7 @@ scheme is NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2986,7 +2986,7 @@ scheme is 
-
    Returns
    
+
    Returns
     scheme used to store the "phase 2" private key (blob or path)
    
@@ -3003,7 +3003,7 @@ authentication method.
    
 unencrypted private key data may be readable by unprivileged users.  Private
 keys should always be encrypted with a private key password.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
    @@ -3018,7 +3018,7 @@ keys should always be encrypted with a private key password.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the "phase 2" private key data
    
 
    
 
    
@@ -3032,7 +3032,7 @@ nm_setting_802_1x_get_phase2_private_key_path
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3047,7 +3047,7 @@ authentication method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     path to the "phase 2" private key file
    
 
    
 
@@ -3086,7 +3086,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3136,7 +3136,7 @@ an error is returned.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
@@ -3147,7 +3147,7 @@ an error is returned.
    
 nm_setting_802_1x_get_phase2_private_key_password
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3162,7 +3162,7 @@ nm_setting_802_1x_get_phase2_private_key_password
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the private key password used to decrypt the private key if
 previously set with nm_setting_802_1x_set_phase2_private_key() or the
 “phase2-private-key-password” property.
    
@@ -3175,7 +3175,7 @@ previously set with NMSetting8021x *setting    );
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3190,7 +3190,7 @@ nm_setting_802_1x_get_phase2_private_key_password_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the
 “phase2-private-key-password”
    
 
    
@@ -3202,7 +3202,7 @@ nm_setting_802_1x_get_phase2_private_key_password_flags
 nm_setting_802_1x_get_phase2_private_key_format
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3217,7 +3217,7 @@ nm_setting_802_1x_get_phase2_private_key_format
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the data format of the "phase 2" private key data stored in the
 “phase2-private-key” property
    
 
    
@@ -3230,7 +3230,7 @@ nm_setting_802_1x_get_phase2_private_key_format
 
    NMSetting8021xCKFormat values indicate the general type of a certificate
 or private key
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -3279,7 +3279,7 @@ and private key
    
 stored in the setting properties, either as a blob of the item's data, or as
 a path to a certificate or private key file on the filesystem
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -3325,7 +3325,7 @@ to a file containing the certificate or key data
    
 
    enum NMSetting8021xError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -3963,6 +3963,6 @@ addition to any certificates specified by the 
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
index 165177b5..c05f9960 100644
--- a/docs/libnm-util/html/NMSettingAdsl.html
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -261,7 +261,7 @@ properties of ADSL connections.
    
 nm_setting_adsl_error_quark (void);
 
    Registers an error quark for NMSettingAdsl if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingAdsl errors.
    
 
    
@@ -272,7 +272,7 @@ nm_setting_adsl_error_quark (void
 nm_setting_adsl_new (void);
 
    Creates a new NMSettingAdsl object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingAdsl object
    
 
    
 
@@ -282,7 +282,7 @@ nm_setting_adsl_new (void<
 
    const char *
 nm_setting_adsl_get_username (NMSettingAdsl *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -297,7 +297,7 @@ nm_setting_adsl_get_username (
-
    Returns
    
+
    Returns
    
 
     the “username” property of the setting
    
 
 
@@ -307,7 +307,7 @@ nm_setting_adsl_get_username (const char *
 nm_setting_adsl_get_password (NMSettingAdsl *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -322,7 +322,7 @@ nm_setting_adsl_get_password (
-
    Returns
    
+
    Returns
    
 
     the “password” property of the setting
    
 
 
@@ -332,7 +332,7 @@ nm_setting_adsl_get_password (const char *
 nm_setting_adsl_get_protocol (NMSettingAdsl *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -347,7 +347,7 @@ nm_setting_adsl_get_protocol (
-
    Returns
    
+
    Returns
    
 
     the “protocol” property of the setting
    
 
 
@@ -357,7 +357,7 @@ nm_setting_adsl_get_protocol (const char *
 nm_setting_adsl_get_encapsulation (NMSettingAdsl *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -372,7 +372,7 @@ nm_setting_adsl_get_encapsulation (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “encapsulation” property of the setting
    
 
    
 
@@ -382,7 +382,7 @@ nm_setting_adsl_get_encapsulation (guint32
 nm_setting_adsl_get_vpi (NMSettingAdsl *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -397,7 +397,7 @@ nm_setting_adsl_get_vpi (
-
    Returns
    
+
    Returns
    
 
     the “vpi” property of the setting
    
 
 
@@ -407,7 +407,7 @@ nm_setting_adsl_get_vpi (guint32
 nm_setting_adsl_get_vci (NMSettingAdsl *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -422,7 +422,7 @@ nm_setting_adsl_get_vci (
-
    Returns
    
+
    Returns
    
 
     the “vci” property of the setting
    
 
 
@@ -432,7 +432,7 @@ nm_setting_adsl_get_vci (NMSettingSecretFlags
 nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -447,7 +447,7 @@ nm_setting_adsl_get_password_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the “password”
    
 
    
 
@@ -463,7 +463,7 @@ nm_setting_adsl_get_password_flags (
 
    enum NMSettingAdslError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -639,6 +639,6 @@ required
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index b011f98f..8f6ca597 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -166,7 +166,7 @@ Point (NAP) profiles.
    
 nm_setting_bluetooth_error_quark (void);
 
    Registers an error quark for NMSettingBluetooth if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingBluetooth errors.
    
 
    
 
@@ -177,7 +177,7 @@ nm_setting_bluetooth_error_quark (void);
 
    Creates a new NMSettingBluetooth object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingBluetooth object. 
    
 
    [transfer full]
    
 
    
@@ -190,7 +190,7 @@ nm_setting_bluetooth_get_bdaddr (Gets the Bluetooth address of the remote device which this setting
 describes a connection to.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -205,7 +205,7 @@ describes a connection to.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the Bluetooth address
    
 
    
 
    
@@ -218,7 +218,7 @@ nm_setting_bluetooth_get_connection_type
 
    Returns the connection method for communicating with the remote device (i.e.
 either DUN to a DUN-capable device or PANU to a NAP-capable device).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -233,7 +233,7 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the type, either NM_SETTING_BLUETOOTH_TYPE_PANU or
 NM_SETTING_BLUETOOTH_TYPE_DUN
    
 
    
@@ -250,7 +250,7 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).
    
 
    
 
    enum NMSettingBluetoothError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -348,6 +348,6 @@ Area Networking connections to devices supporting the NAP profile.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index 8d0e4d48..3889dacd 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -8,7 +8,7 @@
 
-
+
@@ -269,7 +269,7 @@ necessary for bond connections.
    
 nm_setting_bond_error_quark (void);
    Registers an error quark for NMSettingBond if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingBond errors.
    
 
    
@@ -280,7 +280,7 @@ nm_setting_bond_error_quark (void
 nm_setting_bond_new (void);
 
    Creates a new NMSettingBond object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingBond object. 
    
 
    [transfer full]
    
 
    
@@ -291,7 +291,7 @@ nm_setting_bond_new (void<
 
    const char *
 nm_setting_bond_get_interface_name (NMSettingBond *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -306,7 +306,7 @@ nm_setting_bond_get_interface_name (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “interface-name” property of the setting
    
 
    
 
@@ -319,7 +319,7 @@ nm_setting_bond_get_num_options (nm_setting_bond_get_option().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -334,7 +334,7 @@ using 
 
 
    
-
    Returns
    
+
    Returns
    
 
     the number of bonding options
    
 
    
 
@@ -352,7 +352,7 @@ are *not* guaranteed to be static across modifications to options done by
 and should not be used to refer to options except for short periods of time
 such as during option iteration.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -387,7 +387,7 @@ option; this value is owned by the setting and should not be modified. 
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    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
 currently held by the setting)
    
@@ -403,7 +403,7 @@ nm_setting_bond_get_option_by_name (name
 , if it exists.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -425,7 +425,7 @@ nm_setting_bond_get_option_by_name (
 
 
    
-
    Returns
    
+
    Returns
    
 
     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
    
 
    
@@ -444,7 +444,7 @@ that may already exist.
    
 
    The order of how to set several options is relevant because there are options
 that conflict with each other.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -471,7 +471,7 @@ that conflict with each other.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the option was valid and was added to the internal option
 list, FALSE if it was not.
    
 
    
@@ -486,7 +486,7 @@ nm_setting_bond_remove_option (
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -508,7 +508,7 @@ list.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the option was found and removed from the internal option
 list, FALSE if it was not.
    
 
    
@@ -526,7 +526,7 @@ the name
 . If value
  is NULL, the function only validates the option name.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -548,7 +548,7 @@ the name
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE, if the value
 is valid for the given name.
 If the name
@@ -563,7 +563,7 @@ is not a valid option, FALSE will be returned.
    
 nm_setting_bond_get_valid_options (NMSettingBond *setting);
 
    Returns a list of valid bond options.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -578,7 +578,7 @@ nm_setting_bond_get_valid_options (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a NULL-terminated array of strings of valid bond options. 
    
 
    [transfer none]
    
 
    
@@ -590,7 +590,7 @@ nm_setting_bond_get_valid_options (NMSettingBond *setting,
                                     const char *name);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -612,7 +612,7 @@ nm_setting_bond_get_option_default (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the value of the bond option if not overridden by an entry in
 the “options” property.
    
 
    
@@ -629,7 +629,7 @@ the 
 
    enum NMSettingBondError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -654,20 +654,24 @@ the 
    NM_SETTING_BOND_ERROR_MISSING_PROPERTY
    
     
-
-
+
+
-
-
+
+
    
 
 

    
-
    the property was missing and is
-required
    
+
    the property was missing and is
    
     		
  
 
    
 
    
 
    NM_SETTING_BOND_ERROR_INVALID_OPTION
    		  
+
    the option was invalid
    
+    		 
 
    
 
    
 
    NM_SETTING_BOND_ERROR_MISSING_OPTION
    		  
+
    the option was missing
+required
    
+    		 
 
    
     
 
    
@@ -803,6 +807,6 @@ must be strings. Option names must contain only alphanumeric characters
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
    
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
index 71cdd58f..a25a31ba 100644
--- a/docs/libnm-util/html/NMSettingBridge.html
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -258,7 +258,7 @@ necessary for bridging connections.
    
 nm_setting_bridge_error_quark (void);
 
    Registers an error quark for NMSettingBridge if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingBridge errors.
    
 
    
 
    Since: 0.9.8
    
@@ -270,7 +270,7 @@ nm_setting_bridge_error_quark (vo
 nm_setting_bridge_new (void);
 
    Creates a new NMSettingBridge object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingBridge object. 
    
 
    [transfer full]
    
 
    
@@ -282,7 +282,7 @@ nm_setting_bridge_new (voidconst char *
 nm_setting_bridge_get_interface_name (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -297,7 +297,7 @@ nm_setting_bridge_get_interface_name (
-
    Returns
    
+
    Returns
    
 
     the “interface-name” property of the setting
    
 
 
    Since: 0.9.8
    
@@ -308,7 +308,7 @@ nm_setting_bridge_get_interface_name (const GByteArray *
 nm_setting_bridge_get_mac_address (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -323,7 +323,7 @@ nm_setting_bridge_get_mac_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “mac-address” property of the setting
    
 
    
 
    Since: 0.9.10
    
@@ -334,7 +334,7 @@ nm_setting_bridge_get_mac_address (gboolean
 nm_setting_bridge_get_stp (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -349,7 +349,7 @@ nm_setting_bridge_get_stp (
-
    Returns
    
+
    Returns
    
 
     the “stp” property of the setting
    
 
 
    Since: 0.9.8
    
@@ -360,7 +360,7 @@ nm_setting_bridge_get_stp (guint16
 nm_setting_bridge_get_priority (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -375,7 +375,7 @@ nm_setting_bridge_get_priority (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “priority” property of the setting
    
 
    
 
    Since: 0.9.8
    
@@ -386,7 +386,7 @@ nm_setting_bridge_get_priority (guint16
 nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -401,7 +401,7 @@ nm_setting_bridge_get_forward_delay (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “forward-delay” property of the setting
    
 
    
 
    Since: 0.9.8
    
@@ -412,7 +412,7 @@ nm_setting_bridge_get_forward_delay (guint16
 nm_setting_bridge_get_hello_time (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -427,7 +427,7 @@ nm_setting_bridge_get_hello_time (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “hello-time” property of the setting
    
 
    
 
    Since: 0.9.8
    
@@ -438,7 +438,7 @@ nm_setting_bridge_get_hello_time (guint16
 nm_setting_bridge_get_max_age (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -453,7 +453,7 @@ nm_setting_bridge_get_max_age (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “max-age” property of the setting
    
 
    
 
    Since: 0.9.8
    
@@ -464,7 +464,7 @@ nm_setting_bridge_get_max_age (guint32
 nm_setting_bridge_get_ageing_time (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -479,7 +479,7 @@ nm_setting_bridge_get_ageing_time (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “ageing-time” property of the setting
    
 
    
 
    Since: 0.9.8
    
@@ -496,7 +496,7 @@ nm_setting_bridge_get_ageing_time (
 
    enum NMSettingBridgeError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -670,6 +670,6 @@ bridge.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
index bc204181..48fce2eb 100644
--- a/docs/libnm-util/html/NMSettingBridgePort.html
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -173,7 +173,7 @@ optional properties that apply to bridge ports.
    
 nm_setting_bridge_port_error_quark (void);
 
    Registers an error quark for NMSettingBridgePort if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingBridgePort errors.
    
 
    
 
    Since: 0.9.8
    
@@ -185,7 +185,7 @@ nm_setting_bridge_port_error_quark (void);
 
    Creates a new NMSettingBridgePort object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingBridgePort object. 
    
 
    [transfer full]
    
 
    
@@ -197,7 +197,7 @@ nm_setting_bridge_port_new (void<
 
    guint16
 nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -212,7 +212,7 @@ nm_setting_bridge_port_get_priority (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “priority” property of the setting
    
 
    
 
    Since: 0.9.8
    
@@ -223,7 +223,7 @@ nm_setting_bridge_port_get_priority (guint16
 nm_setting_bridge_port_get_path_cost (NMSettingBridgePort *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -238,7 +238,7 @@ nm_setting_bridge_port_get_path_cost (
-
    Returns
    
+
    Returns
    
 
     the “path-cost” property of the setting
    
 
 
    Since: 0.9.8
    
@@ -250,7 +250,7 @@ nm_setting_bridge_port_get_path_cost (NMSettingBridgePort *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -265,7 +265,7 @@ nm_setting_bridge_port_get_hairpin_mode
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “hairpin-mode” property of the setting
    
 
    
 
    Since: 0.9.8
    
@@ -282,7 +282,7 @@ nm_setting_bridge_port_get_hairpin_mode
 
    
 
    enum NMSettingBridgePortError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -377,6 +377,6 @@ port.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index 43980d9d..cee12173 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -8,7 +8,7 @@
 
-
+
@@ -191,7 +191,7 @@ networks, including those using CDMA2000/EVDO technology.
    
 nm_setting_cdma_error_quark (void);
    Registers an error quark for NMSettingCdma if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingCdma errors.
    
 
    
@@ -202,7 +202,7 @@ nm_setting_cdma_error_quark (void
 nm_setting_cdma_new (void);
 
    Creates a new NMSettingCdma object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingCdma object
    
 
    
 
@@ -212,7 +212,7 @@ nm_setting_cdma_new (void<
 
    const char *
 nm_setting_cdma_get_number (NMSettingCdma *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -227,7 +227,7 @@ nm_setting_cdma_get_number (
-
    Returns
    
+
    Returns
    
 
     the “number” property of the setting
    
 
 
@@ -237,7 +237,7 @@ nm_setting_cdma_get_number (const char *
 nm_setting_cdma_get_username (NMSettingCdma *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -252,7 +252,7 @@ nm_setting_cdma_get_username (
-
    Returns
    
+
    Returns
    
 
     the “username” property of the setting
    
 
 
@@ -262,7 +262,7 @@ nm_setting_cdma_get_username (const char *
 nm_setting_cdma_get_password (NMSettingCdma *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -277,7 +277,7 @@ nm_setting_cdma_get_password (
-
    Returns
    
+
    Returns
    
 
     the “password” property of the setting
    
 
 
@@ -287,7 +287,7 @@ nm_setting_cdma_get_password (NMSettingSecretFlags
 nm_setting_cdma_get_password_flags (NMSettingCdma *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -302,7 +302,7 @@ nm_setting_cdma_get_password_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the “password”
    
 
    
 
@@ -318,7 +318,7 @@ nm_setting_cdma_get_password_flags (
 
    enum NMSettingCdmaError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -434,6 +434,6 @@ username is required, it is specified here.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index ba73eb00..f1dd93b7 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -430,7 +430,7 @@ a void    );
 
    Registers an error quark for NMSettingConnection if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingConnection errors.
    
 
    
 
@@ -441,7 +441,7 @@ nm_setting_connection_error_quark (void);
 
    Creates a new NMSettingConnection object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingConnection object
    
 
    
 
@@ -452,7 +452,7 @@ nm_setting_connection_new (voidNMSettingConnection *setting);
 
    Returns the “id” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -467,7 +467,7 @@ nm_setting_connection_get_id (
-
    Returns
    
+
    Returns
    
 
     the connection ID
    
 
 
@@ -478,7 +478,7 @@ nm_setting_connection_get_id (NMSettingConnection *setting);
 
    Returns the “uuid” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -493,7 +493,7 @@ nm_setting_connection_get_uuid (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the connection UUID
    
 
    
 
@@ -505,7 +505,7 @@ nm_setting_connection_get_interface_name
                                (NMSettingConnection *setting);
 
    Returns the “interface-name” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -520,7 +520,7 @@ nm_setting_connection_get_interface_name
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the connection's interface name
    
 
    
 
    Since: 0.9.10
    
@@ -533,7 +533,7 @@ nm_setting_connection_get_connection_type
                                (NMSettingConnection *setting);
 
    Returns the “type” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -548,7 +548,7 @@ nm_setting_connection_get_connection_type
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the connection type
    
 
    
 
    
@@ -559,7 +559,7 @@ nm_setting_connection_get_connection_type
 nm_setting_connection_get_autoconnect (NMSettingConnection *setting);
 
    Returns the “autoconnect” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -574,7 +574,7 @@ nm_setting_connection_get_autoconnect (
-
    Returns
    
+
    Returns
    
 
     the connection's autoconnect behavior
    
 
 
@@ -585,7 +585,7 @@ nm_setting_connection_get_autoconnect (NMSettingConnection *setting);
 
    Returns the “timestamp” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -600,7 +600,7 @@ nm_setting_connection_get_timestamp (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the connection's timestamp
    
 
    
 
@@ -611,7 +611,7 @@ nm_setting_connection_get_timestamp (NMSettingConnection *setting);
 
    Returns the “read-only” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -626,7 +626,7 @@ nm_setting_connection_get_read_only (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection is read-only, FALSE if it is not
    
 
    
 
@@ -639,7 +639,7 @@ nm_setting_connection_get_num_permissions
 
    Returns the number of entires in the “permissions”
 property of this setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -654,7 +654,7 @@ property of this setting.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of permissions entires
    
 
    
 
    
@@ -670,7 +670,7 @@ nm_setting_connection_get_permission (“permissions” property
 of this setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -709,7 +709,7 @@ of this setting.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if a permission was returned, FALSE if idx
 was invalid
    
 
    
@@ -721,7 +721,7 @@ was invalid
    
 nm_setting_connection_get_zone (NMSettingConnection *setting);
 
    Returns the “zone” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -736,7 +736,7 @@ nm_setting_connection_get_zone (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the trust level of a connection
    
 
    
 
@@ -749,7 +749,7 @@ nm_setting_connection_permissions_user_allowed
                                 const char *uname);
 
    Checks whether the given username is allowed to view/access this connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -771,7 +771,7 @@ nm_setting_connection_permissions_user_allowed
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the requested user is allowed to view this connection,
 FALSE if the given user is not allowed to view this connection
    
 
    
@@ -789,7 +789,7 @@ the "user" permission type is supported, and pitem“permissions”: for more details.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -822,7 +822,7 @@ the "user" permission type is supported, and pitem
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the permission was unique and was successfully added to the
 list, FALSE if ptype
 or pitem
@@ -840,7 +840,7 @@ nm_setting_connection_remove_permission
 
    Removes the permission at index idx
  from the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -876,7 +876,7 @@ At this time, only the "user" permission type is supported, and “permissions”: for more details.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -909,7 +909,7 @@ be a username. See 
-
    Returns
    
+
    Returns
    
 
     TRUE if the permission was found and removed; FALSE if it was not.
    
 
 
    Since: 0.9.10
    
@@ -921,7 +921,7 @@ be a username. See NMSettingConnection *setting    );
 
    Returns the “master” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -936,7 +936,7 @@ nm_setting_connection_get_master (
 
 
    
-
    Returns
    
+
    Returns
    
 
     interface name of the master device or UUID of the master
 connection.
    
 
    
@@ -948,7 +948,7 @@ connection.
    
 nm_setting_connection_is_slave_type (NMSettingConnection *setting,
                                      const char *type);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -972,7 +972,7 @@ against setting
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if connection is of the given slave type
 
    
 
    
@@ -984,7 +984,7 @@ against setting
 nm_setting_connection_get_slave_type (NMSettingConnection *setting);
 
    Returns the “slave-type” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -999,7 +999,7 @@ nm_setting_connection_get_slave_type (
-
    Returns
    
+
    Returns
    
 
     the type of slave this connection is, if any
    
 
 
@@ -1010,7 +1010,7 @@ nm_setting_connection_get_slave_type (NMSettingConnection *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1025,7 +1025,7 @@ nm_setting_connection_get_num_secondaries
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured secondary connection UUIDs
    
 
    
 
    Since: 0.9.8
    
@@ -1037,7 +1037,7 @@ nm_setting_connection_get_num_secondaries
 nm_setting_connection_get_secondary (NMSettingConnection *setting,
                                      guint32 idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1059,7 +1059,7 @@ nm_setting_connection_get_secondary (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the secondary connection UUID at index idx
 
    
 
    
@@ -1073,7 +1073,7 @@ nm_setting_connection_add_secondary (const char *sec_uuid);
 
    Adds a new secondary connetion UUID to the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1095,7 +1095,7 @@ nm_setting_connection_add_secondary (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the secondary connection UUID was added; FALSE if the UUID
 was already present
    
 
    
@@ -1111,7 +1111,7 @@ nm_setting_connection_remove_secondary
 
    Removes the secondary coonnection UUID at index idx
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1144,7 +1144,7 @@ nm_setting_connection_remove_secondary_by_value
 
    Removes the secondary coonnection UUID sec_uuid
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1166,7 +1166,7 @@ nm_setting_connection_remove_secondary_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the secondary connection UUID was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -1178,7 +1178,7 @@ nm_setting_connection_remove_secondary_by_value
 nm_setting_connection_get_gateway_ping_timeout
                                (NMSettingConnection *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1193,7 +1193,7 @@ nm_setting_connection_get_gateway_ping_timeout
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the value contained in the “gateway-ping-timeout”
 property.
    
 
    
@@ -1213,7 +1213,7 @@ property.
    
 
    Describes errors that may result from operations involving a
 NMSettingConnection.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -1517,6 +1517,6 @@ firewall.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingDcb.html b/docs/libnm-util/html/NMSettingDcb.html
index 5cd1cd53..943f3ea6 100644
--- a/docs/libnm-util/html/NMSettingDcb.html
+++ b/docs/libnm-util/html/NMSettingDcb.html
@@ -8,7 +8,7 @@
 
-
+
@@ -447,7 +447,7 @@ of storage technologies like Fibre Channel over Ethernet (FCoE) and iSCSI.
    
 nm_setting_dcb_error_quark (void);
    Registers an error quark for NMSettingDcb if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingDcb errors.
    
 
    Since: 0.9.10
    
@@ -459,7 +459,7 @@ nm_setting_dcb_error_quark (void<
 nm_setting_dcb_new (void);
 
    Creates a new NMSettingDcb object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingDcb object. 
    
 
    [transfer full]
    
 
    
@@ -471,7 +471,7 @@ nm_setting_dcb_new (voidNMSettingDcbFlags
 nm_setting_dcb_get_app_fcoe_flags (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -486,7 +486,7 @@ nm_setting_dcb_get_app_fcoe_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “app-fcoe-flags” property of the setting
    
 
    
 
    Since: 0.9.10
    
@@ -497,7 +497,7 @@ nm_setting_dcb_get_app_fcoe_flags (gint
 nm_setting_dcb_get_app_fcoe_priority (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -512,7 +512,7 @@ nm_setting_dcb_get_app_fcoe_priority (
-
    Returns
    
+
    Returns
    
 
     the “app-fcoe-priority” property of the setting
    
 
 
    Since: 0.9.10
    
@@ -523,7 +523,7 @@ nm_setting_dcb_get_app_fcoe_priority (const char *
 nm_setting_dcb_get_app_fcoe_mode (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -538,7 +538,7 @@ nm_setting_dcb_get_app_fcoe_mode (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “app-fcoe-mode” property of the setting
    
 
    
 
    Since: 0.9.10
    
@@ -549,7 +549,7 @@ nm_setting_dcb_get_app_fcoe_mode (NMSettingDcbFlags
 nm_setting_dcb_get_app_iscsi_flags (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -564,7 +564,7 @@ nm_setting_dcb_get_app_iscsi_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “app-iscsi-flags” property of the setting
    
 
    
 
    Since: 0.9.10
    
@@ -575,7 +575,7 @@ nm_setting_dcb_get_app_iscsi_flags (gint
 nm_setting_dcb_get_app_iscsi_priority (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -590,7 +590,7 @@ nm_setting_dcb_get_app_iscsi_priority (
-
    Returns
    
+
    Returns
    
 
     the “app-iscsi-priority” property of the setting
    
 
 
    Since: 0.9.10
    
@@ -601,7 +601,7 @@ nm_setting_dcb_get_app_iscsi_priority (NMSettingDcbFlags
 nm_setting_dcb_get_app_fip_flags (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -616,7 +616,7 @@ nm_setting_dcb_get_app_fip_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “app-fip-flags” property of the setting
    
 
    
 
    Since: 0.9.10
    
@@ -627,7 +627,7 @@ nm_setting_dcb_get_app_fip_flags (gint
 nm_setting_dcb_get_app_fip_priority (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -642,7 +642,7 @@ nm_setting_dcb_get_app_fip_priority (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “app-fip-priority” property of the setting
    
 
    
 
    Since: 0.9.10
    
@@ -654,7 +654,7 @@ nm_setting_dcb_get_app_fip_priority (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -669,7 +669,7 @@ nm_setting_dcb_get_priority_flow_control_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “priority-flow-control-flags” property of the setting
    
 
    
 
    Since: 0.9.10
    
@@ -682,7 +682,7 @@ nm_setting_dcb_get_priority_flow_control
                                (NMSettingDcb *setting,
                                 guint user_priority);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -704,7 +704,7 @@ nm_setting_dcb_get_priority_flow_control
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if flow control is enabled for the given user_priority
 ,
 FALSE if not enabled
    
@@ -722,7 +722,7 @@ nm_setting_dcb_set_priority_flow_control
 
    These values are only valid when “priority-flow-control” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -757,7 +757,7 @@ the NMSettingDcb *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -772,7 +772,7 @@ nm_setting_dcb_get_priority_group_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “priority-group-flags” property of the setting
    
 
    
 
    Since: 0.9.10
    
@@ -784,7 +784,7 @@ nm_setting_dcb_get_priority_group_flags
 nm_setting_dcb_get_priority_group_id (NMSettingDcb *setting,
                                       guint user_priority);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -806,7 +806,7 @@ nm_setting_dcb_get_priority_group_id (
-
    Returns
    
+
    Returns
    
 
     the group number user_priority
 is assigned to.  These values are
 only valid when “priority-group-flags” includes the
@@ -824,7 +824,7 @@ nm_setting_dcb_set_priority_group_id (“priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -862,7 +862,7 @@ nm_setting_dcb_get_priority_group_bandwidth
                                (NMSettingDcb *setting,
                                 guint group_id);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -884,7 +884,7 @@ nm_setting_dcb_get_priority_group_bandwidth
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the bandwidth percentage assigned to group_id
 .  These values are
 only valid when “priority-group-flags” includes the
@@ -903,7 +903,7 @@ nm_setting_dcb_set_priority_group_bandwidth
 
    These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -939,7 +939,7 @@ to
    
 nm_setting_dcb_get_priority_bandwidth (NMSettingDcb *setting,
                                        guint user_priority);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -961,7 +961,7 @@ nm_setting_dcb_get_priority_bandwidth (
-
    Returns
    
+
    Returns
    
 
     the allowed bandwidth percentage of user_priority
 in its priority group.
 These values are only valid when “priority-group-flags” includes the
@@ -979,7 +979,7 @@ nm_setting_dcb_set_priority_bandwidth (“priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1017,7 +1017,7 @@ nm_setting_dcb_get_priority_strict_bandwidth
                                (NMSettingDcb *setting,
                                 guint user_priority);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1039,7 +1039,7 @@ nm_setting_dcb_get_priority_strict_bandwidth
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     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
@@ -1058,7 +1058,7 @@ nm_setting_dcb_set_priority_strict_bandwidth
 
    These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1096,7 +1096,7 @@ nm_setting_dcb_get_priority_traffic_class
                                (NMSettingDcb *setting,
                                 guint user_priority);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1118,7 +1118,7 @@ nm_setting_dcb_get_priority_traffic_class
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the traffic class assigned to user_priority
 . These values are only
 valid when “priority-group-flags” includes the
@@ -1147,7 +1147,7 @@ nm_setting_dcb_set_priority_traffic_class
 
    
 
    enum NMSettingDcbError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -1192,7 +1192,7 @@ required
    enum NMSettingDcbFlags
    DCB feature flags.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -1517,6 +1517,6 @@ which the priority is mapped.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGeneric.html b/docs/libnm-util/html/NMSettingGeneric.html
index b6cc9066..4ccfa39c 100644
--- a/docs/libnm-util/html/NMSettingGeneric.html
+++ b/docs/libnm-util/html/NMSettingGeneric.html
@@ -8,7 +8,7 @@
 
-
+
@@ -102,7 +102,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
    
@@ -112,7 +112,7 @@ the "connection type" setting on 
 nm_setting_generic_error_quark (void);
 
    Registers an error quark for NMSettingGeneric if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingGeneric errors.
    
 
    
 
    Since: 0.9.10
    
@@ -124,7 +124,7 @@ nm_setting_generic_error_quark (v
 nm_setting_generic_new (void);
 
    Creates a new NMSettingGeneric object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingGeneric object. 
    
 
    [transfer full]
    
 
    
@@ -142,7 +142,7 @@ nm_setting_generic_new (void
 
    enum NMSettingGenericError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -186,6 +186,6 @@ is required
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index 1e725b02..73c0b048 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -50,10 +50,6 @@
 
 
     
-
-
-
-
@@ -291,6 +287,10 @@
 
+
+
+
+
    
 
 

    #defineNM_SETTING_GSM_BANDS_MAX
    
 
 NMSetting *
 enum
 NMSettingGsmNetworkBand
 
    #defineNM_SETTING_GSM_BANDS_MAX
    
     
 
    
 
    
@@ -324,29 +324,18 @@ networks, including those using GPRS/EDGE and UMTS/HSPA technology.
    
 nm_setting_gsm_error_quark (void);
 
    Registers an error quark for NMSettingGsm if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingGsm errors.
    
 
    
 
    
 
    
 
    
-
    NM_SETTING_GSM_BANDS_MAX
    
-
    #define             NM_SETTING_GSM_BANDS_MAX
    
-
    
-
    NM_SETTING_GSM_BANDS_MAX has been deprecated since version 0.9.10 and should not be used in newly-written code.
    
-
    No longer used.
    
-
    
-
    NM_SETTING_GSM_BANDS_MAX macro indicate the maximal value that can be used
-as the allowed frequency bands (“allowed-bands” property).
    
-
    
-
    
-
    
 
    nm_setting_gsm_new ()
    
 
    NMSetting *
 nm_setting_gsm_new (void);
    
 
    Creates a new NMSettingGsm object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingGsm object
    
 
    
 
    
@@ -356,7 +345,7 @@ nm_setting_gsm_new (voidconst char *
 nm_setting_gsm_get_number (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -371,7 +360,7 @@ nm_setting_gsm_get_number (
-
    Returns
    
+
    Returns
    
 
     the “number” property of the setting
    
 
 
@@ -381,7 +370,7 @@ nm_setting_gsm_get_number (const char *
 nm_setting_gsm_get_username (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -396,7 +385,7 @@ nm_setting_gsm_get_username (
-
    Returns
    
+
    Returns
    
 
     the “username” property of the setting
    
 
 
@@ -406,7 +395,7 @@ nm_setting_gsm_get_username (const char *
 nm_setting_gsm_get_password (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -421,7 +410,7 @@ nm_setting_gsm_get_password (
-
    Returns
    
+
    Returns
    
 
     the “password” property of the setting
    
 
 
@@ -431,7 +420,7 @@ nm_setting_gsm_get_password (const char *
 nm_setting_gsm_get_apn (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -446,7 +435,7 @@ nm_setting_gsm_get_apn (
-
    Returns
    
+
    Returns
    
 
     the “apn” property of the setting
    
 
 
@@ -456,7 +445,7 @@ nm_setting_gsm_get_apn (const char *
 nm_setting_gsm_get_network_id (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -471,7 +460,7 @@ nm_setting_gsm_get_network_id (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “network-id” property of the setting
    
 
    
 
@@ -481,7 +470,7 @@ nm_setting_gsm_get_network_id (const char *
 nm_setting_gsm_get_pin (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -496,7 +485,7 @@ nm_setting_gsm_get_pin (
-
    Returns
    
+
    Returns
    
 
     the “pin” property of the setting
    
 
 
@@ -506,7 +495,7 @@ nm_setting_gsm_get_pin (gboolean
 nm_setting_gsm_get_home_only (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -521,7 +510,7 @@ nm_setting_gsm_get_home_only (
-
    Returns
    
+
    Returns
    
 
     the “home-only” property of the setting
    
 
 
@@ -531,7 +520,7 @@ nm_setting_gsm_get_home_only (NMSettingSecretFlags
 nm_setting_gsm_get_pin_flags (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -546,7 +535,7 @@ nm_setting_gsm_get_pin_flags (
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the “pin”
    
 
 
@@ -556,7 +545,7 @@ nm_setting_gsm_get_pin_flags (NMSettingSecretFlags
 nm_setting_gsm_get_password_flags (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -571,7 +560,7 @@ nm_setting_gsm_get_password_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the “password”
    
 
    
 
@@ -585,7 +574,7 @@ nm_setting_gsm_get_network_type (No longer used. Network type setting should be done talking to ModemManager directly.
    
 
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -600,7 +589,7 @@ nm_setting_gsm_get_network_type (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “network-type” property of the setting
    
 
    
 
@@ -614,7 +603,7 @@ nm_setting_gsm_get_allowed_bands (No longer used. Bands setting should be done talking to ModemManager directly.
    
 
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -629,7 +618,7 @@ nm_setting_gsm_get_allowed_bands (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “allowed-bands” property of the setting
    
 
    
 
@@ -645,7 +634,7 @@ nm_setting_gsm_get_allowed_bands (
 
    enum NMSettingGsmError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -769,7 +758,7 @@ is missing in the connection
    
 
    NMSettingGsmNetworkType values indicate the allowed access technologies
 the device may use when connecting to this network.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -846,7 +835,7 @@ technologies may be used
    
 
    NMSettingGsmNetworkBand values indicate the allowed frequency bands
 the device may use when connecting to this network.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -963,6 +952,17 @@ the device may use when connecting to this network.
    
 
    
 
 

    
 
    
 
    
+
    
+
    
+
    NM_SETTING_GSM_BANDS_MAX
    
+
    #define             NM_SETTING_GSM_BANDS_MAX
    
+
    
+
    NM_SETTING_GSM_BANDS_MAX has been deprecated since version 0.9.10 and should not be used in newly-written code.
    
+
    No longer used.
    
+
    
+
    NM_SETTING_GSM_BANDS_MAX macro indicate the maximal value that can be used
+as the allowed frequency bands (“allowed-bands” property).
    
+
    
 
    
 
    
 
    Property Details
    
@@ -1100,6 +1100,6 @@ username is required, it is specified here.
    
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
    
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index b14b4721..825e96b8 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -738,7 +738,7 @@ properties related to IPv4 addressing, routing, and Domain Name Service
    
 nm_setting_ip4_config_error_quark (void);
 
    Registers an error quark for NMSettingIP4Config if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingIP4Config errors.
    
 
    
 
@@ -749,7 +749,7 @@ nm_setting_ip4_config_error_quark (void);
 
    Creates and returns a new NMIP4Address object.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMIP4Address object. 
    
 
    [transfer full]
    
 
    
@@ -761,7 +761,7 @@ nm_ip4_address_new (voidNMIP4Address *source);
 
    Copies a given NMIP4Address object and returns the copy.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -776,7 +776,7 @@ nm_ip4_address_dup (
-
    Returns
    
+
    Returns
    
 
     the copy of the given NMIP4Address copy. 
    
 
    [transfer full]
    
 
@@ -788,7 +788,7 @@ nm_ip4_address_dup (NMIP4Address *address);
 
    Increases the reference count of the object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -811,7 +811,7 @@ nm_ip4_address_unref (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -834,7 +834,7 @@ nm_ip4_address_compare (NMIP4Address *other);
 
    Determines if two NMIP4Address objects contain the same values.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -857,7 +857,7 @@ to.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the objects contain the same values, FALSE if they do not.
    
 
    
 
@@ -868,7 +868,7 @@ to.
    
 nm_ip4_address_get_address (NMIP4Address *address);
 
    Gets the IPv4 address property of this address object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -883,7 +883,7 @@ nm_ip4_address_get_address (
-
    Returns
    
+
    Returns
    
 
     the IPv4 address in network byte order
    
 
 
@@ -895,7 +895,7 @@ nm_ip4_address_set_address (guint32 addr);
 
    Sets the IPv4 address property of this object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -925,7 +925,7 @@ nm_ip4_address_get_prefix (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -940,7 +940,7 @@ object.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IPv4 address prefix
    
 
    
 
@@ -952,7 +952,7 @@ nm_ip4_address_set_prefix (guint32 prefix);
 
    Sets the IPv4 address prefix.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -981,7 +981,7 @@ nm_ip4_address_set_prefix (NMIP4Address *address);
 
    Gets the IPv4 default gateway property of this address object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -996,7 +996,7 @@ nm_ip4_address_get_gateway (
-
    Returns
    
+
    Returns
    
 
     the IPv4 gateway address in network byte order
    
 
 
@@ -1008,7 +1008,7 @@ nm_ip4_address_set_gateway (guint32 gateway);
 
    Sets the IPv4 default gateway property of this address object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1037,7 +1037,7 @@ nm_ip4_address_set_gateway (void);
 
    Creates and returns a new NMIP4Route object.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMIP4Route object. 
    
 
    [transfer full]
    
 
    
@@ -1049,7 +1049,7 @@ nm_ip4_route_new (voidNMIP4Route *source);
 
    Copies a given NMIP4Route object and returns the copy.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1064,7 +1064,7 @@ nm_ip4_route_dup (
-
    Returns
    
+
    Returns
    
 
     the copy of the given NMIP4Route copy. 
    
 
    [transfer full]
    
 
@@ -1076,7 +1076,7 @@ nm_ip4_route_dup (NMIP4Route *route);
 
    Increases the reference count of the object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1099,7 +1099,7 @@ nm_ip4_route_unref (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1122,7 +1122,7 @@ nm_ip4_route_compare (NMIP4Route *other);
 
    Determines if two NMIP4Route objects contain the same values.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1145,7 +1145,7 @@ to.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the objects contain the same values, FALSE if they do not.
    
 
    
 
@@ -1156,7 +1156,7 @@ to.
    
 nm_ip4_route_get_dest (NMIP4Route *route);
 
    Gets the IPv4 destination address property of this route object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1171,7 +1171,7 @@ nm_ip4_route_get_dest (
-
    Returns
    
+
    Returns
    
 
     the IPv4 address in network byte order
    
 
 
@@ -1183,7 +1183,7 @@ nm_ip4_route_set_dest (guint32 dest);
 
    Sets the IPv4 destination address property of this route object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1212,7 +1212,7 @@ nm_ip4_route_set_dest (NMIP4Route *route);
 
    Gets the IPv4 prefix (ie "24" or "30" etc) of this route.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1227,7 +1227,7 @@ nm_ip4_route_get_prefix (
-
    Returns
    
+
    Returns
    
 
     the IPv4 prefix
    
 
 
@@ -1239,7 +1239,7 @@ nm_ip4_route_set_prefix (guint32 prefix);
 
    Sets the IPv4 prefix of this route.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1268,7 +1268,7 @@ nm_ip4_route_set_prefix (NMIP4Route *route);
 
    Gets the IPv4 address of the next hop of this route.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1283,7 +1283,7 @@ nm_ip4_route_get_next_hop (
-
    Returns
    
+
    Returns
    
 
     the IPv4 address in network byte order
    
 
 
@@ -1295,7 +1295,7 @@ nm_ip4_route_set_next_hop (guint32 next_hop);
 
    Sets the IPv4 address of the next hop of this route.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1325,7 +1325,7 @@ nm_ip4_route_get_metric (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1340,7 +1340,7 @@ nm_ip4_route_get_metric (
-
    Returns
    
+
    Returns
    
 
     the route metric
    
 
 
@@ -1353,7 +1353,7 @@ nm_ip4_route_set_metric (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1382,7 +1382,7 @@ nm_ip4_route_set_metric (void);
 
    Creates a new NMSettingIP4Config object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingIP4Config object. 
    
 
    [transfer full]
    
 
    
@@ -1393,7 +1393,7 @@ nm_setting_ip4_config_new (voidconst char *
 nm_setting_ip4_config_get_method (NMSettingIP4Config *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1408,7 +1408,7 @@ nm_setting_ip4_config_get_method (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “method” property of the setting
    
 
    
 
@@ -1418,7 +1418,7 @@ nm_setting_ip4_config_get_method (guint32
 nm_setting_ip4_config_get_num_dns (NMSettingIP4Config *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1433,7 +1433,7 @@ nm_setting_ip4_config_get_num_dns (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured DNS servers
    
 
    
 
@@ -1444,7 +1444,7 @@ nm_setting_ip4_config_get_num_dns (NMSettingIP4Config *setting,
                                guint32 i);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1466,7 +1466,7 @@ nm_setting_ip4_config_get_dns (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the IPv4 address (network byte order) of the DNS server at index
 i
 
    
@@ -1480,7 +1480,7 @@ nm_setting_ip4_config_add_dns (guint32 dns);
 
    Adds a new DNS server to the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1502,7 +1502,7 @@ nm_setting_ip4_config_add_dns (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS server was added; FALSE if the server was already
 known
    
 
    
@@ -1516,7 +1516,7 @@ nm_setting_ip4_config_remove_dns (Removes the DNS server at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1548,7 +1548,7 @@ nm_setting_ip4_config_remove_dns_by_value
 
    Removes the DNS server dns
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1570,7 +1570,7 @@ nm_setting_ip4_config_remove_dns_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS server was found and removed; FALSE if it was not.
 domain was already known
    
 
    
@@ -1583,7 +1583,7 @@ domain was already known
    
 nm_setting_ip4_config_clear_dns (NMSettingIP4Config *setting);
 
    Removes all configured DNS servers.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1605,7 +1605,7 @@ nm_setting_ip4_config_clear_dns (NMSettingIP4Config *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1620,7 +1620,7 @@ nm_setting_ip4_config_get_num_dns_searches
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured DNS search domains
    
 
    
 
@@ -1631,7 +1631,7 @@ nm_setting_ip4_config_get_num_dns_searches
 nm_setting_ip4_config_get_dns_search (NMSettingIP4Config *setting,
                                       guint32 i);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1653,7 +1653,7 @@ nm_setting_ip4_config_get_dns_search (
-
    Returns
    
+
    Returns
    
 
     the DNS search domain at index i
 
    
 
@@ -1666,7 +1666,7 @@ nm_setting_ip4_config_add_dns_search (const char *dns_search);
 
    Adds a new DNS search domain to the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1688,7 +1688,7 @@ nm_setting_ip4_config_add_dns_search (
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS search domain was added; FALSE if the search
 domain was already known
    
 
@@ -1703,7 +1703,7 @@ nm_setting_ip4_config_remove_dns_search
 
    Removes the DNS search domain at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1735,7 +1735,7 @@ nm_setting_ip4_config_remove_dns_search_by_value
 
    Removes the DNS search domain dns_search
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1757,7 +1757,7 @@ nm_setting_ip4_config_remove_dns_search_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS search domain was found and removed; FALSE if it was not.
    
 
    Since 0.9.10
    
 
    
@@ -1770,7 +1770,7 @@ nm_setting_ip4_config_clear_dns_searches
                                (NMSettingIP4Config *setting);
 
    Removes all configured DNS search domains.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1792,7 +1792,7 @@ nm_setting_ip4_config_clear_dns_searches
 nm_setting_ip4_config_get_num_addresses
                                (NMSettingIP4Config *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1807,7 +1807,7 @@ nm_setting_ip4_config_get_num_addresses
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured addresses
    
 
    
 
@@ -1818,7 +1818,7 @@ nm_setting_ip4_config_get_num_addresses
 nm_setting_ip4_config_get_address (NMSettingIP4Config *setting,
                                    guint32 i);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1840,7 +1840,7 @@ nm_setting_ip4_config_get_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the address at index i
 
    
 
    
@@ -1854,7 +1854,7 @@ nm_setting_ip4_config_add_address (Adds a new IPv4 address and associated information to the setting.  The
 given address is duplicated internally and is not changed by this function.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1876,7 +1876,7 @@ given address is duplicated internally and is not changed by this function.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the address was added; FALSE if the address was already
 known.
    
 
    
@@ -1890,7 +1890,7 @@ nm_setting_ip4_config_remove_address (i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1922,7 +1922,7 @@ nm_setting_ip4_config_remove_address_by_value
 
    Removes the address address
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1944,7 +1944,7 @@ nm_setting_ip4_config_remove_address_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the address was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -1956,7 +1956,7 @@ nm_setting_ip4_config_remove_address_by_value
 nm_setting_ip4_config_clear_addresses (NMSettingIP4Config *setting);
 
    Removes all configured addresses.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1977,7 +1977,7 @@ nm_setting_ip4_config_clear_addresses (guint32
 nm_setting_ip4_config_get_num_routes (NMSettingIP4Config *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1992,7 +1992,7 @@ nm_setting_ip4_config_get_num_routes (
-
    Returns
    
+
    Returns
    
 
     the number of configured routes
    
 
 
@@ -2003,7 +2003,7 @@ nm_setting_ip4_config_get_num_routes (NMSettingIP4Config *setting,
                                  guint32 i);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2025,7 +2025,7 @@ nm_setting_ip4_config_get_route (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the route at index i
 
    
 
    
@@ -2039,7 +2039,7 @@ nm_setting_ip4_config_add_route (Adds a new IPv4 route and associated information to the setting.  The
 given route is duplicated internally and is not changed by this function.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2061,7 +2061,7 @@ given route is duplicated internally and is not changed by this function.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the route was added; FALSE if the route was already known.
    
 
    
 
@@ -2074,7 +2074,7 @@ nm_setting_ip4_config_remove_route (Removes the route at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2106,7 +2106,7 @@ nm_setting_ip4_config_remove_route_by_value
 
    Removes the route route
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2128,7 +2128,7 @@ nm_setting_ip4_config_remove_route_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the route was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -2140,7 +2140,7 @@ nm_setting_ip4_config_remove_route_by_value
 nm_setting_ip4_config_clear_routes (NMSettingIP4Config *setting);
 
    Removes all configured routes.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2164,7 +2164,7 @@ nm_setting_ip4_config_get_route_metric
 
    Returns the value contained in the “route-metric”
 property.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2179,7 +2179,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the route metric that is used for IPv4 routes that don't explicitly
 specify a metric. See “route-metric” for more details.
    
 
    
@@ -2194,7 +2194,7 @@ nm_setting_ip4_config_get_ignore_auto_routes
 
    Returns the value contained in the “ignore-auto-routes”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2209,7 +2209,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if automatically configured (ie via DHCP) routes should be
 ignored.
    
 
    
@@ -2223,7 +2223,7 @@ nm_setting_ip4_config_get_ignore_auto_dns
 
    Returns the value contained in the “ignore-auto-dns”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2238,7 +2238,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if automatically configured (ie via DHCP) DNS information
 should be ignored.
    
 
    
@@ -2252,7 +2252,7 @@ nm_setting_ip4_config_get_dhcp_client_id
 
    Returns the value contained in the “dhcp-client-id”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2267,7 +2267,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the configured Client ID to send to the DHCP server when requesting
 addresses via DHCP.
    
 
    
@@ -2281,7 +2281,7 @@ nm_setting_ip4_config_get_dhcp_send_hostname
 
    Returns the value contained in the “dhcp-send-hostname”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2296,7 +2296,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     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.
    
@@ -2311,7 +2311,7 @@ nm_setting_ip4_config_get_dhcp_hostname
 
    Returns the value contained in the “dhcp-hostname”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2326,7 +2326,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the configured hostname to send to the DHCP server
    
 
    
 
    
@@ -2339,7 +2339,7 @@ nm_setting_ip4_config_get_dhcp_timeout
 
    Returns the value contained in the “dhcp-timeout”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2354,7 +2354,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     The number of seconds after which unfinished DHCP transaction
 fails or zero for "default".
    
 
    
@@ -2368,7 +2368,7 @@ nm_setting_ip4_config_get_never_default
 
    Returns the value contained in the “never-default”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2383,7 +2383,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if this connection should never be the default connection
 for IPv4 addressing
    
 
    
@@ -2396,7 +2396,7 @@ nm_setting_ip4_config_get_may_fail (Returns the value contained in the “may-fail”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2411,7 +2411,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if this connection doesn't require IPv4 addressing to complete
 for the connection to succeed.
    
 
    
@@ -2428,7 +2428,7 @@ for the connection to succeed.
    
 
    
 
    enum NMSettingIP4ConfigError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -2779,6 +2779,6 @@ methods because there is no upstream network.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index eb42de11..2e0e0e5c 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -8,7 +8,7 @@
 
-
+
@@ -706,7 +706,7 @@ properties related to IPv6 addressing, routing, and Domain Name Service
    
 nm_setting_ip6_config_error_quark (void);
    Registers an error quark for NMSettingIP6Config if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingIP6Config errors.
    
 
    
@@ -717,7 +717,7 @@ nm_setting_ip6_config_error_quark (void);
 
    Creates and returns a new NMIP6Address object.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMIP6Address object. 
    
 
    [transfer full]
    
 
    
@@ -729,7 +729,7 @@ nm_ip6_address_new (voidNMIP6Address *source);
 
    Copies a given NMIP6Address object and returns the copy.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -744,7 +744,7 @@ nm_ip6_address_dup (
-
    Returns
    
+
    Returns
    
 
     the copy of the given NMIP6Address copy. 
    
 
    [transfer full]
    
 
@@ -756,7 +756,7 @@ nm_ip6_address_dup (NMIP6Address *address);
 
    Increases the reference count of the object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -779,7 +779,7 @@ nm_ip6_address_unref (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -802,7 +802,7 @@ nm_ip6_address_compare (NMIP6Address *other);
 
    Determines if two NMIP6Address objects contain the same values.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -825,7 +825,7 @@ to.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the objects contain the same values, FALSE if they do not.
    
 
    
 
    
@@ -836,7 +836,7 @@ to.
    
 nm_ip6_address_get_address (NMIP6Address *address);
 
    Gets the IPv6 address property of this address object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -851,7 +851,7 @@ nm_ip6_address_get_address (
-
    Returns
    
+
    Returns
    
 
             the IPv6 address. 
    
 
    [array fixed-size=16][element-type guint8][transfer none]
    
 
@@ -864,7 +864,7 @@ nm_ip6_address_set_address (const struct in6_addr *addr);
 
    Sets the IPv6 address property of this object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -893,7 +893,7 @@ nm_ip6_address_set_address (NMIP6Address *address);
 
    Gets the IPv6 address prefix property of this address object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -908,7 +908,7 @@ nm_ip6_address_get_prefix (
-
    Returns
    
+
    Returns
    
 
     the IPv6 address prefix
    
 
 
@@ -920,7 +920,7 @@ nm_ip6_address_set_prefix (guint32 prefix);
 
    Sets the IPv6 address prefix.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -949,7 +949,7 @@ nm_ip6_address_set_prefix (NMIP6Address *address);
 
    Gets the IPv6 default gateway property of this address object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -964,7 +964,7 @@ nm_ip6_address_get_gateway (
-
    Returns
    
+
    Returns
    
 
             the IPv6 gateway address. 
    
 
    [array fixed-size=16][element-type guint8][transfer none]
    
 
@@ -977,7 +977,7 @@ nm_ip6_address_set_gateway (const struct in6_addr *gateway);
 
    Sets the IPv6 default gateway property of this address object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1006,7 +1006,7 @@ nm_ip6_address_set_gateway (void);
 
    Creates and returns a new NMIP6Route object.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMIP6Route object. 
    
 
    [transfer full]
    
 
    
@@ -1018,7 +1018,7 @@ nm_ip6_route_new (voidNMIP6Route *source);
 
    Copies a given NMIP6Route object and returns the copy.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1033,7 +1033,7 @@ nm_ip6_route_dup (
-
    Returns
    
+
    Returns
    
 
     the copy of the given NMIP6Route copy. 
    
 
    [transfer full]
    
 
@@ -1045,7 +1045,7 @@ nm_ip6_route_dup (NMIP6Route *route);
 
    Increases the reference count of the object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1068,7 +1068,7 @@ nm_ip6_route_unref (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1091,7 +1091,7 @@ nm_ip6_route_compare (NMIP6Route *other);
 
    Determines if two NMIP6Route objects contain the same values.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1114,7 +1114,7 @@ to.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the objects contain the same values, FALSE if they do not.
    
 
    
 
@@ -1125,7 +1125,7 @@ to.
    
 nm_ip6_route_get_dest (NMIP6Route *route);
 
    Gets the IPv6 destination address property of this route object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1140,7 +1140,7 @@ nm_ip6_route_get_dest (
-
    Returns
    
+
    Returns
    
 
             the IPv6 address of destination. 
    
 
    [array fixed-size=16][element-type guint8][transfer none]
    
 
@@ -1153,7 +1153,7 @@ nm_ip6_route_set_dest (const struct in6_addr *dest);
 
    Sets the IPv6 destination address property of this route object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1182,7 +1182,7 @@ nm_ip6_route_set_dest (NMIP6Route *route);
 
    Gets the IPv6 prefix (ie "32" or "64" etc) of this route.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1197,7 +1197,7 @@ nm_ip6_route_get_prefix (
-
    Returns
    
+
    Returns
    
 
     the IPv6 prefix
    
 
 
@@ -1209,7 +1209,7 @@ nm_ip6_route_set_prefix (guint32 prefix);
 
    Sets the IPv6 prefix of this route.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1238,7 +1238,7 @@ nm_ip6_route_set_prefix (NMIP6Route *route);
 
    Gets the IPv6 address of the next hop of this route.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1253,7 +1253,7 @@ nm_ip6_route_get_next_hop (
-
    Returns
    
+
    Returns
    
 
             the IPv6 address of next hop. 
    
 
    [array fixed-size=16][element-type guint8][transfer none]
    
 
@@ -1266,7 +1266,7 @@ nm_ip6_route_set_next_hop (const struct in6_addr *next_hop);
 
    Sets the IPv6 address of the next hop of this route.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1296,7 +1296,7 @@ nm_ip6_route_get_metric (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1311,7 +1311,7 @@ nm_ip6_route_get_metric (
-
    Returns
    
+
    Returns
    
 
     the route metric
    
 
 
@@ -1324,7 +1324,7 @@ nm_ip6_route_set_metric (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1353,7 +1353,7 @@ nm_ip6_route_set_metric (void);
 
    Creates a new NMSettingIP6Config object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingIP6Config object. 
    
 
    [transfer full]
    
 
    
@@ -1364,7 +1364,7 @@ nm_setting_ip6_config_new (voidconst char *
 nm_setting_ip6_config_get_method (NMSettingIP6Config *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1379,7 +1379,7 @@ nm_setting_ip6_config_get_method (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “method” property of the setting
    
 
    
 
@@ -1389,7 +1389,7 @@ nm_setting_ip6_config_get_method (guint32
 nm_setting_ip6_config_get_num_dns (NMSettingIP6Config *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1404,7 +1404,7 @@ nm_setting_ip6_config_get_num_dns (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured DNS servers
    
 
    
 
@@ -1415,7 +1415,7 @@ nm_setting_ip6_config_get_num_dns (NMSettingIP6Config *setting,
                                guint32 i);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1437,7 +1437,7 @@ nm_setting_ip6_config_get_dns (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the IPv6 address of the DNS server at index i
 . 
    
 
    [transfer none]
    
@@ -1451,7 +1451,7 @@ nm_setting_ip6_config_add_dns (const struct in6_addr *dns);
 
    Adds a new DNS server to the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1473,7 +1473,7 @@ nm_setting_ip6_config_add_dns (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS server was added; FALSE if the server was already
 known
    
 
    
@@ -1487,7 +1487,7 @@ nm_setting_ip6_config_remove_dns (Removes the DNS server at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1519,7 +1519,7 @@ nm_setting_ip6_config_remove_dns_by_value
 
    Removes the DNS server at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1541,7 +1541,7 @@ nm_setting_ip6_config_remove_dns_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS server was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -1553,7 +1553,7 @@ nm_setting_ip6_config_remove_dns_by_value
 nm_setting_ip6_config_clear_dns (NMSettingIP6Config *setting);
 
    Removes all configured DNS servers.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1575,7 +1575,7 @@ nm_setting_ip6_config_clear_dns (NMSettingIP6Config *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1590,7 +1590,7 @@ nm_setting_ip6_config_get_num_dns_searches
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured DNS search domains
    
 
    
 
@@ -1601,7 +1601,7 @@ nm_setting_ip6_config_get_num_dns_searches
 nm_setting_ip6_config_get_dns_search (NMSettingIP6Config *setting,
                                       guint32 i);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1623,7 +1623,7 @@ nm_setting_ip6_config_get_dns_search (
-
    Returns
    
+
    Returns
    
 
     the DNS search domain at index i
 
    
 
@@ -1636,7 +1636,7 @@ nm_setting_ip6_config_add_dns_search (const char *dns_search);
 
    Adds a new DNS search domain to the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1658,7 +1658,7 @@ nm_setting_ip6_config_add_dns_search (
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS search domain was added; FALSE if the search
 domain was already known
    
 
@@ -1673,7 +1673,7 @@ nm_setting_ip6_config_remove_dns_search
 
    Removes the DNS search domain at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1705,7 +1705,7 @@ nm_setting_ip6_config_remove_dns_search_by_value
 
    Removes the DNS search domain dns_search
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1727,7 +1727,7 @@ nm_setting_ip6_config_remove_dns_search_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS search domain was found and removed; FALSE if it was not.
    
 
    Since 0.9.10
    
 
    
@@ -1740,7 +1740,7 @@ nm_setting_ip6_config_clear_dns_searches
                                (NMSettingIP6Config *setting);
 
    Removes all configured DNS search domains.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1762,7 +1762,7 @@ nm_setting_ip6_config_clear_dns_searches
 nm_setting_ip6_config_get_num_addresses
                                (NMSettingIP6Config *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1777,7 +1777,7 @@ nm_setting_ip6_config_get_num_addresses
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured addresses
    
 
    
 
@@ -1788,7 +1788,7 @@ nm_setting_ip6_config_get_num_addresses
 nm_setting_ip6_config_get_address (NMSettingIP6Config *setting,
                                    guint32 i);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1810,7 +1810,7 @@ nm_setting_ip6_config_get_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the address at index i
 
    
 
    
@@ -1824,7 +1824,7 @@ nm_setting_ip6_config_add_address (Adds a new IPv6 address and associated information to the setting.  The
 given address is duplicated internally and is not changed by this function.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1846,7 +1846,7 @@ given address is duplicated internally and is not changed by this function.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the address was added; FALSE if the address was already
 known.
    
 
    
@@ -1860,7 +1860,7 @@ nm_setting_ip6_config_remove_address (i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1892,7 +1892,7 @@ nm_setting_ip6_config_remove_address_by_value
 
    Removes the address address
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1914,7 +1914,7 @@ nm_setting_ip6_config_remove_address_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the address was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -1926,7 +1926,7 @@ nm_setting_ip6_config_remove_address_by_value
 nm_setting_ip6_config_clear_addresses (NMSettingIP6Config *setting);
 
    Removes all configured addresses.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1947,7 +1947,7 @@ nm_setting_ip6_config_clear_addresses (guint32
 nm_setting_ip6_config_get_num_routes (NMSettingIP6Config *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1962,7 +1962,7 @@ nm_setting_ip6_config_get_num_routes (
-
    Returns
    
+
    Returns
    
 
     the number of configured routes
    
 
 
@@ -1973,7 +1973,7 @@ nm_setting_ip6_config_get_num_routes (NMSettingIP6Config *setting,
                                  guint32 i);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1995,7 +1995,7 @@ nm_setting_ip6_config_get_route (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the route at index i
 
    
 
    
@@ -2009,7 +2009,7 @@ nm_setting_ip6_config_add_route (Adds a new IPv6 route and associated information to the setting.  The
 given route is duplicated internally and is not changed by this function.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2031,7 +2031,7 @@ given route is duplicated internally and is not changed by this function.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the route was added; FALSE if the route was already known.
    
 
    
 
@@ -2044,7 +2044,7 @@ nm_setting_ip6_config_remove_route (Removes the route at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2076,7 +2076,7 @@ nm_setting_ip6_config_remove_route_by_value
 
    Removes the route route
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2098,7 +2098,7 @@ nm_setting_ip6_config_remove_route_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the route was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -2110,7 +2110,7 @@ nm_setting_ip6_config_remove_route_by_value
 nm_setting_ip6_config_clear_routes (NMSettingIP6Config *setting);
 
    Removes all configured routes.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2134,7 +2134,7 @@ nm_setting_ip6_config_get_ignore_auto_routes
 
    Returns the value contained in the “ignore-auto-routes”
 property.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2149,7 +2149,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if automatically configured (ie via DHCP) routes should be
 ignored.
    
 
    
@@ -2163,7 +2163,7 @@ nm_setting_ip6_config_get_route_metric
 
    Returns the value contained in the “route-metric”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2178,7 +2178,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the route metric that is used for IPv6 routes that don't explicitly
 specify a metric. See “route-metric” for more details.
    
 
    
@@ -2193,7 +2193,7 @@ nm_setting_ip6_config_get_ignore_auto_dns
 
    Returns the value contained in the “ignore-auto-dns”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2208,7 +2208,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if automatically configured (ie via DHCP or router
 advertisements) DNS information should be ignored.
    
 
    
@@ -2222,7 +2222,7 @@ nm_setting_ip6_config_get_dhcp_hostname
 
    Returns the value contained in the “dhcp-hostname”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2237,7 +2237,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the configured hostname to send to the DHCP server
    
 
    
 
    Since: 0.9.8
    
@@ -2251,7 +2251,7 @@ nm_setting_ip6_config_get_never_default
 
    Returns the value contained in the “never-default”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2266,7 +2266,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if this connection should never be the default connection
 for IPv6 addressing
    
 
    
@@ -2279,7 +2279,7 @@ nm_setting_ip6_config_get_may_fail (Returns the value contained in the “may-fail”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2294,7 +2294,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if this connection doesn't require IPv6 addressing to complete
 for the connection to succeed.
    
 
    
@@ -2307,7 +2307,7 @@ nm_setting_ip6_config_get_ip6_privacy (“ip6-privacy”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2322,7 +2322,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     IPv6 Privacy Extensions configuration value (NMSettingIP6ConfigPrivacy).
    
 
    
 
@@ -2338,7 +2338,7 @@ property.
    
 
    
 
    enum NMSettingIP6ConfigError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -2518,7 +2518,7 @@ supported for IPv6)
    NMSettingIP6ConfigPrivacy values indicate if and how IPv6 Privacy
 Extensions are used (RFC4941).
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -2723,6 +2723,6 @@ automatic configuration.  Routes cannot be used with the "shared" or
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index 82db623e..aa3a30fe 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -8,7 +8,7 @@
 
-
+
@@ -207,7 +207,7 @@ necessary for connection to IP-over-InfiniBand networks.
    
 nm_setting_infiniband_error_quark (void);
    Registers an error quark for NMSettingInfiniband if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingInfiniband errors.
    
 
    
@@ -218,7 +218,7 @@ nm_setting_infiniband_error_quark (void);
 
    Creates a new NMSettingInfiniband object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingInfiniband object. 
    
 
    [transfer full]
    
 
    
@@ -229,7 +229,7 @@ nm_setting_infiniband_new (voidconst GByteArray *
 nm_setting_infiniband_get_mac_address (NMSettingInfiniband *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
    @@ -244,7 +244,7 @@ nm_setting_infiniband_get_mac_address (
-
    Returns
    
+
    Returns
    
 
     the “mac-address” property of the setting
    
 
 
@@ -254,7 +254,7 @@ nm_setting_infiniband_get_mac_address (guint32
 nm_setting_infiniband_get_mtu (NMSettingInfiniband *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -269,7 +269,7 @@ nm_setting_infiniband_get_mtu (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “mtu” property of the setting
    
 
    
 
@@ -282,7 +282,7 @@ nm_setting_infiniband_get_transport_mode
 
    Returns the transport mode for this device. Either 'datagram' or
 'connected'.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -297,7 +297,7 @@ nm_setting_infiniband_get_transport_mode
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IPoIB transport mode
    
 
    
 
    
@@ -310,7 +310,7 @@ nm_setting_infiniband_get_p_key (
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -325,7 +325,7 @@ a 16-bit unsigned integer.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IPoIB P_Key
    
 
    
 
@@ -336,7 +336,7 @@ a 16-bit unsigned integer.
    
 nm_setting_infiniband_get_parent (NMSettingInfiniband *setting);
 
    Returns the parent interface name for this device, if set.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -351,7 +351,7 @@ nm_setting_infiniband_get_parent (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the parent interface name
    
 
    
 
@@ -367,7 +367,7 @@ nm_setting_infiniband_get_parent (
 
    enum NMSettingInfinibandError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -492,6 +492,6 @@ specify the base device by setting either this property or
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index d9a5d1d0..5d7b0d41 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -172,7 +172,7 @@ nm_setting_olpc_mesh_error_quark (void);
 
    Creates a new NMSettingOlpcMesh object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingOlpcMesh object
    
 
    
 
@@ -207,7 +207,7 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 
    
 
    enum NMSettingOlpcMeshError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -294,6 +294,6 @@ answers the request.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index c66bd595..52c2887a 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -430,7 +430,7 @@ cable and DSL modems and some mobile broadband devices.
    
 nm_setting_ppp_error_quark (void);
 
    Registers an error quark for NMSettingPPP if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingPPP errors.
    
 
    
 
@@ -441,7 +441,7 @@ nm_setting_ppp_error_quark (void<
 nm_setting_ppp_new (void);
 
    Creates a new NMSettingPPP object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingPPP object. 
    
 
    [transfer full]
    
 
    
@@ -452,7 +452,7 @@ nm_setting_ppp_new (voidgboolean
 nm_setting_ppp_get_noauth (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -467,7 +467,7 @@ nm_setting_ppp_get_noauth (
-
    Returns
    
+
    Returns
    
 
     the “noauth” property of the setting
    
 
 
@@ -477,7 +477,7 @@ nm_setting_ppp_get_noauth (gboolean
 nm_setting_ppp_get_refuse_eap (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -492,7 +492,7 @@ nm_setting_ppp_get_refuse_eap (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “refuse-eap” property of the setting
    
 
    
 
@@ -502,7 +502,7 @@ nm_setting_ppp_get_refuse_eap (gboolean
 nm_setting_ppp_get_refuse_pap (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -517,7 +517,7 @@ nm_setting_ppp_get_refuse_pap (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “refuse-pap” property of the setting
    
 
    
 
@@ -527,7 +527,7 @@ nm_setting_ppp_get_refuse_pap (gboolean
 nm_setting_ppp_get_refuse_chap (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -542,7 +542,7 @@ nm_setting_ppp_get_refuse_chap (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “refuse-chap” property of the setting
    
 
    
 
@@ -552,7 +552,7 @@ nm_setting_ppp_get_refuse_chap (gboolean
 nm_setting_ppp_get_refuse_mschap (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -567,7 +567,7 @@ nm_setting_ppp_get_refuse_mschap (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “refuse-mschap” property of the setting
    
 
    
 
@@ -577,7 +577,7 @@ nm_setting_ppp_get_refuse_mschap (gboolean
 nm_setting_ppp_get_refuse_mschapv2 (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -592,7 +592,7 @@ nm_setting_ppp_get_refuse_mschapv2 (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “refuse-mschapv2” property of the setting
    
 
    
 
@@ -602,7 +602,7 @@ nm_setting_ppp_get_refuse_mschapv2 (gboolean
 nm_setting_ppp_get_nobsdcomp (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -617,7 +617,7 @@ nm_setting_ppp_get_nobsdcomp (
-
    Returns
    
+
    Returns
    
 
     the “nobsdcomp” property of the setting
    
 
 
@@ -627,7 +627,7 @@ nm_setting_ppp_get_nobsdcomp (gboolean
 nm_setting_ppp_get_nodeflate (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -642,7 +642,7 @@ nm_setting_ppp_get_nodeflate (
-
    Returns
    
+
    Returns
    
 
     the “nodeflate” property of the setting
    
 
 
@@ -652,7 +652,7 @@ nm_setting_ppp_get_nodeflate (gboolean
 nm_setting_ppp_get_no_vj_comp (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -667,7 +667,7 @@ nm_setting_ppp_get_no_vj_comp (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “no-vj-comp” property of the setting
    
 
    
 
@@ -677,7 +677,7 @@ nm_setting_ppp_get_no_vj_comp (gboolean
 nm_setting_ppp_get_require_mppe (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -692,7 +692,7 @@ nm_setting_ppp_get_require_mppe (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “require-mppe” property of the setting
    
 
    
 
@@ -702,7 +702,7 @@ nm_setting_ppp_get_require_mppe (gboolean
 nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -717,7 +717,7 @@ nm_setting_ppp_get_require_mppe_128 (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “require-mppe-128” property of the setting
    
 
    
 
@@ -727,7 +727,7 @@ nm_setting_ppp_get_require_mppe_128 (gboolean
 nm_setting_ppp_get_mppe_stateful (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -742,7 +742,7 @@ nm_setting_ppp_get_mppe_stateful (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “mppe-stateful” property of the setting
    
 
    
 
@@ -752,7 +752,7 @@ nm_setting_ppp_get_mppe_stateful (gboolean
 nm_setting_ppp_get_crtscts (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -767,7 +767,7 @@ nm_setting_ppp_get_crtscts (
-
    Returns
    
+
    Returns
    
 
     the “crtscts” property of the setting
    
 
 
@@ -777,7 +777,7 @@ nm_setting_ppp_get_crtscts (guint32
 nm_setting_ppp_get_baud (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -792,7 +792,7 @@ nm_setting_ppp_get_baud (
-
    Returns
    
+
    Returns
    
 
     the “baud” property of the setting
    
 
 
@@ -802,7 +802,7 @@ nm_setting_ppp_get_baud (guint32
 nm_setting_ppp_get_mru (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -817,7 +817,7 @@ nm_setting_ppp_get_mru (
-
    Returns
    
+
    Returns
    
 
     the “mru” property of the setting
    
 
 
@@ -827,7 +827,7 @@ nm_setting_ppp_get_mru (guint32
 nm_setting_ppp_get_mtu (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -842,7 +842,7 @@ nm_setting_ppp_get_mtu (
-
    Returns
    
+
    Returns
    
 
     the “mtu” property of the setting
    
 
 
@@ -852,7 +852,7 @@ nm_setting_ppp_get_mtu (guint32
 nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -867,7 +867,7 @@ nm_setting_ppp_get_lcp_echo_failure (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “lcp-echo-failure” property of the setting
    
 
    
 
@@ -877,7 +877,7 @@ nm_setting_ppp_get_lcp_echo_failure (guint32
 nm_setting_ppp_get_lcp_echo_interval (NMSettingPPP *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -892,7 +892,7 @@ nm_setting_ppp_get_lcp_echo_interval (
-
    Returns
    
+
    Returns
    
 
     the “lcp-echo-interval” property of the setting
    
 
 
@@ -908,7 +908,7 @@ nm_setting_ppp_get_lcp_echo_interval (
 
    enum NMSettingPPPError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -1235,6 +1235,6 @@ be set to TRUE.  If 128-bit MPPE is not available t
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index c7abaffe..a626360c 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -191,7 +191,7 @@ to provide IP transport, for example cable or DSL modems.
    
 nm_setting_pppoe_error_quark (void);
 
    Registers an error quark for NMSettingPPPOE if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingPPPOE errors.
    
 
    
 
@@ -202,7 +202,7 @@ nm_setting_pppoe_error_quark (voi
 nm_setting_pppoe_new (void);
 
    Creates a new NMSettingPPPOE object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingPPPOE object. 
    
 
    [transfer full]
    
 
    
@@ -213,7 +213,7 @@ nm_setting_pppoe_new (void
 
    const char *
 nm_setting_pppoe_get_service (NMSettingPPPOE *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -228,7 +228,7 @@ nm_setting_pppoe_get_service (
-
    Returns
    
+
    Returns
    
 
     the “service” property of the setting
    
 
 
@@ -238,7 +238,7 @@ nm_setting_pppoe_get_service (const char *
 nm_setting_pppoe_get_username (NMSettingPPPOE *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -253,7 +253,7 @@ nm_setting_pppoe_get_username (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “username” property of the setting
    
 
    
 
@@ -263,7 +263,7 @@ nm_setting_pppoe_get_username (const char *
 nm_setting_pppoe_get_password (NMSettingPPPOE *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -278,7 +278,7 @@ nm_setting_pppoe_get_password (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “password” property of the setting
    
 
    
 
@@ -288,7 +288,7 @@ nm_setting_pppoe_get_password (NMSettingSecretFlags
 nm_setting_pppoe_get_password_flags (NMSettingPPPOE *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -303,7 +303,7 @@ nm_setting_pppoe_get_password_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the “password”
    
 
    
 
@@ -319,7 +319,7 @@ nm_setting_pppoe_get_password_flags (
 
    enum NMSettingPPPOEError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -432,6 +432,6 @@ access concentrators or a specific service is known to be required.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 43c21e9e..5fa59aed 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -209,7 +209,7 @@ such as mobile broadband or analog telephone connections.
    
 nm_setting_serial_error_quark (void);
 
    Registers an error quark for NMSettingSerial if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingSerial errors.
    
 
    
 
@@ -220,7 +220,7 @@ nm_setting_serial_error_quark (vo
 nm_setting_serial_new (void);
 
    Creates a new NMSettingSerial object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingSerial object. 
    
 
    [transfer full]
    
 
    
@@ -231,7 +231,7 @@ nm_setting_serial_new (voidguint
 nm_setting_serial_get_baud (NMSettingSerial *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -246,7 +246,7 @@ nm_setting_serial_get_baud (
-
    Returns
    
+
    Returns
    
 
     the “baud” property of the setting
    
 
 
@@ -256,7 +256,7 @@ nm_setting_serial_get_baud (guint
 nm_setting_serial_get_bits (NMSettingSerial *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -271,7 +271,7 @@ nm_setting_serial_get_bits (
-
    Returns
    
+
    Returns
    
 
     the “bits” property of the setting
    
 
 
@@ -281,7 +281,7 @@ nm_setting_serial_get_bits (char
 nm_setting_serial_get_parity (NMSettingSerial *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -296,7 +296,7 @@ nm_setting_serial_get_parity (
-
    Returns
    
+
    Returns
    
 
     the “parity” property of the setting
    
 
 
@@ -306,7 +306,7 @@ nm_setting_serial_get_parity (guint
 nm_setting_serial_get_stopbits (NMSettingSerial *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -321,7 +321,7 @@ nm_setting_serial_get_stopbits (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “stopbits” property of the setting
    
 
    
 
@@ -331,7 +331,7 @@ nm_setting_serial_get_stopbits (guint64
 nm_setting_serial_get_send_delay (NMSettingSerial *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -346,7 +346,7 @@ nm_setting_serial_get_send_delay (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “send-delay” property of the setting
    
 
    
 
@@ -362,7 +362,7 @@ nm_setting_serial_get_send_delay (
 
    enum NMSettingSerialError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -492,6 +492,6 @@ The 1 in "8n1" for example.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingTeam.html b/docs/libnm-util/html/NMSettingTeam.html
index 2e40a312..09de0419 100644
--- a/docs/libnm-util/html/NMSettingTeam.html
+++ b/docs/libnm-util/html/NMSettingTeam.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -156,7 +156,7 @@ necessary for team connections.
    
 nm_setting_team_error_quark (void);
 
    Registers an error quark for NMSettingTeam if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingTeam errors.
    
 
    
 
    Since: 0.9.10
    
@@ -168,7 +168,7 @@ nm_setting_team_error_quark (void
 nm_setting_team_new (void);
 
    Creates a new NMSettingTeam object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingTeam object. 
    
 
    [transfer full]
    
 
    
@@ -180,7 +180,7 @@ nm_setting_team_new (void<
 
    const char *
 nm_setting_team_get_interface_name (NMSettingTeam *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -195,7 +195,7 @@ nm_setting_team_get_interface_name (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “interface-name” property of the setting
    
 
    
 
    Since: 0.9.10
    
@@ -206,7 +206,7 @@ nm_setting_team_get_interface_name (const char *
 nm_setting_team_get_config (NMSettingTeam *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -221,7 +221,7 @@ nm_setting_team_get_config (
-
    Returns
    
+
    Returns
    
 
     the “config” property of the setting
    
 
 
    Since: 0.9.10
    
@@ -238,7 +238,7 @@ nm_setting_team_get_config (
 
    enum NMSettingTeamError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -314,6 +314,6 @@ configuration is used.  See man teamd.conf for the format details.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingTeamPort.html b/docs/libnm-util/html/NMSettingTeamPort.html
index c08a4eb0..e0860deb 100644
--- a/docs/libnm-util/html/NMSettingTeamPort.html
+++ b/docs/libnm-util/html/NMSettingTeamPort.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -137,7 +137,7 @@ optional properties that apply to team ports.
    
 nm_setting_team_port_error_quark (void);
 
    Registers an error quark for NMSettingTeamPort if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingTeamPort errors.
    
 
    
 
    Since: 0.9.10
    
@@ -149,7 +149,7 @@ nm_setting_team_port_error_quark (void);
 
    Creates a new NMSettingTeamPort object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingTeamPort object. 
    
 
    [transfer full]
    
 
    
@@ -161,7 +161,7 @@ nm_setting_team_port_new (voidconst char *
 nm_setting_team_port_get_config (NMSettingTeamPort *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -176,7 +176,7 @@ nm_setting_team_port_get_config (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “config” property of the setting
    
 
    
 
    Since: 0.9.10
    
@@ -193,7 +193,7 @@ nm_setting_team_port_get_config (
 
    enum NMSettingTeamPortError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -255,6 +255,6 @@ used. See man teamd.conf for the format details.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index e3243206..92dc88b3 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -286,7 +286,7 @@ properties.
    
 nm_setting_vpn_error_quark (void);
 
    Registers an error quark for NMSettingVPN if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingVPN errors.
    
 
    
 
@@ -298,7 +298,7 @@ nm_setting_vpn_error_quark (void<
                   const char *value,
                   gpointer user_data);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -333,7 +333,7 @@ nm_setting_vpn_error_quark (void<
 nm_setting_vpn_new (void);
 
    Creates a new NMSettingVPN object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingVPN object. 
    
 
    [transfer full]
    
 
    
@@ -346,7 +346,7 @@ nm_setting_vpn_get_service_type (Returns the service name of the VPN, which identifies the specific VPN
 plugin that should be used to connect to this VPN.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -361,7 +361,7 @@ plugin that should be used to connect to this VPN.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the VPN plugin's service name
    
 
    
 
@@ -371,7 +371,7 @@ plugin that should be used to connect to this VPN.
    
 
    const char *
 nm_setting_vpn_get_user_name (NMSettingVPN *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -386,7 +386,7 @@ nm_setting_vpn_get_user_name (
-
    Returns
    
+
    Returns
    
 
     the “user-name” property of the setting
    
 
 
@@ -396,7 +396,7 @@ nm_setting_vpn_get_user_name (gboolean
 nm_setting_vpn_get_persistent (NMSettingVPN *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -411,7 +411,7 @@ nm_setting_vpn_get_persistent (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “persistent” property of the setting
    
 
    
 
@@ -422,7 +422,7 @@ nm_setting_vpn_get_persistent (NMSettingVPN *setting);
 
    Gets number of key/value pairs of VPN configuration data.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -437,7 +437,7 @@ nm_setting_vpn_get_num_data_items (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the number of VPN plugin specific configuration data items
    
 
    
 
@@ -454,7 +454,7 @@ nm_setting_vpn_add_data_item (nm_setting_vpn_add_secret() is for.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -492,7 +492,7 @@ nm_setting_vpn_get_data_item (nm_setting_vpn_add_data_item().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -514,7 +514,7 @@ by 
-
    Returns
    
+
    Returns
    
 
     the data item, if any
    
 
 
@@ -527,7 +527,7 @@ nm_setting_vpn_remove_data_item (Deletes a key/value relationship previously established by
 nm_setting_vpn_add_data_item().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -549,7 +549,7 @@ nm_setting_vpn_remove_data_item (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the data item was found and removed from the internal list,
 FALSE if it was not.
    
 
    
@@ -566,7 +566,7 @@ and modify data items inside func
 , though any additions or removals made
 during iteration will not be part of the iteration.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -601,7 +601,7 @@ during iteration will not be part of the iteration.
    
 nm_setting_vpn_get_num_secrets (NMSettingVPN *setting);
 
    Gets number of VPN plugin specific secrets in the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -616,7 +616,7 @@ nm_setting_vpn_get_num_secrets (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the number of VPN plugin specific secrets
    
 
    
 
@@ -632,7 +632,7 @@ nm_setting_vpn_add_secret (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -670,7 +670,7 @@ nm_setting_vpn_get_secret (nm_setting_vpn_add_secret().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -692,7 +692,7 @@ by 
-
    Returns
    
+
    Returns
    
 
     the secret, if any
    
 
 
@@ -705,7 +705,7 @@ nm_setting_vpn_remove_secret (nm_setting_vpn_add_secret().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -727,7 +727,7 @@ nm_setting_vpn_remove_secret (
-
    Returns
    
+
    Returns
    
 
     TRUE if the secret was found and removed from the internal list,
 FALSE if it was not.
    
 
@@ -744,7 +744,7 @@ and modify secrets inside func
 , though any additions or removals made during
 iteration will not be part of the iteration.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -784,7 +784,7 @@ iteration will not be part of the iteration.
    
 
    
 
    enum NMSettingVpnError
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -914,6 +914,6 @@ VPN connection.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index df603abd..7631e145 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -50,10 +50,6 @@
 
 
     
-
-
-
-
@@ -256,6 +252,10 @@
 
+
+
+
+
    
 
 

    #defineNM_VLAN_FLAGS_ALL
    
 
 NMSetting *
 enum
 NMVlanFlags
 
    #defineNM_VLAN_FLAGS_ALL
    
     
 
    
 
    
@@ -288,23 +288,18 @@ necessary for connection to VLAN interfaces.
    
 nm_setting_vlan_error_quark (void);
 
    Registers an error quark for NMSettingVlan if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingVlan errors.
    
 
    
 
 
    
 
    
-
    NM_VLAN_FLAGS_ALL
    
-
    #define             NM_VLAN_FLAGS_ALL
    
-
    
-
    
-
    
 
    nm_setting_vlan_new ()
    
 
    NMSetting *
 nm_setting_vlan_new (void);
    
 
    Creates a new NMSettingVlan object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingVlan object. 
    
 
    [transfer full]
    
 
    
@@ -315,7 +310,7 @@ nm_setting_vlan_new (void<
 
    const char *
 nm_setting_vlan_get_interface_name (NMSettingVlan *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -330,7 +325,7 @@ nm_setting_vlan_get_interface_name (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “interface_name” property of the setting
    
 
    
 
@@ -340,7 +335,7 @@ nm_setting_vlan_get_interface_name (const char *
 nm_setting_vlan_get_parent (NMSettingVlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -355,7 +350,7 @@ nm_setting_vlan_get_parent (
-
    Returns
    
+
    Returns
    
 
     the “parent” property of the setting
    
 
 
@@ -365,7 +360,7 @@ nm_setting_vlan_get_parent (guint32
 nm_setting_vlan_get_id (NMSettingVlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -380,7 +375,7 @@ nm_setting_vlan_get_id (
-
    Returns
    
+
    Returns
    
 
     the “id” property of the setting
    
 
 
@@ -390,7 +385,7 @@ nm_setting_vlan_get_id (guint32
 nm_setting_vlan_get_flags (NMSettingVlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -405,7 +400,7 @@ nm_setting_vlan_get_flags (
-
    Returns
    
+
    Returns
    
 
     the “flags” property of the setting
    
 
 
@@ -419,7 +414,7 @@ nm_setting_vlan_get_num_priorities (“ingress_priority_map” or “egress_priority_map”
 properties of this setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -441,7 +436,7 @@ properties of this setting.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     return the number of ingress/egress priority entries, -1 if error
    
 
    
 
    
@@ -457,7 +452,7 @@ nm_setting_vlan_get_priority (“ingress_priority_map”
 or “egress_priority_map” properties of this setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -494,7 +489,7 @@ or 
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if a priority map was returned, FALSE if error
    
 
    
@@ -523,7 +518,7 @@ Priority Code Point (PCP) value, and toto
  is the outgoing 802.1q VLAN Priority Code Point (PCP) value.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
    @@ -557,7 +552,7 @@ to
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the new priority mapping was successfully added to the
 list, FALSE if error
    
 
    
@@ -574,7 +569,7 @@ nm_setting_vlan_remove_priority (“ingress_priority_map” or “egress_priority_map”
 properties.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -617,7 +612,7 @@ or 
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -651,7 +646,7 @@ to
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the priority mapping was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -670,7 +665,7 @@ or 
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -697,7 +692,7 @@ properties.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the priority mapping was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -711,7 +706,7 @@ nm_setting_vlan_clear_priorities (Clear all the entires from “ingress_priority_map” or
 “egress_priority_map” properties.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -744,7 +739,7 @@ nm_setting_vlan_add_priority_str (“egress_priority_map” properties.  The priority map maps
 the Linux SKB priorities to 802.1p priorities.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -771,7 +766,7 @@ the Linux SKB priorities to 802.1p priorities.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the entry was successfully added to the list, or it
 overwrote the old value, FALSE if error
    
 
    
@@ -788,7 +783,7 @@ overwrote the old value, FALSE if error
    
 
    
 
    enum NMSettingVlanError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -878,7 +873,7 @@ overwrote the old value, FALSE if error
    A selector for traffic priority maps; these map Linux SKB priorities
 to 802.1p priorities used in VLANs.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -909,7 +904,7 @@ to 802.1p priorities used in VLANs.
    enum NMVlanFlags
    NMVlanFlags values control the behavior of the VLAN interface.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -954,6 +949,11 @@ to 802.1p priorities used in VLANs.
    
 
 

 
    
 
    
 
    
+
    
+
    
+
    NM_VLAN_FLAGS_ALL
    
+
    #define             NM_VLAN_FLAGS_ALL
    
+
    
 
 
    
 
    Property Details
    
@@ -1023,6 +1023,6 @@ with a 
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index 26544076..fc5be6ac 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -163,7 +163,7 @@ nm_setting_wimax_error_quark (voi
 
 
    Registers an error quark for NMSettingWimax if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingWimax errors.
    
 
    
 
@@ -178,7 +178,7 @@ nm_setting_wimax_new (void
 
 
    Creates a new NMSettingWimax object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingWimax object
    
 
    
 
@@ -194,7 +194,7 @@ nm_setting_wimax_get_network_name (Returns the WiMAX NSP name (ex "Sprint" or "CLEAR") which identifies the
 specific WiMAX network this setting describes a connection to.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -209,7 +209,7 @@ specific WiMAX network this setting describes a connection to.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the WiMAX NSP name
    
 
    
 
@@ -225,7 +225,7 @@ nm_setting_wimax_get_mac_address (Returns the MAC address of a WiMAX device which this connection is locked
 to.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -240,7 +240,7 @@ to.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the MAC address
    
 
    
 
@@ -256,7 +256,7 @@ to.
    
 
    
 
    enum NMSettingWimaxError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -339,6 +339,6 @@ should use.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index 75184b1b..97df5498 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -8,7 +8,7 @@
 
-
+
@@ -394,7 +394,7 @@ necessary for connection to Ethernet networks.
    
 nm_setting_wired_error_quark (void);
    Registers an error quark for NMSettingWired if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingWired errors.
    
 
    
@@ -405,7 +405,7 @@ nm_setting_wired_error_quark (voi
 nm_setting_wired_new (void);
 
    Creates a new NMSettingWired object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingWired object. 
    
 
    [transfer full]
    
 
    
@@ -416,7 +416,7 @@ nm_setting_wired_new (void
 
    const char *
 nm_setting_wired_get_port (NMSettingWired *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -431,7 +431,7 @@ nm_setting_wired_get_port (
-
    Returns
    
+
    Returns
    
 
     the “port” property of the setting
    
 
 
@@ -441,7 +441,7 @@ nm_setting_wired_get_port (guint32
 nm_setting_wired_get_speed (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -456,7 +456,7 @@ nm_setting_wired_get_speed (
-
    Returns
    
+
    Returns
    
 
     the “speed” property of the setting
    
 
 
@@ -466,7 +466,7 @@ nm_setting_wired_get_speed (const char *
 nm_setting_wired_get_duplex (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -481,7 +481,7 @@ nm_setting_wired_get_duplex (
-
    Returns
    
+
    Returns
    
 
     the “duplex” property of the setting
    
 
 
@@ -491,7 +491,7 @@ nm_setting_wired_get_duplex (gboolean
 nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -506,7 +506,7 @@ nm_setting_wired_get_auto_negotiate (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “auto-negotiate” property of the setting
    
 
    
 
@@ -516,7 +516,7 @@ nm_setting_wired_get_auto_negotiate (const GByteArray *
 nm_setting_wired_get_mac_address (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -531,7 +531,7 @@ nm_setting_wired_get_mac_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “mac-address” property of the setting
    
 
    
 
@@ -542,7 +542,7 @@ nm_setting_wired_get_mac_address (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -557,7 +557,7 @@ nm_setting_wired_get_cloned_mac_address
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “cloned-mac-address” property of the setting
    
 
    
 
    
@@ -568,7 +568,7 @@ nm_setting_wired_get_cloned_mac_address
 nm_setting_wired_get_mac_address_blacklist
                                (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -583,7 +583,7 @@ nm_setting_wired_get_mac_address_blacklist
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “mac-address-blacklist”
 property of the setting. 
    
 
    [element-type GLib.ByteArray]
    
@@ -596,7 +596,7 @@ property of the setting. 
    
 nm_setting_wired_get_num_mac_blacklist_items
                                (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -611,7 +611,7 @@ nm_setting_wired_get_num_mac_blacklist_items
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of blacklisted MAC addresses
    
 
    
 
    Since: 0.9.10
    
@@ -624,7 +624,7 @@ nm_setting_wired_get_mac_blacklist_item
                                (NMSettingWired *setting,
                                 guint32 idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -646,7 +646,7 @@ nm_setting_wired_get_mac_blacklist_item
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the blacklisted MAC address string (hex-digits-and-colons notation)
 at index idx
 
    
@@ -662,7 +662,7 @@ nm_setting_wired_add_mac_blacklist_item
                                 const char *mac);
 
    Adds a new MAC address to the “mac-address-blacklist” property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -684,7 +684,7 @@ nm_setting_wired_add_mac_blacklist_item
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present
    
 
    
@@ -700,7 +700,7 @@ nm_setting_wired_remove_mac_blacklist_item
 
    Removes the MAC address at index idx
  from the blacklist.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -733,7 +733,7 @@ nm_setting_wired_remove_mac_blacklist_item_by_value
 
    Removes the MAC address mac
  from the blacklist.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -756,7 +756,7 @@ the blacklist
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the MAC address was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -769,7 +769,7 @@ nm_setting_wired_clear_mac_blacklist_items
                                (NMSettingWired *setting);
 
    Removes all blacklisted MAC addresses.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -791,7 +791,7 @@ nm_setting_wired_clear_mac_blacklist_items
 
    guint32
 nm_setting_wired_get_mtu (NMSettingWired *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -806,7 +806,7 @@ nm_setting_wired_get_mtu (
-
    Returns
    
+
    Returns
    
 
     the “mtu” property of the setting
    
 
 
@@ -819,7 +819,7 @@ nm_setting_wired_get_s390_subchannels (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -834,7 +834,7 @@ conjunction with that device.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     GPtrArray of strings, each specifying one
 subchannel the s390 device uses to communicate to the host. 
    
 
    [element-type utf8]
    
@@ -848,7 +848,7 @@ nm_setting_wired_get_s390_nettype (Returns the s390 device type this connection should apply to.  Will be one
 of 'qeth', 'lcs', or 'ctc'.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -863,7 +863,7 @@ of 'qeth', 'lcs', or 'ctc'.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the s390 device type
    
 
    
 
    
@@ -876,7 +876,7 @@ nm_setting_wired_get_num_s390_options (nm_setting_wired_get_s390_option().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -891,7 +891,7 @@ option individually using 
-
    Returns
    
+
    Returns
     the number of s390-specific device options
    
@@ -909,7 +909,7 @@ are *not* guaranteed to be static across modifications to options done by
 and should not be used to refer to options except for short periods of time
 such as during option iteration.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
    @@ -944,7 +944,7 @@ option; this value is owned by the setting and should not be modified. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    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
 currently held by the setting)
    
@@ -961,7 +961,7 @@ nm_setting_wired_get_s390_option_by_key
 key
 , if it exists.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -983,7 +983,7 @@ nm_setting_wired_get_s390_option_by_key
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     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
    
 
    
@@ -1000,7 +1000,7 @@ of allowed options.  Key names may contain only alphanumeric characters
 (ie [a-zA-Z0-9]).  Adding a new key replaces any existing key/value pair that
 may already exist.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1027,7 +1027,7 @@ may already exist.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the option was valid and was added to the internal option
 list, FALSE if it was not.
    
 
    
@@ -1042,7 +1042,7 @@ nm_setting_wired_remove_s390_option (
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1064,7 +1064,7 @@ list.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the option was found and removed from the internal option
 list, FALSE if it was not.
    
 
    
@@ -1077,7 +1077,7 @@ nm_setting_wired_get_valid_s390_options
                                (NMSettingWired *setting);
 
    Returns a list of valid s390 options.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1092,7 +1092,7 @@ nm_setting_wired_get_valid_s390_options
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a NULL-terminated array of strings of valid s390 options. 
    
 
    [transfer none]
    
 
    
@@ -1110,7 +1110,7 @@ nm_setting_wired_get_valid_s390_options
 
    
 
    enum NMSettingWiredError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -1328,6 +1328,6 @@ Mbit/s, ie 100 == 100Mbit/s.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 1db2d508..2941907e 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -8,7 +8,7 @@
 
-
+
@@ -460,7 +460,7 @@ necessary for connection to 802.11 Wi-Fi networks.
    
 nm_setting_wireless_error_quark (void);
    Registers an error quark for NMSettingWireless if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingWireless errors.
    
 
    
@@ -471,7 +471,7 @@ nm_setting_wireless_error_quark (
 nm_setting_wireless_new (void);
 
    Creates a new NMSettingWireless object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingWireless object. 
    
 
    [transfer full]
    
 
    
@@ -482,7 +482,7 @@ nm_setting_wireless_new (voidconst GByteArray *
 nm_setting_wireless_get_ssid (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -497,7 +497,7 @@ nm_setting_wireless_get_ssid (
-
    Returns
    
+
    Returns
    
 
     the “ssid” property of the setting
    
 
 
@@ -507,7 +507,7 @@ nm_setting_wireless_get_ssid (const char *
 nm_setting_wireless_get_mode (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -522,7 +522,7 @@ nm_setting_wireless_get_mode (
-
    Returns
    
+
    Returns
    
 
     the “mode” property of the setting
    
 
 
@@ -532,7 +532,7 @@ nm_setting_wireless_get_mode (const char *
 nm_setting_wireless_get_band (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -547,7 +547,7 @@ nm_setting_wireless_get_band (
-
    Returns
    
+
    Returns
    
 
     the “band” property of the setting
    
 
 
@@ -557,7 +557,7 @@ nm_setting_wireless_get_band (guint32
 nm_setting_wireless_get_channel (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -572,7 +572,7 @@ nm_setting_wireless_get_channel (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “channel” property of the setting
    
 
    
 
@@ -582,7 +582,7 @@ nm_setting_wireless_get_channel (const GByteArray *
 nm_setting_wireless_get_bssid (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -597,7 +597,7 @@ nm_setting_wireless_get_bssid (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “bssid” property of the setting
    
 
    
 
@@ -607,7 +607,7 @@ nm_setting_wireless_get_bssid (guint32
 nm_setting_wireless_get_rate (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -622,7 +622,7 @@ nm_setting_wireless_get_rate (
-
    Returns
    
+
    Returns
    
 
     the “rate” property of the setting
    
 
 
@@ -632,7 +632,7 @@ nm_setting_wireless_get_rate (guint32
 nm_setting_wireless_get_tx_power (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -647,7 +647,7 @@ nm_setting_wireless_get_tx_power (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “tx-power” property of the setting
    
 
    
 
@@ -657,7 +657,7 @@ nm_setting_wireless_get_tx_power (const GByteArray *
 nm_setting_wireless_get_mac_address (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -672,7 +672,7 @@ nm_setting_wireless_get_mac_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “mac-address” property of the setting
    
 
    
 
@@ -683,7 +683,7 @@ nm_setting_wireless_get_mac_address (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -698,7 +698,7 @@ nm_setting_wireless_get_cloned_mac_address
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “cloned-mac-address” property of the setting
    
 
    
 
    
@@ -709,7 +709,7 @@ nm_setting_wireless_get_cloned_mac_address
 nm_setting_wireless_get_mac_address_blacklist
                                (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -724,7 +724,7 @@ nm_setting_wireless_get_mac_address_blacklist
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the
 “mac-address-blacklist” property of the setting. 
    
 
    [element-type GLib.ByteArray]
    
@@ -737,7 +737,7 @@ nm_setting_wireless_get_mac_address_blacklist
 nm_setting_wireless_get_num_mac_blacklist_items
                                (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -752,7 +752,7 @@ nm_setting_wireless_get_num_mac_blacklist_items
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of blacklisted MAC addresses
    
 
    
 
    Since: 0.9.10
    
@@ -765,7 +765,7 @@ nm_setting_wireless_get_mac_blacklist_item
                                (NMSettingWireless *setting,
                                 guint32 idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -787,7 +787,7 @@ nm_setting_wireless_get_mac_blacklist_item
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the blacklisted MAC address string (hex-digits-and-colons notation)
 at index idx
 
    
@@ -803,7 +803,7 @@ nm_setting_wireless_add_mac_blacklist_item
                                 const char *mac);
 
    Adds a new MAC address to the “mac-address-blacklist” property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -825,7 +825,7 @@ nm_setting_wireless_add_mac_blacklist_item
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present
    
 
    
@@ -841,7 +841,7 @@ nm_setting_wireless_remove_mac_blacklist_item
 
    Removes the MAC address at index idx
  from the blacklist.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -874,7 +874,7 @@ nm_setting_wireless_remove_mac_blacklist_item_by_value
 
    Removes the MAC address mac
  from the blacklist.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -897,7 +897,7 @@ the blacklist
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the MAC address was found and removed; FALSE if it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -910,7 +910,7 @@ nm_setting_wireless_clear_mac_blacklist_items
                                (NMSettingWireless *setting);
 
    Removes all blacklisted MAC addresses.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -932,7 +932,7 @@ nm_setting_wireless_clear_mac_blacklist_items
 
    guint32
 nm_setting_wireless_get_mtu (NMSettingWireless *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -947,7 +947,7 @@ nm_setting_wireless_get_mtu (
-
    Returns
    
+
    Returns
    
 
     the “mtu” property of the setting
    
 
 
@@ -957,7 +957,7 @@ nm_setting_wireless_get_mtu (gboolean
 nm_setting_wireless_get_hidden (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -972,7 +972,7 @@ nm_setting_wireless_get_hidden (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “hidden” property of the setting
    
 
    
 
@@ -982,7 +982,7 @@ nm_setting_wireless_get_hidden (guint32
 nm_setting_wireless_get_powersave (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -997,7 +997,7 @@ nm_setting_wireless_get_powersave (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “powersave” property of the setting
    
 
    
 
    Since: 1.2
    
@@ -1013,7 +1013,7 @@ NetworkManager now tracks previously seen BSSIDs internally so this function
 no longer has much use. Actually, changes you make using this function will
 not be preserved.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1035,7 +1035,7 @@ not be preserved.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if bssid
 was already known, FALSE if not
    
 
    
@@ -1047,7 +1047,7 @@ was already known, FALSE if not
    
 nm_setting_wireless_get_num_seen_bssids
                                (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1062,7 +1062,7 @@ nm_setting_wireless_get_num_seen_bssids
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of BSSIDs in the previously seen BSSID list
    
 
    
 
    
@@ -1073,7 +1073,7 @@ nm_setting_wireless_get_num_seen_bssids
 nm_setting_wireless_get_seen_bssid (NMSettingWireless *setting,
                                     guint32 i);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1095,7 +1095,7 @@ nm_setting_wireless_get_seen_bssid (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the BSSID at index i
 
    
 
    
@@ -1118,7 +1118,7 @@ and mode.  Useful for clients that wish to filter a set of connections
 against a set of access points and determine which connections are
 compatible with which access points.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1162,7 +1162,7 @@ capabilities
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the given settings are compatible with the access point's
 security flags and mode, FALSE if they are not.
    
 
    
@@ -1178,7 +1178,7 @@ nm_setting_wireless_get_security (
 
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1193,7 +1193,7 @@ the presence of NM_SETTING_WIRELESS_SECURITY_SETTING_NAME in the connection.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “security” property of the setting
    
 
    
 
    
@@ -1209,7 +1209,7 @@ the presence of NM_SETTING_WIRELESS_SECURITY_SETTING_NAME in the connection.
    
 
    
 
    enum NMSettingWirelessError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -1543,6 +1543,6 @@ devices support setting a static transmit power.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index d091dda2..be7d19c6 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -8,7 +8,7 @@
 
-
+
@@ -535,7 +535,7 @@ nm_setting_wireless_security_error_quark
                                (void);
    Registers an error quark for NMSettingWired if necessary.
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMSettingWired errors.
    
 
    
@@ -546,7 +546,7 @@ nm_setting_wireless_security_error_quark
 nm_setting_wireless_security_new (void);
    Creates a new NMSettingWirelessSecurity object with default values.
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingWirelessSecurity object. 
    
 
    [transfer full]
    
 
    
@@ -558,7 +558,7 @@ nm_setting_wireless_security_new (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -573,7 +573,7 @@ nm_setting_wireless_security_get_key_mgmt
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “key-mgmt” property of the setting
    
 
    
 
    
@@ -584,7 +584,7 @@ nm_setting_wireless_security_get_key_mgmt
 nm_setting_wireless_security_get_num_protos
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -599,7 +599,7 @@ nm_setting_wireless_security_get_num_protos
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of security protocols this connection allows when
 connecting to secure Wi-Fi networks
    
 
    
@@ -612,7 +612,7 @@ nm_setting_wireless_security_get_proto
                                (NMSettingWirelessSecurity *setting,
                                 guint32 i);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -634,7 +634,7 @@ nm_setting_wireless_security_get_proto
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the protocol at index i
 
    
 
    
@@ -653,7 +653,7 @@ protocol list contains only "wpa" but the access point for the SSID specified
 by this connection only supports WPA2/RSN, the connection cannot be used
 with the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -675,7 +675,7 @@ with the access point.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    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
    
 
    
@@ -689,7 +689,7 @@ nm_setting_wireless_security_remove_proto
                                 guint32 i);
 
    Removes a protocol from the allowed protocol list.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -720,7 +720,7 @@ nm_setting_wireless_security_remove_proto_by_value
                                 const char *proto);
    Removes a protocol from the allowed protocol list.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -742,7 +742,7 @@ nm_setting_wireless_security_remove_proto_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the protocol was found and removed; FALSE it it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -756,7 +756,7 @@ nm_setting_wireless_security_clear_protos
 
    Removes all protocols from the allowed list.  If there are no protocols
 specified then all protocols are allowed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -778,7 +778,7 @@ specified then all protocols are allowed.
    
 nm_setting_wireless_security_get_num_pairwise
                                (NMSettingWirelessSecurity *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -793,7 +793,7 @@ nm_setting_wireless_security_get_num_pairwise
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of pairwise encryption algorithms in the allowed list
    
 
    
 
    
@@ -807,7 +807,7 @@ nm_setting_wireless_security_get_pairwise
 
    Returns the allowed pairwise encryption algorithm from allowed algorithm
 list.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -829,7 +829,7 @@ list.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the pairwise encryption algorithm at index i
 
    
 
    
@@ -846,7 +846,7 @@ algorithms.  If the list is not empty, then only access points that support
 one or more of the encryption algorithms in the list will be considered
 compatible with this connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -868,7 +868,7 @@ compatible with this connection.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the algorithm was added to the list, FALSE if it was
 already in the list
    
 
    
@@ -883,7 +883,7 @@ nm_setting_wireless_security_remove_pairwise
 
    Removes an encryption algorithm from the allowed pairwise encryption
 algorithm list.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -915,7 +915,7 @@ nm_setting_wireless_security_remove_pairwise_by_value
 
    Removes an encryption algorithm from the allowed pairwise encryption
 algorithm list.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -937,7 +937,7 @@ algorithm list.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the encryption algorith was found and removed; FALSE it it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -951,7 +951,7 @@ nm_setting_wireless_security_clear_pairwise
 
    Removes all algorithms from the allowed list.  If there are no algorithms
 specified then all pairwise encryption algorithms are allowed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -973,7 +973,7 @@ specified then all pairwise encryption algorithms are allowed.
    
 nm_setting_wireless_security_get_num_groups
                                (NMSettingWirelessSecurity *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -988,7 +988,7 @@ nm_setting_wireless_security_get_num_groups
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of groupwise encryption algorithms in the allowed list
    
 
    
 
    
@@ -1002,7 +1002,7 @@ nm_setting_wireless_security_get_group
 
    Returns the allowed groupwise encryption algorithm from allowed algorithm
 list.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1024,7 +1024,7 @@ list.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the groupwise encryption algorithm at index i
 
    
 
    
@@ -1041,7 +1041,7 @@ algorithms.  If the list is not empty, then only access points that support
 one or more of the encryption algorithms in the list will be considered
 compatible with this connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1064,7 +1064,7 @@ compatible with this connection.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the algorithm was added to the list, FALSE if it was
 already in the list
    
 
    
@@ -1079,7 +1079,7 @@ nm_setting_wireless_security_remove_group
 
    Removes an encryption algorithm from the allowed groupwise encryption
 algorithm list.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1111,7 +1111,7 @@ nm_setting_wireless_security_remove_group_by_value
 
    Removes an encryption algorithm from the allowed groupwise encryption
 algorithm list.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1134,7 +1134,7 @@ algorithm list.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the algorithm was found and removed; FALSE it it was not.
    
 
    
 
    Since: 0.9.10
    
@@ -1148,7 +1148,7 @@ nm_setting_wireless_security_clear_groups
 
    Removes all algorithms from the allowed list.  If there are no algorithms
 specified then all groupwise encryption algorithms are allowed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1169,7 +1169,7 @@ specified then all groupwise encryption algorithms are allowed.
    const char *
 nm_setting_wireless_security_get_psk (NMSettingWirelessSecurity *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -1184,7 +1184,7 @@ nm_setting_wireless_security_get_psk (
-
    Returns
    
+
    Returns
    
 
     the “psk” property of the setting
    
 
 
@@ -1195,7 +1195,7 @@ nm_setting_wireless_security_get_psk (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1210,7 +1210,7 @@ nm_setting_wireless_security_get_psk_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the
 “psk”
    
 
    
@@ -1222,7 +1222,7 @@ nm_setting_wireless_security_get_psk_flags
 nm_setting_wireless_security_get_leap_username
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1237,7 +1237,7 @@ nm_setting_wireless_security_get_leap_username
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “leap-username” property of the setting
    
 
    
 
@@ -1248,7 +1248,7 @@ nm_setting_wireless_security_get_leap_username
 nm_setting_wireless_security_get_leap_password
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1263,7 +1263,7 @@ nm_setting_wireless_security_get_leap_password
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “leap-password” property of the setting
    
 
    
 
@@ -1274,7 +1274,7 @@ nm_setting_wireless_security_get_leap_password
 nm_setting_wireless_security_get_leap_password_flags
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1289,7 +1289,7 @@ nm_setting_wireless_security_get_leap_password_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the
 “leap-password”
    
 
    
@@ -1302,7 +1302,7 @@ nm_setting_wireless_security_get_wep_key
                                (NMSettingWirelessSecurity *setting,
                                 guint32 idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1324,7 +1324,7 @@ nm_setting_wireless_security_get_wep_key
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the WEP key at the given index
    
 
    
 
@@ -1338,7 +1338,7 @@ nm_setting_wireless_security_set_wep_key
                                 const char *key);
 
    Sets a WEP key in the given index.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1374,7 +1374,7 @@ property.
    
 nm_setting_wireless_security_get_wep_tx_keyidx
                                (NMSettingWirelessSecurity *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1389,7 +1389,7 @@ nm_setting_wireless_security_get_wep_tx_keyidx
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “wep-tx-keyidx” property of the setting
    
 
    
 
@@ -1400,7 +1400,7 @@ nm_setting_wireless_security_get_wep_tx_keyidx
 nm_setting_wireless_security_get_auth_alg
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1415,7 +1415,7 @@ nm_setting_wireless_security_get_auth_alg
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “auth-alg” property of the setting
    
 
    
 
@@ -1426,7 +1426,7 @@ nm_setting_wireless_security_get_auth_alg
 nm_setting_wireless_security_get_wep_key_flags
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1441,7 +1441,7 @@ nm_setting_wireless_security_get_wep_key_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the all WEP keys
    
 
    
 
@@ -1452,7 +1452,7 @@ nm_setting_wireless_security_get_wep_key_flags
 nm_setting_wireless_security_get_wep_key_type
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1467,7 +1467,7 @@ nm_setting_wireless_security_get_wep_key_type
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “wep-key-type” property of the setting
    
 
    
 
@@ -1483,7 +1483,7 @@ nm_setting_wireless_security_get_wep_key_type
 
    
 
    enum NMSettingWirelessSecurityError
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -1569,7 +1569,7 @@ ASCII keys are also valid WEP passphrases, but since passphrases and ASCII
 keys are hashed differently to determine the actual WEP key the type must be
 specified.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -1898,6 +1898,6 @@ Linksys WRT54G) number the keys 1 - 4.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html
index 76baf202..dea7fb19 100644
--- a/docs/libnm-util/html/annotation-glossary.html
+++ b/docs/libnm-util/html/annotation-glossary.html
@@ -7,7 +7,7 @@
 
-
+
@@ -64,6 +64,6 @@
 
    Don't free data after the code is done.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index cf28ac5a..f3bbfd20 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -8,7 +8,7 @@
 
-
+
@@ -5363,6 +5363,6 @@ g_value_array_sort_with_data, macro in nm-gvaluearray-compat
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index 44d6c268..d4175ca9 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -8,7 +8,7 @@
 
-
+
@@ -122,6 +122,6 @@ that require PPP to deliver IP capability
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 103f41a3..951ff8d4 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -6,7 +6,7 @@
 
-
+
@@ -15,7 +15,7 @@
 
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
    
 
    
-      for libnm-util 1.2.4
+      for libnm-util 1.4.0
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm-util/stable/.
@@ -152,6 +152,6 @@ that require PPP to deliver IP capability
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
    
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
deleted file mode 100644
index c95acf87..00000000
--- a/docs/libnm-util/html/index.sgml
+++ /dev/null
@@ -1,1981 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html
index aaaadc84..9754cfdc 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManager.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManager.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -511,7 +511,7 @@
 
    enum NMState
    
 
    NMState values indicate the current overall networking state.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -589,7 +589,7 @@
 
    
 
    enum NMConnectivityState
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -644,9 +644,9 @@
 
    
 
    enum NMDeviceType
    
 
    NMDeviceType values indicate the type of hardware represented by
-an NMDevice.
    
+an NMDevice.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -811,7 +811,7 @@ GSM/UMTS, or LTE network access protocols
    enum NMDeviceCapabilities
    General device capability flags.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -856,7 +856,7 @@ GSM/UMTS, or LTE network access protocols
    enum NMDeviceWifiCapabilities
    802.11 specific device encryption and authentication capabilities.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -957,7 +957,7 @@ GSM/UMTS, or LTE network access protocols
    enum NM80211ApFlags
    802.11 access point flags.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -991,7 +991,7 @@ encryption (usually means WEP)
    
 the current security requirements of an access point as determined from the
 access point's beacon.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -1092,7 +1092,7 @@ is supported
    enum NM80211Mode
    Indicates the 802.11 mode an access point or device is currently in.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -1144,7 +1144,7 @@ is supported
    NMBluetoothCapabilities values indicate the usable capabilities of a
 Bluetooth device.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -1185,7 +1185,7 @@ technology families a modem device supports.  For more information on the
 specific access technologies the device supports use the ModemManager D-Bus
 API.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -1239,7 +1239,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability
    
 
    enum NMDeviceState
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -1369,7 +1369,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability
    enum NMDeviceStateReason
    Device state change reason codes
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -1834,7 +1834,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability
    
 specific network while it is starting, connected, or disconnecting from that
 network.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -1886,6 +1886,6 @@ network.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html b/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
index 6860917d..724ba32c 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
@@ -8,7 +8,7 @@
 
-
+
@@ -453,7 +453,7 @@
 
    enum NMVPNServiceState
    VPN daemon states
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
    @@ -519,7 +519,7 @@
 
    enum NMVPNConnectionState
    VPN connection states
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -596,7 +596,7 @@
 
    enum NMVPNConnectionStateReason
    VPN connection state reasons
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -709,7 +709,7 @@
 
    enum NMVPNPluginFailure
    VPN plugin failure reasons
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -944,6 +944,6 @@
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 9507d0ab..616f6d62 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -8,7 +8,7 @@
 
-
+
@@ -503,7 +503,7 @@ nm_utils_init (GError **er
 
    Initializes libnm-util; should be called when starting any program that
 uses libnm-util.  This function can be called more than once.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
    @@ -518,7 +518,7 @@ uses libnm-util.  This function can be called more than once.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the initialization was successful, FALSE on failure.
    
 
    
 
@@ -540,7 +540,7 @@ nm_utils_is_empty_ssid (const gui
 AP's SSID.  This function attempts to detect blank/empty SSIDs using a
 number of known SSID-cloaking methods.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -563,7 +563,7 @@ number of known SSID-cloaking methods.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the SSID is "empty", FALSE if it is not
    
 
    
 
@@ -578,7 +578,7 @@ replacing embedded NULLs and non-printable characters with the hexadecimal
 representation of that character.  Intended for debugging only, should not
 be used for display of SSIDs.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -601,7 +601,7 @@ be used for display of SSIDs.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     pointer to the escaped SSID, which uses an internal static buffer
 and will be overwritten by subsequent calls to this function
    
 
    
@@ -620,7 +620,7 @@ and thus was changed.  This function compensates for that behavior at the
 cost of some compatibility with odd SSIDs that may legitimately have trailing
 NULLs, even though that is functionally pointless.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -647,7 +647,7 @@ NULLs, even though that is functionally pointless.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the SSIDs are the same, FALSE if they are not
    
 
    
 
@@ -676,7 +676,7 @@ into a printable UTF-8 string, using roughly the following procedure:
    
 
    Again, this function should be used for debugging and display purposes
 _only_.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -691,7 +691,7 @@ _only_.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    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. 
    
@@ -705,7 +705,7 @@ Returns NULL on errors. 
    
 nm_utils_gvalue_hash_dup (GHashTable *hash);
 
    Utility function to duplicate a hash table of GValues.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -720,7 +720,7 @@ nm_utils_gvalue_hash_dup (GHashTa
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     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]
    
@@ -739,7 +739,7 @@ nm_utils_slist_free (GSListUtility function to free a GSList.
    
 
    [skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -779,7 +779,7 @@ type, and AP capabilities intersect.
    NOTE: this function cannot handle checking security for AP/Hotspot mode;
 use nm_utils_ap_mode_security_valid() instead.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -833,7 +833,7 @@ e.g. (
-
    Returns
    
+
    Returns
     TRUE if the device capabilities and AP capabilties intersect and are
 compatible with the desired type
 , FALSE if they are not
    
@@ -849,7 +849,7 @@ nm_utils_ap_mode_security_valid (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -873,7 +873,7 @@ e.g. 
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the device capabilities are compatible with the desired
 type
 , FALSE if they are not.
    
@@ -889,7 +889,7 @@ nm_utils_wep_key_valid (const cha
 
    Checks if key
  is a valid WEP key
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -911,7 +911,7 @@ nm_utils_wep_key_valid (const cha
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if key
 is a WEP key, FALSE if not
    
 
    
@@ -925,7 +925,7 @@ nm_utils_wpa_psk_valid (const cha
 
    Checks if psk
  is a valid WPA PSK
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -940,7 +940,7 @@ nm_utils_wpa_psk_valid (const cha
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if psk
 is a WPA PSK, FALSE if not
    
 
    
@@ -957,7 +957,7 @@ and prefix) into a GSList of GArray     may be
 extended in the future.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -972,7 +972,7 @@ extended in the future.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated GSList of NMIP4Address objects. 
    
 
    [transfer full][element-type NMIP4Address]
    
 
    
@@ -989,7 +989,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1024,7 +1024,7 @@ prefix, and metric) into a GSList of 
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1039,7 +1039,7 @@ extended in the future.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated GSList of NMIP4Route objects. 
    
 
    [transfer full][element-type NMIP4Route]
    
 
    
@@ -1056,7 +1056,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1086,7 +1086,7 @@ which should be unset by the caller (when no longer needed) with
 
    guint32
 nm_utils_ip4_netmask_to_prefix (guint32 netmask);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1101,7 +1101,7 @@ nm_utils_ip4_netmask_to_prefix (g
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the CIDR prefix represented by the netmask
    
 
    
 
    
@@ -1111,7 +1111,7 @@ nm_utils_ip4_netmask_to_prefix (g
 
    guint32
 nm_utils_ip4_prefix_to_netmask (guint32 prefix);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1126,7 +1126,7 @@ nm_utils_ip4_prefix_to_netmask (g
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the netmask represented by the prefix, in network byte order
    
 
    
 
    
@@ -1140,7 +1140,7 @@ 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
 falls in the predefined classes.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1155,7 +1155,7 @@ falls in the predefined classes.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the default class prefix for the given IP
    
 
    
 
@@ -1170,7 +1170,7 @@ prefix, and gateway), into a GSList of GValueArray     may be
 extended in the future.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1185,7 +1185,7 @@ extended in the future.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated GSList of NMIP6Address objects. 
    
 
    [transfer full][element-type NMIP6Address]
    
 
    
@@ -1202,7 +1202,7 @@ nm_utils_ip6_addresses_to_gvalue (
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1237,7 +1237,7 @@ routes (which is a tuple of destination, prefix, next hop, and metric)
 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
    
+
    Parameters
    
 
    
 
 

 
    @@ -1253,7 +1253,7 @@ is not guaranteed to be stable and may be extended in the future.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated GSList of NMIP6Route objects. 
    
 
    [transfer full][element-type NMIP6Route]
    
 
    
@@ -1270,7 +1270,7 @@ representing a list of NetworkManager IPv6 routes (which is a tuple of destinati
 prefix, next hop, and metric).  The specific format of this serialization is not
 guaranteed to be stable and may be extended in the future.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1303,7 +1303,7 @@ nm_utils_ip6_dns_from_gvalue (const GByteArrays into a GSList of struct in6_addrs.
    
 
    [skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1318,7 +1318,7 @@ nm_utils_ip6_dns_from_gvalue (const 
-
    Returns
    
+
    Returns
    
 
     a GSList of IP6 addresses.
    
 
 
@@ -1335,7 +1335,7 @@ The specific format of this serialization is not guaranteed to be
 stable and may be extended in the future.
    
 
    [skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1365,7 +1365,7 @@ addresses, which should be unset by the caller (when no longer needed) with
 
    char *
 nm_utils_uuid_generate (void);
    
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated UUID suitable for use as the NMSettingConnection
 object's “id”: property.  Should be freed with g_free()
    
 
    
@@ -1378,7 +1378,7 @@ nm_utils_uuid_generate_from_string (const For a given s
 , this function will always return the same UUID.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1393,7 +1393,7 @@ nm_utils_uuid_generate_from_string (const 
 
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated UUID suitable for use as the NMSettingConnection
 object's “id”: property
    
 
    
@@ -1410,7 +1410,7 @@ nm_utils_rsa_key_encrypt (const G
 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1444,7 +1444,7 @@ and returned in this argument. 
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     on success, PEM-formatted data suitable for writing to a PEM-formatted
 certificate/private key file. 
    
 
    [transfer full]
    
@@ -1462,7 +1462,7 @@ nm_utils_rsa_key_encrypt_aes (const 
-
    Parameters
    
+
    Parameters
    
 
    @@ -1496,7 +1496,7 @@ and returned in this argument. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     on success, PEM-formatted data suitable for writing to a PEM-formatted
 certificate/private key file. 
    
 
    [transfer full]
    
@@ -1510,7 +1510,7 @@ nm_utils_file_is_pkcs12 (const ch
 
    Utility function to find out if the filename
  is in PKCS#12 format.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1525,7 +1525,7 @@ nm_utils_file_is_pkcs12 (const ch
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the file is PKCS#12, FALSE if it is not
    
 
    
 
    
@@ -1551,7 +1551,7 @@ nm_utils_file_search_in_paths (const paths
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1610,7 +1610,7 @@ function. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     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. 
    
@@ -1624,7 +1624,7 @@ invocations of the function might overwrite it. 
    
 nm_utils_wifi_freq_to_channel (guint32 freq);
 
    Utility function to translate a Wi-Fi frequency to its corresponding channel.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1639,7 +1639,7 @@ nm_utils_wifi_freq_to_channel (gu
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the channel represented by the frequency or 0
    
 
    
 
    
@@ -1651,7 +1651,7 @@ nm_utils_wifi_channel_to_freq (gu
                                const char *band);
 
    Utility function to translate a Wi-Fi channel to its corresponding frequency.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1673,7 +1673,7 @@ nm_utils_wifi_channel_to_freq (gu
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the frequency represented by the channel of the band,
 or -1 when the freq is invalid, or 0 when the band
 is invalid
    
@@ -1688,7 +1688,7 @@ nm_utils_wifi_find_next_channel (
                                  char *band);
 
    Utility function to find out next/previous Wi-Fi channel for a channel.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1715,7 +1715,7 @@ nm_utils_wifi_find_next_channel (
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the next channel in the specified direction or 0
    
 
    
 
    
@@ -1727,7 +1727,7 @@ nm_utils_wifi_is_channel_valid (g
                                 const char *band);
 
    Utility function to verify Wi-Fi channel validity.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1749,7 +1749,7 @@ nm_utils_wifi_is_channel_valid (g
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE or FALSE
    
 
    
 
@@ -1761,7 +1761,7 @@ nm_utils_hwaddr_len (int t
 
    Returns the length in octets of a hardware address of type type
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1777,7 +1777,7 @@ nm_utils_hwaddr_len (int t
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the positive length, or -1 if the type is unknown/unsupported.
    
 
    
 
@@ -1798,7 +1798,7 @@ a length; but you can just use ARPHRD_ETHER     or
 ARPHRD_INFINIBAND) of the raw address given its length.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1813,7 +1813,7 @@ a length; but you can just use 
-
    Returns
    
+
    Returns
     the type, either ARPHRD_ETHER or
 ARPHRD_INFINIBAND.  If the length is unexpected, return -1
 (unsupported type/length).
    
@@ -1830,7 +1830,7 @@ nm_utils_hwaddr_ntoa (gconstpoint
 
    See also nm_utils_hwaddr_ntoa_len(), which takes a length instead of
 a type.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1853,7 +1853,7 @@ a type.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the textual form of addr
 . 
    
 
    [transfer full]
    
@@ -1869,7 +1869,7 @@ nm_utils_hwaddr_atoba (const char
  and converts it to binary form in a GByteArray. See
 nm_utils_hwaddr_aton() if you don't want a GByteArray.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1892,7 +1892,7 @@ nm_utils_hwaddr_atoba (const char
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new GByteArray, or NULL if asc
 couldn't
 be parsed. 
    
@@ -1914,7 +1914,7 @@ nm_utils_hwaddr_aton (const char<
 
    See also nm_utils_hwaddr_aton_len(), which takes an output length
 instead of a type.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1942,7 +1942,7 @@ instead of a type.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     buffer
 , or NULL if asc
 couldn't be parsed
    
@@ -1957,7 +1957,7 @@ nm_utils_hwaddr_ntoa_len (gconstp
 
    Converts addr
  to textual form.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1980,7 +1980,7 @@ nm_utils_hwaddr_ntoa_len (gconstp
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the textual form of addr
 . 
    
 
    [transfer full]
    
@@ -2000,7 +2000,7 @@ nm_utils_hwaddr_aton_len (const c
 Bytes in asc
  can be sepatared by colons (:), or hyphens (-), but not mixed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2028,7 +2028,7 @@ the size of the buffer in bytes.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     buffer
 , or NULL if asc
 couldn't be parsed
@@ -2045,7 +2045,7 @@ nm_utils_hwaddr_valid (const char
 
    Parses asc
  to see if it is a valid hardware address of some type.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2060,7 +2060,7 @@ nm_utils_hwaddr_valid (const char
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if asc
 appears to be a valid hardware address
 of some type, FALSE if not.
    
@@ -2080,7 +2080,7 @@ If final_len
  is greater than -1, the returned string is terminated at
 that index (returned_string[final_len] == '\0'),
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2108,7 +2108,7 @@ array
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the textual form of bytes
 . 
    
 
    [transfer full]
    
@@ -2122,7 +2122,7 @@ array
    
 nm_utils_hex2byte (const char *hex);
 
    Converts a hex string (2 characters) into its byte representation.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2137,7 +2137,7 @@ nm_utils_hex2byte (const char
 
 
    
-
    Returns
    
+
    Returns
    
 
     a byte, or -1 if hex
 doesn't represent a hex byte
    
 
    
@@ -2154,7 +2154,7 @@ nm_utils_hexstr2bin (const charlen
 /2.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2177,7 +2177,7 @@ string (it has to be even)
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a array of bytes, or NULL on error. 
    
 
    [transfer full]
    
 
    
@@ -2191,7 +2191,7 @@ nm_utils_iface_valid_name (const 
 
    This function is a 1:1 copy of the kernel's interface validation
 function in net/core/dev.c.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2206,7 +2206,7 @@ function in net/core/dev.c.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if interface name is valid, otherwise FALSE is returned.
    
 
    
 
    Since: 0.9.8
    
@@ -2219,7 +2219,7 @@ nm_utils_is_uuid (const charChecks if str
  is a UUID
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2234,7 +2234,7 @@ nm_utils_is_uuid (const char
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if str
 is a UUID, FALSE if not
    
 
    
@@ -2249,7 +2249,7 @@ nm_utils_inet4_ntop (in_addr_tWrapper for inet_ntop.
    
 
    [skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2280,7 +2280,7 @@ buffer to avoid these issues.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the input buffer dst
 , or a pointer to an
 internal, static buffer. This function cannot fail.
    
@@ -2296,7 +2296,7 @@ nm_utils_inet6_ntop (const struct
 
    Wrapper for inet_ntop.
    
 
    [skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2327,7 +2327,7 @@ buffer to avoid these issues.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the input buffer dst
 , or a pointer to an
 internal, static buffer. NULL is not allowed as in6addr
@@ -2364,7 +2364,7 @@ compatible with virtual_type
 configuration of the two connections, or on the capabilities of an
 underlying device driver.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2387,7 +2387,7 @@ underlying device driver.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE or FALSE
    
 
    
 
    Since: 0.9.10
    
@@ -2401,7 +2401,7 @@ underlying device driver.
    
 Used with nm_utils_security_valid() for checking whether a given access
 point is compatible with a network device.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -2498,6 +2498,6 @@ for both 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index e1526746..55b665a5 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -111,10 +111,6 @@
     
     
     
-    
-    
-    
-    
     
     
     
@@ -135,6 +131,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
@@ -429,7 +429,6 @@
     
     
     
-    
     
     
     
@@ -458,6 +457,7 @@
     
     
     
+    
     
     
     
@@ -601,7 +601,6 @@
     
     
     
-    
     
     
     
@@ -626,6 +625,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index 9c2eaa40..f628203c 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -103,6 +103,6 @@
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index e8ea05db..88c5fb89 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.2.4
+1.4.0
diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in
index d5f367ea..c429ca23 100644
--- a/docs/libnm/Makefile.in
+++ b/docs/libnm/Makefile.in
@@ -95,8 +95,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = docs/libnm
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -172,6 +173,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -228,13 +230,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -246,6 +249,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -306,6 +311,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -341,6 +348,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -821,7 +829,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
 	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -832,6 +840,17 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO
 sgml.stamp: sgml-build.stamp
 	@true
 
+xml/gtkdocentities.ent: Makefile
+	$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+	) > $@
+
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html
index 56a6c893..dbc1d092 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -293,7 +293,7 @@ NMAccessPoint implements
 nm_access_point_get_flags (    NMAccessPoint *ap);
    Gets the flags of the access point.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -308,7 +308,7 @@ nm_access_point_get_flags (
-
    Returns
    
+
    Returns
    
 
     the flags
    
 
 
@@ -319,7 +319,7 @@ nm_access_point_get_flags (NMAccessPoint *ap);
 
    Gets the WPA (version 1) flags of the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -334,7 +334,7 @@ nm_access_point_get_wpa_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the WPA flags
    
 
    
 
@@ -346,7 +346,7 @@ nm_access_point_get_rsn_flags (Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access
 point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -361,7 +361,7 @@ point.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the RSN flags
    
 
    
 
    
@@ -372,7 +372,7 @@ point.
    
 nm_access_point_get_ssid (NMAccessPoint *ap);
 
    Gets the SSID of the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -387,7 +387,7 @@ nm_access_point_get_ssid (
-
    Returns
    
+
    Returns
    
 
     the GBytes containing the SSID, or NULL if the
 SSID is unknown. 
    
 
    [transfer none]
    
@@ -400,7 +400,7 @@ SSID is unknown. 
    
 nm_access_point_get_bssid (NMAccessPoint *ap);
 
    Gets the Basic Service Set ID (BSSID) of the Wi-Fi access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -415,7 +415,7 @@ nm_access_point_get_bssid (
-
    Returns
    
+
    Returns
    
 
     the BSSID of the access point. This is an internal string and must
 not be modified or freed.
    
 
@@ -427,7 +427,7 @@ not be modified or freed.
    
 nm_access_point_get_frequency (NMAccessPoint *ap);
 
    Gets the frequency of the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -442,7 +442,7 @@ nm_access_point_get_frequency (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the frequency
    
 
    
 
@@ -453,7 +453,7 @@ nm_access_point_get_frequency (NMAccessPoint *ap);
 
    Gets the mode of the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -468,7 +468,7 @@ nm_access_point_get_mode (
-
    Returns
    
+
    Returns
    
 
     the mode
    
 
 
@@ -479,7 +479,7 @@ nm_access_point_get_mode (NMAccessPoint *ap);
 
    Gets the maximum bit rate of the access point in kbit/s.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -494,7 +494,7 @@ nm_access_point_get_max_bitrate (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the maximum bit rate (kbit/s)
    
 
    
 
@@ -505,7 +505,7 @@ nm_access_point_get_max_bitrate (NMAccessPoint *ap);
 
    Gets the current signal strength of the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -520,7 +520,7 @@ nm_access_point_get_strength (
-
    Returns
    
+
    Returns
    
 
     the signal strength
    
 
 
@@ -533,7 +533,7 @@ nm_access_point_get_last_seen (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -548,7 +548,7 @@ point has not been found in a scan.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the last seen time in seconds
    
 
    
 
    Since: 1.2
    
@@ -569,7 +569,7 @@ use NMDevice using nm_device_filter_connections() and finally filter that list
 with this function.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -584,7 +584,7 @@ with this function.
    
-
@@ -592,9 +592,9 @@ filter. 
    
 
 

 
 
    
 
    connections
     an array of NMConnections to
+
     an array of NMConnections to
 filter. 
    		
 [element-type NMConnection]
 
    
 
    
 
    
 
    
-
    Returns
    
+
    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. 
    
 
    [transfer container][element-type NMConnection]
    
@@ -612,7 +612,7 @@ the connection may be activated with that AP.  The connection must match the
 's SSID, (if given) BSSID, and other attributes like security settings,
 channel, band, etc.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -636,7 +636,7 @@ against
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection may be activated with this Wi-Fi AP,
 FALSE if it cannot be.
    
 
    
@@ -814,6 +814,6 @@ coordinator of the wireless network allowing clients to connect) or
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
    
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index 8ef75fb1..f70f51be 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -359,7 +359,7 @@ nm_active_connection_get_connection (Gets the NMRemoteConnection associated with connection
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -374,7 +374,7 @@ nm_active_connection_get_connection (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMRemoteConnection which this
 NMActiveConnection is an active instance of. 
    
 
    [transfer none]
    
@@ -387,7 +387,7 @@ nm_active_connection_get_connection (NMActiveConnection *connection);
 
    Gets the NMConnection's ID.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -402,7 +402,7 @@ nm_active_connection_get_id (
-
    Returns
    
+
    Returns
    
 
     the ID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.
    
 
@@ -414,7 +414,7 @@ This is the internal string used by the connection, and must not be modified.
    NMActiveConnection *connection    );
 
    Gets the NMConnection's UUID.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -429,7 +429,7 @@ nm_active_connection_get_uuid (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the UUID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.
    
 
    
@@ -442,7 +442,7 @@ nm_active_connection_get_connection_type
                                (NMActiveConnection *connection);
 
    Gets the NMConnection's type.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -457,7 +457,7 @@ nm_active_connection_get_connection_type
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the type of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.
    
 
    
@@ -476,7 +476,7 @@ is based on other information. (Eg, if connectionNMAccessPoint, and you can
 resolve it with nm_device_wifi_get_access_point_by_path().)
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -491,7 +491,7 @@ resolve it with 
-
    Returns
    
+
    Returns
     the specific object's D-Bus path. This is the internal string used
 by the connection, and must not be modified.
    
@@ -501,9 +501,9 @@ by the connection, and must not be modified.
    nm_active_connection_get_devices ()
    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
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
    @@ -518,8 +518,8 @@ nm_active_connection_get_devices (
 
 
    
-
    Returns
    
-
     the GPtrArray containing NMDevices.
+
    Returns
    
+
     the GPtrArray containing NMDevices.
 This is the internal copy used by the connection, and must not be modified. 
    
 
    [element-type NMDevice]
    
 
    
@@ -531,7 +531,7 @@ This is the internal copy used by the connection, and must not be modified. 
    
 nm_active_connection_get_state (NMActiveConnection *connection);
 
    Gets the active connection's state.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -546,7 +546,7 @@ nm_active_connection_get_state (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the state
    
 
    
 
@@ -557,7 +557,7 @@ nm_active_connection_get_state (NMActiveConnection *connection);
 
    Gets the master NMDevice of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -572,7 +572,7 @@ nm_active_connection_get_master (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the master NMDevice of the NMActiveConnection. 
    
 
    [transfer none]
    
 
    
@@ -585,7 +585,7 @@ nm_active_connection_get_default (Whether the active connection is the default IPv4 one (that is, is used for
 the default IPv4 route and DNS information).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -600,7 +600,7 @@ the default IPv4 route and DNS information).
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the active connection is the default IPv4 connection
    
 
    
 
    
@@ -611,7 +611,7 @@ the default IPv4 route and DNS information).
    
 nm_active_connection_get_ip4_config (NMActiveConnection *connection);
 
    Gets the current IPv4 NMIPConfig associated with the NMActiveConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -626,7 +626,7 @@ nm_active_connection_get_ip4_config (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the IPv4 NMIPConfig, or NULL if the connection is
 not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 
    
 
    [transfer none]
    
@@ -640,7 +640,7 @@ nm_active_connection_get_dhcp4_config (NMDhcpConfig (if any) associated with the
 NMActiveConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -655,7 +655,7 @@ nm_active_connection_get_dhcp4_config (
-
    Returns
    
+
    Returns
    
 
     the IPv4 NMDhcpConfig, or NULL if the connection
 does not use DHCP, or is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 
    
@@ -670,7 +670,7 @@ nm_active_connection_get_default6 (Whether the active connection is the default IPv6 one (that is, is used for
 the default IPv6 route and DNS information).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -685,7 +685,7 @@ the default IPv6 route and DNS information).
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the active connection is the default IPv6 connection
    
 
    
 
    
@@ -696,7 +696,7 @@ the default IPv6 route and DNS information).
    
 nm_active_connection_get_ip6_config (NMActiveConnection *connection);
 
    Gets the current IPv6 NMIPConfig associated with the NMActiveConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -711,7 +711,7 @@ nm_active_connection_get_ip6_config (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the IPv6 NMIPConfig, or NULL if the connection is
 not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 
    
 
    [transfer none]
    
@@ -725,7 +725,7 @@ nm_active_connection_get_dhcp6_config (NMDhcpConfig (if any) associated with the
 NMActiveConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -740,7 +740,7 @@ nm_active_connection_get_dhcp6_config (
-
    Returns
    
+
    Returns
    
 
     the IPv6 NMDhcpConfig, or NULL if the connection
 does not use DHCPv6, or is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 
    
@@ -754,7 +754,7 @@ state. 
    
 nm_active_connection_get_vpn (NMActiveConnection *connection);
 
    Whether the active connection is a VPN connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -769,7 +769,7 @@ nm_active_connection_get_vpn (
-
    Returns
    
+
    Returns
    
 
     TRUE if the active connection is a VPN connection
    
 
 
@@ -990,6 +990,6 @@ nm_active_connection_get_vpn (
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index 06167333..8b26d625 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -617,6 +617,16 @@
     
+
+
+
+
+
+
+
+
+
+
@@ -774,6 +784,14 @@
 
+
+
+
+
+
+
+
+
@@ -823,7 +841,7 @@ NMClient implements
 nm_client_error_quark (void);
 
    Registers an error quark for NMClient if necessary.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the error quark used for NMClient errors.
    
 
    
 
@@ -838,7 +856,7 @@ nm_client_new (GCancellablenm_client_new_async() if you want to avoid
 that.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    
 voidactive-connection-addedRun First
    voidactive-connection-removedRun First
    void
 any-device-added
 Run First
 
    NM_CLIENT_CONNECTION_REMOVED
 
    
 
    #defineNM_CLIENT_ACTIVE_CONNECTION_ADDED
    #defineNM_CLIENT_ACTIVE_CONNECTION_REMOVED
    
 enum
 NMClientPermission
 
    @@ -860,7 +878,7 @@ that.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new NMClient or NULL on an error
    
 
    
 
    
@@ -877,7 +895,7 @@ nm_client_new_async (GCancellable
 nm_client_new_finish() to get the result. Note that on an error,
 the callback can be invoked with two first parameters as NULL.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -913,7 +931,7 @@ nm_client_new_finish (GAsyncResul
                       GError **error);
 
    Gets the result of an nm_client_new_async() call.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -935,7 +953,7 @@ nm_client_new_finish (GAsyncResul
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new NMClient, or NULL on error
    
 
    
 
    
@@ -946,7 +964,7 @@ nm_client_new_finish (GAsyncResul
 nm_client_get_version (NMClient *client);
 
    Gets NetworkManager version.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -961,7 +979,7 @@ nm_client_get_version (
-
    Returns
    
+
    Returns
    
 
     string with the version (or NULL if NetworkManager is not running)
    
 
 
@@ -972,7 +990,7 @@ nm_client_get_version (NMClient *client);
 
    Gets the current daemon state.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -987,7 +1005,7 @@ nm_client_get_state (
-
    Returns
    
+
    Returns
    
 
     the current NMState
    
 
 
@@ -999,7 +1017,7 @@ nm_client_get_startup (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1014,7 +1032,7 @@ connections at startup.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     whether the daemon is still starting up
    
 
    
 
    
@@ -1025,7 +1043,7 @@ connections at startup.
    
 nm_client_get_nm_running (NMClient *client);
 
    Determines whether the daemon is running.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1040,7 +1058,7 @@ nm_client_get_nm_running (
-
    Returns
    
+
    Returns
    
 
     TRUE if the daemon is running
    
 
 
@@ -1051,7 +1069,7 @@ nm_client_get_nm_running (NMClient *client);
 
    Whether networking is enabled or disabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1066,7 +1084,7 @@ nm_client_networking_get_enabled (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if networking is enabled, FALSE if networking is disabled
    
 
    
 
@@ -1081,7 +1099,7 @@ nm_client_networking_set_enabled (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1108,7 +1126,7 @@ all controlled interfaces are available for activation.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE otherwise
    
 
    
 
    
@@ -1119,7 +1137,7 @@ all controlled interfaces are available for activation.
    
 nm_client_wireless_get_enabled (NMClient *client);
 
    Determines whether the wireless is enabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1134,7 +1152,7 @@ nm_client_wireless_get_enabled (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if wireless is enabled
    
 
    
 
@@ -1146,7 +1164,7 @@ nm_client_wireless_set_enabled (gboolean enabled);
 
    Enables or disables wireless devices.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1176,7 +1194,7 @@ nm_client_wireless_hardware_get_enabled
                                (NMClient *client);
 
    Determines whether the wireless hardware is enabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1191,7 +1209,7 @@ nm_client_wireless_hardware_get_enabled
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the wireless hardware is enabled
    
 
    
 
@@ -1202,7 +1220,7 @@ nm_client_wireless_hardware_get_enabled
 nm_client_wwan_get_enabled (NMClient *client);
 
    Determines whether WWAN is enabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1217,7 +1235,7 @@ nm_client_wwan_get_enabled (
-
    Returns
    
+
    Returns
    
 
     TRUE if WWAN is enabled
    
 
 
@@ -1229,7 +1247,7 @@ nm_client_wwan_set_enabled (gboolean enabled);
 
    Enables or disables WWAN devices.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1258,7 +1276,7 @@ nm_client_wwan_set_enabled (NMClient *client);
 
    Determines whether the WWAN hardware is enabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1273,7 +1291,7 @@ nm_client_wwan_hardware_get_enabled (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the WWAN hardware is enabled
    
 
    
 
@@ -1284,7 +1302,7 @@ nm_client_wwan_hardware_get_enabled (NMClient *client);
 
    Determines whether WiMAX is enabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1299,7 +1317,7 @@ nm_client_wimax_get_enabled (
-
    Returns
    
+
    Returns
    
 
     TRUE if WiMAX is enabled
    
 
 
@@ -1311,7 +1329,7 @@ nm_client_wimax_set_enabled (gboolean enabled);
 
    Enables or disables WiMAX devices.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1340,7 +1358,7 @@ nm_client_wimax_set_enabled (NMClient *client);
 
    Determines whether the WiMAX hardware is enabled.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1355,7 +1373,7 @@ nm_client_wimax_hardware_get_enabled (
-
    Returns
    
+
    Returns
    
 
     TRUE if the WiMAX hardware is enabled
    
 
 
@@ -1369,7 +1387,7 @@ nm_client_get_logging (GError **error);
 
    Gets NetworkManager current logging level and domains.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1402,7 +1420,7 @@ a list of domains separated by ",". 
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE otherwise
    
 
    
 
@@ -1416,7 +1434,7 @@ nm_client_set_logging (GError **error);
 
    Sets NetworkManager logging level and/or domains.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1449,7 +1467,7 @@ domains separated by ",". (NULL or an empty string
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE otherwise
    
 
    
 
@@ -1462,7 +1480,7 @@ nm_client_get_permission_result (Requests the result of a specific permission, which indicates whether the
 client can or cannot perform the action the permission represents
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1484,7 +1502,7 @@ client can or cannot perform the action the permission represents
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the permission's result, one of NMClientPermissionResult
    
 
    
 
@@ -1498,7 +1516,7 @@ nm_client_get_connectivity (nm_client_check_connectivity_async(), which re-check the
 connectivity state first before returning any information.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1513,7 +1531,7 @@ connectivity state first before returning any information.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the current connectivity state
    
 
    
 
@@ -1530,7 +1548,7 @@ the most recent known state without re-checking.
    
 
    This is a blocking call; use nm_client_check_connectivity_async()
 if you do not want to block.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1557,7 +1575,7 @@ if you do not want to block.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the (new) current connectivity state
    
 
    
 
@@ -1575,7 +1593,7 @@ nm_client_check_connectivity_async (nm_client_check_connectivity(), which blocks.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1618,7 +1636,7 @@ nm_client_check_connectivity_finish (Retrieves the result of an nm_client_check_connectivity_async()
 call.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1645,7 +1663,7 @@ call.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the (new) current connectivity state
    
 
    
 
@@ -1660,7 +1678,7 @@ nm_client_save_hostname (
-
    Parameters
    
+
    Parameters
    
 
    @@ -1693,7 +1711,7 @@ clear any existing persistent hostname. 
    
 
 

 
    
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the request was successful, FALSE if it failed
    
 
    
 
@@ -1709,7 +1727,7 @@ nm_client_save_hostname_async (Requests that the machine's persistent hostname be set to the specified value
 or cleared.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1757,7 +1775,7 @@ nm_client_save_hostname_finish (GError **error);
 
    Gets the result of an nm_client_save_hostname_async() call.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1784,7 +1802,7 @@ nm_client_save_hostname_finish (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the request was successful, FALSE if it failed
    
 
    
 
@@ -1798,7 +1816,7 @@ nm_client_get_devices (nm_device_ethernet_get_hw_address().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1813,9 +1831,9 @@ methods such as 
-
    Returns
    
+
    Returns
    
 
     a GPtrArray
-containing all the NMDevices.  The returned array is owned by the
+containing all the NMDevices.  The returned array is owned by the
 NMClient object and should not be modified. 
    
 
    [transfer none][element-type NMDevice]
    
 
@@ -1834,7 +1852,7 @@ a placeholder.
    
 what kind of device each member of the returned array is, and then you may
 use device-specific methods such as nm_device_ethernet_get_hw_address().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1849,9 +1867,9 @@ use device-specific methods such as 
-
    Returns
    
+
    Returns
    
 
     a GPtrArray
-containing all the NMDevices.  The returned array is owned by the
+containing all the NMDevices.  The returned array is owned by the
 NMClient object and should not be modified. 
    
 
    [transfer none][element-type NMDevice]
    
 
@@ -1865,7 +1883,7 @@ nm_client_get_device_by_path (const char *object_path);
 
    Gets a NMDevice from a NMClient.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1887,7 +1905,7 @@ nm_client_get_device_by_path (
-
    Returns
    
+
    Returns
    
 
     the NMDevice for the given object_path
 or NULL if none is found. 
    
 
    [transfer none]
    
@@ -1901,7 +1919,7 @@ nm_client_get_device_by_iface (const char *iface);
 
    Gets a NMDevice from a NMClient.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1923,7 +1941,7 @@ nm_client_get_device_by_iface (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMDevice for the given iface
 or NULL if none is found. 
    
 
    [transfer none]
    
@@ -1936,7 +1954,7 @@ or NULL if none is found. 
    
 nm_client_get_active_connections (NMClient *client);
 
    Gets the active connections.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1951,9 +1969,9 @@ nm_client_get_active_connections (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a GPtrArray
-containing all the active NMActiveConnections.
+containing all the active NMActiveConnections.
 The returned array is owned by the client and should not be modified. 
    
 
    [transfer none][element-type NMActiveConnection]
    
 
    
@@ -1973,7 +1991,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1988,7 +2006,7 @@ non-NetworkManager-recognized device, this will return NUL
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the appropriate NMActiveConnection, if
 any. 
    
 
    [transfer none]
    
@@ -2003,7 +2021,7 @@ nm_client_get_activating_connection (“primary-connection” upon successful activation.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2018,7 +2036,7 @@ currently-activating connection that is expected to become the new
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the appropriate NMActiveConnection, if
 any. 
    
 
    [transfer none]
    
@@ -2054,7 +2072,7 @@ the new connection, not when it finishes. You can used the returned
 NMActiveConnection object (in particular, “state”) to
 track the activation to its completion.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2118,7 +2136,7 @@ nm_client_activate_connection_finish (GError **error);
 
    Gets the result of a call to nm_client_activate_connection_async().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2145,7 +2163,7 @@ nm_client_activate_connection_finish (
-
    Returns
    
+
    Returns
    
 
     the new NMActiveConnection on success, NULL on
 failure, in which case error
 will be set. 
    
@@ -2174,7 +2192,7 @@ the new connection, not when it finishes. You can used the returned
 NMActiveConnection object (in particular, “state”) to
 track the activation to its completion.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2245,7 +2263,7 @@ nm_client_add_and_activate_connection_finish
 
    You can call nm_active_connection_get_connection() on the returned
 NMActiveConnection to find the path of the created NMConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2272,7 +2290,7 @@ nm_client_add_and_activate_connection_finish
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new NMActiveConnection on success, NULL on
 failure, in which case error
 will be set. 
    
@@ -2289,7 +2307,7 @@ nm_client_deactivate_connection (GError **error);
 
    Deactivates an active NMActiveConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2321,7 +2339,7 @@ nm_client_deactivate_connection (
 
 
    
-
    Returns
    
+
    Returns
    
 
     success or failure
    
 
    
 
@@ -2336,7 +2354,7 @@ nm_client_deactivate_connection_async (gpointer user_data);
 
    Asynchronously deactivates an active NMActiveConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2384,7 +2402,7 @@ nm_client_deactivate_connection_finish
                                 GError **error);
 
    Gets the result of a call to nm_client_deactivate_connection_async().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2411,7 +2429,7 @@ nm_client_deactivate_connection_finish
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     success or failure
    
 
    
 
    
@@ -2421,7 +2439,7 @@ nm_client_deactivate_connection_finish
 
    const GPtrArray *
 nm_client_get_connections (NMClient *client);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2436,7 +2454,7 @@ nm_client_get_connections (
-
    Returns
    
+
    Returns
    
 
     an array
 containing all connections provided by the remote settings service.  The
 returned array is owned by the NMClient object and should not be modified.
    
@@ -2454,7 +2472,7 @@ nm_client_get_connection_by_id (Returns the first matching NMRemoteConnection matching a given id
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2476,7 +2494,7 @@ nm_client_get_connection_by_id (
 
 
    
-
    Returns
    
+
    Returns
    
 
     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
@@ -2493,7 +2511,7 @@ nm_client_get_connection_by_path (Returns the NMRemoteConnection representing the connection at path
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2515,7 +2533,7 @@ nm_client_get_connection_by_path (
 
 
    
-
    Returns
    
+
    Returns
    
 
     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
@@ -2532,7 +2550,7 @@ nm_client_get_connection_by_uuid (Returns the NMRemoteConnection identified by uuid
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2554,7 +2572,7 @@ nm_client_get_connection_by_uuid (
 
 
    
-
    Returns
    
+
    Returns
    
 
     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
@@ -2590,7 +2608,7 @@ identical settings to connection
  as NetworkManager may perform automatic
 completion and/or normalization of connection properties.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2643,7 +2661,7 @@ nm_client_add_connection_finish (GError **error);
 
    Gets the result of a call to nm_client_add_connection_async().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2670,7 +2688,7 @@ nm_client_add_connection_finish (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the new NMRemoteConnection on success, NULL on
 failure, in which case error
 will be set. 
    
@@ -2699,7 +2717,7 @@ then failures
  will be set to a NULL-terminated array of the
 filenames that failed to load.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2714,8 +2732,8 @@ filenames that failed to load.
    
 
     
-
-
+
+
@@ -2737,7 +2755,7 @@ filenames that failed to load. 
    
 
    
 
 

    
 
    filenames
    NULL-terminated array of filenames to load
    		 
     NULL-terminated array of filenames to load. 
    		[array zero-terminated=1]
 
    
 
    
 
    failures
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if NetworkManager at least tried to load filenames
 ,
 FALSE if an error occurred (eg, permission denied).
    
@@ -2756,7 +2774,7 @@ nm_client_load_connections_async (
 
    See nm_client_load_connections() for more details.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2771,8 +2789,8 @@ given files, adding or updating the connections described within.
    
-
-
+
+
@@ -2805,7 +2823,7 @@ nm_client_load_connections_finish (Gets the result of an nm_client_load_connections_async() call.
    
 
    See nm_client_load_connections() for more details.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    
 
    filenames
    NULL-terminated array of filenames to load
    		 
     NULL-terminated array of filenames to load. 
    		[array zero-terminated=1]
 
    
 
    
 
    cancellable
    @@ -2820,9 +2838,9 @@ nm_client_load_connections_finish (
 
-
-
+
+
@@ -2838,7 +2856,7 @@ filenames that failed to load. 
    
 
    
 
 

    
 
    failures
     on return, a NULL-terminated array of
-filenames that failed to load. 
    		[out][transfer full]
     on return, a
+NULL-terminated array of filenames that failed to load. 
    		[out][transfer full][array zero-terminated=1]
 
    
 
    
 
    result
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if NetworkManager at least tried to load filenames
 ,
 FALSE if an error occurred (eg, permission denied).
    
@@ -2855,7 +2873,7 @@ nm_client_reload_connections (
-
    Parameters
    
+
    Parameters
    
 
    @@ -2882,7 +2900,7 @@ the in-memory state matches the on-disk state.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on failure
    
 
    
 
    
@@ -2898,7 +2916,7 @@ nm_client_reload_connections_async (
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2940,7 +2958,7 @@ nm_client_reload_connections_finish (GError **error);
 
    Gets the result of an nm_client_reload_connections_async() call.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2967,7 +2985,7 @@ nm_client_reload_connections_finish (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on failure
    
 
    
 
@@ -3143,11 +3161,23 @@ nm_client_reload_connections_finish (
 
    
 
    
+
    NM_CLIENT_ACTIVE_CONNECTION_ADDED
    
+
    #define NM_CLIENT_ACTIVE_CONNECTION_ADDED "active-connection-added"
+
    
+
    
+
    
+
    
+
    NM_CLIENT_ACTIVE_CONNECTION_REMOVED
    
+
    #define NM_CLIENT_ACTIVE_CONNECTION_REMOVED "active-connection-removed"
+
    
+
    
+
    
+
    
 
    enum NMClientPermission
    
 
    NMClientPermission values indicate various permissions that NetworkManager
 clients can obtain to perform certain tasks on behalf of the current user.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -3266,6 +3296,21 @@ clients can obtain to perform certain tasks on behalf of the current user.
    
     
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
 
 

     
 
    
 
    NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK
    		
+
    permission to create checkpoints.
    
+    		 
    NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS
    		
+
    controls whether device
+ statistics can be globally enabled or disabled
    
+    		 
    
 
    NM_CLIENT_PERMISSION_LAST
    		
 
 
    a reserved boundary value
    
@@ -3282,7 +3327,7 @@ clients can obtain to perform certain tasks on behalf of the current user.
    
 
    NMClientPermissionResult values indicate what authorizations and permissions
 the user requires to obtain a given NMClientPermission
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -3331,7 +3376,7 @@ the user requires to obtain a given NMManagerError, NMSettingsError, NMAgentManagerError, and NMConnectionError.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -3559,6 +3604,80 @@ see 
 
    Signal Details
    
+
    The “active-connection-added” signal
    
+
    void
+user_function (NMClient           *client,
+               NMActiveConnection *active_connection,
+               gpointer            user_data)
    
+
    Notifies that a NMActiveConnection has been added.
    
+
    
+
    Parameters
    
+
    
 
 

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




    client
    the settings object that received the signal
    		 
    active_connection
    the new active connection
    		 
    user_data
    user data set when the signal handler was connected.
    		 
    
+
    
+
    Flags: Run First
    
+
+
    
+
    
+
    The “active-connection-removed” signal
    
+
    void
+user_function (NMClient           *client,
+               NMActiveConnection *active_connection,
+               gpointer            user_data)
    
+
    Notifies that a NMActiveConnection has been removed.
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    




    client
    the settings object that received the signal
    		 
    active_connection
    the removed active connection
    		 
    user_data
    user data set when the signal handler was connected.
    		 
    
+
    
+
    Flags: Run First
    
+
    
+
    
+
    
 
    The “any-device-added” signal
    
 
    void
 user_function (NMClient *client,
@@ -3567,7 +3686,7 @@ user_function (Notifies that a NMDevice is added.  This signal is emitted for both
 regular devices and placeholder devices.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3605,7 +3724,7 @@ user_function (Notifies that a NMDevice is removed.  This signal is emitted for both
 regular devices and placeholder devices.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -3642,7 +3761,7 @@ user_function (gpointer            user_data)
 
    Notifies that a NMConnection has been added.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -3679,7 +3798,7 @@ user_function (gpointer            user_data)
 
    Notifies that a NMConnection has been removed.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -3717,7 +3836,7 @@ user_function (Notifies that a NMDevice is added.  This signal is not emitted for
 placeholder devices.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -3755,7 +3874,7 @@ user_function (Notifies that a NMDevice is removed.  This signal is not emitted for
 placeholder devices.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -3793,7 +3912,7 @@ user_function (gpointer  user_data)
 
    Notifies that a permission has changed
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -3829,6 +3948,6 @@ user_function (
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html
index bf8587db..239c3737 100644
--- a/docs/libnm/html/NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -572,7 +572,7 @@ same name which has previously been added to the     NMSetting object and does not increase
 the setting object's reference count.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -603,7 +603,7 @@ nm_connection_remove_setting (NMSetting with the given GType from the NMConnection.  This
 operation dereferences the NMSetting object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -634,7 +634,7 @@ nm_connection_get_setting (NMSetting with the given GType, if one has been previously added
 to the NMConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -656,7 +656,7 @@ to the 
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSetting, or NULL if no setting of that type was previously
 added to the NMConnection. 
    
 
    [transfer none]
    
@@ -671,7 +671,7 @@ nm_connection_get_setting_by_name (Gets the NMSetting with the given name, if one has been previously added
 the NMConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -693,7 +693,7 @@ the 
-
    Returns
    
+
    Returns
    
 
     the NMSetting, or NULL if no setting with that name was previously
 added to the NMConnection. 
    
 
    [transfer none]
    
@@ -709,7 +709,7 @@ nm_connection_to_dbus (NM_VARIANT_TYPE_CONNECTION describing the connection, suitable for
 marshalling over D-Bus or otherwise serializing.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -731,7 +731,7 @@ marshalling over D-Bus or otherwise serializing.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new floating GVariant describing the connection,
 its settings, and each setting's properties. 
    
 
    [transfer none]
    
@@ -750,7 +750,7 @@ nm_connection_replace_settings (nm_connection_verify()).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -777,7 +777,7 @@ need to result in a connection that passes 
-
    Returns
    
+
    Returns
     TRUE if connection was updated, FALSE if new_settings
 could not
 be deserialized (in which case connection
@@ -796,7 +796,7 @@ nm_connection_replace_settings_from_connection
 
 with the copied settings.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -827,7 +827,7 @@ nm_connection_clear_settings (connection
 's settings.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -853,7 +853,7 @@ nm_connection_compare (nm_setting_compare() for a description of
 each flag's behavior.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -880,7 +880,7 @@ each flag's behavior.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the comparison succeeds, FALSE if it does not
    
 
    
 
    
@@ -899,7 +899,7 @@ each setting that differ are added to the returned o
  hash table.
 No values are returned, only key names.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -934,7 +934,7 @@ differ mapped to one or more of 
-
    Returns
    
+
    Returns
     TRUE if the connections contain the same values, FALSE if they do
 not
    
@@ -955,7 +955,7 @@ connection for the connection to be valid.  As another example, the
 MAC address.  The returned GError contains information about which
 setting and which property failed validation, and how it failed validation.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
    @@ -977,7 +977,7 @@ setting and which property failed validation, and how it failed validation.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection is valid, FALSE if it is not
    
 
    
 
    
@@ -989,7 +989,7 @@ nm_connection_verify_secrets (GError **error);
 
    Verifies the secrets in the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1011,7 +1011,7 @@ nm_connection_verify_secrets (
-
    Returns
    
+
    Returns
    
 
     TRUE if the secrets are valid, FALSE if they are not
    
 
 
    Since: 1.2
    
@@ -1033,7 +1033,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1070,7 +1070,7 @@ why the connection is invalid, if the function returns an error.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection is valid, FALSE if it is not
    
 
    
 
@@ -1086,7 +1086,7 @@ intended as a guide to what secrets may be required, because in some
 circumstances, there is no way to conclusively determine exactly which
 secrets are needed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1112,7 +1112,7 @@ elements. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the setting name of the NMSetting object which has invalid or
 missing secrets
    
 
    
@@ -1125,7 +1125,7 @@ nm_connection_clear_secrets (
-
    Parameters
    
+
    Parameters
    
 
    @@ -1151,7 +1151,7 @@ nm_connection_clear_secrets_with_flags
 
    Clears and frees secrets determined by func
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1197,7 +1197,7 @@ returned by secrets
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1230,7 +1230,7 @@ or 
-
    Returns
    
+
    Returns
     TRUE if the secrets were successfully updated, FALSE if the update
 failed (tried to update secrets for a setting that doesn't exist, etc)
    
@@ -1245,7 +1245,7 @@ nm_connection_set_path (“path”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -1275,7 +1275,7 @@ which provides the connection
    
 nm_connection_get_path (NMConnection *connection);
 
    Returns the connection's D-Bus path.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1290,7 +1290,7 @@ nm_connection_get_path (
-
    Returns
    
+
    Returns
    
 
     the D-Bus path of the connection, previously set by a call to
 nm_connection_set_path().
    
 
@@ -1306,7 +1306,7 @@ If the connection contains no NMSettingConnection, it will return 
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1321,7 +1321,7 @@ NetworkManager, this is the name of the created interface.
    
 
    
 
 

    
 
 
    
-
    Returns
    
+
    Returns
    
 
     Name of the kernel interface or NULL
    
 
    
 
@@ -1337,7 +1337,7 @@ type (ie wired, Wi-Fi, ppp, etc). Checks the type    
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1360,7 +1360,7 @@ property of the connection and matches that against 
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection is of the given type
 , FALSE if not
    
 
    
@@ -1375,7 +1375,7 @@ nm_connection_for_each_setting_value (NMSetting object in the NMConnection,
 calling the supplied user function for each property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1412,7 +1412,7 @@ nm_connection_dump (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1434,7 +1434,7 @@ output format is not guaranteed to be stable and may change at any time.
    
 nm_connection_get_uuid (NMConnection *connection);
 
    A shortcut to return the UUID from the connection's NMSettingConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1449,7 +1449,7 @@ nm_connection_get_uuid (
-
    Returns
    
+
    Returns
    
 
     the UUID from the connection's 'connection' setting
    
 
 
@@ -1460,7 +1460,7 @@ nm_connection_get_uuid (NMConnection *connection);
 
    A shortcut to return the ID from the connection's NMSettingConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1475,7 +1475,7 @@ nm_connection_get_id (
-
    Returns
    
+
    Returns
    
 
     the ID from the connection's 'connection' setting
    
 
 
@@ -1486,7 +1486,7 @@ nm_connection_get_id (NMConnection *connection);
 
    A shortcut to return the type from the connection's NMSettingConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1501,7 +1501,7 @@ nm_connection_get_connection_type (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the type from the connection's 'connection' setting
    
 
    
 
@@ -1514,7 +1514,7 @@ nm_connection_is_virtual (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1529,7 +1529,7 @@ activated even if the device it refers to doesn't exist).
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     whether connection
 refers to a virtual device
    
 
    
@@ -1545,7 +1545,7 @@ return for the virtual device that would be created for 
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1560,7 +1560,7 @@ Eg, "VLAN (eth1.1)".
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the name of connection
 's device,
 or NULL if connection
@@ -1575,7 +1575,7 @@ is not a virtual connection type. 
    
 nm_connection_get_setting_802_1x (NMConnection *connection);
 
    A shortcut to return any NMSetting8021x the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1590,7 +1590,7 @@ nm_connection_get_setting_802_1x (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSetting8021x if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1602,7 +1602,7 @@ nm_connection_get_setting_802_1x (NMConnection *connection);
 
    A shortcut to return any NMSettingBluetooth the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1617,7 +1617,7 @@ nm_connection_get_setting_bluetooth (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingBluetooth if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1629,7 +1629,7 @@ nm_connection_get_setting_bluetooth (NMConnection *connection);
 
    A shortcut to return any NMSettingBond the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1644,7 +1644,7 @@ nm_connection_get_setting_bond (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingBond if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1656,7 +1656,7 @@ nm_connection_get_setting_bond (NMConnection *connection);
 
    A shortcut to return any NMSettingTeam the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1671,7 +1671,7 @@ nm_connection_get_setting_team (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingTeam if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1683,7 +1683,7 @@ nm_connection_get_setting_team (NMConnection *connection);
 
    A shortcut to return any NMSettingTeamPort the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1698,7 +1698,7 @@ nm_connection_get_setting_team_port (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingTeamPort if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1710,7 +1710,7 @@ nm_connection_get_setting_team_port (NMConnection *connection);
 
    A shortcut to return any NMSettingBridge the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1725,7 +1725,7 @@ nm_connection_get_setting_bridge (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingBridge if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1737,7 +1737,7 @@ nm_connection_get_setting_bridge (NMConnection *connection);
 
    A shortcut to return any NMSettingBridgePort the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1752,7 +1752,7 @@ nm_connection_get_setting_bridge_port (
-
    Returns
    
+
    Returns
    
 
     an NMSettingBridgePort if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
@@ -1764,7 +1764,7 @@ nm_connection_get_setting_bridge_port (NMConnection *connection);
 
    A shortcut to return any NMSettingCdma the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1779,7 +1779,7 @@ nm_connection_get_setting_cdma (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingCdma if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1791,7 +1791,7 @@ nm_connection_get_setting_cdma (NMConnection *connection);
 
    A shortcut to return any NMSettingConnection the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1806,7 +1806,7 @@ nm_connection_get_setting_connection (
-
    Returns
    
+
    Returns
    
 
     an NMSettingConnection if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
@@ -1818,7 +1818,7 @@ nm_connection_get_setting_connection (NMConnection *connection);
 
    A shortcut to return any NMSettingDcb the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1833,7 +1833,7 @@ nm_connection_get_setting_dcb (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingDcb if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1845,7 +1845,7 @@ nm_connection_get_setting_dcb (NMConnection *connection);
 
    A shortcut to return any NMSettingGeneric the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1860,7 +1860,7 @@ nm_connection_get_setting_generic (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingGeneric if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1872,7 +1872,7 @@ nm_connection_get_setting_generic (NMConnection *connection);
 
    A shortcut to return any NMSettingGsm the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1887,7 +1887,7 @@ nm_connection_get_setting_gsm (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingGsm if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1899,7 +1899,7 @@ nm_connection_get_setting_gsm (NMConnection *connection);
 
    A shortcut to return any NMSettingInfiniband the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1914,7 +1914,7 @@ nm_connection_get_setting_infiniband (
-
    Returns
    
+
    Returns
    
 
     an NMSettingInfiniband if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
@@ -1926,7 +1926,7 @@ nm_connection_get_setting_infiniband (NMConnection *connection);
 
    A shortcut to return any NMSettingIPTunnel the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1941,7 +1941,7 @@ nm_connection_get_setting_ip_tunnel (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingIPTunnel if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -1957,7 +1957,7 @@ nm_connection_get_setting_ip4_config (NMSettingIP4Config.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1972,7 +1972,7 @@ majority of IPv4-setting-related methods are on that type, not
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingIP4Config if the
 connection contains one, otherwise NULL. 
    
 
    [type NMSettingIP4Config][transfer none]
    
@@ -1988,7 +1988,7 @@ nm_connection_get_setting_ip6_config (NMSettingIP6Config.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2003,7 +2003,7 @@ majority of IPv6-setting-related methods are on that type, not
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingIP6Config if the
 connection contains one, otherwise NULL. 
    
 
    [type NMSettingIP6Config][transfer none]
    
@@ -2016,7 +2016,7 @@ connection contains one, otherwise NULL. 
    
 nm_connection_get_setting_macvlan (NMConnection *connection);
 
    A shortcut to return any NMSettingMacvlan the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2031,7 +2031,7 @@ nm_connection_get_setting_macvlan (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingMacvlan if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2044,7 +2044,7 @@ nm_connection_get_setting_macvlan (NMConnection *connection);
 
    A shortcut to return any NMSettingOlpcMesh the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2059,7 +2059,7 @@ nm_connection_get_setting_olpc_mesh (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingOlpcMesh if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2071,7 +2071,7 @@ nm_connection_get_setting_olpc_mesh (NMConnection *connection);
 
    A shortcut to return any NMSettingPpp the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2086,7 +2086,7 @@ nm_connection_get_setting_ppp (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingPpp if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2098,7 +2098,7 @@ nm_connection_get_setting_ppp (NMConnection *connection);
 
    A shortcut to return any NMSettingPppoe the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2113,7 +2113,7 @@ nm_connection_get_setting_pppoe (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingPppoe if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2125,7 +2125,7 @@ nm_connection_get_setting_pppoe (NMConnection *connection);
 
    A shortcut to return any NMSettingSerial the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2140,7 +2140,7 @@ nm_connection_get_setting_serial (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingSerial if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2152,7 +2152,7 @@ nm_connection_get_setting_serial (NMConnection *connection);
 
    A shortcut to return any NMSettingTun the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2167,7 +2167,7 @@ nm_connection_get_setting_tun (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingTun if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2180,7 +2180,7 @@ nm_connection_get_setting_tun (NMConnection *connection);
 
    A shortcut to return any NMSettingVpn the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2195,7 +2195,7 @@ nm_connection_get_setting_vpn (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingVpn if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2207,7 +2207,7 @@ nm_connection_get_setting_vpn (NMConnection *connection);
 
    A shortcut to return any NMSettingWimax the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2222,7 +2222,7 @@ nm_connection_get_setting_wimax (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingWimax if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2234,7 +2234,7 @@ nm_connection_get_setting_wimax (NMConnection *connection);
 
    A shortcut to return any NMSettingAdsl the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2249,7 +2249,7 @@ nm_connection_get_setting_adsl (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingAdsl if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2261,7 +2261,7 @@ nm_connection_get_setting_adsl (NMConnection *connection);
 
    A shortcut to return any NMSettingWired the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2276,7 +2276,7 @@ nm_connection_get_setting_wired (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingWired if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2288,7 +2288,7 @@ nm_connection_get_setting_wired (NMConnection *connection);
 
    A shortcut to return any NMSettingWireless the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2303,7 +2303,7 @@ nm_connection_get_setting_wireless (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingWireless if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2316,7 +2316,7 @@ nm_connection_get_setting_wireless_security
                                (NMConnection *connection);
 
    A shortcut to return any NMSettingWirelessSecurity the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2331,7 +2331,7 @@ nm_connection_get_setting_wireless_security
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2343,7 +2343,7 @@ nm_connection_get_setting_wireless_security
 nm_connection_get_setting_vlan (NMConnection *connection);
 
    A shortcut to return any NMSettingVlan the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2358,7 +2358,7 @@ nm_connection_get_setting_vlan (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingVlan if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2370,7 +2370,7 @@ nm_connection_get_setting_vlan (NMConnection *connection);
 
    A shortcut to return any NMSettingVxlan the connection might contain.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2385,7 +2385,7 @@ nm_connection_get_setting_vxlan (
 
 
    
-
    Returns
    
+
    Returns
    
 
     an NMSettingVxlan if the connection contains one, otherwise NULL. 
    
 
    [transfer none]
    
 
    
@@ -2431,7 +2431,7 @@ nm_connection_get_setting_vxlan (
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -2478,7 +2478,7 @@ an NM_VARIANT_TYPE_CONNECTION dictionary.
    
 
    These flags determine which properties are serialized when calling when
 calling nm_connection_to_dbus().
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -2514,6 +2514,6 @@ calling 
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index e6e7bbec..1071031b 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -832,7 +832,7 @@ NMDevice implements
 nm_device_get_iface (    NMDevice *device);
 
    Gets the interface name of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -847,7 +847,7 @@ nm_device_get_iface (
-
    Returns
    
+
    Returns
    
 
     the interface of the device. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -860,7 +860,7 @@ nm_device_get_ip_iface (NMDevice over which IP traffic flows
 when the device is in the ACTIVATED state.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -875,7 +875,7 @@ when the device is in the ACTIVATED state.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IP traffic interface of the device. This is the internal string
 used by the device, and must not be modified.
    
 
    
@@ -887,7 +887,7 @@ used by the device, and must not be modified.
    
 nm_device_get_device_type (NMDevice *device);
 
    Returns the numeric type of the NMDevice, ie Ethernet, Wi-Fi, etc.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -902,7 +902,7 @@ nm_device_get_device_type (
-
    Returns
    
+
    Returns
    
 
     the device type
    
 
 
@@ -913,7 +913,7 @@ nm_device_get_device_type (NMDevice *device);
 
    Gets the Unique Device Identifier of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -928,7 +928,7 @@ nm_device_get_udi (
-
    Returns
    
+
    Returns
    
 
     the Unique Device Identifier of the device.  This identifier may be
 used to gather more information about the device from various operating
 system services like udev or sysfs.
    
@@ -941,7 +941,7 @@ system services like udev or sysfs.
    
 nm_device_get_driver (NMDevice *device);
 
    Gets the driver of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -956,7 +956,7 @@ nm_device_get_driver (
-
    Returns
    
+
    Returns
    
 
     the driver of the device. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -968,7 +968,7 @@ device, and must not be modified.
    
 nm_device_get_driver_version (NMDevice *device);
 
    Gets the driver version of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -983,7 +983,7 @@ nm_device_get_driver_version (
-
    Returns
    
+
    Returns
    
 
     the version of the device driver. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -995,7 +995,7 @@ device, and must not be modified.
    
 nm_device_get_firmware_version (NMDevice *device);
 
    Gets the firmware version of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1010,7 +1010,7 @@ nm_device_get_firmware_version (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the firmware version of the device. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -1024,7 +1024,7 @@ nm_device_get_type_description (device
  is.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1039,7 +1039,7 @@ nm_device_get_type_description (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the type description of the device. This is the internal
 string used by the device, and must not be modified.
    
 
    
@@ -1052,7 +1052,7 @@ nm_device_get_hw_address (device
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1067,7 +1067,7 @@ nm_device_get_hw_address (
-
    Returns
    
+
    Returns
    
 
     the current MAC of the device, or NULL.
 This is the internal string used by the device, and must not be modified.
    
 
@@ -1079,7 +1079,7 @@ This is the internal string used by the device, and must not be modified.
    
 nm_device_get_capabilities (NMDevice *device);
 
    Gets the device' capabilities.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1094,7 +1094,7 @@ nm_device_get_capabilities (
-
    Returns
    
+
    Returns
    
 
     the capabilities
    
 
 
@@ -1105,7 +1105,7 @@ nm_device_get_capabilities (NMDevice *device);
 
    Whether the NMDevice is managed by NetworkManager.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1120,7 +1120,7 @@ nm_device_get_managed (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device is managed by NetworkManager
    
 
 
@@ -1132,7 +1132,7 @@ nm_device_set_managed (gboolean managed);
 
    Enables or disables management of  NMDevice by NetworkManager.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1162,7 +1162,7 @@ nm_device_set_managed (NMDevice *device);
 
    Whether the NMDevice can be autoconnected.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1177,7 +1177,7 @@ nm_device_get_autoconnect (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device is allowed to be autoconnected
    
 
 
@@ -1189,7 +1189,7 @@ nm_device_set_autoconnect (gboolean autoconnect);
 
    Enables or disables automatic activation of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1219,7 +1219,7 @@ nm_device_get_firmware_missing (Indicates that firmware required for the device's operation is likely
 to be missing.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1234,7 +1234,7 @@ to be missing.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if firmware required for the device's operation is likely
 to be missing.
    
 
    
@@ -1246,7 +1246,7 @@ to be missing.
    
 nm_device_get_nm_plugin_missing (NMDevice *device);
 
    Indicates that the NetworkManager plugin for the device is not installed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1261,7 +1261,7 @@ nm_device_get_nm_plugin_missing (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the device plugin not installed.
    
 
    
 
    Since: 1.2
    
@@ -1275,7 +1275,7 @@ nm_device_get_ip4_config (nm_active_connection_get_ip4_config(), which also
 works with VPN connections.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1290,7 +1290,7 @@ works with VPN connections.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IPv4 NMIPConfig, or NULL if the device is not
 activated. 
    
 
    [transfer none]
    
@@ -1305,7 +1305,7 @@ nm_device_get_dhcp4_config (nm_active_connection_get_dhcp4_config(), which also
 works with VPN connections.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1320,7 +1320,7 @@ works with VPN connections.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IPv4 NMDhcpConfig, or NULL if the device is
 not activated or not using DHCP. 
    
 
    [transfer none]
    
@@ -1335,7 +1335,7 @@ nm_device_get_ip6_config (nm_active_connection_get_ip6_config(), which also
 works with VPN connections.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1350,7 +1350,7 @@ works with VPN connections.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IPv6 NMIPConfig or NULL if the device is not activated. 
    
 
    [transfer none]
    
 
    
@@ -1364,7 +1364,7 @@ nm_device_get_dhcp6_config (nm_active_connection_get_dhcp6_config(), which also
 works with VPN connections.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1379,7 +1379,7 @@ works with VPN connections.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IPv6 NMDhcpConfig, or NULL if the device is
 not activated or not using DHCPv6. 
    
 
    [transfer none]
    
@@ -1392,7 +1392,7 @@ not activated or not using DHCPv6. 
    
 nm_device_get_state (NMDevice *device);
 
    Gets the current NMDevice state.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1407,7 +1407,7 @@ nm_device_get_state (
-
    Returns
    
+
    Returns
    
 
     the current device state
    
 
 
@@ -1418,7 +1418,7 @@ nm_device_get_state (NMDevice *device);
 
    Gets the reason for entering the current NMDevice state.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1433,7 +1433,7 @@ nm_device_get_state_reason (
-
    Returns
    
+
    Returns
    
 
     the reason for entering the current device state
    
 
 
@@ -1444,7 +1444,7 @@ nm_device_get_state_reason (NMDevice *device);
 
    Gets the NMActiveConnection object which owns this device during activation.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1459,7 +1459,7 @@ nm_device_get_active_connection (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMActiveConnection or NULL if the device is
 not part of an active connection. 
    
 
    [transfer none]
    
@@ -1470,11 +1470,11 @@ not part of an active connection. 
    
 
    nm_device_get_available_connections ()
    
 
    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
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1489,9 +1489,9 @@ be activated on device
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the GPtrArray
-containing NMRemoteConnections. This is the internal copy used by
+containing NMRemoteConnections. This is the internal copy used by
 the connection, and must not be modified. 
    
 
    [element-type NMRemoteConnection]
    
 
    
@@ -1503,10 +1503,10 @@ the connection, and must not be modified. 
    
 nm_device_get_physical_port_id (NMDevice *device);
 
    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
    
+
    Parameters
    
 
    @@ -1521,7 +1521,7 @@ ports on a single physical port. (Eg, NPAR / SR-IOV.)
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     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.
    
@@ -1534,7 +1534,7 @@ must not be modified.
    
 nm_device_get_mtu (NMDevice *device);
 
    Gets the  MTU of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1549,7 +1549,7 @@ nm_device_get_mtu (
-
    Returns
    
+
    Returns
    
 
     the MTU of the device.
    
 
 
@@ -1559,7 +1559,7 @@ nm_device_get_mtu (gboolean
 nm_device_is_real (NMDevice *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1574,7 +1574,7 @@ nm_device_is_real (
-
    Returns
    
+
    Returns
    
 
     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.
    
@@ -1588,7 +1588,7 @@ that could be automatically created by NetworkManager if one of its
 nm_device_is_software (NMDevice *device);
 
    Whether the device is a software device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1603,7 +1603,7 @@ nm_device_is_software (
-
    Returns
    
+
    Returns
    
 
     TRUE if device
 is a software device, FALSE if it is a hardware device.
    
 
@@ -1615,7 +1615,7 @@ is a software device, FALSE if it is a hardware dev
 nm_device_get_product (NMDevice *device);
 
    Gets the product string of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1630,7 +1630,7 @@ nm_device_get_product (
-
    Returns
    
+
    Returns
    
 
     the product name of the device. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -1642,7 +1642,7 @@ device, and must not be modified.
    
 nm_device_get_vendor (NMDevice *device);
 
    Gets the vendor string of the NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1657,7 +1657,7 @@ nm_device_get_vendor (
-
    Returns
    
+
    Returns
    
 
     the vendor name of the device. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -1670,7 +1670,7 @@ nm_device_get_description (device
 , based on its vendor and product names.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1685,7 +1685,7 @@ nm_device_get_description (
-
    Returns
    
+
    Returns
    
 
     a description of device
 . If either the vendor or the
 product name is unknown, this returns the interface name.
    
@@ -1698,7 +1698,7 @@ product name is unknown, this returns the interface name.
    
 nm_device_get_metered (NMDevice *device);
 
    Gets the metered setting of a NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1713,7 +1713,7 @@ nm_device_get_metered (
-
    Returns
    
+
    Returns
    
 
     the metered setting.
    
 
 
    Since: 1.2
    
@@ -1725,7 +1725,7 @@ nm_device_get_metered (NMDevice *device);
 
    Gets the list of neighbors discovered through LLDP.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1740,7 +1740,7 @@ nm_device_get_lldp_neighbors (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray
 containing NMLldpNeighbors. This is the internal copy used by the
 device and must not be modified. The library never modifies the returned
@@ -1759,7 +1759,7 @@ nm_device_disambiguate_names (devices
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1782,7 +1782,7 @@ devices in devices
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the device names. 
    
 
    [transfer full][array zero-terminated=1]
    
 
    
@@ -1800,7 +1800,7 @@ nm_device_reapply (
-
    Parameters
    
+
    Parameters
    
 
    @@ -1844,7 +1844,7 @@ catch concurrent accesses.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
@@ -1864,7 +1864,7 @@ nm_device_reapply_async (
-
    Parameters
    
+
    Parameters
    
 
    @@ -1924,7 +1924,7 @@ nm_device_reapply_finish (GError **error);
 
    Gets the result of a call to nm_device_reapply_async().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1951,7 +1951,7 @@ nm_device_reapply_finish (
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
@@ -1968,7 +1968,7 @@ nm_device_get_applied_connection (GError **error);
 
    Fetch the currently applied connection on the device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2006,7 +2006,7 @@ the applied connection. 
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a NMConnection with the currently applied settings
 or NULL on error.
    
 
    The connection is as received from D-Bus and might not validate according
@@ -2027,7 +2027,7 @@ nm_device_get_applied_connection_async
                                 gpointer user_data);
 
    Asynchronously begins an get the a currently applied connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2077,7 +2077,7 @@ nm_device_get_applied_connection_finish
                                 GError **error);
    Gets the result of a call to nm_device_get_applied_connection_async().
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -2110,7 +2110,7 @@ connection. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a currently applied NMConnection or NULL in case
 of error.
    
 
    The connection is as received from D-Bus and might not validate according
@@ -2130,7 +2130,7 @@ nm_device_disconnect (
-
    Parameters
    
+
    Parameters
    
 
    @@ -2157,7 +2157,7 @@ request.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
@@ -2174,7 +2174,7 @@ nm_device_disconnect_async (
-
    Parameters
    
+
    Parameters
    
 
    @@ -2216,7 +2216,7 @@ nm_device_disconnect_finish (GError **error);
 
    Gets the result of a call to nm_device_disconnect_async().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2243,7 +2243,7 @@ nm_device_disconnect_finish (
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
@@ -2257,7 +2257,7 @@ nm_device_delete (GError **error);
 
    Deletes the software device. Hardware devices can't be deleted.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2284,7 +2284,7 @@ nm_device_delete (
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
@@ -2300,7 +2300,7 @@ nm_device_delete_async (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2342,7 +2342,7 @@ nm_device_delete_finish (GError **error);
 
    Gets the result of a call to nm_device_delete_async().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2369,7 +2369,7 @@ nm_device_delete_finish (
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
@@ -2391,7 +2391,7 @@ Ethernet, Bluetooth, Wi-Fi WPA connections, or any other connection that is
 incompatible with the device. To get the full list of connections see
 nm_client_get_connections().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2406,16 +2406,16 @@ 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]
 
    
     
 
    
 
    
 
    
-
    Returns
    
+
    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. 
    
 
    [transfer container][element-type NMConnection]
    
@@ -2436,7 +2436,7 @@ network, and will not be valid if it describes a WPA network, or if it is
 an Ethernet, Bluetooth, WWAN, etc connection that is incompatible with the
 device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2460,7 +2460,7 @@ against
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection may be activated with this device, FALSE
 if is incompatible with the device's capabilities and characteristics.
    
 
    
@@ -2484,7 +2484,7 @@ device.
    
 compatibility of the given device and connection. But, in addition, it sets
 GError when FALSE is returned.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2513,7 +2513,7 @@ against
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection may be activated with this device, FALSE
 if is incompatible with the device's capabilities and characteristics.
    
 
    
@@ -2527,7 +2527,7 @@ nm_device_get_setting_type (device
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2542,7 +2542,7 @@ that can be used on device
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     device
 's associated NMSetting type
    
 
    
@@ -2554,7 +2554,7 @@ that can be used on device
 nm_lldp_neighbor_new (void);
 
    Creates a new NMLldpNeighbor object.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new NMLldpNeighbor object. 
    
 
    [transfer full]
    
 
    
@@ -2567,7 +2567,7 @@ nm_lldp_neighbor_new (void
 nm_lldp_neighbor_ref (NMLldpNeighbor *neighbor);
 
    Increases the reference count of the object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2591,7 +2591,7 @@ nm_lldp_neighbor_unref (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2615,7 +2615,7 @@ nm_lldp_neighbor_get_attr_names (Gets an array of attribute names available for neighbor
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2630,7 +2630,7 @@ nm_lldp_neighbor_get_attr_names (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a NULL-terminated array of attribute names. 
    
 
    [transfer full]
    
 
    
@@ -2648,7 +2648,7 @@ nm_lldp_neighbor_get_attr_string_value
  on neighbor
 
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2675,7 +2675,7 @@ nm_lldp_neighbor_get_attr_string_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if a string attribute with name name
 was found, FALSE otherwise
    
 
    
@@ -2692,7 +2692,7 @@ nm_lldp_neighbor_get_attr_uint_value (neighbor
 
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2719,7 +2719,7 @@ nm_lldp_neighbor_get_attr_uint_value (
-
    Returns
    
+
    Returns
    
 
     TRUE if a uint attribute with name name
 was found, FALSE otherwise
    
 
@@ -2733,7 +2733,7 @@ nm_lldp_neighbor_get_attr_type (char *name);
 
    Get the type of an attribute.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2755,7 +2755,7 @@ nm_lldp_neighbor_get_attr_type (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the GVariantType of the attribute with name name
 
    
 
    
@@ -3038,7 +3038,7 @@ operations like addressing and routing.
    
 
    
 
    The “ip4-config” property
    
 
      “ip4-config”               NMIPConfig *
    
-
    The NMIP4Config of the device.
    
+
    The NMIP4Config of the device.
    
 
    Flags: Read
    
 
    
 
    
@@ -3168,7 +3168,7 @@ user_function (gpointer  user_data)
 
    Notifies the state change of a NMDevice.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -3209,6 +3209,6 @@ user_function (
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceAdsl.html b/docs/libnm/html/NMDeviceAdsl.html
index f64abd16..fd0db66c 100644
--- a/docs/libnm/html/NMDeviceAdsl.html
+++ b/docs/libnm/html/NMDeviceAdsl.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -110,7 +110,7 @@ NMDeviceAdsl implements
 nm_device_adsl_get_carrier (    NMDeviceAdsl *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -125,7 +125,7 @@ nm_device_adsl_get_carrier (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
 
@@ -155,6 +155,6 @@ nm_device_adsl_get_carrier (
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html
index b135cfb0..b127fc4b 100644
--- a/docs/libnm/html/NMDeviceBond.html
+++ b/docs/libnm/html/NMDeviceBond.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -148,7 +148,7 @@ NMDeviceBond implements
 nm_device_bond_get_hw_address (    NMDeviceBond *device);
 
    Gets the hardware (MAC) address of the NMDeviceBond
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -163,7 +163,7 @@ nm_device_bond_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -175,7 +175,7 @@ device, and must not be modified.
    
 nm_device_bond_get_carrier (NMDeviceBond *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -190,7 +190,7 @@ nm_device_bond_get_carrier (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
 
@@ -202,7 +202,7 @@ nm_device_bond_get_slaves (device
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -217,9 +217,9 @@ nm_device_bond_get_slaves (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray containing
-NMDevices that are slaves of device
+NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 
    
 
    [element-type NMDevice]
    
@@ -279,6 +279,6 @@ copy used by the device, and must not be modified. 
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html
index 4015e5b6..a08a2f2d 100644
--- a/docs/libnm/html/NMDeviceBridge.html
+++ b/docs/libnm/html/NMDeviceBridge.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -148,7 +148,7 @@ NMDeviceBridge implements
 nm_device_bridge_get_hw_address (NMDeviceBridge *device);
 
    Gets the hardware (MAC) address of the NMDeviceBridge
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -163,7 +163,7 @@ nm_device_bridge_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -175,7 +175,7 @@ device, and must not be modified.
    
 nm_device_bridge_get_carrier (NMDeviceBridge *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -190,7 +190,7 @@ nm_device_bridge_get_carrier (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
 
@@ -202,7 +202,7 @@ nm_device_bridge_get_slaves (device
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -217,9 +217,9 @@ nm_device_bridge_get_slaves (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray containing
-NMDevices that are slaves of device
+NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 
    
 
    [element-type NMDevice]
    
@@ -279,6 +279,6 @@ copy used by the device, and must not be modified. 
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceBt.html b/docs/libnm/html/NMDeviceBt.html
index 9d3b379b..b707efa5 100644
--- a/docs/libnm/html/NMDeviceBt.html
+++ b/docs/libnm/html/NMDeviceBt.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -148,7 +148,7 @@ NMDeviceBt implements
 nm_device_bt_get_hw_address (NMDeviceBt *device);
 
    Gets the hardware (MAC) address of the NMDeviceBt
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -163,7 +163,7 @@ nm_device_bt_get_hw_address (
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -175,7 +175,7 @@ device, and must not be modified.
    
 nm_device_bt_get_name (NMDeviceBt *device);
 
    Gets the name of the NMDeviceBt.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -190,7 +190,7 @@ nm_device_bt_get_name (
-
    Returns
    
+
    Returns
    
 
     the name of the device
    
 
 
@@ -201,7 +201,7 @@ nm_device_bt_get_name (NMDeviceBt *device);
 
    Returns the Bluetooth device's usable capabilities.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -216,7 +216,7 @@ nm_device_bt_get_capabilities (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a combination of NMBluetoothCapabilities
    
 
    
 
@@ -273,6 +273,6 @@ nm_device_bt_get_capabilities (
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    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 68bfbd7a..2619d4d0 100644
--- a/docs/libnm/html/NMDeviceEthernet.html
+++ b/docs/libnm/html/NMDeviceEthernet.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -181,7 +181,7 @@ NMDeviceEthernet implements
 nm_device_ethernet_get_hw_address (    NMDeviceEthernet *device);
 
    Gets the active hardware (MAC) address of the NMDeviceEthernet
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -196,7 +196,7 @@ nm_device_ethernet_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the active hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -209,7 +209,7 @@ nm_device_ethernet_get_permanent_hw_address
                                (NMDeviceEthernet *device);
 
    Gets the permanent hardware (MAC) address of the NMDeviceEthernet
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -224,7 +224,7 @@ nm_device_ethernet_get_permanent_hw_address
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the permanent hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -236,7 +236,7 @@ device, and must not be modified.
    
 nm_device_ethernet_get_speed (NMDeviceEthernet *device);
 
    Gets the speed of the NMDeviceEthernet.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -251,7 +251,7 @@ nm_device_ethernet_get_speed (
-
    Returns
    
+
    Returns
    
 
     the speed of the device
    
 
 
@@ -262,7 +262,7 @@ nm_device_ethernet_get_speed (NMDeviceEthernet *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -277,7 +277,7 @@ nm_device_ethernet_get_carrier (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
    
 
@@ -289,7 +289,7 @@ nm_device_ethernet_get_s390_subchannels
                                (NMDeviceEthernet *device);
 
    Return the list of s390 subchannels if the device supports them.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -304,7 +304,7 @@ nm_device_ethernet_get_s390_subchannels
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     array of strings, each specifying
 one subchannel the s390 device uses to communicate to the host. 
    
 
    [transfer none][element-type utf8]
    
@@ -394,6 +394,6 @@ communication with z/VM or s390 host.
    
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
    
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceGeneric.html b/docs/libnm/html/NMDeviceGeneric.html
index e446b89d..d1b2387f 100644
--- a/docs/libnm/html/NMDeviceGeneric.html
+++ b/docs/libnm/html/NMDeviceGeneric.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -122,7 +122,7 @@ NMDeviceGeneric implements
 nm_device_generic_get_hw_address (NMDeviceGeneric *device);
 
    Gets the hardware address of the NMDeviceGeneric
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -137,7 +137,7 @@ nm_device_generic_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -183,6 +183,6 @@ if not known.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceIPTunnel.html b/docs/libnm/html/NMDeviceIPTunnel.html
index 310bf608..e003d58b 100644
--- a/docs/libnm/html/NMDeviceIPTunnel.html
+++ b/docs/libnm/html/NMDeviceIPTunnel.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -284,7 +284,7 @@ NMDeviceIPTunnel implements
 
    NMDevice *
 nm_device_ip_tunnel_get_parent (NMDeviceIPTunnel *device);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -299,7 +299,7 @@ nm_device_ip_tunnel_get_parent (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the device's parent device. 
    
 
    [transfer none]
    
 
    
@@ -311,7 +311,7 @@ nm_device_ip_tunnel_get_parent (NMIPTunnelMode
 nm_device_ip_tunnel_get_mode (NMDeviceIPTunnel *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -326,7 +326,7 @@ nm_device_ip_tunnel_get_mode (
-
    Returns
    
+
    Returns
    
 
     the tunneling mode
    
 
 
    Since: 1.2
    
@@ -337,7 +337,7 @@ nm_device_ip_tunnel_get_mode (const char *
 nm_device_ip_tunnel_get_local (NMDeviceIPTunnel *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -352,7 +352,7 @@ nm_device_ip_tunnel_get_local (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the local endpoint of the tunnel
    
 
    
 
    Since: 1.2
    
@@ -363,7 +363,7 @@ nm_device_ip_tunnel_get_local (const char *
 nm_device_ip_tunnel_get_remote (NMDeviceIPTunnel *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -378,7 +378,7 @@ nm_device_ip_tunnel_get_remote (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the remote endpoint of the tunnel
    
 
    
 
    Since: 1.2
    
@@ -389,7 +389,7 @@ nm_device_ip_tunnel_get_remote (guint8
 nm_device_ip_tunnel_get_ttl (NMDeviceIPTunnel *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -404,7 +404,7 @@ nm_device_ip_tunnel_get_ttl (
-
    Returns
    
+
    Returns
    
 
     the TTL assigned to tunneled packets
    
 
 
    Since: 1.2
    
@@ -415,7 +415,7 @@ nm_device_ip_tunnel_get_ttl (guint8
 nm_device_ip_tunnel_get_tos (NMDeviceIPTunnel *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -430,7 +430,7 @@ nm_device_ip_tunnel_get_tos (
-
    Returns
    
+
    Returns
    
 
     type of service (IPv4) or traffic class (IPv6) assigned
 to tunneled packets.
    
 
@@ -443,7 +443,7 @@ to tunneled packets.
    
 nm_device_ip_tunnel_get_path_mtu_discovery
                                (NMDeviceIPTunnel *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -458,7 +458,7 @@ nm_device_ip_tunnel_get_path_mtu_discovery
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     whether path MTU discovery is enabled
    
 
    
 
    Since: 1.2
    
@@ -469,7 +469,7 @@ nm_device_ip_tunnel_get_path_mtu_discovery
 
    const char *
 nm_device_ip_tunnel_get_input_key (NMDeviceIPTunnel *device);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -484,7 +484,7 @@ nm_device_ip_tunnel_get_input_key (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the key used for incoming packets
    
 
    
 
    Since: 1.2
    
@@ -495,7 +495,7 @@ nm_device_ip_tunnel_get_input_key (const char *
 nm_device_ip_tunnel_get_output_key (NMDeviceIPTunnel *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -510,7 +510,7 @@ nm_device_ip_tunnel_get_output_key (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the key used for outgoing packets
    
 
    
 
    Since: 1.2
    
@@ -522,7 +522,7 @@ nm_device_ip_tunnel_get_output_key (NMDeviceIPTunnel *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -537,7 +537,7 @@ nm_device_ip_tunnel_get_encapsulation_limit
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the maximum permitted encapsulation level
    
 
    
 
    Since: 1.2
    
@@ -548,7 +548,7 @@ nm_device_ip_tunnel_get_encapsulation_limit
 
    guint
 nm_device_ip_tunnel_get_flow_label (NMDeviceIPTunnel *device);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -563,7 +563,7 @@ nm_device_ip_tunnel_get_flow_label (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the flow label assigned to tunnel packets
    
 
    
 
    Since: 1.2
    
@@ -750,6 +750,6 @@ tunneled packets.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceInfiniband.html b/docs/libnm/html/NMDeviceInfiniband.html
index b6b52604..afbcc47e 100644
--- a/docs/libnm/html/NMDeviceInfiniband.html
+++ b/docs/libnm/html/NMDeviceInfiniband.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -131,7 +131,7 @@ NMDeviceInfiniband implements
 nm_device_infiniband_get_hw_address (NMDeviceInfiniband *device);
 
    Gets the hardware (MAC) address of the NMDeviceInfiniband
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -146,7 +146,7 @@ nm_device_infiniband_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -158,7 +158,7 @@ device, and must not be modified.
    
 nm_device_infiniband_get_carrier (NMDeviceInfiniband *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -173,7 +173,7 @@ nm_device_infiniband_get_carrier (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
    
 
@@ -217,6 +217,6 @@ nm_device_infiniband_get_carrier (
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    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 e8850687..23f800d0 100644
--- a/docs/libnm/html/NMDeviceMacvlan.html
+++ b/docs/libnm/html/NMDeviceMacvlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -182,7 +182,7 @@ NMDeviceMacvlan implements
 
    NMDevice *
 nm_device_macvlan_get_parent (NMDeviceMacvlan *device);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -197,7 +197,7 @@ nm_device_macvlan_get_parent (
-
    Returns
    
+
    Returns
    
 
     the device's parent device. 
    
 
    [transfer none]
    
 
@@ -210,7 +210,7 @@ nm_device_macvlan_get_parent (NMDeviceMacvlan *device);
 
    Gets the MACVLAN mode of the device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -225,7 +225,7 @@ nm_device_macvlan_get_mode (
-
    Returns
    
+
    Returns
    
 
     the MACVLAN mode. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -238,7 +238,7 @@ device, and must not be modified.
    
 nm_device_macvlan_get_no_promisc (NMDeviceMacvlan *device);
 
    Gets the no-promiscuous flag of the device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -253,7 +253,7 @@ nm_device_macvlan_get_no_promisc (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the no-promiscuous flag of the device.
    
 
    
 
    Since: 1.2
    
@@ -265,7 +265,7 @@ nm_device_macvlan_get_no_promisc (NMDeviceMacvlan *device);
 
    Gets the device type (MACVLAN or MACVTAP).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -280,7 +280,7 @@ nm_device_macvlan_get_tap (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device is a MACVTAP, FALSE if it is a MACVLAN.
    
 
 
    Since: 1.2
    
@@ -292,7 +292,7 @@ nm_device_macvlan_get_tap (NMDeviceMacvlan *device);
 
    Gets the hardware (MAC) address of the NMDeviceMacvlan
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -307,7 +307,7 @@ nm_device_macvlan_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -399,6 +399,6 @@ device, and must not be modified.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceModem.html b/docs/libnm/html/NMDeviceModem.html
index f30e5846..1bef57b3 100644
--- a/docs/libnm/html/NMDeviceModem.html
+++ b/docs/libnm/html/NMDeviceModem.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -134,7 +134,7 @@ nm_device_modem_get_modem_capabilities
 supports.  Not all capabilities are available concurrently however; some
 may require a firmware reload or reinitialization.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -149,7 +149,7 @@ may require a firmware reload or reinitialization.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the generic access technology families the modem supports
    
 
    
 
    
@@ -163,7 +163,7 @@ nm_device_modem_get_current_capabilities
 supports without a firmware reload or reinitialization.  This value
 represents the network types the modem can immediately connect to.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -178,7 +178,7 @@ represents the network types the modem can immediately connect to.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the generic access technology families the modem supports without
 a firmware reload or other reinitialization
    
 
    
@@ -225,6 +225,6 @@ CDMA/EVDO and GSM/UMTS.
    
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
    
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceOlpcMesh.html b/docs/libnm/html/NMDeviceOlpcMesh.html
index df5a3297..f3f752d0 100644
--- a/docs/libnm/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm/html/NMDeviceOlpcMesh.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -149,7 +149,7 @@ NMDeviceOlpcMesh implements
 nm_device_olpc_mesh_get_hw_address (NMDeviceOlpcMesh *device);
 
    Gets the hardware (MAC) address of the NMDeviceOlpcMesh
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -164,7 +164,7 @@ nm_device_olpc_mesh_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -176,7 +176,7 @@ device, and must not be modified.
    
 nm_device_olpc_mesh_get_companion (NMDeviceOlpcMesh *device);
 
    Gets the companion device of the NMDeviceOlpcMesh.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -191,7 +191,7 @@ nm_device_olpc_mesh_get_companion (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the companion of the device of NULL. 
    
 
    [transfer none]
    
 
    
@@ -204,7 +204,7 @@ nm_device_olpc_mesh_get_active_channel
                                (NMDeviceOlpcMesh *device);
 
    Returns the active channel of the NMDeviceOlpcMesh device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -219,7 +219,7 @@ nm_device_olpc_mesh_get_active_channel
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     active channel of the device
    
 
    
 
@@ -276,6 +276,6 @@ nm_device_olpc_mesh_get_active_channel
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html
index ecfce255..25503461 100644
--- a/docs/libnm/html/NMDeviceTeam.html
+++ b/docs/libnm/html/NMDeviceTeam.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -64,6 +64,13 @@
 nm_device_team_get_slaves ()
     		
 
    const char *
+
+nm_device_team_get_config ()
+
    
     
 
    
 
    
@@ -84,6 +91,12 @@
 
 
 gchar *
+config
+Read
+
+
+
+gchar *
 hw-address
 Read
 
@@ -117,6 +130,10 @@
 NM_DEVICE_TEAM_SLAVES
 
 
+#define
+NM_DEVICE_TEAM_CONFIG
+
+
  
 NMDeviceTeam
 
@@ -148,7 +165,7 @@ NMDeviceTeam implements
 nm_device_team_get_hw_address (NMDeviceTeam *device);
 
    Gets the hardware (MAC) address of the NMDeviceTeam
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -163,7 +180,7 @@ nm_device_team_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -175,7 +192,7 @@ device, and must not be modified.
    
 nm_device_team_get_carrier (NMDeviceTeam *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -190,7 +207,7 @@ nm_device_team_get_carrier (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
 
@@ -202,7 +219,7 @@ nm_device_team_get_slaves (device
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -217,14 +234,42 @@ nm_device_team_get_slaves (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray containing
-NMDevices that are slaves of device
+NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 
    
 
    [element-type NMDevice]
    
 
 
+
    
+
    
+
    nm_device_team_get_config ()
    
+
    const char *
+nm_device_team_get_config (NMDeviceTeam *device);
    
+
    Gets the current JSON configuration of the NMDeviceTeam
    
+
    
+
    Parameters
    
+
    
 
 

    
+++++
+
+
+
+
+
+
    




    device
    a NMDeviceTeam
    		 
    
+
    
+
    
+
    Returns
    
+
     the current configuration. This is the internal string used by the
+device, and must not be modified.
    
+
    
+
    Since: 1.4
    
+
    
 
    
 
    
 
    Types and Values
    
@@ -247,6 +292,12 @@ copy used by the device, and must not be modified. 
    
 
    
 
    
 
    
+
    NM_DEVICE_TEAM_CONFIG
    
+
    #define NM_DEVICE_TEAM_CONFIG      "config"
+
    
+
    
+
    
+
    
 
    NMDeviceTeam
    
 
    typedef struct _NMDeviceTeam NMDeviceTeam;
    
 
    
@@ -262,6 +313,15 @@ copy used by the device, and must not be modified. 
    
 
 
    
 
    
+
    The “config” property
    
+
      “config”                   gchar *
    
+
    The current JSON configuration of the device.
    
+
    Flags: Read
    
+
    Default value: NULL
    
+
    Since: 1.4
    
+
    
+
    
+
    
 
    The “hw-address” property
    
 
      “hw-address”               gchar *
    
 
    The hardware (MAC) address of the device.
    
@@ -279,6 +339,6 @@ copy used by the device, and must not be modified. 
    
 
    
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceTun.html b/docs/libnm/html/NMDeviceTun.html
index 0fbc5942..c54b201c 100644
--- a/docs/libnm/html/NMDeviceTun.html
+++ b/docs/libnm/html/NMDeviceTun.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -216,7 +216,7 @@ NMDeviceTun implements
 nm_device_tun_get_hw_address (NMDeviceTun *device);
 
    Gets the hardware (MAC) address of the NMDeviceTun
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -231,7 +231,7 @@ nm_device_tun_get_hw_address (
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -244,7 +244,7 @@ device, and must not be modified.
    
 nm_device_tun_get_mode (NMDeviceTun *device);
 
    Returns the TUN/TAP mode for the device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -259,7 +259,7 @@ nm_device_tun_get_mode (
-
    Returns
    
+
    Returns
    
 
     'tun' or 'tap'
    
 
 
    Since: 1.2
    
@@ -271,7 +271,7 @@ nm_device_tun_get_mode (NMDeviceTun *device);
 
    Gets the tunnel owner.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -286,7 +286,7 @@ nm_device_tun_get_owner (
-
    Returns
    
+
    Returns
    
 
     the uid of the tunnel owner, or -1 if it has no owner.
    
 
 
    Since: 1.2
    
@@ -298,7 +298,7 @@ nm_device_tun_get_owner (NMDeviceTun *device);
 
    Gets the tunnel group.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -313,7 +313,7 @@ nm_device_tun_get_group (
-
    Returns
    
+
    Returns
    
 
     the gid of the tunnel group, or -1 if it has no owner.
    
 
 
    Since: 1.2
    
@@ -331,7 +331,7 @@ nm_device_tun_get_no_pi (NMDeviceTun *device);
 
    Returns whether the NMDeviceTun has the IFF_VNET_HDR flag.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -346,7 +346,7 @@ nm_device_tun_get_vnet_hdr (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has the flag, FALSE otherwise
    
 
 
    Since: 1.2
    
@@ -358,7 +358,7 @@ nm_device_tun_get_vnet_hdr (NMDeviceTun *device);
 
    Returns whether the NMDeviceTun has the IFF_MULTI_QUEUE flag.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -373,7 +373,7 @@ nm_device_tun_get_multi_queue (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the device doesn't have the flag, FALSE otherwise
    
 
    
 
    Since: 1.2
    
@@ -501,6 +501,6 @@ include a virtio network header.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceVlan.html b/docs/libnm/html/NMDeviceVlan.html
index 6acd104f..5e4add6e 100644
--- a/docs/libnm/html/NMDeviceVlan.html
+++ b/docs/libnm/html/NMDeviceVlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -166,7 +166,7 @@ NMDeviceVlan implements
 nm_device_vlan_get_hw_address (NMDeviceVlan *device);
 
    Gets the hardware (MAC) address of the NMDeviceVlan
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -181,7 +181,7 @@ nm_device_vlan_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -193,7 +193,7 @@ device, and must not be modified.
    
 nm_device_vlan_get_carrier (NMDeviceVlan *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -208,7 +208,7 @@ nm_device_vlan_get_carrier (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier
    
 
 
@@ -218,7 +218,7 @@ nm_device_vlan_get_carrier (NMDevice *
 nm_device_vlan_get_parent (NMDeviceVlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -233,7 +233,7 @@ nm_device_vlan_get_parent (
-
    Returns
    
+
    Returns
    
 
     the device's parent device. 
    
 
    [transfer none]
    
 
@@ -244,7 +244,7 @@ nm_device_vlan_get_parent (guint
 nm_device_vlan_get_vlan_id (NMDeviceVlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -259,7 +259,7 @@ nm_device_vlan_get_vlan_id (
-
    Returns
    
+
    Returns
    
 
     the device's VLAN ID
    
 
 
@@ -331,6 +331,6 @@ nm_device_vlan_get_vlan_id (
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceVxlan.html b/docs/libnm/html/NMDeviceVxlan.html
index 98ce3d82..d4171cda 100644
--- a/docs/libnm/html/NMDeviceVxlan.html
+++ b/docs/libnm/html/NMDeviceVxlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -404,7 +404,7 @@ NMDeviceVxlan implements
 nm_device_vxlan_get_hw_address (    NMDeviceVxlan *device);
 
    Gets the hardware (MAC) address of the NMDeviceVxlan
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -419,7 +419,7 @@ nm_device_vxlan_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -432,7 +432,7 @@ device, and must not be modified.
    
 nm_device_vxlan_get_carrier (NMDeviceVxlan *device);
 
    Whether the device has carrier.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -447,7 +447,7 @@ nm_device_vxlan_get_carrier (
-
    Returns
    
+
    Returns
    
 
     TRUE if the device has carrier.
    
 
 
    Since: 1.2
    
@@ -458,7 +458,7 @@ nm_device_vxlan_get_carrier (NMDevice *
 nm_device_vxlan_get_parent (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -473,7 +473,7 @@ nm_device_vxlan_get_parent (
-
    Returns
    
+
    Returns
    
 
     the device's parent device. 
    
 
    [transfer none]
    
 
@@ -485,7 +485,7 @@ nm_device_vxlan_get_parent (guint
 nm_device_vxlan_get_id (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -500,7 +500,7 @@ nm_device_vxlan_get_id (
-
    Returns
    
+
    Returns
    
 
     the device's VXLAN ID.
    
 
 
    Since: 1.2
    
@@ -511,7 +511,7 @@ nm_device_vxlan_get_id (const char *
 nm_device_vxlan_get_group (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -526,7 +526,7 @@ nm_device_vxlan_get_group (
-
    Returns
    
+
    Returns
    
 
     The unicast destination IP address or the multicast
 IP address joined
    
 
@@ -538,7 +538,7 @@ IP address joined
    
 
    const char *
 nm_device_vxlan_get_local (NMDeviceVxlan *device);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -553,7 +553,7 @@ nm_device_vxlan_get_local (
-
    Returns
    
+
    Returns
    
 
     the source IP address to use in outgoing packets
    
 
 
    Since: 1.2
    
@@ -564,7 +564,7 @@ nm_device_vxlan_get_local (guint
 nm_device_vxlan_get_src_port_min (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -579,7 +579,7 @@ nm_device_vxlan_get_src_port_min (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the minimum UDP source port
    
 
    
 
    Since: 1.2
    
@@ -590,7 +590,7 @@ nm_device_vxlan_get_src_port_min (guint
 nm_device_vxlan_get_src_port_max (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -605,7 +605,7 @@ nm_device_vxlan_get_src_port_max (
 
 
    
-
    Returns
    
+
    Returns
    
 
      the maximum UDP source port
    
 
    
 
    Since: 1.2
    
@@ -616,7 +616,7 @@ nm_device_vxlan_get_src_port_max (guint
 nm_device_vxlan_get_dst_port (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -631,7 +631,7 @@ nm_device_vxlan_get_dst_port (
-
    Returns
    
+
    Returns
    
 
     the UDP destination port
    
 
 
    Since: 1.2
    
@@ -642,7 +642,7 @@ nm_device_vxlan_get_dst_port (gboolean
 nm_device_vxlan_get_learning (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -657,7 +657,7 @@ nm_device_vxlan_get_learning (
-
    Returns
    
+
    Returns
    
 
     whether address learning is enabled
    
 
 
    Since: 1.2
    
@@ -668,7 +668,7 @@ nm_device_vxlan_get_learning (guint
 nm_device_vxlan_get_ageing (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -683,7 +683,7 @@ nm_device_vxlan_get_ageing (
-
    Returns
    
+
    Returns
    
 
     the lifetime in seconds of FDB entries learnt by the kernel
    
 
 
    Since: 1.2
    
@@ -694,7 +694,7 @@ nm_device_vxlan_get_ageing (guint
 nm_device_vxlan_get_tos (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -709,7 +709,7 @@ nm_device_vxlan_get_tos (
-
    Returns
    
+
    Returns
    
 
     the TOS value to use in outgoing packets
    
 
 
    Since: 1.2
    
@@ -720,7 +720,7 @@ nm_device_vxlan_get_tos (guint
 nm_device_vxlan_get_ttl (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -735,7 +735,7 @@ nm_device_vxlan_get_ttl (
-
    Returns
    
+
    Returns
    
 
     the time-to-live value to use in outgoing packets
    
 
 
    Since: 1.2
    
@@ -746,7 +746,7 @@ nm_device_vxlan_get_ttl (guint
 nm_device_vxlan_get_limit (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -761,7 +761,7 @@ nm_device_vxlan_get_limit (
-
    Returns
    
+
    Returns
    
 
     the maximum number of entries that can be added to the
 forwarding table
    
 
@@ -773,7 +773,7 @@ forwarding table
    
 
    gboolean
 nm_device_vxlan_get_proxy (NMDeviceVxlan *device);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -788,7 +788,7 @@ nm_device_vxlan_get_proxy (
-
    Returns
    
+
    Returns
    
 
     whether ARP proxy is turned on
    
 
 
    Since: 1.2
    
@@ -799,7 +799,7 @@ nm_device_vxlan_get_proxy (gboolean
 nm_device_vxlan_get_rsc (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -814,7 +814,7 @@ nm_device_vxlan_get_rsc (
-
    Returns
    
+
    Returns
    
 
     whether route short circuit is turned on
    
 
 
    Since: 1.2
    
@@ -825,7 +825,7 @@ nm_device_vxlan_get_rsc (gboolean
 nm_device_vxlan_get_l2miss (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -840,7 +840,7 @@ nm_device_vxlan_get_l2miss (
-
    Returns
    
+
    Returns
    
 
     whether netlink LL ADDR miss notifications are generated
    
 
 
    Since: 1.2
    
@@ -851,7 +851,7 @@ nm_device_vxlan_get_l2miss (gboolean
 nm_device_vxlan_get_l3miss (NMDeviceVxlan *device);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -866,7 +866,7 @@ nm_device_vxlan_get_l3miss (
-
    Returns
    
+
    Returns
    
 
     wether netlink IP ADDR miss notifications are generated
    
 
 
    Since: 1.2
    
@@ -1162,6 +1162,6 @@ tunnel endpoint.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html
index bb85020c..2bc893d5 100644
--- a/docs/libnm/html/NMDeviceWifi.html
+++ b/docs/libnm/html/NMDeviceWifi.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -288,7 +288,7 @@ NMDeviceWifi implements
 nm_device_wifi_get_hw_address (NMDeviceWifi *device);
 
    Gets the actual hardware (MAC) address of the NMDeviceWifi
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -303,7 +303,7 @@ nm_device_wifi_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the actual hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -316,7 +316,7 @@ nm_device_wifi_get_permanent_hw_address
                                (NMDeviceWifi *device);
 
    Gets the permanent hardware (MAC) address of the NMDeviceWifi
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -331,7 +331,7 @@ nm_device_wifi_get_permanent_hw_address
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the permanent hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -343,7 +343,7 @@ device, and must not be modified.
    
 nm_device_wifi_get_mode (NMDeviceWifi *device);
 
    Gets the NMDeviceWifi mode.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -358,7 +358,7 @@ nm_device_wifi_get_mode (
-
    Returns
    
+
    Returns
    
 
     the mode
    
 
 
@@ -369,7 +369,7 @@ nm_device_wifi_get_mode (NMDeviceWifi *device);
 
    Gets the bit rate of the NMDeviceWifi in kbit/s.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -384,7 +384,7 @@ nm_device_wifi_get_bitrate (
-
    Returns
    
+
    Returns
    
 
     the bit rate (kbit/s)
    
 
 
@@ -395,7 +395,7 @@ nm_device_wifi_get_bitrate (NMDeviceWifi *device);
 
    Gets the Wi-Fi capabilities of the NMDeviceWifi.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -410,7 +410,7 @@ nm_device_wifi_get_capabilities (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the capabilities
    
 
    
 
@@ -422,7 +422,7 @@ nm_device_wifi_get_active_access_point
                                (NMDeviceWifi *device);
 
    Gets the active NMAccessPoint.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -437,7 +437,7 @@ nm_device_wifi_get_active_access_point
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the access point or NULL if none is active. 
    
 
    [transfer none]
    
 
    
@@ -451,7 +451,7 @@ nm_device_wifi_get_access_point_by_path
                                 const char *path);
 
    Gets a NMAccessPoint by path.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -473,7 +473,7 @@ nm_device_wifi_get_access_point_by_path
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the access point or NULL if none is found. 
    
 
    [transfer none]
    
 
    
@@ -485,7 +485,7 @@ nm_device_wifi_get_access_point_by_path
 nm_device_wifi_get_access_points (NMDeviceWifi *device);
 
    Gets all the scanned access points of the NMDeviceWifi.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -500,9 +500,9 @@ nm_device_wifi_get_access_points (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a GPtrArray containing all the
-scanned NMAccessPoints.
+scanned NMAccessPoints.
 The returned array is owned by the client and should not be modified. 
    
 
    [element-type NMAccessPoint]
    
 
    
@@ -519,7 +519,7 @@ nm_device_wifi_request_scan (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -546,7 +546,7 @@ after that for the scan to complete.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be
 set.
    
@@ -571,7 +571,7 @@ for the scanning. The argument is the dictionary passed to 
-
    Parameters
    
+
    Parameters
    
 
    @@ -603,7 +603,7 @@ D-Bus call. Valid otions inside the dictionary are:
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be
 set.
    
@@ -624,7 +624,7 @@ nm_device_wifi_request_scan_async (
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -679,7 +679,7 @@ for the scanning. The argument is the dictionary passed to 
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -727,7 +727,7 @@ nm_device_wifi_request_scan_finish (GError **error);
 
    Gets the result of a call to nm_device_wifi_request_scan_async().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -754,7 +754,7 @@ nm_device_wifi_request_scan_finish (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be
 set.
    
@@ -876,7 +876,7 @@ user_function (gpointer      user_data)
 
    Notifies that a NMAccessPoint is added to the Wi-Fi device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -913,7 +913,7 @@ user_function (gpointer      user_data)
 
    Notifies that a NMAccessPoint is removed from the Wi-Fi device.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -944,6 +944,6 @@ user_function (
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceWimax.html b/docs/libnm/html/NMDeviceWimax.html
index 5f751d77..6cf01ef9 100644
--- a/docs/libnm/html/NMDeviceWimax.html
+++ b/docs/libnm/html/NMDeviceWimax.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -269,7 +269,7 @@ nm_device_wimax_get_hw_address (    
 
    Gets the hardware (MAC) address of the NMDeviceWimax
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -284,7 +284,7 @@ nm_device_wimax_get_hw_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the hardware address. This is the internal string used by the
 device, and must not be modified.
    
 
    
@@ -300,7 +300,7 @@ nm_device_wimax_get_active_nsp (
 
    Gets the active NMWimaxNsp.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -315,7 +315,7 @@ nm_device_wimax_get_active_nsp (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the access point or NULL if none is active. 
    
 
    [transfer full]
    
 
    
@@ -332,7 +332,7 @@ nm_device_wimax_get_nsp_by_path (
 
    Gets a NMWimaxNsp by path.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -354,7 +354,7 @@ nm_device_wimax_get_nsp_by_path (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the access point or NULL if none is found. 
    
 
    [transfer none]
    
 
    
@@ -370,7 +370,7 @@ nm_device_wimax_get_nsps (NMDeviceWimax.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -385,9 +385,9 @@ nm_device_wimax_get_nsps (
-
    Returns
    
+
    Returns
    
 
     a GPtrArray containing
-all the scanned NMWimaxNsps.
+all the scanned NMWimaxNsps.
 The returned array is owned by the client and should not be modified. 
    
 
    [element-type NMWimaxNsp]
    
 
@@ -405,7 +405,7 @@ nm_device_wimax_get_center_frequency (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -420,7 +420,7 @@ device is not connected.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the center frequency in KHz, or 0
    
 
    
 
    
@@ -438,7 +438,7 @@ 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
 device is not connected.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -453,7 +453,7 @@ device is not connected.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the RSSI in dBm, or 0
    
 
    
 
@@ -470,7 +470,7 @@ nm_device_wimax_get_cinr (
-
    Parameters
    
+
    Parameters
    
 
    @@ -485,7 +485,7 @@ meaning when the device is not connected.
    
 
 

 
    
 
 
    
-
    Returns
    
+
    Returns
    
 
     the CINR in dB, or 0
    
 
    
 
@@ -502,7 +502,7 @@ nm_device_wimax_get_tx_power (
-
    Parameters
    
+
    Parameters
    
 
    @@ -517,7 +517,7 @@ nm_device_wimax_get_tx_power (
-
    Returns
    
+
    Returns
    
 
     the TX power in dBm, or 0
    
 
 
@@ -532,7 +532,7 @@ nm_device_wimax_get_bsid (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -547,7 +547,7 @@ nm_device_wimax_get_bsid (
-
    Returns
    
+
    Returns
    
 
     the ID of the serving Base Station, or NULL
    
 
 
@@ -724,7 +724,7 @@ user_function (<
 
    WiMAX is no longer supported.
    
 
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -765,7 +765,7 @@ user_function (<
 
    WiMAX is no longer supported.
    
 
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -796,6 +796,6 @@ user_function (<
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDhcpConfig.html b/docs/libnm/html/NMDhcpConfig.html
index 407a1341..88595d77 100644
--- a/docs/libnm/html/NMDhcpConfig.html
+++ b/docs/libnm/html/NMDhcpConfig.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -138,7 +138,7 @@ NMDhcpConfig implements
 nm_dhcp_config_get_family (    NMDhcpConfig *config);
 
    Gets the IP address family of the configuration
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -153,7 +153,7 @@ nm_dhcp_config_get_family (
-
    Returns
    
+
    Returns
    
 
     the IP address family; either AF_INET or
 AF_INET6
    
 
@@ -165,7 +165,7 @@ nm_dhcp_config_get_family (NMDhcpConfig *config);
 
    Gets all the options contained in the configuration.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -180,7 +180,7 @@ nm_dhcp_config_get_options (
-
    Returns
    
+
    Returns
    
 
     the GHashTable containing
 strings for keys and values.  This is the internal copy used by the
 configuration, and must not be modified. 
    
@@ -195,7 +195,7 @@ nm_dhcp_config_get_one_option (const char *option);
 
    Gets one option by option name.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -217,7 +217,7 @@ nm_dhcp_config_get_one_option (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the configuration option's value. This is the internal string used by the
 configuration, and must not be modified.
    
 
    
@@ -264,6 +264,6 @@ configuration, and must not be modified.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMIPConfig.html b/docs/libnm/html/NMIPConfig.html
index 6435caa6..90573d09 100644
--- a/docs/libnm/html/NMIPConfig.html
+++ b/docs/libnm/html/NMIPConfig.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -230,7 +230,7 @@ NMIPConfig implements
 nm_ip_config_get_family (NMIPConfig *config);
 
    Gets the IP address family
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -245,7 +245,7 @@ nm_ip_config_get_family (
-
    Returns
    
+
    Returns
    
 
     the IP address family; either AF_INET or
 AF_INET6
    
 
@@ -257,7 +257,7 @@ nm_ip_config_get_family (NMIPConfig *config);
 
    Gets the IP gateway address.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -272,7 +272,7 @@ nm_ip_config_get_gateway (
-
    Returns
    
+
    Returns
    
 
     the IP address of the gateway. 
    
 
    [transfer none]
    
 
@@ -284,7 +284,7 @@ nm_ip_config_get_gateway (NMIPConfig *config);
 
    Gets the IP addresses (containing the address, prefix, and gateway).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -299,7 +299,7 @@ nm_ip_config_get_addresses (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray
 containing NMIPAddresses.  This is the internal copy used by the
 configuration and must not be modified. The library never modifies the
@@ -314,7 +314,7 @@ returned array and thus it is safe for callers to reference and keep using it. <
 nm_ip_config_get_routes (NMIPConfig *config);
 
    Gets the routes.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -329,9 +329,9 @@ nm_ip_config_get_routes (
-
    Returns
    
+
    Returns
    
 
     the GPtrArray containing
-NMIPRoutes. This is the internal copy used by the configuration, and must
+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. 
    
 
    [element-type NMIPRoute][transfer none]
    
@@ -344,7 +344,7 @@ safe for callers to reference and keep using it. 
    
 nm_ip_config_get_nameservers (NMIPConfig *config);
 
    Gets the domain name servers (DNS).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -359,7 +359,7 @@ nm_ip_config_get_nameservers (
-
    Returns
    
+
    Returns
    
 
     the array of nameserver IP addresses. 
    
 
    [transfer none]
    
 
@@ -371,7 +371,7 @@ nm_ip_config_get_nameservers (NMIPConfig *config);
 
    Gets the domain names.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -386,7 +386,7 @@ nm_ip_config_get_domains (
-
    Returns
    
+
    Returns
    
 
     the array of domains.
 (This is never NULL, though it may be 0-length). 
    
 
    [transfer none]
    
@@ -399,7 +399,7 @@ nm_ip_config_get_domains (NMIPConfig *config);
 
    Gets the DNS searches.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -414,7 +414,7 @@ nm_ip_config_get_searches (
-
    Returns
    
+
    Returns
    
 
     the array of DNS search strings.
 (This is never NULL, though it may be 0-length). 
    
 
    [transfer none]
    
@@ -427,7 +427,7 @@ nm_ip_config_get_searches (NMIPConfig *config);
 
    Gets the Windows Internet Name Service servers (WINS).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -442,7 +442,7 @@ nm_ip_config_get_wins_servers (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the arry of WINS server IP address strings.
 (This is never NULL, though it may be 0-length.). 
    
 
    [transfer none]
    
@@ -569,6 +569,6 @@ nm_ip_config_get_wins_servers (
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMObject.html b/docs/libnm/html/NMObject.html
index ccb3f2c9..52f6fea9 100644
--- a/docs/libnm/html/NMObject.html
+++ b/docs/libnm/html/NMObject.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -132,7 +132,7 @@ NMObject implements
 nm_object_get_path (    NMObject *object);
 
    Gets the DBus path of the NMObject.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -147,7 +147,7 @@ nm_object_get_path (
-
    Returns
    
+
    Returns
    
 
     the object's path. This is the internal string used by the
 device, and must not be modified.
    
 
@@ -199,6 +199,6 @@ device, and must not be modified.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html
index 47dbcbcc..ff741917 100644
--- a/docs/libnm/html/NMRemoteConnection.html
+++ b/docs/libnm/html/NMRemoteConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -241,7 +241,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -273,7 +273,7 @@ disk; if FALSE, then only the in-memory representat
 
    
 
 

    
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
@@ -295,7 +295,7 @@ nm_remote_connection_commit_changes_async
 be saved to disk; if FALSE, then only the in-memory representation will be
 changed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -343,7 +343,7 @@ nm_remote_connection_commit_changes_finish
                                 GError **error);
    Gets the result of a call to nm_remote_connection_commit_changes_async().
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -370,7 +370,7 @@ nm_remote_connection_commit_changes_finish
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
@@ -385,7 +385,7 @@ nm_remote_connection_save (
-
    Parameters
    
+
    Parameters
    
 
    @@ -412,7 +412,7 @@ been written to disk, or if the connection has never been saved.
    
 
 

 
    
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
@@ -428,7 +428,7 @@ nm_remote_connection_save_async (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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -470,7 +470,7 @@ nm_remote_connection_save_finish (GError **error);
 
    Gets the result of a call to nm_remote_connection_save_async().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -497,7 +497,7 @@ nm_remote_connection_save_finish (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
@@ -511,7 +511,7 @@ nm_remote_connection_delete (GError **error);
 
    Deletes the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -538,7 +538,7 @@ nm_remote_connection_delete (
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
@@ -553,7 +553,7 @@ nm_remote_connection_delete_async (gpointer user_data);
 
    Asynchronously deletes the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -595,7 +595,7 @@ nm_remote_connection_delete_finish (GError **error);
 
    Gets the result of a call to nm_remote_connection_delete_async().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -622,7 +622,7 @@ nm_remote_connection_delete_finish (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE on success, FALSE on error, in which case error
 will be set.
    
 
    
@@ -638,7 +638,7 @@ nm_remote_connection_get_secrets (Request the connection's secrets. Note that this is a blocking D-Bus call,
 not a simple property accessor.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -670,7 +670,7 @@ not a simple property accessor.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a GVariant of type NM_VARIANT_TYPE_CONNECTION containing
 connection
 's secrets, or NULL on error.
    
@@ -688,7 +688,7 @@ nm_remote_connection_get_secrets_async
                                 gpointer user_data);
 
    Asynchronously requests the connection's secrets.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -736,7 +736,7 @@ nm_remote_connection_get_secrets_finish
                                 GError **error);
    Gets the result of a call to nm_remote_connection_get_secrets_async().
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -763,7 +763,7 @@ nm_remote_connection_get_secrets_finish
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a GVariant of type NM_VARIANT_TYPE_CONNECTION
 containing connection
 's secrets, or NULL on error. 
    
@@ -776,7 +776,7 @@ containing connection
 
    gboolean
 nm_remote_connection_get_unsaved (NMRemoteConnection *connection);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -791,7 +791,7 @@ nm_remote_connection_get_unsaved (
 
 
    
-
    Returns
    
+
    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
 representation.
    
@@ -806,12 +806,12 @@ nm_remote_connection_get_visible (nm_remote_connection_save() and nm_remote_connection_delete() will
-always fail. (NMRemoteSettings will not normally return
+always fail. (NMRemoteSettings will not normally return
 non-visible connections to callers, but it is possible for a
 connection's visibility to change after you already have a
 reference to it.)
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -826,7 +826,7 @@ reference to it.)
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the remote connection is visible to the current
 user, FALSE if not.
    
 
    
@@ -881,7 +881,7 @@ to disk, FALSE if the connection is the same as its
 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
-fail. (NMRemoteSettings will not normally return non-visible connections
+fail. (NMRemoteSettings will not normally return non-visible connections
 to callers, but it is possible for a connection's visibility to change
 after you already have a reference to it.)
    
 
    Flags: Read
    
@@ -890,6 +890,6 @@ after you already have a reference to it.)
    
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html
index b7654a05..910412cd 100644
--- a/docs/libnm/html/NMSecretAgentOld.html
+++ b/docs/libnm/html/NMSecretAgentOld.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -271,7 +271,7 @@ something like this:
    
 GVariant *secrets_dict;
 
 secrets = nm_simple_connection_new ();
-s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_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);
@@ -289,7 +289,7 @@ something like this:
    
 
 
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -346,7 +346,7 @@ and the value is the secret
    NMSecretAgentOld subclass has finished saving the secrets, this function
 should be called.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -393,7 +393,7 @@ has returned. 
    NMSecretAgentOld subclass has finished deleting the secrets, this function
 should be called.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -441,7 +441,7 @@ secrets for connections on behalf of its user.
    It is a programmer error to attempt to register an agent that is already
 registered, or in the process of registering.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -468,7 +468,7 @@ registered, or in the process of registering.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if registration was successful, FALSE on error.
    
 
    
 
@@ -486,7 +486,7 @@ save secrets for connections on behalf of its user.
    
 
    It is a programmer error to attempt to register an agent that is already
 registered, or in the process of registering.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -528,7 +528,7 @@ nm_secret_agent_old_register_finish (GError **error);
 
    Gets the result of a call to nm_secret_agent_old_register_async().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -555,7 +555,7 @@ nm_secret_agent_old_register_finish (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if registration was successful, FALSE on error.
    
 
    
 
@@ -570,7 +570,7 @@ nm_secret_agent_old_unregister (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -597,7 +597,7 @@ store secrets on behalf of this user.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if unregistration was successful, FALSE on error
    
 
    
 
@@ -613,7 +613,7 @@ nm_secret_agent_old_unregister_async (
-
    Parameters
    
+
    Parameters
    
 
    @@ -655,7 +655,7 @@ nm_secret_agent_old_unregister_finish (GError **error);
 
    Gets the result of a call to nm_secret_agent_old_unregister_async().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -682,7 +682,7 @@ nm_secret_agent_old_unregister_finish (
-
    Returns
    
+
    Returns
    
 
     TRUE if unregistration was successful, FALSE on error.
    
 
 
@@ -692,7 +692,7 @@ nm_secret_agent_old_unregister_finish (gboolean
 nm_secret_agent_old_get_registered (NMSecretAgentOld *self);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -707,7 +707,7 @@ nm_secret_agent_old_get_registered (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a TRUE if the agent is registered, FALSE if it is not.
    
 
    
 
@@ -732,7 +732,7 @@ existing secrets without user interaction, or requesting entirely new
 secrets from the user.
    
 
    Virtual: get_secrets
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -793,7 +793,7 @@ nm_secret_agent_old_save_secrets (
 
    Virtual: save_secrets
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -839,7 +839,7 @@ nm_secret_agent_old_delete_secrets (
 
    Virtual: delete_secrets
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -958,6 +958,6 @@ of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index 09859dd6..7f6aae2d 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -42,18 +42,6 @@
 
     
-
-
-
-
-
-
-
-
-
-
-
-
@@ -192,6 +180,18 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
@@ -270,24 +270,6 @@ of properties and allowed values.
    
 
    
 
    Functions
    
 
    
-
    NM_SETTING_PARAM_REQUIRED
    
-
    #define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
-
    
-
    
-
    
-
    
-
    NM_SETTING_PARAM_SECRET
    
-
    #define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
-
    
-
    
-
    
-
    
-
    NM_SETTING_PARAM_FUZZY_IGNORE
    
-
    #define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
-
    
-
    
-
    
-
    
 
    NMSettingClearSecretsWithFlagsFn ()
    
 
    gboolean
 (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
@@ -295,7 +277,7 @@ of properties and allowed values.
    
                                      NMSettingSecretFlags flags,
                                      gpointer user_data);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    #defineNM_SETTING_PARAM_REQUIRED
    #defineNM_SETTING_PARAM_SECRET
    #defineNM_SETTING_PARAM_FUZZY_IGNORE
    
 
 gboolean
 
    
 
    
 #defineNM_SETTING_PARAM_REQUIRED
    #defineNM_SETTING_PARAM_SECRET
    #defineNM_SETTING_PARAM_FUZZY_IGNORE
    #define
 NM_SETTING_NAME
 
    
 
    @@ -327,7 +309,7 @@ of properties and allowed values.
    
 
    
 
 

    
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE to clear the secret, FALSE to not clear the secret
    
 
    
 
@@ -341,7 +323,7 @@ of properties and allowed values.
    
                          GParamFlags flags,
                          gpointer user_data);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -386,7 +368,7 @@ of properties and allowed values.
    
 nm_setting_lookup_type (const char *name);
    Returns the GType of the setting's class for a given setting name.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -401,7 +383,7 @@ nm_setting_lookup_type (const cha
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the GType of the setting's class, or G_TYPE_INVALID if
 name
 is not recognized.
    
@@ -414,7 +396,7 @@ is not recognized.
    
 nm_setting_duplicate (NMSetting *setting);
 
    Duplicates a NMSetting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -429,7 +411,7 @@ nm_setting_duplicate (
-
    Returns
    
+
    Returns
    
 
     a new NMSetting containing the same properties and values as the
 source NMSetting. 
    
 
    [transfer full]
    
@@ -442,7 +424,7 @@ source NMSetting *setting    );
 
    Returns the type name of the NMSetting object
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -457,7 +439,7 @@ nm_setting_get_name (
-
    Returns
    
+
    Returns
    
 
     a string containing the type name of the NMSetting object,
 like 'ppp' or 'wireless' or 'wired'.
    
 
@@ -475,7 +457,7 @@ some are dependent on other values (hence the need for GError contains information about which property of the setting
 failed validation, and in what way that property failed validation.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -505,7 +487,7 @@ is being verified in isolation. 
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the setting is valid, FALSE if it is not
    
 
    
 
    
@@ -522,7 +504,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -552,7 +534,7 @@ is being verified in isolation. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the setting secrets are valid, FALSE if they are not
    
 
    
 
    Since: 1.2
    
@@ -568,7 +550,7 @@ nm_setting_compare (NMSettingCompareFlags
 for a description of each flag's behavior.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -595,7 +577,7 @@ for a description of each flag's behavior.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the comparison succeeds, FALSE if it does not
    
 
    
 
@@ -615,7 +597,7 @@ of each setting that differ from the other are added to NMSettingDiffResult values.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -657,7 +639,7 @@ in and the settings differ, a new one is created and returned. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the settings contain the same values, FALSE if they do not
    
 
    
 
@@ -671,7 +653,7 @@ nm_setting_enumerate_values (NMSetting object, calling the supplied
 user function for each property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -708,7 +690,7 @@ nm_setting_to_string (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -723,7 +705,7 @@ output format is not guaranteed to be stable and may change at any time.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    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()
    
@@ -740,7 +722,7 @@ nm_setting_get_secret_flags (NMSettingSecretFlags describing how to
 handle that secret.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -772,7 +754,7 @@ handle that secret.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    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
    
 
    
@@ -788,7 +770,7 @@ nm_setting_set_secret_flags (NMSettingSecretFlags describing how to
 handle that secret.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -820,7 +802,7 @@ handle that secret.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    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
    
 
    
@@ -835,7 +817,7 @@ nm_setting_get_dbus_property_type (GObject property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -858,7 +840,7 @@ to get the type of
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the D-Bus marshalling type of property
 on setting
 .
    
@@ -868,6 +850,24 @@ on setting
 
    
 
    Types and Values
    
 
    
+
    NM_SETTING_PARAM_REQUIRED
    
+
    #define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
+
    
+
    
+
    
+
    
+
    NM_SETTING_PARAM_SECRET
    
+
    #define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
+
    
+
    
+
    
+
    
+
    NM_SETTING_PARAM_FUZZY_IGNORE
    
+
    #define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
+
    
+
    
+
    
+
    
 
    NM_SETTING_NAME
    
 
    #define NM_SETTING_NAME "name"
 
    
@@ -879,7 +879,7 @@ on setting
 secret has a corresponding set of these flags which indicate how the secret
 is to be stored and/or requested when it is needed.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -932,7 +932,7 @@ secret is not required
    These flags modify the comparison behavior when comparing two settings or
 two connections.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -1038,7 +1038,7 @@ two connections.
    enum NMSettingMacRandomization
    Controls if and how the MAC address of a device is randomzied.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -1084,7 +1084,7 @@ It should only be accessed through the functions described below.
    enum NMSettingDiffResult
    These values indicate the result of a setting difference operation.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -1150,6 +1150,6 @@ example "ppp" or "wireless" or "wired".
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html
index 3596bce3..1abcd6db 100644
--- a/docs/libnm/html/NMSetting8021x.html
+++ b/docs/libnm/html/NMSetting8021x.html
@@ -8,7 +8,7 @@
 
-
+
@@ -998,7 +998,7 @@ following books.
    
 nm_setting_802_1x_new (void);
    Creates a new NMSetting8021x object with default values.
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSetting8021x object
    
 
    
@@ -1013,7 +1013,7 @@ nm_setting_802_1x_check_cert_scheme (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -1040,7 +1040,7 @@ the blob must be not UNKNOWN (or NULL).
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the scheme of the blob or NM_SETTING_802_1X_CK_SCHEME_UNKNOWN.
 For NULL it also returns NM_SETTING_802_1X_CK_SCHEME_UNKNOWN.
    
 
    
@@ -1057,7 +1057,7 @@ network.  Generally only one EAP method is used.  Use the functions
 and nm_setting_802_1x_remove_eap_method() for adding, removing, and retrieving
 allowed EAP methods.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1072,7 +1072,7 @@ allowed EAP methods.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of allowed EAP methods
    
 
    
 
    
@@ -1085,7 +1085,7 @@ nm_setting_802_1x_get_eap_method (Returns the name of the allowed EAP method at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1107,7 +1107,7 @@ nm_setting_802_1x_get_eap_method (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the name of the allowed EAP method at index i
 
    
 
    
@@ -1122,7 +1122,7 @@ nm_setting_802_1x_add_eap_method (“eap” property for a list of
 allowed EAP methods.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1144,7 +1144,7 @@ allowed EAP methods.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the EAP method was successfully added, FALSE if it was
 not a valid method or if it was already allowed.
    
 
    
@@ -1157,7 +1157,7 @@ nm_setting_802_1x_remove_eap_method (guint32 i);
 
    Removes the allowed EAP method at the specified index.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1189,7 +1189,7 @@ nm_setting_802_1x_remove_eap_method_by_value
 
    Removes the allowed EAP method method
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1211,7 +1211,7 @@ nm_setting_802_1x_remove_eap_method_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the EAP method was founs and removed, FALSE if it was not.
    
 
    
 
    
@@ -1222,7 +1222,7 @@ nm_setting_802_1x_remove_eap_method_by_value
 nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);
 
    Clears all allowed EAP methods.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1245,7 +1245,7 @@ nm_setting_802_1x_get_identity (Returns the identifier used by some EAP methods (like TLS) to
 authenticate the user.  Often this is a username or login name.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1260,7 +1260,7 @@ authenticate the user.  Often this is a username or login name.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the user identifier
    
 
    
 
    
@@ -1275,7 +1275,7 @@ authenticate the user in the outer unencrypted "phase 1" authentication.  The
 inner "phase 2" authentication will use the “identity” in
 a secure form, if applicable for that EAP method.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1290,7 +1290,7 @@ a secure form, if applicable for that EAP method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the anonymous identifier
    
 
    
 
    
@@ -1301,7 +1301,7 @@ a secure form, if applicable for that EAP method.
    
 nm_setting_802_1x_get_pac_file (NMSetting8021x *setting);
 
    Returns the file containing PAC credentials used by EAP-FAST method.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1316,7 +1316,7 @@ nm_setting_802_1x_get_pac_file (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the PAC file
    
 
    
 
@@ -1332,7 +1332,7 @@ properties are ignored if the 
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1347,7 +1347,7 @@ of these properties.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if a system CA certificate path should be used, FALSE if not
    
 
    
 
@@ -1362,7 +1362,7 @@ which the supplicant can then add to the verification chain.  This may be
 used in addition to the “ca-cert” property to add more CA
 certificates for verifying the network to client.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1377,7 +1377,7 @@ certificates for verifying the network to client.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the CA certificate directory path
    
 
    
 
@@ -1392,7 +1392,7 @@ certificates which the supplicant can then add to the verification chain.
 This may be used in addition to the “phase2-ca-cert” property
 to add more CA certificates for verifying the network to client.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1407,7 +1407,7 @@ to add more CA certificates for verifying the network to client.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the "phase 2" CA certificate directory path
    
 
    
 
@@ -1420,7 +1420,7 @@ nm_setting_802_1x_get_ca_cert_scheme (NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
 if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1435,7 +1435,7 @@ if 
-
    Returns
    
+
    Returns
     scheme used to store the CA certificate (blob or path)
    
@@ -1451,7 +1451,7 @@ CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
 of the network cannot be confirmed by the client.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
    @@ -1466,7 +1466,7 @@ of the network cannot be confirmed by the client.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the CA certificate data. 
    
 
    [transfer none]
    
 
    
@@ -1483,7 +1483,7 @@ CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
 of the network cannot be confirmed by the client.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1498,7 +1498,7 @@ of the network cannot be confirmed by the client.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     path to the CA certificate file
    
 
    
 
@@ -1516,7 +1516,7 @@ with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1558,7 +1558,7 @@ clears the CA certificate.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
@@ -1568,7 +1568,7 @@ clears the CA certificate.
    
 
    const char *
 nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1583,7 +1583,7 @@ nm_setting_802_1x_get_subject_match (
 
 
    
-
    Returns
    
+
    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
@@ -1599,7 +1599,7 @@ nm_setting_802_1x_get_num_altsubject_matches
 
    Returns the number of entries in the
 “altsubject-matches” property of this setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1614,7 +1614,7 @@ nm_setting_802_1x_get_num_altsubject_matches
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of altsubject-matches entries.
    
 
    
 
@@ -1628,7 +1628,7 @@ nm_setting_802_1x_get_altsubject_match
 
    Returns the altSubjectName match at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1650,7 +1650,7 @@ nm_setting_802_1x_get_altsubject_match
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the altSubjectName match at index i
 
    
 
    
@@ -1666,7 +1666,7 @@ nm_setting_802_1x_add_altsubject_match
 match is added, the altSubjectName of the remote authentication
 server is not verified.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1688,7 +1688,7 @@ server is not verified.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the alternative subject name match was
 successfully added, FALSE if it was already allowed.
    
 
    
@@ -1702,7 +1702,7 @@ nm_setting_802_1x_remove_altsubject_match
                                 guint32 i);
 
    Removes the allowed altSubjectName at the specified index.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1734,7 +1734,7 @@ nm_setting_802_1x_remove_altsubject_match_by_value
 
    Removes the allowed altSubjectName altsubject_match
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1756,7 +1756,7 @@ nm_setting_802_1x_remove_altsubject_match_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the alternative subject name match was found and removed,
 FALSE if it was not.
    
 
    
@@ -1769,7 +1769,7 @@ nm_setting_802_1x_clear_altsubject_matches
                                (NMSetting8021x *setting);
 
    Clears all altSubjectName matches.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1791,7 +1791,7 @@ nm_setting_802_1x_clear_altsubject_matches
 nm_setting_802_1x_get_domain_suffix_match
                                (NMSetting8021x *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1806,7 +1806,7 @@ nm_setting_802_1x_get_domain_suffix_match
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “domain-suffix-match” property.
    
 
    
 
    Since: 1.2
    
@@ -1821,7 +1821,7 @@ nm_setting_802_1x_get_client_cert_scheme
 is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
 if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1836,7 +1836,7 @@ if 
-
    Returns
    
+
    Returns
     scheme used to store the client certificate (blob or path)
    
@@ -1850,7 +1850,7 @@ nm_setting_802_1x_get_client_cert_blob
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
    @@ -1865,7 +1865,7 @@ authentication method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the client certificate data. 
    
 
    [transfer none]
    
 
    
@@ -1880,7 +1880,7 @@ nm_setting_802_1x_get_client_cert_path
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1895,7 +1895,7 @@ authentication method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     path to the client certificate file
    
 
    
 
@@ -1916,7 +1916,7 @@ file if using the 
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1959,7 +1959,7 @@ clears the client certificate.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
@@ -1969,7 +1969,7 @@ clears the client certificate.
    
 
    const char *
 nm_setting_802_1x_get_phase1_peapver (NMSetting8021x *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1984,7 +1984,7 @@ nm_setting_802_1x_get_phase1_peapver (
-
    Returns
    
+
    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).
    
@@ -1997,7 +1997,7 @@ values are NULL (unset), "0" (PEAP version 0), and
 nm_setting_802_1x_get_phase1_peaplabel
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2012,7 +2012,7 @@ nm_setting_802_1x_get_phase1_peaplabel
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    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),
@@ -2027,7 +2027,7 @@ wpa_supplicant documentation for more details.
    
 nm_setting_802_1x_get_phase1_fast_provisioning
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2042,7 +2042,7 @@ nm_setting_802_1x_get_phase1_fast_provisioning
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     whether "phase 1" PEAP fast provisioning should be used, as specified
 by the “phase1-fast-provisioning” property.  See the
 wpa_supplicant documentation for more details.
    
@@ -2054,7 +2054,7 @@ wpa_supplicant documentation for more details.
    
 
    const char *
 nm_setting_802_1x_get_phase2_auth (NMSetting8021x *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2069,7 +2069,7 @@ nm_setting_802_1x_get_phase2_auth (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the "phase 2" non-EAP (ex MD5) allowed authentication method as
 specified by the “phase2-auth” property.
    
 
    
@@ -2080,7 +2080,7 @@ specified by the const char *
 nm_setting_802_1x_get_phase2_autheap (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2095,7 +2095,7 @@ nm_setting_802_1x_get_phase2_autheap (
-
    Returns
    
+
    Returns
    
 
     the "phase 2" EAP-based (ex TLS) allowed authentication method as
 specified by the “phase2-autheap” property.
    
 
@@ -2111,7 +2111,7 @@ returned scheme is nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
 use nm_setting_802_1x_get_ca_cert_path().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2126,7 +2126,7 @@ use 
-
    Returns
    
+
    Returns
    
 
     scheme used to store the "phase 2" CA certificate (blob or path)
    
 
 
@@ -2143,7 +2143,7 @@ CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
 of the network cannot be confirmed by the client.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2158,7 +2158,7 @@ of the network cannot be confirmed by the client.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the "phase 2" CA certificate data. 
    
 
    [transfer none]
    
 
    
@@ -2176,7 +2176,7 @@ CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
 of the network cannot be confirmed by the client.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2191,7 +2191,7 @@ of the network cannot be confirmed by the client.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     path to the "phase 2" CA certificate file
    
 
    
 
    
@@ -2209,7 +2209,7 @@ 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 NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2251,7 +2251,7 @@ clears the "phase2" CA certificate.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
    
@@ -2262,7 +2262,7 @@ clears the "phase2" CA certificate.
    
 nm_setting_802_1x_get_phase2_subject_match
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2277,7 +2277,7 @@ nm_setting_802_1x_get_phase2_subject_match
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    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
@@ -2293,7 +2293,7 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 
    Returns the number of entries in the
 “phase2-altsubject-matches” property of this setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2308,7 +2308,7 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of phase2-altsubject-matches entries.
    
 
    
 
    
@@ -2322,7 +2322,7 @@ nm_setting_802_1x_get_phase2_altsubject_match
 
    Returns the "phase 2" altSubjectName match at index i
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2344,7 +2344,7 @@ nm_setting_802_1x_get_phase2_altsubject_match
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the "phase 2" altSubjectName match at index i
 
    
 
    
@@ -2360,7 +2360,7 @@ nm_setting_802_1x_add_phase2_altsubject_match
 at least one match is added, the altSubjectName of the "phase 2"
 remote authentication server is not verified.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2383,7 +2383,7 @@ connection
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the "phase 2" alternative subject name match was
 successfully added, FALSE if it was already allowed.
    
 
    
@@ -2397,7 +2397,7 @@ nm_setting_802_1x_remove_phase2_altsubject_match
                                 guint32 i);
 
    Removes the allowed "phase 2" altSubjectName at the specified index.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2429,7 +2429,7 @@ nm_setting_802_1x_remove_phase2_altsubject_match_by_value
 
    Removes the allowed "phase 2" altSubjectName phase2_altsubject_match
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2451,7 +2451,7 @@ nm_setting_802_1x_remove_phase2_altsubject_match_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the alternative subject name match for "phase 2" was found and removed,
 FALSE if it was not.
    
 
    
@@ -2464,7 +2464,7 @@ nm_setting_802_1x_clear_phase2_altsubject_matches
                                (NMSetting8021x *setting);
 
    Clears all "phase 2" altSubjectName matches.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2486,7 +2486,7 @@ nm_setting_802_1x_clear_phase2_altsubject_matches
 nm_setting_802_1x_get_phase2_domain_suffix_match
                                (NMSetting8021x *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2501,7 +2501,7 @@ nm_setting_802_1x_get_phase2_domain_suffix_match
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “phase2-domain-suffix-match” property.
    
 
    
 
    Since: 1.2
    
@@ -2518,7 +2518,7 @@ returned scheme is NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2533,7 +2533,7 @@ returned scheme is 
-
    Returns
    
+
    Returns
     scheme used to store the "phase 2" client certificate (blob or path)
    
@@ -2547,7 +2547,7 @@ nm_setting_802_1x_get_phase2_client_cert_blob
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
    @@ -2562,7 +2562,7 @@ authentication method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the "phase 2" client certificate data. 
    
 
    [transfer none]
    
 
    
@@ -2577,7 +2577,7 @@ nm_setting_802_1x_get_phase2_client_cert_path
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2592,7 +2592,7 @@ authentication method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     path to the "phase 2" client certificate file
    
 
    
 
@@ -2614,7 +2614,7 @@ file if using the 
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2657,7 +2657,7 @@ clears the "phase2" client certificate.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
@@ -2667,7 +2667,7 @@ clears the "phase2" client certificate.
    
 
    const char *
 nm_setting_802_1x_get_password (NMSetting8021x *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2682,7 +2682,7 @@ nm_setting_802_1x_get_password (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the password used by the authentication method, if any, as specified
 by the “password” property
    
 
    
@@ -2693,7 +2693,7 @@ by the NMSettingSecretFlags
 nm_setting_802_1x_get_password_flags (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2708,7 +2708,7 @@ nm_setting_802_1x_get_password_flags (
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the “password”
    
 
 
@@ -2718,7 +2718,7 @@ nm_setting_802_1x_get_password_flags (GBytes *
 nm_setting_802_1x_get_password_raw (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2733,7 +2733,7 @@ nm_setting_802_1x_get_password_raw (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the password used by the authentication method as a
 UTF-8-encoded array of bytes, as specified by the
 “password-raw” property. 
    
@@ -2747,7 +2747,7 @@ UTF-8-encoded array of bytes, as specified by the
 nm_setting_802_1x_get_password_raw_flags
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2762,7 +2762,7 @@ nm_setting_802_1x_get_password_raw_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the
 “password-raw”
    
 
    
@@ -2773,7 +2773,7 @@ nm_setting_802_1x_get_password_raw_flags
 
    const char *
 nm_setting_802_1x_get_pin (NMSetting8021x *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2788,7 +2788,7 @@ nm_setting_802_1x_get_pin (
-
    Returns
    
+
    Returns
    
 
     the PIN used by the authentication method, if any, as specified
 by the “pin” property
    
 
@@ -2799,7 +2799,7 @@ by the NMSettingSecretFlags
 nm_setting_802_1x_get_pin_flags (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2814,7 +2814,7 @@ nm_setting_802_1x_get_pin_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the
 “pin”
    
 
    
@@ -2831,7 +2831,7 @@ nm_setting_802_1x_get_private_key_scheme
 NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2846,7 +2846,7 @@ nm_setting_802_1x_get_private_key_scheme
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     scheme used to store the private key (blob or path)
    
 
    
 
@@ -2863,7 +2863,7 @@ authentication method.
    
 unencrypted private key data may be readable by unprivileged users.  Private
 keys should always be encrypted with a private key password.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2878,7 +2878,7 @@ keys should always be encrypted with a private key password.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the private key data. 
    
 
    [transfer none]
    
 
    
@@ -2893,7 +2893,7 @@ nm_setting_802_1x_get_private_key_path
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2908,7 +2908,7 @@ authentication method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     path to the private key file
    
 
    
 
@@ -2946,7 +2946,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2995,7 +2995,7 @@ an error is returned.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
@@ -3006,7 +3006,7 @@ an error is returned.
    
 nm_setting_802_1x_get_private_key_password
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3021,7 +3021,7 @@ nm_setting_802_1x_get_private_key_password
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the private key password used to decrypt the private key if
 previously set with nm_setting_802_1x_set_private_key(), or the
 “private-key-password” property.
    
@@ -3034,7 +3034,7 @@ previously set with NMSetting8021x *setting    );
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3049,7 +3049,7 @@ nm_setting_802_1x_get_private_key_password_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the
 “private-key-password”
    
 
    
@@ -3061,7 +3061,7 @@ nm_setting_802_1x_get_private_key_password_flags
 nm_setting_802_1x_get_private_key_format
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3076,7 +3076,7 @@ nm_setting_802_1x_get_private_key_format
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the data format of the private key data stored in the
 “private-key” property
    
 
    
@@ -3093,7 +3093,7 @@ scheme is NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3108,7 +3108,7 @@ scheme is 
-
    Returns
    
+
    Returns
     scheme used to store the "phase 2" private key (blob or path)
    
@@ -3125,7 +3125,7 @@ authentication method.
    
 unencrypted private key data may be readable by unprivileged users.  Private
 keys should always be encrypted with a private key password.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
    @@ -3140,7 +3140,7 @@ keys should always be encrypted with a private key password.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the "phase 2" private key data. 
    
 
    [transfer none]
    
 
    
@@ -3155,7 +3155,7 @@ nm_setting_802_1x_get_phase2_private_key_path
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3170,7 +3170,7 @@ authentication method.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     path to the "phase 2" private key file
    
 
    
 
    
@@ -3209,7 +3209,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3259,7 +3259,7 @@ an error is returned.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the operation succeeded, FALSE if it was unsuccessful
    
 
    
 
@@ -3270,7 +3270,7 @@ an error is returned.
    
 nm_setting_802_1x_get_phase2_private_key_password
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3285,7 +3285,7 @@ nm_setting_802_1x_get_phase2_private_key_password
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the private key password used to decrypt the private key if
 previously set with nm_setting_802_1x_set_phase2_private_key() or the
 “phase2-private-key-password” property.
    
@@ -3298,7 +3298,7 @@ previously set with NMSetting8021x *setting    );
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3313,7 +3313,7 @@ nm_setting_802_1x_get_phase2_private_key_password_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the
 “phase2-private-key-password”
    
 
    
@@ -3325,7 +3325,7 @@ nm_setting_802_1x_get_phase2_private_key_password_flags
 nm_setting_802_1x_get_phase2_private_key_format
                                (NMSetting8021x *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3340,7 +3340,7 @@ nm_setting_802_1x_get_phase2_private_key_format
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the data format of the "phase 2" private key data stored in the
 “phase2-private-key” property
    
 
    
@@ -3359,7 +3359,7 @@ nm_setting_802_1x_get_phase2_private_key_format
 
    NMSetting8021xCKFormat values indicate the general type of a certificate
 or private key
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -3408,7 +3408,7 @@ and private key
    
 stored in the setting properties, either as a blob of the item's data, or as
 a path to a certificate or private key file on the filesystem
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -4092,6 +4092,6 @@ properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingAdsl.html b/docs/libnm/html/NMSettingAdsl.html
index ce039df3..37461bea 100644
--- a/docs/libnm/html/NMSettingAdsl.html
+++ b/docs/libnm/html/NMSettingAdsl.html
@@ -8,7 +8,7 @@
 
-
+
@@ -242,7 +242,7 @@ properties of ADSL connections.
    
 nm_setting_adsl_new (void);
    Creates a new NMSettingAdsl object with default values.
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingAdsl object
    
 
    
@@ -252,7 +252,7 @@ nm_setting_adsl_new (void<
 
    const char *
 nm_setting_adsl_get_username (NMSettingAdsl *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -267,7 +267,7 @@ nm_setting_adsl_get_username (
-
    Returns
    
+
    Returns
    
 
     the “username” property of the setting
    
 
 
@@ -277,7 +277,7 @@ nm_setting_adsl_get_username (const char *
 nm_setting_adsl_get_password (NMSettingAdsl *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -292,7 +292,7 @@ nm_setting_adsl_get_password (
-
    Returns
    
+
    Returns
    
 
     the “password” property of the setting
    
 
 
@@ -302,7 +302,7 @@ nm_setting_adsl_get_password (const char *
 nm_setting_adsl_get_protocol (NMSettingAdsl *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -317,7 +317,7 @@ nm_setting_adsl_get_protocol (
-
    Returns
    
+
    Returns
    
 
     the “protocol” property of the setting
    
 
 
@@ -327,7 +327,7 @@ nm_setting_adsl_get_protocol (const char *
 nm_setting_adsl_get_encapsulation (NMSettingAdsl *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -342,7 +342,7 @@ nm_setting_adsl_get_encapsulation (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “encapsulation” property of the setting
    
 
    
 
@@ -352,7 +352,7 @@ nm_setting_adsl_get_encapsulation (guint32
 nm_setting_adsl_get_vpi (NMSettingAdsl *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -367,7 +367,7 @@ nm_setting_adsl_get_vpi (
-
    Returns
    
+
    Returns
    
 
     the “vpi” property of the setting
    
 
 
@@ -377,7 +377,7 @@ nm_setting_adsl_get_vpi (guint32
 nm_setting_adsl_get_vci (NMSettingAdsl *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -392,7 +392,7 @@ nm_setting_adsl_get_vci (
-
    Returns
    
+
    Returns
    
 
     the “vci” property of the setting
    
 
 
@@ -402,7 +402,7 @@ nm_setting_adsl_get_vci (NMSettingSecretFlags
 nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -417,7 +417,7 @@ nm_setting_adsl_get_password_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the “password”
    
 
    
 
@@ -568,6 +568,6 @@ nm_setting_adsl_get_password_flags (
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBluetooth.html b/docs/libnm/html/NMSettingBluetooth.html
index 51ce06b7..4f062e20 100644
--- a/docs/libnm/html/NMSettingBluetooth.html
+++ b/docs/libnm/html/NMSettingBluetooth.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -147,7 +147,7 @@ Point (NAP) profiles.
    
 nm_setting_bluetooth_new (void);
 
    Creates a new NMSettingBluetooth object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingBluetooth object. 
    
 
    [transfer full]
    
 
    
@@ -160,7 +160,7 @@ nm_setting_bluetooth_get_bdaddr (Gets the Bluetooth address of the remote device which this setting
 describes a connection to.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -175,7 +175,7 @@ describes a connection to.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the Bluetooth address
    
 
    
 
    
@@ -188,7 +188,7 @@ nm_setting_bluetooth_get_connection_type
 
    Returns the connection method for communicating with the remote device (i.e.
 either DUN to a DUN-capable device or PANU to a NAP-capable device).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -203,7 +203,7 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the type, either NM_SETTING_BLUETOOTH_TYPE_PANU or
 NM_SETTING_BLUETOOTH_TYPE_DUN
    
 
    
@@ -271,6 +271,6 @@ Area Networking connections to devices supporting the NAP profile.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html
index 1da953e2..df203b96 100644
--- a/docs/libnm/html/NMSettingBond.html
+++ b/docs/libnm/html/NMSettingBond.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -280,7 +280,7 @@ necessary for bond connections.
    
 nm_setting_bond_new (void);
 
    Creates a new NMSettingBond object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingBond object. 
    
 
    [transfer full]
    
 
    
@@ -294,7 +294,7 @@ nm_setting_bond_get_num_options (nm_setting_bond_get_option().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -309,7 +309,7 @@ using 
 
 
    
-
    Returns
    
+
    Returns
    
 
     the number of bonding options
    
 
    
@@ -327,7 +327,7 @@ are *not* guaranteed to be static across modifications to options done by
 and should not be used to refer to options except for short periods of time
 such as during option iteration.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -363,7 +363,7 @@ modified. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    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
 currently held by the setting)
    
@@ -379,7 +379,7 @@ nm_setting_bond_get_option_by_name (name
 , if it exists.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -401,7 +401,7 @@ nm_setting_bond_get_option_by_name (
 
 
    
-
    Returns
    
+
    Returns
    
 
     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
    
 
    
@@ -420,7 +420,7 @@ that may already exist.
    
 
    The order of how to set several options is relevant because there are options
 that conflict with each other.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -447,7 +447,7 @@ that conflict with each other.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the option was valid and was added to the internal option
 list, FALSE if it was not.
    
 
    
@@ -462,7 +462,7 @@ nm_setting_bond_remove_option (
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -484,7 +484,7 @@ list.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the option was found and removed from the internal option
 list, FALSE if it was not.
    
 
    
@@ -502,7 +502,7 @@ the name
 . If value
  is NULL, the function only validates the option name.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -524,7 +524,7 @@ the name
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE, if the value
 is valid for the given name.
 If the name
@@ -538,7 +538,7 @@ is not a valid option, FALSE will be returned.
    
 nm_setting_bond_get_valid_options (NMSettingBond *setting);
 
    Returns a list of valid bond options.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -553,7 +553,7 @@ nm_setting_bond_get_valid_options (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a NULL-terminated array of strings of valid bond options. 
    
 
    [transfer none]
    
 
    
@@ -565,7 +565,7 @@ nm_setting_bond_get_valid_options (NMSettingBond *setting,
                                     const char *name);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -587,7 +587,7 @@ nm_setting_bond_get_option_default (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the value of the bond option if not overridden by an entry in
 the “options” property.
    
 
    
@@ -788,6 +788,6 @@ must be strings. Option names must contain only alphanumeric characters
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html
index 1752d4d5..5cfbcec6 100644
--- a/docs/libnm/html/NMSettingBridge.html
+++ b/docs/libnm/html/NMSettingBridge.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -239,7 +239,7 @@ necessary for bridging connections.
    
 nm_setting_bridge_new (void);
 
    Creates a new NMSettingBridge object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingBridge object. 
    
 
    [transfer full]
    
 
    
@@ -250,7 +250,7 @@ nm_setting_bridge_new (voidconst char *
 nm_setting_bridge_get_mac_address (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -265,7 +265,7 @@ nm_setting_bridge_get_mac_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “mac-address” property of the setting
    
 
    
 
@@ -275,7 +275,7 @@ nm_setting_bridge_get_mac_address (gboolean
 nm_setting_bridge_get_stp (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -290,7 +290,7 @@ nm_setting_bridge_get_stp (
-
    Returns
    
+
    Returns
    
 
     the “stp” property of the setting
    
 
 
@@ -300,7 +300,7 @@ nm_setting_bridge_get_stp (guint16
 nm_setting_bridge_get_priority (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -315,7 +315,7 @@ nm_setting_bridge_get_priority (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “priority” property of the setting
    
 
    
 
@@ -325,7 +325,7 @@ nm_setting_bridge_get_priority (guint16
 nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -340,7 +340,7 @@ nm_setting_bridge_get_forward_delay (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “forward-delay” property of the setting
    
 
    
 
@@ -350,7 +350,7 @@ nm_setting_bridge_get_forward_delay (guint16
 nm_setting_bridge_get_hello_time (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -365,7 +365,7 @@ nm_setting_bridge_get_hello_time (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “hello-time” property of the setting
    
 
    
 
@@ -375,7 +375,7 @@ nm_setting_bridge_get_hello_time (guint16
 nm_setting_bridge_get_max_age (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -390,7 +390,7 @@ nm_setting_bridge_get_max_age (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “max-age” property of the setting
    
 
    
 
@@ -400,7 +400,7 @@ nm_setting_bridge_get_max_age (guint32
 nm_setting_bridge_get_ageing_time (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -415,7 +415,7 @@ nm_setting_bridge_get_ageing_time (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “ageing-time” property of the setting
    
 
    
 
@@ -426,7 +426,7 @@ nm_setting_bridge_get_ageing_time (NMSettingBridge *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -441,7 +441,7 @@ nm_setting_bridge_get_multicast_snooping
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “multicast-snooping” property of the setting
    
 
    
 
    Since: 1.2
    
@@ -589,6 +589,6 @@ bridge.
    
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html
index f6b9cb84..59ffcb7e 100644
--- a/docs/libnm/html/NMSettingBridgePort.html
+++ b/docs/libnm/html/NMSettingBridgePort.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -154,7 +154,7 @@ optional properties that apply to bridge ports.
    
 nm_setting_bridge_port_new (void);
 
    Creates a new NMSettingBridgePort object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingBridgePort object. 
    
 
    [transfer full]
    
 
    
@@ -165,7 +165,7 @@ nm_setting_bridge_port_new (void<
 
    guint16
 nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -180,7 +180,7 @@ nm_setting_bridge_port_get_priority (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “priority” property of the setting
    
 
    
 
@@ -190,7 +190,7 @@ nm_setting_bridge_port_get_priority (guint16
 nm_setting_bridge_port_get_path_cost (NMSettingBridgePort *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -205,7 +205,7 @@ nm_setting_bridge_port_get_path_cost (
-
    Returns
    
+
    Returns
    
 
     the “path-cost” property of the setting
    
 
 
@@ -216,7 +216,7 @@ nm_setting_bridge_port_get_path_cost (NMSettingBridgePort *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -231,7 +231,7 @@ nm_setting_bridge_port_get_hairpin_mode
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “hairpin-mode” property of the setting
    
 
    
 
@@ -299,6 +299,6 @@ port.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html
index d3533f79..7c474aa3 100644
--- a/docs/libnm/html/NMSettingCdma.html
+++ b/docs/libnm/html/NMSettingCdma.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -172,7 +172,7 @@ networks, including those using CDMA2000/EVDO technology.
    
 nm_setting_cdma_new (void);
 
    Creates a new NMSettingCdma object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingCdma object
    
 
    
 
@@ -182,7 +182,7 @@ nm_setting_cdma_new (void<
 
    const char *
 nm_setting_cdma_get_number (NMSettingCdma *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -197,7 +197,7 @@ nm_setting_cdma_get_number (
-
    Returns
    
+
    Returns
    
 
     the “number” property of the setting
    
 
 
@@ -207,7 +207,7 @@ nm_setting_cdma_get_number (const char *
 nm_setting_cdma_get_username (NMSettingCdma *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -222,7 +222,7 @@ nm_setting_cdma_get_username (
-
    Returns
    
+
    Returns
    
 
     the “username” property of the setting
    
 
 
@@ -232,7 +232,7 @@ nm_setting_cdma_get_username (const char *
 nm_setting_cdma_get_password (NMSettingCdma *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -247,7 +247,7 @@ nm_setting_cdma_get_password (
-
    Returns
    
+
    Returns
    
 
     the “password” property of the setting
    
 
 
@@ -257,7 +257,7 @@ nm_setting_cdma_get_password (NMSettingSecretFlags
 nm_setting_cdma_get_password_flags (NMSettingCdma *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -272,7 +272,7 @@ nm_setting_cdma_get_password_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the “password”
    
 
    
 
@@ -355,6 +355,6 @@ username is required, it is specified here.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index e69e8221..a11b4135 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -67,6 +67,13 @@
     
+
+
+
+
@@ -339,6 +346,12 @@
 
+
+
+
+
+
@@ -398,6 +411,10 @@
 
+
+
+
+
@@ -496,7 +513,7 @@ a void);
 
    Creates a new NMSettingConnection object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingConnection object
    
 
    
 
@@ -507,7 +524,7 @@ nm_setting_connection_new (voidNMSettingConnection *setting);
 
    Returns the “id” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    const char *
 
 
+nm_setting_connection_get_stable_id ()
+
    const char *
+
 nm_setting_connection_get_interface_name ()
 
 
    Read / Write
 
    
 
    
+gchar *stable-idRead / Write
    
 guint64
 timestamp
 Read / Write / Construct
    
 
    
 #defineNM_SETTING_CONNECTION_STABLE_ID
    #define
 NM_SETTING_CONNECTION_INTERFACE_NAME
 
    
 
    @@ -522,7 +539,7 @@ nm_setting_connection_get_id (
-
    Returns
    
+
    Returns
    
 
     the connection ID
    
 
 
@@ -533,7 +550,7 @@ nm_setting_connection_get_id (NMSettingConnection *setting);
 
    Returns the “uuid” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -548,19 +565,46 @@ nm_setting_connection_get_uuid (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the connection UUID
    
 
    
 
 
    
 
    
+
    nm_setting_connection_get_stable_id ()
    
+
    const char *
+nm_setting_connection_get_stable_id (NMSettingConnection *setting);
    
+
    Returns the “stable_id” property of the connection.
    
+
    
+
    Parameters
    
+
    
 
 

    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingConnection
    		 
    
+
    
+
    
+
    Returns
    
+
     the stable-id for the connection
    
+
    
+
    Since: 1.4
    
+
+
    
+
    
 
    nm_setting_connection_get_interface_name ()
    
 
    const char *
 nm_setting_connection_get_interface_name
                                (NMSettingConnection *setting);
    
 
    Returns the “interface-name” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -575,7 +619,7 @@ nm_setting_connection_get_interface_name
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the connection's interface name
    
 
    
 
    
@@ -587,7 +631,7 @@ nm_setting_connection_get_connection_type
                                (NMSettingConnection *setting);
 
    Returns the “type” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -602,7 +646,7 @@ nm_setting_connection_get_connection_type
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the connection type
    
 
    
 
@@ -613,7 +657,7 @@ nm_setting_connection_get_connection_type
 nm_setting_connection_get_autoconnect (NMSettingConnection *setting);
 
    Returns the “autoconnect” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -628,7 +672,7 @@ nm_setting_connection_get_autoconnect (
-
    Returns
    
+
    Returns
    
 
     the connection's autoconnect behavior
    
 
 
@@ -641,7 +685,7 @@ nm_setting_connection_get_autoconnect_priority
 
    Returns the “autoconnect-priority” property of the connection.
 The higher number, the higher priority.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -656,7 +700,7 @@ The higher number, the higher priority.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the connection's autoconnect priority
    
 
    
 
@@ -667,7 +711,7 @@ The higher number, the higher priority.
    
 nm_setting_connection_get_timestamp (NMSettingConnection *setting);
 
    Returns the “timestamp” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -682,7 +726,7 @@ nm_setting_connection_get_timestamp (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the connection's timestamp
    
 
    
 
@@ -693,7 +737,7 @@ nm_setting_connection_get_timestamp (NMSettingConnection *setting);
 
    Returns the “read-only” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -708,7 +752,7 @@ nm_setting_connection_get_read_only (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection is read-only, FALSE if it is not
    
 
    
 
@@ -721,7 +765,7 @@ nm_setting_connection_get_num_permissions
 
    Returns the number of entires in the “permissions”
 property of this setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -736,7 +780,7 @@ property of this setting.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of permissions entires
    
 
    
 
@@ -752,7 +796,7 @@ nm_setting_connection_get_permission (“permissions” property
 of this setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -791,7 +835,7 @@ of this setting.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if a permission was returned, FALSE if idx
 was invalid
    
 
    
@@ -803,7 +847,7 @@ was invalid
    
 nm_setting_connection_get_zone (NMSettingConnection *setting);
 
    Returns the “zone” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -818,7 +862,7 @@ nm_setting_connection_get_zone (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the trust level of a connection
    
 
    
 
@@ -831,7 +875,7 @@ nm_setting_connection_permissions_user_allowed
                                 const char *uname);
 
    Checks whether the given username is allowed to view/access this connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -853,7 +897,7 @@ nm_setting_connection_permissions_user_allowed
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the requested user is allowed to view this connection,
 FALSE if the given user is not allowed to view this connection
    
 
    
@@ -871,7 +915,7 @@ the "user" permission type is supported, and pitem“permissions”: for more details.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -904,7 +948,7 @@ the "user" permission type is supported, and pitem
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the permission was unique and was successfully added to the
 list, FALSE if ptype
 or pitem
@@ -922,7 +966,7 @@ nm_setting_connection_remove_permission
 
    Removes the permission at index idx
  from the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -958,7 +1002,7 @@ At this time, only the "user" permission type is supported, and “permissions”: for more details.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -991,7 +1035,7 @@ be a username. See 
-
    Returns
    
+
    Returns
    
 
     TRUE if the permission was found and removed; FALSE if it was not.
    
 
 
@@ -1002,7 +1046,7 @@ be a username. See NMSettingConnection *setting    );
 
    Returns the “master” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1017,7 +1061,7 @@ nm_setting_connection_get_master (
 
 
    
-
    Returns
    
+
    Returns
    
 
     interface name of the master device or UUID of the master
 connection.
    
 
    
@@ -1029,7 +1073,7 @@ connection.
    
 nm_setting_connection_is_slave_type (NMSettingConnection *setting,
                                      const char *type);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1053,7 +1097,7 @@ against setting
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if connection is of the given slave type
 
    
 
    
@@ -1065,7 +1109,7 @@ against setting
 nm_setting_connection_get_slave_type (NMSettingConnection *setting);
 
    Returns the “slave-type” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1080,7 +1124,7 @@ nm_setting_connection_get_slave_type (
-
    Returns
    
+
    Returns
    
 
     the type of slave this connection is, if any
    
 
 
@@ -1092,7 +1136,7 @@ nm_setting_connection_get_autoconnect_slaves
                                (NMSettingConnection *setting);
 
    Returns the “autoconnect-slaves” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1107,7 +1151,7 @@ nm_setting_connection_get_autoconnect_slaves
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     whether slaves of the connection should be activated together
 with the connection.
    
 
    
@@ -1120,7 +1164,7 @@ with the connection.
    
 nm_setting_connection_get_num_secondaries
                                (NMSettingConnection *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1135,7 +1179,7 @@ nm_setting_connection_get_num_secondaries
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured secondary connection UUIDs
    
 
    
 
@@ -1146,7 +1190,7 @@ nm_setting_connection_get_num_secondaries
 nm_setting_connection_get_secondary (NMSettingConnection *setting,
                                      guint32 idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1168,7 +1212,7 @@ nm_setting_connection_get_secondary (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the secondary connection UUID at index idx
 
    
 
    
@@ -1181,7 +1225,7 @@ nm_setting_connection_add_secondary (const char *sec_uuid);
 
    Adds a new secondary connetion UUID to the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1203,7 +1247,7 @@ nm_setting_connection_add_secondary (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the secondary connection UUID was added; FALSE if the UUID
 was already present
    
 
    
@@ -1218,7 +1262,7 @@ nm_setting_connection_remove_secondary
 
    Removes the secondary coonnection UUID at index idx
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1250,7 +1294,7 @@ nm_setting_connection_remove_secondary_by_value
 
    Removes the secondary coonnection UUID sec_uuid
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1272,7 +1316,7 @@ nm_setting_connection_remove_secondary_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the secondary connection UUID was found and removed; FALSE if it was not.
    
 
    
 
@@ -1283,7 +1327,7 @@ nm_setting_connection_remove_secondary_by_value
 nm_setting_connection_get_gateway_ping_timeout
                                (NMSettingConnection *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1298,7 +1342,7 @@ nm_setting_connection_get_gateway_ping_timeout
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the value contained in the “gateway-ping-timeout”
 property.
    
 
    
@@ -1309,7 +1353,7 @@ property.
    
 
    NMMetered
 nm_setting_connection_get_metered (NMSettingConnection *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1324,7 +1368,7 @@ nm_setting_connection_get_metered (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “metered” property of the setting.
    
 
    
 
    Since: 1.2
    
@@ -1336,7 +1380,7 @@ nm_setting_connection_get_metered (NMSettingConnection *setting);
 
    Returns the “lldp” property of the connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1351,7 +1395,7 @@ nm_setting_connection_get_lldp (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a NMSettingConnectionLldp which indicates whether LLDP must be
 enabled for the connection.
    
 
    
@@ -1397,6 +1441,12 @@ enabled for the connection.
    
 
 
    
 
    
+
    NM_SETTING_CONNECTION_STABLE_ID
    
+
    #define NM_SETTING_CONNECTION_STABLE_ID      "stable-id"
+
    
+
    
+
    
+
    
 
    NM_SETTING_CONNECTION_INTERFACE_NAME
    
 
    #define NM_SETTING_CONNECTION_INTERFACE_NAME "interface-name"
 
    
@@ -1491,7 +1541,7 @@ enabled for the connection.
    
 
    NMSettingConnectionAutoconnectSlaves values indicate whether slave connections
 should be activated when master is activated.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -1531,7 +1581,7 @@ should be activated when master is activated.
    
 
    enum NMSettingConnectionLldp
    
 
    NMSettingConnectionLldp values indicate whether LLDP should be enabled.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -1720,6 +1770,20 @@ slave.
    
 
 
    
 
    
+
    The “stable-id” property
    
+
      “stable-id”                gchar *
    
+
    This token to generate stable IDs for the connection. If unset,
+the UUID will be used instead.
    
+
    The stable-id is used instead of the connection UUID 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.
    
+
    Flags: Read / Write
    
+
    Default value: NULL
    
+
    Since: 1.4
    
+
    
+
    
+
    
 
    The “timestamp” property
    
 
      “timestamp”                guint64
    
 
    The time, in seconds since the Unix Epoch, that the connection was last
@@ -1777,6 +1841,6 @@ the change takes effect immediately.
    
 
    
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html
index cfc5515a..bf987e05 100644
--- a/docs/libnm/html/NMSettingDcb.html
+++ b/docs/libnm/html/NMSettingDcb.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -429,7 +429,7 @@ of storage technologies like Fibre Channel over Ethernet (FCoE) and iSCSI.
    
 nm_setting_dcb_new (void);
 
    Creates a new NMSettingDcb object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingDcb object. 
    
 
    [transfer full]
    
 
    
@@ -440,7 +440,7 @@ nm_setting_dcb_new (voidNMSettingDcbFlags
 nm_setting_dcb_get_app_fcoe_flags (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -455,7 +455,7 @@ nm_setting_dcb_get_app_fcoe_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “app-fcoe-flags” property of the setting
    
 
    
 
@@ -465,7 +465,7 @@ nm_setting_dcb_get_app_fcoe_flags (gint
 nm_setting_dcb_get_app_fcoe_priority (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -480,7 +480,7 @@ nm_setting_dcb_get_app_fcoe_priority (
-
    Returns
    
+
    Returns
    
 
     the “app-fcoe-priority” property of the setting
    
 
 
@@ -490,7 +490,7 @@ nm_setting_dcb_get_app_fcoe_priority (const char *
 nm_setting_dcb_get_app_fcoe_mode (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -505,7 +505,7 @@ nm_setting_dcb_get_app_fcoe_mode (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “app-fcoe-mode” property of the setting
    
 
    
 
@@ -515,7 +515,7 @@ nm_setting_dcb_get_app_fcoe_mode (NMSettingDcbFlags
 nm_setting_dcb_get_app_iscsi_flags (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -530,7 +530,7 @@ nm_setting_dcb_get_app_iscsi_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “app-iscsi-flags” property of the setting
    
 
    
 
@@ -540,7 +540,7 @@ nm_setting_dcb_get_app_iscsi_flags (gint
 nm_setting_dcb_get_app_iscsi_priority (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -555,7 +555,7 @@ nm_setting_dcb_get_app_iscsi_priority (
-
    Returns
    
+
    Returns
    
 
     the “app-iscsi-priority” property of the setting
    
 
 
@@ -565,7 +565,7 @@ nm_setting_dcb_get_app_iscsi_priority (NMSettingDcbFlags
 nm_setting_dcb_get_app_fip_flags (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -580,7 +580,7 @@ nm_setting_dcb_get_app_fip_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “app-fip-flags” property of the setting
    
 
    
 
@@ -590,7 +590,7 @@ nm_setting_dcb_get_app_fip_flags (gint
 nm_setting_dcb_get_app_fip_priority (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -605,7 +605,7 @@ nm_setting_dcb_get_app_fip_priority (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “app-fip-priority” property of the setting
    
 
    
 
@@ -616,7 +616,7 @@ nm_setting_dcb_get_app_fip_priority (NMSettingDcb *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -631,7 +631,7 @@ nm_setting_dcb_get_priority_flow_control_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “priority-flow-control-flags” property of the setting
    
 
    
 
@@ -643,7 +643,7 @@ nm_setting_dcb_get_priority_flow_control
                                (NMSettingDcb *setting,
                                 guint user_priority);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -665,7 +665,7 @@ nm_setting_dcb_get_priority_flow_control
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if flow control is enabled for the given user_priority
 ,
 FALSE if not enabled
    
@@ -682,7 +682,7 @@ nm_setting_dcb_set_priority_flow_control
 
    These values are only valid when “priority-flow-control” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -716,7 +716,7 @@ the NMSettingDcb *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -731,7 +731,7 @@ nm_setting_dcb_get_priority_group_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “priority-group-flags” property of the setting
    
 
    
 
    
@@ -742,7 +742,7 @@ nm_setting_dcb_get_priority_group_flags
 nm_setting_dcb_get_priority_group_id (NMSettingDcb *setting,
                                       guint user_priority);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -764,7 +764,7 @@ nm_setting_dcb_get_priority_group_id (
-
    Returns
    
+
    Returns
    
 
     the group number user_priority
 is assigned to.  These values are
 only valid when “priority-group-flags” includes the
@@ -781,7 +781,7 @@ nm_setting_dcb_set_priority_group_id (“priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -818,7 +818,7 @@ nm_setting_dcb_get_priority_group_bandwidth
                                (NMSettingDcb *setting,
                                 guint group_id);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -840,7 +840,7 @@ nm_setting_dcb_get_priority_group_bandwidth
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the bandwidth percentage assigned to group_id
 .  These values are
 only valid when “priority-group-flags” includes the
@@ -858,7 +858,7 @@ nm_setting_dcb_set_priority_group_bandwidth
 
    These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -893,7 +893,7 @@ to
    
 nm_setting_dcb_get_priority_bandwidth (NMSettingDcb *setting,
                                        guint user_priority);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -915,7 +915,7 @@ nm_setting_dcb_get_priority_bandwidth (
-
    Returns
    
+
    Returns
    
 
     the allowed bandwidth percentage of user_priority
 in its priority group.
 These values are only valid when “priority-group-flags” includes the
@@ -932,7 +932,7 @@ nm_setting_dcb_set_priority_bandwidth (“priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -969,7 +969,7 @@ nm_setting_dcb_get_priority_strict_bandwidth
                                (NMSettingDcb *setting,
                                 guint user_priority);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -991,7 +991,7 @@ nm_setting_dcb_get_priority_strict_bandwidth
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     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
@@ -1009,7 +1009,7 @@ nm_setting_dcb_set_priority_strict_bandwidth
 
    These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1046,7 +1046,7 @@ nm_setting_dcb_get_priority_traffic_class
                                (NMSettingDcb *setting,
                                 guint user_priority);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1068,7 +1068,7 @@ nm_setting_dcb_get_priority_traffic_class
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the traffic class assigned to user_priority
 . These values are only
 valid when “priority-group-flags” includes the
@@ -1097,7 +1097,7 @@ nm_setting_dcb_set_priority_traffic_class
 
    enum NMSettingDcbFlags
    
 
    DCB feature flags.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -1402,6 +1402,6 @@ which the priority is mapped.
    
-
    Generated by GTK-Doc V1.24
    
+
    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 42d890ef..3cba85b9 100644
--- a/docs/libnm/html/NMSettingGeneric.html
+++ b/docs/libnm/html/NMSettingGeneric.html
@@ -8,7 +8,7 @@
 
-
+
@@ -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
    
@@ -91,7 +91,7 @@ the "connection type" setting on 
 nm_setting_generic_new (void);
 
    Creates a new NMSettingGeneric object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingGeneric object. 
    
 
    [transfer full]
    
 
    
@@ -112,6 +112,6 @@ nm_setting_generic_new (void
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html
index 63878218..567ad32d 100644
--- a/docs/libnm/html/NMSettingGsm.html
+++ b/docs/libnm/html/NMSettingGsm.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -308,7 +308,7 @@ networks, including those using GPRS/EDGE and UMTS/HSPA technology.
    
 nm_setting_gsm_new (void);
 
    Creates a new NMSettingGsm object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingGsm object
    
 
    
 
@@ -318,7 +318,7 @@ nm_setting_gsm_new (voidconst char *
 nm_setting_gsm_get_number (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -333,7 +333,7 @@ nm_setting_gsm_get_number (
-
    Returns
    
+
    Returns
    
 
     the “number” property of the setting
    
 
 
@@ -343,7 +343,7 @@ nm_setting_gsm_get_number (const char *
 nm_setting_gsm_get_username (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -358,7 +358,7 @@ nm_setting_gsm_get_username (
-
    Returns
    
+
    Returns
    
 
     the “username” property of the setting
    
 
 
@@ -368,7 +368,7 @@ nm_setting_gsm_get_username (const char *
 nm_setting_gsm_get_password (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -383,7 +383,7 @@ nm_setting_gsm_get_password (
-
    Returns
    
+
    Returns
    
 
     the “password” property of the setting
    
 
 
@@ -393,7 +393,7 @@ nm_setting_gsm_get_password (const char *
 nm_setting_gsm_get_apn (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -408,7 +408,7 @@ nm_setting_gsm_get_apn (
-
    Returns
    
+
    Returns
    
 
     the “apn” property of the setting
    
 
 
@@ -418,7 +418,7 @@ nm_setting_gsm_get_apn (const char *
 nm_setting_gsm_get_network_id (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -433,7 +433,7 @@ nm_setting_gsm_get_network_id (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “network-id” property of the setting
    
 
    
 
@@ -443,7 +443,7 @@ nm_setting_gsm_get_network_id (const char *
 nm_setting_gsm_get_pin (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -458,7 +458,7 @@ nm_setting_gsm_get_pin (
-
    Returns
    
+
    Returns
    
 
     the “pin” property of the setting
    
 
 
@@ -468,7 +468,7 @@ nm_setting_gsm_get_pin (gboolean
 nm_setting_gsm_get_home_only (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -483,7 +483,7 @@ nm_setting_gsm_get_home_only (
-
    Returns
    
+
    Returns
    
 
     the “home-only” property of the setting
    
 
 
@@ -493,7 +493,7 @@ nm_setting_gsm_get_home_only (const char *
 nm_setting_gsm_get_device_id (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -508,7 +508,7 @@ nm_setting_gsm_get_device_id (
-
    Returns
    
+
    Returns
    
 
     the “device-id” property of the setting
    
 
 
    Since: 1.2
    
@@ -519,7 +519,7 @@ nm_setting_gsm_get_device_id (const char *
 nm_setting_gsm_get_sim_id (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -534,7 +534,7 @@ nm_setting_gsm_get_sim_id (
-
    Returns
    
+
    Returns
    
 
     the “sim-id” property of the setting
    
 
 
    Since: 1.2
    
@@ -545,7 +545,7 @@ nm_setting_gsm_get_sim_id (const char *
 nm_setting_gsm_get_sim_operator_id (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -560,7 +560,7 @@ nm_setting_gsm_get_sim_operator_id (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “sim-operator-id” property of the setting
    
 
    
 
    Since: 1.2
    
@@ -571,7 +571,7 @@ nm_setting_gsm_get_sim_operator_id (NMSettingSecretFlags
 nm_setting_gsm_get_pin_flags (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -586,7 +586,7 @@ nm_setting_gsm_get_pin_flags (
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the “pin”
    
 
 
@@ -596,7 +596,7 @@ nm_setting_gsm_get_pin_flags (NMSettingSecretFlags
 nm_setting_gsm_get_password_flags (NMSettingGsm *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -611,7 +611,7 @@ nm_setting_gsm_get_password_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the “password”
    
 
    
 
@@ -831,6 +831,6 @@ username is required, it is specified here.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index 162a186c..07f64c9a 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -172,7 +172,7 @@ connection.
    
 nm_setting_ip4_config_new (void);
 
    Creates a new NMSettingIP4Config object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingIP4Config object. 
    
 
    [transfer full]
    
 
    
@@ -186,7 +186,7 @@ nm_setting_ip4_config_get_dhcp_client_id
 
    Returns the value contained in the “dhcp-client-id”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -201,7 +201,7 @@ property.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the configured Client ID to send to the DHCP server when requesting
 addresses via DHCP.
    
 
    
@@ -214,7 +214,7 @@ nm_setting_ip4_config_get_dhcp_fqdn (Returns the value contained in the “dhcp-fqdn”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -229,7 +229,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the configured FQDN to send to the DHCP server
    
 
    
 
    Since: 1.2
    
@@ -329,6 +329,6 @@ cannot be set at the same time.
    
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
    
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html
index 285780a6..b6b3d888 100644
--- a/docs/libnm/html/NMSettingIP6Config.html
+++ b/docs/libnm/html/NMSettingIP6Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -65,6 +65,13 @@
 nm_setting_ip6_config_get_addr_gen_mode ()
 
 
+
+const char *
+
+
+nm_setting_ip6_config_get_token ()
+
+
 
 
 
@@ -87,6 +94,12 @@
 ip6-privacy
 Read / Write / Construct
 
+
+
+gchar *
+token
+Read / Write
+
 
 
 
@@ -112,6 +125,10 @@
 
 
 #define
+NM_SETTING_IP6_CONFIG_TOKEN
+
+
+#define
 NM_SETTING_IP6_CONFIG_METHOD_IGNORE
 
 
@@ -185,7 +202,7 @@ supported.
    
 nm_setting_ip6_config_new (void);
 
    Creates a new NMSettingIP6Config object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingIP6Config object. 
    
 
    [transfer full]
    
 
    
@@ -198,7 +215,7 @@ nm_setting_ip6_config_get_ip6_privacy (“ip6-privacy”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -213,7 +230,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     IPv6 Privacy Extensions configuration value (NMSettingIP6ConfigPrivacy).
    
 
    
 
@@ -226,7 +243,7 @@ nm_setting_ip6_config_get_addr_gen_mode
 
    Returns the value contained in the “addr-gen-mode”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -241,11 +258,39 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     IPv6 Address Generation Mode.
    
 
    
 
    Since: 1.2
    
 
+
    
+
    
+
    nm_setting_ip6_config_get_token ()
    
+
    const char *
+nm_setting_ip6_config_get_token (NMSettingIP6Config *setting);
    
+
    Returns the value contained in the “token”
+property.
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingIP6Config
    		 
    
+
    
+
    
+
    Returns
    
+
     A string.
    
+
    
+
    Since: 1.4
    
+
    
 
 
    
 
    Types and Values
    
@@ -268,6 +313,12 @@ property.
    
 
    
 
    
 
    
+
    NM_SETTING_IP6_CONFIG_TOKEN
    
+
    #define NM_SETTING_IP6_CONFIG_TOKEN "token"
+
    
+
    
+
    
+
    
 
    NM_SETTING_IP6_CONFIG_METHOD_IGNORE
    
 
    #define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
 
    
@@ -326,7 +377,7 @@ supported for IPv6)
    
 
    NMSettingIP6ConfigPrivacy values indicate if and how IPv6 Privacy
 Extensions are used (RFC4941).
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -374,7 +425,7 @@ are enabled and temporary addresses are preferred over public addresses
    NMSettingIP6ConfigAddrGenMode controls how the the Interface Identifier for
 RFC4862 Stateless Address Autoconfiguration is created.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -462,9 +513,19 @@ setting as another way of avoiding host tracking with IPv6 addresses.
    Flags: Read / Write / Construct
    Default value: NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN
    
+
    
+
    
+
    The “token” property
    
+
      “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
    
+
    Default value: NULL
    
+
    Since: 1.4
    
+
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index 98cd3a82..fde14a76 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -8,7 +8,7 @@
 
-
+
@@ -975,7 +975,7 @@ nm_ip_address_new (int fam
                    GError **error);
 
    Creates a new NMIPAddress object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -1008,7 +1008,7 @@ nm_ip_address_new (int fam
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new NMIPAddress object, or NULL on error. 
    
 
    [transfer full]
    
 
    
@@ -1026,7 +1026,7 @@ nm_ip_address_new_binary (intfamily
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1059,7 +1059,7 @@ correct size for family
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new NMIPAddress object, or NULL on error. 
    
 
    [transfer full]
    
 
    
@@ -1071,7 +1071,7 @@ correct size for family
 nm_ip_address_ref (NMIPAddress *address);
 
    Increases the reference count of the object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1094,7 +1094,7 @@ nm_ip_address_unref (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1118,7 +1118,7 @@ nm_ip_address_equal (NMIPAddress objects contain the same address and prefix
 (attributes are not compared).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1141,7 +1141,7 @@ to.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the objects contain the same values, FALSE if they do not.
    
 
    
 
    
@@ -1153,7 +1153,7 @@ nm_ip_address_dup (address
 
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1168,7 +1168,7 @@ nm_ip_address_dup (
-
    Returns
    
+
    Returns
    
 
     a copy of address
 . 
    
 
    [transfer full]
    
@@ -1182,7 +1182,7 @@ nm_ip_address_get_family (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1197,7 +1197,7 @@ object.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IP address family
    
 
    
 
@@ -1208,7 +1208,7 @@ object.
    
 nm_ip_address_get_address (NMIPAddress *address);
 
    Gets the IP address property of this address object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1223,7 +1223,7 @@ nm_ip_address_get_address (
-
    Returns
    
+
    Returns
    
 
     the IP address
    
 
 
@@ -1239,7 +1239,7 @@ nm_ip_address_set_address (nm_utils_ipaddr_valid() to check it.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1273,7 +1273,7 @@ nm_ip_address_get_address_binary (
 
    [skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1307,7 +1307,7 @@ nm_ip_address_set_address_binary (
 
    [skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1337,7 +1337,7 @@ nm_ip_address_get_prefix (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1352,7 +1352,7 @@ object.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IP address prefix
    
 
    
 
@@ -1364,7 +1364,7 @@ nm_ip_address_set_prefix (guint prefix);
 
    Sets the IP address prefix property of this address object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1394,7 +1394,7 @@ nm_ip_address_get_attribute_names (Gets an array of attribute names defined on address
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1409,7 +1409,7 @@ nm_ip_address_get_attribute_names (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a NULL-terminated array of attribute names,. 
    
 
    [transfer full]
    
 
    
@@ -1424,7 +1424,7 @@ nm_ip_address_get_attribute (address
 
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1446,7 +1446,7 @@ nm_ip_address_get_attribute (
-
    Returns
    
+
    Returns
    
 
     the value of the attribute with name name
 on
 address
@@ -1465,7 +1465,7 @@ nm_ip_address_set_attribute (address
  to the given value.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1504,7 +1504,7 @@ nm_ip_route_new (int famil
                  GError **error);
 
    Creates a new NMIPRoute object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1547,7 +1547,7 @@ nm_ip_route_new (int famil
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new NMIPRoute object, or NULL on error. 
    
 
    [transfer full]
    
 
    
@@ -1568,7 +1568,7 @@ nm_ip_route_new_binary (intfamily
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1611,7 +1611,7 @@ point to buffers of the correct size for family
 
 
    
-
    Returns
    
+
    Returns
    
 
     the new NMIPRoute object, or NULL on error. 
    
 
    [transfer full]
    
 
    
@@ -1623,7 +1623,7 @@ point to buffers of the correct size for familyNMIPRoute *route);
 
    Increases the reference count of the object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1646,7 +1646,7 @@ nm_ip_route_unref (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1670,7 +1670,7 @@ nm_ip_route_equal (NMIPRoute objects contain the same destination, prefix,
 next hop, and metric. (Attributes are not compared.)
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1693,7 +1693,7 @@ to.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the objects contain the same values, FALSE if they do not.
    
 
    
 
@@ -1705,7 +1705,7 @@ nm_ip_route_dup (route
 
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1720,7 +1720,7 @@ nm_ip_route_dup (
-
    Returns
    
+
    Returns
    
 
     a copy of route
 . 
    
 
    [transfer full]
    
@@ -1734,7 +1734,7 @@ nm_ip_route_get_family (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1749,7 +1749,7 @@ object.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IP address family
    
 
    
 
@@ -1760,7 +1760,7 @@ object.
    
 nm_ip_route_get_dest (NMIPRoute *route);
 
    Gets the IP destination address property of this route object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1775,7 +1775,7 @@ nm_ip_route_get_dest (
-
    Returns
    
+
    Returns
    
 
     the IP address of the route's destination
    
 
 
@@ -1791,7 +1791,7 @@ nm_ip_route_set_dest (nm_utils_ipaddr_valid() to check it.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1825,7 +1825,7 @@ nm_ip_route_get_dest_binary ([skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1859,7 +1859,7 @@ nm_ip_route_set_dest_binary ([skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1888,7 +1888,7 @@ nm_ip_route_set_dest_binary (NMIPRoute *route);
 
    Gets the IP prefix (ie "24" or "30" etc) of this route.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1903,7 +1903,7 @@ nm_ip_route_get_prefix (
-
    Returns
    
+
    Returns
    
 
     the IP prefix
    
 
 
@@ -1915,7 +1915,7 @@ nm_ip_route_set_prefix (guint prefix);
 
    Sets the prefix property of this route object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1945,7 +1945,7 @@ nm_ip_route_get_next_hop (NULL if the
 route has no next hop.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1960,7 +1960,7 @@ route has no next hop.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IP address of the next hop, or NULL if this is a device route.
    
 
    
 
@@ -1977,7 +1977,7 @@ nm_ip_route_set_next_hop (nm_utils_ipaddr_valid() to check
 it.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2011,7 +2011,7 @@ nm_ip_route_get_next_hop_binary (
 
    [skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2033,7 +2033,7 @@ nm_ip_route_get_next_hop_binary (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if route
 has a next hop, FALSE if not (in which case
 next_hop
@@ -2053,7 +2053,7 @@ nm_ip_route_set_next_hop_binary (
 
    [skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2084,7 +2084,7 @@ nm_ip_route_get_metric (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2099,7 +2099,7 @@ indicate "better" or more preferred routes; -1 indicates "default"
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the route metric
    
 
    
 
@@ -2111,7 +2111,7 @@ nm_ip_route_set_metric (gint64 metric);
 
    Sets the metric property of this route object.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2141,7 +2141,7 @@ nm_ip_route_get_attribute_names (Gets an array of attribute names defined on route
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2156,7 +2156,7 @@ nm_ip_route_get_attribute_names (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a NULL-terminated array of attribute names. 
    
 
    [transfer full]
    
 
    
@@ -2171,7 +2171,7 @@ nm_ip_route_get_attribute (route
 
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2193,7 +2193,7 @@ nm_ip_route_get_attribute (
-
    Returns
    
+
    Returns
    
 
     the value of the attribute with name name
 on
 route
@@ -2212,7 +2212,7 @@ nm_ip_route_set_attribute (route
  to the given value.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2245,7 +2245,7 @@ nm_ip_route_set_attribute (const char *
 nm_setting_ip_config_get_method (NMSettingIPConfig *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2260,7 +2260,7 @@ nm_setting_ip_config_get_method (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “method” property of the setting; see
 NMSettingIP4Config and NMSettingIP6Config for details of the
 methods available with each type.
    
@@ -2272,7 +2272,7 @@ methods available with each type.
    
 
    guint
 nm_setting_ip_config_get_num_dns (NMSettingIPConfig *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2287,7 +2287,7 @@ nm_setting_ip_config_get_num_dns (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured DNS servers
    
 
    
 
@@ -2298,7 +2298,7 @@ nm_setting_ip_config_get_num_dns (NMSettingIPConfig *setting,
                               int idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2320,7 +2320,7 @@ nm_setting_ip_config_get_dns (
-
    Returns
    
+
    Returns
    
 
     the IP address of the DNS server at index idx
 
    
 
@@ -2333,7 +2333,7 @@ nm_setting_ip_config_add_dns (const char *dns);
 
    Adds a new DNS server to the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2355,7 +2355,7 @@ nm_setting_ip_config_add_dns (
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS server was added; FALSE if the server was already
 known
    
 
@@ -2369,7 +2369,7 @@ nm_setting_ip_config_remove_dns (Removes the DNS server at index idx
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2401,7 +2401,7 @@ nm_setting_ip_config_remove_dns_by_value
 
    Removes the DNS server dns
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2423,7 +2423,7 @@ nm_setting_ip_config_remove_dns_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS server was found and removed; FALSE if it was not.
    
 
    
 
@@ -2434,7 +2434,7 @@ nm_setting_ip_config_remove_dns_by_value
 nm_setting_ip_config_clear_dns (NMSettingIPConfig *setting);
 
    Removes all configured DNS servers.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2456,7 +2456,7 @@ nm_setting_ip_config_clear_dns (NMSettingIPConfig *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2471,7 +2471,7 @@ nm_setting_ip_config_get_num_dns_searches
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured DNS search domains
    
 
    
 
@@ -2482,7 +2482,7 @@ nm_setting_ip_config_get_num_dns_searches
 nm_setting_ip_config_get_dns_search (NMSettingIPConfig *setting,
                                      int idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2504,7 +2504,7 @@ nm_setting_ip_config_get_dns_search (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the DNS search domain at index idx
 
    
 
    
@@ -2517,7 +2517,7 @@ nm_setting_ip_config_add_dns_search (const char *dns_search);
 
    Adds a new DNS search domain to the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2539,7 +2539,7 @@ nm_setting_ip_config_add_dns_search (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS search domain was added; FALSE if the search
 domain was already known
    
 
    
@@ -2554,7 +2554,7 @@ nm_setting_ip_config_remove_dns_search
 
    Removes the DNS search domain at index idx
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2586,7 +2586,7 @@ nm_setting_ip_config_remove_dns_search_by_value
 
    Removes the DNS search domain dns_search
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2608,7 +2608,7 @@ nm_setting_ip_config_remove_dns_search_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS search domain was found and removed; FALSE if it was not.
    
 
    Since 0.9.10
    
 
    
@@ -2621,7 +2621,7 @@ nm_setting_ip_config_clear_dns_searches
                                (NMSettingIPConfig *setting);
 
    Removes all configured DNS search domains.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2643,7 +2643,7 @@ nm_setting_ip_config_clear_dns_searches
 nm_setting_ip_config_get_num_dns_options
                                (NMSettingIPConfig *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -2658,7 +2658,7 @@ nm_setting_ip_config_get_num_dns_options
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured DNS options
    
 
    
 
    Since: 1.2
    
@@ -2674,7 +2674,7 @@ Either the options are explicitly set to have no values,
 or the options are left undefined. The latter means to use
 a default configuration, while the former explicitly means "no-options".
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2689,7 +2689,7 @@ a default configuration, while the former explicitly means "no-options".
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     whether DNS options are initalized or left unset (the default).
    
 
    
 
@@ -2700,7 +2700,7 @@ a default configuration, while the former explicitly means "no-options".
    
 nm_setting_ip_config_get_dns_option (NMSettingIPConfig *setting,
                                      guint idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2722,7 +2722,7 @@ nm_setting_ip_config_get_dns_option (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the DNS option at index idx
 
    
 
    
@@ -2736,7 +2736,7 @@ nm_setting_ip_config_next_valid_dns_option
                                (NMSettingIPConfig *setting,
                                 guint idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2758,7 +2758,7 @@ nm_setting_ip_config_next_valid_dns_option
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the index, greater or equal than idx
 , of the first valid
 DNS option, or -1 if no valid option is found
    
@@ -2773,7 +2773,7 @@ nm_setting_ip_config_add_dns_option (const char *dns_option);
 
    Adds a new DNS option to the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2795,7 +2795,7 @@ nm_setting_ip_config_add_dns_option (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS option was added; FALSE otherwise
    
 
    
 
    Since: 1.2
    
@@ -2810,7 +2810,7 @@ nm_setting_ip_config_remove_dns_option
 
    Removes the DNS option at index idx
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2843,7 +2843,7 @@ nm_setting_ip_config_remove_dns_option_by_value
 
    Removes the DNS option dns_option
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2865,7 +2865,7 @@ nm_setting_ip_config_remove_dns_option_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the DNS option was found and removed; FALSE if it was not.
    
 
    
 
    Since: 1.2
    
@@ -2879,7 +2879,7 @@ nm_setting_ip_config_clear_dns_options
                                 gboolean is_set);
 
    Removes all configured DNS options.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2909,7 +2909,7 @@ Specify how to clear the options.
    gint
 nm_setting_ip_config_get_dns_priority (NMSettingIPConfig *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -2924,10 +2924,10 @@ nm_setting_ip_config_get_dns_priority (
-
    Returns
    
+
    Returns
    
 
     the priority of DNS servers
    
 
-
    Since: 1.2.4
    
+
    Since: 1.4
    
 
 
    
 
    
@@ -2936,7 +2936,7 @@ nm_setting_ip_config_get_dns_priority (NMSettingIPConfig *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2951,7 +2951,7 @@ nm_setting_ip_config_get_num_addresses
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured addresses
    
 
    
 
    
@@ -2962,7 +2962,7 @@ nm_setting_ip_config_get_num_addresses
 nm_setting_ip_config_get_address (NMSettingIPConfig *setting,
                                   int idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2984,7 +2984,7 @@ nm_setting_ip_config_get_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the address at index idx
 . 
    
 
    [transfer none]
    
@@ -2999,7 +2999,7 @@ nm_setting_ip_config_add_address (Adds a new IP address and associated information to the setting.  The
 given address is duplicated internally and is not changed by this function.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -3021,7 +3021,7 @@ given address is duplicated internally and is not changed by this function.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the address was added; FALSE if the address was already
 known.
    
 
    
@@ -3035,7 +3035,7 @@ nm_setting_ip_config_remove_address (Removes the address at index idx
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3067,7 +3067,7 @@ nm_setting_ip_config_remove_address_by_value
 
    Removes the address address
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -3089,7 +3089,7 @@ nm_setting_ip_config_remove_address_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the address was found and removed; FALSE if it was not.
    
 
    
 
@@ -3100,7 +3100,7 @@ nm_setting_ip_config_remove_address_by_value
 nm_setting_ip_config_clear_addresses (NMSettingIPConfig *setting);
 
    Removes all configured addresses.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3121,7 +3121,7 @@ nm_setting_ip_config_clear_addresses (const char *
 nm_setting_ip_config_get_gateway (NMSettingIPConfig *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -3136,7 +3136,7 @@ nm_setting_ip_config_get_gateway (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the IP address of the gateway associated with this configuration, or
 NULL.
    
 
    
@@ -3147,7 +3147,7 @@ nm_setting_ip_config_get_gateway (guint
 nm_setting_ip_config_get_num_routes (NMSettingIPConfig *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -3162,7 +3162,7 @@ nm_setting_ip_config_get_num_routes (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the number of configured routes
    
 
    
 
@@ -3173,7 +3173,7 @@ nm_setting_ip_config_get_num_routes (NMSettingIPConfig *setting,
                                 int idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -3195,7 +3195,7 @@ nm_setting_ip_config_get_route (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the route at index idx
 . 
    
 
    [transfer none]
    
@@ -3210,7 +3210,7 @@ nm_setting_ip_config_add_route (Adds a new route and associated information to the setting.  The
 given route is duplicated internally and is not changed by this function.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -3232,7 +3232,7 @@ given route is duplicated internally and is not changed by this function.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the route was added; FALSE if the route was already known.
    
 
    
 
@@ -3245,7 +3245,7 @@ nm_setting_ip_config_remove_route (Removes the route at index idx
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3277,7 +3277,7 @@ nm_setting_ip_config_remove_route_by_value
 
    Removes the route route
 .
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -3299,7 +3299,7 @@ nm_setting_ip_config_remove_route_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the route was found and removed; FALSE if it was not.
    
 
    
 
@@ -3310,7 +3310,7 @@ nm_setting_ip_config_remove_route_by_value
 nm_setting_ip_config_clear_routes (NMSettingIPConfig *setting);
 
    Removes all configured routes.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3333,7 +3333,7 @@ nm_setting_ip_config_get_route_metric (“route-metric”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -3348,7 +3348,7 @@ property.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the route metric that is used for routes that don't explicitly
 specify a metric. See “route-metric” for more details.
    
 
    
@@ -3362,7 +3362,7 @@ nm_setting_ip_config_get_ignore_auto_routes
 
    Returns the value contained in the “ignore-auto-routes”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3377,7 +3377,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if automatically configured (ie via DHCP) routes should be
 ignored.
    
 
    
@@ -3391,7 +3391,7 @@ nm_setting_ip_config_get_ignore_auto_dns
 
    Returns the value contained in the “ignore-auto-dns”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3406,7 +3406,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if automatically configured (ie via DHCP) DNS information
 should be ignored.
    
 
    
@@ -3420,7 +3420,7 @@ nm_setting_ip_config_get_dhcp_hostname
 
    Returns the value contained in the “dhcp-hostname”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3435,7 +3435,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the configured hostname to send to the DHCP server
    
 
    
 
@@ -3448,7 +3448,7 @@ nm_setting_ip_config_get_dhcp_send_hostname
 
    Returns the value contained in the “dhcp-send-hostname”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3463,7 +3463,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     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.
    
@@ -3478,7 +3478,7 @@ nm_setting_ip_config_get_never_default
 
    Returns the value contained in the “never-default”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3493,7 +3493,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if this connection should never be the default
 connection
    
 
    
@@ -3506,7 +3506,7 @@ nm_setting_ip_config_get_may_fail (Returns the value contained in the “may-fail”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3521,7 +3521,7 @@ property.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if this connection doesn't require this type of IP
 addressing to complete for the connection to succeed.
    
 
    
@@ -3532,7 +3532,7 @@ addressing to complete for the connection to succeed.
    
 
    gint
 nm_setting_ip_config_get_dad_timeout (NMSettingIPConfig *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -3547,7 +3547,7 @@ nm_setting_ip_config_get_dad_timeout (
-
    Returns
    
+
    Returns
    
 
     the “dad-timeout” property.
    
 
 
    Since: 1.2
    
@@ -3560,7 +3560,7 @@ nm_setting_ip_config_get_dhcp_timeout (“dhcp-timeout”
 property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -3575,7 +3575,7 @@ property.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the configured DHCP timeout in seconds. 0 = default for
 the particular kind of device.
    
 
    
@@ -3879,7 +3879,7 @@ priority, only DNS servers from configurations with the lowest priority
 value will be used.
    
 
    Flags: Read / Write / Construct
    
 
    Default value: 0
    
-
    Since: 1.2.4
    
+
    Since: 1.4
    
 
    
 
    
 
    
@@ -3996,6 +3996,6 @@ For IPv4, zero is a regular value for the metric.
    
 
    
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIPTunnel.html b/docs/libnm/html/NMSettingIPTunnel.html
index d3147dda..b6e323bb 100644
--- a/docs/libnm/html/NMSettingIPTunnel.html
+++ b/docs/libnm/html/NMSettingIPTunnel.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -305,7 +305,7 @@
 nm_setting_ip_tunnel_new (void);
 
    Creates a new NMSettingIPTunnel object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingIPTunnel object. 
    
 
    [transfer full]
    
 
    
@@ -318,7 +318,7 @@ nm_setting_ip_tunnel_new (void    NMSettingIPTunnel *setting);
 
    Returns the “parent” property of the setting
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -333,7 +333,7 @@ nm_setting_ip_tunnel_get_parent (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the parent device
    
 
    
 
    Since: 1.2
    
@@ -345,7 +345,7 @@ nm_setting_ip_tunnel_get_parent (NMSettingIPTunnel *setting);
 
    Returns the “mode” property of the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -360,7 +360,7 @@ nm_setting_ip_tunnel_get_mode (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the tunnel mode
    
 
    
 
    Since: 1.2
    
@@ -372,7 +372,7 @@ nm_setting_ip_tunnel_get_mode (NMSettingIPTunnel *setting);
 
    Returns the “local” property of the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -387,7 +387,7 @@ nm_setting_ip_tunnel_get_local (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the local endpoint
    
 
    
 
    Since: 1.2
    
@@ -399,7 +399,7 @@ nm_setting_ip_tunnel_get_local (NMSettingIPTunnel *setting);
 
    Returns the “remote” property of the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -414,7 +414,7 @@ nm_setting_ip_tunnel_get_remote (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the remote endpoint
    
 
    
 
    Since: 1.2
    
@@ -426,7 +426,7 @@ nm_setting_ip_tunnel_get_remote (NMSettingIPTunnel *setting);
 
    Returns the “ttl” property of the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -441,7 +441,7 @@ nm_setting_ip_tunnel_get_ttl (
-
    Returns
    
+
    Returns
    
 
     the Time-to-live value
    
 
 
    Since: 1.2
    
@@ -453,7 +453,7 @@ nm_setting_ip_tunnel_get_ttl (NMSettingIPTunnel *setting);
 
    Returns the “tos” property of the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -468,7 +468,7 @@ nm_setting_ip_tunnel_get_tos (
-
    Returns
    
+
    Returns
    
 
     the TOS value
    
 
 
    Since: 1.2
    
@@ -481,7 +481,7 @@ nm_setting_ip_tunnel_get_path_mtu_discovery
                                (NMSettingIPTunnel *setting);
 
    Returns the “path-mtu-discovery” property of the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -496,7 +496,7 @@ nm_setting_ip_tunnel_get_path_mtu_discovery
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     whether path MTU discovery is enabled
    
 
    
 
    Since: 1.2
    
@@ -508,7 +508,7 @@ nm_setting_ip_tunnel_get_path_mtu_discovery
 nm_setting_ip_tunnel_get_input_key (NMSettingIPTunnel *setting);
 
    Returns the “input-key” property of the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -523,7 +523,7 @@ nm_setting_ip_tunnel_get_input_key (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the input key
    
 
    
 
    Since: 1.2
    
@@ -535,7 +535,7 @@ nm_setting_ip_tunnel_get_input_key (NMSettingIPTunnel *setting);
 
    Returns the “output-key” property of the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -550,7 +550,7 @@ nm_setting_ip_tunnel_get_output_key (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the output key
    
 
    
 
    Since: 1.2
    
@@ -563,7 +563,7 @@ nm_setting_ip_tunnel_get_encapsulation_limit
                                (NMSettingIPTunnel *setting);
 
    Returns the “encapsulation-limit” property of the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -578,7 +578,7 @@ nm_setting_ip_tunnel_get_encapsulation_limit
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the encapsulation limit value
    
 
    
 
    Since: 1.2
    
@@ -590,7 +590,7 @@ nm_setting_ip_tunnel_get_encapsulation_limit
 nm_setting_ip_tunnel_get_flow_label (NMSettingIPTunnel *setting);
 
    Returns the “flow-label” property of the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -605,7 +605,7 @@ nm_setting_ip_tunnel_get_flow_label (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the flow label value
    
 
    
 
    Since: 1.2
    
@@ -617,7 +617,7 @@ nm_setting_ip_tunnel_get_flow_label (NMSettingIPTunnel *setting);
 
    Returns the “mtu” property of the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -632,7 +632,7 @@ nm_setting_ip_tunnel_get_mtu (
-
    Returns
    
+
    Returns
    
 
     the MTU
    
 
 
    Since: 1.2
    
@@ -848,6 +848,6 @@ packets inherit the TTL value.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingInfiniband.html b/docs/libnm/html/NMSettingInfiniband.html
index 5aa72bd5..8e474327 100644
--- a/docs/libnm/html/NMSettingInfiniband.html
+++ b/docs/libnm/html/NMSettingInfiniband.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -195,7 +195,7 @@ necessary for connection to IP-over-InfiniBand networks.
    
 nm_setting_infiniband_new (void);
 
    Creates a new NMSettingInfiniband object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingInfiniband object. 
    
 
    [transfer full]
    
 
    
@@ -206,7 +206,7 @@ nm_setting_infiniband_new (voidconst char *
 nm_setting_infiniband_get_mac_address (NMSettingInfiniband *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -221,7 +221,7 @@ nm_setting_infiniband_get_mac_address (
-
    Returns
    
+
    Returns
    
 
     the “mac-address” property of the setting
    
 
 
@@ -231,7 +231,7 @@ nm_setting_infiniband_get_mac_address (guint32
 nm_setting_infiniband_get_mtu (NMSettingInfiniband *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -246,7 +246,7 @@ nm_setting_infiniband_get_mtu (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “mtu” property of the setting
    
 
    
 
@@ -259,7 +259,7 @@ nm_setting_infiniband_get_transport_mode
 
    Returns the transport mode for this device. Either 'datagram' or
 'connected'.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -274,7 +274,7 @@ nm_setting_infiniband_get_transport_mode
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IPoIB transport mode
    
 
    
 
@@ -287,7 +287,7 @@ nm_setting_infiniband_get_p_key (
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -302,7 +302,7 @@ a 16-bit unsigned integer.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the IPoIB P_Key
    
 
    
 
@@ -313,7 +313,7 @@ a 16-bit unsigned integer.
    
 nm_setting_infiniband_get_parent (NMSettingInfiniband *setting);
 
    Returns the parent interface name for this device, if set.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -328,7 +328,7 @@ nm_setting_infiniband_get_parent (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the parent interface name
    
 
    
 
@@ -342,7 +342,7 @@ nm_setting_infiniband_get_virtual_interface_name
 and “p-key”. (If either property is unset, this will
 return NULL.)
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -357,7 +357,7 @@ return NULL.)
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the interface name, or NULL
    
 
    
 
@@ -460,6 +460,6 @@ specify the base device by setting either this property or
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    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 d924b0f9..71fa1bcf 100644
--- a/docs/libnm/html/NMSettingMacvlan.html
+++ b/docs/libnm/html/NMSettingMacvlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -177,7 +177,7 @@ necessary for connection to macvlan interfaces.
    
 nm_setting_macvlan_new (void);
 
    Creates a new NMSettingMacvlan object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingMacvlan object. 
    
 
    [transfer full]
    
 
    
@@ -189,7 +189,7 @@ nm_setting_macvlan_new (voidconst char *
 nm_setting_macvlan_get_parent (NMSettingMacvlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -204,7 +204,7 @@ nm_setting_macvlan_get_parent (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “parent” property of the setting
    
 
    
 
    Since: 1.2
    
@@ -215,7 +215,7 @@ nm_setting_macvlan_get_parent (NMSettingMacvlanMode
 nm_setting_macvlan_get_mode (NMSettingMacvlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -230,7 +230,7 @@ nm_setting_macvlan_get_mode (
-
    Returns
    
+
    Returns
    
 
     the “mode” property of the setting
    
 
 
    Since: 1.2
    
@@ -241,7 +241,7 @@ nm_setting_macvlan_get_mode (gboolean
 nm_setting_macvlan_get_promiscuous (NMSettingMacvlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -256,7 +256,7 @@ nm_setting_macvlan_get_promiscuous (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “promiscuous” property of the setting
    
 
    
 
    Since: 1.2
    
@@ -267,7 +267,7 @@ nm_setting_macvlan_get_promiscuous (gboolean
 nm_setting_macvlan_get_tap (NMSettingMacvlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -282,7 +282,7 @@ nm_setting_macvlan_get_tap (
-
    Returns
    
+
    Returns
    
 
     the “tap” property of the setting
    
 
 
    Since: 1.2
    
@@ -328,7 +328,7 @@ nm_setting_macvlan_get_tap (
 
    enum NMSettingMacvlanMode
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -437,6 +437,6 @@ with a 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingOlpcMesh.html b/docs/libnm/html/NMSettingOlpcMesh.html
index 900ed774..3b5d1ee8 100644
--- a/docs/libnm/html/NMSettingOlpcMesh.html
+++ b/docs/libnm/html/NMSettingOlpcMesh.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -155,7 +155,7 @@ necessary for connection to OLPC-Mesh devices.
    
 nm_setting_olpc_mesh_new (void);
 
    Creates a new NMSettingOlpcMesh object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingOlpcMesh object
    
 
    
 
@@ -165,7 +165,7 @@ nm_setting_olpc_mesh_new (voidGBytes *
 nm_setting_olpc_mesh_get_ssid (NMSettingOlpcMesh *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -180,7 +180,7 @@ nm_setting_olpc_mesh_get_ssid (
 
 
    
-
    Returns
    
+
    Returns
    
 
    . 
    
 
    [transfer none]
    
 
    
@@ -259,6 +259,6 @@ answers the request.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingPpp.html b/docs/libnm/html/NMSettingPpp.html
index 78e3148f..7f64f3de 100644
--- a/docs/libnm/html/NMSettingPpp.html
+++ b/docs/libnm/html/NMSettingPpp.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -411,7 +411,7 @@ cable and DSL modems and some mobile broadband devices.
    
 nm_setting_ppp_new (void);
 
    Creates a new NMSettingPpp object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingPpp object. 
    
 
    [transfer full]
    
 
    
@@ -422,7 +422,7 @@ nm_setting_ppp_new (voidgboolean
 nm_setting_ppp_get_noauth (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -437,7 +437,7 @@ nm_setting_ppp_get_noauth (
-
    Returns
    
+
    Returns
    
 
     the “noauth” property of the setting
    
 
 
@@ -447,7 +447,7 @@ nm_setting_ppp_get_noauth (gboolean
 nm_setting_ppp_get_refuse_eap (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -462,7 +462,7 @@ nm_setting_ppp_get_refuse_eap (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “refuse-eap” property of the setting
    
 
    
 
@@ -472,7 +472,7 @@ nm_setting_ppp_get_refuse_eap (gboolean
 nm_setting_ppp_get_refuse_pap (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -487,7 +487,7 @@ nm_setting_ppp_get_refuse_pap (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “refuse-pap” property of the setting
    
 
    
 
@@ -497,7 +497,7 @@ nm_setting_ppp_get_refuse_pap (gboolean
 nm_setting_ppp_get_refuse_chap (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -512,7 +512,7 @@ nm_setting_ppp_get_refuse_chap (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “refuse-chap” property of the setting
    
 
    
 
@@ -522,7 +522,7 @@ nm_setting_ppp_get_refuse_chap (gboolean
 nm_setting_ppp_get_refuse_mschap (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -537,7 +537,7 @@ nm_setting_ppp_get_refuse_mschap (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “refuse-mschap” property of the setting
    
 
    
 
@@ -547,7 +547,7 @@ nm_setting_ppp_get_refuse_mschap (gboolean
 nm_setting_ppp_get_refuse_mschapv2 (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -562,7 +562,7 @@ nm_setting_ppp_get_refuse_mschapv2 (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “refuse-mschapv2” property of the setting
    
 
    
 
@@ -572,7 +572,7 @@ nm_setting_ppp_get_refuse_mschapv2 (gboolean
 nm_setting_ppp_get_nobsdcomp (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -587,7 +587,7 @@ nm_setting_ppp_get_nobsdcomp (
-
    Returns
    
+
    Returns
    
 
     the “nobsdcomp” property of the setting
    
 
 
@@ -597,7 +597,7 @@ nm_setting_ppp_get_nobsdcomp (gboolean
 nm_setting_ppp_get_nodeflate (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -612,7 +612,7 @@ nm_setting_ppp_get_nodeflate (
-
    Returns
    
+
    Returns
    
 
     the “nodeflate” property of the setting
    
 
 
@@ -622,7 +622,7 @@ nm_setting_ppp_get_nodeflate (gboolean
 nm_setting_ppp_get_no_vj_comp (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -637,7 +637,7 @@ nm_setting_ppp_get_no_vj_comp (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “no-vj-comp” property of the setting
    
 
    
 
@@ -647,7 +647,7 @@ nm_setting_ppp_get_no_vj_comp (gboolean
 nm_setting_ppp_get_require_mppe (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -662,7 +662,7 @@ nm_setting_ppp_get_require_mppe (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “require-mppe” property of the setting
    
 
    
 
@@ -672,7 +672,7 @@ nm_setting_ppp_get_require_mppe (gboolean
 nm_setting_ppp_get_require_mppe_128 (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -687,7 +687,7 @@ nm_setting_ppp_get_require_mppe_128 (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “require-mppe-128” property of the setting
    
 
    
 
@@ -697,7 +697,7 @@ nm_setting_ppp_get_require_mppe_128 (gboolean
 nm_setting_ppp_get_mppe_stateful (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -712,7 +712,7 @@ nm_setting_ppp_get_mppe_stateful (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “mppe-stateful” property of the setting
    
 
    
 
@@ -722,7 +722,7 @@ nm_setting_ppp_get_mppe_stateful (gboolean
 nm_setting_ppp_get_crtscts (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -737,7 +737,7 @@ nm_setting_ppp_get_crtscts (
-
    Returns
    
+
    Returns
    
 
     the “crtscts” property of the setting
    
 
 
@@ -747,7 +747,7 @@ nm_setting_ppp_get_crtscts (guint32
 nm_setting_ppp_get_baud (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -762,7 +762,7 @@ nm_setting_ppp_get_baud (
-
    Returns
    
+
    Returns
    
 
     the “baud” property of the setting
    
 
 
@@ -772,7 +772,7 @@ nm_setting_ppp_get_baud (guint32
 nm_setting_ppp_get_mru (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -787,7 +787,7 @@ nm_setting_ppp_get_mru (
-
    Returns
    
+
    Returns
    
 
     the “mru” property of the setting
    
 
 
@@ -797,7 +797,7 @@ nm_setting_ppp_get_mru (guint32
 nm_setting_ppp_get_mtu (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -812,7 +812,7 @@ nm_setting_ppp_get_mtu (
-
    Returns
    
+
    Returns
    
 
     the “mtu” property of the setting
    
 
 
@@ -822,7 +822,7 @@ nm_setting_ppp_get_mtu (guint32
 nm_setting_ppp_get_lcp_echo_failure (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -837,7 +837,7 @@ nm_setting_ppp_get_lcp_echo_failure (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “lcp-echo-failure” property of the setting
    
 
    
 
@@ -847,7 +847,7 @@ nm_setting_ppp_get_lcp_echo_failure (guint32
 nm_setting_ppp_get_lcp_echo_interval (NMSettingPpp *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -862,7 +862,7 @@ nm_setting_ppp_get_lcp_echo_interval (
-
    Returns
    
+
    Returns
    
 
     the “lcp-echo-interval” property of the setting
    
 
 
@@ -1158,6 +1158,6 @@ be set to TRUE.  If 128-bit MPPE is not available t
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingPppoe.html b/docs/libnm/html/NMSettingPppoe.html
index 571c7f95..fde987d2 100644
--- a/docs/libnm/html/NMSettingPppoe.html
+++ b/docs/libnm/html/NMSettingPppoe.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -172,7 +172,7 @@ to provide IP transport, for example cable or DSL modems.
    
 nm_setting_pppoe_new (void);
 
    Creates a new NMSettingPppoe object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingPppoe object. 
    
 
    [transfer full]
    
 
    
@@ -183,7 +183,7 @@ nm_setting_pppoe_new (void
 
    const char *
 nm_setting_pppoe_get_service (NMSettingPppoe *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -198,7 +198,7 @@ nm_setting_pppoe_get_service (
-
    Returns
    
+
    Returns
    
 
     the “service” property of the setting
    
 
 
@@ -208,7 +208,7 @@ nm_setting_pppoe_get_service (const char *
 nm_setting_pppoe_get_username (NMSettingPppoe *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -223,7 +223,7 @@ nm_setting_pppoe_get_username (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “username” property of the setting
    
 
    
 
@@ -233,7 +233,7 @@ nm_setting_pppoe_get_username (const char *
 nm_setting_pppoe_get_password (NMSettingPppoe *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -248,7 +248,7 @@ nm_setting_pppoe_get_password (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “password” property of the setting
    
 
    
 
@@ -258,7 +258,7 @@ nm_setting_pppoe_get_password (NMSettingSecretFlags
 nm_setting_pppoe_get_password_flags (NMSettingPppoe *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -273,7 +273,7 @@ nm_setting_pppoe_get_password_flags (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the “password”
    
 
    
 
@@ -353,6 +353,6 @@ access concentrators or a specific service is known to be required.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html
index b31f0715..75f8f1a0 100644
--- a/docs/libnm/html/NMSettingSerial.html
+++ b/docs/libnm/html/NMSettingSerial.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -196,7 +196,7 @@ such as mobile broadband or analog telephone connections.
    
 nm_setting_serial_new (void);
 
    Creates a new NMSettingSerial object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingSerial object. 
    
 
    [transfer full]
    
 
    
@@ -207,7 +207,7 @@ nm_setting_serial_new (voidguint
 nm_setting_serial_get_baud (NMSettingSerial *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -222,7 +222,7 @@ nm_setting_serial_get_baud (
-
    Returns
    
+
    Returns
    
 
     the “baud” property of the setting
    
 
 
@@ -232,7 +232,7 @@ nm_setting_serial_get_baud (guint
 nm_setting_serial_get_bits (NMSettingSerial *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -247,7 +247,7 @@ nm_setting_serial_get_bits (
-
    Returns
    
+
    Returns
    
 
     the “bits” property of the setting
    
 
 
@@ -257,7 +257,7 @@ nm_setting_serial_get_bits (NMSettingSerialParity
 nm_setting_serial_get_parity (NMSettingSerial *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -272,7 +272,7 @@ nm_setting_serial_get_parity (
-
    Returns
    
+
    Returns
    
 
     the “parity” property of the setting
    
 
 
@@ -282,7 +282,7 @@ nm_setting_serial_get_parity (guint
 nm_setting_serial_get_stopbits (NMSettingSerial *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -297,7 +297,7 @@ nm_setting_serial_get_stopbits (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “stopbits” property of the setting
    
 
    
 
@@ -307,7 +307,7 @@ nm_setting_serial_get_stopbits (guint64
 nm_setting_serial_get_send_delay (NMSettingSerial *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -322,7 +322,7 @@ nm_setting_serial_get_send_delay (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “send-delay” property of the setting
    
 
    
 
@@ -339,7 +339,7 @@ nm_setting_serial_get_send_delay (
    enum NMSettingSerialParity
    
 
    The parity setting of a serial port.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -457,6 +457,6 @@ The 1 in "8n1" for example.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index c1a62a83..b21ef120 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -118,7 +118,7 @@ necessary for team connections.
    
 nm_setting_team_new (void);
 
    Creates a new NMSettingTeam object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingTeam object. 
    
 
    [transfer full]
    
 
    
@@ -129,7 +129,7 @@ nm_setting_team_new (void<
 
    const char *
 nm_setting_team_get_config (NMSettingTeam *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -144,7 +144,7 @@ nm_setting_team_get_config (
-
    Returns
    
+
    Returns
    
 
     the “config” property of the setting
    
 
 
@@ -183,6 +183,6 @@ configuration is used.  See man teamd.conf for the format details.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html
index 5bc4544a..e6ebf299 100644
--- a/docs/libnm/html/NMSettingTeamPort.html
+++ b/docs/libnm/html/NMSettingTeamPort.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -118,7 +118,7 @@ optional properties that apply to team ports.
    
 nm_setting_team_port_new (void);
 
    Creates a new NMSettingTeamPort object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingTeamPort object. 
    
 
    [transfer full]
    
 
    
@@ -129,7 +129,7 @@ nm_setting_team_port_new (voidconst char *
 nm_setting_team_port_get_config (NMSettingTeamPort *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -144,7 +144,7 @@ nm_setting_team_port_get_config (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “config” property of the setting
    
 
    
 
@@ -183,6 +183,6 @@ used. See man teamd.conf for the format details.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTun.html b/docs/libnm/html/NMSettingTun.html
index 41837ea7..0a711b49 100644
--- a/docs/libnm/html/NMSettingTun.html
+++ b/docs/libnm/html/NMSettingTun.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -211,7 +211,7 @@ necessary for connection to TUN/TAP interfaces.
    
 nm_setting_tun_new (void);
 
    Creates a new NMSettingTun object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingTun object. 
    
 
    [transfer full]
    
 
    
@@ -223,7 +223,7 @@ nm_setting_tun_new (voidNMSettingTunMode
 nm_setting_tun_get_mode (NMSettingTun *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -238,7 +238,7 @@ nm_setting_tun_get_mode (
-
    Returns
    
+
    Returns
    
 
     the “mode” property of the setting
    
 
 
    Since: 1.2
    
@@ -249,7 +249,7 @@ nm_setting_tun_get_mode (const char *
 nm_setting_tun_get_owner (NMSettingTun *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -264,7 +264,7 @@ nm_setting_tun_get_owner (
-
    Returns
    
+
    Returns
    
 
     the “owner” property of the setting
    
 
 
    Since: 1.2
    
@@ -275,7 +275,7 @@ nm_setting_tun_get_owner (const char *
 nm_setting_tun_get_group (NMSettingTun *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -290,7 +290,7 @@ nm_setting_tun_get_group (
-
    Returns
    
+
    Returns
    
 
     the “group” property of the setting
    
 
 
    Since: 1.2
    
@@ -301,7 +301,7 @@ nm_setting_tun_get_group (gboolean
 nm_setting_tun_get_pi (NMSettingTun *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -316,7 +316,7 @@ nm_setting_tun_get_pi (
-
    Returns
    
+
    Returns
    
 
     the “pi” property of the setting
    
 
 
    Since: 1.2
    
@@ -327,7 +327,7 @@ nm_setting_tun_get_pi (gboolean
 nm_setting_tun_get_vnet_hdr (NMSettingTun *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -342,7 +342,7 @@ nm_setting_tun_get_vnet_hdr (
-
    Returns
    
+
    Returns
    
 
     the “vnet_hdr” property of the setting
    
 
 
    Since: 1.2
    
@@ -353,7 +353,7 @@ nm_setting_tun_get_vnet_hdr (gboolean
 nm_setting_tun_get_multi_queue (NMSettingTun *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -368,7 +368,7 @@ nm_setting_tun_get_multi_queue (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “multi-queue” property of the setting
    
 
    
 
    Since: 1.2
    
@@ -422,7 +422,7 @@ nm_setting_tun_get_multi_queue (
    enum NMSettingTunMode
    
 
    NMSettingTunMode values indicate the device type (TUN/TAP)
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -529,6 +529,6 @@ network header.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index 25807d63..4e12fc59 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -42,10 +42,6 @@
 
     
-
-
-
-
@@ -225,6 +221,10 @@
 
+
+
+
+
    
 
 

 
    #defineNM_VLAN_FLAGS_ALL
    
 
 NMSetting *
 enum
 NMVlanFlags
 
    #defineNM_VLAN_FLAGS_ALL
    
     
 
    
 
    
@@ -247,17 +247,12 @@ necessary for connection to VLAN interfaces.
    
 
    
 
    Functions
    
 
    
-
    NM_VLAN_FLAGS_ALL
    
-
    #define             NM_VLAN_FLAGS_ALL
    
-
    
-
    
-
    
 
    nm_setting_vlan_new ()
    
 
    NMSetting *
 nm_setting_vlan_new (void);
    
 
    Creates a new NMSettingVlan object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingVlan object. 
    
 
    [transfer full]
    
 
    
@@ -268,7 +263,7 @@ nm_setting_vlan_new (void<
 
    const char *
 nm_setting_vlan_get_parent (NMSettingVlan *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -283,7 +278,7 @@ nm_setting_vlan_get_parent (
-
    Returns
    
+
    Returns
    
 
     the “parent” property of the setting
    
 
 
@@ -293,7 +288,7 @@ nm_setting_vlan_get_parent (guint32
 nm_setting_vlan_get_id (NMSettingVlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -308,7 +303,7 @@ nm_setting_vlan_get_id (
-
    Returns
    
+
    Returns
    
 
     the “id” property of the setting
    
 
 
@@ -318,7 +313,7 @@ nm_setting_vlan_get_id (guint32
 nm_setting_vlan_get_flags (NMSettingVlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -333,7 +328,7 @@ nm_setting_vlan_get_flags (
-
    Returns
    
+
    Returns
    
 
     the “flags” property of the setting
    
 
 
@@ -347,7 +342,7 @@ nm_setting_vlan_get_num_priorities (“ingress_priority_map” or “egress_priority_map”
 properties of this setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -369,7 +364,7 @@ properties of this setting.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     return the number of ingress/egress priority entries, -1 if error
    
 
    
 
    
@@ -385,7 +380,7 @@ nm_setting_vlan_get_priority (“ingress_priority_map”
 or “egress_priority_map” properties of this setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -422,7 +417,7 @@ or 
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if a priority map was returned, FALSE if error
    
 
    
@@ -451,7 +446,7 @@ Priority Code Point (PCP) value, and toto
  is the outgoing 802.1q VLAN Priority Code Point (PCP) value.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
    @@ -485,7 +480,7 @@ to
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the new priority mapping was successfully added to the
 list, FALSE if error
    
 
    
@@ -502,7 +497,7 @@ nm_setting_vlan_remove_priority (“ingress_priority_map” or “egress_priority_map”
 properties.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -545,7 +540,7 @@ or 
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -579,7 +574,7 @@ to
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the priority mapping was found and removed; FALSE if it was not.
    
 
    
 
    
@@ -597,7 +592,7 @@ or 
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -624,7 +619,7 @@ properties.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the priority mapping was found and removed; FALSE if it was not.
    
 
    
 
@@ -637,7 +632,7 @@ nm_setting_vlan_clear_priorities (Clear all the entires from “ingress_priority_map” or
 “egress_priority_map” properties.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -670,7 +665,7 @@ nm_setting_vlan_add_priority_str (“egress_priority_map” properties.  The priority map maps
 the Linux SKB priorities to 802.1p priorities.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -697,7 +692,7 @@ the Linux SKB priorities to 802.1p priorities.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the entry was successfully added to the list, or it
 overwrote the old value, FALSE if error
    
 
    
@@ -751,7 +746,7 @@ overwrote the old value, FALSE if error
    
 
    A selector for traffic priority maps; these map Linux SKB priorities
 to 802.1p priorities used in VLANs.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -782,7 +777,7 @@ to 802.1p priorities used in VLANs.
    enum NMVlanFlags
    NMVlanFlags values control the behavior of the VLAN interface.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -827,6 +822,11 @@ to 802.1p priorities used in VLANs.
    
 
 

 
    
 
    
 
+
    
+
    
+
    NM_VLAN_FLAGS_ALL
    
+
    #define             NM_VLAN_FLAGS_ALL
    
+
    
 
 
    
 
    Property Details
    
@@ -888,6 +888,6 @@ with a 
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html
index 047769d6..c9eff973 100644
--- a/docs/libnm/html/NMSettingVpn.html
+++ b/docs/libnm/html/NMSettingVpn.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -283,7 +283,7 @@ properties.
    
                   const char *value,
                   gpointer user_data);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -318,7 +318,7 @@ properties.
    
 nm_setting_vpn_new (void);
    Creates a new NMSettingVpn object with default values.
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingVpn object. 
    
 
    [transfer full]
    
 
    
@@ -331,7 +331,7 @@ nm_setting_vpn_get_service_type (Returns the service name of the VPN, which identifies the specific VPN
 plugin that should be used to connect to this VPN.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -346,7 +346,7 @@ plugin that should be used to connect to this VPN.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the VPN plugin's service name
    
 
    
 
@@ -356,7 +356,7 @@ plugin that should be used to connect to this VPN.
    
 
    const char *
 nm_setting_vpn_get_user_name (NMSettingVpn *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -371,7 +371,7 @@ nm_setting_vpn_get_user_name (
-
    Returns
    
+
    Returns
    
 
     the “user-name” property of the setting
    
 
 
@@ -381,7 +381,7 @@ nm_setting_vpn_get_user_name (gboolean
 nm_setting_vpn_get_persistent (NMSettingVpn *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -396,7 +396,7 @@ nm_setting_vpn_get_persistent (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “persistent” property of the setting
    
 
    
 
@@ -407,7 +407,7 @@ nm_setting_vpn_get_persistent (NMSettingVpn *setting);
 
    Gets number of key/value pairs of VPN configuration data.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -422,7 +422,7 @@ nm_setting_vpn_get_num_data_items (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the number of VPN plugin specific configuration data items
    
 
    
 
@@ -439,7 +439,7 @@ nm_setting_vpn_add_data_item (nm_setting_vpn_add_secret() is for.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -477,7 +477,7 @@ nm_setting_vpn_get_data_item (nm_setting_vpn_add_data_item().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -499,7 +499,7 @@ by 
-
    Returns
    
+
    Returns
    
 
     the data item, if any
    
 
 
@@ -512,7 +512,7 @@ nm_setting_vpn_remove_data_item (Deletes a key/value relationship previously established by
 nm_setting_vpn_add_data_item().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -534,7 +534,7 @@ nm_setting_vpn_remove_data_item (
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the data item was found and removed from the internal list,
 FALSE if it was not.
    
 
    
@@ -551,7 +551,7 @@ and modify data items inside func
 , though any additions or removals made
 during iteration will not be part of the iteration.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -586,7 +586,7 @@ during iteration will not be part of the iteration.
    
 nm_setting_vpn_get_num_secrets (NMSettingVpn *setting);
 
    Gets number of VPN plugin specific secrets in the setting.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -601,7 +601,7 @@ nm_setting_vpn_get_num_secrets (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the number of VPN plugin specific secrets
    
 
    
 
@@ -617,7 +617,7 @@ nm_setting_vpn_add_secret (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -655,7 +655,7 @@ nm_setting_vpn_get_secret (nm_setting_vpn_add_secret().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -677,7 +677,7 @@ by 
-
    Returns
    
+
    Returns
    
 
     the secret, if any
    
 
 
@@ -690,7 +690,7 @@ nm_setting_vpn_remove_secret (nm_setting_vpn_add_secret().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -712,7 +712,7 @@ nm_setting_vpn_remove_secret (
-
    Returns
    
+
    Returns
    
 
     TRUE if the secret was found and removed from the internal list,
 FALSE if it was not.
    
 
@@ -729,7 +729,7 @@ and modify secrets inside func
 , though any additions or removals made during
 iteration will not be part of the iteration.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -763,7 +763,7 @@ iteration will not be part of the iteration.
    
 
    guint32
 nm_setting_vpn_get_timeout (NMSettingVpn *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -778,7 +778,7 @@ nm_setting_vpn_get_timeout (
-
    Returns
    
+
    Returns
    
 
     the “timeout” property of the setting
    
 
 
    Since: 1.2
    
@@ -901,6 +901,6 @@ VPN connection.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingVxlan.html b/docs/libnm/html/NMSettingVxlan.html
index c3189428..c8012196 100644
--- a/docs/libnm/html/NMSettingVxlan.html
+++ b/docs/libnm/html/NMSettingVxlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -375,7 +375,7 @@ necessary for connection to VXLAN interfaces.
    
 nm_setting_vxlan_new (void);
 
    Creates a new NMSettingVxlan object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingVxlan object. 
    
 
    [transfer full]
    
 
    
@@ -387,7 +387,7 @@ nm_setting_vxlan_new (void
 
    const char *
 nm_setting_vxlan_get_parent (NMSettingVxlan *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -402,7 +402,7 @@ nm_setting_vxlan_get_parent (
-
    Returns
    
+
    Returns
    
 
     the “parent” property of the setting
    
 
 
    Since: 1.2
    
@@ -413,7 +413,7 @@ nm_setting_vxlan_get_parent (guint
 nm_setting_vxlan_get_id (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -428,7 +428,7 @@ nm_setting_vxlan_get_id (
-
    Returns
    
+
    Returns
    
 
     the “id” property of the setting
    
 
 
    Since: 1.2
    
@@ -439,7 +439,7 @@ nm_setting_vxlan_get_id (const char *
 nm_setting_vxlan_get_local (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -454,7 +454,7 @@ nm_setting_vxlan_get_local (
-
    Returns
    
+
    Returns
    
 
     the “local” property of the setting
    
 
 
    Since: 1.2
    
@@ -465,7 +465,7 @@ nm_setting_vxlan_get_local (const char *
 nm_setting_vxlan_get_remote (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -480,7 +480,7 @@ nm_setting_vxlan_get_remote (
-
    Returns
    
+
    Returns
    
 
     the “remote” property of the setting
    
 
 
    Since: 1.2
    
@@ -491,7 +491,7 @@ nm_setting_vxlan_get_remote (guint
 nm_setting_vxlan_get_source_port_min (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -506,7 +506,7 @@ nm_setting_vxlan_get_source_port_min (
-
    Returns
    
+
    Returns
    
 
     the “source-port-min” property of the setting
    
 
 
    Since: 1.2
    
@@ -517,7 +517,7 @@ nm_setting_vxlan_get_source_port_min (guint
 nm_setting_vxlan_get_source_port_max (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -532,7 +532,7 @@ nm_setting_vxlan_get_source_port_max (
-
    Returns
    
+
    Returns
    
 
     the “source-port-max” property of the setting
    
 
 
    Since: 1.2
    
@@ -543,7 +543,7 @@ nm_setting_vxlan_get_source_port_max (guint
 nm_setting_vxlan_get_destination_port (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -558,7 +558,7 @@ nm_setting_vxlan_get_destination_port (
-
    Returns
    
+
    Returns
    
 
     the “destination-port” property of the setting
    
 
 
    Since: 1.2
    
@@ -569,7 +569,7 @@ nm_setting_vxlan_get_destination_port (guint
 nm_setting_vxlan_get_tos (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -584,7 +584,7 @@ nm_setting_vxlan_get_tos (
-
    Returns
    
+
    Returns
    
 
     the “tos” property of the setting
    
 
 
    Since: 1.2
    
@@ -595,7 +595,7 @@ nm_setting_vxlan_get_tos (guint
 nm_setting_vxlan_get_ttl (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -610,7 +610,7 @@ nm_setting_vxlan_get_ttl (
-
    Returns
    
+
    Returns
    
 
     the “ttl” property of the setting
    
 
 
    Since: 1.2
    
@@ -621,7 +621,7 @@ nm_setting_vxlan_get_ttl (guint
 nm_setting_vxlan_get_ageing (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -636,7 +636,7 @@ nm_setting_vxlan_get_ageing (
-
    Returns
    
+
    Returns
    
 
     the “ageing” property of the setting
    
 
 
    Since: 1.2
    
@@ -647,7 +647,7 @@ nm_setting_vxlan_get_ageing (guint
 nm_setting_vxlan_get_limit (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -662,7 +662,7 @@ nm_setting_vxlan_get_limit (
-
    Returns
    
+
    Returns
    
 
     the “limit” property of the setting
    
 
 
    Since: 1.2
    
@@ -673,7 +673,7 @@ nm_setting_vxlan_get_limit (gboolean
 nm_setting_vxlan_get_proxy (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -688,7 +688,7 @@ nm_setting_vxlan_get_proxy (
-
    Returns
    
+
    Returns
    
 
     the “proxy” property of the setting
    
 
 
    Since: 1.2
    
@@ -699,7 +699,7 @@ nm_setting_vxlan_get_proxy (gboolean
 nm_setting_vxlan_get_learning (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -714,7 +714,7 @@ nm_setting_vxlan_get_learning (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “learning” property of the setting
    
 
    
 
    Since: 1.2
    
@@ -725,7 +725,7 @@ nm_setting_vxlan_get_learning (gboolean
 nm_setting_vxlan_get_rsc (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -740,7 +740,7 @@ nm_setting_vxlan_get_rsc (
-
    Returns
    
+
    Returns
    
 
     the “rsc” property of the setting
    
 
 
    Since: 1.2
    
@@ -751,7 +751,7 @@ nm_setting_vxlan_get_rsc (gboolean
 nm_setting_vxlan_get_l2_miss (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -766,7 +766,7 @@ nm_setting_vxlan_get_l2_miss (
-
    Returns
    
+
    Returns
    
 
     the “l2_miss” property of the setting
    
 
 
    Since: 1.2
    
@@ -777,7 +777,7 @@ nm_setting_vxlan_get_l2_miss (gboolean
 nm_setting_vxlan_get_l3_miss (NMSettingVxlan *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -792,7 +792,7 @@ nm_setting_vxlan_get_l3_miss (
-
    Returns
    
+
    Returns
    
 
     the “l3_miss” property of the setting
    
 
 
    Since: 1.2
    
@@ -1069,6 +1069,6 @@ tunnel endpoint.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWimax.html b/docs/libnm/html/NMSettingWimax.html
index 132a0428..91763884 100644
--- a/docs/libnm/html/NMSettingWimax.html
+++ b/docs/libnm/html/NMSettingWimax.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -144,7 +144,7 @@ nm_setting_wimax_new (void
 
 
    Creates a new NMSettingWimax object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingWimax object
    
 
    
 
@@ -160,7 +160,7 @@ nm_setting_wimax_get_network_name (Returns the WiMAX NSP name (ex "Sprint" or "CLEAR") which identifies the
 specific WiMAX network this setting describes a connection to.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -175,7 +175,7 @@ specific WiMAX network this setting describes a connection to.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the WiMAX NSP name
    
 
    
 
@@ -191,7 +191,7 @@ nm_setting_wimax_get_mac_address (Returns the MAC address of a WiMAX device which this connection is locked
 to.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -206,7 +206,7 @@ to.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the MAC address
    
 
    
 
@@ -267,6 +267,6 @@ should use.
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index 568b9d5e..41bdca30 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -94,6 +94,13 @@
 
 
 
+const char *
+
+
+nm_setting_wired_get_generate_mac_address_mask ()
+
+
+
 const char * const *
 
 
@@ -262,6 +269,12 @@
 
 
 gchar *
+generate-mac-address-mask
+Read / Write
+
+
+
+gchar *
 mac-address
 Read / Write
 
@@ -359,6 +372,10 @@
 
 
 #define
+NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK
+
+
+#define
 NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
 
 
@@ -414,7 +431,7 @@ necessary for connection to Ethernet networks.
    
 nm_setting_wired_new (void);
 
    Creates a new NMSettingWired object with default values.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingWired object. 
    
 
    [transfer full]
    
 
    
@@ -425,7 +442,7 @@ nm_setting_wired_new (void
 
    const char *
 nm_setting_wired_get_port (NMSettingWired *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -440,7 +457,7 @@ nm_setting_wired_get_port (
-
    Returns
    
+
    Returns
    
 
     the “port” property of the setting
    
 
 
@@ -450,7 +467,7 @@ nm_setting_wired_get_port (guint32
 nm_setting_wired_get_speed (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -465,7 +482,7 @@ nm_setting_wired_get_speed (
-
    Returns
    
+
    Returns
    
 
     the “speed” property of the setting
    
 
 
@@ -475,7 +492,7 @@ nm_setting_wired_get_speed (const char *
 nm_setting_wired_get_duplex (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -490,7 +507,7 @@ nm_setting_wired_get_duplex (
-
    Returns
    
+
    Returns
    
 
     the “duplex” property of the setting
    
 
 
@@ -500,7 +517,7 @@ nm_setting_wired_get_duplex (gboolean
 nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -515,7 +532,7 @@ nm_setting_wired_get_auto_negotiate (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “auto-negotiate” property of the setting
    
 
    
 
@@ -525,7 +542,7 @@ nm_setting_wired_get_auto_negotiate (const char *
 nm_setting_wired_get_mac_address (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -540,7 +557,7 @@ nm_setting_wired_get_mac_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “mac-address” property of the setting
    
 
    
 
@@ -551,7 +568,7 @@ nm_setting_wired_get_mac_address (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -566,18 +583,45 @@ nm_setting_wired_get_cloned_mac_address
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “cloned-mac-address” property of the setting
    
 
    
 
 
    
 
    
+
    nm_setting_wired_get_generate_mac_address_mask ()
    
+
    const char *
+nm_setting_wired_get_generate_mac_address_mask
+                               (NMSettingWired *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingWired
    		 
    
+
    
+
    
+
    Returns
    
+
     the “generate-mac-address-mask” property of the setting
    
+
    
+
    Since: 1.4
    
+
    
+
    
+
    
 
    nm_setting_wired_get_mac_address_blacklist ()
    
 
    const char * const *
 nm_setting_wired_get_mac_address_blacklist
                                (NMSettingWired *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -592,7 +636,7 @@ nm_setting_wired_get_mac_address_blacklist
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “mac-address-blacklist” property of the setting
    
 
    
 
    
@@ -603,7 +647,7 @@ nm_setting_wired_get_mac_address_blacklist
 nm_setting_wired_get_num_mac_blacklist_items
                                (NMSettingWired *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -618,7 +662,7 @@ nm_setting_wired_get_num_mac_blacklist_items
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of blacklisted MAC addresses
    
 
    
 
@@ -630,7 +674,7 @@ nm_setting_wired_get_mac_blacklist_item
                                (NMSettingWired *setting,
                                 guint32 idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -652,7 +696,7 @@ nm_setting_wired_get_mac_blacklist_item
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the blacklisted MAC address string (hex-digits-and-colons notation)
 at index idx
 
    
@@ -667,7 +711,7 @@ nm_setting_wired_add_mac_blacklist_item
                                 const char *mac);
 
    Adds a new MAC address to the “mac-address-blacklist” property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -689,7 +733,7 @@ nm_setting_wired_add_mac_blacklist_item
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present
    
 
    
@@ -704,7 +748,7 @@ nm_setting_wired_remove_mac_blacklist_item
 
    Removes the MAC address at index idx
  from the blacklist.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -736,7 +780,7 @@ nm_setting_wired_remove_mac_blacklist_item_by_value
 
    Removes the MAC address mac
  from the blacklist.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -759,7 +803,7 @@ the blacklist
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the MAC address was found and removed; FALSE if it was not.
    
 
    
 
    
@@ -771,7 +815,7 @@ nm_setting_wired_clear_mac_blacklist_items
                                (NMSettingWired *setting);
 
    Removes all blacklisted MAC addresses.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -792,7 +836,7 @@ nm_setting_wired_clear_mac_blacklist_items
 
    guint32
 nm_setting_wired_get_mtu (NMSettingWired *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -807,7 +851,7 @@ nm_setting_wired_get_mtu (
-
    Returns
    
+
    Returns
    
 
     the “mtu” property of the setting
    
 
 
@@ -820,7 +864,7 @@ nm_setting_wired_get_s390_subchannels (
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -835,7 +879,7 @@ conjunction with that device.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     array of strings, each specifying
 one subchannel the s390 device uses to communicate to the host. 
    
 
    [transfer none][element-type utf8]
    
@@ -849,7 +893,7 @@ nm_setting_wired_get_s390_nettype (Returns the s390 device type this connection should apply to.  Will be one
 of 'qeth', 'lcs', or 'ctc'.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -864,7 +908,7 @@ of 'qeth', 'lcs', or 'ctc'.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the s390 device type
    
 
    
 
    
@@ -877,7 +921,7 @@ nm_setting_wired_get_num_s390_options (nm_setting_wired_get_s390_option().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -892,7 +936,7 @@ option individually using 
-
    Returns
    
+
    Returns
     the number of s390-specific device options
    
@@ -910,7 +954,7 @@ are *not* guaranteed to be static across modifications to options done by
 and should not be used to refer to options except for short periods of time
 such as during option iteration.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
    @@ -946,7 +990,7 @@ modified. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    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
 currently held by the setting)
    
@@ -963,7 +1007,7 @@ nm_setting_wired_get_s390_option_by_key
 key
 , if it exists.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -985,7 +1029,7 @@ nm_setting_wired_get_s390_option_by_key
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     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
    
 
    
@@ -1002,7 +1046,7 @@ of allowed options.  Key names may contain only alphanumeric characters
 (ie [a-zA-Z0-9]).  Adding a new key replaces any existing key/value pair that
 may already exist.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1029,7 +1073,7 @@ may already exist.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the option was valid and was added to the internal option
 list, FALSE if it was not.
    
 
    
@@ -1044,7 +1088,7 @@ nm_setting_wired_remove_s390_option (
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1066,7 +1110,7 @@ list.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the option was found and removed from the internal option
 list, FALSE if it was not.
    
 
    
@@ -1079,7 +1123,7 @@ nm_setting_wired_get_valid_s390_options
                                (NMSettingWired *setting);
 
    Returns a list of valid s390 options.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1094,7 +1138,7 @@ nm_setting_wired_get_valid_s390_options
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a NULL-terminated array of strings of valid s390 options. 
    
 
    [transfer none]
    
 
    
@@ -1106,7 +1150,7 @@ nm_setting_wired_get_valid_s390_options
 nm_setting_wired_get_wake_on_lan (NMSettingWired *setting);
 
    Returns the Wake-on-LAN options enabled for the connection
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1121,7 +1165,7 @@ nm_setting_wired_get_wake_on_lan (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the Wake-on-LAN options
    
 
    
 
    Since: 1.2
    
@@ -1135,7 +1179,7 @@ nm_setting_wired_get_wake_on_lan_password
 
    Returns the Wake-on-LAN password. This only applies to
 NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1150,7 +1194,7 @@ nm_setting_wired_get_wake_on_lan_password
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the Wake-on-LAN setting password, or NULL if there is no password.
    
 
    
 
    Since: 1.2
    
@@ -1169,7 +1213,7 @@ nm_setting_wired_get_wake_on_lan_password
 
    Options for “wake-on-lan”. Note that not all options
 are supported by all devices.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -1307,6 +1351,12 @@ are supported by all devices.
    
+
    NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK
    
+
    #define NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK "generate-mac-address-mask"
+
    
+
    
+
    
+
    
 
    NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
    
 
    #define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 
    
@@ -1370,6 +1420,17 @@ are supported by all devices.
    
 
      “cloned-mac-address”       gchar *
    
 
    If specified, request that the device use this MAC address instead of its
 permanent MAC address.  This is known as MAC cloning or spoofing.
    
+
    Beside explicitly specifing a MAC address, the special values "preserve", "permanent",
+"random" and "stable" are supported.
+"preserve" means not to touch the MAC address on activation.
+"permanent" means to use the permanent hardware address of the device.
+"random" creates a random MAC address on each connect.
+"stable" creates a hashed MAC address based on connection.stable-id (or
+the connection's UUID) and a machine dependent key.
    
+
    If unspecified, the value can be overwritten via global defaults, see manual
+of NetworkManager.conf. If still unspecified, it defaults to "permanent".
    
+
    On D-Bus, this field is expressed as "assigned-mac-address" or the deprecated
+"cloned-mac-address".
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
 
    
@@ -1384,6 +1445,37 @@ Either "half" or "full".
    
+
    The “generate-mac-address-mask” property
    
+
      “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
+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.
    
+
    Flags: Read / Write
    
+
    Default value: NULL
    
+
    
+
    
+
    
 
    The “mac-address” property
    
 
      “mac-address”              gchar *
    
 
    If specified, this connection will only apply to the Ethernet device
@@ -1494,6 +1586,6 @@ no password will be required.
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index a58e847c..ff5b9e91 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -8,7 +8,7 @@
 
-
+
@@ -117,6 +117,13 @@
 
+
+
+
+
+
+
+
+
+
@@ -379,6 +392,10 @@
 
+
+
+
+
@@ -446,7 +463,7 @@ necessary for connection to 802.11 Wi-Fi networks.
    
 nm_setting_wireless_new (void);
    Creates a new NMSettingWireless object with default values.
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingWireless object. 
    
 
    [transfer full]
    
 
    
@@ -457,7 +474,7 @@ nm_setting_wireless_new (voidGBytes *
 nm_setting_wireless_get_ssid (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
    const char *
+
+nm_setting_wireless_get_generate_mac_address_mask ()
+
    
 const char * const *
 
 
@@ -269,6 +276,12 @@
 Read / Write
 
    
 
    
+gchar *generate-mac-address-maskRead / Write
    
 gboolean
 hidden
 Read / Write
    
 
    
 #defineNM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK
    #define
 NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
 
    
 
    
 
 
    @@ -472,7 +489,7 @@ nm_setting_wireless_get_ssid (
-
    Returns
    
+
    Returns
    
 
     the “ssid” property of the setting. 
    
 
    [transfer none]
    
 
@@ -483,7 +500,7 @@ nm_setting_wireless_get_ssid (const char *
 nm_setting_wireless_get_mode (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -498,7 +515,7 @@ nm_setting_wireless_get_mode (
-
    Returns
    
+
    Returns
    
 
     the “mode” property of the setting
    
 
 
@@ -508,7 +525,7 @@ nm_setting_wireless_get_mode (const char *
 nm_setting_wireless_get_band (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -523,7 +540,7 @@ nm_setting_wireless_get_band (
-
    Returns
    
+
    Returns
    
 
     the “band” property of the setting
    
 
 
@@ -533,7 +550,7 @@ nm_setting_wireless_get_band (guint32
 nm_setting_wireless_get_channel (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -548,7 +565,7 @@ nm_setting_wireless_get_channel (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “channel” property of the setting
    
 
    
 
@@ -558,7 +575,7 @@ nm_setting_wireless_get_channel (const char *
 nm_setting_wireless_get_bssid (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -573,7 +590,7 @@ nm_setting_wireless_get_bssid (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “bssid” property of the setting
    
 
    
 
@@ -583,7 +600,7 @@ nm_setting_wireless_get_bssid (guint32
 nm_setting_wireless_get_rate (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -598,7 +615,7 @@ nm_setting_wireless_get_rate (
-
    Returns
    
+
    Returns
    
 
     the “rate” property of the setting
    
 
 
@@ -608,7 +625,7 @@ nm_setting_wireless_get_rate (guint32
 nm_setting_wireless_get_tx_power (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -623,7 +640,7 @@ nm_setting_wireless_get_tx_power (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “tx-power” property of the setting
    
 
    
 
@@ -633,7 +650,7 @@ nm_setting_wireless_get_tx_power (const char *
 nm_setting_wireless_get_mac_address (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -648,7 +665,7 @@ nm_setting_wireless_get_mac_address (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “mac-address” property of the setting
    
 
    
 
@@ -659,7 +676,7 @@ nm_setting_wireless_get_mac_address (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -674,18 +691,45 @@ nm_setting_wireless_get_cloned_mac_address
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “cloned-mac-address” property of the setting
    
 
    
 
    
 
    
 
    
+
    nm_setting_wireless_get_generate_mac_address_mask ()
    
+
    const char *
+nm_setting_wireless_get_generate_mac_address_mask
+                               (NMSettingWireless *setting);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    setting
    the NMSettingWireless
    		 
    
+
    
+
    
+
    Returns
    
+
     the “generate-mac-address-mask” property of the setting
    
+
    
+
    Since: 1.4
    
+
    
+
    
+
    
 
    nm_setting_wireless_get_mac_address_blacklist ()
    
 
    const char * const *
 nm_setting_wireless_get_mac_address_blacklist
                                (NMSettingWireless *setting);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -700,7 +744,7 @@ nm_setting_wireless_get_mac_address_blacklist
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “mac-address-blacklist” property of the setting
    
 
    
 
    
@@ -711,7 +755,7 @@ nm_setting_wireless_get_mac_address_blacklist
 nm_setting_wireless_get_num_mac_blacklist_items
                                (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -726,7 +770,7 @@ nm_setting_wireless_get_num_mac_blacklist_items
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of blacklisted MAC addresses
    
 
    
 
@@ -738,7 +782,7 @@ nm_setting_wireless_get_mac_blacklist_item
                                (NMSettingWireless *setting,
                                 guint32 idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -760,7 +804,7 @@ nm_setting_wireless_get_mac_blacklist_item
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the blacklisted MAC address string (hex-digits-and-colons notation)
 at index idx
 
    
@@ -775,7 +819,7 @@ nm_setting_wireless_add_mac_blacklist_item
                                 const char *mac);
 
    Adds a new MAC address to the “mac-address-blacklist” property.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -797,7 +841,7 @@ nm_setting_wireless_add_mac_blacklist_item
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present
    
 
    
@@ -812,7 +856,7 @@ nm_setting_wireless_remove_mac_blacklist_item
 
    Removes the MAC address at index idx
  from the blacklist.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -844,7 +888,7 @@ nm_setting_wireless_remove_mac_blacklist_item_by_value
 
    Removes the MAC address mac
  from the blacklist.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -867,7 +911,7 @@ the blacklist
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the MAC address was found and removed; FALSE if it was not.
    
 
    
 
    
@@ -879,7 +923,7 @@ nm_setting_wireless_clear_mac_blacklist_items
                                (NMSettingWireless *setting);
 
    Removes all blacklisted MAC addresses.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -900,7 +944,7 @@ nm_setting_wireless_clear_mac_blacklist_items
 
    guint32
 nm_setting_wireless_get_mtu (NMSettingWireless *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -915,7 +959,7 @@ nm_setting_wireless_get_mtu (
-
    Returns
    
+
    Returns
    
 
     the “mtu” property of the setting
    
 
 
@@ -925,7 +969,7 @@ nm_setting_wireless_get_mtu (gboolean
 nm_setting_wireless_get_hidden (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -940,7 +984,7 @@ nm_setting_wireless_get_hidden (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “hidden” property of the setting
    
 
    
 
@@ -950,7 +994,7 @@ nm_setting_wireless_get_hidden (guint32
 nm_setting_wireless_get_powersave (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -965,7 +1009,7 @@ nm_setting_wireless_get_powersave (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the “powersave” property of the setting
    
 
    
 
    Since: 1.2
    
@@ -977,7 +1021,7 @@ nm_setting_wireless_get_powersave (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -992,7 +1036,7 @@ nm_setting_wireless_get_mac_address_randomization
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “mac-address-randomization” property of the
 setting
    
 
    
@@ -1009,7 +1053,7 @@ NetworkManager now tracks previously seen BSSIDs internally so this function
 no longer has much use. Actually, changes you make using this function will
 not be preserved.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1031,7 +1075,7 @@ not be preserved.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if bssid
 was already known, FALSE if not
    
 
    
@@ -1043,7 +1087,7 @@ was already known, FALSE if not
    
 nm_setting_wireless_get_num_seen_bssids
                                (NMSettingWireless *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1058,7 +1102,7 @@ nm_setting_wireless_get_num_seen_bssids
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of BSSIDs in the previously seen BSSID list
    
 
    
 
@@ -1069,7 +1113,7 @@ nm_setting_wireless_get_num_seen_bssids
 nm_setting_wireless_get_seen_bssid (NMSettingWireless *setting,
                                     guint32 i);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1091,7 +1135,7 @@ nm_setting_wireless_get_seen_bssid (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the BSSID at index i
 
    
 
    
@@ -1114,7 +1158,7 @@ and mode.  Useful for clients that wish to filter a set of connections
 against a set of access points and determine which connections are
 compatible with which access points.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1158,7 +1202,7 @@ capabilities
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the given settings are compatible with the access point's
 security flags and mode, FALSE if they are not.
    
 
    
@@ -1227,6 +1271,12 @@ security flags and mode, FALSE if they are not.
    
 
 
    
 
    
+
    NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK
    
+
    #define NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK "generate-mac-address-mask"
+
    
+
    
+
    
+
    
 
    NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
    
 
    #define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 
    
@@ -1289,7 +1339,7 @@ for this connection.
    
 
    enum NMSettingWirelessPowersave
    
 
    These flags indicate whether wireless powersave must be enabled.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -1385,8 +1435,50 @@ also requires the "band" property to be set.
    
 
    The “cloned-mac-address” property
    
 
      “cloned-mac-address”       gchar *
    
-
    If specified, request that the Wi-Fi device use this MAC address instead
-of its permanent MAC address.  This is known as MAC cloning or spoofing.
    
+
    If specified, request that the device use this MAC address instead of its
+permanent MAC address.  This is known as MAC cloning or spoofing.
    
+
    Beside explicitly specifing a MAC address, the special values "preserve", "permanent",
+"random" and "stable" are supported.
+"preserve" means not to touch the MAC address on activation.
+"permanent" means to use the permanent hardware address of the device.
+"random" creates a random MAC address on each connect.
+"stable" creates a hashed MAC address based on connection.stable-id (or
+the connection's UUID) and a machine dependent key.
    
+
    If unspecified, the value can be overwritten via global defaults, see manual
+of NetworkManager.conf. If still unspecified, it defaults to "permanent".
    
+
    On D-Bus, this field is expressed as "assigned-mac-address" or the deprecated
+"cloned-mac-address".
    
+
    Flags: Read / Write
    
+
    Default value: NULL
    
+
    
+
    
+
    
+
    The “generate-mac-address-mask” property
    
+
      “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
+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.
    
 
    Flags: Read / Write
    
 
    Default value: NULL
    
 
    
@@ -1430,6 +1522,10 @@ the user has set a global default to randomize and the supplicant
 supports randomization),  NM_SETTING_MAC_RANDOMIZATION_NEVER (never
 randomize the MAC address), or NM_SETTING_MAC_RANDOMIZATION_ALWAYS
 (always randomize the MAC address).
    
+
    
+
    NMSettingWireless:mac-address-randomization has been deprecated since version 1.4 and should not be used in newly-written code.
    
+
    Deprecated by NMSettingWireless:cloned-mac-address property
    
+
    Flags: Read / Write
    Default value: 0
    Since: 1.2
    
@@ -1508,6 +1604,6 @@ devices support setting a static transmit power.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index b8e8f37f..08363746 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -8,7 +8,7 @@
 
-
+
@@ -513,7 +513,7 @@ of how Wi-Fi security works, you may want to get copies of the following books.<
 nm_setting_wireless_security_new (void);
    Creates a new NMSettingWirelessSecurity object with default values.
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMSettingWirelessSecurity object. 
    
 
    [transfer full]
    
 
    
@@ -525,7 +525,7 @@ nm_setting_wireless_security_new (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
    @@ -540,7 +540,7 @@ nm_setting_wireless_security_get_key_mgmt
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “key-mgmt” property of the setting
    
 
    
 
    
@@ -551,7 +551,7 @@ nm_setting_wireless_security_get_key_mgmt
 nm_setting_wireless_security_get_num_protos
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -566,7 +566,7 @@ nm_setting_wireless_security_get_num_protos
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of security protocols this connection allows when
 connecting to secure Wi-Fi networks
    
 
    
@@ -579,7 +579,7 @@ nm_setting_wireless_security_get_proto
                                (NMSettingWirelessSecurity *setting,
                                 guint32 i);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -601,7 +601,7 @@ nm_setting_wireless_security_get_proto
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the protocol at index i
 
    
 
    
@@ -620,7 +620,7 @@ protocol list contains only "wpa" but the access point for the SSID specified
 by this connection only supports WPA2/RSN, the connection cannot be used
 with the access point.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -642,7 +642,7 @@ with the access point.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    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
    
 
    
@@ -656,7 +656,7 @@ nm_setting_wireless_security_remove_proto
                                 guint32 i);
 
    Removes a protocol from the allowed protocol list.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -687,7 +687,7 @@ nm_setting_wireless_security_remove_proto_by_value
                                 const char *proto);
    Removes a protocol from the allowed protocol list.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -709,7 +709,7 @@ nm_setting_wireless_security_remove_proto_by_value
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the protocol was found and removed; FALSE it it was not.
    
 
    
 
@@ -722,7 +722,7 @@ nm_setting_wireless_security_clear_protos
 
    Removes all protocols from the allowed list.  If there are no protocols
 specified then all protocols are allowed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -744,7 +744,7 @@ specified then all protocols are allowed.
    
 nm_setting_wireless_security_get_num_pairwise
                                (NMSettingWirelessSecurity *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -759,7 +759,7 @@ nm_setting_wireless_security_get_num_pairwise
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of pairwise encryption algorithms in the allowed list
    
 
    
 
@@ -773,7 +773,7 @@ nm_setting_wireless_security_get_pairwise
 
    Returns the allowed pairwise encryption algorithm from allowed algorithm
 list.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -795,7 +795,7 @@ list.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the pairwise encryption algorithm at index i
 
    
 
    
@@ -812,7 +812,7 @@ algorithms.  If the list is not empty, then only access points that support
 one or more of the encryption algorithms in the list will be considered
 compatible with this connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -834,7 +834,7 @@ compatible with this connection.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the algorithm was added to the list, FALSE if it was
 already in the list
    
 
    
@@ -849,7 +849,7 @@ nm_setting_wireless_security_remove_pairwise
 
    Removes an encryption algorithm from the allowed pairwise encryption
 algorithm list.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -881,7 +881,7 @@ nm_setting_wireless_security_remove_pairwise_by_value
 
    Removes an encryption algorithm from the allowed pairwise encryption
 algorithm list.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -903,7 +903,7 @@ algorithm list.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the encryption algorith was found and removed; FALSE it it was not.
    
 
    
 
@@ -916,7 +916,7 @@ nm_setting_wireless_security_clear_pairwise
 
    Removes all algorithms from the allowed list.  If there are no algorithms
 specified then all pairwise encryption algorithms are allowed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -938,7 +938,7 @@ specified then all pairwise encryption algorithms are allowed.
    
 nm_setting_wireless_security_get_num_groups
                                (NMSettingWirelessSecurity *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -953,7 +953,7 @@ nm_setting_wireless_security_get_num_groups
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the number of groupwise encryption algorithms in the allowed list
    
 
    
 
@@ -967,7 +967,7 @@ nm_setting_wireless_security_get_group
 
    Returns the allowed groupwise encryption algorithm from allowed algorithm
 list.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -989,7 +989,7 @@ list.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the groupwise encryption algorithm at index i
 
    
 
    
@@ -1006,7 +1006,7 @@ algorithms.  If the list is not empty, then only access points that support
 one or more of the encryption algorithms in the list will be considered
 compatible with this connection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1029,7 +1029,7 @@ compatible with this connection.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the algorithm was added to the list, FALSE if it was
 already in the list
    
 
    
@@ -1044,7 +1044,7 @@ nm_setting_wireless_security_remove_group
 
    Removes an encryption algorithm from the allowed groupwise encryption
 algorithm list.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1076,7 +1076,7 @@ nm_setting_wireless_security_remove_group_by_value
 
    Removes an encryption algorithm from the allowed groupwise encryption
 algorithm list.
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1099,7 +1099,7 @@ algorithm list.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the algorithm was found and removed; FALSE it it was not.
    
 
    
 
@@ -1112,7 +1112,7 @@ nm_setting_wireless_security_clear_groups
 
    Removes all algorithms from the allowed list.  If there are no algorithms
 specified then all groupwise encryption algorithms are allowed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1133,7 +1133,7 @@ specified then all groupwise encryption algorithms are allowed.
    const char *
 nm_setting_wireless_security_get_psk (NMSettingWirelessSecurity *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -1148,7 +1148,7 @@ nm_setting_wireless_security_get_psk (
-
    Returns
    
+
    Returns
    
 
     the “psk” property of the setting
    
 
 
@@ -1159,7 +1159,7 @@ nm_setting_wireless_security_get_psk (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1174,7 +1174,7 @@ nm_setting_wireless_security_get_psk_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the
 “psk”
    
 
    
@@ -1186,7 +1186,7 @@ nm_setting_wireless_security_get_psk_flags
 nm_setting_wireless_security_get_leap_username
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1201,7 +1201,7 @@ nm_setting_wireless_security_get_leap_username
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “leap-username” property of the setting
    
 
    
 
@@ -1212,7 +1212,7 @@ nm_setting_wireless_security_get_leap_username
 nm_setting_wireless_security_get_leap_password
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1227,7 +1227,7 @@ nm_setting_wireless_security_get_leap_password
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “leap-password” property of the setting
    
 
    
 
@@ -1238,7 +1238,7 @@ nm_setting_wireless_security_get_leap_password
 nm_setting_wireless_security_get_leap_password_flags
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1253,7 +1253,7 @@ nm_setting_wireless_security_get_leap_password_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the
 “leap-password”
    
 
    
@@ -1266,7 +1266,7 @@ nm_setting_wireless_security_get_wep_key
                                (NMSettingWirelessSecurity *setting,
                                 guint32 idx);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1288,7 +1288,7 @@ nm_setting_wireless_security_get_wep_key
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the WEP key at the given index
    
 
    
 
@@ -1302,7 +1302,7 @@ nm_setting_wireless_security_set_wep_key
                                 const char *key);
 
    Sets a WEP key in the given index.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1338,7 +1338,7 @@ property.
    
 nm_setting_wireless_security_get_wep_tx_keyidx
                                (NMSettingWirelessSecurity *setting);
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -1353,7 +1353,7 @@ nm_setting_wireless_security_get_wep_tx_keyidx
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “wep-tx-keyidx” property of the setting
    
 
    
 
@@ -1364,7 +1364,7 @@ nm_setting_wireless_security_get_wep_tx_keyidx
 nm_setting_wireless_security_get_auth_alg
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1379,7 +1379,7 @@ nm_setting_wireless_security_get_auth_alg
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “auth-alg” property of the setting
    
 
    
 
@@ -1390,7 +1390,7 @@ nm_setting_wireless_security_get_auth_alg
 nm_setting_wireless_security_get_wep_key_flags
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1405,7 +1405,7 @@ nm_setting_wireless_security_get_wep_key_flags
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the NMSettingSecretFlags pertaining to the all WEP keys
    
 
    
 
@@ -1416,7 +1416,7 @@ nm_setting_wireless_security_get_wep_key_flags
 nm_setting_wireless_security_get_wep_key_type
                                (NMSettingWirelessSecurity *setting);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1431,7 +1431,7 @@ nm_setting_wireless_security_get_wep_key_type
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the “wep-key-type” property of the setting
    
 
    
 
@@ -1456,7 +1456,7 @@ ASCII keys are also valid WEP passphrases, but since passphrases and ASCII
 keys are hashed differently to determine the actual WEP key the type must be
 specified.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -1783,6 +1783,6 @@ Linksys WRT54G) number the keys 1 - 4.
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html
index b96c0029..00e3f8d7 100644
--- a/docs/libnm/html/NMSimpleConnection.html
+++ b/docs/libnm/html/NMSimpleConnection.html
@@ -8,7 +8,7 @@
 
-
+
@@ -106,7 +106,7 @@ nm_simple_connection_new (voidNMSimpleConnection does not directly represent a D-Bus-exported connection,
 but might be used in the process of creating a new one.
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new empty NMConnection object. 
    
 
    [transfer full]
    
 
    
@@ -121,7 +121,7 @@ nm_simple_connection_new_from_dbus (nm_connection_to_dbus() for a
 description of the expected hash table.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
 
 
 
 
 
 
 
 
    @@ -143,7 +143,7 @@ description of the expected hash table.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the new NMSimpleConnection object, populated with
 settings created from the values in the hash table, or NULL if the
 connection failed to normalize. 
    
@@ -157,7 +157,7 @@ connection failed to normalize. 
    
 nm_simple_connection_new_clone (NMConnection *connection);
 
    Clones an NMConnection as an NMSimpleConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -172,7 +172,7 @@ nm_simple_connection_new_clone (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a new NMConnection containing the same settings
 and properties as the source NMConnection. 
    
 
    [transfer full]
    
@@ -188,6 +188,6 @@ and properties as the source 
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html
index 3f0b93bc..94eff703 100644
--- a/docs/libnm/html/NMVpnConnection.html
+++ b/docs/libnm/html/NMVpnConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -147,7 +147,7 @@ NMVpnConnection implements
 nm_vpn_connection_get_vpn_state (    NMVpnConnection *vpn);
 
    Gets the current NMVpnConnection state.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -162,7 +162,7 @@ nm_vpn_connection_get_vpn_state (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the VPN state of the active VPN connection.
    
 
    
 
@@ -173,7 +173,7 @@ nm_vpn_connection_get_vpn_state (NMVpnConnection *vpn);
 
    Gets the VPN login banner of the active NMVpnConnection.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -188,7 +188,7 @@ nm_vpn_connection_get_banner (
-
    Returns
    
+
    Returns
    
 
     the VPN login banner of the VPN connection. This is the internal
 string used by the connection, and must not be modified.
    
 
@@ -245,6 +245,6 @@ user_function (
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index d49d5fea..cae4d706 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -77,6 +77,14 @@
 
     
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
 
 

    
 
+gsize
+
+nm_vpn_editor_plugin_get_vt ()
+
    
 NMConnection *
 
 
@@ -107,6 +115,29 @@
 nm_vpn_editor_plugin_load_from_file ()
 
 
    
+NMVpnEditorPlugin *
+
+nm_vpn_editor_plugin_load ()
+
    struct _NMVpnPluginInfo *
+
+nm_vpn_editor_plugin_get_plugin_info ()
+
    
+void
+
+nm_vpn_editor_plugin_set_plugin_info ()
+
    
     
 
    
 
    
@@ -187,6 +218,10 @@
  
 NMVpnEditor
 
+
+ 
+NMVpnEditorPluginVT
+
 
 
    
 
@@ -229,7 +264,7 @@ nm_vpn_editor_plugin_get_editor (NMConnection *connection,
                                  GError **error);
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -256,7 +291,7 @@ nm_vpn_editor_plugin_get_editor (
 
 
    
-
    Returns
    
+
    Returns
    
 
     a new NMVpnEditor or NULL on error. 
    
 
    [transfer full]
    
 
    
@@ -269,13 +304,60 @@ nm_vpn_editor_plugin_get_capabilities (
+
    nm_vpn_editor_plugin_get_vt ()
    
+
    gsize
+nm_vpn_editor_plugin_get_vt (NMVpnEditorPlugin *plugin,
+                             NMVpnEditorPluginVT *vt,
+                             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
+both the plugin and the caller. See the header-only file
+'nm-vpn-editor-plugin-call.h' which defines the meaning.
    
+
    
+
    Parameters
    
+
    
 
 

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




    plugin
    the NMVpnEditorPlugin
    		 
    vt
     buffer to be filled with the VT table of the plugin. 
    		[out]
    vt_size
    the size of the buffer. Can be 0 to only query the
+size of plugin's VT.
    		 
    
+
    
+
    
+
    Returns
    
+
     the actual size of the plugin
+'s virtual function table.
    
+
    
+
    Since: 1.4
    
+
+
    
+
    
 
    nm_vpn_editor_plugin_import ()
    
 
    NMConnection *
 nm_vpn_editor_plugin_import (NMVpnEditorPlugin *plugin,
                              const char *path,
                              GError **error);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -302,7 +384,7 @@ nm_vpn_editor_plugin_import (
-
    Returns
    
+
    Returns
    
 
     a new NMConnection imported from path
 , or NULL
 on error or if the file at path
@@ -345,9 +427,10 @@ function.
    
  is not an absolute path name, it assumes the file
 is in the plugin directory of NetworkManager. In any case, the call
 will do certain checks on the file before passing it to dlopen.
-A consequence for that is, that you cannot omit the ".so" suffix.
    
+A consequence for that is, that you cannot omit the ".so" suffix
+as you could for nm_vpn_editor_plugin_load().
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -398,12 +481,125 @@ loading the shared library. 
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new plugin instance or NULL on error. 
    
 
    [transfer full]
    
 
    
 
    Since: 1.2
    
 
    
+
    
+
    
+
    nm_vpn_editor_plugin_load ()
    
+
    NMVpnEditorPlugin *
+nm_vpn_editor_plugin_load (const char *plugin_name,
+                           const char *check_service,
+                           GError **error);
    
+
    Load the shared libary plugin_name
+ and create a new
+NMVpnEditorPlugin instace via the NMVpnEditorPluginFactory
+function.
    
+
    This is similar to nm_vpn_editor_plugin_load_from_file(), but
+it does no validation of the plugin name, instead passes it directly
+to dlopen(). If you have the full path to a plugin file,
+nm_vpn_editor_plugin_load_from_file() is preferred.
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    




    plugin_name
    The name of the shared library to load.
+This path will be directly passed to dlopen() without
+further checks.
    		 
    check_service
    if not-null, check that the loaded plugin advertises
+the given service.
    		 
    error
    on failure the error reason.
    		 
    
+
    
+
    
+
    Returns
    
+
     a new plugin instance or NULL on error. 
    
+
    [transfer full]
    
+
    
+
    Since: 1.4
    
+
    
+
    
+
    
+
    nm_vpn_editor_plugin_get_plugin_info ()
    
+
    struct _NMVpnPluginInfo *
+nm_vpn_editor_plugin_get_plugin_info (NMVpnEditorPlugin *plugin);
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
    




    plugin
    the NMVpnEditorPlugin instance
    		 
    
+
    
+
    
+
    Returns
    
+
     if set, return the NMVpnPluginInfo instance. 
    
+
    [transfer none]
    
+
    
+
    Since: 1.4
    
+
    
+
    
+
    
+
    nm_vpn_editor_plugin_set_plugin_info ()
    
+
    void
+nm_vpn_editor_plugin_set_plugin_info (NMVpnEditorPlugin *plugin,
+                                      struct _NMVpnPluginInfo *plugin_info);
    
+
    Set or clear the plugin-info instance.
+This takes a weak reference on plugin_info
+, to avoid circular
+reference as the plugin-info might also reference the editor-plugin.
    
+
    
+
    Parameters
    
+
    
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
    




    plugin
    the NMVpnEditorPlugin instance
    		 
    plugin_info
     a NMVpnPluginInfo instance or NULL. 
    		[allow-none]
    
+
    
+
    Since: 1.4
    
+
    
 
 
    
 
    Types and Values
    
@@ -411,7 +607,7 @@ loading the shared library. 
    
 
    enum NMVpnEditorPluginCapability
    
 
    Flags that indicate certain capabilities of the plugin to editor programs.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -491,11 +687,17 @@ loading the shared library. 
    
 	                            GError **error);
 
 	char * (*get_suggested_filename) (NMVpnEditorPlugin *plugin, NMConnection *connection);
+
+	void (*notify_plugin_info_set) (NMVpnEditorPlugin *plugin,
+	                                struct _NMVpnPluginInfo *plugin_info);
+
+	const NMVpnEditorPluginVT *(*get_vt) (NMVpnEditorPlugin *plugin,
+	                                      gsize *out_vt_size);
 } NMVpnEditorPluginInterface;
 
    Interface for VPN editor plugins.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -504,11 +706,6 @@ loading the shared library. 
    
-
-
-
-
-
@@ -546,6 +743,17 @@ name.  Returned value will be NULL or a suggested f
 the caller.
    
+
+
+
+
+
+
+
+
+
+
    
 
 

 
 
 
    GTypeInterface g_iface;
    the parent interface
    		 
    
 
    get_editor ()
    		
 
    returns an NMVpnEditor, pre-filled with values from connection
 if non-NULL.
    		
  
 
    notify_plugin_info_set ()
    		  
    get_vt ()
    return a virtual function table to implement further functions in
+the plugin, without requiring to update libnm. Used by nm_vpn_editor_plugin_get_vt().
    		 
    
     
 
    
 
    
@@ -555,6 +763,11 @@ the caller.
    
 
    NMVpnEditor
    
 
    typedef struct _NMVpnEditor NMVpnEditor;
    
 
    
+
    
+
    
+
    NMVpnEditorPluginVT
    
+
    typedef struct _NMVpnEditorPluginVT NMVpnEditorPluginVT;
    
+
    
 
 
    
 
    Property Details
    
@@ -594,6 +807,6 @@ user_function (
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index 980be14e..599612e0 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -163,7 +163,7 @@ NMWimaxNsp implements
 nm_wimax_nsp_get_name (    NMWimaxNsp *nsp);
 
    Gets the name of the wimax NSP
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -178,7 +178,7 @@ nm_wimax_nsp_get_name (
-
    Returns
    
+
    Returns
    
 
     the name
    
 
 
@@ -189,7 +189,7 @@ nm_wimax_nsp_get_name (NMWimaxNsp *nsp);
 
    Gets the WPA signal quality of the wimax NSP.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -204,7 +204,7 @@ nm_wimax_nsp_get_signal_quality (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the signal quality
    
 
    
 
@@ -215,7 +215,7 @@ nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp);
 
    Gets the network type of the wimax NSP.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -230,7 +230,7 @@ nm_wimax_nsp_get_network_type (
 
 
    
-
    Returns
    
+
    Returns
    
 
     the network type
    
 
    
 
@@ -245,7 +245,7 @@ return connections which may be activated with the NSP.  Any returned
 connections will match the nsp
 's network name and other attributes.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -260,7 +260,7 @@ connections will match the nsp
 
 
-
@@ -268,9 +268,9 @@ filter. 
    
 
    
 
 

    
 
    connections
     an array of NMConnections to
+
     an array of NMConnections to
 filter. 
    		
 [element-type NMConnection]
 
    
 
    
 
    
-
    Returns
    
+
    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. 
    
 
    [transfer container][element-type NMConnection]
    
@@ -287,7 +287,7 @@ connection may be activated with that NSP.  The connection must match the
 nsp
 's network name and other attributes.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -311,7 +311,7 @@ against
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the connection may be activated with this WiMAX NSP,
 FALSE if it cannot be.
    
 
    
@@ -371,6 +371,6 @@ against
    
 
    
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/annotation-glossary.html b/docs/libnm/html/annotation-glossary.html
index ff056841..536d9dc2 100644
--- a/docs/libnm/html/annotation-glossary.html
+++ b/docs/libnm/html/annotation-glossary.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -68,6 +68,6 @@
 
    Override the parsed C type with given type.
    
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index 5450ce1f..15cfcad6 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -415,7 +415,7 @@
 
 
    
 
    
-NM_AVAILABLE_IN_1_2_4, macro in nm-version
+NM_AVAILABLE_IN_1_4, macro in nm-version
 
    
 
    
 
    B
    
@@ -425,10 +425,22 @@
 
    
 
    C
    
 
    
+NMCheckpointCreateFlags, enum in nm-dbus-interface
+
    
+
    
+
    
 NMClient, struct in nm-types
 
    
 
    
 
    
+NMClient::active-connection-added, object signal in nm-types
+
    
+
    
+
    
+NMClient::active-connection-removed, object signal in nm-types
+
    
+
    
+
    
 NMClient::any-device-added, object signal in nm-types
 
    
 
    
@@ -569,6 +581,14 @@
 
 
    
 
    
+NM_CLIENT_ACTIVE_CONNECTION_ADDED, macro in NMClient
+
    
+
    
+
    
+NM_CLIENT_ACTIVE_CONNECTION_REMOVED, macro in NMClient
+
    
+
    
+
    
 nm_client_add_and_activate_connection_async, function in NMClient
 
    
 
    
@@ -1254,6 +1274,10 @@
 
 
    
 
    
+NM_DBUS_INTERFACE_DEVICE_STATISTICS, macro in nm-dbus-interface
+
    
+
    
+
    
 NM_DBUS_INTERFACE_DEVICE_TEAM, macro in nm-dbus-interface
 
    
 
    
@@ -1470,6 +1494,14 @@
 
 
    
 
    
+NM_DEPRECATED_IN_1_4, macro in nm-version
+
    
+
    
+
    
+NM_DEPRECATED_IN_1_4_FOR, macro in nm-version
+
    
+
    
+
    
 NMDevice, struct in nm-types
 
    
 
    
@@ -1818,6 +1850,10 @@
 
 
    
 
    
+NMDeviceTeam:config, object property in nm-types
+
    
+
    
+
    
 NMDeviceTeam:hw-address, object property in nm-types
 
    
 
    
@@ -2674,10 +2710,18 @@
 
 
    
 
    
+NM_DEVICE_TEAM_CONFIG, macro in NMDeviceTeam
+
    
+
    
+
    
 nm_device_team_get_carrier, function in NMDeviceTeam
 
    
 
    
 
    
+nm_device_team_get_config, function in NMDeviceTeam
+
    
+
    
+
    
 nm_device_team_get_hw_address, function in NMDeviceTeam
 
    
 
    
@@ -3598,6 +3642,10 @@
 NM_REMOTE_CONNECTION_VISIBLE, macro in NMRemoteConnection
 
 
    
+
    
+NMRollbackResult, enum in nm-dbus-interface
+
    
+
    
 
    S
    
 
    
 NMSecretAgentCapabilities, enum in nm-dbus-interface
@@ -4052,6 +4100,10 @@
 
    
 
    
 
    
+NMSettingConnection:stable-id, object property in NMSettingConnection
+
    
+
    
+
    
 NMSettingConnection:timestamp, object property in NMSettingConnection
 
    
 
    
@@ -4252,6 +4304,10 @@
 
 
    
 
    
+NMSettingIP6Config:token, object property in NMSettingIP6Config
+
    
+
    
+
    
 NMSettingIP6ConfigAddrGenMode, enum in NMSettingIP6Config
 
    
 
    
@@ -4768,6 +4824,10 @@
 
 
    
 
    
+NMSettingWired:generate-mac-address-mask, object property in NMSettingWired
+
    
+
    
+
    
 NMSettingWired:mac-address, object property in NMSettingWired
 
    
 
    
@@ -4832,6 +4892,10 @@
 
 
    
 
    
+NMSettingWireless:generate-mac-address-mask, object property in NMSettingWireless
+
    
+
    
+
    
 NMSettingWireless:hidden, object property in NMSettingWireless
 
    
 
    
@@ -5896,6 +5960,10 @@
 
 
    
 
    
+nm_setting_connection_get_stable_id, function in NMSettingConnection
+
    
+
    
+
    
 nm_setting_connection_get_timestamp, function in NMSettingConnection
 
    
 
    
@@ -5976,6 +6044,10 @@
 
 
    
 
    
+NM_SETTING_CONNECTION_STABLE_ID, macro in NMSettingConnection
+
    
+
    
+
    
 NM_SETTING_CONNECTION_TIMESTAMP, macro in NMSettingConnection
 
    
 
    
@@ -6456,6 +6528,10 @@
 
 
    
 
    
+nm_setting_ip6_config_get_token, function in NMSettingIP6Config
+
    
+
    
+
    
 NM_SETTING_IP6_CONFIG_IP6_PRIVACY, macro in NMSettingIP6Config
 
    
 
    
@@ -6492,6 +6568,10 @@
 
 
    
 
    
+NM_SETTING_IP6_CONFIG_TOKEN, macro in NMSettingIP6Config
+
    
+
    
+
    
 NM_SETTING_IP_CONFIG_ADDRESSES, macro in NMSettingIPConfig
 
    
 
    
@@ -7624,6 +7704,10 @@
 
 
    
 
    
+NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK, macro in NMSettingWired
+
    
+
    
+
    
 nm_setting_wired_get_auto_negotiate, function in NMSettingWired
 
    
 
    
@@ -7636,6 +7720,10 @@
 
 
    
 
    
+nm_setting_wired_get_generate_mac_address_mask, function in NMSettingWired
+
    
+
    
+
    
 nm_setting_wired_get_mac_address, function in NMSettingWired
 
    
 
    
@@ -7788,6 +7876,10 @@
 
 
    
 
    
+NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK, macro in NMSettingWireless
+
    
+
    
+
    
 nm_setting_wireless_get_band, function in NMSettingWireless
 
    
 
    
@@ -7804,6 +7896,10 @@
 
 
    
 
    
+nm_setting_wireless_get_generate_mac_address_mask, function in NMSettingWireless
+
    
+
    
+
    
 nm_setting_wireless_get_hidden, function in NMSettingWireless
 
    
 
    
@@ -8494,6 +8590,10 @@
 
 
    
 
    
+NMVpnEditorPluginVT, struct in NMVpnEditorPlugin
+
    
+
    
+
    
 NMVpnIterFunc, user_function in NMSettingVpn
 
    
 
    
@@ -8562,14 +8662,26 @@ NMVpnPluginInfo, struct in nm-vpn-plugin-info
 
 
    
 
    
+nm_vpn_editor_plugin_get_plugin_info, function in NMVpnEditorPlugin
+
    
+
    
+
    
 nm_vpn_editor_plugin_get_suggested_filename, function in NMVpnEditorPlugin
 
    
 
    
 
    
+nm_vpn_editor_plugin_get_vt, function in NMVpnEditorPlugin
+
    
+
    
+
    
 nm_vpn_editor_plugin_import, function in NMVpnEditorPlugin
 
    
 
    
 
    
+nm_vpn_editor_plugin_load, function in NMVpnEditorPlugin
+
    
+
    
+
    
 nm_vpn_editor_plugin_load_from_file, function in NMVpnEditorPlugin
 
    
 
    
@@ -8582,6 +8694,10 @@ NMVpnPluginInfo, struct in nm-vpn-plugin-info
 
 
    
 
    
+nm_vpn_editor_plugin_set_plugin_info, function in NMVpnEditorPlugin
+
    
+
    
+
    
 nm_vpn_editor_update_connection, function in NMVpnEditor
 
    
 
    
@@ -8698,6 +8814,10 @@ NM_VPN_PLUGIN_INFO_NAME, macro in nm-vpn-plugin-info
 
 
    
 
    
+NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
+
    
+
    
+
    
 NM_VPN_PLUGIN_IP4_CONFIG_PTP, macro in nm-vpn-dbus-interface
 
    
 
    
@@ -8742,6 +8862,10 @@ NM_VPN_PLUGIN_INFO_NAME, macro in nm-vpn-plugin-info
 
 
    
 
    
+NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
+
    
+
    
+
    
 NM_VPN_PLUGIN_IP6_CONFIG_PTP, macro in nm-vpn-dbus-interface
 
    
 
    
@@ -8828,6 +8952,6 @@ NM_VPN_SERVICE_PLUGIN_STATE, macro in nm-vpn-service-plugin
 
    
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/ch02.html b/docs/libnm/html/ch02.html
index 64f06223..c1e74fc1 100644
--- a/docs/libnm/html/ch02.html
+++ b/docs/libnm/html/ch02.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,6 +41,6 @@
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/ch03.html b/docs/libnm/html/ch03.html
index 79fcec44..e500c1ec 100644
--- a/docs/libnm/html/ch03.html
+++ b/docs/libnm/html/ch03.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -132,6 +132,6 @@ use WEP, LEAP, WPA or WPA2/RSN security    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/ch04.html b/docs/libnm/html/ch04.html
index 07e8b676..71a344e8 100644
--- a/docs/libnm/html/ch04.html
+++ b/docs/libnm/html/ch04.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -101,6 +101,6 @@
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/ch05.html b/docs/libnm/html/ch05.html
index 8dd164e2..467f6474 100644
--- a/docs/libnm/html/ch05.html
+++ b/docs/libnm/html/ch05.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -32,6 +32,6 @@
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/ch06.html b/docs/libnm/html/ch06.html
index c4aadccf..b214f75e 100644
--- a/docs/libnm/html/ch06.html
+++ b/docs/libnm/html/ch06.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -32,6 +32,6 @@
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index 8794d373..cb9bddb3 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 
    
 
    
 
    
-      for libnm 1.2.4
+      for libnm 1.4.0
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm/stable/.
@@ -277,6 +277,6 @@ use WEP, LEAP, WPA or WPA2/RSN security
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml
deleted file mode 100644
index 82b34062..00000000
--- a/docs/libnm/html/index.sgml
+++ /dev/null
@@ -1,3230 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index cafcbd4b..29d2ff19 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -174,6 +174,10 @@
 
 
 #define
+NM_DBUS_INTERFACE_DEVICE_STATISTICS
+
+
+#define
 NM_DBUS_INTERFACE_SETTINGS
 
 
@@ -348,6 +352,14 @@
 enum
 NMIPTunnelMode
 
+
+enum
+NMCheckpointCreateFlags
+
+
+enum
+NMRollbackResult
+
 
 
 
@@ -582,6 +594,12 @@
 
 
    
 
    
+
    NM_DBUS_INTERFACE_DEVICE_STATISTICS
    
+
    #define NM_DBUS_INTERFACE_DEVICE_STATISTICS NM_DBUS_INTERFACE_DEVICE ".Statistics"
+
    
+
    
+
    
+
    
 
    NM_DBUS_INTERFACE_SETTINGS
    
 
    #define NM_DBUS_INTERFACE_SETTINGS        "org.freedesktop.NetworkManager.Settings"
 
    
@@ -639,7 +657,7 @@
 
    enum NMState
    
 
    NMState values indicate the current overall networking state.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -711,7 +729,7 @@
 
    
 
    enum NMConnectivityState
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

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

 
    @@ -932,7 +950,7 @@ GSM/UMTS, or LTE network access protocols
    enum NMDeviceCapabilities
    General device capability flags.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -977,7 +995,7 @@ GSM/UMTS, or LTE network access protocols
    enum NMDeviceWifiCapabilities
    802.11 specific device encryption and authentication capabilities.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -1078,7 +1096,7 @@ GSM/UMTS, or LTE network access protocols
    enum NM80211ApFlags
    802.11 access point flags.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -1112,7 +1130,7 @@ encryption (usually means WEP)
    
 the current security requirements of an access point as determined from the
 access point's beacon.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -1213,7 +1231,7 @@ is supported
    enum NM80211Mode
    Indicates the 802.11 mode an access point or device is currently in.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -1265,7 +1283,7 @@ is supported
    NMBluetoothCapabilities values indicate the usable capabilities of a
 Bluetooth device.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -1306,7 +1324,7 @@ technology families a modem device supports.  For more information on the
 specific access technologies the device supports use the ModemManager D-Bus
 API.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -1361,7 +1379,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability
    enum NMWimaxNspNetworkType
    WiMAX network type.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -1405,7 +1423,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability
    
 
    enum NMDeviceState
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -1535,7 +1553,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability
    enum NMDeviceStateReason
    Device state change reason codes
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -1992,7 +2010,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability
    
 
    enum NMMetered
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -2047,7 +2065,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability
    
 specific network while it is starting, connected, or disconnecting from that
 network.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -2101,7 +2119,7 @@ network.
    enum NMSecretAgentGetSecretsFlags
    NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -2172,7 +2190,7 @@ network.
    enum NMSecretAgentCapabilities
    NMSecretAgentCapabilities indicate various capabilities of the agent.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -2313,7 +2331,7 @@ VPN plugin authentication dialogs.
    enum NMIPTunnelMode
    The tunneling mode.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -2396,9 +2414,88 @@ VPN plugin authentication dialogs.
    Since: 1.2
    
+
    
+
    
+
    enum NMCheckpointCreateFlags
    
+
    The flags for CheckpointCreate call
    
+
    
+
    Members
    
+
    
 
 

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




    NM_CHECKPOINT_CREATE_FLAG_NONE
    		
+
    no flags
    
+    		 
    NM_CHECKPOINT_CREATE_FLAG_DESTROY_ALL
    		
+
    when creating
+  a new checkpoint, destroy all existing ones.
    
+    		 
    
+
    
+
    Since: 1.4
    
+
    
+
    
+
    
+
    enum NMRollbackResult
    
+
    The result of a checkpoint Rollback() operation for a specific device.
    
+
    
+
    Members
    
+
    
+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    




    NM_ROLLBACK_RESULT_OK
    		
+
    the rollback succeeded.
    
+    		 
    NM_ROLLBACK_RESULT_ERR_NO_DEVICE
    		
+
    the device no longer exists.
    
+    		 
    NM_ROLLBACK_RESULT_ERR_DEVICE_UNMANAGED
    		
+
    the device is now unmanaged.
    
+    		 
    NM_ROLLBACK_RESULT_ERR_FAILED
    		
+
    other errors during rollback.
    
+    		 
    
+
    
+
    Since: 1.4
    
+
    
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index 13444902..8a52029f 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -49,10 +49,6 @@
 
 
 
-#define
-NM_AGENT_MANAGER_ERROR
-
-
 
 GQuark
 
@@ -85,10 +81,6 @@
 
 
 
-#define
-NM_MANAGER_ERROR
-
-
 
 GQuark
 
@@ -97,10 +89,6 @@
 
 
 
-#define
-NM_SECRET_AGENT_ERROR
-
-
 
 GQuark
 
@@ -109,14 +97,6 @@
 
 
 
-#define
-NM_SETTINGS_ERROR
-
-
-#define
-NM_VPN_PLUGIN_ERROR
-
-
 
 GQuark
 
@@ -140,6 +120,10 @@
 NMAgentManagerError
 
 
+#define
+NM_AGENT_MANAGER_ERROR
+
+
 enum
 NMConnectionError
 
@@ -168,17 +152,33 @@
 NMManagerError
 
 
+#define
+NM_MANAGER_ERROR
+
+
 enum
 NMSecretAgentError
 
 
+#define
+NM_SECRET_AGENT_ERROR
+
+
 enum
 NMSettingsError
 
 
+#define
+NM_SETTINGS_ERROR
+
+
 enum
 NMVpnPluginError
 
+
+#define
+NM_VPN_PLUGIN_ERROR
+
 
 
 
@@ -207,12 +207,6 @@ nm_agent_manager_error_quark (voi
 
 
    
 
    
-
    NM_AGENT_MANAGER_ERROR
    
-
    #define NM_AGENT_MANAGER_ERROR (nm_agent_manager_error_quark ())
-
    
-
    
-
    
-
    
 
    nm_connection_error_quark ()
    
 
    GQuark
 nm_connection_error_quark (void);
    
@@ -237,42 +231,18 @@ nm_manager_error_quark (void
 
    
 
    
-
    NM_MANAGER_ERROR
    
-
    #define NM_MANAGER_ERROR (nm_manager_error_quark ())
-
    
-
    
-
    
-
    
 
    nm_secret_agent_error_quark ()
    
 
    GQuark
 nm_secret_agent_error_quark (void);
    
 
    
 
    
 
    
-
    NM_SECRET_AGENT_ERROR
    
-
    #define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
-
    
-
    
-
    
-
    
 
    nm_settings_error_quark ()
    
 
    GQuark
 nm_settings_error_quark (void);
    
 
    
 
    
 
    
-
    NM_SETTINGS_ERROR
    
-
    #define NM_SETTINGS_ERROR (nm_settings_error_quark ())
-
    
-
    
-
    
-
    
-
    NM_VPN_PLUGIN_ERROR
    
-
    #define NM_VPN_PLUGIN_ERROR      (nm_vpn_plugin_error_quark ())
-
    
-
    
-
    
-
    
 
    nm_vpn_plugin_error_quark ()
    
 
    GQuark
 nm_vpn_plugin_error_quark (void);
    
@@ -287,7 +257,7 @@ nm_vpn_plugin_error_quark (voidnm_client_activate_connection()), and correspond to D-Bus
 errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -348,15 +318,21 @@ errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.
    
+
    NM_AGENT_MANAGER_ERROR
    
+
    #define NM_AGENT_MANAGER_ERROR (nm_agent_manager_error_quark ())
+
    
+
    
+
    
+
    
 
    enum NMConnectionError
    
 
    Describes errors that may result from operations involving a NMConnection
-or its NMSettings.
    
+or its NMSettings.
    
 
    These errors may be returned directly from NMConnection and NMSetting
 methods, or may be returned from D-Bus operations (eg on NMClient or
 NMDevice), where they correspond to errors in the
 "org.freedesktop.NetworkManager.Settings.Connection" namespace.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -453,7 +429,7 @@ methods, or may be returned from D-Bus operations (eg on NMSetting8021x operations.
    
-
    Members
    
+
    Members
    
 
    
 
 

 
    @@ -522,7 +498,7 @@ and some 
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -616,7 +592,7 @@ These may be returned from 
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -727,6 +703,12 @@ errors in that namespace.
    
+
    NM_MANAGER_ERROR
    
+
    #define NM_MANAGER_ERROR (nm_manager_error_quark ())
+
    
+
    
+
    
+
    
 
    enum NMSecretAgentError
    
 
    NMSecretAgentError values are passed by secret agents back to NetworkManager
 when they encounter problems retrieving secrets on behalf of NM. They
@@ -736,7 +718,7 @@ namespace.
    
 codes; instead, the secret agent manager will translate them to the
 corresponding NMAgentManagerError codes.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -796,6 +778,12 @@ corresponding 
 
    
 
    
+
    NM_SECRET_AGENT_ERROR
    
+
    #define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
+
    
+
    
+
    
+
    
 
    enum NMSettingsError
    
 
    Errors related to the settings/persistent configuration interface of
 NetworkManager.
    
@@ -803,7 +791,7 @@ NetworkManager.
    
 the "org.freedesktop.NetworkManager.Settings" interface, and correspond to
 D-Bus errors in that namespace.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -867,11 +855,17 @@ D-Bus errors in that namespace.
    
+
    NM_SETTINGS_ERROR
    
+
    #define NM_SETTINGS_ERROR (nm_settings_error_quark ())
+
    
+
    
+
    
+
    
 
    enum NMVpnPluginError
    
 
    Returned by the VPN service plugin to indicate errors. These codes correspond
 to errors in the "org.freedesktop.NetworkManager.VPN.Error" namespace.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
 
    @@ -965,9 +959,15 @@ to errors in the "org.freedesktop.NetworkManager.VPN.Error" namespace.
    
 
 

 
    
 
    
 
    
+
    
+
    
+
    NM_VPN_PLUGIN_ERROR
    
+
    #define NM_VPN_PLUGIN_ERROR      (nm_vpn_plugin_error_quark ())
+
    
+
    
 
    
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 1ae50f34..2ffb16a2 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -571,7 +571,7 @@ nm_utils_is_empty_ssid (const gui
 AP's SSID.  This function attempts to detect blank/empty SSIDs using a
 number of known SSID-cloaking methods.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -594,7 +594,7 @@ number of known SSID-cloaking methods.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the SSID is "empty", FALSE if it is not
    
 
    
 
@@ -609,7 +609,7 @@ replacing embedded NULLs and non-printable characters with the hexadecimal
 representation of that character.  Intended for debugging only, should not
 be used for display of SSIDs.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -632,7 +632,7 @@ be used for display of SSIDs.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     pointer to the escaped SSID, which uses an internal static buffer
 and will be overwritten by subsequent calls to this function
    
 
    
@@ -653,7 +653,7 @@ and thus was changed.  This function compensates for that behavior at the
 cost of some compatibility with odd SSIDs that may legitimately have trailing
 NULLs, even though that is functionally pointless.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -692,7 +692,7 @@ NULLs, even though that is functionally pointless.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the SSIDs are the same, FALSE if they are not
    
 
    
 
@@ -722,7 +722,7 @@ into a printable UTF-8 string, using roughly the following procedure:
    
 
    Again, this function should be used for debugging and display purposes
 _only_.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -745,7 +745,7 @@ _only_.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    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. 
    
@@ -769,7 +769,7 @@ type, and AP capabilities intersect.
    
 
    NOTE: this function cannot handle checking security for AP/Hotspot mode;
 use nm_utils_ap_mode_security_valid() instead.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -823,7 +823,7 @@ e.g. (
-
    Returns
    
+
    Returns
     TRUE if the device capabilities and AP capabilties intersect and are
 compatible with the desired type
 , FALSE if they are not
    
@@ -839,7 +839,7 @@ nm_utils_ap_mode_security_valid (
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
    @@ -863,7 +863,7 @@ e.g. 
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the device capabilities are compatible with the desired
 type
 , FALSE if they are not.
    
@@ -878,7 +878,7 @@ nm_utils_wep_key_valid (const cha
 
    Checks if key
  is a valid WEP key
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -900,7 +900,7 @@ nm_utils_wep_key_valid (const cha
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if key
 is a WEP key, FALSE if not
    
 
    
@@ -913,7 +913,7 @@ nm_utils_wpa_psk_valid (const cha
 
    Checks if psk
  is a valid WPA PSK
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -928,7 +928,7 @@ nm_utils_wpa_psk_valid (const cha
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if psk
 is a WPA PSK, FALSE if not
    
 
    
@@ -941,7 +941,7 @@ nm_utils_ip4_dns_to_variant (char
 
    Utility function to convert an array of IP address strings int a GVariant of
 type 'au' representing an array of IPv4 addresses.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -956,7 +956,7 @@ type 'au' representing an array of IPv4 addresses.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new floating GVariant representing dns
 . 
    
 
    [transfer none]
    
@@ -970,7 +970,7 @@ nm_utils_ip4_dns_from_variant (GV
 
    Utility function to convert a GVariant of type 'au' representing a list of
 IPv4 addresses into an array of IP address strings.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -985,7 +985,7 @@ IPv4 addresses into an array of IP address strings.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a NULL-terminated array of IP address strings. 
    
 
    [transfer full][type utf8]
    
 
    
@@ -1003,7 +1003,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1025,7 +1025,7 @@ gateway). The "gateway" field of the first address will get the value of
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new floating GVariant representing addresses
 . 
    
 
    [transfer none]
    
@@ -1044,7 +1044,7 @@ the first address (if set) will be returned in out_g
 ; the "gateway" fields
 of the other addresses are ignored.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1066,7 +1066,7 @@ of the other addresses are ignored.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated
 GPtrArray of NMIPAddress objects. 
    
 
    [transfer full][element-type NMIPAddress]
    
@@ -1082,7 +1082,7 @@ IPv4 routes into a GVariant of type 'aau' representing
 NetworkManager IPv4 routes (which are tuples of route, prefix, next hop, and
 metric).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1091,13 +1091,13 @@ metric).
    
-
+
    
 
 

 
 
    
 
    routes
     an array of NMIP4Route objects. 
     an array of NMIP4Route objects. 
    		
 [element-type NMIPRoute]
 
    
 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new floating GVariant representing routes
 . 
    
 
    [transfer none]
    
@@ -1112,7 +1112,7 @@ nm_utils_ip4_routes_from_variant (GPtrArray of NMIPRoute objects.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1127,7 +1127,7 @@ and metric) into a GPtrArray of 
-
    Returns
    
+
    Returns
     a newly allocated
 GPtrArray of NMIPRoute objects. 
    [transfer full][element-type NMIPRoute]
    
@@ -1139,7 +1139,7 @@ and metric) into a GPtrArray of guint32
 nm_utils_ip4_netmask_to_prefix (guint32 netmask);
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

 
 
    @@ -1154,7 +1154,7 @@ nm_utils_ip4_netmask_to_prefix (g
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the CIDR prefix represented by the netmask
    
 
    
 
    
@@ -1164,7 +1164,7 @@ nm_utils_ip4_netmask_to_prefix (g
 
    guint32
 nm_utils_ip4_prefix_to_netmask (guint32 prefix);
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1179,7 +1179,7 @@ nm_utils_ip4_prefix_to_netmask (g
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the netmask represented by the prefix, in network byte order
    
 
    
 
    
@@ -1193,7 +1193,7 @@ 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
 falls in the predefined classes.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1208,7 +1208,7 @@ falls in the predefined classes.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the default class prefix for the given IP
    
 
    
 
    
@@ -1220,7 +1220,7 @@ nm_utils_ip6_dns_to_variant (char
 
    Utility function to convert an array of IP address strings int a GVariant of
 type 'aay' representing an array of IPv6 addresses.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1235,7 +1235,7 @@ type 'aay' representing an array of IPv6 addresses.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new floating GVariant representing dns
 . 
    
 
    [transfer none]
    
@@ -1249,7 +1249,7 @@ nm_utils_ip6_dns_from_variant (GV
 
    Utility function to convert a GVariant of type 'aay' representing a list of
 IPv6 addresses into an array of IP address strings.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1264,7 +1264,7 @@ IPv6 addresses into an array of IP address strings.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a NULL-terminated array of IP address strings. 
    
 
    [transfer full][type utf8]
    
 
    
@@ -1283,7 +1283,7 @@ gateway).  The "gateway" field of the first address will get the value of
  (if non-NULL). In all of the other addresses, that field will be
 all 0s.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1305,7 +1305,7 @@ all 0s.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new floating GVariant representing addresses
 . 
    
 
    [transfer none]
    
@@ -1324,7 +1324,7 @@ of the first address (if set) will be returned in ou
 ; the "gateway"
 fields of the other addresses are ignored.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1346,7 +1346,7 @@ fields of the other addresses are ignored.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated
 GPtrArray of NMIPAddress objects. 
    
 
    [transfer full][element-type NMIPAddress]
    
@@ -1362,7 +1362,7 @@ IPv6 routes into a GVariant of type 'a(ayuayu)' repres
 NetworkManager IPv6 routes (which are tuples of route, prefix, next hop, and
 metric).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1377,7 +1377,7 @@ metric).
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new floating GVariant representing routes
 . 
    
 
    [transfer none]
    
@@ -1392,7 +1392,7 @@ nm_utils_ip6_routes_from_variant (GPtrArray of NMIPRoute objects.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1407,7 +1407,7 @@ hop, and metric) into a GPtrArray of 
 
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated
 GPtrArray of NMIPRoute objects. 
    
 
    [transfer full][element-type NMIPRoute]
    
@@ -1424,7 +1424,7 @@ 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.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -1439,7 +1439,7 @@ include additional attributes.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new floating GVariant representing addresses
 . 
    
 
    [transfer none]
    
@@ -1456,7 +1456,7 @@ NetworkManager IPv4 or IPv6 addresses (as described in the documentation for
 nm_utils_ip_addresses_to_variant()) into a GPtrArray of NMIPAddress
 objects.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1478,7 +1478,7 @@ objects.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated
 GPtrArray of NMIPAddress objects. 
    
 
    [transfer full][element-type NMIPAddress]
    
@@ -1494,7 +1494,7 @@ IPv4 or IPv6 routes into a GVariant of type 'aa{sv}' r
 of new-style NetworkManager IP routes (which are tuples of destination,
 prefix, next hop, metric, and additional attributes).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1509,7 +1509,7 @@ prefix, next hop, metric, and additional attributes).
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new floating GVariant representing routes
 . 
    
 
    [transfer none]
    
@@ -1526,7 +1526,7 @@ NetworkManager IPv4 or IPv6 addresses (which are tuples of destination,
 prefix, next hop, metric, and additional attributes) into a GPtrArray of
 NMIPRoute objects.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1548,7 +1548,7 @@ prefix, next hop, metric, and additional attributes) into a G
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated
 GPtrArray of NMIPRoute objects. 
    
 
    [transfer full][element-type NMIPRoute]
    
@@ -1560,7 +1560,7 @@ prefix, next hop, metric, and additional attributes) into a G
 
    char *
 nm_utils_uuid_generate (void);
    
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated UUID suitable for use as the NMSettingConnection
 object's “id”: property.  Should be freed with g_free()
    
 
    
@@ -1575,7 +1575,7 @@ nm_utils_file_is_certificate (const 
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1590,7 +1590,7 @@ recognized by NetworkManager.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the file is a certificate, FALSE if it is not
    
 
    
 
    
@@ -1605,7 +1605,7 @@ nm_utils_file_is_private_key (const 
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1627,7 +1627,7 @@ recognized by NetworkManager.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the file is a private key, FALSE if it is not
    
 
    
 
    
@@ -1639,7 +1639,7 @@ nm_utils_file_is_pkcs12 (const ch
 
    Tests if filename
  is a PKCS#12 file.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1654,7 +1654,7 @@ nm_utils_file_is_pkcs12 (const ch
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the file is PKCS#12, FALSE if it is not
    
 
    
 
    
@@ -1689,7 +1689,7 @@ nm_utils_file_search_in_paths (const paths
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1748,7 +1748,7 @@ function. 
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     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. 
    
@@ -1762,7 +1762,7 @@ invocations of the function might overwrite it. 
    
 nm_utils_wifi_freq_to_channel (guint32 freq);
 
    Utility function to translate a Wi-Fi frequency to its corresponding channel.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1777,7 +1777,7 @@ nm_utils_wifi_freq_to_channel (gu
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the channel represented by the frequency or 0
    
 
    
 
    
@@ -1789,7 +1789,7 @@ nm_utils_wifi_channel_to_freq (gu
                                const char *band);
 
    Utility function to translate a Wi-Fi channel to its corresponding frequency.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1811,7 +1811,7 @@ nm_utils_wifi_channel_to_freq (gu
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the frequency represented by the channel of the band,
 or -1 when the freq is invalid, or 0 when the band
 is invalid
    
@@ -1826,7 +1826,7 @@ nm_utils_wifi_find_next_channel (
                                  char *band);
 
    Utility function to find out next/previous Wi-Fi channel for a channel.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1853,7 +1853,7 @@ nm_utils_wifi_find_next_channel (
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the next channel in the specified direction or 0
    
 
    
 
    
@@ -1865,7 +1865,7 @@ nm_utils_wifi_is_channel_valid (g
                                 const char *band);
 
    Utility function to verify Wi-Fi channel validity.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1887,7 +1887,7 @@ nm_utils_wifi_is_channel_valid (g
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE or FALSE
    
 
    
 
    
@@ -1898,7 +1898,7 @@ nm_utils_wifi_is_channel_valid (g
 nm_utils_wifi_2ghz_freqs (void);
 
    Utility function to return 2.4 GHz Wi-Fi frequencies (802.11bg band).
    
 
    
-
    Returns
    
+
    Returns
    
 
     zero-terminated array of frequencies numbers (in MHz)
    
 
    
 
    Since: 1.2
    
@@ -1910,7 +1910,7 @@ nm_utils_wifi_2ghz_freqs (void    void);
 
    Utility function to return 5 GHz Wi-Fi frequencies (802.11a band).
    
 
    
-
    Returns
    
+
    Returns
    
 
     zero-terminated array of frequencies numbers (in MHz)
    
 
    
 
    Since: 1.2
    
@@ -1926,7 +1926,7 @@ strength suitable for printing to stdout. If the current locale and terminal
 support it, this will use unicode graphics characters to represent
 "bars". Otherwise it will use 0 to 4 asterisks.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1941,7 +1941,7 @@ support it, this will use unicode graphics characters to represent
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the graphical representation of the access point strength
    
 
    
 
    
@@ -1955,7 +1955,7 @@ nm_utils_hwaddr_len (int t
 
    It is an error to call this function with any value other than
 ARPHRD_ETHER or ARPHRD_INFINIBAND.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -1971,7 +1971,7 @@ nm_utils_hwaddr_len (int t
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the length.
    
 
    
 
    
@@ -1984,7 +1984,7 @@ nm_utils_hwaddr_ntoa (gconstpoint
 
    Converts addr
  to textual form.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2007,7 +2007,7 @@ nm_utils_hwaddr_ntoa (gconstpoint
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the textual form of addr
 . 
    
 
    [transfer full]
    
@@ -2023,7 +2023,7 @@ nm_utils_hwaddr_atoba (const char
  and converts it to binary form in a GByteArray. See
 nm_utils_hwaddr_aton() if you don't want a GByteArray.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2045,7 +2045,7 @@ nm_utils_hwaddr_atoba (const char
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a new GByteArray, or NULL if asc
 couldn't
 be parsed. 
    
@@ -2065,7 +2065,7 @@ nm_utils_hwaddr_aton (const char<
 Bytes in asc
  can be sepatared by colons (:), or hyphens (-), but not mixed.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2093,7 +2093,7 @@ the size of the buffer in bytes.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     buffer
 , or NULL if asc
 couldn't be parsed
@@ -2111,7 +2111,7 @@ nm_utils_hwaddr_valid (const char
  to see if it is a valid hardware address of the given
 length.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2135,7 +2135,7 @@ is expected to convert to
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if asc
 appears to be a valid hardware address
 of the indicated length, FALSE if not.
    
@@ -2152,7 +2152,7 @@ nm_utils_hwaddr_canonical (const 
 length, and if so, returns it in canonical form (uppercase, with
 leading 0s as needed, and with colons rather than hyphens).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2176,7 +2176,7 @@ is expected to convert to
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the canonicalized address if asc
 appears to
 be a valid hardware address of the indicated length, NULL if not. 
    
@@ -2223,7 +2223,7 @@ match. (This means that externally-provided address strings do not need to be
 sanity-checked before comparing them against known good addresses; they are
 guaranteed to not match if they are invalid.)
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2259,7 +2259,7 @@ is ASCII
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if hwaddr1
 and hwaddr2
 are equivalent, FALSE if they are
@@ -2279,7 +2279,7 @@ nm_utils_bin2hexstr (gconstpointe
 greater than -1, the returned string is terminated at that index
 (returned_string[final_len] == '\0'),
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2307,7 +2307,7 @@ array
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the textual form of bytes
 . 
    
 
    [transfer full]
    
@@ -2326,7 +2326,7 @@ eg "00:11" or "0:1".  Any "0x" at the beginning of h
 
 may not start or end with ':'.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2341,7 +2341,7 @@ may not start or end with ':'.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the converted bytes, or NULL on error. 
    
 
    [transfer full]
    
 
    
@@ -2354,7 +2354,7 @@ nm_utils_iface_valid_name (const 
 
    This function is a 1:1 copy of the kernel's interface validation
 function in net/core/dev.c.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2369,7 +2369,7 @@ function in net/core/dev.c.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if interface name is valid, otherwise FALSE is returned.
    
 
    
 
    
@@ -2381,7 +2381,7 @@ nm_utils_is_uuid (const charChecks if str
  is a UUID
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2396,7 +2396,7 @@ nm_utils_is_uuid (const char
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if str
 is a UUID, FALSE if not
    
 
    
@@ -2410,7 +2410,7 @@ nm_utils_inet4_ntop (in_addr_tWrapper for inet_ntop.
    
 
    [skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2441,7 +2441,7 @@ buffer to avoid these issues.
    
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the input buffer dst
 , or a pointer to an
 internal, static buffer. This function cannot fail.
    
@@ -2456,7 +2456,7 @@ nm_utils_inet6_ntop (const struct
 
    Wrapper for inet_ntop.
    
 
    [skip]
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2487,7 +2487,7 @@ buffer to avoid these issues.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     the input buffer dst
 , or a pointer to an
 internal, static buffer. NULL is not allowed as in6addr
@@ -2504,7 +2504,7 @@ nm_utils_ipaddr_valid (int
 
    Checks if ip
  contains a valid IP address of the given family.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2527,7 +2527,7 @@ nm_utils_ipaddr_valid (int
 
    
 
 

    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE or FALSE
    
 
    
 
    
@@ -2559,7 +2559,7 @@ compatible with virtual_type
 configuration of the two connections, or on the capabilities of an
 underlying device driver.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2582,7 +2582,7 @@ underlying device driver.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE or FALSE
    
 
    
 
    
@@ -2597,7 +2597,7 @@ available modes.
 The mode
  string can be either a descriptive name or a number (as string).
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2612,7 +2612,7 @@ The mode
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     numeric bond mode, or -1 on error
    
 
    
 
    Since: 1.2
    
@@ -2626,7 +2626,7 @@ nm_utils_bond_mode_int_to_string (
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2641,7 +2641,7 @@ available modes.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     bonding mode string, or NULL on error
    
 
    
 
    Since: 1.2
    
@@ -2657,7 +2657,7 @@ nm_utils_enum_to_str (GTypeG_TYPE_ENUM and the given value is not valid the
 function returns NULL.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2679,7 +2679,7 @@ function returns NULL.
    
 
 

 
    
 
    
 
    
-
    Returns
    
+
    Returns
    
 
     a newly allocated string or NULL
    
 
    
 
    Since: 1.2
    
@@ -2699,7 +2699,7 @@ the function returns FALSE and stores a pointer to
 containing the unrecognized token in err_token
 .
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    @@ -2731,7 +2731,7 @@ containing the unrecognized token in err_token
 
 
    
-
    Returns
    
+
    Returns
    
 
     TRUE if the conversion was successful, FALSE otherwise
    
 
    
 
    Since: 1.2
    
@@ -2745,7 +2745,7 @@ nm_utils_enum_get_values (GTypegint to);
 
    Returns the list of possible values for a given enum.
    
 
    
-
    Parameters
    
+
    Parameters
    
 
    
 
 

    @@ -2772,7 +2772,7 @@ nm_utils_enum_get_values (GType
 
 
    
-
    Returns
    
+
    Returns
    
 
     a NULL-terminated dynamically-allocated array of static strings
 or NULL on error. 
    
 
    [transfer full]
    
@@ -2788,7 +2788,7 @@ or NULL on error. 
    
 Used with nm_utils_security_valid() for checking whether a given access
 point is compatible with a network device.
    
 
    
-
    Members
    
+
    Members
    
 
    
 
 

    @@ -2890,6 +2890,6 @@ for both 
-
    Generated by GTK-Doc V1.24
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html
index 4af37c3c..73166291 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,14 +41,6 @@
     
-
-
-
-
-
-
-
-
@@ -65,6 +57,12 @@
 NM_DEPRECATED_IN_1_2_FOR()
 
 
+
+
+
+
    
 
 

 
    
 #defineNM_VERSION_MIN_REQUIRED
    #defineNM_VERSION_MAX_ALLOWED
    #define
 
 NM_DEPRECATED_IN_0_9_10_FOR()
 
    #define
+NM_DEPRECATED_IN_1_4_FOR()
+
    
     
 
    
 
    
@@ -78,6 +76,14 @@
 
 
 #define
+NM_VERSION_MIN_REQUIRED
+
+
+#define
+NM_VERSION_MAX_ALLOWED
+
+
+#define
 NM_DEPRECATED_IN_0_9_10
 
 
@@ -102,7 +108,11 @@
 
 
 #define
-NM_AVAILABLE_IN_1_2_4
+NM_DEPRECATED_IN_1_4
+
+
+#define
+NM_AVAILABLE_IN_1_4
 
 
 
    
@@ -113,18 +123,6 @@
 
    
 
    Functions
    
 
    
-
    NM_VERSION_MIN_REQUIRED
    
-
    # define NM_VERSION_MIN_REQUIRED (NM_VERSION_CUR_STABLE)
-
    
-
    
-
    
-
    
-
    NM_VERSION_MAX_ALLOWED
    
-
    # define NM_VERSION_MAX_ALLOWED (NM_VERSION_CUR_STABLE)
-
    
-
    
-
    
-
    
 
    NM_DEPRECATED_IN_0_9_10_FOR()
    
 
    # define NM_DEPRECATED_IN_0_9_10_FOR(f) G_DEPRECATED_FOR(f)
 
    
@@ -141,10 +139,28 @@
 
    # define NM_DEPRECATED_IN_1_2_FOR(f)    G_DEPRECATED_FOR(f)
 
    
 
    
+
    
+
    
+
    NM_DEPRECATED_IN_1_4_FOR()
    
+
    # define NM_DEPRECATED_IN_1_4_FOR(f)    G_DEPRECATED_FOR(f)
+
    
+
    
 
    
 
    
 
    Types and Values
    
 
    
+
    NM_VERSION_MIN_REQUIRED
    
+
    # define NM_VERSION_MIN_REQUIRED (NM_VERSION_CUR_STABLE)
+
    
+
    
+
    
+
    
+
    NM_VERSION_MAX_ALLOWED
    
+
    # define NM_VERSION_MAX_ALLOWED (NM_VERSION_CUR_STABLE)
+
    
+
    
+
    
+
    
 
    NM_DEPRECATED_IN_0_9_10
    
 
    # define NM_DEPRECATED_IN_0_9_10        G_DEPRECATED
 
    
@@ -180,13 +196,19 @@
 
    
 
    
 
    
-
    NM_AVAILABLE_IN_1_2_4
    
-
    # define NM_AVAILABLE_IN_1_2_4          G_UNAVAILABLE(1.2,4)
+
    NM_DEPRECATED_IN_1_4
    
+
    # define NM_DEPRECATED_IN_1_4           G_DEPRECATED
+
    
+
    
+
    
+
    
+
    NM_AVAILABLE_IN_1_4
    
+
    # define NM_AVAILABLE_IN_1_4            G_UNAVAILABLE(1,4)
 
    
 
    
 
    
 
    
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
    
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
index 299f1d09..b1fb6cab 100644
--- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -226,6 +226,10 @@
 
 
 #define
+NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES
+
+
+#define
 NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT
 
 
@@ -286,6 +290,10 @@
 
 
 #define
+NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES
+
+
+#define
 NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT
 
 
@@ -463,7 +471,7 @@
 
    enum NMVpnServiceState
    
 
    VPN daemon states
    
 
    
-
    Members
    
+
    Members
    
 
    @@ -529,7 +537,7 @@
 
    enum NMVpnConnectionState
    VPN connection states
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -606,7 +614,7 @@
 
    enum NMVpnConnectionStateReason
    VPN connection state reasons
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -719,7 +727,7 @@
 
    enum NMVpnPluginFailure
    VPN plugin failure reasons
    
-
    Members
    
+
    Members
    
 
    
 
 

 
 
    @@ -857,6 +865,12 @@
 
    
+
    NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES
    
+
    #define NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES "preserve-routes"
+
    
+
    
+
    
+
    
 
    NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT
    
 
    #define NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT "never-default"
 
    
@@ -947,6 +961,12 @@
 
    
+
    NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES
    
+
    #define NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES "preserve-routes"
+
    
+
    
+
    
+
    
 
    NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT
    
 
    #define NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT "never-default"
 
    
@@ -954,6 +974,6 @@
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
\ No newline at end of file
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index 5358ef52..7c7d25f6 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -168,6 +168,8 @@
     
     
     
+    
+    
     
     
     
@@ -194,6 +196,8 @@
     
     
     
+    
+    
     
     
     
@@ -231,19 +235,15 @@
     
     
     
-    
     
     
     
     
-    
     
-    
     
-    
-    
     
     
+    
     
     
     
@@ -251,9 +251,13 @@
     
     
     
+    
     
+    
     
+    
     
+    
     
     
     
@@ -287,6 +291,7 @@
     
     
     
+    
     
     
     
@@ -331,6 +336,8 @@
     
     
     
+    
+    
     
     
     
@@ -400,9 +407,6 @@
     
     
     
-    
-    
-    
     
     
     
@@ -417,6 +421,9 @@
     
     
     
+    
+    
+    
     
     
     
@@ -427,6 +434,7 @@
     
     
     
+    
     
     
     
@@ -458,6 +466,7 @@
     
     
     
+    
     
     
     
@@ -489,6 +498,7 @@
     
     
     
+    
     
     
     
@@ -906,9 +916,11 @@
     
     
     
+    
     
     
     
+    
     
     
     
@@ -920,6 +932,7 @@
     
     
     
+    
     
     
     
@@ -979,7 +992,7 @@
     
     
     
-    
+    
     
     
     
@@ -1245,7 +1258,6 @@
     
     
     
-    
     
     
     
@@ -1267,6 +1279,7 @@
     
     
     
+    
     
     
     
@@ -1369,6 +1382,7 @@
     
     
     
+    
     
     
     
@@ -1395,6 +1409,7 @@
     
     
     
+    
     
     
     
@@ -1406,6 +1421,7 @@
     
     
     
+    
     
     
     
@@ -1426,6 +1442,7 @@
     
     
     
+    
     
     
     
@@ -1451,6 +1468,7 @@
     
     
     
+    
     
     
     
@@ -1466,6 +1484,7 @@
     
     
     
+    
     
     
     
@@ -1791,11 +1810,14 @@
     
     
     
+    
     
     
     
+    
     
     
+    
     
     
     
@@ -2166,18 +2188,20 @@
     
     
     
-    
-    
     
     
     
+    
+    
+    
     
     
     
     
     
     
-    
+    
+    
     
     
     
@@ -2224,6 +2248,7 @@
     
     
     
+    
     
     
     
@@ -2239,21 +2264,27 @@
     
     
     
+    
     
     
     
     
     
+    
     
     
     
     
+    
+    
+    
     
     
     
     
     
     
+    
     
     
     
@@ -2272,6 +2303,8 @@
     
     
     
+    
+    
     
     
     
@@ -2529,6 +2562,12 @@
     
     
     
+    
+    
+    
+    
+    
+    
     
     
     
@@ -2661,5 +2700,16 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
   
 
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index 147fbcc2..586c6aa7 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -153,6 +153,6 @@
 
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/ref-overview.html b/docs/libnm/html/ref-overview.html
index 8d5ab916..e5b0b936 100644
--- a/docs/libnm/html/ref-overview.html
+++ b/docs/libnm/html/ref-overview.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -42,6 +42,6 @@
     
    
 
 
    
-
    Generated by GTK-Doc V1.24
    
+
    Generated by GTK-Doc V1.25
 
 
\ No newline at end of file
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index adb1dc9f..004e4b80 100644
--- a/docs/libnm/libnm-sections.txt
+++ b/docs/libnm/libnm-sections.txt
@@ -112,6 +112,8 @@ NM_CLIENT_ANY_DEVICE_REMOVED
 NM_CLIENT_PERMISSION_CHANGED
 NM_CLIENT_CONNECTION_ADDED
 NM_CLIENT_CONNECTION_REMOVED
+NM_CLIENT_ACTIVE_CONNECTION_ADDED
+NM_CLIENT_ACTIVE_CONNECTION_REMOVED
 NMClientPermission
 NMClientPermissionResult
 NMClientError
@@ -442,6 +444,7 @@ NM_DBUS_INTERFACE_DEVICE_MACVLAN
 NM_DBUS_INTERFACE_DEVICE_VXLAN
 NM_DBUS_INTERFACE_DEVICE_GRE
 NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL
+NM_DBUS_INTERFACE_DEVICE_STATISTICS
 NM_DBUS_INTERFACE_SETTINGS
 NM_DBUS_PATH_SETTINGS
 NM_DBUS_INTERFACE_SETTINGS_CONNECTION
@@ -486,6 +489,8 @@ NM_LLDP_DEST_NEAREST_BRIDGE
 NM_LLDP_DEST_NEAREST_NON_TPMR_BRIDGE
 NM_LLDP_DEST_NEAREST_CUSTOMER_BRIDGE
 NMIPTunnelMode
+NMCheckpointCreateFlags
+NMRollbackResult
 
 
 
    
@@ -839,10 +844,12 @@ nm_device_olpc_mesh_get_type
 NM_DEVICE_TEAM_HW_ADDRESS
 NM_DEVICE_TEAM_CARRIER
 NM_DEVICE_TEAM_SLAVES
+NM_DEVICE_TEAM_CONFIG
 NMDeviceTeam
 nm_device_team_get_hw_address
 nm_device_team_get_carrier
 nm_device_team_get_slaves
+nm_device_team_get_config
 
 NMDeviceTeamClass
 NM_DEVICE_TEAM
@@ -1559,6 +1566,7 @@ NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MAX
 NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_DEFAULT
 NM_SETTING_CONNECTION_ID
 NM_SETTING_CONNECTION_UUID
+NM_SETTING_CONNECTION_STABLE_ID
 NM_SETTING_CONNECTION_INTERFACE_NAME
 NM_SETTING_CONNECTION_TYPE
 NM_SETTING_CONNECTION_AUTOCONNECT
@@ -1580,6 +1588,7 @@ NMSettingConnection
 nm_setting_connection_new
 nm_setting_connection_get_id
 nm_setting_connection_get_uuid
+nm_setting_connection_get_stable_id
 nm_setting_connection_get_interface_name
 nm_setting_connection_get_connection_type
 nm_setting_connection_get_autoconnect
@@ -1965,6 +1974,7 @@ nm_setting_ip4_config_get_type
 NM_SETTING_IP6_CONFIG_SETTING_NAME
 NM_SETTING_IP6_CONFIG_IP6_PRIVACY
 NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE
+NM_SETTING_IP6_CONFIG_TOKEN
 NM_SETTING_IP6_CONFIG_METHOD_IGNORE
 NM_SETTING_IP6_CONFIG_METHOD_AUTO
 NM_SETTING_IP6_CONFIG_METHOD_DHCP
@@ -1977,6 +1987,7 @@ NMSettingIP6Config
 nm_setting_ip6_config_new
 nm_setting_ip6_config_get_ip6_privacy
 nm_setting_ip6_config_get_addr_gen_mode
+nm_setting_ip6_config_get_token
 
 NMSettingIP6ConfigClass
 NM_IS_SETTING_IP6_CONFIG
@@ -2366,6 +2377,7 @@ NM_SETTING_WIRED_DUPLEX
 NM_SETTING_WIRED_AUTO_NEGOTIATE
 NM_SETTING_WIRED_MAC_ADDRESS
 NM_SETTING_WIRED_CLONED_MAC_ADDRESS
+NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK
 NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
 NM_SETTING_WIRED_MTU
 NM_SETTING_WIRED_S390_SUBCHANNELS
@@ -2381,6 +2393,7 @@ nm_setting_wired_get_duplex
 nm_setting_wired_get_auto_negotiate
 nm_setting_wired_get_mac_address
 nm_setting_wired_get_cloned_mac_address
+nm_setting_wired_get_generate_mac_address_mask
 nm_setting_wired_get_mac_address_blacklist
 nm_setting_wired_get_num_mac_blacklist_items
 nm_setting_wired_get_mac_blacklist_item
@@ -2423,6 +2436,7 @@ NM_SETTING_WIRELESS_RATE
 NM_SETTING_WIRELESS_TX_POWER
 NM_SETTING_WIRELESS_MAC_ADDRESS
 NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
+NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK
 NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
 NM_SETTING_WIRELESS_MTU
 NM_SETTING_WIRELESS_SEEN_BSSIDS
@@ -2444,6 +2458,7 @@ nm_setting_wireless_get_rate
 nm_setting_wireless_get_tx_power
 nm_setting_wireless_get_mac_address
 nm_setting_wireless_get_cloned_mac_address
+nm_setting_wireless_get_generate_mac_address_mask
 nm_setting_wireless_get_mac_address_blacklist
 nm_setting_wireless_get_num_mac_blacklist_items
 nm_setting_wireless_get_mac_blacklist_item
@@ -2666,7 +2681,9 @@ NM_AVAILABLE_IN_1_0
 NM_DEPRECATED_IN_1_2
 NM_DEPRECATED_IN_1_2_FOR
 NM_AVAILABLE_IN_1_2
-NM_AVAILABLE_IN_1_2_4
+NM_DEPRECATED_IN_1_4
+NM_DEPRECATED_IN_1_4_FOR
+NM_AVAILABLE_IN_1_4
 
    
 
 
    
@@ -2736,6 +2753,7 @@ NM_VPN_PLUGIN_IP4_CONFIG_MSS
 NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN
 NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS
 NM_VPN_PLUGIN_IP4_CONFIG_ROUTES
+NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES
 NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT
 NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY
 NM_VPN_PLUGIN_IP4_CONFIG_BANNER
@@ -2751,6 +2769,7 @@ NM_VPN_PLUGIN_IP6_CONFIG_MSS
 NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN
 NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS
 NM_VPN_PLUGIN_IP6_CONFIG_ROUTES
+NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES
 NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT
 
    
 
@@ -2780,11 +2799,16 @@ NM_VPN_EDITOR_PLUGIN_SERVICE
 NMVpnEditorPluginInterface
 nm_vpn_editor_plugin_get_editor
 nm_vpn_editor_plugin_get_capabilities
+nm_vpn_editor_plugin_get_vt
 nm_vpn_editor_plugin_import
 nm_vpn_editor_plugin_export
 nm_vpn_editor_plugin_get_suggested_filename
 nm_vpn_editor_plugin_load_from_file
+nm_vpn_editor_plugin_load
+nm_vpn_editor_plugin_get_plugin_info
+nm_vpn_editor_plugin_set_plugin_info
 NMVpnEditor
+NMVpnEditorPluginVT
 
 NMVpnEditorPlugin
 NM_IS_VPN_EDITOR_PLUGIN
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index e8ea05db..88c5fb89 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.2.4
+1.4.0
diff --git a/examples/C/Makefile.in b/examples/C/Makefile.in
index 4f2a6a97..a0240aa9 100644
--- a/examples/C/Makefile.in
+++ b/examples/C/Makefile.in
@@ -90,8 +90,9 @@ host_triplet = @host@
 @WITH_QT_TRUE@am__append_1 = qt
 subdir = examples/C
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -226,6 +227,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -282,13 +284,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -300,6 +303,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -360,6 +365,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -395,6 +402,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/examples/C/glib/Makefile.in b/examples/C/glib/Makefile.in
index 4c6abd2b..949b884c 100644
--- a/examples/C/glib/Makefile.in
+++ b/examples/C/glib/Makefile.in
@@ -97,8 +97,9 @@ noinst_PROGRAMS = add-connection-gdbus$(EXEEXT) \
 	monitor-nm-state-gdbus$(EXEEXT)
 subdir = examples/C/glib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -264,6 +265,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -320,13 +322,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -338,6 +341,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -398,6 +403,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -433,6 +440,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/examples/C/qt/Makefile.in b/examples/C/qt/Makefile.in
index 6555d0d0..f5242deb 100644
--- a/examples/C/qt/Makefile.in
+++ b/examples/C/qt/Makefile.in
@@ -93,8 +93,9 @@ noinst_PROGRAMS = add-connection-wired$(EXEEXT) \
 	monitor-nm-running$(EXEEXT)
 subdir = examples/C/qt
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -236,6 +237,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -292,13 +294,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -310,6 +313,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -370,6 +375,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -405,6 +412,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/examples/Makefile.in b/examples/Makefile.in
index bc4acdd6..baa72b1f 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -89,8 +89,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = examples
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -225,6 +226,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -281,13 +283,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -299,6 +302,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -359,6 +364,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -394,6 +401,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/examples/dispatcher/Makefile.in b/examples/dispatcher/Makefile.in
index af6fb984..068eb732 100644
--- a/examples/dispatcher/Makefile.in
+++ b/examples/dispatcher/Makefile.in
@@ -89,8 +89,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = examples/dispatcher
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -165,6 +166,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -221,13 +223,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -239,6 +242,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -299,6 +304,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -334,6 +341,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/examples/lua/Makefile.in b/examples/lua/Makefile.in
index 9ebe048d..7c0b0bc9 100644
--- a/examples/lua/Makefile.in
+++ b/examples/lua/Makefile.in
@@ -89,8 +89,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = examples/lua
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -225,6 +226,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -281,13 +283,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -299,6 +302,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -359,6 +364,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -394,6 +401,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/examples/lua/lgi/Makefile.in b/examples/lua/lgi/Makefile.in
index 646192ed..04d0f714 100644
--- a/examples/lua/lgi/Makefile.in
+++ b/examples/lua/lgi/Makefile.in
@@ -89,8 +89,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = examples/lua/lgi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -165,6 +166,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -221,13 +223,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -239,6 +242,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -299,6 +304,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -334,6 +341,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/examples/python/Makefile.in b/examples/python/Makefile.in
index 9f39ae63..4baa2535 100644
--- a/examples/python/Makefile.in
+++ b/examples/python/Makefile.in
@@ -89,8 +89,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = examples/python
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -225,6 +226,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -281,13 +283,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -299,6 +302,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -359,6 +364,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -394,6 +401,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/examples/python/dbus/Makefile.in b/examples/python/dbus/Makefile.in
index 70a0d583..6387f543 100644
--- a/examples/python/dbus/Makefile.in
+++ b/examples/python/dbus/Makefile.in
@@ -89,8 +89,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = examples/python/dbus
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -165,6 +166,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -221,13 +223,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -239,6 +242,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -299,6 +304,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -334,6 +341,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/examples/python/gi/Makefile.in b/examples/python/gi/Makefile.in
index 362ecee5..4c8011ae 100644
--- a/examples/python/gi/Makefile.in
+++ b/examples/python/gi/Makefile.in
@@ -89,8 +89,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = examples/python/gi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -165,6 +166,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -221,13 +223,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -239,6 +242,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -299,6 +304,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -334,6 +341,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/examples/python/python-networkmanager/Makefile.in b/examples/python/python-networkmanager/Makefile.in
index e0d0bd37..2e5ce364 100644
--- a/examples/python/python-networkmanager/Makefile.in
+++ b/examples/python/python-networkmanager/Makefile.in
@@ -89,8 +89,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = examples/python/python-networkmanager
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -165,6 +166,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -221,13 +223,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -239,6 +242,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -299,6 +304,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -334,6 +341,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/examples/ruby/Makefile.in b/examples/ruby/Makefile.in
index 305a48eb..04a1388d 100644
--- a/examples/ruby/Makefile.in
+++ b/examples/ruby/Makefile.in
@@ -89,8 +89,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = examples/ruby
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -165,6 +166,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -221,13 +223,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -239,6 +242,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -299,6 +304,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -334,6 +341,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/examples/shell/Makefile.in b/examples/shell/Makefile.in
index 7afaeab8..d2c5426e 100644
--- a/examples/shell/Makefile.in
+++ b/examples/shell/Makefile.in
@@ -89,8 +89,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = examples/shell
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -165,6 +166,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -221,13 +223,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -239,6 +242,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -299,6 +304,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -334,6 +341,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/gtk-doc.make b/gtk-doc.make
index 9ccd0b04..e4a12a5b 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -142,7 +142,7 @@ GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
 GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
 
-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
 	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -153,6 +153,17 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO
 sgml.stamp: sgml-build.stamp
 	@true
 
+xml/gtkdocentities.ent: Makefile
+	$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+		echo ""; \
+	) > $@
+
 #### html ####
 
 GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index 3a627930..27b54e5d 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -17,6 +17,8 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-active-connection.h \
 	nmdbus-agent-manager.c \
 	nmdbus-agent-manager.h \
+	nmdbus-checkpoint.c \
+	nmdbus-checkpoint.h \
 	nmdbus-device-adsl.c \
 	nmdbus-device-adsl.h \
 	nmdbus-device-bond.c \
@@ -41,6 +43,8 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-device-modem.h \
 	nmdbus-device-olpc-mesh.c \
 	nmdbus-device-olpc-mesh.h \
+	nmdbus-device-statistics.c \
+	nmdbus-device-statistics.h \
 	nmdbus-device-team.c \
 	nmdbus-device-team.h \
 	nmdbus-device-tun.c \
@@ -81,6 +85,7 @@ nodist_libnmdbus_la_SOURCES = \
 DBUS_INTERFACE_DOCS = \
 	nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
 	nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
+	nmdbus-checkpoint-org.freedesktop.NetworkManager.Checkpoint.xml \
 	nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
 	nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
 	nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
@@ -111,7 +116,8 @@ DBUS_INTERFACE_DOCS = \
 	nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
 	nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
 	nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
-	nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
+	nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
+	nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml
 
 define _make_nmdbus_rule
 $(1): $(patsubst nmdbus-%.c,nm-%.xml,$(1))
@@ -139,6 +145,7 @@ EXTRA_DIST = \
 	nm-access-point.xml \
 	nm-active-connection.xml \
 	nm-agent-manager.xml \
+	nm-checkpoint.xml \
 	nm-device-adsl.xml \
 	nm-device-bond.xml \
 	nm-device-bridge.xml \
@@ -150,6 +157,7 @@ EXTRA_DIST = \
 	nm-device-macvlan.xml \
 	nm-device-modem.xml \
 	nm-device-olpc-mesh.xml \
+	nm-device-statistics.xml \
 	nm-device-team.xml \
 	nm-device-tun.xml \
 	nm-device-veth.xml \
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index 3f6bf9e6..63e8451d 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -90,8 +90,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = introspection
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -114,21 +115,21 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
 libnmdbus_la_LIBADD =
 nodist_libnmdbus_la_OBJECTS = nmdbus-access-point.lo \
 	nmdbus-active-connection.lo nmdbus-agent-manager.lo \
-	nmdbus-device-adsl.lo nmdbus-device-bond.lo \
-	nmdbus-device-bridge.lo nmdbus-device-bt.lo \
-	nmdbus-device-ethernet.lo nmdbus-device.lo \
+	nmdbus-checkpoint.lo nmdbus-device-adsl.lo \
+	nmdbus-device-bond.lo nmdbus-device-bridge.lo \
+	nmdbus-device-bt.lo nmdbus-device-ethernet.lo nmdbus-device.lo \
 	nmdbus-device-generic.lo nmdbus-device-infiniband.lo \
 	nmdbus-device-ip-tunnel.lo nmdbus-device-macvlan.lo \
 	nmdbus-device-modem.lo nmdbus-device-olpc-mesh.lo \
-	nmdbus-device-team.lo nmdbus-device-tun.lo \
-	nmdbus-device-veth.lo nmdbus-device-vlan.lo \
-	nmdbus-device-vxlan.lo nmdbus-device-wifi.lo \
-	nmdbus-device-wimax.lo nmdbus-dhcp4-config.lo \
-	nmdbus-dhcp6-config.lo nmdbus-ip4-config.lo \
-	nmdbus-ip6-config.lo nmdbus-manager.lo nmdbus-ppp-manager.lo \
-	nmdbus-secret-agent.lo nmdbus-settings-connection.lo \
-	nmdbus-settings.lo nmdbus-vpn-connection.lo \
-	nmdbus-vpn-plugin.lo
+	nmdbus-device-statistics.lo nmdbus-device-team.lo \
+	nmdbus-device-tun.lo nmdbus-device-veth.lo \
+	nmdbus-device-vlan.lo nmdbus-device-vxlan.lo \
+	nmdbus-device-wifi.lo nmdbus-device-wimax.lo \
+	nmdbus-dhcp4-config.lo nmdbus-dhcp6-config.lo \
+	nmdbus-ip4-config.lo nmdbus-ip6-config.lo nmdbus-manager.lo \
+	nmdbus-ppp-manager.lo nmdbus-secret-agent.lo \
+	nmdbus-settings-connection.lo nmdbus-settings.lo \
+	nmdbus-vpn-connection.lo nmdbus-vpn-plugin.lo
 libnmdbus_la_OBJECTS = $(nodist_libnmdbus_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -231,6 +232,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -287,13 +289,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -305,6 +308,8 @@ LIBOBJS = @LIBOBJS@
 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@
@@ -365,6 +370,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -400,6 +407,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -480,6 +488,8 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-active-connection.h \
 	nmdbus-agent-manager.c \
 	nmdbus-agent-manager.h \
+	nmdbus-checkpoint.c \
+	nmdbus-checkpoint.h \
 	nmdbus-device-adsl.c \
 	nmdbus-device-adsl.h \
 	nmdbus-device-bond.c \
@@ -504,6 +514,8 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-device-modem.h \
 	nmdbus-device-olpc-mesh.c \
 	nmdbus-device-olpc-mesh.h \
+	nmdbus-device-statistics.c \
+	nmdbus-device-statistics.h \
 	nmdbus-device-team.c \
 	nmdbus-device-team.h \
 	nmdbus-device-tun.c \
@@ -544,6 +556,7 @@ nodist_libnmdbus_la_SOURCES = \
 DBUS_INTERFACE_DOCS = \
 	nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
 	nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
+	nmdbus-checkpoint-org.freedesktop.NetworkManager.Checkpoint.xml \
 	nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
 	nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
 	nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
@@ -574,7 +587,8 @@ DBUS_INTERFACE_DOCS = \
 	nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
 	nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
 	nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
-	nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
+	nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
+	nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml
 
 BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS)
 CLEANFILES = $(BUILT_SOURCES)
@@ -582,6 +596,7 @@ EXTRA_DIST = \
 	nm-access-point.xml \
 	nm-active-connection.xml \
 	nm-agent-manager.xml \
+	nm-checkpoint.xml \
 	nm-device-adsl.xml \
 	nm-device-bond.xml \
 	nm-device-bridge.xml \
@@ -593,6 +608,7 @@ EXTRA_DIST = \
 	nm-device-macvlan.xml \
 	nm-device-modem.xml \
 	nm-device-olpc-mesh.xml \
+	nm-device-statistics.xml \
 	nm-device-team.xml \
 	nm-device-tun.xml \
 	nm-device-veth.xml \
@@ -672,6 +688,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-access-point.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-active-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-agent-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-checkpoint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-adsl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-bond.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-bridge.Plo@am__quote@
@@ -683,6 +700,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-macvlan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-modem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-olpc-mesh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-statistics.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-team.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-tun.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-veth.Plo@am__quote@
diff --git a/introspection/nm-checkpoint.xml b/introspection/nm-checkpoint.xml
new file mode 100644
index 00000000..d0fbda8d
--- /dev/null
+++ b/introspection/nm-checkpoint.xml
@@ -0,0 +1,42 @@
+
+
+
+  
+  
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+      
+    
+  
+
diff --git a/introspection/nm-device-statistics.xml b/introspection/nm-device-statistics.xml
new file mode 100644
index 00000000..bdb19c89
--- /dev/null
+++ b/introspection/nm-device-statistics.xml
@@ -0,0 +1,37 @@
+
+
+  
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+        
+    
+  
+
diff --git a/introspection/nm-device-team.xml b/introspection/nm-device-team.xml
index 05bbbafe..64faaec4 100644
--- a/introspection/nm-device-team.xml
+++ b/introspection/nm-device-team.xml
@@ -25,6 +25,13 @@
     -->
     
 
+    
+    
+
     
+    
+      
+      
+      
+      
+    
+
+    
+    
+      
+    
+
+    
+    
+      
+      
+    
+