From 913bcb40f6c699f8a38351c69e7ea263fe78f71f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 18 Nov 2022 17:48:09 +0100 Subject: New upstream version 1.40.4 --- Makefile.am | 18 +- Makefile.in | 256 +++++----- NEWS | 15 + configure | 34 +- configure.ac | 2 +- docs/api/Makefile.am | 16 +- docs/api/Makefile.in | 15 +- docs/api/html/index.html | 2 +- docs/api/html/nm-dbus-types.html | 3 +- docs/api/html/nm-settings-dbus.html | 8 +- docs/api/html/nm-settings-nmcli.html | 2 - docs/api/version.xml | 2 +- docs/libnm/html/NMAccessPoint.html | 4 +- docs/libnm/html/NMCheckpoint.html | 1 + docs/libnm/html/NMClient.html | 20 +- docs/libnm/html/NMConnection.html | 14 +- docs/libnm/html/NMDevice.html | 4 +- docs/libnm/html/NMDevice6Lowpan.html | 24 +- docs/libnm/html/NMDeviceDummy.html | 7 +- docs/libnm/html/NMDeviceIPTunnel.html | 1 + docs/libnm/html/NMDeviceMacsec.html | 9 +- docs/libnm/html/NMDeviceMacvlan.html | 7 +- docs/libnm/html/NMDeviceOvsBridge.html | 1 + docs/libnm/html/NMDeviceOvsInterface.html | 1 + docs/libnm/html/NMDeviceOvsPort.html | 1 + docs/libnm/html/NMDevicePpp.html | 1 + docs/libnm/html/NMDeviceTun.html | 28 +- docs/libnm/html/NMDeviceVeth.html | 3 +- docs/libnm/html/NMDeviceVrf.html | 1 + docs/libnm/html/NMDeviceVxlan.html | 11 +- docs/libnm/html/NMDeviceWifiP2P.html | 8 +- docs/libnm/html/NMDeviceWireGuard.html | 1 + docs/libnm/html/NMDeviceWpan.html | 25 +- docs/libnm/html/NMRemoteConnection.html | 1 + docs/libnm/html/NMSetting.html | 9 +- docs/libnm/html/NMSetting6Lowpan.html | 4 +- docs/libnm/html/NMSetting8021x.html | 82 ++-- docs/libnm/html/NMSettingAdsl.html | 14 +- docs/libnm/html/NMSettingBond.html | 2 +- docs/libnm/html/NMSettingBridge.html | 44 +- docs/libnm/html/NMSettingBridgePort.html | 6 +- docs/libnm/html/NMSettingCdma.html | 8 +- docs/libnm/html/NMSettingConnection.html | 36 +- docs/libnm/html/NMSettingDcb.html | 38 +- docs/libnm/html/NMSettingGeneric.html | 2 +- docs/libnm/html/NMSettingGsm.html | 18 +- docs/libnm/html/NMSettingHostname.html | 2 +- docs/libnm/html/NMSettingIP4Config.html | 4 +- docs/libnm/html/NMSettingIP6Config.html | 2 +- docs/libnm/html/NMSettingIPConfig.html | 4 +- docs/libnm/html/NMSettingIPTunnel.html | 72 ++- docs/libnm/html/NMSettingInfiniband.html | 8 +- docs/libnm/html/NMSettingMacvlan.html | 1 + docs/libnm/html/NMSettingOvsBridge.html | 2 +- docs/libnm/html/NMSettingOvsExternalIDs.html | 1 + docs/libnm/html/NMSettingSerial.html | 10 +- docs/libnm/html/NMSettingSriov.html | 30 +- docs/libnm/html/NMSettingTCConfig.html | 4 +- docs/libnm/html/NMSettingTeam.html | 3 +- docs/libnm/html/NMSettingTeamPort.html | 2 +- docs/libnm/html/NMSettingTun.html | 1 + docs/libnm/html/NMSettingUser.html | 2 + docs/libnm/html/NMSettingVlan.html | 34 +- docs/libnm/html/NMSettingVpn.html | 1 + docs/libnm/html/NMSettingWireGuard.html | 20 + docs/libnm/html/NMSettingWired.html | 18 +- docs/libnm/html/NMSettingWireless.html | 29 +- docs/libnm/html/NMSettingWirelessSecurity.html | 61 ++- docs/libnm/html/NMSettingWpan.html | 12 +- docs/libnm/html/NMVpnPluginInfo.html | 2 +- docs/libnm/html/NMVpnPluginOld.html | 38 -- docs/libnm/html/NMVpnServicePlugin.html | 7 + docs/libnm/html/NMWifiP2PPeer.html | 5 +- docs/libnm/html/NMWimaxNsp.html | 4 +- docs/libnm/html/api-index-full.html | 470 +++++++++--------- docs/libnm/html/index.html | 2 +- docs/libnm/html/libnm-nm-dbus-interface.html | 3 +- docs/libnm/html/libnm-nm-errors.html | 6 +- docs/libnm/html/libnm-nm-utils.html | 50 +- docs/libnm/html/libnm-nm-version.html | 16 +- docs/libnm/html/libnm.devhelp2 | 176 ++++--- docs/libnm/html/usage.html | 2 +- docs/libnm/libnm-sections.txt | 8 +- docs/libnm/version.xml | 2 +- man/NetworkManager-dispatcher.8 | 4 +- man/NetworkManager-wait-online.service.8 | 4 +- man/NetworkManager.8 | 6 +- man/NetworkManager.conf.5 | 6 +- man/nm-cloud-setup.8 | 6 +- man/nm-initrd-generator.8 | 6 +- man/nm-online.1 | 6 +- man/nm-openvswitch.7 | 6 +- man/nm-settings-dbus.5 | 10 +- man/nm-settings-dbus.xml | 10 +- man/nm-settings-docs-dbus.xml | 10 +- man/nm-settings-docs-nmcli.xml | 2 +- man/nm-settings-ifcfg-rh.5 | 6 +- man/nm-settings-ifcfg-rh.xml | 2 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings-nmcli.5 | 10 +- man/nm-settings-nmcli.xml | 6 +- man/nmcli-examples.7 | 6 +- man/nmcli.1 | 6 +- man/nmtui.1 | 6 +- meson.build | 2 +- po/NetworkManager.pot | 528 ++++++++++----------- po/hr.gmo | Bin 364643 -> 363906 bytes po/ru.gmo | Bin 543682 -> 542614 bytes po/uk.gmo | Bin 618917 -> 616159 bytes po/zh_CN.gmo | Bin 369599 -> 368913 bytes src/core/NetworkManagerUtils.c | 1 + src/core/devices/nm-device-ethernet.c | 10 + src/core/devices/nm-device.c | 9 +- src/core/devices/wwan/nm-modem-ofono.c | 11 +- src/core/nm-connectivity.c | 5 +- src/core/nm-l3cfg.c | 2 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 9 +- .../ifcfg-test_roundtrip_ethtool-6.cexpected | 15 + .../ifcfg-test_roundtrip_ethtool-7.cexpected | 15 + .../ifcfg-test_roundtrip_ethtool-8.cexpected | 15 + .../ifcfg-test_roundtrip_ethtool-9.cexpected | 15 + .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 154 ++++++ .../plugins/keyfile/tests/test-keyfile-settings.c | 13 +- src/libnm-base/nm-ethtool-base.c | 12 + src/libnm-base/nm-ethtool-base.h | 2 + src/libnm-client-impl/libnm.ver | 34 ++ src/libnm-client-impl/meson.build | 1 - src/libnm-client-impl/nm-client.c | 6 +- src/libnm-client-impl/nm-device-6lowpan.c | 23 +- src/libnm-client-impl/nm-device-macsec.c | 2 +- src/libnm-client-impl/nm-device-tun.c | 2 +- src/libnm-client-impl/nm-device-veth.c | 2 +- src/libnm-client-impl/nm-device-vxlan.c | 4 +- src/libnm-client-impl/nm-device-wifi-p2p.c | 2 +- src/libnm-client-impl/nm-device-wpan.c | 19 - src/libnm-client-impl/nm-remote-connection.c | 2 + src/libnm-client-impl/nm-settings-docs-gir.xml | 8 +- src/libnm-client-impl/nm-vpn-plugin-old.c | 22 +- src/libnm-client-impl/nm-vpn-service-plugin.c | 30 ++ src/libnm-client-impl/tests/meson.build | 12 + src/libnm-client-impl/tests/test-gir.py | 153 ++++++ src/libnm-client-public/nm-checkpoint.h | 2 + src/libnm-client-public/nm-client.h | 5 + src/libnm-client-public/nm-device-6lowpan.h | 8 +- src/libnm-client-public/nm-device-dummy.h | 2 + src/libnm-client-public/nm-device-ip-tunnel.h | 2 + src/libnm-client-public/nm-device-macsec.h | 4 +- src/libnm-client-public/nm-device-macvlan.h | 2 + src/libnm-client-public/nm-device-ovs-bridge.h | 2 + src/libnm-client-public/nm-device-ovs-interface.h | 2 + src/libnm-client-public/nm-device-ovs-port.h | 2 + src/libnm-client-public/nm-device-ppp.h | 3 + src/libnm-client-public/nm-device-tun.h | 2 + src/libnm-client-public/nm-device-veth.h | 4 +- src/libnm-client-public/nm-device-vrf.h | 2 + src/libnm-client-public/nm-device-vxlan.h | 6 +- src/libnm-client-public/nm-device-wifi-p2p.h | 2 +- src/libnm-client-public/nm-device-wireguard.h | 2 + src/libnm-client-public/nm-device-wpan.h | 6 +- src/libnm-client-public/nm-vpn-plugin-old.h | 6 - src/libnm-client-public/nm-vpn-service-plugin.h | 2 + src/libnm-client-public/nm-wifi-p2p-peer.h | 2 + src/libnm-core-impl/nm-connection.c | 14 +- src/libnm-core-impl/nm-setting-6lowpan.c | 6 +- src/libnm-core-impl/nm-setting-bridge.c | 30 +- src/libnm-core-impl/nm-setting-connection.c | 2 +- src/libnm-core-impl/nm-setting-ethtool.c | 18 +- src/libnm-core-impl/nm-setting-hostname.c | 2 +- src/libnm-core-impl/nm-setting-ip-config.c | 6 +- src/libnm-core-impl/nm-setting-ip-tunnel.c | 6 +- src/libnm-core-impl/nm-setting-ip4-config.c | 6 +- src/libnm-core-impl/nm-setting-ovs-bridge.c | 2 +- src/libnm-core-impl/nm-setting-ovs-external-ids.c | 2 + src/libnm-core-impl/nm-setting-sriov.c | 4 +- src/libnm-core-impl/nm-setting-tc-config.c | 4 +- src/libnm-core-impl/nm-setting-user.c | 6 + src/libnm-core-impl/nm-setting-vpn.c | 2 + src/libnm-core-impl/nm-setting-wireguard.c | 2 +- src/libnm-core-impl/nm-setting-wireless-security.c | 4 +- src/libnm-core-impl/nm-setting-wpan.c | 14 +- src/libnm-core-impl/nm-setting.c | 16 +- src/libnm-core-impl/nm-utils.c | 18 +- src/libnm-core-impl/nm-vpn-editor-plugin.c | 12 + src/libnm-core-impl/nm-vpn-plugin-info.c | 2 +- src/libnm-core-impl/tests/test-general.c | 3 + src/libnm-core-public/nm-connection.h | 11 +- src/libnm-core-public/nm-dbus-interface.h | 4 +- src/libnm-core-public/nm-dbus-types.xml | 4 +- src/libnm-core-public/nm-setting-6lowpan.h | 4 +- src/libnm-core-public/nm-setting-connection.h | 6 +- src/libnm-core-public/nm-setting-hostname.h | 2 +- src/libnm-core-public/nm-setting-ip-config.h | 2 +- src/libnm-core-public/nm-setting-ip-tunnel.h | 6 +- src/libnm-core-public/nm-setting-ip4-config.h | 2 +- src/libnm-core-public/nm-setting-macvlan.h | 2 + src/libnm-core-public/nm-setting-ovs-bridge.h | 2 +- src/libnm-core-public/nm-setting-sriov.h | 2 +- src/libnm-core-public/nm-setting-tc-config.h | 4 +- src/libnm-core-public/nm-setting-team.h | 2 + src/libnm-core-public/nm-setting-tun.h | 2 + src/libnm-core-public/nm-setting-vpn.h | 4 +- .../nm-setting-wireless-security.h | 2 + src/libnm-core-public/nm-setting-wireless.h | 2 + src/libnm-core-public/nm-setting-wpan.h | 12 +- src/libnm-core-public/nm-setting.h | 8 +- src/libnm-core-public/nm-utils.h | 8 +- src/libnm-core-public/nm-version-macros.h | 3 +- src/libnm-core-public/nm-version-macros.h.in | 1 + src/libnm-core-public/nm-version.h | 6 + src/libnm-core-public/nm-vpn-plugin-info.h | 2 +- src/libnm-platform/nmp-object.c | 7 +- src/libnm-std-aux/nm-std-aux.h | 4 +- src/libnmc-setting/settings-docs-input.xml | 10 +- src/libnmc-setting/settings-docs.h | 4 +- src/libnmc-setting/settings-docs.h.in | 4 +- .../tests/test-cmdline-reader.c | 30 +- src/nm-initrd-generator/tests/test-ibft-reader.c | 6 + src/nmcli/devices.c | 2 + src/nmcli/generate-docs-nm-settings-nmcli.xml | 4 +- src/nmcli/generate-docs-nm-settings-nmcli.xml.in | 4 +- src/nmcli/meson.build | 2 +- 222 files changed, 2180 insertions(+), 1438 deletions(-) create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-6.cexpected create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-7.cexpected create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-8.cexpected create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-9.cexpected create mode 100755 src/libnm-client-impl/tests/test-gir.py diff --git a/Makefile.am b/Makefile.am index 05b5ffc9..7cdb1120 100644 --- a/Makefile.am +++ b/Makefile.am @@ -176,7 +176,8 @@ endif # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1405 po/.Makefile.patched: sed -i \ - 's#^dist2: \$$(srcdir)/stamp-po \$$(DISTFILES)#dist2: \$$(srcdir)/stamp-po\n\t\$$(MAKE) \$$(DISTFILES)#' \ + -e 's#^dist2: \$$(srcdir)/stamp-po \$$(DISTFILES)#dist2: \$$(srcdir)/stamp-po\n\t\$$(MAKE) \$$(DISTFILES)#' \ + -e 's#^dist2: stamp-po \$$(DISTFILES)#dist2: stamp-po\n\t\$$(MAKE) \$$(DISTFILES)#' \ "$(builddir)/po/Makefile" && \ touch "$(builddir)/po/.Makefile.patched" @@ -2015,8 +2016,16 @@ src_libnm_client_impl_tests_programs_req_introspection = \ src/libnm-client-impl/tests/test-remote-settings-client \ src/libnm-client-impl/tests/test-secret-agent +check-local-libnm-gir: $(builddir)/src/libnm-client-impl/NM-1.0.gir +check-local-libnm-gir: $(srcdir)/src/libnm-client-impl/libnm.ver +check-local-libnm-gir: + "$(PYTHON)" $(srcdir)/src/libnm-client-impl/tests/test-gir.py \ + --gir $(builddir)/src/libnm-client-impl/NM-1.0.gir \ + --ver $(srcdir)/src/libnm-client-impl/libnm.ver + if HAVE_INTROSPECTION check_programs += $(src_libnm_client_impl_tests_programs_req_introspection) +check_local += check-local-libnm-gir else check_programs_norun += $(src_libnm_client_impl_tests_programs_req_introspection) endif @@ -2070,7 +2079,8 @@ $(src_libnm_client_impl_tests_test_remote_settings_client_OBJECTS): $(src_libnm_ $(src_libnm_client_impl_tests_test_secret_agent_OBJECTS): $(src_libnm_client_impl_NM_1_0_typelib) EXTRA_DIST += \ - src/libnm-client-impl/tests/meson.build + src/libnm-client-impl/tests/meson.build \ + src/libnm-client-impl/tests/test-gir.py ############################################################################### @@ -3576,6 +3586,10 @@ EXTRA_DIST += \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-3.cexpected \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-4.cexpected \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-5.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-6.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-7.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-8.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-9.cexpected \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \ diff --git a/Makefile.in b/Makefile.in index 0813d5ba..51c5b09b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -179,83 +179,84 @@ TESTS = $(am__EXEEXT_11) @BUILD_DOCS_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_16 = src/nmcli/generate-docs-nm-settings-nmcli.xml @HAVE_INTROSPECTION_TRUE@am__append_17 = $(libnm_noinst_data) @HAVE_INTROSPECTION_TRUE@am__append_18 = $(src_libnm_client_impl_tests_programs_req_introspection) -@HAVE_INTROSPECTION_FALSE@am__append_19 = $(src_libnm_client_impl_tests_programs_req_introspection) -@REQUIRE_ROOT_TESTS_TRUE@am__append_20 = -DREQUIRE_ROOT_TESTS=1 +@HAVE_INTROSPECTION_TRUE@am__append_19 = check-local-libnm-gir +@HAVE_INTROSPECTION_FALSE@am__append_20 = $(src_libnm_client_impl_tests_programs_req_introspection) +@REQUIRE_ROOT_TESTS_TRUE@am__append_21 = -DREQUIRE_ROOT_TESTS=1 ############################################################################### # src/core/ppp ############################################################################### -@WITH_PPP_TRUE@am__append_21 = src/core/ppp/libnm-ppp-plugin.la -@WITH_PPP_TRUE@am__append_22 = src/core/ppp/nm-pppd-plugin.la +@WITH_PPP_TRUE@am__append_22 = src/core/ppp/libnm-ppp-plugin.la +@WITH_PPP_TRUE@am__append_23 = src/core/ppp/nm-pppd-plugin.la ############################################################################### # src/core/settings/plugins/ifcfg-rh ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_23 = src/core/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_24 = \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_24 = src/core/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_25 = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/core/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_25 = $(nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_26 = check-local-symbols-settings-ifcfg-rh +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_26 = $(nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = check-local-symbols-settings-ifcfg-rh ############################################################################### # src/core/settings/plugins/ifcfg-rh/tests ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_29 = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/core/settings/plugins/ifcfg-rh/nm-ifup \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/core/settings/plugins/ifcfg-rh/nm-ifdown -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_29 = install-data-hook-ifcfg-rh +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_30 = install-data-hook-ifcfg-rh ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_30 = src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_31 = src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf ############################################################################### # src/core/settings/plugins/ifupdown ############################################################################### -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_31 = src/core/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_32 = src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_33 = check-local-symbols-settings-ifupdown +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_32 = src/core/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_33 = src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_34 = check-local-symbols-settings-ifupdown ############################################################################### -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_34 = src/core/settings/plugins/ifupdown/tests/test-ifupdown +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_35 = src/core/settings/plugins/ifupdown/tests/test-ifupdown ############################################################################### -@WITH_MODEM_MANAGER_1_TRUE@am__append_35 = src/core/devices/wwan/libnm-wwan.la \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_36 = src/core/devices/wwan/libnm-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/core/devices/wwan/libnm-device-plugin-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/core/devices/bluetooth/libnm-device-plugin-bluetooth.la -@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_36 = \ +@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_37 = \ @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@ src/core/devices/wwan/nm-modem-ofono.c \ @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@ src/core/devices/wwan/nm-modem-ofono.h -@WITH_MODEM_MANAGER_1_TRUE@am__append_37 = check-local-devices-wwan \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_38 = check-local-devices-wwan \ @WITH_MODEM_MANAGER_1_TRUE@ check-local-devices-bluetooth -@WITH_MODEM_MANAGER_1_TRUE@am__append_38 = src/core/devices/wwan/tests/test-service-providers +@WITH_MODEM_MANAGER_1_TRUE@am__append_39 = src/core/devices/wwan/tests/test-service-providers ############################################################################### # src/core/devices/bluetooth ############################################################################### -@WITH_MODEM_MANAGER_1_TRUE@am__append_39 = src/core/devices/bluetooth/libnm-bluetooth-utils.la -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_40 = \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_40 = src/core/devices/bluetooth/libnm-bluetooth-utils.la +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_41 = \ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@ src/core/devices/bluetooth/nm-bluez5-dun.c \ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@ src/core/devices/bluetooth/nm-bluez5-dun.h \ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@ $(NULL) -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_41 = $(BLUEZ5_CFLAGS) -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = $(BLUEZ5_LIBS) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = $(BLUEZ5_CFLAGS) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = $(BLUEZ5_LIBS) ############################################################################### -@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_44 = \ @WITH_MODEM_MANAGER_1_TRUE@ src/core/devices/bluetooth/tests/nm-bt-test ############################################################################### # src/core/devices/wifi ############################################################################### -@WITH_WIFI_TRUE@am__append_44 = src/core/devices/wifi/libnm-wifi-base.la -@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_45 = \ +@WITH_WIFI_TRUE@am__append_45 = src/core/devices/wifi/libnm-wifi-base.la +@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_46 = \ @WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/core/devices/wifi/nm-device-iwd.c \ @WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/core/devices/wifi/nm-device-iwd.h \ @WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/core/devices/wifi/nm-device-iwd-p2p.c \ @@ -264,52 +265,52 @@ TESTS = $(am__EXEEXT_11) @WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/core/devices/wifi/nm-iwd-manager.h \ @WITH_IWD_TRUE@@WITH_WIFI_TRUE@ $(NULL) -@WITH_WIFI_TRUE@am__append_46 = src/core/devices/wifi/libnm-device-plugin-wifi.la -@WITH_WIFI_TRUE@am__append_47 = check-local-devices-wifi -@WITH_WIFI_TRUE@am__append_48 = src/core/devices/wifi/tests/test-devices-wifi +@WITH_WIFI_TRUE@am__append_47 = src/core/devices/wifi/libnm-device-plugin-wifi.la +@WITH_WIFI_TRUE@am__append_48 = check-local-devices-wifi +@WITH_WIFI_TRUE@am__append_49 = src/core/devices/wifi/tests/test-devices-wifi ############################################################################### # src/core/devices/team ############################################################################### -@WITH_TEAMDCTL_TRUE@am__append_49 = src/core/devices/team/libnm-device-plugin-team.la -@WITH_TEAMDCTL_TRUE@am__append_50 = check-local-devices-team -@WITH_OPENVSWITCH_TRUE@am__append_51 = src/core/devices/ovs/libnm-device-plugin-ovs.la -@WITH_OPENVSWITCH_TRUE@am__append_52 = check-local-devices-ovs -@BUILD_DOCS_TRUE@am__append_53 = $(libnmc_setting_settings_doc_h) -@BUILD_DOCS_TRUE@am__append_54 = check-local-settings-docs +@WITH_TEAMDCTL_TRUE@am__append_50 = src/core/devices/team/libnm-device-plugin-team.la +@WITH_TEAMDCTL_TRUE@am__append_51 = check-local-devices-team +@WITH_OPENVSWITCH_TRUE@am__append_52 = src/core/devices/ovs/libnm-device-plugin-ovs.la +@WITH_OPENVSWITCH_TRUE@am__append_53 = check-local-devices-ovs +@BUILD_DOCS_TRUE@am__append_54 = $(libnmc_setting_settings_doc_h) +@BUILD_DOCS_TRUE@am__append_55 = check-local-settings-docs ############################################################################### # src/nmcli ############################################################################### -@BUILD_NMCLI_TRUE@am__append_55 = src/nmcli/nmcli -@BUILD_NMCLI_TRUE@am__append_56 = install-data-hook-nmcli -@BUILD_NMCLI_TRUE@am__append_57 = uninstall-hook-nmcli +@BUILD_NMCLI_TRUE@am__append_56 = src/nmcli/nmcli +@BUILD_NMCLI_TRUE@am__append_57 = install-data-hook-nmcli +@BUILD_NMCLI_TRUE@am__append_58 = uninstall-hook-nmcli ############################################################################### # src/libnmt-newt ############################################################################### -@BUILD_NMTUI_TRUE@am__append_58 = src/libnmt-newt/libnmt-newt.a +@BUILD_NMTUI_TRUE@am__append_59 = src/libnmt-newt/libnmt-newt.a ############################################################################### # src/nmtui ############################################################################### -@BUILD_NMTUI_TRUE@am__append_59 = src/nmtui/nmtui -@BUILD_NMTUI_TRUE@am__append_60 = install-exec-hook-nmtui -@BUILD_NMTUI_TRUE@am__append_61 = uninstall-hook-nmtui +@BUILD_NMTUI_TRUE@am__append_60 = src/nmtui/nmtui +@BUILD_NMTUI_TRUE@am__append_61 = install-exec-hook-nmtui +@BUILD_NMTUI_TRUE@am__append_62 = uninstall-hook-nmtui ############################################################################### # src/nm-cloud-setup ############################################################################### -@BUILD_NM_CLOUD_SETUP_TRUE@am__append_62 = src/nm-cloud-setup/libnm-cloud-setup-core.a -@BUILD_NM_CLOUD_SETUP_TRUE@am__append_63 = src/nm-cloud-setup/nm-cloud-setup -@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_64 = \ +@BUILD_NM_CLOUD_SETUP_TRUE@am__append_63 = src/nm-cloud-setup/libnm-cloud-setup-core.a +@BUILD_NM_CLOUD_SETUP_TRUE@am__append_64 = src/nm-cloud-setup/nm-cloud-setup +@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_65 = \ @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@ src/nm-cloud-setup/nm-cloud-setup.service \ @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@ src/nm-cloud-setup/nm-cloud-setup.timer \ @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@ $(NULL) -@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_65 = install-data-hook-cloud-setup -@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_66 = uninstall-hook-cloud-setup -@BUILD_NM_CLOUD_SETUP_TRUE@am__append_67 = \ +@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_66 = install-data-hook-cloud-setup +@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_67 = uninstall-hook-cloud-setup +@BUILD_NM_CLOUD_SETUP_TRUE@am__append_68 = \ @BUILD_NM_CLOUD_SETUP_TRUE@ src/nm-cloud-setup/90-nm-cloud-setup.sh \ @BUILD_NM_CLOUD_SETUP_TRUE@ src/nm-cloud-setup/meson.build \ @BUILD_NM_CLOUD_SETUP_TRUE@ src/nm-cloud-setup/nm-cloud-setup.service.in \ @@ -317,60 +318,60 @@ TESTS = $(am__EXEEXT_11) @BUILD_NM_CLOUD_SETUP_TRUE@ src/nm-cloud-setup/tests/meson.build \ @BUILD_NM_CLOUD_SETUP_TRUE@ $(NULL) -@BUILD_NM_CLOUD_SETUP_TRUE@am__append_68 = \ +@BUILD_NM_CLOUD_SETUP_TRUE@am__append_69 = \ @BUILD_NM_CLOUD_SETUP_TRUE@ src/nm-cloud-setup/nm-cloud-setup.service -@BUILD_NM_CLOUD_SETUP_TRUE@am__append_69 = src/nm-cloud-setup/tests/test-cloud-setup-general +@BUILD_NM_CLOUD_SETUP_TRUE@am__append_70 = src/nm-cloud-setup/tests/test-cloud-setup-general ############################################################################### # data ############################################################################### -@HAVE_SYSTEMD_TRUE@am__append_70 = \ +@HAVE_SYSTEMD_TRUE@am__append_71 = \ @HAVE_SYSTEMD_TRUE@ data/NetworkManager.service \ @HAVE_SYSTEMD_TRUE@ data/NetworkManager-wait-online.service \ @HAVE_SYSTEMD_TRUE@ data/NetworkManager-dispatcher.service \ @HAVE_SYSTEMD_TRUE@ data/nm-priv-helper.service \ @HAVE_SYSTEMD_TRUE@ $(NULL) -@HAVE_INTROSPECTION_TRUE@am__append_71 = $(man_nm_settings_xml) -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_72 = man/nm-settings-ifcfg-rh.5 -@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_73 = man/nm-settings-ifcfg-rh.5 +@HAVE_INTROSPECTION_TRUE@am__append_72 = $(man_nm_settings_xml) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_73 = man/nm-settings-ifcfg-rh.5 @CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_74 = man/nm-settings-ifcfg-rh.5 -@WITH_OPENVSWITCH_TRUE@am__append_75 = man/nm-openvswitch.7 -@WITH_OPENVSWITCH_FALSE@am__append_76 = man/nm-openvswitch.7 +@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_75 = man/nm-settings-ifcfg-rh.5 +@WITH_OPENVSWITCH_TRUE@am__append_76 = man/nm-openvswitch.7 @WITH_OPENVSWITCH_FALSE@am__append_77 = man/nm-openvswitch.7 -@BUILD_NM_CLOUD_SETUP_TRUE@am__append_78 = man/nm-cloud-setup.8 -@BUILD_NM_CLOUD_SETUP_FALSE@am__append_79 = man/nm-cloud-setup.8 +@WITH_OPENVSWITCH_FALSE@am__append_78 = man/nm-openvswitch.7 +@BUILD_NM_CLOUD_SETUP_TRUE@am__append_79 = man/nm-cloud-setup.8 @BUILD_NM_CLOUD_SETUP_FALSE@am__append_80 = man/nm-cloud-setup.8 -@HAVE_DOCS_TRUE@am__append_81 = install-data-hook-man -@HAVE_DOCS_TRUE@am__append_82 = uninstall-hook-man -@HAVE_DOCS_TRUE@am__append_83 = $(man_pages) $(man_pages_autogen) -@BUILD_DOCS_TRUE@am__append_84 = $(man_pages) $(man_pages_autogen) +@BUILD_NM_CLOUD_SETUP_FALSE@am__append_81 = man/nm-cloud-setup.8 +@HAVE_DOCS_TRUE@am__append_82 = install-data-hook-man +@HAVE_DOCS_TRUE@am__append_83 = uninstall-hook-man +@HAVE_DOCS_TRUE@am__append_84 = $(man_pages) $(man_pages_autogen) +@BUILD_DOCS_TRUE@am__append_85 = $(man_pages) $(man_pages_autogen) ############################################################################### # vapi ############################################################################### -@ENABLE_VAPIGEN_TRUE@am__append_85 = \ +@ENABLE_VAPIGEN_TRUE@am__append_86 = \ @ENABLE_VAPIGEN_TRUE@ vapi/libnm.vapi -@ENABLE_VAPIGEN_TRUE@am__append_86 = \ +@ENABLE_VAPIGEN_TRUE@am__append_87 = \ @ENABLE_VAPIGEN_TRUE@ $(VAPIGEN_VAPIS) \ @ENABLE_VAPIGEN_TRUE@ $(VAPIGEN_VAPIS:.vapi=.deps) -@ENABLE_VAPIGEN_TRUE@am__append_87 = $(VAPIGEN_VAPIS) +@ENABLE_VAPIGEN_TRUE@am__append_88 = $(VAPIGEN_VAPIS) ############################################################################### -@ENABLE_TESTS_TRUE@am__append_88 = $(check_programs) $(check_programs_norun) -@ENABLE_TESTS_TRUE@am__append_89 = $(check_ltlibraries) -@ENABLE_TESTS_FALSE@am__append_90 = $(check_programs) $(check_programs_norun) -@ENABLE_TESTS_FALSE@am__append_91 = $(check_ltlibraries) -@WITH_QT_TRUE@am__append_92 = \ +@ENABLE_TESTS_TRUE@am__append_89 = $(check_programs) $(check_programs_norun) +@ENABLE_TESTS_TRUE@am__append_90 = $(check_ltlibraries) +@ENABLE_TESTS_FALSE@am__append_91 = $(check_programs) $(check_programs_norun) +@ENABLE_TESTS_FALSE@am__append_92 = $(check_ltlibraries) +@WITH_QT_TRUE@am__append_93 = \ @WITH_QT_TRUE@ examples/C/qt/add-connection-wired \ @WITH_QT_TRUE@ examples/C/qt/list-connections \ @WITH_QT_TRUE@ examples/C/qt/change-ipv4-addresses \ @WITH_QT_TRUE@ examples/C/qt/monitor-nm-running -@WITH_QT_TRUE@am__append_93 = \ +@WITH_QT_TRUE@am__append_94 = \ @WITH_QT_TRUE@ examples/C/qt/monitor-nm-running.moc subdir = . @@ -4225,13 +4226,13 @@ noinst_LTLIBRARIES = src/c-siphash/libc-siphash.la \ src/core/libNetworkManager.la \ src/libnm-systemd-core/libnm-systemd-core.la $(NULL) \ src/libnm-systemd-shared/libnm-systemd-shared.la \ - src/nm-initrd-generator/libnmi-core.la $(am__append_24) \ - $(am__append_32) $(am__append_39) $(am__append_44) \ - src/nm-dispatcher/libnm-dispatcher-core.la $(am__append_89) -check_LTLIBRARIES = $(am__append_91) -noinst_LIBRARIES = $(am__append_58) $(am__append_62) + src/nm-initrd-generator/libnmi-core.la $(am__append_25) \ + $(am__append_33) $(am__append_40) $(am__append_45) \ + src/nm-dispatcher/libnm-dispatcher-core.la $(am__append_90) +check_LTLIBRARIES = $(am__append_92) +noinst_LIBRARIES = $(am__append_59) $(am__append_63) noinst_DATA = $(am__append_13) -dist_libexec_SCRIPTS = $(am__append_28) +dist_libexec_SCRIPTS = $(am__append_29) ############################################################################### lib_LTLIBRARIES = src/libnm-client-impl/libnm.la @@ -4240,31 +4241,31 @@ plugin_LTLIBRARIES = $(core_plugins) ############################################################################### # src/core/devices/adsl ############################################################################### -core_plugins = $(am__append_21) $(am__append_23) $(am__append_31) \ +core_plugins = $(am__append_22) $(am__append_24) $(am__append_32) \ src/core/devices/adsl/libnm-device-plugin-adsl.la \ - $(am__append_35) $(am__append_46) $(am__append_49) \ - $(am__append_51) + $(am__append_36) $(am__append_47) $(am__append_50) \ + $(am__append_52) service_DATA = -man_MANS = $(am__append_83) +man_MANS = $(am__append_84) examples_DATA = data/server.conf CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \ - src/core/NetworkManager.ver $(am__append_25) \ + src/core/NetworkManager.ver $(am__append_26) \ $(dispatcher_nmdbus_dispatcher_sources) \ src/nm-dispatcher/org.freedesktop.nm_dispatcher.service \ src/nm-priv-helper/org.freedesktop.nm_priv_helper.service \ - $(am__append_68) src/tests/client/test-client.log \ + $(am__append_69) src/tests/client/test-client.log \ data/NetworkManager-dispatcher.service \ data/NetworkManager-wait-online.service \ data/NetworkManager.service data/nm-priv-helper.service \ - data/server.conf $(NULL) $(am__append_71) man/common.ent \ - $(am__append_84) $(am__append_87) $(GLIB_GENERATED) \ + data/server.conf $(NULL) $(am__append_72) man/common.ent \ + $(am__append_85) $(am__append_88) $(GLIB_GENERATED) \ $(INTROSPECTION_GIRS) $(typelib_DATA) cscope.in.out cscope.out \ - cscope.po.out $(NULL) $(am__append_93) + cscope.po.out $(NULL) $(am__append_94) ############################################################################### DISTCLEANFILES = config-extra.h po/.Makefile.patched \ $(polkit_policy_DATA) src/libnm-client-impl/libnm.pc \ - $(am__append_16) $(am__append_17) $(am__append_53) + $(am__append_16) $(am__append_17) $(am__append_54) ############################################################################### @@ -4351,6 +4352,7 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \ tools/generate-docs-nm-settings-docs-gir.py \ src/libnm-client-impl/meson.build $(NULL) \ src/libnm-client-impl/tests/meson.build \ + src/libnm-client-impl/tests/test-gir.py \ src/contrib/meson.build src/contrib/tests/meson.build $(NULL) \ src/libnm-systemd-shared/meson.build \ src/libnm-systemd-core/meson.build \ @@ -4794,6 +4796,10 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-3.cexpected \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-4.cexpected \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-5.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-6.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-7.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-8.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-9.cexpected \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \ @@ -4911,7 +4917,7 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \ src/libnmc-setting/meson.build \ src/libnmc-setting/tests/meson.build \ src/libnmt-newt/meson.build src/nmtui/meson.build \ - $(am__append_67) src/tests/client/test-client.sh \ + $(am__append_68) src/tests/client/test-client.sh \ src/tests/client/test-client.py \ src/tests/client/test-client.check-on-disk/test_001.expected \ src/tests/client/test-client.check-on-disk/test_002.expected \ @@ -4925,7 +4931,7 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \ data/NetworkManager-wait-online.service.in \ data/NetworkManager.service.in data/nm-priv-helper.service.in \ data/meson.build data/nm-shared.xml data/server.conf.in \ - $(NULL) $(am__append_73) $(am__append_76) $(am__append_79) \ + $(NULL) $(am__append_74) $(am__append_77) $(am__append_80) \ man/common.ent.in $(man_nm_settings_xml) $(addsuffix \ .xsl,$(basename $(man_nm_settings_xml))) $(man_pages) \ $(addsuffix .xml,$(basename $(man_pages))) \ @@ -5017,16 +5023,16 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \ EXTRA_LTLIBRARIES = dist_hook = dist-hook-settings-ifcfg-rh-alias-files dist_dependencies = src/libnm-core-public/nm-vpn-dbus-types.xml \ - src/libnm-core-public/nm-dbus-types.xml $(am__append_74) \ - $(am__append_77) $(am__append_80) $(man_pages) \ + src/libnm-core-public/nm-dbus-types.xml $(am__append_75) \ + $(am__append_78) $(am__append_81) $(man_pages) \ $(man_pages_autogen) dist_configure_check = $(am__append_2) -install_data_hook = install-data-hook-dirs $(am__append_29) \ - install-data-hook-dispatcher $(am__append_56) $(am__append_65) \ - $(am__append_81) -install_exec_hook = $(am__append_60) -uninstall_hook = $(am__append_57) $(am__append_61) $(am__append_66) \ +install_data_hook = install-data-hook-dirs $(am__append_30) \ + install-data-hook-dispatcher $(am__append_57) $(am__append_66) \ $(am__append_82) +install_exec_hook = $(am__append_61) +uninstall_hook = $(am__append_58) $(am__append_62) $(am__append_67) \ + $(am__append_83) BUILT_SOURCES = src/libnm-core-public/nm-vpn-dbus-types.xml \ src/libnm-core-public/nm-dbus-types.xml $(gir_DATA) \ $(typelib_DATA) @@ -5040,9 +5046,9 @@ man_pages = man/NetworkManager-dispatcher.8 \ man/NetworkManager-wait-online.service.8 man/NetworkManager.8 \ man/NetworkManager.conf.5 man/nm-initrd-generator.8 \ man/nm-online.1 man/nmcli-examples.7 man/nmcli.1 man/nmtui.1 \ - $(NULL) $(am__append_75) $(am__append_78) + $(NULL) $(am__append_76) $(am__append_79) man_pages_autogen = man/nm-settings-dbus.5 man/nm-settings-keyfile.5 \ - man/nm-settings-nmcli.5 $(NULL) $(am__append_72) + man/nm-settings-nmcli.5 $(NULL) $(am__append_73) ############################################################################### @@ -5090,8 +5096,8 @@ check_programs = src/libnm-platform/tests/test-nm-platform \ src/core/dhcp/tests/test-dhcp-dhclient \ src/core/dhcp/tests/test-dhcp-utils \ src/core/settings/plugins/keyfile/tests/test-keyfile-settings \ - $(am__append_27) $(am__append_34) $(am__append_38) \ - $(am__append_48) src/core/dnsmasq/tests/test-dnsmasq-utils \ + $(am__append_28) $(am__append_35) $(am__append_39) \ + $(am__append_49) src/core/dnsmasq/tests/test-dnsmasq-utils \ src/core/platform/tests/test-address-fake \ src/core/platform/tests/test-address-linux \ src/core/platform/tests/test-cleanup-fake \ @@ -5111,8 +5117,8 @@ check_programs = src/libnm-platform/tests/test-nm-platform \ src/core/tests/test-l3cfg src/core/tests/test-systemd \ src/core/tests/test-utils src/core/tests/test-wired-defname \ $(NULL) src/nm-dispatcher/tests/test-dispatcher-envp \ - src/libnmc-setting/tests/test-libnmc-setting $(am__append_69) -check_programs_norun = $(am__append_19) $(am__append_43) \ + src/libnmc-setting/tests/test-libnmc-setting $(am__append_70) +check_programs_norun = $(am__append_20) $(am__append_44) \ src/core/platform/tests/monitor \ src/core/ndisc/tests/test-ndisc-linux \ examples/C/glib/add-connection-gdbus \ @@ -5123,7 +5129,7 @@ check_programs_norun = $(am__append_19) $(am__append_43) \ examples/C/glib/list-connections-libnm \ examples/C/glib/monitor-nm-running-gdbus \ examples/C/glib/monitor-nm-state-gdbus \ - examples/C/glib/vpn-import-libnm $(NULL) $(am__append_92) + examples/C/glib/vpn-import-libnm $(NULL) $(am__append_93) ############################################################################### @@ -5137,20 +5143,20 @@ check_ltlibraries = $(am__append_7) $(am__append_8) $(am__append_9) \ src/libnmc-base/libnmc-base.la \ src/libnmc-setting/libnmc-setting.la check_local = check-docs check-local-exports-libnm $(am__append_15) \ - check-config-options $(am__append_26) $(am__append_33) \ - check-local-devices-adsl $(am__append_37) $(am__append_47) \ - $(am__append_50) $(am__append_52) $(am__append_54) \ - check-local-tests-client check-local-gitlab-ci check-tree \ - check-po-msgfmt -VAPIGEN_VAPIS = $(am__append_85) -dbusservice_DATA = $(am__append_30) \ + $(am__append_19) check-config-options $(am__append_27) \ + $(am__append_34) check-local-devices-adsl $(am__append_38) \ + $(am__append_48) $(am__append_51) $(am__append_53) \ + $(am__append_55) check-local-tests-client \ + check-local-gitlab-ci check-tree check-po-msgfmt +VAPIGEN_VAPIS = $(am__append_86) +dbusservice_DATA = $(am__append_31) \ src/nm-dispatcher/nm-dispatcher.conf \ src/nm-priv-helper/nm-priv-helper.conf \ src/core/org.freedesktop.NetworkManager.conf dbusactivation_DATA = \ src/nm-dispatcher/org.freedesktop.nm_dispatcher.service \ src/nm-priv-helper/org.freedesktop.nm_priv_helper.service -systemdsystemunit_DATA = $(am__append_64) $(am__append_70) +systemdsystemunit_DATA = $(am__append_65) $(am__append_71) INTROSPECTION_GIRS = $(am__append_12) INTROSPECTION_SCANNER_ARGS = INTROSPECTION_COMPILER_ARGS = @@ -5165,9 +5171,9 @@ nodist_libnminclude_HEADERS = $(src_libnm_core_public_mkenums_h) \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = src/libnm-client-impl/libnm.pc pppd_plugindir = $(PPPD_PLUGIN_DIR) -pppd_plugin_LTLIBRARIES = $(am__append_22) +pppd_plugin_LTLIBRARIES = $(am__append_23) vapidir = $(datadir)/vala/vapi -vapi_DATA = $(am__append_86) +vapi_DATA = $(am__append_87) examplesdir = $(docdir)/examples rundir = $(runstatedir)/NetworkManager statedir = $(localstatedir)/lib/NetworkManager @@ -6641,7 +6647,7 @@ src_core_cppflags = \ \ $(NULL) -src_core_cppflags_test = $(src_core_cppflags) $(NULL) $(am__append_20) +src_core_cppflags_test = $(src_core_cppflags) $(NULL) $(am__append_21) src_core_ldflags = $(CODE_COVERAGE_LDFLAGS) ############################################################################### @@ -7532,7 +7538,7 @@ src_core_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ src/core/devices/wwan/nm-modem.h \ @WITH_MODEM_MANAGER_1_TRUE@ src/core/devices/wwan/nm-service-providers.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/core/devices/wwan/nm-service-providers.h \ -@WITH_MODEM_MANAGER_1_TRUE@ $(NULL) $(am__append_36) +@WITH_MODEM_MANAGER_1_TRUE@ $(NULL) $(am__append_37) @WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_core_devices_wwan_cppflags) @WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_wwan_la_LDFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ -avoid-version \ @@ -7583,13 +7589,13 @@ src_core_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES = src/core/devices/bluetooth/nm-bluez-common.h \ @WITH_MODEM_MANAGER_1_TRUE@ src/core/devices/bluetooth/nm-bt-error.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/core/devices/bluetooth/nm-bt-error.h \ -@WITH_MODEM_MANAGER_1_TRUE@ $(NULL) $(am__append_40) +@WITH_MODEM_MANAGER_1_TRUE@ $(NULL) $(am__append_41) @WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ $(src_core_cppflags_base) $(NULL) \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_41) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_42) @WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_LIBS) $(NULL) \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_42) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_43) @WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \ @WITH_MODEM_MANAGER_1_TRUE@ src/core/devices/bluetooth/nm-bluez-manager.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/core/devices/bluetooth/nm-bluez-manager.h \ @@ -7637,7 +7643,7 @@ src_core_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_WIFI_TRUE@ src/core/devices/wifi/nm-wifi-p2p-peer.h \ @WITH_WIFI_TRUE@ src/core/devices/wifi/nm-wifi-utils.c \ @WITH_WIFI_TRUE@ src/core/devices/wifi/nm-wifi-utils.h $(NULL) \ -@WITH_WIFI_TRUE@ $(am__append_45) +@WITH_WIFI_TRUE@ $(am__append_46) @WITH_WIFI_TRUE@src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS = $(src_core_cppflags_device_plugin) @WITH_WIFI_TRUE@src_core_devices_wifi_libnm_wifi_base_la_LIBADD = \ @WITH_WIFI_TRUE@ $(GLIB_LIBS) @@ -21052,7 +21058,8 @@ dist-configure-check: # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1405 po/.Makefile.patched: sed -i \ - 's#^dist2: \$$(srcdir)/stamp-po \$$(DISTFILES)#dist2: \$$(srcdir)/stamp-po\n\t\$$(MAKE) \$$(DISTFILES)#' \ + -e 's#^dist2: \$$(srcdir)/stamp-po \$$(DISTFILES)#dist2: \$$(srcdir)/stamp-po\n\t\$$(MAKE) \$$(DISTFILES)#' \ + -e 's#^dist2: stamp-po \$$(DISTFILES)#dist2: stamp-po\n\t\$$(MAKE) \$$(DISTFILES)#' \ "$(builddir)/po/Makefile" && \ touch "$(builddir)/po/.Makefile.patched" @@ -21196,6 +21203,13 @@ check-local-exports-libnm: src/libnm-client-impl/libnm.la @HAVE_INTROSPECTION_TRUE@man/nm-settings-docs-%.xml: src/libnm-client-impl/nm-property-infos-%.xml src/libnm-client-impl/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py man/common.ent @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) "$(PYTHON)" $(srcdir)/tools/generate-docs-nm-settings-docs-merge.py $@ $(wordlist 1,2,$^) +check-local-libnm-gir: $(builddir)/src/libnm-client-impl/NM-1.0.gir +check-local-libnm-gir: $(srcdir)/src/libnm-client-impl/libnm.ver +check-local-libnm-gir: + "$(PYTHON)" $(srcdir)/src/libnm-client-impl/tests/test-gir.py \ + --gir $(builddir)/src/libnm-client-impl/NM-1.0.gir \ + --ver $(srcdir)/src/libnm-client-impl/libnm.ver + $(src_libnm_client_impl_tests_test_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) $(src_libnm_client_impl_tests_test_nm_client_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) $(src_libnm_client_impl_tests_test_remote_settings_client_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) diff --git a/NEWS b/NEWS index 20e88c83..3464a428 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,18 @@ +=============================================== +NetworkManager-1.40.4 +Overview of changes since NetworkManager-1.40.2 +=============================================== + +* dhcp: revert restarting DHCP when MAC address changes, + for example during a bond fail over. +* various documentation fixes. +* fix non-exported ABI in libnm which was wrongly present + in the header files but unusable so far. +* ifcfg-rh: fix writing ethtool pause settings to file. +* core: set "proto static" for manual routing rules configured + by NetworkManager. +* Various minor bugfixes. + =============================================== NetworkManager-1.40.2 Overview of changes since NetworkManager-1.40.0 diff --git a/configure b/configure index 3cccdb46..5c1be5f0 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.71 for NetworkManager 1.40.2. +# Generated by GNU Autoconf 2.71 for NetworkManager 1.40.4. # # Report bugs to . # @@ -622,8 +622,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.40.2' -PACKAGE_STRING='NetworkManager 1.40.2' +PACKAGE_VERSION='1.40.4' +PACKAGE_STRING='NetworkManager 1.40.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1744,7 +1744,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.40.2 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.40.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1816,7 +1816,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.40.2:";; + short | recursive ) echo "Configuration of NetworkManager 1.40.4:";; esac cat <<\_ACEOF @@ -2171,7 +2171,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.40.2 +NetworkManager configure 1.40.4 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2892,7 +2892,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.40.2, which was +It was created by NetworkManager $as_me 1.40.4, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4388,7 +4388,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.40.2' + VERSION='1.40.4' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -7298,11 +7298,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_11+y} +if test ${ac_cv_prog_cxx_cxx11+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_11=no + ac_cv_prog_cxx_cxx11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7344,11 +7344,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_98+y} +if test ${ac_cv_prog_cxx_cxx98+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_98=no + ac_cv_prog_cxx_cxx98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -19328,8 +19328,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 NM_MINOR_VERSION=40 -NM_MICRO_VERSION=2 -NM_VERSION=1.40.2 +NM_MICRO_VERSION=4 +NM_VERSION=1.40.4 @@ -19337,7 +19337,7 @@ NM_VERSION=1.40.2 -NM_GIT_SHA=4704b924ad584b467926dabddb8e726c1166ab5b +NM_GIT_SHA=86b82bf358a969fc7ff56d4933ae00382ac2bada if test """" != "no-config-h" ; then @@ -32768,7 +32768,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.40.2, which was +This file was extended by NetworkManager $as_me 1.40.4, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32836,7 +32836,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -NetworkManager config.status 1.40.2 +NetworkManager config.status 1.40.4 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 8a4803f9..75faec9a 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) m4_define([nm_minor_version], [40]) -m4_define([nm_micro_version], [2]) +m4_define([nm_micro_version], [4]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index c89dbc44..359e91fd 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -2,25 +2,12 @@ AUTOMAKE_OPTIONS = 1.7 XSLTPROC = xsltproc --xinclude --nonet XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) - GENERATED_FILES = if BUILD_DOCS - -settings-spec.xml: settings-spec.xsl $(top_builddir)/man/nm-settings-docs-dbus.xml - $(AM_V_GEN) (! test -f $@ || chmod u+w $@) && xsltproc --output $@ $^ - -# Top-level SGML file includes (depends on) settings-spec.xml -$(DOC_MAIN_SGML_FILE): settings-spec.xml - GENERATED_FILES += settings-spec.xml - -all: $(GENERATED_FILES) - endif -#################################### - # The name of the module. DOC_MODULE=NetworkManager @@ -130,7 +117,8 @@ setup-build.stamp: fi $(AM_V_at)touch setup-build.stamp -#################################### +settings-spec.xml: settings-spec.xsl $(top_builddir)/man/nm-settings-docs-dbus.xml + $(AM_V_GEN) (! test -f $@ || chmod u+w $@) && xsltproc --output $@ $^ EXTRA_DIST += \ version.xml.in \ diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index dfa37d09..3ba87ce5 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -457,8 +457,6 @@ AUTOMAKE_OPTIONS = 1.7 XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) GENERATED_FILES = $(am__append_1) -#################################### - # The name of the module. DOC_MODULE = NetworkManager @@ -550,8 +548,6 @@ SETUP_FILES = \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt - -#################################### EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in \ settings-spec.xsl meson.build $(GENERATED_FILES) $(NULL) DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ @@ -815,14 +811,6 @@ uninstall-am: uninstall-local .PRECIOUS: Makefile -@BUILD_DOCS_TRUE@settings-spec.xml: settings-spec.xsl $(top_builddir)/man/nm-settings-docs-dbus.xml -@BUILD_DOCS_TRUE@ $(AM_V_GEN) (! test -f $@ || chmod u+w $@) && xsltproc --output $@ $^ - -# Top-level SGML file includes (depends on) settings-spec.xml -@BUILD_DOCS_TRUE@$(DOC_MAIN_SGML_FILE): settings-spec.xml - -@BUILD_DOCS_TRUE@all: $(GENERATED_FILES) - gtkdoc-check.test: Makefile $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ @@ -1038,6 +1026,9 @@ setup-build.stamp: fi $(AM_V_at)touch setup-build.stamp +settings-spec.xml: settings-spec.xsl $(top_builddir)/man/nm-settings-docs-dbus.xml + $(AM_V_GEN) (! test -f $@ || chmod u+w $@) && xsltproc --output $@ $^ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 231490ab..b4911392 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -16,7 +16,7 @@

- for NetworkManager 1.40.2 + for NetworkManager 1.40.4 The latest version of this documentation can be found on-line at https://networkmanager.dev/docs/api/latest/. diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html index 350f587f..d940c0f8 100644 --- a/docs/api/html/nm-dbus-types.html +++ b/docs/api/html/nm-dbus-types.html @@ -32,6 +32,7 @@

enum NMCapability

NMCapability names the numbers in the Capabilities property. Capabilities are positive numbers. They are part of stable API and a certain capability number is guaranteed not to change.

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

+

Since: 1.6

Values

@@ -3961,7 +3962,7 @@

enum NMCheckpointCreateFlags

The flags for CheckpointCreate call

-

Since: 1.4 (gi flags generated since 1.12)

+

Since: 1.12 (public since 1.4, g-ir since 1.12)

Values

diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html index 0903c329..854ca8f0 100644 --- a/docs/api/html/nm-settings-dbus.html +++ b/docs/api/html/nm-settings-dbus.html @@ -1742,9 +1742,7 @@ dhcp-vendor-class-identifier string   - The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. - - Since 1.28 + The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. @@ -1832,9 +1830,7 @@ 0 Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. - When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". - - Since 1.40 + When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html index 6968e035..17ef394f 100644 --- a/docs/api/html/nm-settings-nmcli.html +++ b/docs/api/html/nm-settings-nmcli.html @@ -2101,7 +2101,6 @@

dhcp-vendor-class-identifier

The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server.

-

Since 1.28

Format: string

@@ -2184,7 +2183,6 @@

Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server.

When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default".

-

Since 1.40

Format: int32

diff --git a/docs/api/version.xml b/docs/api/version.xml index 148dabb4..77926ffe 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -1.40.2 +1.40.4 diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html index cc8d8247..d174979d 100644 --- a/docs/libnm/html/NMAccessPoint.html +++ b/docs/libnm/html/NMAccessPoint.html @@ -577,7 +577,7 @@ with this function.

connections

-

an array of NMConnections to +

an array of NMConnections to filter.

[element-type NMConnection] @@ -587,7 +587,7 @@ filter.

Returns

an array of -NMConnections that could be activated with the given ap +NMConnections that could be activated with the given ap . The array should be freed with g_ptr_array_unref() when it is no longer required.

WARNING: the transfer annotation for this function may not work correctly diff --git a/docs/libnm/html/NMCheckpoint.html b/docs/libnm/html/NMCheckpoint.html index 57a729dd..1e4f8e00 100644 --- a/docs/libnm/html/NMCheckpoint.html +++ b/docs/libnm/html/NMCheckpoint.html @@ -241,6 +241,7 @@ nm_checkpoint_get_rollback_timeout (

NMCheckpoint

typedef struct _NMCheckpoint NMCheckpoint;
+

Since: 1.12

diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html index 82cf2677..cb57834b 100644 --- a/docs/libnm/html/NMClient.html +++ b/docs/libnm/html/NMClient.html @@ -1287,6 +1287,10 @@ NM_CLIENT_ERROR +typedef +NMDnsEntry + +   NMClient @@ -3400,8 +3404,8 @@ before being added.

device

-

the NMDevice

-  +

the NMDevice.

+[allow-none]

specific_object

@@ -3542,8 +3546,8 @@ before being added.

device

-

the NMDevice

-  +

the NMDevice.

+[allow-none]

specific_object

@@ -3636,6 +3640,7 @@ failure, in which case error will be set.

[transfer full]

+

Since: 1.16

@@ -5829,6 +5834,13 @@ operation succeeded, but the object that was allegedly created (eg,
+

NMDnsEntry

+
typedef struct NMDnsEntry NMDnsEntry;
+
+

Since: 1.6

+
+
+

NMClient

typedef struct _NMClient NMClient;

NMClient contains a cache of the objects of NetworkManager's D-Bus API. diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html index e195ef4c..7c20ebdf 100644 --- a/docs/libnm/html/NMConnection.html +++ b/docs/libnm/html/NMConnection.html @@ -1318,7 +1318,7 @@ failed (tried to update secrets for a setting that doesn't exist, etc)

nm_connection_set_path (NMConnection *connection, const char *path);

Sets the D-Bus path of the connection. This property is not serialized, and -is only for the reference of the caller. Sets the “path” +is only for the reference of the caller. Sets the “path” property.

Parameters

@@ -1409,7 +1409,7 @@ nm_connection_is_type (const char *type);

A convenience function to check if the given connection is a particular -type (ie wired, Wi-Fi, ppp, etc). Checks the “type” +type (ie wired, Wi-Fi, ppp, etc). Checks the “type” property of the connection and matches that against type .

@@ -2265,7 +2265,7 @@ nm_connection_get_setting_ovs_bridge (NMSettingOvsBridge if the connection contains one, otherwise NULL.

[transfer none]

-

Since: 1.10

+

Since: 1.14

@@ -2294,7 +2294,7 @@ nm_connection_get_setting_ovs_interface

an NMSettingOvsInterface if the connection contains one, otherwise NULL.

[transfer none]

-

Since: 1.10

+

Since: 1.14

@@ -2322,7 +2322,7 @@ nm_connection_get_setting_ovs_patch (an NMSettingOvsPatch if the connection contains one, otherwise NULL.

[transfer none]

-

Since: 1.10

+

Since: 1.14

@@ -2350,7 +2350,7 @@ nm_connection_get_setting_ovs_port (an NMSettingOvsPort if the connection contains one, otherwise NULL.

[transfer none]

-

Since: 1.10

+

Since: 1.14

@@ -2515,7 +2515,7 @@ nm_connection_get_setting_tun (an NMSettingTun if the connection contains one, otherwise NULL.

[transfer none]

-

Since: 1.2

+

Since: 1.14

diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html index ac125f88..e152c456 100644 --- a/docs/libnm/html/NMDevice.html +++ b/docs/libnm/html/NMDevice.html @@ -2673,7 +2673,7 @@ incompatible with the device. To get the full list of connections see

connections

-

an array of NMConnections to filter.

+

an array of NMConnections to filter.

[element-type NMConnection] @@ -2682,7 +2682,7 @@ incompatible with the device. To get the full list of connections see

Returns

an array of -NMConnections that could be activated with the given device +NMConnections that could be activated with the given device . The array should be freed with g_ptr_array_unref() when it is no longer required.

WARNING: the transfer annotation for this function may not work correctly diff --git a/docs/libnm/html/NMDevice6Lowpan.html b/docs/libnm/html/NMDevice6Lowpan.html index 7f7ad0fc..96e11196 100644 --- a/docs/libnm/html/NMDevice6Lowpan.html +++ b/docs/libnm/html/NMDevice6Lowpan.html @@ -40,24 +40,14 @@ - - + NMDevice * nm_device_6lowpan_get_parent () - - - -4 - - -NM_DEPRECATED_IN_1_24_FOR () - - - +

@@ -136,14 +126,7 @@ nm_device_6lowpan_get_parent ([transfer none]

-

Since: 1.14

- -
-
-

NM_DEPRECATED_IN_1_24_FOR ()

-
4
-NM_DEPRECATED_IN_1_24_FOR ();
-

NM_DEPRECATED_IN_1_24_FOR is deprecated and should not be used in newly-written code.

+

Since: 1.42, 1.40.4

@@ -163,6 +146,7 @@ NM_DEPRECATED_IN_1_24_FOR ();

NMDevice6Lowpan

typedef struct _NMDevice6Lowpan NMDevice6Lowpan;
+

Since: 1.14

diff --git a/docs/libnm/html/NMDeviceDummy.html b/docs/libnm/html/NMDeviceDummy.html index f363c920..0d95a63f 100644 --- a/docs/libnm/html/NMDeviceDummy.html +++ b/docs/libnm/html/NMDeviceDummy.html @@ -41,10 +41,10 @@ -4 +0 -NM_DEPRECATED_IN_1_24_FOR () +NM_DEPRECATED_IN_1_24_FOR ()
@@ -83,7 +83,7 @@

Functions

NM_DEPRECATED_IN_1_24_FOR ()

-
4
+
0
 NM_DEPRECATED_IN_1_24_FOR ();

 
NM_DEPRECATED_IN_1_24_FOR is deprecated and should not be used in newly-written code.
@@ -99,6 +99,7 @@ NM_DEPRECATED_IN_1_24_FOR ();

NMDeviceDummy

typedef struct _NMDeviceDummy NMDeviceDummy;
+

Since: 1.8

diff --git a/docs/libnm/html/NMDeviceIPTunnel.html b/docs/libnm/html/NMDeviceIPTunnel.html index dae1eb56..0c1284c1 100644 --- a/docs/libnm/html/NMDeviceIPTunnel.html +++ b/docs/libnm/html/NMDeviceIPTunnel.html @@ -682,6 +682,7 @@ nm_device_ip_tunnel_get_flags (

NMDeviceIPTunnel

typedef struct _NMDeviceIPTunnel NMDeviceIPTunnel;
+

Since: 1.2

diff --git a/docs/libnm/html/NMDeviceMacsec.html b/docs/libnm/html/NMDeviceMacsec.html index a310cda5..83f7f703 100644 --- a/docs/libnm/html/NMDeviceMacsec.html +++ b/docs/libnm/html/NMDeviceMacsec.html @@ -51,10 +51,10 @@ -4 +0 -NM_DEPRECATED_IN_1_24_FOR () +NM_DEPRECATED_IN_1_24_FOR () @@ -342,12 +342,12 @@ nm_device_macsec_get_parent ([transfer none]

-

Since: 1.6

+

Since: 1.42, 1.40.4

NM_DEPRECATED_IN_1_24_FOR ()

-
4
+
0
 NM_DEPRECATED_IN_1_24_FOR ();

 
NM_DEPRECATED_IN_1_24_FOR is deprecated and should not be used in newly-written code.
@@ -770,6 +770,7 @@ nm_device_macsec_get_replay_protect (

NMDeviceMacsec

typedef struct _NMDeviceMacsec NMDeviceMacsec;
+

Since: 1.6

diff --git a/docs/libnm/html/NMDeviceMacvlan.html b/docs/libnm/html/NMDeviceMacvlan.html index c034178f..ee7e068a 100644 --- a/docs/libnm/html/NMDeviceMacvlan.html +++ b/docs/libnm/html/NMDeviceMacvlan.html @@ -74,10 +74,10 @@ -4 +0 -NM_DEPRECATED_IN_1_24_FOR () +NM_DEPRECATED_IN_1_24_FOR () @@ -276,7 +276,7 @@ nm_device_macvlan_get_tap (

NM_DEPRECATED_IN_1_24_FOR ()

-
4
+
0
 NM_DEPRECATED_IN_1_24_FOR ();

 
NM_DEPRECATED_IN_1_24_FOR is deprecated and should not be used in newly-written code.
@@ -316,6 +316,7 @@ NM_DEPRECATED_IN_1_24_FOR ();

NMDeviceMacvlan

typedef struct _NMDeviceMacvlan NMDeviceMacvlan;
+

Since: 1.2

diff --git a/docs/libnm/html/NMDeviceOvsBridge.html b/docs/libnm/html/NMDeviceOvsBridge.html index 180c3e81..527ab9c1 100644 --- a/docs/libnm/html/NMDeviceOvsBridge.html +++ b/docs/libnm/html/NMDeviceOvsBridge.html @@ -144,6 +144,7 @@ copy used by the device, and must not be modified.

NMDeviceOvsBridge

typedef struct _NMDeviceOvsBridge NMDeviceOvsBridge;
+

Since: 1.10

diff --git a/docs/libnm/html/NMDeviceOvsInterface.html b/docs/libnm/html/NMDeviceOvsInterface.html index 58e76d48..a1f3fd7b 100644 --- a/docs/libnm/html/NMDeviceOvsInterface.html +++ b/docs/libnm/html/NMDeviceOvsInterface.html @@ -65,6 +65,7 @@

NMDeviceOvsInterface

typedef struct _NMDeviceOvsInterface NMDeviceOvsInterface;
+

Since: 1.10

diff --git a/docs/libnm/html/NMDeviceOvsPort.html b/docs/libnm/html/NMDeviceOvsPort.html index b15ac45c..9f51f3e2 100644 --- a/docs/libnm/html/NMDeviceOvsPort.html +++ b/docs/libnm/html/NMDeviceOvsPort.html @@ -144,6 +144,7 @@ copy used by the device, and must not be modified.

NMDeviceOvsPort

typedef struct _NMDeviceOvsPort NMDeviceOvsPort;
+

Since: 1.10

diff --git a/docs/libnm/html/NMDevicePpp.html b/docs/libnm/html/NMDevicePpp.html index 2272269e..e44bffc7 100644 --- a/docs/libnm/html/NMDevicePpp.html +++ b/docs/libnm/html/NMDevicePpp.html @@ -65,6 +65,7 @@

NMDevicePpp

typedef struct _NMDevicePpp NMDevicePpp;
+

Since: 1.10

diff --git a/docs/libnm/html/NMDeviceTun.html b/docs/libnm/html/NMDeviceTun.html index 8662e739..21b82f23 100644 --- a/docs/libnm/html/NMDeviceTun.html +++ b/docs/libnm/html/NMDeviceTun.html @@ -43,10 +43,10 @@ -4 +0 -NM_DEPRECATED_IN_1_24_FOR () +NM_DEPRECATED_IN_1_24_FOR () @@ -200,7 +200,7 @@

Functions

NM_DEPRECATED_IN_1_24_FOR ()

-
4
+
0
 NM_DEPRECATED_IN_1_24_FOR ();

 
NM_DEPRECATED_IN_1_24_FOR is deprecated and should not be used in newly-written code.
@@ -290,6 +290,27 @@ nm_device_tun_get_group (

nm_device_tun_get_no_pi ()

gboolean
 nm_device_tun_get_no_pi (NMDeviceTun *device);
+

Returns whether the NMDeviceTun has the IFF_NO_PI flag.

+
+

Parameters

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

device

a NMDeviceTun

 
+
+
+

Returns

+

TRUE if the device has the flag, FALSE otherwise

+
+

Since: 1.2

@@ -393,6 +414,7 @@ nm_device_tun_get_multi_queue (

NMDeviceTun

typedef struct _NMDeviceTun NMDeviceTun;
+

Since: 1.2

diff --git a/docs/libnm/html/NMDeviceVeth.html b/docs/libnm/html/NMDeviceVeth.html index b74ad941..6f135a0d 100644 --- a/docs/libnm/html/NMDeviceVeth.html +++ b/docs/libnm/html/NMDeviceVeth.html @@ -123,7 +123,7 @@ nm_device_veth_get_peer ([transfer none]

-

Since: 1.30

+

Since: 1.42, 1.40.4

@@ -137,6 +137,7 @@ nm_device_veth_get_peer (

NMDeviceVeth

typedef struct _NMDeviceVeth NMDeviceVeth;
+

Since: 1.30

diff --git a/docs/libnm/html/NMDeviceVrf.html b/docs/libnm/html/NMDeviceVrf.html index 3ed71874..881d52ff 100644 --- a/docs/libnm/html/NMDeviceVrf.html +++ b/docs/libnm/html/NMDeviceVrf.html @@ -134,6 +134,7 @@ nm_device_vrf_get_table (

NMDeviceVrf

typedef struct _NMDeviceVrf NMDeviceVrf;
+

Since: 1.24

diff --git a/docs/libnm/html/NMDeviceVxlan.html b/docs/libnm/html/NMDeviceVxlan.html index 1a6907e6..c288d09b 100644 --- a/docs/libnm/html/NMDeviceVxlan.html +++ b/docs/libnm/html/NMDeviceVxlan.html @@ -43,10 +43,10 @@ -4 +0 -NM_DEPRECATED_IN_1_24_FOR () +NM_DEPRECATED_IN_1_24_FOR () @@ -388,7 +388,7 @@

Functions

NM_DEPRECATED_IN_1_24_FOR ()

-
4
+
0
 NM_DEPRECATED_IN_1_24_FOR ();

 
NM_DEPRECATED_IN_1_24_FOR is deprecated and should not be used in newly-written code.
@@ -419,7 +419,7 @@ nm_device_vxlan_get_carrier (Since: 1.2

+

Since: 1.42, 1.40.4

@@ -786,7 +786,7 @@ nm_device_vxlan_get_rsc (

Returns

whether route short circuit is turned on

-

Since: 1.2

+

Since: 1.42, 1.40.4

@@ -954,6 +954,7 @@ nm_device_vxlan_get_l3miss (

NMDeviceVxlan

typedef struct _NMDeviceVxlan NMDeviceVxlan;
+

Since: 1.2

diff --git a/docs/libnm/html/NMDeviceWifiP2P.html b/docs/libnm/html/NMDeviceWifiP2P.html index 7d0bd519..b5944e1e 100644 --- a/docs/libnm/html/NMDeviceWifiP2P.html +++ b/docs/libnm/html/NMDeviceWifiP2P.html @@ -44,10 +44,10 @@ -4 +0 -NM_DEPRECATED_IN_1_24_FOR () +NM_DEPRECATED_IN_1_24_FOR () @@ -180,7 +180,7 @@

Functions

NM_DEPRECATED_IN_1_24_FOR ()

-
4
+
0
 NM_DEPRECATED_IN_1_24_FOR ();

 
NM_DEPRECATED_IN_1_24_FOR is deprecated and should not be used in newly-written code.
@@ -218,7 +218,7 @@ nm_device_wifi_p2p_get_peer_by_path (the peer or NULL if none is found.

[transfer none]

-

Since: 1.16

+

Since: 1.42, 1.40.4

diff --git a/docs/libnm/html/NMDeviceWireGuard.html b/docs/libnm/html/NMDeviceWireGuard.html index 519b9a62..bb13e92f 100644 --- a/docs/libnm/html/NMDeviceWireGuard.html +++ b/docs/libnm/html/NMDeviceWireGuard.html @@ -243,6 +243,7 @@ See: ip-rule(8)

NMDeviceWireGuard

typedef struct _NMDeviceWireGuard NMDeviceWireGuard;
+

Since: 1.14

diff --git a/docs/libnm/html/NMDeviceWpan.html b/docs/libnm/html/NMDeviceWpan.html index db0cc11b..b17f1afb 100644 --- a/docs/libnm/html/NMDeviceWpan.html +++ b/docs/libnm/html/NMDeviceWpan.html @@ -33,23 +33,6 @@
-

Functions

-
---- - - - - -
-4 - -NM_DEPRECATED_IN_1_24_FOR () -
-
-

Types and Values

@@ -81,12 +64,7 @@

Functions

-
-

NM_DEPRECATED_IN_1_24_FOR ()

-
4
-NM_DEPRECATED_IN_1_24_FOR ();
-

NM_DEPRECATED_IN_1_24_FOR is deprecated and should not be used in newly-written code.

-
+

Types and Values

@@ -99,6 +77,7 @@ NM_DEPRECATED_IN_1_24_FOR ();

NMDeviceWpan

typedef struct _NMDeviceWpan NMDeviceWpan;
+

Since: 1.14

diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html index dedf951f..feae6e7b 100644 --- a/docs/libnm/html/NMRemoteConnection.html +++ b/docs/libnm/html/NMRemoteConnection.html @@ -382,6 +382,7 @@ nm_remote_connection_update2_finish (NULL.

[transfer full]

+

Since: 1.12

diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html index 36675132..d7259309 100644 --- a/docs/libnm/html/NMSetting.html +++ b/docs/libnm/html/NMSetting.html @@ -868,7 +868,7 @@ nm_setting_option_get ([transfer none]

-

Since: 1.26.

+

Since: 1.26

@@ -1178,19 +1178,19 @@ on setting

Types and Values

NM_SETTING_PARAM_REQUIRED

-
#define NM_SETTING_PARAM_REQUIRED (1 << (1 + G_PARAM_USER_SHIFT))
+
#define NM_SETTING_PARAM_REQUIRED 0x200

NM_SETTING_PARAM_SECRET

-
#define NM_SETTING_PARAM_SECRET (1 << (2 + G_PARAM_USER_SHIFT))
+
#define NM_SETTING_PARAM_SECRET 0x400

NM_SETTING_PARAM_FUZZY_IGNORE

-
#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
+
#define NM_SETTING_PARAM_FUZZY_IGNORE 0x800
@@ -1398,6 +1398,7 @@ overridden by user-controlled defaults configuration, is "never".

+

Since: 1.2

diff --git a/docs/libnm/html/NMSetting6Lowpan.html b/docs/libnm/html/NMSetting6Lowpan.html index f179af2b..742af78b 100644 --- a/docs/libnm/html/NMSetting6Lowpan.html +++ b/docs/libnm/html/NMSetting6Lowpan.html @@ -93,7 +93,7 @@ nm_setting_6lowpan_new (voidthe new empty NMSetting6Lowpan object.

[transfer full]

-

Since: 1.14

+

Since: 1.42, 1.40.4

@@ -119,7 +119,7 @@ nm_setting_6lowpan_get_parent (

Returns

the “parent” property of the setting

-

Since: 1.14

+

Since: 1.42, 1.40.4

diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html index f8759573..c79db83f 100644 --- a/docs/libnm/html/NMSetting8021x.html +++ b/docs/libnm/html/NMSetting8021x.html @@ -1106,7 +1106,7 @@ nm_setting_802_1x_get_eap_method (NMSetting8021x *setting, const char *eap);

Adds an allowed EAP method. The setting is not valid until at least one -EAP method has been added. See “eap” property for a list of +EAP method has been added. See “eap” property for a list of allowed EAP methods.

Parameters

@@ -1259,7 +1259,7 @@ nm_setting_802_1x_get_anonymous_identity (NMSetting8021x *setting);

Returns the anonymous identifier used by some EAP methods (like TTLS) to authenticate the user in the outer unencrypted "phase 1" authentication. The -inner "phase 2" authentication will use the “identity” in +inner "phase 2" authentication will use the “identity” in a secure form, if applicable for that EAP method.

Parameters

@@ -1312,9 +1312,9 @@ nm_setting_802_1x_get_pac_file (

nm_setting_802_1x_get_system_ca_certs ()

gboolean
 nm_setting_802_1x_get_system_ca_certs (NMSetting8021x *setting);
-

Sets the “system-ca-certs” property. The -“ca-path” and “phase2-ca-path” -properties are ignored if the “system-ca-certs” property is +

Sets the “system-ca-certs” property. The +“ca-path” and “phase2-ca-path” +properties are ignored if the “system-ca-certs” property is TRUE, in which case a system-wide CA certificate directory specified at compile time (using the --system-ca-path configure option) is used in place of these properties.

@@ -1346,7 +1346,7 @@ nm_setting_802_1x_get_ca_path (Returns the path of the CA certificate directory if previously set. Systems will often have a directory that contains multiple individual CA certificates 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 +used in addition to the “ca-cert” property to add more CA certificates for verifying the network to client.

Parameters

@@ -1376,7 +1376,7 @@ nm_setting_802_1x_get_phase2_ca_path (“phase2-ca-cert” property +This may be used in addition to the “phase2-ca-cert” property to add more CA certificates for verifying the network to client.

Parameters

@@ -1531,7 +1531,7 @@ nm_setting_802_1x_set_ca_cert (NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, GError **error); -

Reads a certificate from disk and sets the “ca-cert” property +

Reads a certificate from disk and sets the “ca-cert” property with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

@@ -1606,7 +1606,7 @@ nm_setting_802_1x_get_ca_cert_password

Returns

the password used to access the CA certificate stored in -“ca-cert” property. Only makes sense if the certificate +“ca-cert” property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.

Since: 1.8

@@ -1661,7 +1661,7 @@ nm_setting_802_1x_get_subject_match (

Returns

-

the “subject-match” property. This is the +

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

@@ -1674,7 +1674,7 @@ performed.

nm_setting_802_1x_get_num_altsubject_matches (NMSetting8021x *setting);

Returns the number of entries in the -“altsubject-matches” property of this setting.

+“altsubject-matches” property of this setting.

Parameters

@@ -2044,7 +2044,7 @@ nm_setting_802_1x_set_client_cert (NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, GError **error); -

Reads a certificate from disk and sets the “client-cert” +

Reads a certificate from disk and sets the “client-cert” property with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

@@ -2123,7 +2123,7 @@ nm_setting_802_1x_get_client_cert_password

Returns

the password used to access the client certificate stored in -“client-cert” property. Only makes sense if the certificate +“client-cert” property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.

Since: 1.8

@@ -2179,7 +2179,7 @@ nm_setting_802_1x_get_phase1_peapver (

Returns

the "phase 1" PEAP version to be used when authenticating with -EAP-PEAP as contained in the “phase1-peapver” property. Valid +EAP-PEAP as contained in the “phase1-peapver” property. Valid values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).

@@ -2208,7 +2208,7 @@ nm_setting_802_1x_get_phase1_peaplabel

Returns

whether the "phase 1" PEAP label is new-style or old-style, to be used when authenticating with EAP-PEAP, as contained in the -“phase1-peaplabel” property. Valid values are NULL (unset), +“phase1-peaplabel” property. Valid values are NULL (unset), "0" (use old-style label), and "1" (use new-style label). See the wpa_supplicant documentation for more details.

@@ -2237,7 +2237,7 @@ nm_setting_802_1x_get_phase1_fast_provisioning

Returns

whether "phase 1" PEAP fast provisioning should be used, as specified -by the “phase1-fast-provisioning” property. See the +by the “phase1-fast-provisioning” property. See the wpa_supplicant documentation for more details.

@@ -2264,7 +2264,7 @@ nm_setting_802_1x_get_phase2_auth (

Returns

the "phase 2" non-EAP (ex MD5) allowed authentication method as -specified by the “phase2-auth” property.

+specified by the “phase2-auth” property.

@@ -2290,7 +2290,7 @@ nm_setting_802_1x_get_phase2_autheap (

Returns

the "phase 2" EAP-based (ex TLS) allowed authentication method as -specified by the “phase2-autheap” property.

+specified by the “phase2-autheap” property.

@@ -2431,7 +2431,7 @@ nm_setting_802_1x_set_phase2_ca_cert (NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, GError **error); -

Reads a certificate from disk and sets the “phase2-ca-cert” +

Reads a certificate from disk and sets the “phase2-ca-cert” property with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

@@ -2506,7 +2506,7 @@ nm_setting_802_1x_get_phase2_ca_cert_password

Returns

the password used to access the "phase2" CA certificate stored in -“phase2-ca-cert” property. Only makes sense if the certificate +“phase2-ca-cert” property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.

Since: 1.8

@@ -2535,7 +2535,7 @@ nm_setting_802_1x_get_phase2_ca_cert_password_flags

Returns

the NMSettingSecretFlags pertaining to the -“phase2-private-key-password”

+“phase2-private-key-password”

Since: 1.8

@@ -2562,7 +2562,7 @@ nm_setting_802_1x_get_phase2_subject_match

Returns

-

the “phase2-subject-match” property. This is +

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 is to be performed.

@@ -2575,7 +2575,7 @@ is to be performed.

nm_setting_802_1x_get_num_phase2_altsubject_matches (NMSetting8021x *setting);

Returns the number of entries in the -“phase2-altsubject-matches” property of this setting.

+“phase2-altsubject-matches” property of this setting.

Parameters

@@ -2952,7 +2952,7 @@ nm_setting_802_1x_set_phase2_client_cert NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, GError **error); -

Reads a certificate from disk and sets the “phase2-client-cert” +

Reads a certificate from disk and sets the “phase2-client-cert” property with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

@@ -3031,7 +3031,7 @@ nm_setting_802_1x_get_phase2_client_cert_password

Returns

the password used to access the "phase2" client certificate stored in -“phase2-client-cert” property. Only makes sense if the certificate +“phase2-client-cert” property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.

Since: 1.8

@@ -3087,7 +3087,7 @@ nm_setting_802_1x_get_password (

Returns

the password used by the authentication method, if any, as specified -by the “password” property

+by the “password” property

@@ -3112,7 +3112,7 @@ nm_setting_802_1x_get_password_flags (

Returns

-

the NMSettingSecretFlags pertaining to the “password”

+

the NMSettingSecretFlags pertaining to the “password”

@@ -3139,7 +3139,7 @@ nm_setting_802_1x_get_password_raw (

Returns

the password used by the authentication method as a UTF-8-encoded array of bytes, as specified by the -“password-raw” property.

+“password-raw” property.

[transfer none]

@@ -3167,7 +3167,7 @@ nm_setting_802_1x_get_password_raw_flags

Returns

the NMSettingSecretFlags pertaining to the -“password-raw”

+“password-raw”

@@ -3193,7 +3193,7 @@ nm_setting_802_1x_get_pin (

Returns

the PIN used by the authentication method, if any, as specified -by the “pin” property

+by the “pin” property

@@ -3219,7 +3219,7 @@ nm_setting_802_1x_get_pin_flags (

Returns

the NMSettingSecretFlags pertaining to the -“pin”

+“pin”

@@ -3363,14 +3363,14 @@ nm_setting_802_1x_set_private_key (

This function reads a private key from disk and sets the -“private-key” property with the private key file data if using +“private-key” property with the private key file data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

If password is given, this function attempts to decrypt the private key to verify that password is correct, and if it is, updates the -“private-key-password” property with the given password +“private-key-password” property with the given password . If the decryption is unsuccessful, FALSE is returned, error is set, and no @@ -3461,7 +3461,7 @@ nm_setting_802_1x_get_private_key_password

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.

+“private-key-password” property.

@@ -3488,7 +3488,7 @@ nm_setting_802_1x_get_private_key_password_flags

Returns

the NMSettingSecretFlags pertaining to the -“private-key-password”

+“private-key-password”

@@ -3515,7 +3515,7 @@ nm_setting_802_1x_get_private_key_format

Returns

the data format of the private key data stored in the -“private-key” property

+“private-key” property

@@ -3661,14 +3661,14 @@ nm_setting_802_1x_set_phase2_private_key when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x authentication method.

This function reads a private key from disk and sets the -“phase2-private-key” property with the private key file data if +“phase2-private-key” property with the private key file data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

If password is given, this function attempts to decrypt the private key to verify that password is correct, and if it is, updates the -“phase2-private-key-password” property with the given +“phase2-private-key-password” property with the given password . If the decryption is unsuccessful, FALSE is returned, error is @@ -3760,7 +3760,7 @@ nm_setting_802_1x_get_phase2_private_key_password

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.

+“phase2-private-key-password” property.

@@ -3787,7 +3787,7 @@ nm_setting_802_1x_get_phase2_private_key_password_flags

Returns

the NMSettingSecretFlags pertaining to the -“phase2-private-key-password”

+“phase2-private-key-password”

@@ -3814,7 +3814,7 @@ nm_setting_802_1x_get_phase2_private_key_format

Returns

the data format of the "phase 2" private key data stored in the -“phase2-private-key” property

+“phase2-private-key” property

diff --git a/docs/libnm/html/NMSettingAdsl.html b/docs/libnm/html/NMSettingAdsl.html index 6ae00ebd..1aa75c7c 100644 --- a/docs/libnm/html/NMSettingAdsl.html +++ b/docs/libnm/html/NMSettingAdsl.html @@ -204,7 +204,7 @@ nm_setting_adsl_get_username (

Returns

-

the “username” property of the setting

+

the “username” property of the setting

@@ -229,7 +229,7 @@ nm_setting_adsl_get_password (

Returns

-

the “password” property of the setting

+

the “password” property of the setting

@@ -254,7 +254,7 @@ nm_setting_adsl_get_protocol (

Returns

-

the “protocol” property of the setting

+

the “protocol” property of the setting

@@ -279,7 +279,7 @@ nm_setting_adsl_get_encapsulation (

Returns

-

the “encapsulation” property of the setting

+

the “encapsulation” property of the setting

@@ -304,7 +304,7 @@ nm_setting_adsl_get_vpi (

Returns

-

the “vpi” property of the setting

+

the “vpi” property of the setting

@@ -329,7 +329,7 @@ nm_setting_adsl_get_vci (

Returns

-

the “vci” property of the setting

+

the “vci” property of the setting

@@ -354,7 +354,7 @@ nm_setting_adsl_get_password_flags (

Returns

-

the NMSettingSecretFlags pertaining to the “password”

+

the NMSettingSecretFlags pertaining to the “password”

diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html index 75ffeb87..7f850594 100644 --- a/docs/libnm/html/NMSettingBond.html +++ b/docs/libnm/html/NMSettingBond.html @@ -577,7 +577,7 @@ nm_setting_bond_get_option_default (

Returns

the value of the bond option if not overridden by an entry in -the “options” property.

+the “options” property.

diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html index be894860..4cd226a6 100644 --- a/docs/libnm/html/NMSettingBridge.html +++ b/docs/libnm/html/NMSettingBridge.html @@ -592,7 +592,7 @@ nm_setting_bridge_get_mac_address (

Returns

-

the “mac-address” property of the setting

+

the “mac-address” property of the setting

@@ -617,7 +617,7 @@ nm_setting_bridge_get_stp (

Returns

-

the “stp” property of the setting

+

the “stp” property of the setting

@@ -642,7 +642,7 @@ nm_setting_bridge_get_priority (

Returns

-

the “priority” property of the setting

+

the “priority” property of the setting

@@ -667,7 +667,7 @@ nm_setting_bridge_get_forward_delay (

Returns

-

the “forward-delay” property of the setting

+

the “forward-delay” property of the setting

@@ -692,7 +692,7 @@ nm_setting_bridge_get_hello_time (

Returns

-

the “hello-time” property of the setting

+

the “hello-time” property of the setting

@@ -717,7 +717,7 @@ nm_setting_bridge_get_max_age (

Returns

-

the “max-age” property of the setting

+

the “max-age” property of the setting

@@ -742,7 +742,7 @@ nm_setting_bridge_get_ageing_time (

Returns

-

the “ageing-time” property of the setting

+

the “ageing-time” property of the setting

@@ -1516,8 +1516,8 @@ nm_setting_bridge_get_group_address (const

Returns

the “group-address” property of the setting

-

Since 1.24

+

Since: 1.24

@@ -1542,8 +1542,8 @@ nm_setting_bridge_get_vlan_protocol (const

Returns

the “vlan-protocol” property of the setting

-

Since 1.24

+

Since: 1.24

@@ -1569,8 +1569,8 @@ nm_setting_bridge_get_vlan_stats_enabled

Returns

the “vlan-stats-enabled” property of the setting

-

Since 1.24

+

Since: 1.24

@@ -1596,8 +1596,8 @@ nm_setting_bridge_get_multicast_router

Returns

the “multicast-router” property of the setting

-

Since 1.24

+

Since: 1.24

@@ -1623,8 +1623,8 @@ nm_setting_bridge_get_multicast_query_use_ifaddr

Returns

the “multicast-query-use-ifaddr” property of the setting

-

Since 1.24

+

Since: 1.24

@@ -1650,8 +1650,8 @@ nm_setting_bridge_get_multicast_querier

Returns

the “multicast-querier” property of the setting

-

Since 1.24

+

Since: 1.24

@@ -1677,8 +1677,8 @@ nm_setting_bridge_get_multicast_hash_max

Returns

the “multicast-hash-max” property of the setting

-

Since 1.26

+

Since: 1.26

@@ -1704,8 +1704,8 @@ nm_setting_bridge_get_multicast_last_member_count

Returns

the “multicast-last-member-count” property of the setting

-

Since 1.26

+

Since: 1.26

@@ -1731,8 +1731,8 @@ nm_setting_bridge_get_multicast_last_member_interval

Returns

the “multicast-last-member-interval” property of the setting

-

Since 1.26

+

Since: 1.26

@@ -1758,8 +1758,8 @@ nm_setting_bridge_get_multicast_membership_interval

Returns

the “multicast-membership-interval” property of the setting

-

Since 1.26

+

Since: 1.26

@@ -1785,8 +1785,8 @@ nm_setting_bridge_get_multicast_querier_interval

Returns

the “multicast-querier-interval” property of the setting

-

Since 1.26

+

Since: 1.26

@@ -1812,8 +1812,8 @@ nm_setting_bridge_get_multicast_query_interval

Returns

the “multicast-query-interval” property of the setting

-

Since 1.26

+

Since: 1.26

@@ -1839,8 +1839,8 @@ nm_setting_bridge_get_multicast_query_response_interval

Returns

the “multicast-query-response-interval” property of the setting

-

Since 1.26

+

Since: 1.26

@@ -1866,8 +1866,8 @@ nm_setting_bridge_get_multicast_startup_query_count

Returns

the “multicast-query-response-interval” property of the setting

-

Since 1.26

+

Since: 1.26

@@ -1893,8 +1893,8 @@ nm_setting_bridge_get_multicast_startup_query_interval

Returns

the “multicast-startup-query-interval” property of the setting

-

Since 1.26

+

Since: 1.26

diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html index dfd522e0..d6044d66 100644 --- a/docs/libnm/html/NMSettingBridgePort.html +++ b/docs/libnm/html/NMSettingBridgePort.html @@ -193,7 +193,7 @@ nm_setting_bridge_port_get_priority (

Returns

-

the “priority” property of the setting

+

the “priority” property of the setting

@@ -218,7 +218,7 @@ nm_setting_bridge_port_get_path_cost (

Returns

-

the “path-cost” property of the setting

+

the “path-cost” property of the setting

@@ -244,7 +244,7 @@ nm_setting_bridge_port_get_hairpin_mode

Returns

-

the “hairpin-mode” property of the setting

+

the “hairpin-mode” property of the setting

diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html index 4b7fa909..e0e96e90 100644 --- a/docs/libnm/html/NMSettingCdma.html +++ b/docs/libnm/html/NMSettingCdma.html @@ -162,7 +162,7 @@ nm_setting_cdma_get_number (

Returns

-

the “number” property of the setting

+

the “number” property of the setting

@@ -187,7 +187,7 @@ nm_setting_cdma_get_username (

Returns

-

the “username” property of the setting

+

the “username” property of the setting

@@ -212,7 +212,7 @@ nm_setting_cdma_get_password (

Returns

-

the “password” property of the setting

+

the “password” property of the setting

@@ -237,7 +237,7 @@ nm_setting_cdma_get_password_flags (

Returns

-

the NMSettingSecretFlags pertaining to the “password”

+

the NMSettingSecretFlags pertaining to the “password”

diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html index e03307c8..3db17611 100644 --- a/docs/libnm/html/NMSettingConnection.html +++ b/docs/libnm/html/NMSettingConnection.html @@ -538,7 +538,7 @@ nm_setting_connection_new (void

nm_setting_connection_get_id ()

const char *
 nm_setting_connection_get_id (NMSettingConnection *setting);
-

Returns the “id” property of the connection.

+

Returns the “id” property of the connection.

Parameters

@@ -564,7 +564,7 @@ nm_setting_connection_get_id (

nm_setting_connection_get_uuid ()

const char *
 nm_setting_connection_get_uuid (NMSettingConnection *setting);
-

Returns the “uuid” property of the connection.

+

Returns the “uuid” property of the connection.

Parameters

@@ -618,7 +618,7 @@ nm_setting_connection_get_stable_id (const char * nm_setting_connection_get_interface_name (NMSettingConnection *setting); -

Returns the “interface-name” property of the connection.

+

Returns the “interface-name” property of the connection.

Parameters

@@ -645,7 +645,7 @@ nm_setting_connection_get_interface_name 
const char *
 nm_setting_connection_get_connection_type
                                (NMSettingConnection *setting);
-

Returns the “type” property of the connection.

+

Returns the “type” property of the connection.

Parameters

@@ -671,7 +671,7 @@ nm_setting_connection_get_connection_type

nm_setting_connection_get_autoconnect ()

gboolean
 nm_setting_connection_get_autoconnect (NMSettingConnection *setting);
-

Returns the “autoconnect” property of the connection.

+

Returns the “autoconnect” property of the connection.

Parameters

@@ -781,7 +781,7 @@ nm_setting_connection_get_multi_connect

nm_setting_connection_get_timestamp ()

guint64
 nm_setting_connection_get_timestamp (NMSettingConnection *setting);
-

Returns the “timestamp” property of the connection.

+

Returns the “timestamp” property of the connection.

Parameters

@@ -807,7 +807,7 @@ nm_setting_connection_get_timestamp (

nm_setting_connection_get_read_only ()

gboolean
 nm_setting_connection_get_read_only (NMSettingConnection *setting);
-

Returns the “read-only” property of the connection.

+

Returns the “read-only” property of the connection.

Parameters

@@ -834,7 +834,7 @@ nm_setting_connection_get_read_only (guint32 nm_setting_connection_get_num_permissions (NMSettingConnection *setting); -

Returns the number of entries in the “permissions” +

Returns the number of entries in the “permissions” property of this setting.

Parameters

@@ -865,7 +865,7 @@ nm_setting_connection_get_permission (const char **out_ptype, const char **out_pitem, const char **out_detail); -

Retrieve one of the entries of the “permissions” property +

Retrieve one of the entries of the “permissions” property of this setting.

Parameters

@@ -896,7 +896,7 @@ unless the entry is invalid, in which case it returns "invalid".

 +“permissions” for more detail

 @@ -918,7 +918,7 @@ was invalid

nm_setting_connection_get_zone ()

const char *
 nm_setting_connection_get_zone (NMSettingConnection *setting);
-

Returns the “zone” property of the connection.

+

Returns the “zone” property of the connection.

Parameters

out_pitem

on return, the permission item (formatted according to ptype , see -“permissions” for more detail

 
@@ -986,7 +986,7 @@ nm_setting_connection_add_permission (pitem must be a username. See -“permissions”: for more details.

+“permissions”: for more details.

Parameters

@@ -1075,7 +1075,7 @@ nm_setting_connection_remove_permission_by_value

Removes the permission from the connection. At this time, only the "user" permission type is supported, and pitem must -be a username. See “permissions”: for more details.

+be a username. See “permissions”: for more details.

Parameters

@@ -1119,7 +1119,7 @@ be a username. See “permissions”: for more details

nm_setting_connection_get_master ()

const char *
 nm_setting_connection_get_master (NMSettingConnection *setting);
-

Returns the “master” property of the connection.

+

Returns the “master” property of the connection.

Parameters

@@ -1182,7 +1182,7 @@ against setting

nm_setting_connection_get_slave_type ()

const char *
 nm_setting_connection_get_slave_type (NMSettingConnection *setting);
-

Returns the “slave-type” property of the connection.

+

Returns the “slave-type” property of the connection.

Parameters

@@ -1422,7 +1422,7 @@ nm_setting_connection_get_gateway_ping_timeout

Returns

-

the value contained in the “gateway-ping-timeout” +

the value contained in the “gateway-ping-timeout” property.

@@ -1612,7 +1612,7 @@ nm_setting_connection_get_mptcp_flags (

Returns

the “mptcp-flags” property of the setting.

-

Since: 1.40

+

Since: 1.42, 1.40.4

@@ -1928,6 +1928,7 @@ master is activated

+

Since: 1.2

@@ -1966,6 +1967,7 @@ master is activated

+

Since: 1.2

diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html index 4370ce9d..853854df 100644 --- a/docs/libnm/html/NMSettingDcb.html +++ b/docs/libnm/html/NMSettingDcb.html @@ -354,7 +354,7 @@ nm_setting_dcb_get_app_fcoe_flags (

Returns

-

the “app-fcoe-flags” property of the setting

+

the “app-fcoe-flags” property of the setting

@@ -379,7 +379,7 @@ nm_setting_dcb_get_app_fcoe_priority (

Returns

-

the “app-fcoe-priority” property of the setting

+

the “app-fcoe-priority” property of the setting

@@ -404,7 +404,7 @@ nm_setting_dcb_get_app_fcoe_mode (

Returns

-

the “app-fcoe-mode” property of the setting

+

the “app-fcoe-mode” property of the setting

@@ -429,7 +429,7 @@ nm_setting_dcb_get_app_iscsi_flags (

Returns

-

the “app-iscsi-flags” property of the setting

+

the “app-iscsi-flags” property of the setting

@@ -454,7 +454,7 @@ nm_setting_dcb_get_app_iscsi_priority (

Returns

-

the “app-iscsi-priority” property of the setting

+

the “app-iscsi-priority” property of the setting

@@ -479,7 +479,7 @@ nm_setting_dcb_get_app_fip_flags (

Returns

-

the “app-fip-flags” property of the setting

+

the “app-fip-flags” property of the setting

@@ -504,7 +504,7 @@ nm_setting_dcb_get_app_fip_priority (

Returns

-

the “app-fip-priority” property of the setting

+

the “app-fip-priority” property of the setting

@@ -530,7 +530,7 @@ nm_setting_dcb_get_priority_flow_control_flags

Returns

-

the “priority-flow-control-flags” property of the setting

+

the “priority-flow-control-flags” property of the setting

@@ -577,7 +577,7 @@ nm_setting_dcb_set_priority_flow_control (NMSettingDcb *setting, guint user_priority, gboolean enabled); -

These values are only valid when “priority-flow-control” includes +

These values are only valid when “priority-flow-control” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

Parameters

@@ -630,7 +630,7 @@ nm_setting_dcb_get_priority_group_flags

Returns

-

the “priority-group-flags” property of the setting

+

the “priority-group-flags” property of the setting

@@ -665,7 +665,7 @@ nm_setting_dcb_get_priority_group_id (

Returns

the group number user_priority is assigned to. These values are -only valid when “priority-group-flags” includes the +only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

@@ -676,7 +676,7 @@ only valid when “priority-group-flags” includes th nm_setting_dcb_set_priority_group_id (NMSettingDcb *setting, guint user_priority, guint group_id); -

These values are only valid when “priority-group-flags” includes +

These values are only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

Parameters

@@ -741,7 +741,7 @@ nm_setting_dcb_get_priority_group_bandwidth

Returns

the bandwidth percentage assigned to group_id . These values are -only valid when “priority-group-flags” includes the +only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

@@ -753,7 +753,7 @@ nm_setting_dcb_set_priority_group_bandwidth (NMSettingDcb *setting, guint group_id, guint bandwidth_percent); -

These values are only valid when “priority-group-flags” includes +

These values are only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

Parameters

@@ -816,7 +816,7 @@ nm_setting_dcb_get_priority_bandwidth (

Returns

the allowed bandwidth percentage of user_priority in its priority group. -These values are only valid when “priority-group-flags” includes the +These values are only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

@@ -827,7 +827,7 @@ These values are only valid when “priority-group-flags”NMSettingDcb *setting, guint user_priority, guint bandwidth_percent); -

These values are only valid when “priority-group-flags” includes +

These values are only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

Parameters

@@ -893,7 +893,7 @@ nm_setting_dcb_get_priority_strict_bandwidth

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 -“priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

+“priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

@@ -904,7 +904,7 @@ nm_setting_dcb_set_priority_strict_bandwidth (NMSettingDcb *setting, guint user_priority, gboolean strict); -

These values are only valid when “priority-group-flags” includes +

These values are only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

Parameters

@@ -969,7 +969,7 @@ nm_setting_dcb_get_priority_traffic_class

Returns

the traffic class assigned to user_priority . These values are only -valid when “priority-group-flags” includes the +valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html index 4a10561c..2a3b9d16 100644 --- a/docs/libnm/html/NMSettingGeneric.html +++ b/docs/libnm/html/NMSettingGeneric.html @@ -67,7 +67,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

diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html index b6477e6f..35c275cd 100644 --- a/docs/libnm/html/NMSettingGsm.html +++ b/docs/libnm/html/NMSettingGsm.html @@ -290,7 +290,7 @@ nm_setting_gsm_get_username (

Returns

-

the “username” property of the setting

+

the “username” property of the setting

@@ -315,7 +315,7 @@ nm_setting_gsm_get_password (

Returns

-

the “password” property of the setting

+

the “password” property of the setting

@@ -340,7 +340,7 @@ nm_setting_gsm_get_apn (

Returns

-

the “apn” property of the setting

+

the “apn” property of the setting

@@ -365,7 +365,7 @@ nm_setting_gsm_get_network_id (

Returns

-

the “network-id” property of the setting

+

the “network-id” property of the setting

@@ -390,7 +390,7 @@ nm_setting_gsm_get_pin (

Returns

-

the “pin” property of the setting

+

the “pin” property of the setting

@@ -415,7 +415,7 @@ nm_setting_gsm_get_home_only (

Returns

-

the “home-only” property of the setting

+

the “home-only” property of the setting

@@ -548,7 +548,7 @@ nm_setting_gsm_get_number (

Returns

-

the “number” property of the setting

+

the “number” property of the setting

@@ -573,7 +573,7 @@ nm_setting_gsm_get_pin_flags (

Returns

-

the NMSettingSecretFlags pertaining to the “pin”

+

the NMSettingSecretFlags pertaining to the “pin”

@@ -598,7 +598,7 @@ nm_setting_gsm_get_password_flags (

Returns

-

the NMSettingSecretFlags pertaining to the “password”

+

the NMSettingSecretFlags pertaining to the “password”

diff --git a/docs/libnm/html/NMSettingHostname.html b/docs/libnm/html/NMSettingHostname.html index 5ad796ae..5f3e812d 100644 --- a/docs/libnm/html/NMSettingHostname.html +++ b/docs/libnm/html/NMSettingHostname.html @@ -133,7 +133,7 @@ nm_setting_hostname_new (voidthe new empty NMSettingHostname object.

[transfer full]

-

Since: 1.30

+

Since: 1.42, 1.40.4

diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html index 5fac8aff..aa26a2f3 100644 --- a/docs/libnm/html/NMSettingIP4Config.html +++ b/docs/libnm/html/NMSettingIP4Config.html @@ -179,7 +179,7 @@ nm_setting_ip4_config_new (voidconst char * nm_setting_ip4_config_get_dhcp_client_id (NMSettingIP4Config *setting); -

Returns the value contained in the “dhcp-client-id” +

Returns the value contained in the “dhcp-client-id” property.

Parameters

@@ -285,7 +285,7 @@ property.

Returns

the link-local configuration

-

Since: 1.40

+

Since: 1.42, 1.40.4

diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html index 452f5796..fe805d0f 100644 --- a/docs/libnm/html/NMSettingIP6Config.html +++ b/docs/libnm/html/NMSettingIP6Config.html @@ -215,7 +215,7 @@ nm_setting_ip6_config_new (void

nm_setting_ip6_config_get_ip6_privacy ()

NMSettingIP6ConfigPrivacy
 nm_setting_ip6_config_get_ip6_privacy (NMSettingIP6Config *setting);
-

Returns the value contained in the “ip6-privacy” +

Returns the value contained in the “ip6-privacy” property.

Parameters

diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html index 7b4be85c..82ea7af2 100644 --- a/docs/libnm/html/NMSettingIPConfig.html +++ b/docs/libnm/html/NMSettingIPConfig.html @@ -1704,6 +1704,7 @@ to.

0 if the two objects have the same values (according to their flags) or a integer indicating the compare order.

+

Since: 1.22

@@ -4796,6 +4797,7 @@ a default configuration, while the former explicitly means "no-options".

Returns

whether DNS options are initialized or left unset (the default).

+

Since: 1.2

@@ -5894,7 +5896,7 @@ property.

Returns

the configured DHCP IAID (Identity Association Identifier)

-

Since: 1.22

+

Since: 1.42, 1.40.4

diff --git a/docs/libnm/html/NMSettingIPTunnel.html b/docs/libnm/html/NMSettingIPTunnel.html index 88bc354e..97d92639 100644 --- a/docs/libnm/html/NMSettingIPTunnel.html +++ b/docs/libnm/html/NMSettingIPTunnel.html @@ -514,7 +514,7 @@ nm_setting_ip_tunnel_get_encapsulation_limit

Returns

the encapsulation limit value

-

Since: 1.2

+

Since: 1.42, 1.40.4

@@ -541,7 +541,7 @@ nm_setting_ip_tunnel_get_flow_label (

Returns

the flow label value

-

Since: 1.2

+

Since: 1.42, 1.40.4

@@ -575,6 +575,27 @@ nm_setting_ip_tunnel_get_mtu (

nm_setting_ip_tunnel_get_flags ()

NMIPTunnelFlags
 nm_setting_ip_tunnel_get_flags (NMSettingIPTunnel *setting);
+

Returns the “flags” property of the setting.

+
+

Parameters

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

setting

the NMSettingIPTunnel

 
+
+
+

Returns

+

the tunnel flags

+
+

Since: 1.12

@@ -665,6 +686,7 @@ nm_setting_ip_tunnel_get_flags (

enum NMIPTunnelFlags

+

IP tunnel flags.

Members

@@ -676,42 +698,60 @@ nm_setting_ip_tunnel_get_flags ( - - + + - - + + - - + + - - + + - - + + - - + + - - + +

NM_IP_TUNNEL_FLAG_NONE

   +

no flag

+		 

NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT

   +

don't add encapsulation limit +if one isn't present in inner packet

+		 

NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS

   +

copy the traffic class field +from the inner packet

+		 

NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL

   +

copy the flowlabel from the +inner packet

+		 

NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV

   +

used for Mobile IPv6

+		 

NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY

   +

copy DSCP from the outer packet

+		 

NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK

   +

copy fwmark from inner packet

+		 
+

Since: 1.12

diff --git a/docs/libnm/html/NMSettingInfiniband.html b/docs/libnm/html/NMSettingInfiniband.html index 185907d0..c4c2ef31 100644 --- a/docs/libnm/html/NMSettingInfiniband.html +++ b/docs/libnm/html/NMSettingInfiniband.html @@ -169,7 +169,7 @@ nm_setting_infiniband_get_mac_address (

Returns

-

the “mac-address” property of the setting

+

the “mac-address” property of the setting

@@ -194,7 +194,7 @@ nm_setting_infiniband_get_mtu (

Returns

-

the “mtu” property of the setting

+

the “mtu” property of the setting

@@ -285,8 +285,8 @@ nm_setting_infiniband_get_parent (const char * nm_setting_infiniband_get_virtual_interface_name (NMSettingInfiniband *setting); -

Returns the interface name created by combining “parent” -and “p-key”. (If either property is unset, this will +

Returns the interface name created by combining “parent” +and “p-key”. (If either property is unset, this will return NULL.)

Parameters

diff --git a/docs/libnm/html/NMSettingMacvlan.html b/docs/libnm/html/NMSettingMacvlan.html index 2b084c14..4979cf0e 100644 --- a/docs/libnm/html/NMSettingMacvlan.html +++ b/docs/libnm/html/NMSettingMacvlan.html @@ -345,6 +345,7 @@ nm_setting_macvlan_get_tap (Since: 1.2

diff --git a/docs/libnm/html/NMSettingOvsBridge.html b/docs/libnm/html/NMSettingOvsBridge.html index 9d0a6da9..e72e64ef 100644 --- a/docs/libnm/html/NMSettingOvsBridge.html +++ b/docs/libnm/html/NMSettingOvsBridge.html @@ -272,7 +272,7 @@ nm_setting_ovs_bridge_get_datapath_type

Returns

the “datapath_type” property of the setting

-

Since: 1.20

+

Since: 1.42, 1.40.4

diff --git a/docs/libnm/html/NMSettingOvsExternalIDs.html b/docs/libnm/html/NMSettingOvsExternalIDs.html index 639dd644..87b5da95 100644 --- a/docs/libnm/html/NMSettingOvsExternalIDs.html +++ b/docs/libnm/html/NMSettingOvsExternalIDs.html @@ -162,6 +162,7 @@ nm_setting_ovs_external_ids_get_data_keys NULL-terminated array containing each key from the table.

[array length=out_len][transfer none]

+

Since: 1.30

diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html index b4f5f1f5..efed6596 100644 --- a/docs/libnm/html/NMSettingSerial.html +++ b/docs/libnm/html/NMSettingSerial.html @@ -178,7 +178,7 @@ nm_setting_serial_get_baud (

Returns

-

the “baud” property of the setting

+

the “baud” property of the setting

@@ -203,7 +203,7 @@ nm_setting_serial_get_bits (

Returns

-

the “bits” property of the setting

+

the “bits” property of the setting

@@ -228,7 +228,7 @@ nm_setting_serial_get_parity (

Returns

-

the “parity” property of the setting

+

the “parity” property of the setting

@@ -253,7 +253,7 @@ nm_setting_serial_get_stopbits (

Returns

-

the “stopbits” property of the setting

+

the “stopbits” property of the setting

@@ -278,7 +278,7 @@ nm_setting_serial_get_send_delay (

Returns

-

the “send-delay” property of the setting

+

the “send-delay” property of the setting

diff --git a/docs/libnm/html/NMSettingSriov.html b/docs/libnm/html/NMSettingSriov.html index a1b42911..81600da0 100644 --- a/docs/libnm/html/NMSettingSriov.html +++ b/docs/libnm/html/NMSettingSriov.html @@ -795,6 +795,34 @@ nm_sriov_vf_get_vlan_qos (const NMSriovVFVlanProtocol nm_sriov_vf_get_vlan_protocol (const NMSriovVF *vf, guint vlan_id); +

Returns the configured protocol for the given VLAN.

+
+

Parameters

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

vf

the NMSriovVF

 

vlan_id

the VLAN id

 
+
+
+

Returns

+

the configured protocol

+
+

Since: 1.14

@@ -1121,7 +1149,7 @@ the value is of the correct type and well-formed.

Returns

TRUE if the attribute is valid, FALSE otherwise

-

Since: 1.14

+

Since: 1.42, 1.40.4

diff --git a/docs/libnm/html/NMSettingTCConfig.html b/docs/libnm/html/NMSettingTCConfig.html index 50bebca4..ea07415d 100644 --- a/docs/libnm/html/NMSettingTCConfig.html +++ b/docs/libnm/html/NMSettingTCConfig.html @@ -1376,7 +1376,7 @@ nm_tc_tfilter_get_action (

Returns

the action associated with a traffic filter.

-

Since: 1.12

+

Since: 1.42, 1.40.4

@@ -1407,7 +1407,7 @@ nm_tc_tfilter_set_action (Since: 1.12

+

Since: 1.42, 1.40.4

diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html index 431b3923..1af5bc5f 100644 --- a/docs/libnm/html/NMSettingTeam.html +++ b/docs/libnm/html/NMSettingTeam.html @@ -1202,7 +1202,7 @@ nm_setting_team_get_config (

Returns

-

the “config” property of the setting

+

the “config” property of the setting

@@ -1955,6 +1955,7 @@ option 'validate_inactive' is enabled (set to true).

+

Since: 1.12

diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html index b2dc9bfa..bd6712a5 100644 --- a/docs/libnm/html/NMSettingTeamPort.html +++ b/docs/libnm/html/NMSettingTeamPort.html @@ -236,7 +236,7 @@ nm_setting_team_port_get_config (

Returns

-

the “config” property of the setting

+

the “config” property of the setting

diff --git a/docs/libnm/html/NMSettingTun.html b/docs/libnm/html/NMSettingTun.html index 0d1a7357..3b6fb181 100644 --- a/docs/libnm/html/NMSettingTun.html +++ b/docs/libnm/html/NMSettingTun.html @@ -402,6 +402,7 @@ nm_setting_tun_get_multi_queue ( +

Since: 1.2

diff --git a/docs/libnm/html/NMSettingUser.html b/docs/libnm/html/NMSettingUser.html index d268e29c..a00c80cb 100644 --- a/docs/libnm/html/NMSettingUser.html +++ b/docs/libnm/html/NMSettingUser.html @@ -123,6 +123,7 @@ nm_setting_user_new (void<

Returns

the new empty NMSettingUser object

+

Since: 1.8

@@ -158,6 +159,7 @@ nm_setting_user_get_keys (NULL-terminated array containing each key from the table.

[array length=out_len][transfer none]

+

Since: 1.8

diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html index 7b992456..69d1733c 100644 --- a/docs/libnm/html/NMSettingVlan.html +++ b/docs/libnm/html/NMSettingVlan.html @@ -233,7 +233,7 @@ nm_setting_vlan_get_parent (

Returns

-

the “parent” property of the setting

+

the “parent” property of the setting

@@ -258,7 +258,7 @@ nm_setting_vlan_get_id (

Returns

-

the “id” property of the setting

+

the “id” property of the setting

@@ -283,7 +283,7 @@ nm_setting_vlan_get_flags (

Returns

-

the “flags” property of the setting

+

the “flags” property of the setting

@@ -293,7 +293,7 @@ nm_setting_vlan_get_flags (NMSettingVlan *setting, NMVlanPriorityMap map);

Returns the number of entries in the -“ingress_priority_map” or “egress_priority_map” +“ingress_priority_map” or “egress_priority_map” properties of this setting.

Parameters

@@ -331,8 +331,8 @@ nm_setting_vlan_get_priority (guint32 idx, guint32 *out_from, guint32 *out_to); -

Retrieve one of the entries of the “ingress_priority_map” -or “egress_priority_map” properties of this setting.

+

Retrieve one of the entries of the “ingress_priority_map” +or “egress_priority_map” properties of this setting.

Parameters

@@ -384,8 +384,8 @@ nm_setting_vlan_add_priority (NMVlanPriorityMap map, guint32 from, guint32 to); -

Adds a priority mapping to the “ingress_priority_map” or -“egress_priority_map” properties of the setting. If from +

Adds a priority mapping to the “ingress_priority_map” or +“egress_priority_map” properties of the setting. If from is already in the given priority map, this function will overwrite the existing entry with the new to @@ -448,7 +448,7 @@ nm_setting_vlan_remove_priority (guint32 idx);

Removes the priority map at index idx from the -“ingress_priority_map” or “egress_priority_map” +“ingress_priority_map” or “egress_priority_map” properties.

Parameters

@@ -489,8 +489,8 @@ nm_setting_vlan_remove_priority_by_value guint32 to);

Removes the priority map form :to - from the “ingress_priority_map” -or “egress_priority_map” (according to map + from the “ingress_priority_map” +or “egress_priority_map” (according to map argument) properties.

@@ -541,8 +541,8 @@ nm_setting_vlan_remove_priority_str_by_value NMVlanPriorityMap map, const char *str);

Removes the priority map str - from the “ingress_priority_map” -or “egress_priority_map” (according to map + from the “ingress_priority_map” +or “egress_priority_map” (according to map argument) properties.

@@ -583,8 +583,8 @@ properties.

void
 nm_setting_vlan_clear_priorities (NMSettingVlan *setting,
                                   NMVlanPriorityMap map);
-

Clear all the entries from “ingress_priority_map” or -“egress_priority_map” properties.

+

Clear all the entries from “ingress_priority_map” or +“egress_priority_map” properties.

Parameters

@@ -615,8 +615,8 @@ nm_setting_vlan_clear_priorities (NMSettingVlan *setting, NMVlanPriorityMap map, const char *str); -

Adds a priority map entry into either the “ingress_priority_map” -or the “egress_priority_map” properties. The priority map maps +

Adds a priority map entry into either the “ingress_priority_map” +or the “egress_priority_map” properties. The priority map maps the Linux SKB priorities to 802.1p priorities.

Parameters

diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html index b7d49ee4..d90c1369 100644 --- a/docs/libnm/html/NMSettingVpn.html +++ b/docs/libnm/html/NMSettingVpn.html @@ -354,6 +354,7 @@ nm_setting_vpn_get_persistent (

Returns

the “persistent” property of the setting

+

Since: 1.42, 1.40.4

diff --git a/docs/libnm/html/NMSettingWireGuard.html b/docs/libnm/html/NMSettingWireGuard.html index 34f5415b..4faf4634 100644 --- a/docs/libnm/html/NMSettingWireGuard.html +++ b/docs/libnm/html/NMSettingWireGuard.html @@ -1611,6 +1611,26 @@ is unchanged.

nm_setting_wireguard_clear_peers ()

guint
 nm_setting_wireguard_clear_peers (NMSettingWireGuard *self);
+
+

Parameters

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

self

the NMSettingWireGuard instance

 
+
+
+

Returns

+

the number of cleared peers.

+
+

Since: 1.16

diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html index 247660e5..6389ac4b 100644 --- a/docs/libnm/html/NMSettingWired.html +++ b/docs/libnm/html/NMSettingWired.html @@ -372,7 +372,7 @@ nm_setting_wired_get_port (

Returns

-

the “port” property of the setting

+

the “port” property of the setting

@@ -397,7 +397,7 @@ nm_setting_wired_get_speed (

Returns

-

the “speed” property of the setting

+

the “speed” property of the setting

@@ -422,7 +422,7 @@ nm_setting_wired_get_duplex (

Returns

-

the “duplex” property of the setting

+

the “duplex” property of the setting

@@ -447,7 +447,7 @@ nm_setting_wired_get_auto_negotiate (

Returns

-

the “auto-negotiate” property of the setting

+

the “auto-negotiate” property of the setting

@@ -472,7 +472,7 @@ nm_setting_wired_get_mac_address (

Returns

-

the “mac-address” property of the setting

+

the “mac-address” property of the setting

@@ -498,7 +498,7 @@ nm_setting_wired_get_cloned_mac_address

Returns

-

the “cloned-mac-address” property of the setting

+

the “cloned-mac-address” property of the setting

@@ -578,7 +578,7 @@ nm_setting_wired_get_mac_address_blacklist

Returns

-

the “mac-address-blacklist” property of the setting

+

the “mac-address-blacklist” property of the setting

@@ -650,7 +650,7 @@ at index idx nm_setting_wired_add_mac_blacklist_item (NMSettingWired *setting, const char *mac); -

Adds a new MAC address to the “mac-address-blacklist” property.

+

Adds a new MAC address to the “mac-address-blacklist” property.

Parameters

@@ -793,7 +793,7 @@ nm_setting_wired_get_mtu (

Returns

-

the “mtu” property of the setting

+

the “mtu” property of the setting

diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html index 5c0b26aa..8f937cbc 100644 --- a/docs/libnm/html/NMSettingWireless.html +++ b/docs/libnm/html/NMSettingWireless.html @@ -417,7 +417,7 @@ nm_setting_wireless_get_ssid (

Returns

-

the “ssid” property of the setting.

+

the “ssid” property of the setting.

[transfer none]

@@ -443,7 +443,7 @@ nm_setting_wireless_get_mode (

Returns

-

the “mode” property of the setting

+

the “mode” property of the setting

@@ -468,7 +468,7 @@ nm_setting_wireless_get_band (

Returns

-

the “band” property of the setting

+

the “band” property of the setting

@@ -493,7 +493,7 @@ nm_setting_wireless_get_channel (

Returns

-

the “channel” property of the setting

+

the “channel” property of the setting

@@ -518,7 +518,7 @@ nm_setting_wireless_get_bssid (

Returns

-

the “bssid” property of the setting

+

the “bssid” property of the setting

@@ -543,7 +543,7 @@ nm_setting_wireless_get_rate (

Returns

-

the “rate” property of the setting

+

the “rate” property of the setting

@@ -568,7 +568,7 @@ nm_setting_wireless_get_tx_power (

Returns

-

the “tx-power” property of the setting

+

the “tx-power” property of the setting

@@ -593,7 +593,7 @@ nm_setting_wireless_get_mac_address (

Returns

-

the “mac-address” property of the setting

+

the “mac-address” property of the setting

@@ -619,7 +619,7 @@ nm_setting_wireless_get_cloned_mac_address

Returns

-

the “cloned-mac-address” property of the setting

+

the “cloned-mac-address” property of the setting

@@ -672,7 +672,7 @@ nm_setting_wireless_get_mac_address_blacklist

Returns

-

the “mac-address-blacklist” property of the setting

+

the “mac-address-blacklist” property of the setting

@@ -744,7 +744,7 @@ at index idx nm_setting_wireless_add_mac_blacklist_item (NMSettingWireless *setting, const char *mac); -

Adds a new MAC address to the “mac-address-blacklist” property.

+

Adds a new MAC address to the “mac-address-blacklist” property.

Parameters

@@ -887,7 +887,7 @@ nm_setting_wireless_get_mtu (

Returns

-

the “mtu” property of the setting

+

the “mtu” property of the setting

@@ -912,7 +912,7 @@ nm_setting_wireless_get_hidden (

Returns

-

the “hidden” property of the setting

+

the “hidden” property of the setting

@@ -937,7 +937,7 @@ nm_setting_wireless_get_powersave (

Returns

-

the “powersave” property of the setting

+

the “powersave” property of the setting

Since: 1.2

@@ -1501,6 +1501,7 @@ for this connection.

+

Since: 1.2

diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html index 951217cb..617735d0 100644 --- a/docs/libnm/html/NMSettingWirelessSecurity.html +++ b/docs/libnm/html/NMSettingWirelessSecurity.html @@ -479,7 +479,7 @@ nm_setting_wireless_security_get_key_mgmt

Returns

-

the “key-mgmt” property of the setting

+

the “key-mgmt” property of the setting

@@ -1070,6 +1070,26 @@ specified then all groupwise encryption algorithms are allowed.

nm_setting_wireless_security_get_pmf ()

NMSettingWirelessSecurityPmf
 nm_setting_wireless_security_get_pmf (NMSettingWirelessSecurity *setting);
+
+

Parameters

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

setting

the NMSettingWirelessSecurity

 
+
+
+

Returns

+

the “pmf” property of the setting

+
+

Since: 1.10

@@ -1093,7 +1113,7 @@ nm_setting_wireless_security_get_psk (

Returns

-

the “psk” property of the setting

+

the “psk” property of the setting

@@ -1120,7 +1140,7 @@ nm_setting_wireless_security_get_psk_flags

Returns

the NMSettingSecretFlags pertaining to the -“psk”

+“psk”

@@ -1146,7 +1166,7 @@ nm_setting_wireless_security_get_leap_username

Returns

-

the “leap-username” property of the setting

+

the “leap-username” property of the setting

@@ -1172,7 +1192,7 @@ nm_setting_wireless_security_get_leap_password

Returns

-

the “leap-password” property of the setting

+

the “leap-password” property of the setting

@@ -1199,7 +1219,7 @@ nm_setting_wireless_security_get_leap_password_flags

Returns

the NMSettingSecretFlags pertaining to the -“leap-password”

+“leap-password”

@@ -1267,7 +1287,7 @@ nm_setting_wireless_security_set_wep_key

key

the WEP key as a string, in either hexadecimal, ASCII, or passphrase -form as determined by the value of the “wep-key-type” +form as determined by the value of the “wep-key-type” property.

  @@ -1298,7 +1318,7 @@ nm_setting_wireless_security_get_wep_tx_keyidx

Returns

-

the “wep-tx-keyidx” property of the setting

+

the “wep-tx-keyidx” property of the setting

@@ -1324,7 +1344,7 @@ nm_setting_wireless_security_get_auth_alg

Returns

-

the “auth-alg” property of the setting

+

the “auth-alg” property of the setting

@@ -1376,7 +1396,7 @@ nm_setting_wireless_security_get_wep_key_type

Returns

-

the “wep-key-type” property of the setting

+

the “wep-key-type” property of the setting

@@ -1411,6 +1431,26 @@ nm_setting_wireless_security_get_wps_method

nm_setting_wireless_security_get_fils ()

NMSettingWirelessSecurityFils
 nm_setting_wireless_security_get_fils (NMSettingWirelessSecurity *setting);
+
+

Parameters

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

setting

the NMSettingWirelessSecurity

 
+
+
+

Returns

+

the “fils” property of the setting

+
+

Since: 1.12

@@ -1533,6 +1573,7 @@ the actual WEP key using the MD5 hash algorithm.

+

Since: 1.10

diff --git a/docs/libnm/html/NMSettingWpan.html b/docs/libnm/html/NMSettingWpan.html index 3c13f380..5355e7ad 100644 --- a/docs/libnm/html/NMSettingWpan.html +++ b/docs/libnm/html/NMSettingWpan.html @@ -149,7 +149,7 @@ nm_setting_wpan_new (void<

the new empty NMSettingWpan object.

[transfer full]

-

Since: 1.14

+

Since: 1.42, 1.40.4

@@ -175,7 +175,7 @@ nm_setting_wpan_get_mac_address (

Returns

the “mac-address” property of the setting

-

Since: 1.14

+

Since: 1.42, 1.40.4

@@ -201,7 +201,7 @@ nm_setting_wpan_get_pan_id (

Returns

the “pan-id” property of the setting

-

Since: 1.14

+

Since: 1.42, 1.40.4

@@ -227,7 +227,7 @@ nm_setting_wpan_get_short_address (

Returns

the “short-address” property of the setting

-

Since: 1.14

+

Since: 1.42, 1.40.4

@@ -253,7 +253,7 @@ nm_setting_wpan_get_page (

Returns

the “page” property of the setting

-

Since: 1.16

+

Since: 1.42, 1.40.4

@@ -279,7 +279,7 @@ nm_setting_wpan_get_channel (

Returns

the “channel” property of the setting

-

Since: 1.16

+

Since: 1.42, 1.40.4

diff --git a/docs/libnm/html/NMVpnPluginInfo.html b/docs/libnm/html/NMVpnPluginInfo.html index 45880d12..696d2bd8 100644 --- a/docs/libnm/html/NMVpnPluginInfo.html +++ b/docs/libnm/html/NMVpnPluginInfo.html @@ -613,7 +613,7 @@ nm_vpn_plugin_info_supports_multiple (

Returns

TRUE if the service supports multiple instances with different bus names, otherwise FALSE

-

Since: 1.2

+

Since: 1.42, 1.40.4

diff --git a/docs/libnm/html/NMVpnPluginOld.html b/docs/libnm/html/NMVpnPluginOld.html index bf6a322c..276d337b 100644 --- a/docs/libnm/html/NMVpnPluginOld.html +++ b/docs/libnm/html/NMVpnPluginOld.html @@ -96,27 +96,11 @@ void -nm_vpn_plugin_old_set_config () - - - - -void - - nm_vpn_plugin_old_set_ip4_config () -void - - -nm_vpn_plugin_old_set_ip6_config () - - - - gboolean @@ -360,17 +344,6 @@ nm_vpn_plugin_old_failure ( -

nm_vpn_plugin_old_set_config ()

-
void
-nm_vpn_plugin_old_set_config (NMVpnPluginOld *plugin,
-                              GVariant *config);
-
-

nm_vpn_plugin_old_set_config has been deprecated since version 1.2 and should not be used in newly-written code.

-

Replaced by NMVpnServicePlugin.

-
-
-
-

nm_vpn_plugin_old_set_ip4_config ()

void
 nm_vpn_plugin_old_set_ip4_config (NMVpnPluginOld *plugin,
@@ -382,17 +355,6 @@ nm_vpn_plugin_old_set_ip4_config (
 

 

-
nm_vpn_plugin_old_set_ip6_config ()

-
void
-nm_vpn_plugin_old_set_ip6_config (NMVpnPluginOld *plugin,
-                                  GVariant *ip6_config);

-

-
nm_vpn_plugin_old_set_ip6_config has been deprecated since version 1.2 and should not be used in newly-written code.

-
Replaced by NMVpnServicePlugin.

-

-

-

-

 
nm_vpn_plugin_old_disconnect ()

 
gboolean
 nm_vpn_plugin_old_disconnect (NMVpnPluginOld *plugin,
diff --git a/docs/libnm/html/NMVpnServicePlugin.html b/docs/libnm/html/NMVpnServicePlugin.html
index 965727a3..6349d207 100644
--- a/docs/libnm/html/NMVpnServicePlugin.html
+++ b/docs/libnm/html/NMVpnServicePlugin.html
@@ -318,6 +318,7 @@ information to complete the request.

 nm_vpn_service_plugin_set_login_banner
                                (NMVpnServicePlugin *plugin,
                                 const char *banner);

+
Since: 1.2

 

 

 

@@ -325,6 +326,7 @@ nm_vpn_service_plugin_set_login_banner
 
void
 nm_vpn_service_plugin_failure (NMVpnServicePlugin *plugin,
                                NMVpnPluginFailure reason);

+
Since: 1.2

 

 

 

@@ -332,6 +334,7 @@ nm_vpn_service_plugin_failure (void
 nm_vpn_service_plugin_set_config (NMVpnServicePlugin *plugin,
                                   GVariant *config);
+

Since: 1.2

@@ -339,6 +342,7 @@ nm_vpn_service_plugin_set_config (void nm_vpn_service_plugin_set_ip4_config (NMVpnServicePlugin *plugin, GVariant *ip4_config); +

Since: 1.2

@@ -346,6 +350,7 @@ nm_vpn_service_plugin_set_ip4_config (void nm_vpn_service_plugin_set_ip6_config (NMVpnServicePlugin *plugin, GVariant *ip6_config); +

Since: 1.2

@@ -353,6 +358,7 @@ nm_vpn_service_plugin_set_ip6_config (gboolean nm_vpn_service_plugin_disconnect (NMVpnServicePlugin *plugin, GError **err); +

Since: 1.2

@@ -499,6 +505,7 @@ to flags,

NMVpnServicePlugin

typedef struct _NMVpnServicePlugin NMVpnServicePlugin;
+

Since: 1.2

diff --git a/docs/libnm/html/NMWifiP2PPeer.html b/docs/libnm/html/NMWifiP2PPeer.html index b945792e..074d90d8 100644 --- a/docs/libnm/html/NMWifiP2PPeer.html +++ b/docs/libnm/html/NMWifiP2PPeer.html @@ -572,7 +572,7 @@ with this function.

connections

-

an array of NMConnections to +

an array of NMConnections to filter.

[element-type NMConnection] @@ -582,7 +582,7 @@ filter.

Returns

an array of -NMConnections that could be activated with the given peer +NMConnections that could be activated with the given peer . The array should be freed with g_ptr_array_unref() when it is no longer required.

[transfer container][element-type NMConnection]

@@ -696,6 +696,7 @@ against

NMWifiP2PPeer

typedef struct _NMWifiP2PPeer NMWifiP2PPeer;
+

Since: 1.16

diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html index c6ffe501..0c103ec7 100644 --- a/docs/libnm/html/NMWimaxNsp.html +++ b/docs/libnm/html/NMWimaxNsp.html @@ -269,7 +269,7 @@ connections will match the nsp

connections

-

an array of NMConnections to +

an array of NMConnections to filter.

[element-type NMConnection] @@ -279,7 +279,7 @@ filter.

Returns

an array of -NMConnections that could be activated with the given nsp +NMConnections that could be activated with the given nsp . The array should be freed with g_ptr_array_unref() when it is no longer required.

[transfer full][element-type NMConnection]

diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html index 7a730e98..7d9bbb3b 100644 --- a/docs/libnm/html/api-index-full.html +++ b/docs/libnm/html/api-index-full.html @@ -425,19 +425,19 @@ NMClientNotifyEventWithPtrCb, user_function in NMConnection, struct in NMSettingOvs
-NMConnection::changed, object signal in NMSettingOvs +NMConnection::changed, object signal in NMSettingOvs
-NMConnection::secrets-cleared, object signal in NMSettingOvs +NMConnection::secrets-cleared, object signal in NMSettingOvs
-NMConnection::secrets-updated, object signal in NMSettingOvs +NMConnection::secrets-updated, object signal in NMSettingOvs
@@ -1217,6 +1217,10 @@ NMDhcpConfigClass, struct in NMDnsEntry, typedef in NMClient +
+
+
NMIPAddressCmpFlags, enum in NMSettingIPConfig
@@ -1689,7 +1693,7 @@ _NMObjectClassFieldInfo, struct in
-NMSetting, struct in NMSettingOvs +NMSetting, struct in NMSettingOvs
@@ -1705,11 +1709,11 @@ NMSetting8021x, struct in NMSettingOvs
-NMSetting8021x:altsubject-matches, object property in NMSettingOvs +NMSetting8021x:altsubject-matches, object property in NMSettingOvs
-NMSetting8021x:anonymous-identity, object property in NMSettingOvs +NMSetting8021x:anonymous-identity, object property in NMSettingOvs
@@ -1717,7 +1721,7 @@ NMSetting8021x:auth-timeout, object property in NMSettingOvs
-NMSetting8021x:ca-cert, object property in NMSettingOvs +NMSetting8021x:ca-cert, object property in NMSettingOvs
@@ -1729,11 +1733,11 @@ NMSetting8021x:ca-cert-password-flags, object property in NMSettingOvs
-NMSetting8021x:ca-path, object property in NMSettingOvs +NMSetting8021x:ca-path, object property in NMSettingOvs
-NMSetting8021x:client-cert, object property in NMSettingOvs +NMSetting8021x:client-cert, object property in NMSettingOvs
@@ -1753,11 +1757,11 @@ NMSetting8021x:domain-suffix-match, object property in NMSettingOvs
-NMSetting8021x:eap, object property in NMSettingOvs +NMSetting8021x:eap, object property in NMSettingOvs
-NMSetting8021x:identity, object property in NMSettingOvs +NMSetting8021x:identity, object property in NMSettingOvs
@@ -1765,23 +1769,23 @@ NMSetting8021x:optional, object property in NMSettingOvs
-NMSetting8021x:pac-file, object property in NMSettingOvs +NMSetting8021x:pac-file, object property in NMSettingOvs
-NMSetting8021x:password, object property in NMSettingOvs +NMSetting8021x:password, object property in NMSettingOvs
-NMSetting8021x:password-flags, object property in NMSettingOvs +NMSetting8021x:password-flags, object property in NMSettingOvs
-NMSetting8021x:password-raw, object property in NMSettingOvs +NMSetting8021x:password-raw, object property in NMSettingOvs
-NMSetting8021x:password-raw-flags, object property in NMSettingOvs +NMSetting8021x:password-raw-flags, object property in NMSettingOvs
@@ -1789,31 +1793,31 @@ NMSetting8021x:phase1-auth-flags, object property in NMSettingOvs
-NMSetting8021x:phase1-fast-provisioning, object property in NMSettingOvs +NMSetting8021x:phase1-fast-provisioning, object property in NMSettingOvs
-NMSetting8021x:phase1-peaplabel, object property in NMSettingOvs +NMSetting8021x:phase1-peaplabel, object property in NMSettingOvs
-NMSetting8021x:phase1-peapver, object property in NMSettingOvs +NMSetting8021x:phase1-peapver, object property in NMSettingOvs
-NMSetting8021x:phase2-altsubject-matches, object property in NMSettingOvs +NMSetting8021x:phase2-altsubject-matches, object property in NMSettingOvs
-NMSetting8021x:phase2-auth, object property in NMSettingOvs +NMSetting8021x:phase2-auth, object property in NMSettingOvs
-NMSetting8021x:phase2-autheap, object property in NMSettingOvs +NMSetting8021x:phase2-autheap, object property in NMSettingOvs
-NMSetting8021x:phase2-ca-cert, object property in NMSettingOvs +NMSetting8021x:phase2-ca-cert, object property in NMSettingOvs
@@ -1825,11 +1829,11 @@ NMSetting8021x:phase2-ca-cert-password-flags, object property in NMSettingOvs
-NMSetting8021x:phase2-ca-path, object property in NMSettingOvs +NMSetting8021x:phase2-ca-path, object property in NMSettingOvs
-NMSetting8021x:phase2-client-cert, object property in NMSettingOvs +NMSetting8021x:phase2-client-cert, object property in NMSettingOvs
@@ -1849,47 +1853,47 @@ NMSetting8021x:phase2-domain-suffix-match, object property in NMSettingOvs
-NMSetting8021x:phase2-private-key, object property in NMSettingOvs +NMSetting8021x:phase2-private-key, object property in NMSettingOvs
-NMSetting8021x:phase2-private-key-password, object property in NMSettingOvs +NMSetting8021x:phase2-private-key-password, object property in NMSettingOvs
-NMSetting8021x:phase2-private-key-password-flags, object property in NMSettingOvs +NMSetting8021x:phase2-private-key-password-flags, object property in NMSettingOvs
-NMSetting8021x:phase2-subject-match, object property in NMSettingOvs +NMSetting8021x:phase2-subject-match, object property in NMSettingOvs
-NMSetting8021x:pin, object property in NMSettingOvs +NMSetting8021x:pin, object property in NMSettingOvs
-NMSetting8021x:pin-flags, object property in NMSettingOvs +NMSetting8021x:pin-flags, object property in NMSettingOvs
-NMSetting8021x:private-key, object property in NMSettingOvs +NMSetting8021x:private-key, object property in NMSettingOvs
-NMSetting8021x:private-key-password, object property in NMSettingOvs +NMSetting8021x:private-key-password, object property in NMSettingOvs
-NMSetting8021x:private-key-password-flags, object property in NMSettingOvs +NMSetting8021x:private-key-password-flags, object property in NMSettingOvs
-NMSetting8021x:subject-match, object property in NMSettingOvs +NMSetting8021x:subject-match, object property in NMSettingOvs
-NMSetting8021x:system-ca-certs, object property in NMSettingOvs +NMSetting8021x:system-ca-certs, object property in NMSettingOvs
@@ -1905,7 +1909,7 @@ NMSetting8021x:system-ca-certs, object property in NMSettingOvs
-NMSetting:name, object property in NMSettingOvs +NMSetting:name, object property in NMSettingOvs
@@ -1913,31 +1917,31 @@ NMSettingAdsl, struct in NMSettingOvs
-NMSettingAdsl:encapsulation, object property in NMSettingOvs +NMSettingAdsl:encapsulation, object property in NMSettingOvs
-NMSettingAdsl:password, object property in NMSettingOvs +NMSettingAdsl:password, object property in NMSettingOvs
-NMSettingAdsl:password-flags, object property in NMSettingOvs +NMSettingAdsl:password-flags, object property in NMSettingOvs
-NMSettingAdsl:protocol, object property in NMSettingOvs +NMSettingAdsl:protocol, object property in NMSettingOvs
-NMSettingAdsl:username, object property in NMSettingOvs +NMSettingAdsl:username, object property in NMSettingOvs
-NMSettingAdsl:vci, object property in NMSettingOvs +NMSettingAdsl:vci, object property in NMSettingOvs
-NMSettingAdsl:vpi, object property in NMSettingOvs +NMSettingAdsl:vpi, object property in NMSettingOvs
@@ -1945,11 +1949,11 @@ NMSettingBluetooth, struct in NMSettingOvs
-NMSettingBluetooth:bdaddr, object property in NMSettingOvs +NMSettingBluetooth:bdaddr, object property in NMSettingOvs
-NMSettingBluetooth:type, object property in NMSettingOvs +NMSettingBluetooth:type, object property in NMSettingOvs
@@ -1957,7 +1961,7 @@ NMSettingBond, struct in NMSettingOvs
-NMSettingBond:options, object property in NMSettingOvs +NMSettingBond:options, object property in NMSettingOvs
@@ -1973,11 +1977,11 @@ NMSettingBridge, struct in NMSettingOvs
-NMSettingBridge:ageing-time, object property in NMSettingOvs +NMSettingBridge:ageing-time, object property in NMSettingOvs
-NMSettingBridge:forward-delay, object property in NMSettingOvs +NMSettingBridge:forward-delay, object property in NMSettingOvs
@@ -1989,15 +1993,15 @@ NMSettingBridge:group-forward-mask, object property in NMSettingOvs
-NMSettingBridge:hello-time, object property in NMSettingOvs +NMSettingBridge:hello-time, object property in NMSettingOvs
-NMSettingBridge:mac-address, object property in NMSettingOvs +NMSettingBridge:mac-address, object property in NMSettingOvs
-NMSettingBridge:max-age, object property in NMSettingOvs +NMSettingBridge:max-age, object property in NMSettingOvs
@@ -2053,11 +2057,11 @@ NMSettingBridge:multicast-startup-query-interval, object property in NMSettingOv
-NMSettingBridge:priority, object property in NMSettingOvs +NMSettingBridge:priority, object property in NMSettingOvs
-NMSettingBridge:stp, object property in NMSettingOvs +NMSettingBridge:stp, object property in NMSettingOvs
@@ -2085,15 +2089,15 @@ NMSettingBridgePort, struct in NMSettingOvs
-NMSettingBridgePort:hairpin-mode, object property in NMSettingOvs +NMSettingBridgePort:hairpin-mode, object property in NMSettingOvs
-NMSettingBridgePort:path-cost, object property in NMSettingOvs +NMSettingBridgePort:path-cost, object property in NMSettingOvs
-NMSettingBridgePort:priority, object property in NMSettingOvs +NMSettingBridgePort:priority, object property in NMSettingOvs
@@ -2109,19 +2113,19 @@ NMSettingCdma:mtu, object property in NMSettingOvs
-NMSettingCdma:number, object property in NMSettingOvs +NMSettingCdma:number, object property in NMSettingOvs
-NMSettingCdma:password, object property in NMSettingOvs +NMSettingCdma:password, object property in NMSettingOvs
-NMSettingCdma:password-flags, object property in NMSettingOvs +NMSettingCdma:password-flags, object property in NMSettingOvs
-NMSettingCdma:username, object property in NMSettingOvs +NMSettingCdma:username, object property in NMSettingOvs
@@ -2133,7 +2137,7 @@ NMSettingCdma:username, object property in NMSettingOvs
-NMSettingConnection, struct in NMSettingOvs +NMSettingConnection, struct in NMSettingOvs
@@ -2141,7 +2145,7 @@ NMSettingConnection:auth-retries, object property in NMSettingOvs
-NMSettingConnection:autoconnect, object property in NMSettingOvs +NMSettingConnection:autoconnect, object property in NMSettingOvs
@@ -2161,15 +2165,15 @@ NMSettingConnection:dns-over-tls, object property in NMSettingOvs
-NMSettingConnection:gateway-ping-timeout, object property in NMSettingOvs +NMSettingConnection:gateway-ping-timeout, object property in NMSettingOvs
-NMSettingConnection:id, object property in NMSettingOvs +NMSettingConnection:id, object property in NMSettingOvs
-NMSettingConnection:interface-name, object property in NMSettingOvs +NMSettingConnection:interface-name, object property in NMSettingOvs
@@ -2181,7 +2185,7 @@ NMSettingConnection:llmnr, object property in NMSettingOvs
-NMSettingConnection:master, object property in NMSettingOvs +NMSettingConnection:master, object property in NMSettingOvs
@@ -2205,19 +2209,19 @@ NMSettingConnection:multi-connect, object property in NMSettingOvs
-NMSettingConnection:permissions, object property in NMSettingOvs +NMSettingConnection:permissions, object property in NMSettingOvs
-NMSettingConnection:read-only, object property in NMSettingOvs +NMSettingConnection:read-only, object property in NMSettingOvs
-NMSettingConnection:secondaries, object property in NMSettingOvs +NMSettingConnection:secondaries, object property in NMSettingOvs
-NMSettingConnection:slave-type, object property in NMSettingOvs +NMSettingConnection:slave-type, object property in NMSettingOvs
@@ -2225,15 +2229,15 @@ NMSettingConnection:stable-id, object property in NMSettingOvs
-NMSettingConnection:timestamp, object property in NMSettingOvs +NMSettingConnection:timestamp, object property in NMSettingOvs
-NMSettingConnection:type, object property in NMSettingOvs +NMSettingConnection:type, object property in NMSettingOvs
-NMSettingConnection:uuid, object property in NMSettingOvs +NMSettingConnection:uuid, object property in NMSettingOvs
@@ -2245,7 +2249,7 @@ NMSettingConnection:wait-device-timeout, object property in NMSettingOvs
-NMSettingConnection:zone, object property in NMSettingOvs +NMSettingConnection:zone, object property in NMSettingOvs
@@ -2273,63 +2277,63 @@ NMSettingDcb, struct in NMSettingOvs
-NMSettingDcb:app-fcoe-flags, object property in NMSettingOvs +NMSettingDcb:app-fcoe-flags, object property in NMSettingOvs
-NMSettingDcb:app-fcoe-mode, object property in NMSettingOvs +NMSettingDcb:app-fcoe-mode, object property in NMSettingOvs
-NMSettingDcb:app-fcoe-priority, object property in NMSettingOvs +NMSettingDcb:app-fcoe-priority, object property in NMSettingOvs
-NMSettingDcb:app-fip-flags, object property in NMSettingOvs +NMSettingDcb:app-fip-flags, object property in NMSettingOvs
-NMSettingDcb:app-fip-priority, object property in NMSettingOvs +NMSettingDcb:app-fip-priority, object property in NMSettingOvs
-NMSettingDcb:app-iscsi-flags, object property in NMSettingOvs +NMSettingDcb:app-iscsi-flags, object property in NMSettingOvs
-NMSettingDcb:app-iscsi-priority, object property in NMSettingOvs +NMSettingDcb:app-iscsi-priority, object property in NMSettingOvs
-NMSettingDcb:priority-bandwidth, object property in NMSettingOvs +NMSettingDcb:priority-bandwidth, object property in NMSettingOvs
-NMSettingDcb:priority-flow-control, object property in NMSettingOvs +NMSettingDcb:priority-flow-control, object property in NMSettingOvs
-NMSettingDcb:priority-flow-control-flags, object property in NMSettingOvs +NMSettingDcb:priority-flow-control-flags, object property in NMSettingOvs
-NMSettingDcb:priority-group-bandwidth, object property in NMSettingOvs +NMSettingDcb:priority-group-bandwidth, object property in NMSettingOvs
-NMSettingDcb:priority-group-flags, object property in NMSettingOvs +NMSettingDcb:priority-group-flags, object property in NMSettingOvs
-NMSettingDcb:priority-group-id, object property in NMSettingOvs +NMSettingDcb:priority-group-id, object property in NMSettingOvs
-NMSettingDcb:priority-strict-bandwidth, object property in NMSettingOvs +NMSettingDcb:priority-strict-bandwidth, object property in NMSettingOvs
-NMSettingDcb:priority-traffic-class, object property in NMSettingOvs +NMSettingDcb:priority-traffic-class, object property in NMSettingOvs
@@ -2357,7 +2361,7 @@ NMSettingGsm, struct in NMSettingOvs
-NMSettingGsm:apn, object property in NMSettingOvs +NMSettingGsm:apn, object property in NMSettingOvs
@@ -2369,7 +2373,7 @@ NMSettingGsm:device-id, object property in NMSettingOvs
-NMSettingGsm:home-only, object property in NMSettingOvs +NMSettingGsm:home-only, object property in NMSettingOvs
@@ -2377,27 +2381,27 @@ NMSettingGsm:mtu, object property in NMSettingOvs
-NMSettingGsm:network-id, object property in NMSettingOvs +NMSettingGsm:network-id, object property in NMSettingOvs
-NMSettingGsm:number, object property in NMSettingOvs +NMSettingGsm:number, object property in NMSettingOvs
-NMSettingGsm:password, object property in NMSettingOvs +NMSettingGsm:password, object property in NMSettingOvs
-NMSettingGsm:password-flags, object property in NMSettingOvs +NMSettingGsm:password-flags, object property in NMSettingOvs
-NMSettingGsm:pin, object property in NMSettingOvs +NMSettingGsm:pin, object property in NMSettingOvs
-NMSettingGsm:pin-flags, object property in NMSettingOvs +NMSettingGsm:pin-flags, object property in NMSettingOvs
@@ -2409,7 +2413,7 @@ NMSettingGsm:sim-operator-id, object property in NMSettingOvs
-NMSettingGsm:username, object property in NMSettingOvs +NMSettingGsm:username, object property in NMSettingOvs
@@ -2437,23 +2441,23 @@ NMSettingInfiniband, struct in NMSettingOvs
-NMSettingInfiniband:mac-address, object property in NMSettingOvs +NMSettingInfiniband:mac-address, object property in NMSettingOvs
-NMSettingInfiniband:mtu, object property in NMSettingOvs +NMSettingInfiniband:mtu, object property in NMSettingOvs
-NMSettingInfiniband:p-key, object property in NMSettingOvs +NMSettingInfiniband:p-key, object property in NMSettingOvs
-NMSettingInfiniband:parent, object property in NMSettingOvs +NMSettingInfiniband:parent, object property in NMSettingOvs
-NMSettingInfiniband:transport-mode, object property in NMSettingOvs +NMSettingInfiniband:transport-mode, object property in NMSettingOvs
@@ -2461,7 +2465,7 @@ NMSettingIP4Config, struct in NMSettingOvs
-NMSettingIP4Config:dhcp-client-id, object property in NMSettingOvs +NMSettingIP4Config:dhcp-client-id, object property in NMSettingOvs
@@ -2493,7 +2497,7 @@ NMSettingIP6Config:dhcp-duid, object property in NMSettingOvs
-NMSettingIP6Config:ip6-privacy, object property in NMSettingOvs +NMSettingIP6Config:ip6-privacy, object property in NMSettingOvs
@@ -2765,15 +2769,15 @@ NMSettingOlpcMesh, struct in NMSettingOvs
-NMSettingOlpcMesh:channel, object property in NMSettingOvs +NMSettingOlpcMesh:channel, object property in NMSettingOvs
-NMSettingOlpcMesh:dhcp-anycast-address, object property in NMSettingOvs +NMSettingOlpcMesh:dhcp-anycast-address, object property in NMSettingOvs
-NMSettingOlpcMesh:ssid, object property in NMSettingOvs +NMSettingOlpcMesh:ssid, object property in NMSettingOvs
@@ -3005,23 +3009,23 @@ NMSettingSerial, struct in NMSettingOvs
-NMSettingSerial:baud, object property in NMSettingOvs +NMSettingSerial:baud, object property in NMSettingOvs
-NMSettingSerial:bits, object property in NMSettingOvs +NMSettingSerial:bits, object property in NMSettingOvs
-NMSettingSerial:parity, object property in NMSettingOvs +NMSettingSerial:parity, object property in NMSettingOvs
-NMSettingSerial:send-delay, object property in NMSettingOvs +NMSettingSerial:send-delay, object property in NMSettingOvs
-NMSettingSerial:stopbits, object property in NMSettingOvs +NMSettingSerial:stopbits, object property in NMSettingOvs
@@ -3069,7 +3073,7 @@ NMSettingTeam, struct in NMSettingOvs
-NMSettingTeam:config, object property in NMSettingOvs +NMSettingTeam:config, object property in NMSettingOvs
@@ -3137,7 +3141,7 @@ NMSettingTeamPort, struct in NMSettingOvs
-NMSettingTeamPort:config, object property in NMSettingOvs +NMSettingTeamPort:config, object property in NMSettingOvs
@@ -3221,23 +3225,23 @@ NMSettingVlan, struct in NMSettingOvs
-NMSettingVlan:egress-priority-map, object property in NMSettingOvs +NMSettingVlan:egress-priority-map, object property in NMSettingOvs
-NMSettingVlan:flags, object property in NMSettingOvs +NMSettingVlan:flags, object property in NMSettingOvs
-NMSettingVlan:id, object property in NMSettingOvs +NMSettingVlan:id, object property in NMSettingOvs
-NMSettingVlan:ingress-priority-map, object property in NMSettingOvs +NMSettingVlan:ingress-priority-map, object property in NMSettingOvs
-NMSettingVlan:parent, object property in NMSettingOvs +NMSettingVlan:parent, object property in NMSettingOvs
@@ -3365,11 +3369,11 @@ NMSettingWimax, struct in NMSettingOvs
-NMSettingWimax:mac-address, object property in NMSettingOvs +NMSettingWimax:mac-address, object property in NMSettingOvs
-NMSettingWimax:network-name, object property in NMSettingOvs +NMSettingWimax:network-name, object property in NMSettingOvs
@@ -3381,15 +3385,15 @@ NMSettingWired:accept-all-mac-addresses, object property in NMSettingOvs
-NMSettingWired:auto-negotiate, object property in NMSettingOvs +NMSettingWired:auto-negotiate, object property in NMSettingOvs
-NMSettingWired:cloned-mac-address, object property in NMSettingOvs +NMSettingWired:cloned-mac-address, object property in NMSettingOvs
-NMSettingWired:duplex, object property in NMSettingOvs +NMSettingWired:duplex, object property in NMSettingOvs
@@ -3397,35 +3401,35 @@ NMSettingWired:generate-mac-address-mask, object property in NMSettingOvs
-NMSettingWired:mac-address, object property in NMSettingOvs +NMSettingWired:mac-address, object property in NMSettingOvs
-NMSettingWired:mac-address-blacklist, object property in NMSettingOvs +NMSettingWired:mac-address-blacklist, object property in NMSettingOvs
-NMSettingWired:mtu, object property in NMSettingOvs +NMSettingWired:mtu, object property in NMSettingOvs
-NMSettingWired:port, object property in NMSettingOvs +NMSettingWired:port, object property in NMSettingOvs
-NMSettingWired:s390-nettype, object property in NMSettingOvs +NMSettingWired:s390-nettype, object property in NMSettingOvs
-NMSettingWired:s390-options, object property in NMSettingOvs +NMSettingWired:s390-options, object property in NMSettingOvs
-NMSettingWired:s390-subchannels, object property in NMSettingOvs +NMSettingWired:s390-subchannels, object property in NMSettingOvs
-NMSettingWired:speed, object property in NMSettingOvs +NMSettingWired:speed, object property in NMSettingOvs
@@ -3485,19 +3489,19 @@ NMSettingWireless:ap-isolation, object property in NMSettingOvs
-NMSettingWireless:band, object property in NMSettingOvs +NMSettingWireless:band, object property in NMSettingOvs
-NMSettingWireless:bssid, object property in NMSettingOvs +NMSettingWireless:bssid, object property in NMSettingOvs
-NMSettingWireless:channel, object property in NMSettingOvs +NMSettingWireless:channel, object property in NMSettingOvs
-NMSettingWireless:cloned-mac-address, object property in NMSettingOvs +NMSettingWireless:cloned-mac-address, object property in NMSettingOvs
@@ -3505,15 +3509,15 @@ NMSettingWireless:generate-mac-address-mask, object property in NMSettingOvs
-NMSettingWireless:hidden, object property in NMSettingOvs +NMSettingWireless:hidden, object property in NMSettingOvs
-NMSettingWireless:mac-address, object property in NMSettingOvs +NMSettingWireless:mac-address, object property in NMSettingOvs
-NMSettingWireless:mac-address-blacklist, object property in NMSettingOvs +NMSettingWireless:mac-address-blacklist, object property in NMSettingOvs
@@ -3521,31 +3525,31 @@ NMSettingWireless:mac-address-randomization, object property in NMSettingOvs
-NMSettingWireless:mode, object property in NMSettingOvs +NMSettingWireless:mode, object property in NMSettingOvs
-NMSettingWireless:mtu, object property in NMSettingOvs +NMSettingWireless:mtu, object property in NMSettingOvs
-NMSettingWireless:powersave, object property in NMSettingOvs +NMSettingWireless:powersave, object property in NMSettingOvs
-NMSettingWireless:rate, object property in NMSettingOvs +NMSettingWireless:rate, object property in NMSettingOvs
-NMSettingWireless:seen-bssids, object property in NMSettingOvs +NMSettingWireless:seen-bssids, object property in NMSettingOvs
-NMSettingWireless:ssid, object property in NMSettingOvs +NMSettingWireless:ssid, object property in NMSettingOvs
-NMSettingWireless:tx-power, object property in NMSettingOvs +NMSettingWireless:tx-power, object property in NMSettingOvs
@@ -3561,7 +3565,7 @@ NMSettingWirelessSecurity, struct in NMSettingOvs
-NMSettingWirelessSecurity:auth-alg, object property in NMSettingOvs +NMSettingWirelessSecurity:auth-alg, object property in NMSettingOvs
@@ -3569,27 +3573,27 @@ NMSettingWirelessSecurity:fils, object property in NMSettingOvs
-NMSettingWirelessSecurity:group, object property in NMSettingOvs +NMSettingWirelessSecurity:group, object property in NMSettingOvs
-NMSettingWirelessSecurity:key-mgmt, object property in NMSettingOvs +NMSettingWirelessSecurity:key-mgmt, object property in NMSettingOvs
-NMSettingWirelessSecurity:leap-password, object property in NMSettingOvs +NMSettingWirelessSecurity:leap-password, object property in NMSettingOvs
-NMSettingWirelessSecurity:leap-password-flags, object property in NMSettingOvs +NMSettingWirelessSecurity:leap-password-flags, object property in NMSettingOvs
-NMSettingWirelessSecurity:leap-username, object property in NMSettingOvs +NMSettingWirelessSecurity:leap-username, object property in NMSettingOvs
-NMSettingWirelessSecurity:pairwise, object property in NMSettingOvs +NMSettingWirelessSecurity:pairwise, object property in NMSettingOvs
@@ -3597,43 +3601,43 @@ NMSettingWirelessSecurity:pmf, object property in NMSettingOvs
-NMSettingWirelessSecurity:proto, object property in NMSettingOvs +NMSettingWirelessSecurity:proto, object property in NMSettingOvs
-NMSettingWirelessSecurity:psk, object property in NMSettingOvs +NMSettingWirelessSecurity:psk, object property in NMSettingOvs
-NMSettingWirelessSecurity:psk-flags, object property in NMSettingOvs +NMSettingWirelessSecurity:psk-flags, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-key-flags, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-key-flags, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-key-type, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-key-type, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-key0, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-key0, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-key1, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-key1, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-key2, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-key2, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-key3, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-key3, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-tx-keyidx, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-tx-keyidx, object property in NMSettingOvs
@@ -4325,6 +4329,10 @@ nm_auto_unref_nml_dbusobj, macro in
+NM_AVAILABLE_IN_1_40_4, macro in nm-version +
+
+
NM_AVAILABLE_IN_1_6, macro in nm-version
@@ -5481,11 +5489,11 @@ nm_context_busy_watcher_quark, function in NM_DBUS_INTERFACE_VPN, macro in nm-vpn-dbus-interface
-NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface +NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
@@ -5497,15 +5505,15 @@ NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
-NM_DBUS_INVALID_VPN_CONNECTION, macro in nm-vpn-dbus-interface +NM_DBUS_INVALID_VPN_CONNECTION, macro in nm-vpn-dbus-interface
-NM_DBUS_NO_ACTIVE_VPN_CONNECTION, macro in nm-vpn-dbus-interface +NM_DBUS_NO_ACTIVE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
-NM_DBUS_NO_VPN_CONNECTIONS, macro in nm-vpn-dbus-interface +NM_DBUS_NO_VPN_CONNECTIONS, macro in nm-vpn-dbus-interface
@@ -5541,11 +5549,11 @@ nm_dbus_path_not_empty, function in
-NM_DBUS_PATH_VPN, macro in nm-vpn-dbus-interface +NM_DBUS_PATH_VPN, macro in nm-vpn-dbus-interface
-NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface +NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface
@@ -5561,67 +5569,67 @@ NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_ALREADY_STARTED, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_ALREADY_STARTED, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_ALREADY_STOPPED, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_ALREADY_STOPPED, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_BAD_ARGUMENTS, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_BAD_ARGUMENTS, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_ERROR_PREFIX, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_ERROR_PREFIX, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_CONNECT_FAILED, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_CONNECT_FAILED, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_IP4_CONFIG, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_IP4_CONFIG, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_LOGIN_BANNER, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_LOGIN_BANNER, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_LOGIN_FAILED, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_LOGIN_FAILED, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_STATE_CHANGE, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_STATE_CHANGE, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_STARTING_IN_PROGRESS, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_STARTING_IN_PROGRESS, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_STOPPING_IN_PROGRESS, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_STOPPING_IN_PROGRESS, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_WRONG_STATE, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_WRONG_STATE, macro in nm-vpn-dbus-interface
@@ -5705,7 +5713,7 @@ NM_DBUS_VPN_WRONG_STATE, macro in nm-vpn-dbus-interface
-NM_DEPRECATED_IN_1_24_FOR, function in nm-version +NM_DEPRECATED_IN_1_24_FOR, function in nm-version
@@ -14409,6 +14417,10 @@ NM_VERSION_1_40, macro in nm-version-macros
+NM_VERSION_1_40_4, macro in nm-version-macros +
+
+
NM_VERSION_1_6, macro in nm-version-macros
@@ -14453,11 +14465,11 @@ NM_VERSION_NEXT_STABLE, macro in nm-version-macros
-NM_VPN_DBUS_PLUGIN_INTERFACE, macro in nm-vpn-dbus-interface +NM_VPN_DBUS_PLUGIN_INTERFACE, macro in nm-vpn-dbus-interface
-NM_VPN_DBUS_PLUGIN_PATH, macro in nm-vpn-dbus-interface +NM_VPN_DBUS_PLUGIN_PATH, macro in nm-vpn-dbus-interface
@@ -14525,27 +14537,27 @@ NM_VPN_DBUS_PLUGIN_PATH, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CAN_PERSIST, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CAN_PERSIST, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CONFIG_BANNER, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CONFIG_BANNER, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CONFIG_HAS_IP4, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CONFIG_HAS_IP4, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CONFIG_HAS_IP6, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CONFIG_HAS_IP6, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CONFIG_MTU, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CONFIG_MTU, macro in nm-vpn-dbus-interface
@@ -14553,7 +14565,7 @@ NM_VPN_PLUGIN_CONFIG_PROXY_PAC, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
@@ -14689,55 +14701,55 @@ NM_VPN_PLUGIN_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_BANNER, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_BANNER, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_DNS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_DNS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_MSS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_MSS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_MTU, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_MTU, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_NBNS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_NBNS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, macro in nm-vpn-dbus-interface
@@ -14745,47 +14757,47 @@ 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 +NM_VPN_PLUGIN_IP4_CONFIG_PTP, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_DNS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_DNS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_MSS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_MSS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_PREFIX, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_PREFIX, macro in nm-vpn-dbus-interface
@@ -14793,11 +14805,11 @@ 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 +NM_VPN_PLUGIN_IP6_CONFIG_PTP, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
@@ -14833,18 +14845,10 @@ NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
-nm_vpn_plugin_old_set_config, function in NMVpnPluginOld -
-
-
nm_vpn_plugin_old_set_ip4_config, function in NMVpnPluginOld
-nm_vpn_plugin_old_set_ip6_config, function in NMVpnPluginOld -
-
-
nm_vpn_plugin_old_set_login_banner, function in NMVpnPluginOld
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index 390c043d..1ed84f22 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -15,7 +15,7 @@

- for libnm 1.40.2 + for libnm 1.40.4 The latest version of this documentation can be found on-line at https://networkmanager.dev/docs/libnm/latest/. diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html index 36eb69f8..4db42937 100644 --- a/docs/libnm/html/libnm-nm-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-dbus-interface.html @@ -960,6 +960,7 @@ is loaded. Since: 1.24.

+

Since: 1.6

@@ -3312,7 +3313,7 @@ behavior. Since: 1.38.

-

Since: 1.4 (gi flags generated since 1.12)

+

Since: 1.12 (public since 1.4, g-ir since 1.12)

diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html index 6b16ef3a..7e8b4ede 100644 --- a/docs/libnm/html/libnm-nm-errors.html +++ b/docs/libnm/html/libnm-nm-errors.html @@ -254,7 +254,7 @@ nm_vpn_plugin_error_quark (void

enum NMAgentManagerError

Errors returned from the secret-agent manager.

These errors may be returned from operations that could cause secrets to be -requested (such as nm_client_activate_connection()), and correspond to D-Bus +requested (such as nm_client_activate_connection()), and correspond to D-Bus errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.

Members

@@ -326,7 +326,7 @@ request

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 @@ -737,7 +737,7 @@ activation but is not available.

when they encounter problems retrieving secrets on behalf of NM. They correspond to errors in the "org.freedesktop.NetworkManager.SecretManager" namespace.

-

Client APIs such as nm_client_activate_connection() will not see these error +

Client APIs such as nm_client_activate_connection() will not see these error codes; instead, the secret agent manager will translate them to the corresponding NMAgentManagerError codes.

diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html index 42861d79..43c80849 100644 --- a/docs/libnm/html/libnm-nm-utils.html +++ b/docs/libnm/html/libnm-nm-utils.html @@ -1594,6 +1594,7 @@ include additional attributes.

.

[transfer none]

+

Since: 1.42, 1.40.4

@@ -1633,6 +1634,7 @@ objects.

GPtrArray of NMIPAddress objects.

[transfer full][element-type NMIPAddress]

+

Since: 1.42, 1.40.4

@@ -1664,6 +1666,7 @@ prefix, next hop, metric, and additional attributes).

.

[transfer none]

+

Since: 1.42, 1.40.4

@@ -1703,6 +1706,7 @@ prefix, next hop, metric, and additional attributes) into a GPtrArray of NMIPRoute objects.

[transfer full][element-type NMIPRoute]

+

Since: 1.42, 1.40.4

@@ -1712,7 +1716,7 @@ nm_utils_uuid_generate (void

Returns

a newly allocated UUID suitable for use as the NMSettingConnection -object's “id”: property. Should be freed with g_free()

+object's “id”: property. Should be freed with g_free()

@@ -2476,6 +2480,7 @@ function in net/core/dev.c.

argument. If you want to run against older versions of libnm, don't pass NULL.

+

Since: 1.6

@@ -2904,7 +2909,7 @@ nm_utils_version (void the version ID of the libnm version. That is, the NM_VERSION at runtime.

-

Since: 1.6.0

+

Since: 1.6

@@ -2976,6 +2981,41 @@ the one of the hash table first.

nm_utils_format_variant_attributes (GHashTable *attributes, char attr_separator, char key_value_separator); +

Format attributes to a string.

+
+

Parameters

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

attributes

a GHashTable mapping attribute names to GVariant values.

[element-type utf8 GVariant]

attr_separator

the attribute separator character

 

key_value_separator

character separating key and values

 
+
+
+

Returns

+

the string representing attributes, or NULL +in case there are no attributes.

+

[transfer full]

+
+

Since: 1.8

@@ -3275,6 +3315,12 @@ nm_utils_sriov_vf_from_str (const

nm_utils_get_timestamp_msec ()

gint64
 nm_utils_get_timestamp_msec (void);
+

Gets current time in milliseconds of CLOCK_BOOTTIME.

+
+

Returns

+

time in milliseconds

+
+

Since: 1.12

diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html index b6c12280..7db7a856 100644 --- a/docs/libnm/html/libnm-nm-version.html +++ b/docs/libnm/html/libnm-nm-version.html @@ -119,10 +119,10 @@ -4 +0 -NM_DEPRECATED_IN_1_24_FOR () +NM_DEPRECATED_IN_1_24_FOR () @@ -368,6 +368,10 @@ #define NM_AVAILABLE_IN_1_40 + +#define +NM_AVAILABLE_IN_1_40_4 +
@@ -455,7 +459,7 @@

NM_DEPRECATED_IN_1_24_FOR ()

-
4
+
0
 NM_DEPRECATED_IN_1_24_FOR ();

 
NM_DEPRECATED_IN_1_24_FOR is deprecated and should not be used in newly-written code.
@@ -783,6 +787,12 @@ NM_DEPRECATED_IN_1_24_FOR (); 
#define NM_AVAILABLE_IN_1_40 G_UNAVAILABLE(1, 40)
+
+
+

NM_AVAILABLE_IN_1_40_4

+
#define NM_AVAILABLE_IN_1_40_4 G_UNAVAILABLE(1, 40.4)
+
+
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2 index 18e1826c..c3b8145c 100644 --- a/docs/libnm/html/libnm.devhelp2 +++ b/docs/libnm/html/libnm.devhelp2 @@ -190,7 +190,7 @@ - + @@ -276,6 +276,7 @@ + @@ -441,7 +442,7 @@ - + @@ -487,7 +488,7 @@ - + @@ -549,16 +550,16 @@ - - - - + + + + - + @@ -579,7 +580,7 @@ - + @@ -621,7 +622,7 @@ - + @@ -636,7 +637,7 @@ - + @@ -673,7 +674,7 @@ - + @@ -709,13 +710,13 @@ - - + + - - + + @@ -982,21 +983,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -1124,7 +1125,7 @@ - + @@ -1152,7 +1153,7 @@ - + @@ -1249,7 +1250,7 @@ - + @@ -1285,7 +1286,7 @@ - + @@ -1367,10 +1368,10 @@ - - + + - + @@ -1385,12 +1386,12 @@ - + - + @@ -1459,7 +1460,7 @@ - + @@ -1507,7 +1508,7 @@ - + @@ -1521,7 +1522,7 @@ - + @@ -1639,7 +1640,7 @@ - + @@ -1649,7 +1650,7 @@ - + @@ -1690,8 +1691,8 @@ - - + + @@ -1775,7 +1776,7 @@ - + @@ -1831,9 +1832,9 @@ - - - + + + @@ -1869,7 +1870,7 @@ - + @@ -2020,7 +2021,7 @@ - + @@ -2063,7 +2064,7 @@ - + @@ -2076,10 +2077,10 @@ - + - + @@ -2154,13 +2155,13 @@ - - - - - - - + + + + + + + @@ -2300,8 +2301,7 @@ - - + @@ -2403,7 +2403,7 @@ - + @@ -2511,7 +2511,7 @@ - + @@ -2528,7 +2528,7 @@ - + @@ -2549,7 +2549,7 @@ - + @@ -2563,7 +2563,7 @@ - + @@ -2603,7 +2603,7 @@ - + @@ -2686,7 +2686,6 @@ - @@ -2906,10 +2905,10 @@ - - - - + + + + @@ -2931,7 +2930,7 @@ - + @@ -2942,9 +2941,9 @@ - + - + @@ -2953,7 +2952,7 @@ - + @@ -3029,14 +3028,15 @@ + - - - - - - + + + + + + @@ -3065,7 +3065,7 @@ - + @@ -3122,9 +3122,7 @@ - - diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html index a4eedba2..7b11c68f 100644 --- a/docs/libnm/html/usage.html +++ b/docs/libnm/html/usage.html @@ -96,7 +96,7 @@ 

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

diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt index 241dc854..e497c044 100644 --- a/docs/libnm/libnm-sections.txt +++ b/docs/libnm/libnm-sections.txt @@ -165,6 +165,7 @@ NM_CLIENT_ACTIVE_CONNECTION_REMOVED NMClientError NM_CLIENT_ERROR nm_client_error_quark +NMDnsEntry nm_dns_entry_unref nm_dns_entry_get_interface nm_dns_entry_get_nameservers @@ -268,7 +269,6 @@ nm_utils_file_is_pkcs12 NMClient NMClientClass -NMDnsEntry NM_CLIENT NM_CLIENT_CLASS NM_CLIENT_GET_CLASS @@ -854,7 +854,6 @@ nm_lldp_neighbor_get_type NM_DEVICE_6LOWPAN_PARENT NM_DEVICE_6LOWPAN_HW_ADDRESS nm_device_6lowpan_get_parent -NM_DEPRECATED_IN_1_24_FOR NMDevice6Lowpan NMDevice6LowpanClass @@ -1522,7 +1521,6 @@ nm_device_wireguard_get_type nm-device-wpan NMDeviceWpan NM_DEVICE_WPAN_HW_ADDRESS -NM_DEPRECATED_IN_1_24_FOR NMDeviceWpan NMDeviceWpanClass @@ -4475,6 +4473,7 @@ NM_AVAILABLE_IN_1_38 NM_DEPRECATED_IN_1_40 NM_DEPRECATED_IN_1_40_FOR NM_AVAILABLE_IN_1_40 +NM_AVAILABLE_IN_1_40_4

@@ -4507,6 +4506,7 @@ NM_VERSION_1_34 NM_VERSION_1_36 NM_VERSION_1_38 NM_VERSION_1_40 +NM_VERSION_1_40_4 NM_API_VERSION NM_VERSION_CUR_STABLE NM_VERSION_NEXT_STABLE @@ -4705,9 +4705,7 @@ nm_vpn_plugin_old_set_state nm_vpn_plugin_old_secrets_required nm_vpn_plugin_old_set_login_banner nm_vpn_plugin_old_failure -nm_vpn_plugin_old_set_config nm_vpn_plugin_old_set_ip4_config -nm_vpn_plugin_old_set_ip6_config nm_vpn_plugin_old_disconnect nm_vpn_plugin_old_read_vpn_details nm_vpn_plugin_old_get_secret_flags diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml index 148dabb4..77926ffe 100644 --- a/docs/libnm/version.xml +++ b/docs/libnm/version.xml @@ -1 +1 @@ -1.40.2 +1.40.4 diff --git a/man/NetworkManager-dispatcher.8 b/man/NetworkManager-dispatcher.8 index cf0edb16..b43bfbe3 100644 --- a/man/NetworkManager-dispatcher.8 +++ b/man/NetworkManager-dispatcher.8 @@ -2,9 +2,9 @@ .\" Title: NetworkManager-dispatcher .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: Network management daemons -.\" Source: NetworkManager-dispatcher 1.40.2 +.\" Source: NetworkManager-dispatcher 1.40.4 .\" Language: English .\" .TH "NETWORKMANAGER\-DISPATCHER" "8" "" "NetworkManager\-dispatcher 1\&" "Network management daemons" diff --git a/man/NetworkManager-wait-online.service.8 b/man/NetworkManager-wait-online.service.8 index a22ebb97..919efeb4 100644 --- a/man/NetworkManager-wait-online.service.8 +++ b/man/NetworkManager-wait-online.service.8 @@ -2,9 +2,9 @@ .\" Title: NetworkManager-wait-online.service .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: Network management daemons -.\" Source: NetworkManager-wait-online.service 1.40.2 +.\" Source: NetworkManager-wait-online.service 1.40.4 .\" Language: English .\" .TH "NETWORKMANAGER\-WAIT\-ONLINE\&" "8" "" "NetworkManager\-wait\-online\&" "Network management daemons" diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index 0681d6c7..ccc74e72 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,12 +2,12 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: Network management daemons -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.40\&.2" "Network management daemons" +.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.40\&.4" "Network management daemons" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 4760e293..0b8dbab9 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,12 +2,12 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.40\&.2" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.40\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-cloud-setup.8 b/man/nm-cloud-setup.8 index 7ffdc4c1..39209fb8 100644 --- a/man/nm-cloud-setup.8 +++ b/man/nm-cloud-setup.8 @@ -2,12 +2,12 @@ .\" Title: nm-cloud-setup .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: Automatic Network Configuration in Cloud with NetworkManager -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.40\&.2" "Automatic Network Configuratio" +.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.40\&.4" "Automatic Network Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-initrd-generator.8 b/man/nm-initrd-generator.8 index bcd9ec8b..5ddd198c 100644 --- a/man/nm-initrd-generator.8 +++ b/man/nm-initrd-generator.8 @@ -2,12 +2,12 @@ .\" Title: nm-initrd-generator .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: System Administration -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.40\&.2" "System Administration" +.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.40\&.4" "System Administration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-online.1 b/man/nm-online.1 index 9b19d6fd..28c4d277 100644 --- a/man/nm-online.1 +++ b/man/nm-online.1 @@ -2,12 +2,12 @@ .\" Title: nm-online .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.40\&.2" "General Commands Manual" +.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.40\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7 index e7aa3b16..dc407104 100644 --- a/man/nm-openvswitch.7 +++ b/man/nm-openvswitch.7 @@ -2,12 +2,12 @@ .\" Title: nm-openvswitch .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: Open vSwitch support overview -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.40\&.2" "Open vSwitch support overview" +.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.40\&.4" "Open vSwitch support overview" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-dbus.5 b/man/nm-settings-dbus.5 index 03ebbe7f..63fe0d33 100644 --- a/man/nm-settings-dbus.5 +++ b/man/nm-settings-dbus.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-dbus .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.40\&.2" "Configuration" +.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.40\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -2196,8 +2196,6 @@ T}:T{ \ \& T}:T{ The Vendor Class Identifier DHCP option (60)\&. Special characters in the data string may be escaped using C\-style escapes, nevertheless this property cannot contain nul bytes\&. If the per\-profile value is unspecified (the default), a global connection default gets consulted\&. If still unspecified, the DHCP option is not sent to the server\&. - - Since 1\&.28 T} T{ dns @@ -2302,8 +2300,6 @@ T}:T{ Enable and disable the IPv4 link\-local configuration independently of the ipv4\&.method configuration\&. This allows a link\-local address (169\&.254\&.x\&.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server\&. When set to "auto", the value is dependent on "ipv4\&.method"\&. When set to "default", it honors the global connection default, before falling back to "auto"\&. Note that if "ipv4\&.method" is "disabled", then link local addressing is always disabled too\&. The default is "default"\&. - - Since 1\&.40 T} T{ may\-fail diff --git a/man/nm-settings-dbus.xml b/man/nm-settings-dbus.xml index d95c22ff..5901b8c8 100644 --- a/man/nm-settings-dbus.xml +++ b/man/nm-settings-dbus.xml @@ -1,6 +1,6 @@ -nm-settings-dbusNetworkManager developersnm-settings-dbus5NetworkManagerConfiguration1.40.2nm-settings-dbusDescription of settings and properties of NetworkManager connection profiles on the D-Bus APIDescription +nm-settings-dbusNetworkManager developersnm-settings-dbus5NetworkManagerConfiguration1.40.4nm-settings-dbusDescription of settings and properties of NetworkManager connection profiles on the D-Bus APIDescription NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will @@ -166,9 +166,7 @@ This property is currently not implemented for DHCPv6.dhcp-send-hostnamebooleanTRUE 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-timeoutint320 A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). - Set to 2147483647 (MAXINT32) for infinity.dhcp-vendor-class-identifierstring The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. - - Since 1.28dnsarray of uint32Array of IP addresses of DNS servers (as network-byte-order integers)dns-optionsarray of string Array of DNS options as described in man 5 resolv.conf. + Set to 2147483647 (MAXINT32) for infinity.dhcp-vendor-class-identifierstring The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server.dnsarray of uint32Array of IP addresses of DNS servers (as network-byte-order integers)dns-optionsarray of string Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. @@ -200,9 +198,7 @@ Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See "ip4-auto-default-route".ignore-auto-dnsbooleanFALSE When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used.ignore-auto-routesbooleanFALSE 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.link-localint320 Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. - When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". - - Since 1.40may-failbooleanTRUE 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.methodstring IP configuration method. + When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default".may-failbooleanTRUE 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.methodstring IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "auto", "manual", and "link-local". See the subclass-specific documentation for other values. diff --git a/man/nm-settings-docs-dbus.xml b/man/nm-settings-docs-dbus.xml index c474005b..7158e86a 100644 --- a/man/nm-settings-docs-dbus.xml +++ b/man/nm-settings-docs-dbus.xml @@ -132,9 +132,7 @@ This property is currently not implemented for DHCPv6. 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. 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. A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity. A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). - Set to 2147483647 (MAXINT32) for infinity. The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Since 1.28 The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. - - Since 1.28 Array of IP addresses of DNS servers.Array of IP addresses of DNS servers (as network-byte-order integers) Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are "attempts", "debug", "edns0", "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", "single-request-reopen", "timeout", "trust-ad", "use-vc". The "trust-ad" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have "trust-ad" enabled. When using a caching DNS plugin (dnsmasq or systemd-resolved in NetworkManager.conf) then "edns0" and "trust-ad" are automatically added. Array of DNS options as described in man 5 resolv.conf. + Set to 2147483647 (MAXINT32) for infinity. The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Array of IP addresses of DNS servers.Array of IP addresses of DNS servers (as network-byte-order integers) Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are "attempts", "debug", "edns0", "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", "single-request-reopen", "timeout", "trust-ad", "use-vc". The "trust-ad" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have "trust-ad" enabled. When using a caching DNS plugin (dnsmasq or systemd-resolved in NetworkManager.conf) then "edns0" and "trust-ad" are automatically added. Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. @@ -164,11 +162,9 @@ Setting the gateway causes NetworkManager to configure a standard default route with the gateway as next hop. This is ignored if "never-default" is set. An alternative is to configure the default route explicitly with a manual route and /0 as prefix length. - Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See "ip4-auto-default-route". When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. 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. 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. Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". Since 1.40 Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. - - When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". + Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See "ip4-auto-default-route". When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. 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. 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. Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. - Since 1.40 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. 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. IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "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. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared. IP configuration method. + When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". 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. 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. IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "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. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared. IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "auto", "manual", and "link-local". See the subclass-specific documentation for other values. diff --git a/man/nm-settings-docs-nmcli.xml b/man/nm-settings-docs-nmcli.xml index 41ca76a5..d2b7781c 100644 --- a/man/nm-settings-docs-nmcli.xml +++ b/man/nm-settings-docs-nmcli.xml @@ -1,4 +1,4 @@ - The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Currently, this only applies to 802-1x authentication.The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Currently, this only applies to 802-1x authentication. 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 happens when the circumstances are suitable. That means for example that the device is currently managed and not active. Autoconnect thus never replaces or competes with an already active profile. Note that autoconnect is not implemented for VPN profiles. See "secondaries" as an alternative to automatically connect VPN profiles. If multiple profiles are ready to autoconnect on the same device, the one with the better "connection.autoconnect-priority" is chosen. If the priorities are equal, then the most recently connected profile is activated. If the profiles were not connected earlier or their "connection.timestamp" is identical, the choice is undefined. Depending on "connection.multi-connect", a profile can (auto)connect only once at a time or multiple times.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 happens when the circumstances are suitable. That means for example that the device is currently managed and not active. Autoconnect thus never replaces or competes with an already active profile. Note that autoconnect is not implemented for VPN profiles. See "secondaries" as an alternative to automatically connect VPN profiles. If multiple profiles are ready to autoconnect on the same device, the one with the better "connection.autoconnect-priority" is chosen. If the priorities are equal, then the most recently connected profile is activated. If the profiles were not connected earlier or their "connection.timestamp" is identical, the choice is undefined. Depending on "connection.multi-connect", a profile can (auto)connect only once at a time or multiple times. The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen. The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again.The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again. 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 properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. 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.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 properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. 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. Whether DNSOverTls (dns-over-tls) is enabled for the connection. DNSOverTls is a technology which uses TLS to encrypt dns traffic. The permitted values are: "yes" (2) use DNSOverTls and disabled fallback, "opportunistic" (1) use DNSOverTls but allow fallback to unencrypted resolution, "no" (0) don't ever use DNSOverTls. If unspecified "default" depends on the plugin used. Systemd-resolved uses global setting. This feature requires a plugin which supports DNSOverTls. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved.Whether DNSOverTls (dns-over-tls) is enabled for the connection. DNSOverTls is a technology which uses TLS to encrypt dns traffic. The permitted values are: "yes" (2) use DNSOverTls and disabled fallback, "opportunistic" (1) use DNSOverTls but allow fallback to unencrypted resolution, "no" (0) don't ever use DNSOverTls. If unspecified "default" depends on the plugin used. Systemd-resolved uses global setting. This feature requires a plugin which supports DNSOverTls. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved. If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping. A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G". 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.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. Whether LLDP is enabled for the connection.Whether LLDP is enabled for the connection. Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable LLMNR for the interface, "resolve" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "yes"). This feature requires a plugin which supports LLMNR. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved.Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable LLMNR for the interface, "resolve" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "yes"). This feature requires a plugin which supports LLMNR. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved. Interface name of the master device or UUID of the master connection.Interface name of the master device or UUID of the master connection. Whether mDNS is enabled for the connection. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable mDNS for the interface, "resolve" (1) do not register hostname but allow resolving of mDNS host names and "default" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "no"). This feature requires a plugin which supports mDNS. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved.Whether mDNS is enabled for the connection. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable mDNS for the interface, "resolve" (1) do not register hostname but allow resolving of mDNS host names and "default" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "no"). This feature requires a plugin which supports mDNS. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved. Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately. Whether to configure MPTCP endpoints and the address flags. If MPTCP is enabled in NetworkManager, it will configure the addresses of the interface as MPTCP endpoints. Note that IPv4 loopback addresses (127.0.0.0/8), IPv4 link local addresses (169.254.0.0/16), the IPv6 loopback address (::1), IPv6 link local addresses (fe80::/10), IPv6 unique local addresses (ULA, fc00::/7) and IPv6 privacy extension addresses (rfc3041, ipv6.ip6-privacy) will be excluded from being configured as endpoints. If "disabled" (0x1), MPTCP handling for the interface is disabled and no endpoints are registered. The "enabled" (0x2) flag means that MPTCP handling is enabled. This flag can also be implied from the presence of other flags. Even when enabled, MPTCP handling will by default still be disabled unless "/proc/sys/net/mptcp/enabled" sysctl is on. NetworkManager does not change the sysctl and this is up to the administrator or distribution. To configure endpoints even if the sysctl is disabled, "also-without-sysctl" (0x4) flag can be used. In that case, NetworkManager doesn't look at the sysctl and configures endpoints regardless. Even when enabled, NetworkManager will only configure MPTCP endpoints for a certain address family, if there is a unicast default route (0.0.0.0/0 or ::/0) in the main routing table. The flag "also-without-default-route" (0x8) can override that. When MPTCP handling is enabled then endpoints are configured with the specified address flags "signal" (0x10), "subflow" (0x20), "backup" (0x40), "fullmesh" (0x80). See ip-mptcp(8) manual for additional information about the flags. If the flags are zero (0x0), the global connection default from NetworkManager.conf is honored. If still unspecified, the fallback is "enabled,subflow". Note that this means that MPTCP is by default done depending on the "/proc/sys/net/mptcp/enabled" sysctl. NetworkManager does not change the MPTCP limits nor enable MPTCP via "/proc/sys/net/mptcp/enabled". That is a host configuration which the admin can change via sysctl and ip-mptcp. Strict reverse path filtering (rp_filter) breaks many MPTCP use cases, so when MPTCP handling for IPv4 addresses on the interface is enabled, NetworkManager would loosen the strict reverse path filtering (1) to the loose setting (2).Whether to configure MPTCP endpoints and the address flags. If MPTCP is enabled in NetworkManager, it will configure the addresses of the interface as MPTCP endpoints. Note that IPv4 loopback addresses (127.0.0.0/8), IPv4 link local addresses (169.254.0.0/16), the IPv6 loopback address (::1), IPv6 link local addresses (fe80::/10), IPv6 unique local addresses (ULA, fc00::/7) and IPv6 privacy extension addresses (rfc3041, ipv6.ip6-privacy) will be excluded from being configured as endpoints. If "disabled" (0x1), MPTCP handling for the interface is disabled and no endpoints are registered. The "enabled" (0x2) flag means that MPTCP handling is enabled. This flag can also be implied from the presence of other flags. Even when enabled, MPTCP handling will by default still be disabled unless "/proc/sys/net/mptcp/enabled" sysctl is on. NetworkManager does not change the sysctl and this is up to the administrator or distribution. To configure endpoints even if the sysctl is disabled, "also-without-sysctl" (0x4) flag can be used. In that case, NetworkManager doesn't look at the sysctl and configures endpoints regardless. Even when enabled, NetworkManager will only configure MPTCP endpoints for a certain address family, if there is a unicast default route (0.0.0.0/0 or ::/0) in the main routing table. The flag "also-without-default-route" (0x8) can override that. When MPTCP handling is enabled then endpoints are configured with the specified address flags "signal" (0x10), "subflow" (0x20), "backup" (0x40), "fullmesh" (0x80). See ip-mptcp(8) manual for additional information about the flags. If the flags are zero (0x0), the global connection default from NetworkManager.conf is honored. If still unspecified, the fallback is "enabled,subflow". Note that this means that MPTCP is by default done depending on the "/proc/sys/net/mptcp/enabled" sysctl. NetworkManager does not change the MPTCP limits nor enable MPTCP via "/proc/sys/net/mptcp/enabled". That is a host configuration which the admin can change via sysctl and ip-mptcp. Strict reverse path filtering (rp_filter) breaks many MPTCP use cases, so when MPTCP handling for IPv4 addresses on the interface is enabled, NetworkManager would loosen the strict reverse path filtering (1) to the loose setting (2). If configured, set to a Manufacturer Usage Description (MUD) URL that points to manufacturer-recommended network policies for IoT devices. It is transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL starting with "https://". The special value "none" is allowed to indicate that no MUD URL is used. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the ultimate default is "none".If configured, set to a Manufacturer Usage Description (MUD) URL that points to manufacturer-recommended network policies for IoT devices. It is transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL starting with "https://". The special value "none" is allowed to indicate that no MUD URL is used. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the ultimate default is "none". Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect.Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect. 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 users are allowed if and only if they are in this list. When this is not empty, the connection can be active only when one of the specified users is logged into an active session. 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.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 users are allowed if and only if they are in this list. When this is not empty, the connection can be active only when one of the specified users is logged into an active session. 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. 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.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. List of connection UUIDs that should be activated when the base connection itself is activated. Currently, only VPN connections are supported.List of connection UUIDs that should be activated when the base connection itself is activated. Currently, only VPN connections are supported. Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave. This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The per-host key is the identity of your machine and stored in /var/lib/NetworkManager/secret_key. See NetworkManager(8) manual about the secret-key and the host identity. The '$' character is treated special to perform dynamic substitutions at runtime. Currently, supported are "${CONNECTION}", "${DEVICE}", "${MAC}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that "${DEVICE}" corresponds to the interface name of the device and "${MAC}" is the permanent MAC address of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as "$$". For example, set it to "${CONNECTION}-${BOOT}-${DEVICE}" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to "${CONNECTION}" and uses a unique, fixed ID for the connection.This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The per-host key is the identity of your machine and stored in /var/lib/NetworkManager/secret_key. See NetworkManager(8) manual about the secret-key and the host identity. The '$' character is treated special to perform dynamic substitutions at runtime. Currently, supported are "${CONNECTION}", "${DEVICE}", "${MAC}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that "${DEVICE}" corresponds to the interface name of the device and "${MAC}" is the permanent MAC address of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as "$$". For example, set it to "${CONNECTION}-${BOOT}-${DEVICE}" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to "${CONNECTION}" and uses a unique, fixed ID for the connection. The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).The 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). 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).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). 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 "-").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 "-"). Time in milliseconds to wait for connection to be considered activated. The wait will start after the pre-up dispatcher event. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.Time in milliseconds to wait for connection to be considered activated. The wait will start after the pre-up dispatcher event. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time. Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service and nm-online to give the device a chance to appear. This works by waiting for the given timeout until a compatible device for the profile is available and managed. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service and nm-online to give the device a chance to appear. This works by waiting for the given timeout until a compatible device for the profile is available and managed. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time. The trust level of a the connection. Free form case-insensitive string (for example "Home", "Work", "Public"). NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.The 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. If given, specifies the parent interface name or parent connection UUID from which this 6LowPAN interface should be created.If given, specifies the parent interface name or parent connection UUID from which this 6LowPAN interface should be created. 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.List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed. Anonymous identity string for EAP authentication methods. Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.Anonymous identity string for EAP authentication methods. Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS. A timeout for the authentication. Zero means the global default; if the global default is not set, the authentication timeout is 25 seconds.A timeout for the authentication. Zero means the global default; if the global default is not set, the authentication timeout is 25 seconds. Contains the CA certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; three are currently supported: blob, path and pkcs#11 URL. When using the blob scheme 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. Note that enabling NMSetting8021x:system-ca-certs will override this setting to use the built-in path, if the built-in path is not a directory.Contains the CA certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; three are currently supported: blob, path and pkcs#11 URL. When using the blob scheme 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. Note that enabling NMSetting8021x:system-ca-certs will override this setting to use the built-in path, if the built-in path is not a directory. The password used to access the CA certificate stored in "ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.The password used to access the CA certificate stored in "ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login. Flags indicating how to handle the "ca-cert-password" property.Flags indicating how to handle the "ca-cert-password" property. 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. If NMSetting8021x:system-ca-certs is enabled and the built-in CA path is an existing directory, then this setting is ignored.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. If NMSetting8021x:system-ca-certs is enabled and the built-in CA path is an existing directory, then this setting is ignored. 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.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. The password used to access the client certificate stored in "client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.The password used to access the client certificate stored in "client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login. Flags indicating how to handle the "client-cert-password" property.Flags indicating how to handle the "client-cert-password" property. Constraint for server domain name. If set, this list of FQDNs is used as a 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 the same comparison. Multiple valid FQDNs can be passed as a ";" delimited list.Constraint for server domain name. If set, this list of FQDNs is used as a 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 the same comparison. Multiple valid FQDNs can be passed as a ";" delimited list. 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. Since version 1.24, multiple valid FQDNs can be passed as a ";" delimited list.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. Since version 1.24, multiple valid FQDNs can be passed as a ";" delimited list. 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.The allowed EAP method to be used when authenticating to the network with 802.1x. Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd", and "fast". Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations. Identity string for EAP authentication methods. Often the user's user or login name.Identity string for EAP authentication methods. Often the user's user or login name. Whether the 802.1X authentication is optional. If TRUE, the activation will continue even after a timeout or an authentication failure. Setting the property to TRUE is currently allowed only for Ethernet connections. If set to FALSE, the activation can continue only after a successful authentication.Whether the 802.1X authentication is optional. If TRUE, the activation will continue even after a timeout or an authentication failure. Setting the property to TRUE is currently allowed only for Ethernet connections. If set to FALSE, the activation can continue only after a successful authentication. UTF-8 encoded file path containing PAC for EAP-FAST.UTF-8 encoded file path containing PAC for EAP-FAST. UTF-8 encoded password used for EAP authentication methods. If both the "password" property and the "password-raw" property are specified, "password" is preferred.UTF-8 encoded password used for EAP authentication methods. If both the "password" property and the "password-raw" property are specified, "password" is preferred. Flags indicating how to handle the "password" property.Flags indicating how to handle the "password" property. 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 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. Flags indicating how to handle the "password-raw" property.Flags indicating how to handle the "password-raw" property. Specifies authentication flags to use in "phase 1" outer authentication using NMSetting8021xAuthFlags options. The individual TLS versions can be explicitly disabled. If a certain TLS disable flag is not set, it is up to the supplicant to allow or forbid it. The TLS options map to tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more details.Specifies authentication flags to use in "phase 1" outer authentication using NMSetting8021xAuthFlags options. The individual TLS versions can be explicitly disabled. If a certain TLS disable flag is not set, it is up to the supplicant to allow or forbid it. The TLS options map to tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more details. 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.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. 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.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. 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.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. 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.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. Specifies the allowed "phase 2" inner authentication method when an EAP method that uses an inner TLS tunnel is specified in the "eap" property. For TTLS this property selects one of the supported non-EAP inner methods: "pap", "chap", "mschap", "mschapv2" while "phase2-autheap" selects an EAP inner method. For PEAP this selects an inner EAP method, one of: "gtc", "otp", "md5" and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details. Both "phase2-auth" and "phase2-autheap" cannot be specified.Specifies the allowed "phase 2" inner authentication method when an EAP method that uses an inner TLS tunnel is specified in the "eap" property. For TTLS this property selects one of the supported non-EAP inner methods: "pap", "chap", "mschap", "mschapv2" while "phase2-autheap" selects an EAP inner method. For PEAP this selects an inner EAP method, one of: "gtc", "otp", "md5" and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details. Both "phase2-auth" and "phase2-autheap" cannot be specified. Specifies the allowed "phase 2" inner EAP-based authentication method when TTLS 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.Specifies the allowed "phase 2" inner EAP-based authentication method when TTLS 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. 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"; three are currently supported: blob, path and pkcs#11 URL. When using the blob scheme 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. Note that enabling NMSetting8021x:system-ca-certs will override this setting to use the built-in path, if the built-in path is not a directory.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"; three are currently supported: blob, path and pkcs#11 URL. When using the blob scheme 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. Note that enabling NMSetting8021x:system-ca-certs will override this setting to use the built-in path, if the built-in path is not a directory. The password used to access the "phase2" CA certificate stored in "phase2-ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.The password used to access the "phase2" CA certificate stored in "phase2-ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login. Flags indicating how to handle the "phase2-ca-cert-password" property.Flags indicating how to handle the "phase2-ca-cert-password" property. 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. If NMSetting8021x:system-ca-certs is enabled and the built-in CA path is an existing directory, then this setting is ignored.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. If NMSetting8021x:system-ca-certs is enabled and the built-in CA path is an existing directory, then this setting is ignored. 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.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. The password used to access the "phase2" client certificate stored in "phase2-client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.The password used to access the "phase2" client certificate stored in "phase2-client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login. Flags indicating how to handle the "phase2-client-cert-password" property.Flags indicating how to handle the "phase2-client-cert-password" property. Constraint for server domain name. If set, this list of FQDNs is used as a 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 the same comparison. Multiple valid FQDNs can be passed as a ";" delimited list.Constraint for server domain name. If set, this list of FQDNs is used as a 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 the same comparison. Multiple valid FQDNs can be passed as a ";" delimited list. 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. Since version 1.24, multiple valid FQDNs can be passed as a ";" delimited list.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. Since version 1.24, multiple valid FQDNs can be passed as a ";" delimited list. Contains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate.Contains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. 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.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. Flags indicating how to handle the "phase2-private-key-password" property.Flags indicating how to handle the "phase2-private-key-password" property. 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.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 used for EAP authentication methods.PIN used for EAP authentication methods. Flags indicating how to handle the "pin" property.Flags indicating how to handle the "pin" property. Contains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users. Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data.Contains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users. Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data. 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.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. Flags indicating how to handle the "private-key-password" property.Flags indicating how to handle the "private-key-password" property. 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.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. 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).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). Encapsulation of ADSL connection. Can be "vcmux" or "llc".Encapsulation of ADSL connection. Can be "vcmux" or "llc". Password used to authenticate with the ADSL service.Password used to authenticate with the ADSL service. Flags indicating how to handle the "password" property.Flags indicating how to handle the "password" property. ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm".ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm". Username used to authenticate with the ADSL service.Username used to authenticate with the ADSL service. VCI of ADSL connectionVCI of ADSL connection VPI of ADSL connectionVPI of ADSL connection The Bluetooth address of the device.The Bluetooth address of the device. Either "dun" for Dial-Up Networking connections or "panu" for Personal Area Networking connections to devices supporting the NAP profile.Either "dun" for Dial-Up Networking connections or "panu" for Personal Area Networking connections to devices supporting the NAP profile. 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]).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]). The Ethernet MAC address aging time, in seconds.The Ethernet MAC address aging time, in seconds. The Spanning Tree Protocol (STP) forwarding delay, in seconds.The Spanning Tree Protocol (STP) forwarding delay, in seconds. If specified, The MAC address of the multicast group this bridge uses for STP. The address must be a link-local address in standard Ethernet MAC address format, ie an address of the form 01:80:C2:00:00:0X, with X in [0, 4..F]. If not specified the default value is 01:80:C2:00:00:00.If specified, The MAC address of the multicast group this bridge uses for STP. The address must be a link-local address in standard Ethernet MAC address format, ie an address of the form 01:80:C2:00:00:0X, with X in [0, 4..F]. If not specified the default value is 01:80:C2:00:00:00. A mask of group addresses to forward. Usually, group addresses in the range from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to standards. This property is a mask of 16 bits, each corresponding to a group address in that range that must be forwarded. The mask can't have bits 0, 1 or 2 set because they are used for STP, MAC pause frames and LACP.A mask of group addresses to forward. Usually, group addresses in the range from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to standards. This property is a mask of 16 bits, each corresponding to a group address in that range that must be forwarded. The mask can't have bits 0, 1 or 2 set because they are used for STP, MAC pause frames and LACP. The Spanning Tree Protocol (STP) hello time, in seconds.The Spanning Tree Protocol (STP) hello time, in seconds. If specified, the MAC address of bridge. When creating a new bridge, this MAC address will be set. If this field is left unspecified, the "ethernet.cloned-mac-address" is referred instead to generate the initial MAC address. Note that setting "ethernet.cloned-mac-address" anyway overwrites the MAC address of the bridge later while activating the bridge. Hence, this property is deprecated. Deprecated: 1If specified, the MAC address of bridge. When creating a new bridge, this MAC address will be set. If this field is left unspecified, the "ethernet.cloned-mac-address" is referred instead to generate the initial MAC address. Note that setting "ethernet.cloned-mac-address" anyway overwrites the MAC address of the bridge later while activating the bridge. Hence, this property is deprecated. Deprecated: 1 The Spanning Tree Protocol (STP) maximum message age, in seconds.The Spanning Tree Protocol (STP) maximum message age, in seconds. Set maximum size of multicast hash table (value must be a power of 2).Set maximum size of multicast hash table (value must be a power of 2). Set the number of queries the bridge will send before stopping forwarding a multicast group after a "leave" message has been received.Set the number of queries the bridge will send before stopping forwarding a multicast group after a "leave" message has been received. Set interval (in deciseconds) between queries to find remaining members of a group, after a "leave" message is received.Set interval (in deciseconds) between queries to find remaining members of a group, after a "leave" message is received. Set delay (in deciseconds) after which the bridge will leave a group, if no membership reports for this group are received.Set delay (in deciseconds) after which the bridge will leave a group, if no membership reports for this group are received. Enable or disable sending of multicast queries by the bridge. If not specified the option is disabled.Enable or disable sending of multicast queries by the bridge. If not specified the option is disabled. If no queries are seen after this delay (in deciseconds) has passed, the bridge will start to send its own queries.If no queries are seen after this delay (in deciseconds) has passed, the bridge will start to send its own queries. Interval (in deciseconds) between queries sent by the bridge after the end of the startup phase.Interval (in deciseconds) between queries sent by the bridge after the end of the startup phase. Set the Max Response Time/Max Response Delay (in deciseconds) for IGMP/MLD queries sent by the bridge.Set the Max Response Time/Max Response Delay (in deciseconds) for IGMP/MLD queries sent by the bridge. If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used.If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used. Sets bridge's multicast router. Multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled' to which kernel assigns the numbers 1, 0, and 2, respectively. If not specified the default value is 'auto' (1).Sets bridge's multicast router. Multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled' to which kernel assigns the numbers 1, 0, and 2, respectively. If not specified the default value is 'auto' (1). 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.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. Set the number of IGMP queries to send during startup phase.Set the number of IGMP queries to send during startup phase. Sets the time (in deciseconds) between queries sent out at startup to determine membership information.Sets the time (in deciseconds) between queries sent out at startup to determine membership information. Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower values are "better"; the lowest priority bridge will be elected the root bridge.Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower values are "better"; the lowest priority bridge will be elected the root bridge. Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.Controls whether Spanning Tree Protocol (STP) is enabled for this bridge. The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames.The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames. Control whether VLAN filtering is enabled on the bridge.Control whether VLAN filtering is enabled on the bridge. If specified, the protocol used for VLAN filtering. Supported values are: '802.1Q', '802.1ad'. If not specified the default value is '802.1Q'.If specified, the protocol used for VLAN filtering. Supported values are: '802.1Q', '802.1ad'. If not specified the default value is '802.1Q'. Controls whether per-VLAN stats accounting is enabled.Controls whether per-VLAN stats accounting is enabled. Array of bridge VLAN objects. In addition to the VLANs specified here, the bridge will also have the default-pvid VLAN configured by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.Array of bridge VLAN objects. In addition to the VLANs specified here, the bridge will also have the default-pvid VLAN configured by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash. Enables or disables "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on.Enables or disables "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on. The Spanning Tree Protocol (STP) port cost for destinations via this port.The Spanning Tree Protocol (STP) port cost for destinations via this port. The Spanning Tree Protocol (STP) priority of this bridge port.The Spanning Tree Protocol (STP) priority of this bridge port. Array of bridge VLAN objects. In addition to the VLANs specified here, the port will also have the default-pvid VLAN configured on the bridge by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.Array of bridge VLAN objects. In addition to the VLANs specified here, the port will also have the default-pvid VLAN configured on the bridge by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash. If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames. 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.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. 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.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. Flags indicating how to handle the "password" property.Flags indicating how to handle the "password" property. 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.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. 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).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). The FCoE controller mode; either "fabric" or "vn2vn". Since 1.34, NULL is the default and means "fabric". Before 1.34, NULL was rejected as invalid and the default was "fabric".The FCoE controller mode; either "fabric" or "vn2vn". Since 1.34, NULL is the default and means "fabric". Before 1.34, NULL was rejected as invalid and the default was "fabric". 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.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. 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).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). 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.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. 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).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). 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.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. 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 percents.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 percents. 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.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. 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).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). 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 percents.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 percents. 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).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). 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.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. 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.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. 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.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.Whether to automatically negotiate on pause frame of flow control mechanism defined by IEEE 802.3x standard.Whether RX pause should be enabled. Only valid when automatic negotiation is disabledWhether TX pause should be enabled. Only valid when automatic negotiation is disabled 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.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. When TRUE, the settings such as APN, username, or password will default to values that match the network the modem will register to in the Mobile Broadband Provider database.When TRUE, the settings such as APN, username, or password will default to values that match the network the modem will register to in the Mobile Broadband Provider database. 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.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. When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made. If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames. 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.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. Legacy setting that used to help establishing PPP data sessions for GSM-based modems. Deprecated: 1Legacy setting that used to help establishing PPP data sessions for GSM-based modems. Deprecated: 1 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.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. Flags indicating how to handle the "password" property.Flags indicating how to handle the "password" property. 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.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. Flags indicating how to handle the "pin" property.Flags indicating how to handle the "pin" property. 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.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. 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 provisioned by the given operator.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 provisioned by the given operator. 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.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. 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).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). If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames. 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.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. 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".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". The IP-over-InfiniBand transport mode. Either "datagram" or "connected".The IP-over-InfiniBand transport mode. Either "datagram" or "connected". Array of IP addresses.A list of IPv4 addresses and their prefix length. Multiple addresses can be separated by comma. For example "192.168.1.5/24, 10.1.0.5/24". The addresses are listed in decreasing priority, meaning the first address will be the primary address. Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4. A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "ipv6-duid" uses the DUID from "ipv6.dhcp-duid" property as an RFC4361-compliant client identifier. As IAID it uses "ipv4.dhcp-iaid" and falls back to "ipv6.dhcp-iaid" if unset. The special value "duid" generates a RFC4361-compliant client identifier based on "ipv4.dhcp-iaid" and uses a DUID generated by hashing /etc/machine-id. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin.A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "ipv6-duid" uses the DUID from "ipv6.dhcp-duid" property as an RFC4361-compliant client identifier. As IAID it uses "ipv4.dhcp-iaid" and falls back to "ipv6.dhcp-iaid" if unset. The special value "duid" generates a RFC4361-compliant client identifier based on "ipv4.dhcp-iaid" and uses a DUID generated by hashing /etc/machine-id. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin. 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.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. 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.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. Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4). When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4). When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests. A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address. Array of servers from which DHCP offers must be rejected. This property is useful to avoid getting a lease from misconfigured or rogue servers. For DHCPv4, each element must be an IPv4 address, optionally followed by a slash and a prefix length (e.g. "192.168.122.0/24"). This property is currently not implemented for DHCPv6.Array of servers from which DHCP offers must be rejected. This property is useful to avoid getting a lease from misconfigured or rogue servers. For DHCPv4, each element must be an IPv4 address, optionally followed by a slash and a prefix length (e.g. "192.168.122.0/24"). This property is currently not implemented for DHCPv6. 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.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. A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity. The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Since 1.28The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Since 1.28 Array of IP addresses of DNS servers.Array of IP addresses of DNS servers. Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are "attempts", "debug", "edns0", "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", "single-request-reopen", "timeout", "trust-ad", "use-vc". The "trust-ad" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have "trust-ad" enabled. When using a caching DNS plugin (dnsmasq or systemd-resolved in NetworkManager.conf) then "edns0" and "trust-ad" are automatically added.Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are "attempts", "debug", "edns0", "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", "single-request-reopen", "timeout", "trust-ad", "use-vc". The "trust-ad" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have "trust-ad" enabled. When using a caching DNS plugin (dnsmasq or systemd-resolved in NetworkManager.conf) then "edns0" and "trust-ad" are automatically added. DNS servers priority. The relative priority for DNS servers specified by this setting. A lower numerical value is better (higher priority). Negative values have the special effect of excluding other configurations with a greater numerical priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. To avoid all DNS leaks, set the priority of the profile that should be used to the most negative value of all active connections profiles. Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices. When using dns=default, servers with higher priority will be on top of resolv.conf. To prioritize a given server over another one within the same connection, just specify them in the desired order. Note that commonly the resolver tries name servers in /etc/resolv.conf in the order listed, proceeding with the next server in the list on failure. See for example the "rotate" option of the dns-options setting. If there are any negative DNS priorities, then only name servers from the devices with that lowest priority will be considered. When using a DNS resolver that supports Conditional Forwarding or Split DNS (with dns=dnsmasq or dns=systemd-resolved settings), each connection is used to query domains in its search list. The search domains determine which name servers to ask, and the DNS priority is used to prioritize name servers based on the domain. Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually). When multiple connections specify the same domain, the one with the best priority (lowest numerical value) wins. If a sub domain is configured on another interface it will be accepted regardless the priority, unless parent domain on the other interface has a negative priority, which causes the sub domain to be shadowed. With Split DNS one can avoid undesired DNS leaks by properly configuring DNS priorities and the search domains, so that only name servers of the desired interface are configured.DNS servers priority. The relative priority for DNS servers specified by this setting. A lower numerical value is better (higher priority). Negative values have the special effect of excluding other configurations with a greater numerical priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. To avoid all DNS leaks, set the priority of the profile that should be used to the most negative value of all active connections profiles. Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices. When using dns=default, servers with higher priority will be on top of resolv.conf. To prioritize a given server over another one within the same connection, just specify them in the desired order. Note that commonly the resolver tries name servers in /etc/resolv.conf in the order listed, proceeding with the next server in the list on failure. See for example the "rotate" option of the dns-options setting. If there are any negative DNS priorities, then only name servers from the devices with that lowest priority will be considered. When using a DNS resolver that supports Conditional Forwarding or Split DNS (with dns=dnsmasq or dns=systemd-resolved settings), each connection is used to query domains in its search list. The search domains determine which name servers to ask, and the DNS priority is used to prioritize name servers based on the domain. Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually). When multiple connections specify the same domain, the one with the best priority (lowest numerical value) wins. If a sub domain is configured on another interface it will be accepted regardless the priority, unless parent domain on the other interface has a negative priority, which causes the sub domain to be shadowed. With Split DNS one can avoid undesired DNS leaks by properly configuring DNS priorities and the search domains, so that only name servers of the desired interface are configured. List of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names. When using a DNS plugin that supports Conditional Forwarding or Split DNS, then the search domains specify which name servers to query. This makes the behavior different from running with plain /etc/resolv.conf. For more information see also the dns-priority setting. When set on a profile that also enabled DHCP, the DNS search list received automatically (option 119 for DHCPv4 and option 24 for DHCPv6) gets merged with the manual list. This can be prevented by setting "ignore-auto-dns". Note that if no DNS searches are configured, the fallback will be derived from the domain from DHCP (option 15).List of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names. When using a DNS plugin that supports Conditional Forwarding or Split DNS, then the search domains specify which name servers to query. This makes the behavior different from running with plain /etc/resolv.conf. For more information see also the dns-priority setting. When set on a profile that also enabled DHCP, the DNS search list received automatically (option 119 for DHCPv4 and option 24 for DHCPv6) gets merged with the manual list. This can be prevented by setting "ignore-auto-dns". Note that if no DNS searches are configured, the fallback will be derived from the domain from DHCP (option 15). The gateway associated with this configuration. This is only meaningful if "addresses" is also set. Setting the gateway causes NetworkManager to configure a standard default route with the gateway as next hop. This is ignored if "never-default" is set. An alternative is to configure the default route explicitly with a manual route and /0 as prefix length. Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See "ip4-auto-default-route".The gateway associated with this configuration. This is only meaningful if "addresses" is also set. Setting the gateway causes NetworkManager to configure a standard default route with the gateway as next hop. This is ignored if "never-default" is set. An alternative is to configure the default route explicitly with a manual route and /0 as prefix length. Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See "ip4-auto-default-route". When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used.When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. 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.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. Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". Since 1.40Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". Since 1.40 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.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. IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "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. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "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. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared. 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.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. The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e.g. IPv4, one can ensure that even if IP6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active. Note that if "may-fail" is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout. A zero value means that no required timeout is present, -1 means the default value (either configuration ipvx.required-timeout override or zero).The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e.g. IPv4, one can ensure that even if IP6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active. Note that if "may-fail" is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout. A zero value means that no required timeout is present, -1 means the default value (either configuration ipvx.required-timeout override or zero). The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is chosen 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.The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is chosen 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. Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager. + The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Currently, this only applies to 802-1x authentication.The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Currently, this only applies to 802-1x authentication. 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 happens when the circumstances are suitable. That means for example that the device is currently managed and not active. Autoconnect thus never replaces or competes with an already active profile. Note that autoconnect is not implemented for VPN profiles. See "secondaries" as an alternative to automatically connect VPN profiles. If multiple profiles are ready to autoconnect on the same device, the one with the better "connection.autoconnect-priority" is chosen. If the priorities are equal, then the most recently connected profile is activated. If the profiles were not connected earlier or their "connection.timestamp" is identical, the choice is undefined. Depending on "connection.multi-connect", a profile can (auto)connect only once at a time or multiple times.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 happens when the circumstances are suitable. That means for example that the device is currently managed and not active. Autoconnect thus never replaces or competes with an already active profile. Note that autoconnect is not implemented for VPN profiles. See "secondaries" as an alternative to automatically connect VPN profiles. If multiple profiles are ready to autoconnect on the same device, the one with the better "connection.autoconnect-priority" is chosen. If the priorities are equal, then the most recently connected profile is activated. If the profiles were not connected earlier or their "connection.timestamp" is identical, the choice is undefined. Depending on "connection.multi-connect", a profile can (auto)connect only once at a time or multiple times. The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen. The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again.The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again. 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 properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. 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.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 properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. 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. Whether DNSOverTls (dns-over-tls) is enabled for the connection. DNSOverTls is a technology which uses TLS to encrypt dns traffic. The permitted values are: "yes" (2) use DNSOverTls and disabled fallback, "opportunistic" (1) use DNSOverTls but allow fallback to unencrypted resolution, "no" (0) don't ever use DNSOverTls. If unspecified "default" depends on the plugin used. Systemd-resolved uses global setting. This feature requires a plugin which supports DNSOverTls. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved.Whether DNSOverTls (dns-over-tls) is enabled for the connection. DNSOverTls is a technology which uses TLS to encrypt dns traffic. The permitted values are: "yes" (2) use DNSOverTls and disabled fallback, "opportunistic" (1) use DNSOverTls but allow fallback to unencrypted resolution, "no" (0) don't ever use DNSOverTls. If unspecified "default" depends on the plugin used. Systemd-resolved uses global setting. This feature requires a plugin which supports DNSOverTls. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved. If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping. A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G". 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.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. Whether LLDP is enabled for the connection.Whether LLDP is enabled for the connection. Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable LLMNR for the interface, "resolve" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "yes"). This feature requires a plugin which supports LLMNR. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved.Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable LLMNR for the interface, "resolve" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "yes"). This feature requires a plugin which supports LLMNR. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved. Interface name of the master device or UUID of the master connection.Interface name of the master device or UUID of the master connection. Whether mDNS is enabled for the connection. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable mDNS for the interface, "resolve" (1) do not register hostname but allow resolving of mDNS host names and "default" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "no"). This feature requires a plugin which supports mDNS. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved.Whether mDNS is enabled for the connection. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable mDNS for the interface, "resolve" (1) do not register hostname but allow resolving of mDNS host names and "default" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "no"). This feature requires a plugin which supports mDNS. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved. Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately. Whether to configure MPTCP endpoints and the address flags. If MPTCP is enabled in NetworkManager, it will configure the addresses of the interface as MPTCP endpoints. Note that IPv4 loopback addresses (127.0.0.0/8), IPv4 link local addresses (169.254.0.0/16), the IPv6 loopback address (::1), IPv6 link local addresses (fe80::/10), IPv6 unique local addresses (ULA, fc00::/7) and IPv6 privacy extension addresses (rfc3041, ipv6.ip6-privacy) will be excluded from being configured as endpoints. If "disabled" (0x1), MPTCP handling for the interface is disabled and no endpoints are registered. The "enabled" (0x2) flag means that MPTCP handling is enabled. This flag can also be implied from the presence of other flags. Even when enabled, MPTCP handling will by default still be disabled unless "/proc/sys/net/mptcp/enabled" sysctl is on. NetworkManager does not change the sysctl and this is up to the administrator or distribution. To configure endpoints even if the sysctl is disabled, "also-without-sysctl" (0x4) flag can be used. In that case, NetworkManager doesn't look at the sysctl and configures endpoints regardless. Even when enabled, NetworkManager will only configure MPTCP endpoints for a certain address family, if there is a unicast default route (0.0.0.0/0 or ::/0) in the main routing table. The flag "also-without-default-route" (0x8) can override that. When MPTCP handling is enabled then endpoints are configured with the specified address flags "signal" (0x10), "subflow" (0x20), "backup" (0x40), "fullmesh" (0x80). See ip-mptcp(8) manual for additional information about the flags. If the flags are zero (0x0), the global connection default from NetworkManager.conf is honored. If still unspecified, the fallback is "enabled,subflow". Note that this means that MPTCP is by default done depending on the "/proc/sys/net/mptcp/enabled" sysctl. NetworkManager does not change the MPTCP limits nor enable MPTCP via "/proc/sys/net/mptcp/enabled". That is a host configuration which the admin can change via sysctl and ip-mptcp. Strict reverse path filtering (rp_filter) breaks many MPTCP use cases, so when MPTCP handling for IPv4 addresses on the interface is enabled, NetworkManager would loosen the strict reverse path filtering (1) to the loose setting (2).Whether to configure MPTCP endpoints and the address flags. If MPTCP is enabled in NetworkManager, it will configure the addresses of the interface as MPTCP endpoints. Note that IPv4 loopback addresses (127.0.0.0/8), IPv4 link local addresses (169.254.0.0/16), the IPv6 loopback address (::1), IPv6 link local addresses (fe80::/10), IPv6 unique local addresses (ULA, fc00::/7) and IPv6 privacy extension addresses (rfc3041, ipv6.ip6-privacy) will be excluded from being configured as endpoints. If "disabled" (0x1), MPTCP handling for the interface is disabled and no endpoints are registered. The "enabled" (0x2) flag means that MPTCP handling is enabled. This flag can also be implied from the presence of other flags. Even when enabled, MPTCP handling will by default still be disabled unless "/proc/sys/net/mptcp/enabled" sysctl is on. NetworkManager does not change the sysctl and this is up to the administrator or distribution. To configure endpoints even if the sysctl is disabled, "also-without-sysctl" (0x4) flag can be used. In that case, NetworkManager doesn't look at the sysctl and configures endpoints regardless. Even when enabled, NetworkManager will only configure MPTCP endpoints for a certain address family, if there is a unicast default route (0.0.0.0/0 or ::/0) in the main routing table. The flag "also-without-default-route" (0x8) can override that. When MPTCP handling is enabled then endpoints are configured with the specified address flags "signal" (0x10), "subflow" (0x20), "backup" (0x40), "fullmesh" (0x80). See ip-mptcp(8) manual for additional information about the flags. If the flags are zero (0x0), the global connection default from NetworkManager.conf is honored. If still unspecified, the fallback is "enabled,subflow". Note that this means that MPTCP is by default done depending on the "/proc/sys/net/mptcp/enabled" sysctl. NetworkManager does not change the MPTCP limits nor enable MPTCP via "/proc/sys/net/mptcp/enabled". That is a host configuration which the admin can change via sysctl and ip-mptcp. Strict reverse path filtering (rp_filter) breaks many MPTCP use cases, so when MPTCP handling for IPv4 addresses on the interface is enabled, NetworkManager would loosen the strict reverse path filtering (1) to the loose setting (2). If configured, set to a Manufacturer Usage Description (MUD) URL that points to manufacturer-recommended network policies for IoT devices. It is transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL starting with "https://". The special value "none" is allowed to indicate that no MUD URL is used. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the ultimate default is "none".If configured, set to a Manufacturer Usage Description (MUD) URL that points to manufacturer-recommended network policies for IoT devices. It is transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL starting with "https://". The special value "none" is allowed to indicate that no MUD URL is used. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the ultimate default is "none". Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect.Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect. 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 users are allowed if and only if they are in this list. When this is not empty, the connection can be active only when one of the specified users is logged into an active session. 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.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 users are allowed if and only if they are in this list. When this is not empty, the connection can be active only when one of the specified users is logged into an active session. 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. 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.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. List of connection UUIDs that should be activated when the base connection itself is activated. Currently, only VPN connections are supported.List of connection UUIDs that should be activated when the base connection itself is activated. Currently, only VPN connections are supported. Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave. This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The per-host key is the identity of your machine and stored in /var/lib/NetworkManager/secret_key. See NetworkManager(8) manual about the secret-key and the host identity. The '$' character is treated special to perform dynamic substitutions at runtime. Currently, supported are "${CONNECTION}", "${DEVICE}", "${MAC}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that "${DEVICE}" corresponds to the interface name of the device and "${MAC}" is the permanent MAC address of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as "$$". For example, set it to "${CONNECTION}-${BOOT}-${DEVICE}" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to "${CONNECTION}" and uses a unique, fixed ID for the connection.This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The per-host key is the identity of your machine and stored in /var/lib/NetworkManager/secret_key. See NetworkManager(8) manual about the secret-key and the host identity. The '$' character is treated special to perform dynamic substitutions at runtime. Currently, supported are "${CONNECTION}", "${DEVICE}", "${MAC}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that "${DEVICE}" corresponds to the interface name of the device and "${MAC}" is the permanent MAC address of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as "$$". For example, set it to "${CONNECTION}-${BOOT}-${DEVICE}" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to "${CONNECTION}" and uses a unique, fixed ID for the connection. The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).The 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). 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).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). 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 "-").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 "-"). Time in milliseconds to wait for connection to be considered activated. The wait will start after the pre-up dispatcher event. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.Time in milliseconds to wait for connection to be considered activated. The wait will start after the pre-up dispatcher event. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time. Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service and nm-online to give the device a chance to appear. This works by waiting for the given timeout until a compatible device for the profile is available and managed. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service and nm-online to give the device a chance to appear. This works by waiting for the given timeout until a compatible device for the profile is available and managed. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time. The trust level of a the connection. Free form case-insensitive string (for example "Home", "Work", "Public"). NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.The 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. If given, specifies the parent interface name or parent connection UUID from which this 6LowPAN interface should be created.If given, specifies the parent interface name or parent connection UUID from which this 6LowPAN interface should be created. 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.List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed. Anonymous identity string for EAP authentication methods. Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.Anonymous identity string for EAP authentication methods. Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS. A timeout for the authentication. Zero means the global default; if the global default is not set, the authentication timeout is 25 seconds.A timeout for the authentication. Zero means the global default; if the global default is not set, the authentication timeout is 25 seconds. Contains the CA certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; three are currently supported: blob, path and pkcs#11 URL. When using the blob scheme 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. Note that enabling NMSetting8021x:system-ca-certs will override this setting to use the built-in path, if the built-in path is not a directory.Contains the CA certificate if used by the EAP method specified in the "eap" property. Certificate data is specified using a "scheme"; three are currently supported: blob, path and pkcs#11 URL. When using the blob scheme 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. Note that enabling NMSetting8021x:system-ca-certs will override this setting to use the built-in path, if the built-in path is not a directory. The password used to access the CA certificate stored in "ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.The password used to access the CA certificate stored in "ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login. Flags indicating how to handle the "ca-cert-password" property.Flags indicating how to handle the "ca-cert-password" property. 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. If NMSetting8021x:system-ca-certs is enabled and the built-in CA path is an existing directory, then this setting is ignored.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. If NMSetting8021x:system-ca-certs is enabled and the built-in CA path is an existing directory, then this setting is ignored. 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.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. The password used to access the client certificate stored in "client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.The password used to access the client certificate stored in "client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login. Flags indicating how to handle the "client-cert-password" property.Flags indicating how to handle the "client-cert-password" property. Constraint for server domain name. If set, this list of FQDNs is used as a 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 the same comparison. Multiple valid FQDNs can be passed as a ";" delimited list.Constraint for server domain name. If set, this list of FQDNs is used as a 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 the same comparison. Multiple valid FQDNs can be passed as a ";" delimited list. 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. Since version 1.24, multiple valid FQDNs can be passed as a ";" delimited list.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. Since version 1.24, multiple valid FQDNs can be passed as a ";" delimited list. 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.The allowed EAP method to be used when authenticating to the network with 802.1x. Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd", and "fast". Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations. Identity string for EAP authentication methods. Often the user's user or login name.Identity string for EAP authentication methods. Often the user's user or login name. Whether the 802.1X authentication is optional. If TRUE, the activation will continue even after a timeout or an authentication failure. Setting the property to TRUE is currently allowed only for Ethernet connections. If set to FALSE, the activation can continue only after a successful authentication.Whether the 802.1X authentication is optional. If TRUE, the activation will continue even after a timeout or an authentication failure. Setting the property to TRUE is currently allowed only for Ethernet connections. If set to FALSE, the activation can continue only after a successful authentication. UTF-8 encoded file path containing PAC for EAP-FAST.UTF-8 encoded file path containing PAC for EAP-FAST. UTF-8 encoded password used for EAP authentication methods. If both the "password" property and the "password-raw" property are specified, "password" is preferred.UTF-8 encoded password used for EAP authentication methods. If both the "password" property and the "password-raw" property are specified, "password" is preferred. Flags indicating how to handle the "password" property.Flags indicating how to handle the "password" property. 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 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. Flags indicating how to handle the "password-raw" property.Flags indicating how to handle the "password-raw" property. Specifies authentication flags to use in "phase 1" outer authentication using NMSetting8021xAuthFlags options. The individual TLS versions can be explicitly disabled. If a certain TLS disable flag is not set, it is up to the supplicant to allow or forbid it. The TLS options map to tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more details.Specifies authentication flags to use in "phase 1" outer authentication using NMSetting8021xAuthFlags options. The individual TLS versions can be explicitly disabled. If a certain TLS disable flag is not set, it is up to the supplicant to allow or forbid it. The TLS options map to tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more details. 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.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. 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.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. 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.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. 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.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. Specifies the allowed "phase 2" inner authentication method when an EAP method that uses an inner TLS tunnel is specified in the "eap" property. For TTLS this property selects one of the supported non-EAP inner methods: "pap", "chap", "mschap", "mschapv2" while "phase2-autheap" selects an EAP inner method. For PEAP this selects an inner EAP method, one of: "gtc", "otp", "md5" and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details. Both "phase2-auth" and "phase2-autheap" cannot be specified.Specifies the allowed "phase 2" inner authentication method when an EAP method that uses an inner TLS tunnel is specified in the "eap" property. For TTLS this property selects one of the supported non-EAP inner methods: "pap", "chap", "mschap", "mschapv2" while "phase2-autheap" selects an EAP inner method. For PEAP this selects an inner EAP method, one of: "gtc", "otp", "md5" and "tls". Each "phase 2" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details. Both "phase2-auth" and "phase2-autheap" cannot be specified. Specifies the allowed "phase 2" inner EAP-based authentication method when TTLS 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.Specifies the allowed "phase 2" inner EAP-based authentication method when TTLS 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. 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"; three are currently supported: blob, path and pkcs#11 URL. When using the blob scheme 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. Note that enabling NMSetting8021x:system-ca-certs will override this setting to use the built-in path, if the built-in path is not a directory.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"; three are currently supported: blob, path and pkcs#11 URL. When using the blob scheme 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. Note that enabling NMSetting8021x:system-ca-certs will override this setting to use the built-in path, if the built-in path is not a directory. The password used to access the "phase2" CA certificate stored in "phase2-ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.The password used to access the "phase2" CA certificate stored in "phase2-ca-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login. Flags indicating how to handle the "phase2-ca-cert-password" property.Flags indicating how to handle the "phase2-ca-cert-password" property. 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. If NMSetting8021x:system-ca-certs is enabled and the built-in CA path is an existing directory, then this setting is ignored.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. If NMSetting8021x:system-ca-certs is enabled and the built-in CA path is an existing directory, then this setting is ignored. 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.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. The password used to access the "phase2" client certificate stored in "phase2-client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.The password used to access the "phase2" client certificate stored in "phase2-client-cert" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login. Flags indicating how to handle the "phase2-client-cert-password" property.Flags indicating how to handle the "phase2-client-cert-password" property. Constraint for server domain name. If set, this list of FQDNs is used as a 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 the same comparison. Multiple valid FQDNs can be passed as a ";" delimited list.Constraint for server domain name. If set, this list of FQDNs is used as a 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 the same comparison. Multiple valid FQDNs can be passed as a ";" delimited list. 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. Since version 1.24, multiple valid FQDNs can be passed as a ";" delimited list.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. Since version 1.24, multiple valid FQDNs can be passed as a ";" delimited list. Contains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate.Contains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. 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.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. Flags indicating how to handle the "phase2-private-key-password" property.Flags indicating how to handle the "phase2-private-key-password" property. 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.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 used for EAP authentication methods.PIN used for EAP authentication methods. Flags indicating how to handle the "pin" property.Flags indicating how to handle the "pin" property. Contains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users. Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data.Contains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users. Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data. 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.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. Flags indicating how to handle the "private-key-password" property.Flags indicating how to handle the "private-key-password" property. 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.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. 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).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). Encapsulation of ADSL connection. Can be "vcmux" or "llc".Encapsulation of ADSL connection. Can be "vcmux" or "llc". Password used to authenticate with the ADSL service.Password used to authenticate with the ADSL service. Flags indicating how to handle the "password" property.Flags indicating how to handle the "password" property. ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm".ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm". Username used to authenticate with the ADSL service.Username used to authenticate with the ADSL service. VCI of ADSL connectionVCI of ADSL connection VPI of ADSL connectionVPI of ADSL connection The Bluetooth address of the device.The Bluetooth address of the device. Either "dun" for Dial-Up Networking connections or "panu" for Personal Area Networking connections to devices supporting the NAP profile.Either "dun" for Dial-Up Networking connections or "panu" for Personal Area Networking connections to devices supporting the NAP profile. 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]).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]). The Ethernet MAC address aging time, in seconds.The Ethernet MAC address aging time, in seconds. The Spanning Tree Protocol (STP) forwarding delay, in seconds.The Spanning Tree Protocol (STP) forwarding delay, in seconds. If specified, The MAC address of the multicast group this bridge uses for STP. The address must be a link-local address in standard Ethernet MAC address format, ie an address of the form 01:80:C2:00:00:0X, with X in [0, 4..F]. If not specified the default value is 01:80:C2:00:00:00.If specified, The MAC address of the multicast group this bridge uses for STP. The address must be a link-local address in standard Ethernet MAC address format, ie an address of the form 01:80:C2:00:00:0X, with X in [0, 4..F]. If not specified the default value is 01:80:C2:00:00:00. A mask of group addresses to forward. Usually, group addresses in the range from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to standards. This property is a mask of 16 bits, each corresponding to a group address in that range that must be forwarded. The mask can't have bits 0, 1 or 2 set because they are used for STP, MAC pause frames and LACP.A mask of group addresses to forward. Usually, group addresses in the range from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to standards. This property is a mask of 16 bits, each corresponding to a group address in that range that must be forwarded. The mask can't have bits 0, 1 or 2 set because they are used for STP, MAC pause frames and LACP. The Spanning Tree Protocol (STP) hello time, in seconds.The Spanning Tree Protocol (STP) hello time, in seconds. If specified, the MAC address of bridge. When creating a new bridge, this MAC address will be set. If this field is left unspecified, the "ethernet.cloned-mac-address" is referred instead to generate the initial MAC address. Note that setting "ethernet.cloned-mac-address" anyway overwrites the MAC address of the bridge later while activating the bridge. Hence, this property is deprecated. Deprecated: 1If specified, the MAC address of bridge. When creating a new bridge, this MAC address will be set. If this field is left unspecified, the "ethernet.cloned-mac-address" is referred instead to generate the initial MAC address. Note that setting "ethernet.cloned-mac-address" anyway overwrites the MAC address of the bridge later while activating the bridge. Hence, this property is deprecated. Deprecated: 1 The Spanning Tree Protocol (STP) maximum message age, in seconds.The Spanning Tree Protocol (STP) maximum message age, in seconds. Set maximum size of multicast hash table (value must be a power of 2).Set maximum size of multicast hash table (value must be a power of 2). Set the number of queries the bridge will send before stopping forwarding a multicast group after a "leave" message has been received.Set the number of queries the bridge will send before stopping forwarding a multicast group after a "leave" message has been received. Set interval (in deciseconds) between queries to find remaining members of a group, after a "leave" message is received.Set interval (in deciseconds) between queries to find remaining members of a group, after a "leave" message is received. Set delay (in deciseconds) after which the bridge will leave a group, if no membership reports for this group are received.Set delay (in deciseconds) after which the bridge will leave a group, if no membership reports for this group are received. Enable or disable sending of multicast queries by the bridge. If not specified the option is disabled.Enable or disable sending of multicast queries by the bridge. If not specified the option is disabled. If no queries are seen after this delay (in deciseconds) has passed, the bridge will start to send its own queries.If no queries are seen after this delay (in deciseconds) has passed, the bridge will start to send its own queries. Interval (in deciseconds) between queries sent by the bridge after the end of the startup phase.Interval (in deciseconds) between queries sent by the bridge after the end of the startup phase. Set the Max Response Time/Max Response Delay (in deciseconds) for IGMP/MLD queries sent by the bridge.Set the Max Response Time/Max Response Delay (in deciseconds) for IGMP/MLD queries sent by the bridge. If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used.If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used. Sets bridge's multicast router. Multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled' to which kernel assigns the numbers 1, 0, and 2, respectively. If not specified the default value is 'auto' (1).Sets bridge's multicast router. Multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled' to which kernel assigns the numbers 1, 0, and 2, respectively. If not specified the default value is 'auto' (1). 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.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. Set the number of IGMP queries to send during startup phase.Set the number of IGMP queries to send during startup phase. Sets the time (in deciseconds) between queries sent out at startup to determine membership information.Sets the time (in deciseconds) between queries sent out at startup to determine membership information. Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower values are "better"; the lowest priority bridge will be elected the root bridge.Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower values are "better"; the lowest priority bridge will be elected the root bridge. Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.Controls whether Spanning Tree Protocol (STP) is enabled for this bridge. The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames.The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames. Control whether VLAN filtering is enabled on the bridge.Control whether VLAN filtering is enabled on the bridge. If specified, the protocol used for VLAN filtering. Supported values are: '802.1Q', '802.1ad'. If not specified the default value is '802.1Q'.If specified, the protocol used for VLAN filtering. Supported values are: '802.1Q', '802.1ad'. If not specified the default value is '802.1Q'. Controls whether per-VLAN stats accounting is enabled.Controls whether per-VLAN stats accounting is enabled. Array of bridge VLAN objects. In addition to the VLANs specified here, the bridge will also have the default-pvid VLAN configured by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.Array of bridge VLAN objects. In addition to the VLANs specified here, the bridge will also have the default-pvid VLAN configured by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash. Enables or disables "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on.Enables or disables "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on. The Spanning Tree Protocol (STP) port cost for destinations via this port.The Spanning Tree Protocol (STP) port cost for destinations via this port. The Spanning Tree Protocol (STP) priority of this bridge port.The Spanning Tree Protocol (STP) priority of this bridge port. Array of bridge VLAN objects. In addition to the VLANs specified here, the port will also have the default-pvid VLAN configured on the bridge by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.Array of bridge VLAN objects. In addition to the VLANs specified here, the port will also have the default-pvid VLAN configured on the bridge by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash. If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames. 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.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. 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.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. Flags indicating how to handle the "password" property.Flags indicating how to handle the "password" property. 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.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. 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).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). The FCoE controller mode; either "fabric" or "vn2vn". Since 1.34, NULL is the default and means "fabric". Before 1.34, NULL was rejected as invalid and the default was "fabric".The FCoE controller mode; either "fabric" or "vn2vn". Since 1.34, NULL is the default and means "fabric". Before 1.34, NULL was rejected as invalid and the default was "fabric". 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.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. 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).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). 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.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. 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).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). 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.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. 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 percents.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 percents. 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.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. 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).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). 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 percents.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 percents. 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).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). 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.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. 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.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. 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.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.Whether to automatically negotiate on pause frame of flow control mechanism defined by IEEE 802.3x standard.Whether RX pause should be enabled. Only valid when automatic negotiation is disabledWhether TX pause should be enabled. Only valid when automatic negotiation is disabled 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.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. When TRUE, the settings such as APN, username, or password will default to values that match the network the modem will register to in the Mobile Broadband Provider database.When TRUE, the settings such as APN, username, or password will default to values that match the network the modem will register to in the Mobile Broadband Provider database. 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.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. When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made. If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames. 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.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. Legacy setting that used to help establishing PPP data sessions for GSM-based modems. Deprecated: 1Legacy setting that used to help establishing PPP data sessions for GSM-based modems. Deprecated: 1 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.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. Flags indicating how to handle the "password" property.Flags indicating how to handle the "password" property. 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.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. Flags indicating how to handle the "pin" property.Flags indicating how to handle the "pin" property. 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.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. 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 provisioned by the given operator.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 provisioned by the given operator. 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.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. 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).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). If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames. 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.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. 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".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". The IP-over-InfiniBand transport mode. Either "datagram" or "connected".The IP-over-InfiniBand transport mode. Either "datagram" or "connected". Array of IP addresses.A list of IPv4 addresses and their prefix length. Multiple addresses can be separated by comma. For example "192.168.1.5/24, 10.1.0.5/24". The addresses are listed in decreasing priority, meaning the first address will be the primary address. Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4. A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "ipv6-duid" uses the DUID from "ipv6.dhcp-duid" property as an RFC4361-compliant client identifier. As IAID it uses "ipv4.dhcp-iaid" and falls back to "ipv6.dhcp-iaid" if unset. The special value "duid" generates a RFC4361-compliant client identifier based on "ipv4.dhcp-iaid" and uses a DUID generated by hashing /etc/machine-id. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin.A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "ipv6-duid" uses the DUID from "ipv6.dhcp-duid" property as an RFC4361-compliant client identifier. As IAID it uses "ipv4.dhcp-iaid" and falls back to "ipv6.dhcp-iaid" if unset. The special value "duid" generates a RFC4361-compliant client identifier based on "ipv4.dhcp-iaid" and uses a DUID generated by hashing /etc/machine-id. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin. 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.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. 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.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. Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4). When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4). When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests. A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address. Array of servers from which DHCP offers must be rejected. This property is useful to avoid getting a lease from misconfigured or rogue servers. For DHCPv4, each element must be an IPv4 address, optionally followed by a slash and a prefix length (e.g. "192.168.122.0/24"). This property is currently not implemented for DHCPv6.Array of servers from which DHCP offers must be rejected. This property is useful to avoid getting a lease from misconfigured or rogue servers. For DHCPv4, each element must be an IPv4 address, optionally followed by a slash and a prefix length (e.g. "192.168.122.0/24"). This property is currently not implemented for DHCPv6. 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.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. A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity. The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server.The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Array of IP addresses of DNS servers.Array of IP addresses of DNS servers. Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are "attempts", "debug", "edns0", "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", "single-request-reopen", "timeout", "trust-ad", "use-vc". The "trust-ad" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have "trust-ad" enabled. When using a caching DNS plugin (dnsmasq or systemd-resolved in NetworkManager.conf) then "edns0" and "trust-ad" are automatically added.Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are "attempts", "debug", "edns0", "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", "single-request-reopen", "timeout", "trust-ad", "use-vc". The "trust-ad" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have "trust-ad" enabled. When using a caching DNS plugin (dnsmasq or systemd-resolved in NetworkManager.conf) then "edns0" and "trust-ad" are automatically added. DNS servers priority. The relative priority for DNS servers specified by this setting. A lower numerical value is better (higher priority). Negative values have the special effect of excluding other configurations with a greater numerical priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. To avoid all DNS leaks, set the priority of the profile that should be used to the most negative value of all active connections profiles. Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices. When using dns=default, servers with higher priority will be on top of resolv.conf. To prioritize a given server over another one within the same connection, just specify them in the desired order. Note that commonly the resolver tries name servers in /etc/resolv.conf in the order listed, proceeding with the next server in the list on failure. See for example the "rotate" option of the dns-options setting. If there are any negative DNS priorities, then only name servers from the devices with that lowest priority will be considered. When using a DNS resolver that supports Conditional Forwarding or Split DNS (with dns=dnsmasq or dns=systemd-resolved settings), each connection is used to query domains in its search list. The search domains determine which name servers to ask, and the DNS priority is used to prioritize name servers based on the domain. Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually). When multiple connections specify the same domain, the one with the best priority (lowest numerical value) wins. If a sub domain is configured on another interface it will be accepted regardless the priority, unless parent domain on the other interface has a negative priority, which causes the sub domain to be shadowed. With Split DNS one can avoid undesired DNS leaks by properly configuring DNS priorities and the search domains, so that only name servers of the desired interface are configured.DNS servers priority. The relative priority for DNS servers specified by this setting. A lower numerical value is better (higher priority). Negative values have the special effect of excluding other configurations with a greater numerical priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. To avoid all DNS leaks, set the priority of the profile that should be used to the most negative value of all active connections profiles. Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices. When using dns=default, servers with higher priority will be on top of resolv.conf. To prioritize a given server over another one within the same connection, just specify them in the desired order. Note that commonly the resolver tries name servers in /etc/resolv.conf in the order listed, proceeding with the next server in the list on failure. See for example the "rotate" option of the dns-options setting. If there are any negative DNS priorities, then only name servers from the devices with that lowest priority will be considered. When using a DNS resolver that supports Conditional Forwarding or Split DNS (with dns=dnsmasq or dns=systemd-resolved settings), each connection is used to query domains in its search list. The search domains determine which name servers to ask, and the DNS priority is used to prioritize name servers based on the domain. Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually). When multiple connections specify the same domain, the one with the best priority (lowest numerical value) wins. If a sub domain is configured on another interface it will be accepted regardless the priority, unless parent domain on the other interface has a negative priority, which causes the sub domain to be shadowed. With Split DNS one can avoid undesired DNS leaks by properly configuring DNS priorities and the search domains, so that only name servers of the desired interface are configured. List of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names. When using a DNS plugin that supports Conditional Forwarding or Split DNS, then the search domains specify which name servers to query. This makes the behavior different from running with plain /etc/resolv.conf. For more information see also the dns-priority setting. When set on a profile that also enabled DHCP, the DNS search list received automatically (option 119 for DHCPv4 and option 24 for DHCPv6) gets merged with the manual list. This can be prevented by setting "ignore-auto-dns". Note that if no DNS searches are configured, the fallback will be derived from the domain from DHCP (option 15).List of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names. When using a DNS plugin that supports Conditional Forwarding or Split DNS, then the search domains specify which name servers to query. This makes the behavior different from running with plain /etc/resolv.conf. For more information see also the dns-priority setting. When set on a profile that also enabled DHCP, the DNS search list received automatically (option 119 for DHCPv4 and option 24 for DHCPv6) gets merged with the manual list. This can be prevented by setting "ignore-auto-dns". Note that if no DNS searches are configured, the fallback will be derived from the domain from DHCP (option 15). The gateway associated with this configuration. This is only meaningful if "addresses" is also set. Setting the gateway causes NetworkManager to configure a standard default route with the gateway as next hop. This is ignored if "never-default" is set. An alternative is to configure the default route explicitly with a manual route and /0 as prefix length. Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See "ip4-auto-default-route".The gateway associated with this configuration. This is only meaningful if "addresses" is also set. Setting the gateway causes NetworkManager to configure a standard default route with the gateway as next hop. This is ignored if "never-default" is set. An alternative is to configure the default route explicitly with a manual route and /0 as prefix length. Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See "ip4-auto-default-route". When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used.When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. 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.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. Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default".Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". 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.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. IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "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. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "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. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared. 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.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. The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e.g. IPv4, one can ensure that even if IP6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active. Note that if "may-fail" is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout. A zero value means that no required timeout is present, -1 means the default value (either configuration ipvx.required-timeout override or zero).The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e.g. IPv4, one can ensure that even if IP6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active. Note that if "may-fail" is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout. A zero value means that no required timeout is present, -1 means the default value (either configuration ipvx.required-timeout override or zero). The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is chosen 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.The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is chosen 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. Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager. A list of IPv4 destination addresses, prefix length, optional IPv4 next hop addresses, optional route metric, optional attribute. The valid syntax is: diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index 2167417a..fe1899e0 100644 --- a/man/nm-settings-ifcfg-rh.5 +++ b/man/nm-settings-ifcfg-rh.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-ifcfg-rh .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.40\&.2" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.40\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index 51b035dd..15e7698d 100644 --- a/man/nm-settings-ifcfg-rh.xml +++ b/man/nm-settings-ifcfg-rh.xml @@ -1,6 +1,6 @@ -nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.40.2nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription +nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.40.4nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index d150e877..d57dd77f 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.40\&.2" "Configuration" +.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.40\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index 9aed9dd8..77d52369 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ -nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.40.2nm-settings-keyfileDescription of keyfile settings pluginDescription +nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.40.4nm-settings-keyfileDescription of keyfile settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings-nmcli.5 b/man/nm-settings-nmcli.5 index 6638379f..5ae4274f 100644 --- a/man/nm-settings-nmcli.5 +++ b/man/nm-settings-nmcli.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.40\&.2" "Configuration" +.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.40\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1853,8 +1853,6 @@ Format: int32 .RS 4 The Vendor Class Identifier DHCP option (60)\&. Special characters in the data string may be escaped using C\-style escapes, nevertheless this property cannot contain nul bytes\&. If the per\-profile value is unspecified (the default), a global connection default gets consulted\&. If still unspecified, the DHCP option is not sent to the server\&. .sp -Since 1\&.28 -.sp Format: string .RE .PP @@ -1945,8 +1943,6 @@ Enable and disable the IPv4 link\-local configuration independently of the ipv4\ .sp When set to "auto", the value is dependent on "ipv4\&.method"\&. When set to "default", it honors the global connection default, before falling back to "auto"\&. Note that if "ipv4\&.method" is "disabled", then link local addressing is always disabled too\&. The default is "default"\&. .sp -Since 1\&.40 -.sp Format: int32 .RE .PP diff --git a/man/nm-settings-nmcli.xml b/man/nm-settings-nmcli.xml index e2d6c5e7..083bfb4a 100644 --- a/man/nm-settings-nmcli.xml +++ b/man/nm-settings-nmcli.xml @@ -1,6 +1,6 @@ -nm-settings-nmcliNetworkManager developersnm-settings-nmcli5NetworkManagerConfiguration1.40.2nm-settings-nmcliDescription of settings and properties of NetworkManager connection profiles for nmcliDescription +nm-settings-nmcliNetworkManager developersnm-settings-nmcli5NetworkManagerConfiguration1.40.4nm-settings-nmcliDescription of settings and properties of NetworkManager connection profiles for nmcliDescription NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will @@ -261,7 +261,7 @@ Format: string Array of servers from which DHCP offers must be rejected. This property is useful to avoid getting a lease from misconfigured or rogue servers. For DHCPv4, each element must be an IPv4 address, optionally followed by a slash and a prefix length (e.g. "192.168.122.0/24"). This property is currently not implemented for DHCPv6. Format: array of string 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. Format: boolean A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity. - Format: int32 The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Since 1.28 + Format: int32 The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Format: string Array of IP addresses of DNS servers. Format: array of uint32 Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are "attempts", "debug", "edns0", "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", "single-request-reopen", "timeout", "trust-ad", "use-vc". The "trust-ad" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have "trust-ad" enabled. When using a caching DNS plugin (dnsmasq or systemd-resolved in NetworkManager.conf) then "edns0" and "trust-ad" are automatically added. Format: array of string DNS servers priority. The relative priority for DNS servers specified by this setting. A lower numerical value is better (higher priority). Negative values have the special effect of excluding other configurations with a greater numerical priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. To avoid all DNS leaks, set the priority of the profile that should be used to the most negative value of all active connections profiles. Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices. When using dns=default, servers with higher priority will be on top of resolv.conf. To prioritize a given server over another one within the same connection, just specify them in the desired order. Note that commonly the resolver tries name servers in /etc/resolv.conf in the order listed, proceeding with the next server in the list on failure. See for example the "rotate" option of the dns-options setting. If there are any negative DNS priorities, then only name servers from the devices with that lowest priority will be considered. When using a DNS resolver that supports Conditional Forwarding or Split DNS (with dns=dnsmasq or dns=systemd-resolved settings), each connection is used to query domains in its search list. The search domains determine which name servers to ask, and the DNS priority is used to prioritize name servers based on the domain. Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually). When multiple connections specify the same domain, the one with the best priority (lowest numerical value) wins. If a sub domain is configured on another interface it will be accepted regardless the priority, unless parent domain on the other interface has a negative priority, which causes the sub domain to be shadowed. With Split DNS one can avoid undesired DNS leaks by properly configuring DNS priorities and the search domains, so that only name servers of the desired interface are configured. @@ -270,7 +270,7 @@ Alias: gw4 The gateway associated with this configuration. This is only meaningful if "addresses" is also set. Setting the gateway causes NetworkManager to configure a standard default route with the gateway as next hop. This is ignored if "never-default" is set. An alternative is to configure the default route explicitly with a manual route and /0 as prefix length. Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See "ip4-auto-default-route". Format: string When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. Format: boolean 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. - Format: boolean Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". Since 1.40 + Format: boolean Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". Format: int32 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. Format: boolean IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "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. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared. Format: string 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. diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7 index dc701849..b871f32b 100644 --- a/man/nmcli-examples.7 +++ b/man/nmcli-examples.7 @@ -2,12 +2,12 @@ .\" Title: nmcli-examples .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: Examples -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.40\&.2" "Examples" +.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.40\&.4" "Examples" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmcli.1 b/man/nmcli.1 index 289f66a8..2d7e5c6f 100644 --- a/man/nmcli.1 +++ b/man/nmcli.1 @@ -2,12 +2,12 @@ .\" Title: nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NMCLI" "1" "" "NetworkManager 1\&.40\&.2" "General Commands Manual" +.TH "NMCLI" "1" "" "NetworkManager 1\&.40\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmtui.1 b/man/nmtui.1 index 546f4d21..fca2d6e8 100644 --- a/man/nmtui.1 +++ b/man/nmtui.1 @@ -2,12 +2,12 @@ .\" Title: nmtui .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/18/2022 +.\" Date: 11/18/2022 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.40.2 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NMTUI" "1" "" "NetworkManager 1\&.40\&.2" "General Commands Manual" +.TH "NMTUI" "1" "" "NetworkManager 1\&.40\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/meson.build b/meson.build index 3b90e8e0..246359a5 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project( # - add corresponding NM_VERSION_x_y_z macros in # "src/libnm-core-public/nm-version-macros.h.in" # - update number in configure.ac - version: '1.40.2', + version: '1.40.4', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', diff --git a/po/NetworkManager.pot b/po/NetworkManager.pot index 263569a1..b234313b 100644 --- a/po/NetworkManager.pot +++ b/po/NetworkManager.pot @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: NetworkManager 1.40.2\n" +"Project-Id-Version: NetworkManager 1.40.4\n" "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/" "NetworkManager/issues\n" -"POT-Creation-Date: 2022-10-18 10:10+0200\n" +"POT-Creation-Date: 2022-11-18 10:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -248,16 +248,16 @@ msgstr "" msgid "Wired connection %d" msgstr "" -#: src/core/devices/nm-device-ethernet.c:1628 +#: src/core/devices/nm-device-ethernet.c:1638 #: src/libnmc-setting/nm-meta-setting-desc.c:8303 msgid "Veth connection" msgstr "" -#: src/core/devices/nm-device-ethernet.c:1686 +#: src/core/devices/nm-device-ethernet.c:1696 msgid "PPPoE connection" msgstr "" -#: src/core/devices/nm-device-ethernet.c:1686 +#: src/core/devices/nm-device-ethernet.c:1696 msgid "Wired connection" msgstr "" @@ -610,23 +610,23 @@ msgstr "" #: src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5594 #: src/libnm-client-impl/nm-device.c:1779 -#: src/libnm-core-impl/nm-connection.c:3172 src/nmtui/nm-editor-utils.c:196 +#: src/libnm-core-impl/nm-connection.c:3174 src/nmtui/nm-editor-utils.c:196 msgid "Bond" msgstr "" #: src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5665 #: src/libnm-client-impl/nm-device.c:1781 -#: src/libnm-core-impl/nm-connection.c:3174 src/nmtui/nm-editor-utils.c:214 +#: src/libnm-core-impl/nm-connection.c:3176 src/nmtui/nm-editor-utils.c:214 msgid "Team" msgstr "" #: src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:6002 #: src/libnm-client-impl/nm-device.c:1783 -#: src/libnm-core-impl/nm-connection.c:3176 src/nmtui/nm-editor-utils.c:205 +#: src/libnm-core-impl/nm-connection.c:3178 src/nmtui/nm-editor-utils.c:205 msgid "Bridge" msgstr "" -#: src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:8801 +#: src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:8955 #: src/libnm-core-impl/nm-team-utils.c:2391 msgid "invalid json" msgstr "" @@ -854,7 +854,7 @@ msgstr "" msgid "The device is lacking WPA2/RSN capabilities required by the connection." msgstr "" -#: src/libnm-client-impl/nm-device-wpan.c:57 +#: src/libnm-client-impl/nm-device-wpan.c:38 msgid "The connection was not a wpan connection." msgstr "" @@ -895,12 +895,12 @@ msgid "Mobile Broadband" msgstr "" #: src/libnm-client-impl/nm-device.c:1777 -#: src/libnm-core-impl/nm-connection.c:3180 src/nmtui/nm-editor-utils.c:169 +#: src/libnm-core-impl/nm-connection.c:3182 src/nmtui/nm-editor-utils.c:169 msgid "InfiniBand" msgstr "" #: src/libnm-client-impl/nm-device.c:1785 -#: src/libnm-core-impl/nm-connection.c:3178 src/nmtui/nm-editor-utils.c:223 +#: src/libnm-core-impl/nm-connection.c:3180 src/nmtui/nm-editor-utils.c:223 #: src/nmtui/nmt-page-vlan.c:57 msgid "VLAN" msgstr "" @@ -950,7 +950,7 @@ msgid "6LoWPAN" msgstr "" #: src/libnm-client-impl/nm-device.c:1809 -#: src/libnm-core-impl/nm-connection.c:3186 src/nmtui/nm-editor-utils.c:263 +#: src/libnm-core-impl/nm-connection.c:3188 src/nmtui/nm-editor-utils.c:263 #: src/nmtui/nmt-page-wireguard.c:57 msgid "WireGuard" msgstr "" @@ -1008,8 +1008,8 @@ msgstr "" msgid "registration failed" msgstr "" -#: src/libnm-client-impl/nm-vpn-plugin-old.c:817 -#: src/libnm-client-impl/nm-vpn-service-plugin.c:1025 +#: src/libnm-client-impl/nm-vpn-plugin-old.c:807 +#: src/libnm-client-impl/nm-vpn-service-plugin.c:1055 msgid "No service name specified" msgstr "" @@ -1069,60 +1069,60 @@ msgstr "" msgid "property cannot contain any nul bytes" msgstr "" -#: src/libnm-core-impl/nm-connection.c:455 +#: src/libnm-core-impl/nm-connection.c:457 msgid "wrong type; should be a list of strings." msgstr "" -#: src/libnm-core-impl/nm-connection.c:544 +#: src/libnm-core-impl/nm-connection.c:546 msgid "unknown setting name" msgstr "" -#: src/libnm-core-impl/nm-connection.c:556 +#: src/libnm-core-impl/nm-connection.c:558 msgid "duplicate setting name" msgstr "" -#: src/libnm-core-impl/nm-connection.c:957 +#: src/libnm-core-impl/nm-connection.c:959 msgid "has an invalid UUID" msgstr "" -#: src/libnm-core-impl/nm-connection.c:962 +#: src/libnm-core-impl/nm-connection.c:964 msgid "has a UUID that requires normalization" msgstr "" -#: src/libnm-core-impl/nm-connection.c:967 +#: src/libnm-core-impl/nm-connection.c:969 msgid "has duplicate UUIDs" msgstr "" -#: src/libnm-core-impl/nm-connection.c:1805 +#: src/libnm-core-impl/nm-connection.c:1807 msgid "setting not found" msgstr "" -#: src/libnm-core-impl/nm-connection.c:1859 -#: src/libnm-core-impl/nm-connection.c:1884 -#: src/libnm-core-impl/nm-connection.c:1909 +#: src/libnm-core-impl/nm-connection.c:1861 +#: src/libnm-core-impl/nm-connection.c:1886 +#: src/libnm-core-impl/nm-connection.c:1911 msgid "setting is required for non-slave connections" msgstr "" -#: src/libnm-core-impl/nm-connection.c:1872 -#: src/libnm-core-impl/nm-connection.c:1897 -#: src/libnm-core-impl/nm-connection.c:1922 +#: src/libnm-core-impl/nm-connection.c:1874 +#: src/libnm-core-impl/nm-connection.c:1899 +#: src/libnm-core-impl/nm-connection.c:1924 msgid "setting not allowed in slave connection" msgstr "" -#: src/libnm-core-impl/nm-connection.c:2032 +#: src/libnm-core-impl/nm-connection.c:2034 msgid "Unexpected failure to normalize the connection" msgstr "" -#: src/libnm-core-impl/nm-connection.c:2093 +#: src/libnm-core-impl/nm-connection.c:2095 msgid "Unexpected failure to verify the connection" msgstr "" -#: src/libnm-core-impl/nm-connection.c:2130 +#: src/libnm-core-impl/nm-connection.c:2132 #, c-format msgid "unexpected uuid %s instead of %s" msgstr "" -#: src/libnm-core-impl/nm-connection.c:3031 +#: src/libnm-core-impl/nm-connection.c:3033 #: src/libnm-core-impl/nm-setting-8021x.c:2607 #: src/libnm-core-impl/nm-setting-8021x.c:2644 #: src/libnm-core-impl/nm-setting-8021x.c:2662 @@ -1135,12 +1135,12 @@ msgstr "" #: src/libnm-core-impl/nm-setting-connection.c:1149 #: src/libnm-core-impl/nm-setting-connection.c:1187 #: src/libnm-core-impl/nm-setting-connection.c:1516 -#: src/libnm-core-impl/nm-setting-ip-config.c:5423 +#: src/libnm-core-impl/nm-setting-ip-config.c:5427 #: src/libnm-core-impl/nm-setting-ip-tunnel.c:387 #: src/libnm-core-impl/nm-setting-olpc-mesh.c:99 #: src/libnm-core-impl/nm-setting-ovs-patch.c:75 #: src/libnm-core-impl/nm-setting-pppoe.c:146 -#: src/libnm-core-impl/nm-setting-vpn.c:546 +#: src/libnm-core-impl/nm-setting-vpn.c:548 #: src/libnm-core-impl/nm-setting-wifi-p2p.c:119 #: src/libnm-core-impl/nm-setting-wimax.c:108 #: src/libnm-core-impl/nm-setting-wireless-security.c:916 @@ -1148,11 +1148,11 @@ msgstr "" msgid "property is missing" msgstr "" -#: src/libnm-core-impl/nm-connection.c:3184 +#: src/libnm-core-impl/nm-connection.c:3186 msgid "IP Tunnel" msgstr "" -#: src/libnm-core-impl/nm-connection.c:3188 +#: src/libnm-core-impl/nm-connection.c:3190 msgid "TUN/TAP" msgstr "" @@ -1230,8 +1230,8 @@ msgid "missing prefix length for %s '%s', defaulting to %d" msgstr "" #: src/libnm-core-impl/nm-keyfile.c:1051 -#: src/libnm-core-impl/nm-setting-ovs-external-ids.c:320 -#: src/libnm-core-impl/nm-setting-user.c:364 +#: src/libnm-core-impl/nm-setting-ovs-external-ids.c:322 +#: src/libnm-core-impl/nm-setting-user.c:368 #, c-format msgid "invalid value for \"%s\": %s" msgstr "" @@ -1397,19 +1397,19 @@ msgstr "" msgid "unsupported option \"%s.%s\" of variant type %s" msgstr "" -#: src/libnm-core-impl/nm-setting-6lowpan.c:78 +#: src/libnm-core-impl/nm-setting-6lowpan.c:80 #: src/libnm-core-impl/nm-setting-veth.c:81 msgid "property is not specified" msgstr "" -#: src/libnm-core-impl/nm-setting-6lowpan.c:101 +#: src/libnm-core-impl/nm-setting-6lowpan.c:103 #: src/libnm-core-impl/nm-setting-macsec.c:306 #: src/libnm-core-impl/nm-setting-vlan.c:609 #, c-format msgid "'%s' value doesn't match '%s=%s'" msgstr "" -#: src/libnm-core-impl/nm-setting-6lowpan.c:117 +#: src/libnm-core-impl/nm-setting-6lowpan.c:119 #: src/libnm-core-impl/nm-setting-ip-tunnel.c:360 #: src/libnm-core-impl/nm-setting-macsec.c:322 #: src/libnm-core-impl/nm-setting-macvlan.c:140 @@ -1480,17 +1480,17 @@ msgstr "" #: src/libnm-core-impl/nm-setting-gsm.c:353 #: src/libnm-core-impl/nm-setting-gsm.c:396 #: src/libnm-core-impl/nm-setting-gsm.c:405 -#: src/libnm-core-impl/nm-setting-ip-config.c:5432 +#: src/libnm-core-impl/nm-setting-ip-config.c:5436 #: src/libnm-core-impl/nm-setting-ip4-config.c:286 #: src/libnm-core-impl/nm-setting-ip4-config.c:298 #: src/libnm-core-impl/nm-setting-pppoe.c:151 #: src/libnm-core-impl/nm-setting-pppoe.c:161 -#: src/libnm-core-impl/nm-setting-vpn.c:554 -#: src/libnm-core-impl/nm-setting-vpn.c:564 +#: src/libnm-core-impl/nm-setting-vpn.c:556 +#: src/libnm-core-impl/nm-setting-vpn.c:566 #: src/libnm-core-impl/nm-setting-wimax.c:109 #: src/libnm-core-impl/nm-setting-wireless-security.c:972 #: src/libnm-core-impl/nm-setting-wireless-security.c:1000 -#: src/libnm-core-impl/nm-setting.c:2396 +#: src/libnm-core-impl/nm-setting.c:2410 msgid "property is empty" msgstr "" @@ -1531,8 +1531,8 @@ msgstr "" #: src/libnm-core-impl/nm-setting-wireless.c:937 #: src/libnm-core-impl/nm-setting-wireless.c:949 #: src/libnm-core-impl/nm-setting-wireless.c:962 -#: src/libnm-core-impl/nm-setting-wpan.c:161 -#: src/libnm-core-impl/nm-utils.c:4155 +#: src/libnm-core-impl/nm-setting-wpan.c:163 +#: src/libnm-core-impl/nm-utils.c:4163 msgid "property is invalid" msgstr "" @@ -1834,23 +1834,23 @@ msgstr "" msgid "property invalid" msgstr "" -#: src/libnm-core-impl/nm-setting-ethtool.c:311 +#: src/libnm-core-impl/nm-setting-ethtool.c:297 msgid "unsupported ethtool setting" msgstr "" -#: src/libnm-core-impl/nm-setting-ethtool.c:320 +#: src/libnm-core-impl/nm-setting-ethtool.c:306 msgid "setting has invalid variant type" msgstr "" -#: src/libnm-core-impl/nm-setting-ethtool.c:332 +#: src/libnm-core-impl/nm-setting-ethtool.c:318 msgid "coalesce option must be either 0 or 1" msgstr "" -#: src/libnm-core-impl/nm-setting-ethtool.c:349 +#: src/libnm-core-impl/nm-setting-ethtool.c:335 msgid "pause-autoneg cannot be enabled when setting rx/tx options" msgstr "" -#: src/libnm-core-impl/nm-setting-ethtool.c:374 +#: src/libnm-core-impl/nm-setting-ethtool.c:360 #, c-format msgid "unknown ethtool option '%s'" msgstr "" @@ -1951,278 +1951,278 @@ msgstr "" msgid "Invalid routing metric '%s'" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:1328 +#: src/libnm-core-impl/nm-setting-ip-config.c:1330 #: src/libnm-core-impl/nm-setting-sriov.c:400 msgid "unknown attribute" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:1338 +#: src/libnm-core-impl/nm-setting-ip-config.c:1340 #: src/libnm-core-impl/nm-setting-sriov.c:410 #, c-format msgid "invalid attribute type '%s'" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:1347 +#: src/libnm-core-impl/nm-setting-ip-config.c:1349 msgid "attribute is not valid for a IPv4 route" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:1348 +#: src/libnm-core-impl/nm-setting-ip-config.c:1350 msgid "attribute is not valid for a IPv6 route" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:1359 -#: src/libnm-core-impl/nm-setting-ip-config.c:1391 +#: src/libnm-core-impl/nm-setting-ip-config.c:1361 +#: src/libnm-core-impl/nm-setting-ip-config.c:1393 #, c-format msgid "'%s' is not a valid IPv4 address" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:1360 -#: src/libnm-core-impl/nm-setting-ip-config.c:1392 +#: src/libnm-core-impl/nm-setting-ip-config.c:1362 +#: src/libnm-core-impl/nm-setting-ip-config.c:1394 #, c-format msgid "'%s' is not a valid IPv6 address" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:1382 +#: src/libnm-core-impl/nm-setting-ip-config.c:1384 #, c-format msgid "invalid prefix %s" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:1414 +#: src/libnm-core-impl/nm-setting-ip-config.c:1416 #, c-format msgid "%s is not a valid route type" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:1507 +#: src/libnm-core-impl/nm-setting-ip-config.c:1509 msgid "route scope is invalid for local route" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:1519 +#: src/libnm-core-impl/nm-setting-ip-config.c:1521 #, c-format msgid "a %s route cannot have a next-hop" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2705 +#: src/libnm-core-impl/nm-setting-ip-config.c:2707 msgid "missing priority" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2718 +#: src/libnm-core-impl/nm-setting-ip-config.c:2720 msgid "missing table" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2728 +#: src/libnm-core-impl/nm-setting-ip-config.c:2730 msgid "invalid action type" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2737 +#: src/libnm-core-impl/nm-setting-ip-config.c:2739 msgid "has from/src but the prefix-length is zero" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2745 +#: src/libnm-core-impl/nm-setting-ip-config.c:2747 msgid "missing from/src for a non zero prefix-length" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2752 +#: src/libnm-core-impl/nm-setting-ip-config.c:2754 msgid "invalid from/src" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2759 +#: src/libnm-core-impl/nm-setting-ip-config.c:2761 msgid "invalid prefix length for from/src" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2768 +#: src/libnm-core-impl/nm-setting-ip-config.c:2770 msgid "has to/dst but the prefix-length is zero" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2776 +#: src/libnm-core-impl/nm-setting-ip-config.c:2778 msgid "missing to/dst for a non zero prefix-length" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2783 +#: src/libnm-core-impl/nm-setting-ip-config.c:2785 msgid "invalid to/dst" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2790 +#: src/libnm-core-impl/nm-setting-ip-config.c:2792 msgid "invalid prefix length for to/dst" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2800 +#: src/libnm-core-impl/nm-setting-ip-config.c:2802 msgid "invalid iifname" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2810 +#: src/libnm-core-impl/nm-setting-ip-config.c:2812 msgid "invalid oifname" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2818 +#: src/libnm-core-impl/nm-setting-ip-config.c:2820 msgid "invalid source port range" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2826 +#: src/libnm-core-impl/nm-setting-ip-config.c:2828 msgid "invalid destination port range" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2836 +#: src/libnm-core-impl/nm-setting-ip-config.c:2838 msgid "suppress_prefixlength out of range" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2844 +#: src/libnm-core-impl/nm-setting-ip-config.c:2846 msgid "suppress_prefixlength is only allowed with the to-table action" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2987 +#: src/libnm-core-impl/nm-setting-ip-config.c:2989 #, c-format msgid "invalid key \"%s\"" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:2999 +#: src/libnm-core-impl/nm-setting-ip-config.c:3001 #, c-format msgid "duplicate key %s" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3015 +#: src/libnm-core-impl/nm-setting-ip-config.c:3017 #, c-format msgid "invalid variant type '%s' for \"%s\"" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3026 +#: src/libnm-core-impl/nm-setting-ip-config.c:3028 msgid "missing \"family\"" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3034 +#: src/libnm-core-impl/nm-setting-ip-config.c:3036 msgid "invalid \"family\"" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3091 +#: src/libnm-core-impl/nm-setting-ip-config.c:3093 msgid "\"uid-range-start\" is greater than \"uid-range-end\"" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3285 +#: src/libnm-core-impl/nm-setting-ip-config.c:3287 msgid "Unsupported to-string-flags argument" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3293 +#: src/libnm-core-impl/nm-setting-ip-config.c:3295 msgid "Unsupported extra-argument" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3595 +#: src/libnm-core-impl/nm-setting-ip-config.c:3597 #, c-format msgid "unsupported key \"%s\"" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3602 +#: src/libnm-core-impl/nm-setting-ip-config.c:3604 #, c-format msgid "duplicate key \"%s\"" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3609 +#: src/libnm-core-impl/nm-setting-ip-config.c:3611 #, c-format msgid "invalid value for \"%s\"" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3621 +#: src/libnm-core-impl/nm-setting-ip-config.c:3623 msgid "empty text does not describe a rule" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3629 +#: src/libnm-core-impl/nm-setting-ip-config.c:3631 #, c-format msgid "missing argument for \"%s\"" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3643 +#: src/libnm-core-impl/nm-setting-ip-config.c:3645 msgid "invalid \"from\" part" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3659 +#: src/libnm-core-impl/nm-setting-ip-config.c:3661 msgid "invalid \"to\" part" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3670 +#: src/libnm-core-impl/nm-setting-ip-config.c:3672 msgid "cannot detect address family for rule" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3737 -#: src/libnm-core-impl/nm-setting-ip-config.c:3827 +#: src/libnm-core-impl/nm-setting-ip-config.c:3739 +#: src/libnm-core-impl/nm-setting-ip-config.c:3829 #, c-format msgid "rule is invalid: %s" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:3808 +#: src/libnm-core-impl/nm-setting-ip-config.c:3810 msgid "invalid address family" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5080 +#: src/libnm-core-impl/nm-setting-ip-config.c:5084 #, c-format msgid "rule #%u is invalid: %s" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5448 +#: src/libnm-core-impl/nm-setting-ip-config.c:5452 #, c-format msgid "%d. DNS server address is invalid" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5467 +#: src/libnm-core-impl/nm-setting-ip-config.c:5471 #, c-format msgid "%d. IP address is invalid" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5482 +#: src/libnm-core-impl/nm-setting-ip-config.c:5486 #, c-format msgid "%d. IP address has 'label' property with invalid type" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5494 +#: src/libnm-core-impl/nm-setting-ip-config.c:5498 #, c-format msgid "%d. IP address has invalid label '%s'" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5512 +#: src/libnm-core-impl/nm-setting-ip-config.c:5516 msgid "gateway cannot be set if there are no addresses configured" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5524 +#: src/libnm-core-impl/nm-setting-ip-config.c:5528 msgid "gateway is invalid" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5542 +#: src/libnm-core-impl/nm-setting-ip-config.c:5546 #, c-format msgid "%d. route is invalid" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5555 +#: src/libnm-core-impl/nm-setting-ip-config.c:5559 #, c-format msgid "invalid attribute: %s" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5575 +#: src/libnm-core-impl/nm-setting-ip-config.c:5579 #, c-format msgid "%u. rule has wrong address-family" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5587 +#: src/libnm-core-impl/nm-setting-ip-config.c:5591 #, c-format msgid "%u. rule is invalid: %s" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5603 +#: src/libnm-core-impl/nm-setting-ip-config.c:5607 #, c-format msgid "'%s' is not a valid IAID" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5617 +#: src/libnm-core-impl/nm-setting-ip-config.c:5621 #, c-format msgid "the property cannot be set when '%s' is disabled" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5643 +#: src/libnm-core-impl/nm-setting-ip-config.c:5647 msgid "the property is currently supported only for DHCPv4" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5660 +#: src/libnm-core-impl/nm-setting-ip-config.c:5664 #, c-format msgid "'%s' is not a valid IP or subnet" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5676 +#: src/libnm-core-impl/nm-setting-ip-config.c:5680 #, c-format msgid "a gateway is incompatible with '%s'" msgstr "" @@ -2394,22 +2394,22 @@ msgid "'%s' is not allowed in fail_mode" msgstr "" #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:90 -#: src/libnm-core-impl/nm-setting-user.c:91 +#: src/libnm-core-impl/nm-setting-user.c:93 msgid "missing key" msgstr "" #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:98 -#: src/libnm-core-impl/nm-setting-user.c:99 +#: src/libnm-core-impl/nm-setting-user.c:101 msgid "key is too long" msgstr "" #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:105 -#: src/libnm-core-impl/nm-setting-user.c:106 +#: src/libnm-core-impl/nm-setting-user.c:108 msgid "key must be UTF8" msgstr "" #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:114 -#: src/libnm-core-impl/nm-setting-user.c:153 +#: src/libnm-core-impl/nm-setting-user.c:155 msgid "key contains invalid characters" msgstr "" @@ -2418,33 +2418,33 @@ msgid "key cannot start with \"NM.\"" msgstr "" #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:153 -#: src/libnm-core-impl/nm-setting-user.c:180 +#: src/libnm-core-impl/nm-setting-user.c:182 msgid "value is missing" msgstr "" #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:162 -#: src/libnm-core-impl/nm-setting-user.c:189 +#: src/libnm-core-impl/nm-setting-user.c:191 msgid "value is too large" msgstr "" #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:170 -#: src/libnm-core-impl/nm-setting-user.c:197 +#: src/libnm-core-impl/nm-setting-user.c:199 msgid "value is not valid UTF8" msgstr "" -#: src/libnm-core-impl/nm-setting-ovs-external-ids.c:313 -#: src/libnm-core-impl/nm-setting-user.c:357 +#: src/libnm-core-impl/nm-setting-ovs-external-ids.c:315 +#: src/libnm-core-impl/nm-setting-user.c:361 #, c-format msgid "invalid key \"%s\": %s" msgstr "" -#: src/libnm-core-impl/nm-setting-ovs-external-ids.c:337 -#: src/libnm-core-impl/nm-setting-user.c:381 +#: src/libnm-core-impl/nm-setting-ovs-external-ids.c:339 +#: src/libnm-core-impl/nm-setting-user.c:385 #, c-format msgid "maximum number of user data entries reached (%u instead of %u)" msgstr "" -#: src/libnm-core-impl/nm-setting-ovs-external-ids.c:380 +#: src/libnm-core-impl/nm-setting-ovs-external-ids.c:382 msgid "" "OVS external IDs can only be added to a profile of type OVS bridge/port/" "interface or to OVS system interface" @@ -2662,15 +2662,15 @@ msgstr "" msgid "'%s': invalid group ID" msgstr "" -#: src/libnm-core-impl/nm-setting-user.c:131 +#: src/libnm-core-impl/nm-setting-user.c:133 msgid "key requires a '.' for a namespace" msgstr "" -#: src/libnm-core-impl/nm-setting-user.c:146 +#: src/libnm-core-impl/nm-setting-user.c:148 msgid "key cannot contain \"..\"" msgstr "" -#: src/libnm-core-impl/nm-setting-user.c:314 +#: src/libnm-core-impl/nm-setting-user.c:318 msgid "maximum number of user data entries reached" msgstr "" @@ -2692,29 +2692,29 @@ msgstr "" msgid "vlan setting should have a ethernet setting as well" msgstr "" -#: src/libnm-core-impl/nm-setting-vpn.c:574 +#: src/libnm-core-impl/nm-setting-vpn.c:576 msgid "cannot set connection.multi-connect for VPN setting" msgstr "" -#: src/libnm-core-impl/nm-setting-vpn.c:613 +#: src/libnm-core-impl/nm-setting-vpn.c:615 msgid "setting contained a secret with an empty name" msgstr "" -#: src/libnm-core-impl/nm-setting-vpn.c:652 -#: src/libnm-core-impl/nm-setting.c:3325 +#: src/libnm-core-impl/nm-setting-vpn.c:654 +#: src/libnm-core-impl/nm-setting.c:3339 msgid "not a secret property" msgstr "" -#: src/libnm-core-impl/nm-setting-vpn.c:660 +#: src/libnm-core-impl/nm-setting-vpn.c:662 msgid "secret is not of correct type" msgstr "" -#: src/libnm-core-impl/nm-setting-vpn.c:742 -#: src/libnm-core-impl/nm-setting-vpn.c:792 +#: src/libnm-core-impl/nm-setting-vpn.c:744 +#: src/libnm-core-impl/nm-setting-vpn.c:794 msgid "secret name cannot be empty" msgstr "" -#: src/libnm-core-impl/nm-setting-vpn.c:758 +#: src/libnm-core-impl/nm-setting-vpn.c:760 msgid "secret flags property not found" msgstr "" @@ -2917,50 +2917,50 @@ msgstr "" msgid "conflicting value of mac-address-randomization and cloned-mac-address" msgstr "" -#: src/libnm-core-impl/nm-setting-wpan.c:171 +#: src/libnm-core-impl/nm-setting-wpan.c:173 msgid "page must be defined along with a channel" msgstr "" -#: src/libnm-core-impl/nm-setting-wpan.c:180 +#: src/libnm-core-impl/nm-setting-wpan.c:182 #, c-format msgid "page must be between %d and %d" msgstr "" -#: src/libnm-core-impl/nm-setting-wpan.c:191 +#: src/libnm-core-impl/nm-setting-wpan.c:193 #, c-format msgid "channel must not be between %d and %d" msgstr "" -#: src/libnm-core-impl/nm-setting.c:1649 src/libnm-core-impl/nm-setting.c:1689 -#: src/libnm-core-impl/nm-setting.c:1995 +#: src/libnm-core-impl/nm-setting.c:1663 src/libnm-core-impl/nm-setting.c:1703 +#: src/libnm-core-impl/nm-setting.c:2009 #, c-format msgid "can't set property of type '%s' from value of type '%s'" msgstr "" -#: src/libnm-core-impl/nm-setting.c:1665 +#: src/libnm-core-impl/nm-setting.c:1679 #, c-format msgid "value of type '%s' is invalid or out of range for property '%s'" msgstr "" -#: src/libnm-core-impl/nm-setting.c:1710 +#: src/libnm-core-impl/nm-setting.c:1724 #, c-format msgid "can not set property: %s" msgstr "" -#: src/libnm-core-impl/nm-setting.c:1934 +#: src/libnm-core-impl/nm-setting.c:1948 msgid "duplicate property" msgstr "" -#: src/libnm-core-impl/nm-setting.c:1954 +#: src/libnm-core-impl/nm-setting.c:1968 msgid "unknown property" msgstr "" -#: src/libnm-core-impl/nm-setting.c:2028 src/libnm-core-impl/nm-setting.c:2110 +#: src/libnm-core-impl/nm-setting.c:2042 src/libnm-core-impl/nm-setting.c:2124 #, c-format msgid "failed to set property: %s" msgstr "" -#: src/libnm-core-impl/nm-setting.c:3222 +#: src/libnm-core-impl/nm-setting.c:3236 msgid "secret not found" msgstr "" @@ -3029,226 +3029,226 @@ msgstr "" msgid "invalid link-watchers: %s" msgstr "" -#: src/libnm-core-impl/nm-utils.c:2259 +#: src/libnm-core-impl/nm-utils.c:2267 #, c-format msgid "'%s' is not a valid handle." msgstr "" -#: src/libnm-core-impl/nm-utils.c:2407 +#: src/libnm-core-impl/nm-utils.c:2415 #, c-format msgid "'%s' unexpected: parent already specified." msgstr "" -#: src/libnm-core-impl/nm-utils.c:2425 +#: src/libnm-core-impl/nm-utils.c:2433 #, c-format msgid "invalid handle: '%s'" msgstr "" -#: src/libnm-core-impl/nm-utils.c:2447 +#: src/libnm-core-impl/nm-utils.c:2455 msgid "parent not specified." msgstr "" -#: src/libnm-core-impl/nm-utils.c:2511 +#: src/libnm-core-impl/nm-utils.c:2519 #, c-format msgid "unsupported qdisc option: '%s'." msgstr "" -#: src/libnm-core-impl/nm-utils.c:2641 +#: src/libnm-core-impl/nm-utils.c:2649 msgid "action name missing." msgstr "" -#: src/libnm-core-impl/nm-utils.c:2666 +#: src/libnm-core-impl/nm-utils.c:2674 #, c-format msgid "unsupported action option: '%s'." msgstr "" -#: src/libnm-core-impl/nm-utils.c:2803 +#: src/libnm-core-impl/nm-utils.c:2811 msgid "invalid action: " msgstr "" -#: src/libnm-core-impl/nm-utils.c:2807 +#: src/libnm-core-impl/nm-utils.c:2815 #, c-format msgid "unsupported tfilter option: '%s'." msgstr "" -#: src/libnm-core-impl/nm-utils.c:3107 +#: src/libnm-core-impl/nm-utils.c:3115 #, c-format msgid "failed stat file %s: %s" msgstr "" -#: src/libnm-core-impl/nm-utils.c:3118 +#: src/libnm-core-impl/nm-utils.c:3126 #, c-format msgid "not a file (%s)" msgstr "" -#: src/libnm-core-impl/nm-utils.c:3129 +#: src/libnm-core-impl/nm-utils.c:3137 #, c-format msgid "invalid file owner %d for %s" msgstr "" -#: src/libnm-core-impl/nm-utils.c:3141 +#: src/libnm-core-impl/nm-utils.c:3149 #, c-format msgid "file permissions for %s" msgstr "" -#: src/libnm-core-impl/nm-utils.c:3151 +#: src/libnm-core-impl/nm-utils.c:3159 #, c-format msgid "reject %s" msgstr "" -#: src/libnm-core-impl/nm-utils.c:3171 +#: src/libnm-core-impl/nm-utils.c:3179 #, c-format msgid "path is not absolute (%s)" msgstr "" -#: src/libnm-core-impl/nm-utils.c:3186 +#: src/libnm-core-impl/nm-utils.c:3194 #, c-format msgid "Plugin file does not exist (%s)" msgstr "" -#: src/libnm-core-impl/nm-utils.c:3195 +#: src/libnm-core-impl/nm-utils.c:3203 #, c-format msgid "Plugin is not a valid file (%s)" msgstr "" -#: src/libnm-core-impl/nm-utils.c:3206 +#: src/libnm-core-impl/nm-utils.c:3214 #, c-format msgid "libtool archives are not supported (%s)" msgstr "" -#: src/libnm-core-impl/nm-utils.c:3283 +#: src/libnm-core-impl/nm-utils.c:3291 #, c-format msgid "Could not find \"%s\" binary" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4106 +#: src/libnm-core-impl/nm-utils.c:4114 msgid "unknown secret flags" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4116 +#: src/libnm-core-impl/nm-utils.c:4124 msgid "conflicting secret flags" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4127 +#: src/libnm-core-impl/nm-utils.c:4135 msgid "secret flags must not be \"not-required\"" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4135 +#: src/libnm-core-impl/nm-utils.c:4143 msgid "unsupported secret flags" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4165 +#: src/libnm-core-impl/nm-utils.c:4173 msgid "can't be simultaneously disabled and enabled" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4173 +#: src/libnm-core-impl/nm-utils.c:4181 msgid "WPS is required" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4241 +#: src/libnm-core-impl/nm-utils.c:4249 #, c-format msgid "not a valid ethernet MAC address for mask at position %lld" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4260 +#: src/libnm-core-impl/nm-utils.c:4268 #, c-format msgid "not a valid ethernet MAC address #%u at position %lld" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4892 +#: src/libnm-core-impl/nm-utils.c:4902 msgid "not valid utf-8" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4913 src/libnm-core-impl/nm-utils.c:4966 +#: src/libnm-core-impl/nm-utils.c:4923 src/libnm-core-impl/nm-utils.c:4976 msgid "is not a JSON object" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4942 +#: src/libnm-core-impl/nm-utils.c:4952 msgid "value is NULL" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4942 +#: src/libnm-core-impl/nm-utils.c:4952 msgid "value is empty" msgstr "" -#: src/libnm-core-impl/nm-utils.c:4954 +#: src/libnm-core-impl/nm-utils.c:4964 #, c-format msgid "invalid JSON at position %d (%s)" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5082 src/libnm-core-impl/nm-utils.c:5102 +#: src/libnm-core-impl/nm-utils.c:5092 src/libnm-core-impl/nm-utils.c:5112 msgid "unterminated escape sequence" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5128 +#: src/libnm-core-impl/nm-utils.c:5138 #, c-format msgid "unknown attribute '%s'" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5146 +#: src/libnm-core-impl/nm-utils.c:5156 #, c-format msgid "missing key-value separator '%c' after '%s'" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5166 +#: src/libnm-core-impl/nm-utils.c:5176 #, c-format msgid "invalid uint32 value '%s' for attribute '%s'" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5180 +#: src/libnm-core-impl/nm-utils.c:5190 #, c-format msgid "invalid int32 value '%s' for attribute '%s'" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5193 +#: src/libnm-core-impl/nm-utils.c:5203 #, c-format msgid "invalid uint64 value '%s' for attribute '%s'" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5206 +#: src/libnm-core-impl/nm-utils.c:5216 #, c-format msgid "invalid uint8 value '%s' for attribute '%s'" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5220 +#: src/libnm-core-impl/nm-utils.c:5230 #, c-format msgid "invalid boolean value '%s' for attribute '%s'" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5234 +#: src/libnm-core-impl/nm-utils.c:5244 #, c-format msgid "unsupported attribute '%s' of type '%s'" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5535 +#: src/libnm-core-impl/nm-utils.c:5545 #, c-format msgid "Bridge VLANs %d and %d are not sorted by ascending vid" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5559 +#: src/libnm-core-impl/nm-utils.c:5569 #, c-format msgid "duplicate bridge VLAN vid %u" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5571 +#: src/libnm-core-impl/nm-utils.c:5581 msgid "only one VLAN can be the PVID" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5616 +#: src/libnm-core-impl/nm-utils.c:5626 #, c-format msgid "unknown flags 0x%x" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5628 +#: src/libnm-core-impl/nm-utils.c:5638 msgid "" "'fqdn-no-update' and 'fqdn-serv-update' flags cannot be set at the same time" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5639 +#: src/libnm-core-impl/nm-utils.c:5649 msgid "'fqdn-clear-flags' flag is incompatible with other FQDN flags" msgstr "" -#: src/libnm-core-impl/nm-utils.c:5647 +#: src/libnm-core-impl/nm-utils.c:5657 msgid "DHCPv6 does not support the E (encoded) FQDN flag" msgstr "" @@ -3277,11 +3277,11 @@ msgstr "" msgid "cannot load VPN plugin in '%s': invalid service name" msgstr "" -#: src/libnm-core-impl/nm-vpn-editor-plugin.c:481 +#: src/libnm-core-impl/nm-vpn-editor-plugin.c:493 msgid "the plugin does not support import capability" msgstr "" -#: src/libnm-core-impl/nm-vpn-editor-plugin.c:505 +#: src/libnm-core-impl/nm-vpn-editor-plugin.c:517 msgid "the plugin does not support export capability" msgstr "" @@ -4230,7 +4230,7 @@ msgstr "" #: src/libnmc-base/nm-secret-agent-simple.c:979 #: src/libnmc-base/nm-vpn-helpers.c:143 src/libnmc-base/nm-vpn-helpers.c:147 #: src/libnmc-base/nm-vpn-helpers.c:153 src/libnmc-base/nm-vpn-helpers.c:158 -#: src/nmcli/devices.c:4689 src/nmtui/nmt-page-dsl.c:64 +#: src/nmcli/devices.c:4691 src/nmtui/nmt-page-dsl.c:64 #: src/nmtui/nmt-page-wifi.c:271 src/nmtui/nmt-page-wifi.c:305 #: src/nmtui/nmt-page-wifi.c:344 msgid "Password" @@ -6833,7 +6833,7 @@ msgid "" "string may be escaped using C-style escapes, nevertheless this property " "cannot contain nul bytes. If the per-profile value is unspecified (the " "default), a global connection default gets consulted. If still unspecified, " -"the DHCP option is not sent to the server. Since 1.28" +"the DHCP option is not sent to the server." msgstr "" #: src/libnmc-setting/settings-docs.h.in:170 @@ -6955,7 +6955,7 @@ msgid "" "is dependent on \"ipv4.method\". When set to \"default\", it honors the " "global connection default, before falling back to \"auto\". Note that if " "\"ipv4.method\" is \"disabled\", then link local addressing is always " -"disabled too. The default is \"default\". Since 1.40" +"disabled too. The default is \"default\"." msgstr "" #: src/libnmc-setting/settings-docs.h.in:178 @@ -9410,14 +9410,14 @@ msgstr "" #: src/nmcli/connections.c:2432 src/nmcli/connections.c:3153 #: src/nmcli/connections.c:3165 src/nmcli/connections.c:3177 #: src/nmcli/connections.c:3413 src/nmcli/connections.c:9640 -#: src/nmcli/connections.c:9662 src/nmcli/devices.c:3344 -#: src/nmcli/devices.c:3357 src/nmcli/devices.c:3369 src/nmcli/devices.c:3673 -#: src/nmcli/devices.c:3684 src/nmcli/devices.c:3703 src/nmcli/devices.c:3712 -#: src/nmcli/devices.c:3734 src/nmcli/devices.c:3745 src/nmcli/devices.c:3766 -#: src/nmcli/devices.c:4330 src/nmcli/devices.c:4341 src/nmcli/devices.c:4350 -#: src/nmcli/devices.c:4364 src/nmcli/devices.c:4382 src/nmcli/devices.c:4391 -#: src/nmcli/devices.c:4547 src/nmcli/devices.c:4558 src/nmcli/devices.c:4777 -#: src/nmcli/devices.c:4956 src/nmcli/devices.c:5177 +#: src/nmcli/connections.c:9662 src/nmcli/devices.c:3346 +#: src/nmcli/devices.c:3359 src/nmcli/devices.c:3371 src/nmcli/devices.c:3675 +#: src/nmcli/devices.c:3686 src/nmcli/devices.c:3705 src/nmcli/devices.c:3714 +#: src/nmcli/devices.c:3736 src/nmcli/devices.c:3747 src/nmcli/devices.c:3768 +#: src/nmcli/devices.c:4332 src/nmcli/devices.c:4343 src/nmcli/devices.c:4352 +#: src/nmcli/devices.c:4366 src/nmcli/devices.c:4384 src/nmcli/devices.c:4393 +#: src/nmcli/devices.c:4549 src/nmcli/devices.c:4560 src/nmcli/devices.c:4779 +#: src/nmcli/devices.c:4958 src/nmcli/devices.c:5179 #, c-format msgid "Error: %s argument is missing." msgstr "" @@ -9431,13 +9431,13 @@ msgstr "" #: src/nmcli/connections.c:3213 src/nmcli/connections.c:9146 #: src/nmcli/connections.c:9230 src/nmcli/connections.c:9769 #: src/nmcli/devices.c:2010 src/nmcli/devices.c:2286 src/nmcli/devices.c:2453 -#: src/nmcli/devices.c:2579 src/nmcli/devices.c:2763 src/nmcli/devices.c:3544 -#: src/nmcli/devices.c:4511 src/nmcli/devices.c:4963 src/nmcli/general.c:1068 +#: src/nmcli/devices.c:2579 src/nmcli/devices.c:2763 src/nmcli/devices.c:3546 +#: src/nmcli/devices.c:4513 src/nmcli/devices.c:4965 src/nmcli/general.c:1068 #, c-format msgid "Error: %s." msgstr "" -#: src/nmcli/connections.c:2651 src/nmcli/devices.c:4730 +#: src/nmcli/connections.c:2651 src/nmcli/devices.c:4732 #, c-format msgid "no active connection on device '%s'" msgstr "" @@ -9514,8 +9514,8 @@ msgstr "" #: src/nmcli/connections.c:3187 src/nmcli/connections.c:9673 #: src/nmcli/devices.c:1967 src/nmcli/devices.c:2016 src/nmcli/devices.c:2459 #: src/nmcli/devices.c:2651 src/nmcli/devices.c:2718 src/nmcli/devices.c:2918 -#: src/nmcli/devices.c:3404 src/nmcli/devices.c:3782 src/nmcli/devices.c:4401 -#: src/nmcli/devices.c:4564 src/nmcli/devices.c:4785 src/nmcli/devices.c:4968 +#: src/nmcli/devices.c:3406 src/nmcli/devices.c:3784 src/nmcli/devices.c:4403 +#: src/nmcli/devices.c:4566 src/nmcli/devices.c:4787 src/nmcli/devices.c:4970 #, c-format msgid "Error: invalid extra argument '%s'." msgstr "" @@ -10748,7 +10748,7 @@ msgstr "" msgid "Error: Device '%s' not found.\n" msgstr "" -#: src/nmcli/devices.c:1184 src/nmcli/devices.c:5201 +#: src/nmcli/devices.c:1184 src/nmcli/devices.c:5203 msgid "Error: not all devices found." msgstr "" @@ -10929,218 +10929,218 @@ msgstr "" msgid "%s: device removed\n" msgstr "" -#: src/nmcli/devices.c:3078 +#: src/nmcli/devices.c:3080 msgid "Wi-Fi scan list" msgstr "" -#: src/nmcli/devices.c:3195 src/nmcli/devices.c:3476 +#: src/nmcli/devices.c:3197 src/nmcli/devices.c:3478 #, c-format msgid "Error: Access point with bssid '%s' not found." msgstr "" -#: src/nmcli/devices.c:3397 +#: src/nmcli/devices.c:3399 #, c-format msgid "Error: 'device wifi': %s" msgstr "" -#: src/nmcli/devices.c:3417 +#: src/nmcli/devices.c:3419 #, c-format msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]" msgstr "" -#: src/nmcli/devices.c:3456 +#: src/nmcli/devices.c:3458 #, c-format msgid "Error: Device '%s' not found." msgstr "" -#: src/nmcli/devices.c:3460 +#: src/nmcli/devices.c:3462 #, c-format msgid "" "Error: Device '%s' was not recognized as a Wi-Fi device, check " "NetworkManager Wi-Fi plugin." msgstr "" -#: src/nmcli/devices.c:3465 src/nmcli/devices.c:3817 src/nmcli/devices.c:4446 -#: src/nmcli/devices.c:4581 src/nmcli/devices.c:4716 +#: src/nmcli/devices.c:3467 src/nmcli/devices.c:3819 src/nmcli/devices.c:4448 +#: src/nmcli/devices.c:4583 src/nmcli/devices.c:4718 #, c-format msgid "Error: Device '%s' is not a Wi-Fi device." msgstr "" -#: src/nmcli/devices.c:3645 +#: src/nmcli/devices.c:3647 msgid "SSID or BSSID: " msgstr "" -#: src/nmcli/devices.c:3650 +#: src/nmcli/devices.c:3652 msgid "Error: SSID or BSSID are missing." msgstr "" -#: src/nmcli/devices.c:3694 +#: src/nmcli/devices.c:3696 #, c-format msgid "Error: bssid argument value '%s' is not a valid BSSID." msgstr "" -#: src/nmcli/devices.c:3725 +#: src/nmcli/devices.c:3727 #, c-format msgid "" "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'." msgstr "" -#: src/nmcli/devices.c:3753 src/nmcli/devices.c:3774 +#: src/nmcli/devices.c:3755 src/nmcli/devices.c:3776 #, c-format msgid "Error: %s: %s." msgstr "" -#: src/nmcli/devices.c:3796 +#: src/nmcli/devices.c:3798 #, c-format msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)." msgstr "" -#: src/nmcli/devices.c:3804 +#: src/nmcli/devices.c:3806 #, c-format msgid "Error: Parameter '%s' is neither SSID nor BSSID." msgstr "" -#: src/nmcli/devices.c:3820 src/nmcli/devices.c:4449 src/nmcli/devices.c:4584 -#: src/nmcli/devices.c:4816 +#: src/nmcli/devices.c:3822 src/nmcli/devices.c:4451 src/nmcli/devices.c:4586 +#: src/nmcli/devices.c:4818 msgid "Error: No Wi-Fi device found." msgstr "" -#: src/nmcli/devices.c:3842 +#: src/nmcli/devices.c:3844 #, c-format msgid "Error: Failed to scan hidden SSID: %s." msgstr "" -#: src/nmcli/devices.c:3874 +#: src/nmcli/devices.c:3876 #, c-format msgid "Error: No network with SSID '%s' found." msgstr "" -#: src/nmcli/devices.c:3878 +#: src/nmcli/devices.c:3880 #, c-format msgid "Error: No access point with BSSID '%s' found." msgstr "" -#: src/nmcli/devices.c:3907 +#: src/nmcli/devices.c:3909 #, c-format msgid "Error: Connection '%s' exists but properties don't match." msgstr "" -#: src/nmcli/devices.c:3956 +#: src/nmcli/devices.c:3958 #, c-format msgid "" "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n" msgstr "" -#: src/nmcli/devices.c:3998 +#: src/nmcli/devices.c:4000 msgid "Password: " msgstr "" -#: src/nmcli/devices.c:4136 +#: src/nmcli/devices.c:4138 #, c-format msgid "'%s' is not valid WPA PSK" msgstr "" -#: src/nmcli/devices.c:4157 +#: src/nmcli/devices.c:4159 #, c-format msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)" msgstr "" -#: src/nmcli/devices.c:4176 +#: src/nmcli/devices.c:4178 #, c-format msgid "Hotspot password: %s\n" msgstr "" -#: src/nmcli/devices.c:4355 +#: src/nmcli/devices.c:4357 msgid "Error: ssid is too long." msgstr "" -#: src/nmcli/devices.c:4373 +#: src/nmcli/devices.c:4375 #, c-format msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'." msgstr "" -#: src/nmcli/devices.c:4424 +#: src/nmcli/devices.c:4426 msgid "Error: channel requires band too." msgstr "" -#: src/nmcli/devices.c:4431 +#: src/nmcli/devices.c:4433 #, c-format msgid "Error: channel '%s' not valid for band '%s'." msgstr "" -#: src/nmcli/devices.c:4462 +#: src/nmcli/devices.c:4464 #, c-format msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode." msgstr "" -#: src/nmcli/devices.c:4489 +#: src/nmcli/devices.c:4491 #, c-format msgid "Error: Invalid 'password': %s." msgstr "" -#: src/nmcli/devices.c:4540 src/nmcli/devices.c:4770 +#: src/nmcli/devices.c:4542 src/nmcli/devices.c:4772 #, c-format msgid "Error: '%s' cannot repeat." msgstr "" -#: src/nmcli/devices.c:4675 src/nmcli/devices.c:4678 src/nmcli/devices.c:4682 -#: src/nmcli/devices.c:4685 src/nmtui/nmt-page-wifi.c:253 +#: src/nmcli/devices.c:4677 src/nmcli/devices.c:4680 src/nmcli/devices.c:4684 +#: src/nmcli/devices.c:4687 src/nmtui/nmt-page-wifi.c:253 msgid "Security" msgstr "" -#: src/nmcli/devices.c:4675 +#: src/nmcli/devices.c:4677 msgid "None" msgstr "" -#: src/nmcli/devices.c:4804 +#: src/nmcli/devices.c:4806 #, c-format msgid "%s" msgstr "" #. Main header name -#: src/nmcli/devices.c:4857 +#: src/nmcli/devices.c:4859 msgid "Device LLDP neighbors" msgstr "" -#: src/nmcli/devices.c:4990 +#: src/nmcli/devices.c:4992 #, c-format msgid "Error: 'device lldp list': %s" msgstr "" -#: src/nmcli/devices.c:5058 +#: src/nmcli/devices.c:5060 msgid "Checkpoint was removed." msgstr "" #. The command is done, we're in the confirmation prompt. -#: src/nmcli/devices.c:5065 +#: src/nmcli/devices.c:5067 msgid "No" msgstr "" -#: src/nmcli/devices.c:5078 +#: src/nmcli/devices.c:5080 #, c-format msgid "Error: Destroying a checkpoint failed: %s" msgstr "" -#: src/nmcli/devices.c:5100 src/nmcli/devices.c:5101 +#: src/nmcli/devices.c:5102 src/nmcli/devices.c:5103 msgid "Yes" msgstr "" -#: src/nmcli/devices.c:5127 +#: src/nmcli/devices.c:5129 #, c-format msgid "Error: Creating a checkpoint failed: %s" msgstr "" -#: src/nmcli/devices.c:5143 +#: src/nmcli/devices.c:5145 #, c-format msgid "Error: %s" msgstr "" -#: src/nmcli/devices.c:5182 src/nmcli/nmcli.c:885 +#: src/nmcli/devices.c:5184 src/nmcli/nmcli.c:885 #, c-format msgid "Error: '%s' is not a valid timeout." msgstr "" -#: src/nmcli/devices.c:5209 +#: src/nmcli/devices.c:5211 msgid "Error: Expected a command to run after '--'" msgstr "" diff --git a/po/hr.gmo b/po/hr.gmo index b731de6e..c4f7fcf4 100644 Binary files a/po/hr.gmo and b/po/hr.gmo differ diff --git a/po/ru.gmo b/po/ru.gmo index 0a010dbd..88dabd04 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/uk.gmo b/po/uk.gmo index 35596fe4..095d13a2 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 7b4d8292..2a3d13f8 100644 Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c index 8b0b4845..f5b7666b 100644 --- a/src/core/NetworkManagerUtils.c +++ b/src/core/NetworkManagerUtils.c @@ -978,6 +978,7 @@ nm_ip_routing_rule_to_platform(const NMIPRoutingRule *rule, NMPlatformRoutingRul .start = uid_range_start, .end = uid_range_end, }, + .protocol = RTPROT_STATIC, }; nm_ip_routing_rule_get_xifname_bin(rule, TRUE, out_pl->iifname); diff --git a/src/core/devices/nm-device-ethernet.c b/src/core/devices/nm-device-ethernet.c index 40c6d208..4788cdc6 100644 --- a/src/core/devices/nm-device-ethernet.c +++ b/src/core/devices/nm-device-ethernet.c @@ -1354,6 +1354,11 @@ wake_on_lan_enable(NMDevice *device) if (s_wired) { wol = nm_setting_wired_get_wake_on_lan(s_wired); password = nm_setting_wired_get_wake_on_lan_password(s_wired); + + /* NMSettingWired does not reject invalid flags. Filter them out here. */ + wol = (wol + & (NM_SETTING_WIRED_WAKE_ON_LAN_ALL | NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS)); + if (wol != NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT) goto found; } @@ -1370,9 +1375,14 @@ wake_on_lan_enable(NMDevice *device) nm_log_dbg(LOGD_ETHER, "invalid default value %u for wake-on-lan", (guint) wol); wol = NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT; } + + wol = wol & (NM_SETTING_WIRED_WAKE_ON_LAN_ALL | NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS); + if (wol != NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT) goto found; + wol = NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE; + found: return nm_platform_ethtool_set_wake_on_lan(nm_device_get_platform(device), nm_device_get_ifindex(device), diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 6be9bc7c..2cda9b0d 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -6657,7 +6657,6 @@ device_link_changed(gpointer user_data) NMDeviceClass *klass = NM_DEVICE_GET_CLASS(self); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); gboolean ip_ifname_changed = FALSE; - gboolean hw_addr_changed; nm_auto_nmpobj const NMPObject *pllink_keep_alive = NULL; const NMPlatformLink *pllink; const char *str; @@ -6704,9 +6703,9 @@ device_link_changed(gpointer user_data) if (ifindex == nm_device_get_ip_ifindex(self)) _stats_update_counters_from_pllink(self, pllink); - had_hw_addr = (priv->hw_addr != NULL); - hw_addr_changed = nm_device_update_hw_address(self); - got_hw_addr = (!had_hw_addr && priv->hw_addr); + had_hw_addr = (priv->hw_addr != NULL); + nm_device_update_hw_address(self); + got_hw_addr = (!had_hw_addr && priv->hw_addr); nm_device_update_permanent_hw_address(self, FALSE); if (pllink->name[0] && !nm_streq(priv->iface, pllink->name)) { @@ -6757,8 +6756,6 @@ device_link_changed(gpointer user_data) /* Update DHCP, etc, if needed */ if (ip_ifname_changed) nm_device_update_dynamic_ip_setup(self, "IP interface changed"); - else if (hw_addr_changed) - nm_device_update_dynamic_ip_setup(self, "hw-address changed"); was_up = priv->up; priv->up = NM_FLAGS_HAS(pllink->n_ifi_flags, IFF_UP); diff --git a/src/core/devices/wwan/nm-modem-ofono.c b/src/core/devices/wwan/nm-modem-ofono.c index c003880e..fc27c3fd 100644 --- a/src/core/devices/wwan/nm-modem-ofono.c +++ b/src/core/devices/wwan/nm-modem-ofono.c @@ -739,7 +739,7 @@ handle_settings(GVariant *v_dict, gpointer user_data) gboolean ret = FALSE; const char *interface; const char *s; - const char **array; + gs_free const char **array = NULL; guint32 address_network, gateway_network; int ifindex; GError *error = NULL; @@ -838,15 +838,16 @@ handle_settings(GVariant *v_dict, gpointer user_data) } if (array) { gboolean any_good = FALSE; + gsize i; - for (; array[0]; array++) { - if (!nm_utils_parse_inaddr_bin(AF_INET, *array, NULL, &address_network) + for (i = 0; array[i]; i++) { + if (!nm_utils_parse_inaddr_bin(AF_INET, array[i], NULL, &address_network) || !address_network) { - _LOGW("invalid NameServer: %s", *array); + _LOGW("invalid NameServer: %s", array[i]); continue; } any_good = TRUE; - _LOGI("DNS: %s", *array); + _LOGI("DNS: %s", array[i]); nm_l3_config_data_add_nameserver(priv->l3cd_4, AF_INET, &address_network); } if (!any_good) { diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c index 25ac3c7f..cd30853d 100644 --- a/src/core/nm-connectivity.c +++ b/src/core/nm-connectivity.c @@ -82,7 +82,6 @@ struct _NMConnectivityCheckHandle { gsize response_good_cnt; guint curl_timer; - int ch_ifindex; } concheck; #endif @@ -1049,8 +1048,6 @@ nm_connectivity_check_start(NMConnectivity *self, NMConnectivityState state; const char *reason; - cb_data->concheck.ch_ifindex = ifindex; - if (platform) { state = check_platform_config(self, platform, ifindex, addr_family, &reason); nm_assert((state == NM_CONNECTIVITY_UNKNOWN) == !reason); @@ -1106,7 +1103,7 @@ nm_connectivity_check_start(NMConnectivity *self, "org.freedesktop.resolve1.Manager", "ResolveHostname", g_variant_new("(isit)", - (gint32) cb_data->concheck.ch_ifindex, + 0, cb_data->concheck.con_config->host, (gint32) cb_data->addr_family, SD_RESOLVED_DNS), diff --git a/src/core/nm-l3cfg.c b/src/core/nm-l3cfg.c index 69ea0d26..8fa1e07d 100644 --- a/src/core/nm-l3cfg.c +++ b/src/core/nm-l3cfg.c @@ -4010,7 +4010,7 @@ _l3_commit_ndisc_params(NML3Cfg *self, NML3CfgCommitType commit_type) if (retrans_set && (!self->priv.p->ndisc_retrans_timer_msec_set - || self->priv.p->ndisc_reachable_time_msec != retrans)) { + || self->priv.p->ndisc_retrans_timer_msec != retrans)) { self->priv.p->ndisc_retrans_timer_msec = retrans; self->priv.p->ndisc_retrans_timer_msec_set = TRUE; if (ifname) { diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index 96efc9e5..e8948c3d 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -1312,6 +1312,7 @@ write_ethtool_setting(NMConnection *connection, shvarFile *ifcfg, GError **error gboolean is_first; guint32 u32; gboolean b; + gboolean any_option = FALSE; s_con = nm_connection_get_setting_connection(connection); if (s_con) { @@ -1341,6 +1342,7 @@ write_ethtool_setting(NMConnection *connection, shvarFile *ifcfg, GError **error g_string_append_c(str, ' '); g_string_append(str, nms_ifcfg_rh_utils_get_ethtool_name(ethtool_id)); g_string_append(str, b ? " on" : " off"); + any_option = TRUE; } is_first = TRUE; @@ -1356,6 +1358,7 @@ write_ethtool_setting(NMConnection *connection, shvarFile *ifcfg, GError **error g_string_append_c(str, ' '); g_string_append(str, nms_ifcfg_rh_utils_get_ethtool_name(ethtool_id)); g_string_append_printf(str, " %" G_GUINT32_FORMAT, u32); + any_option = TRUE; } is_first = TRUE; @@ -1371,7 +1374,10 @@ write_ethtool_setting(NMConnection *connection, shvarFile *ifcfg, GError **error g_string_append_c(str, ' '); g_string_append(str, nms_ifcfg_rh_utils_get_ethtool_name(ethtool_id)); g_string_append_printf(str, " %" G_GUINT32_FORMAT, u32); + any_option = TRUE; } + + is_first = TRUE; for (ethtool_id = _NM_ETHTOOL_ID_PAUSE_FIRST; ethtool_id <= _NM_ETHTOOL_ID_PAUSE_LAST; ethtool_id++) { nm_assert(nms_ifcfg_rh_utils_get_ethtool_name(ethtool_id)); @@ -1384,9 +1390,10 @@ write_ethtool_setting(NMConnection *connection, shvarFile *ifcfg, GError **error g_string_append_c(str, ' '); g_string_append(str, nms_ifcfg_rh_utils_get_ethtool_name(ethtool_id)); g_string_append(str, b ? " on" : " off"); + any_option = TRUE; } - if (!str) { + if (!any_option) { /* Write an empty dummy "-A" option without arguments. This is to * ensure that the reader will create an (all default) NMSettingEthtool. * Also, it seems that `ethtool -A "$IFACE"` is silently accepted. */ diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-6.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-6.cexpected new file mode 100644 index 00000000..784ad224 --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-6.cexpected @@ -0,0 +1,15 @@ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +ETHTOOL_OPTS="autoneg on ; -A net0 pause-autoneg off" +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=default +NAME=test_roundtrip_ethtool +UUID=${UUID} +ONBOOT=yes diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-7.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-7.cexpected new file mode 100644 index 00000000..02ab14fe --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-7.cexpected @@ -0,0 +1,15 @@ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +ETHTOOL_OPTS="autoneg on ; -G net0 rx 512" +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=default +NAME=test_roundtrip_ethtool +UUID=${UUID} +ONBOOT=yes diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-8.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-8.cexpected new file mode 100644 index 00000000..fd760839 --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-8.cexpected @@ -0,0 +1,15 @@ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +ETHTOOL_OPTS="autoneg on ; -A net0" +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=default +NAME=test_roundtrip_ethtool +UUID=${UUID} +ONBOOT=yes diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-9.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-9.cexpected new file mode 100644 index 00000000..1703b0dc --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-9.cexpected @@ -0,0 +1,15 @@ +TYPE=Ethernet +PROXY_METHOD=none +BROWSER_ONLY=no +ETHTOOL_OPTS="autoneg on ; -G net0 rx 512 ; -A net0 pause-autoneg off" +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=default +NAME=test_roundtrip_ethtool +UUID=${UUID} +ONBOOT=yes diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index f9fd7fd5..886a605f 100644 --- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -3425,6 +3425,7 @@ test_roundtrip_ethtool(void) gs_unref_object NMConnection *connection = NULL; NMSetting *s_ethtool; NMSetting *s_wired; + int i_run; connection = nmtst_create_minimal_connection("test_roundtrip_ethtool", NULL, @@ -3487,6 +3488,159 @@ test_roundtrip_ethtool(void) TEST_IFCFG_DIR "/ifcfg-test_roundtrip_ethtool-5.cexpected", NULL); g_clear_object(&connection); + + connection = nmtst_create_minimal_connection("test_roundtrip_ethtool", + NULL, + NM_SETTING_WIRED_SETTING_NAME, + NULL); + s_wired = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_WIRED); + g_object_set(s_wired, NM_SETTING_WIRED_AUTO_NEGOTIATE, TRUE, NULL); + + s_ethtool = _nm_connection_new_setting(connection, NM_TYPE_SETTING_ETHTOOL); + nm_setting_option_set_boolean(s_ethtool, NM_ETHTOOL_OPTNAME_PAUSE_AUTONEG, FALSE); + _writer_new_connec_exp(connection, + TEST_SCRATCH_DIR, + TEST_IFCFG_DIR "/ifcfg-test_roundtrip_ethtool-6.cexpected", + NULL); + g_clear_object(&connection); + + connection = nmtst_create_minimal_connection("test_roundtrip_ethtool", + NULL, + NM_SETTING_WIRED_SETTING_NAME, + NULL); + s_wired = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_WIRED); + g_object_set(s_wired, NM_SETTING_WIRED_AUTO_NEGOTIATE, TRUE, NULL); + + s_ethtool = _nm_connection_new_setting(connection, NM_TYPE_SETTING_ETHTOOL); + nm_setting_option_set_uint32(s_ethtool, NM_ETHTOOL_OPTNAME_RING_RX, 512); + _writer_new_connec_exp(connection, + TEST_SCRATCH_DIR, + TEST_IFCFG_DIR "/ifcfg-test_roundtrip_ethtool-7.cexpected", + NULL); + g_clear_object(&connection); + + connection = nmtst_create_minimal_connection("test_roundtrip_ethtool", + NULL, + NM_SETTING_WIRED_SETTING_NAME, + NULL); + s_wired = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_WIRED); + g_object_set(s_wired, NM_SETTING_WIRED_AUTO_NEGOTIATE, TRUE, NULL); + + s_ethtool = _nm_connection_new_setting(connection, NM_TYPE_SETTING_ETHTOOL); + _writer_new_connec_exp(connection, + TEST_SCRATCH_DIR, + TEST_IFCFG_DIR "/ifcfg-test_roundtrip_ethtool-8.cexpected", + NULL); + g_clear_object(&connection); + + connection = nmtst_create_minimal_connection("test_roundtrip_ethtool", + NULL, + NM_SETTING_WIRED_SETTING_NAME, + NULL); + s_wired = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_WIRED); + g_object_set(s_wired, NM_SETTING_WIRED_AUTO_NEGOTIATE, TRUE, NULL); + + s_ethtool = _nm_connection_new_setting(connection, NM_TYPE_SETTING_ETHTOOL); + nm_setting_option_set_boolean(s_ethtool, NM_ETHTOOL_OPTNAME_PAUSE_AUTONEG, FALSE); + nm_setting_option_set_uint32(s_ethtool, NM_ETHTOOL_OPTNAME_RING_RX, 512); + _writer_new_connec_exp(connection, + TEST_SCRATCH_DIR, + TEST_IFCFG_DIR "/ifcfg-test_roundtrip_ethtool-9.cexpected", + NULL); + g_clear_object(&connection); + + for (i_run = 0; i_run < 20; i_run++) { + gs_unref_object NMConnection *con2 = NULL; + gs_unref_object NMConnection *reread = NULL; + nmtst_auto_unlinkfile char *testfile = NULL; + gboolean reread_same; + gboolean v_bool; + NMEthtoolID ethtool_ids[_NM_ETHTOOL_ID_NUM]; + guint i; + guint l; + NMSettingWiredWakeOnLan wake_on_lan; + + con2 = nmtst_create_minimal_connection("test_roundtrip_ethtool", + NULL, + NM_SETTING_WIRED_SETTING_NAME, + NULL); + s_wired = nmtst_connection_assert_setting(con2, NM_TYPE_SETTING_WIRED); + g_object_set(s_wired, NM_SETTING_WIRED_AUTO_NEGOTIATE, nmtst_get_rand_bool(), NULL); + + if (nmtst_get_rand_bool()) { + g_object_set(s_wired, + NM_SETTING_WIRED_SPEED, + 1000u, + NM_SETTING_WIRED_DUPLEX, + nmtst_get_rand_bool() ? "full" : "half", + NULL); + } + + wake_on_lan = nmtst_get_rand_uint32(); + wake_on_lan = wake_on_lan & NM_SETTING_WIRED_WAKE_ON_LAN_ALL; + wake_on_lan = nmtst_rand_select(wake_on_lan, + NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT, + NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE); + g_object_set(s_wired, NM_SETTING_WIRED_WAKE_ON_LAN, (guint) wake_on_lan, NULL); + + if (NM_FLAGS_HAS(wake_on_lan, NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC) + && nmtst_get_rand_bool()) { + g_object_set(s_wired, NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD, "aa:bb:cc:dd:ee:ff", NULL); + } + + l = nmtst_get_rand_uint32() % (G_N_ELEMENTS(ethtool_ids) + 2); + if (l == 0) { + /* pass. No ethtool setting. */ + goto check_roundtrip; + } + l--; + + s_ethtool = _nm_connection_new_setting(con2, NM_TYPE_SETTING_ETHTOOL); + + for (i = 0; i < (int) G_N_ELEMENTS(ethtool_ids); i++) + ethtool_ids[i] = i; + nmtst_rand_perm(NULL, ethtool_ids, NULL, sizeof(ethtool_ids[0]), G_N_ELEMENTS(ethtool_ids)); + + for (i = 0; i < l; i++) { + NMEthtoolID ethtool_id = ethtool_ids[i]; + const GVariantType *vtype; + const char *optname; + + optname = nm_ethtool_data[ethtool_id]->optname; + vtype = nm_ethtool_id_get_variant_type(ethtool_id); + + if (NM_IN_SET(ethtool_id, + NM_ETHTOOL_ID_COALESCE_ADAPTIVE_RX, + NM_ETHTOOL_ID_COALESCE_ADAPTIVE_TX)) { + nm_setting_option_set_uint32(s_ethtool, optname, nmtst_get_rand_uint32() % 2); + } else if (g_variant_type_equal(vtype, G_VARIANT_TYPE_BOOLEAN)) + nm_setting_option_set_boolean(s_ethtool, optname, nmtst_get_rand_bool()); + else if (g_variant_type_equal(vtype, G_VARIANT_TYPE_UINT32)) + nm_setting_option_set_uint32(s_ethtool, optname, nmtst_get_rand_uint32()); + else + g_assert_not_reached(); + } + + if ((nm_setting_option_get_boolean(s_ethtool, NM_ETHTOOL_OPTNAME_PAUSE_RX, NULL) + || nm_setting_option_get_boolean(s_ethtool, NM_ETHTOOL_OPTNAME_PAUSE_TX, NULL)) + && nm_setting_option_get_boolean(s_ethtool, NM_ETHTOOL_OPTNAME_PAUSE_AUTONEG, &v_bool) + && v_bool) { + /* don't accidentally create an invalid profile. */ + nm_setting_option_set(s_ethtool, + NM_ETHTOOL_OPTNAME_PAUSE_AUTONEG, + nmtst_get_rand_bool() ? g_variant_new_boolean(FALSE) : NULL); + } + +check_roundtrip: + _writer_new_connection_reread(con2, + TEST_SCRATCH_DIR, + &testfile, + NO_EXPECTED, + &reread, + &reread_same); + g_assert(NM_IS_CONNECTION(reread)); + g_assert(reread_same); + } } static void diff --git a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c index 1307d4b2..47be3a5e 100644 --- a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c +++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c @@ -2292,14 +2292,19 @@ test_read_missing_vlan_flags(void) static void test_read_missing_id_uuid(void) { - gs_unref_object NMConnection *connection = NULL; - gs_free char *expected_uuid = NULL; - const char *FILENAME = TEST_KEYFILES_DIR "/Test_Missing_ID_UUID"; + gs_unref_object NMConnection *connection = NULL; + gs_free char *expected_uuid = NULL; + gs_free char *expected_uuid2 = NULL; + const char *FILENAME = TEST_KEYFILES_DIR "/Test_Missing_ID_UUID"; + const char F[] = "keyfile\0" TEST_KEYFILES_DIR "/Test_Missing_ID_UUID"; expected_uuid = nm_uuid_generate_from_strings("keyfile", FILENAME, NULL); - connection = keyfile_read_connection_from_file(FILENAME); + expected_uuid2 = + nm_uuid_generate_from_string_str(F, sizeof(F), NM_UUID_TYPE_VERSION3, &nm_uuid_ns_1); + g_assert_cmpstr(expected_uuid, ==, expected_uuid2); + connection = keyfile_read_connection_from_file(FILENAME); g_assert_cmpstr(nm_connection_get_id(connection), ==, "Test_Missing_ID_UUID"); g_assert_cmpstr(nm_connection_get_uuid(connection), ==, expected_uuid); } diff --git a/src/libnm-base/nm-ethtool-base.c b/src/libnm-base/nm-ethtool-base.c index 99bbe68e..78e9fbc1 100644 --- a/src/libnm-base/nm-ethtool-base.c +++ b/src/libnm-base/nm-ethtool-base.c @@ -294,3 +294,15 @@ nm_ethtool_id_to_type(NMEthtoolID id) return NM_ETHTOOL_TYPE_UNKNOWN; } + +const GVariantType * +nm_ethtool_id_get_variant_type(NMEthtoolID ethtool_id) +{ + if (nm_ethtool_id_is_feature(ethtool_id) || nm_ethtool_id_is_pause(ethtool_id)) + return G_VARIANT_TYPE_BOOLEAN; + + if (nm_ethtool_id_is_coalesce(ethtool_id) || nm_ethtool_id_is_ring(ethtool_id)) + return G_VARIANT_TYPE_UINT32; + + return NULL; +} diff --git a/src/libnm-base/nm-ethtool-base.h b/src/libnm-base/nm-ethtool-base.h index abedcafe..22bb88fb 100644 --- a/src/libnm-base/nm-ethtool-base.h +++ b/src/libnm-base/nm-ethtool-base.h @@ -21,6 +21,8 @@ const NMEthtoolData *nm_ethtool_data_get_by_optname(const char *optname); NMEthtoolType nm_ethtool_id_to_type(NMEthtoolID id); +const GVariantType *nm_ethtool_id_get_variant_type(NMEthtoolID ethtool_id); + /****************************************************************************/ static inline NMEthtoolID diff --git a/src/libnm-client-impl/libnm.ver b/src/libnm-client-impl/libnm.ver index e414b7e6..2478defa 100644 --- a/src/libnm-client-impl/libnm.ver +++ b/src/libnm-client-impl/libnm.ver @@ -1844,3 +1844,37 @@ global: nm_setting_ip4_link_local_get_type; nm_setting_ip6_config_get_mtu; } libnm_1_38_0; + +libnm_1_40_4 { +global: + nm_device_6lowpan_get_parent; + nm_device_macsec_get_parent; + nm_device_veth_get_peer; + nm_device_vxlan_get_carrier; + nm_device_vxlan_get_rsc; + nm_device_wifi_p2p_get_peer_by_path; + nm_setting_6lowpan_get_parent; + nm_setting_6lowpan_new; + nm_setting_connection_get_mptcp_flags; + nm_setting_hostname_new; + nm_setting_ip4_config_get_link_local; + nm_setting_ip_config_get_dhcp_iaid; + nm_setting_ip_tunnel_get_encapsulation_limit; + nm_setting_ip_tunnel_get_flow_label; + nm_setting_ovs_bridge_get_datapath_type; + nm_setting_vpn_get_persistent; + nm_setting_wpan_get_channel; + nm_setting_wpan_get_mac_address; + nm_setting_wpan_get_page; + nm_setting_wpan_get_pan_id; + nm_setting_wpan_get_short_address; + nm_setting_wpan_new; + nm_sriov_vf_attribute_validate; + nm_tc_tfilter_get_action; + nm_tc_tfilter_set_action; + nm_utils_ip_addresses_from_variant; + nm_utils_ip_addresses_to_variant; + nm_utils_ip_routes_from_variant; + nm_utils_ip_routes_to_variant; + nm_vpn_plugin_info_supports_multiple; +} libnm_1_40_0; diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index 46464a63..d72ed545 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -236,5 +236,4 @@ if enable_introspection ], depends: libnm_gir, ) - endif diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c index a2ca8333..871c5466 100644 --- a/src/libnm-client-impl/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -5248,7 +5248,7 @@ _add_and_activate_connection(NMClient *self, * @partial: (allow-none): an #NMConnection to add; the connection may be * partially filled (or even %NULL) and will be completed by NetworkManager * using the given @device and @specific_object before being added - * @device: the #NMDevice + * @device: (allow-none): the #NMDevice * @specific_object: (allow-none): the object path of a connection-type-specific * object this activation should use. This parameter is currently ignored for * wired and mobile broadband connections, and the value of %NULL should be used @@ -5322,7 +5322,7 @@ nm_client_add_and_activate_connection_finish(NMClient *client, GAsyncResult *res * @partial: (allow-none): an #NMConnection to add; the connection may be * partially filled (or even %NULL) and will be completed by NetworkManager * using the given @device and @specific_object before being added - * @device: the #NMDevice + * @device: (allow-none): the #NMDevice * @specific_object: (allow-none): the object path of a connection-type-specific * object this activation should use. This parameter is currently ignored for * wired and mobile broadband connections, and the value of %NULL should be used @@ -5396,6 +5396,8 @@ nm_client_add_and_activate_connection2(NMClient *client, * * Returns: (transfer full): the new #NMActiveConnection on success, %NULL on * failure, in which case @error will be set. + * + * Since: 1.16 **/ NMActiveConnection * nm_client_add_and_activate_connection2_finish(NMClient *client, diff --git a/src/libnm-client-impl/nm-device-6lowpan.c b/src/libnm-client-impl/nm-device-6lowpan.c index 39558f25..fc1f59ba 100644 --- a/src/libnm-client-impl/nm-device-6lowpan.c +++ b/src/libnm-client-impl/nm-device-6lowpan.c @@ -39,7 +39,7 @@ G_DEFINE_TYPE(NMDevice6Lowpan, nm_device_6lowpan, NM_TYPE_DEVICE) * * Returns: (transfer none): the device's parent device * - * Since: 1.14 + * Since: 1.42, 1.40.4 **/ NMDevice * nm_device_6lowpan_get_parent(NMDevice6Lowpan *device) @@ -49,27 +49,6 @@ nm_device_6lowpan_get_parent(NMDevice6Lowpan *device) return nml_dbus_property_o_get_obj(&NM_DEVICE_6LOWPAN_GET_PRIVATE(device)->parent); } -/** - * nm_device_6lowpan_get_hw_address: (skip) - * @device: a #NMDevice6Lowpan - * - * Gets the hardware (MAC) address of the #NMDevice6Lowpan - * - * Returns: the hardware address. This is the internal string used by the - * device, and must not be modified. - * - * Since: 1.14 - * - * Deprecated: 1.24: Use nm_device_get_hw_address() instead. - **/ -const char * -nm_device_6lowpan_get_hw_address(NMDevice6Lowpan *device) -{ - g_return_val_if_fail(NM_IS_DEVICE_6LOWPAN(device), NULL); - - return nm_device_get_hw_address(NM_DEVICE(device)); -} - /*****************************************************************************/ static void diff --git a/src/libnm-client-impl/nm-device-macsec.c b/src/libnm-client-impl/nm-device-macsec.c index 525d32d0..763faa6c 100644 --- a/src/libnm-client-impl/nm-device-macsec.c +++ b/src/libnm-client-impl/nm-device-macsec.c @@ -65,7 +65,7 @@ G_DEFINE_TYPE(NMDeviceMacsec, nm_device_macsec, NM_TYPE_DEVICE) * * Returns: (transfer none): the device's parent device * - * Since: 1.6 + * Since: 1.42, 1.40.4 **/ NMDevice * nm_device_macsec_get_parent(NMDeviceMacsec *device) diff --git a/src/libnm-client-impl/nm-device-tun.c b/src/libnm-client-impl/nm-device-tun.c index 353b4bdc..2e75c860 100644 --- a/src/libnm-client-impl/nm-device-tun.c +++ b/src/libnm-client-impl/nm-device-tun.c @@ -124,7 +124,7 @@ nm_device_tun_get_group(NMDeviceTun *device) } /** - * nm_device_tun_get_pi: + * nm_device_tun_get_no_pi: * @device: a #NMDeviceTun * * Returns whether the #NMDeviceTun has the IFF_NO_PI flag. diff --git a/src/libnm-client-impl/nm-device-veth.c b/src/libnm-client-impl/nm-device-veth.c index d9fc325b..0d4537ed 100644 --- a/src/libnm-client-impl/nm-device-veth.c +++ b/src/libnm-client-impl/nm-device-veth.c @@ -44,7 +44,7 @@ G_DEFINE_TYPE(NMDeviceVeth, nm_device_veth, NM_TYPE_DEVICE_ETHERNET) * * Returns: (transfer none): the device's peer device * - * Since: 1.30 + * Since: 1.42, 1.40.4 **/ NMDevice * nm_device_veth_get_peer(NMDeviceVeth *device) diff --git a/src/libnm-client-impl/nm-device-vxlan.c b/src/libnm-client-impl/nm-device-vxlan.c index d81b5516..13c20536 100644 --- a/src/libnm-client-impl/nm-device-vxlan.c +++ b/src/libnm-client-impl/nm-device-vxlan.c @@ -99,7 +99,7 @@ nm_device_vxlan_get_hw_address(NMDeviceVxlan *device) * This property is not implemented yet, and the function always returns * FALSE. * - * Since: 1.2 + * Since: 1.42, 1.40.4 **/ gboolean nm_device_vxlan_get_carrier(NMDeviceVxlan *device) @@ -325,7 +325,7 @@ nm_device_vxlan_get_proxy(NMDeviceVxlan *device) * * Returns: whether route short circuit is turned on * - * Since: 1.2 + * Since: 1.42, 1.40.4 **/ gboolean nm_device_vxlan_get_rsc(NMDeviceVxlan *device) diff --git a/src/libnm-client-impl/nm-device-wifi-p2p.c b/src/libnm-client-impl/nm-device-wifi-p2p.c index 6e667ac6..3d539111 100644 --- a/src/libnm-client-impl/nm-device-wifi-p2p.c +++ b/src/libnm-client-impl/nm-device-wifi-p2p.c @@ -100,7 +100,7 @@ nm_device_wifi_p2p_get_peers(NMDeviceWifiP2P *device) * * Returns: (transfer none): the peer or %NULL if none is found. * - * Since: 1.16 + * Since: 1.42, 1.40.4 **/ NMWifiP2PPeer * nm_device_wifi_p2p_get_peer_by_path(NMDeviceWifiP2P *device, const char *path) diff --git a/src/libnm-client-impl/nm-device-wpan.c b/src/libnm-client-impl/nm-device-wpan.c index 30c1ea16..337e3de0 100644 --- a/src/libnm-client-impl/nm-device-wpan.c +++ b/src/libnm-client-impl/nm-device-wpan.c @@ -24,25 +24,6 @@ struct _NMDeviceWpanClass { G_DEFINE_TYPE(NMDeviceWpan, nm_device_wpan, NM_TYPE_DEVICE) /*****************************************************************************/ -/** - * nm_device_wpan_get_hw_address: (skip) - * @device: a #NMDeviceWpan - * - * Gets the active hardware (MAC) address of the #NMDeviceWpan - * - * Returns: the active hardware address. This is the internal string used by the - * device, and must not be modified. - * - * Deprecated: 1.24: Use nm_device_get_hw_address() instead. - **/ -const char * -nm_device_wpan_get_hw_address(NMDeviceWpan *device) -{ - g_return_val_if_fail(NM_IS_DEVICE_WPAN(device), NULL); - - return nm_device_get_hw_address(NM_DEVICE(device)); -} - static gboolean connection_compatible(NMDevice *device, NMConnection *connection, GError **error) { diff --git a/src/libnm-client-impl/nm-remote-connection.c b/src/libnm-client-impl/nm-remote-connection.c index 23dfc1da..b10d3d55 100644 --- a/src/libnm-client-impl/nm-remote-connection.c +++ b/src/libnm-client-impl/nm-remote-connection.c @@ -125,6 +125,8 @@ nm_remote_connection_update2(NMRemoteConnection *connection, * * Returns: (transfer full): on success, a #GVariant of type "a{sv}" with the result. On failure, * %NULL. + * + * Since: 1.12 **/ GVariant * nm_remote_connection_update2_finish(NMRemoteConnection *connection, diff --git a/src/libnm-client-impl/nm-settings-docs-gir.xml b/src/libnm-client-impl/nm-settings-docs-gir.xml index 3ce853e4..eef7de67 100644 --- a/src/libnm-client-impl/nm-settings-docs-gir.xml +++ b/src/libnm-client-impl/nm-settings-docs-gir.xml @@ -145,9 +145,7 @@ This property is currently not implemented for DHCPv6. Array of servers from which DHCP offers must be rejected. This property is useful to avoid getting a lease from misconfigured or rogue servers. For DHCPv4, each element must be an IPv4 address, optionally followed by a slash and a prefix length (e.g. "192.168.122.0/24"). This property is currently not implemented for DHCPv6. 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. 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. A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). - Set to 2147483647 (MAXINT32) for infinity. A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity. The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. - - Since 1.28 The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Since 1.28 Array of IP addresses of DNS servers. Array of IP addresses of DNS servers. Array of DNS options as described in man 5 resolv.conf. + Set to 2147483647 (MAXINT32) for infinity. A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity. The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Array of IP addresses of DNS servers. Array of IP addresses of DNS servers. Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. @@ -179,9 +177,7 @@ Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See "ip4-auto-default-route". The gateway associated with this configuration. This is only meaningful if "addresses" is also set. Setting the gateway causes NetworkManager to configure a standard default route with the gateway as next hop. This is ignored if "never-default" is set. An alternative is to configure the default route explicitly with a manual route and /0 as prefix length. Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See "ip4-auto-default-route". When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. 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. 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. Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. - When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". - - Since 1.40 Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". Since 1.40 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. 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. IP configuration method. + When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". 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. 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. IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "auto", "manual", and "link-local". See the subclass-specific documentation for other values. diff --git a/src/libnm-client-impl/nm-vpn-plugin-old.c b/src/libnm-client-impl/nm-vpn-plugin-old.c index 19ba2bb0..8898f09a 100644 --- a/src/libnm-client-impl/nm-vpn-plugin-old.c +++ b/src/libnm-client-impl/nm-vpn-plugin-old.c @@ -281,13 +281,8 @@ schedule_fail_stop(NMVpnPluginOld *plugin, guint timeout_secs) priv->fail_stop_id = g_idle_add(fail_stop, plugin); } -/** - * nm_vpn_plugin_old_set_config: - * - * Deprecated: 1.2: Replaced by NMVpnServicePlugin. - */ -void -nm_vpn_plugin_old_set_config(NMVpnPluginOld *plugin, GVariant *config) +static void +set_config(NMVpnPluginOld *plugin, GVariant *config) { NMVpnPluginOldPrivate *priv = NM_VPN_PLUGIN_OLD_GET_PRIVATE(plugin); @@ -382,13 +377,8 @@ nm_vpn_plugin_old_set_ip4_config(NMVpnPluginOld *plugin, GVariant *ip4_config) nm_vpn_plugin_old_set_state(plugin, NM_VPN_SERVICE_STATE_STARTED); } -/** - * nm_vpn_plugin_old_set_ip6_config: - * - * Deprecated: 1.2: Replaced by NMVpnServicePlugin. - */ -void -nm_vpn_plugin_old_set_ip6_config(NMVpnPluginOld *plugin, GVariant *ip6_config) +static void +set_ip6_config(NMVpnPluginOld *plugin, GVariant *ip6_config) { NMVpnPluginOldPrivate *priv = NM_VPN_PLUGIN_OLD_GET_PRIVATE(plugin); @@ -721,7 +711,7 @@ impl_vpn_plugin_old_set_config(NMVpnPluginOld *plugin, GVariant *config, gpointer user_data) { - nm_vpn_plugin_old_set_config(plugin, config); + set_config(plugin, config); g_dbus_method_invocation_return_value(context, NULL); } @@ -741,7 +731,7 @@ impl_vpn_plugin_old_set_ip6_config(NMVpnPluginOld *plugin, GVariant *config, gpointer user_data) { - nm_vpn_plugin_old_set_ip6_config(plugin, config); + set_ip6_config(plugin, config); g_dbus_method_invocation_return_value(context, NULL); } diff --git a/src/libnm-client-impl/nm-vpn-service-plugin.c b/src/libnm-client-impl/nm-vpn-service-plugin.c index 3493d1db..d26a4ff5 100644 --- a/src/libnm-client-impl/nm-vpn-service-plugin.c +++ b/src/libnm-client-impl/nm-vpn-service-plugin.c @@ -136,6 +136,11 @@ nm_vpn_service_plugin_set_state(NMVpnServicePlugin *plugin, NMVpnServiceState st } } +/** + * nm_vpn_service_plugin_set_login_banner: + * + * Since: 1.2 + */ void nm_vpn_service_plugin_set_login_banner(NMVpnServicePlugin *plugin, const char *banner) { @@ -160,6 +165,11 @@ _emit_failure(NMVpnServicePlugin *plugin, NMVpnPluginFailure reason) nmdbus_vpn_plugin_emit_failure(priv->dbus_vpn_service_plugin, reason); } +/** + * nm_vpn_service_plugin_failure: + * + * Since: 1.2 + */ void nm_vpn_service_plugin_failure(NMVpnServicePlugin *plugin, NMVpnPluginFailure reason) { @@ -169,6 +179,11 @@ nm_vpn_service_plugin_failure(NMVpnServicePlugin *plugin, NMVpnPluginFailure rea nm_vpn_service_plugin_disconnect(plugin, NULL); } +/** + * nm_vpn_service_plugin_disconnect: + * + * Since: 1.2 + */ gboolean nm_vpn_service_plugin_disconnect(NMVpnServicePlugin *plugin, GError **err) { @@ -326,6 +341,11 @@ schedule_fail_stop(NMVpnServicePlugin *plugin, guint timeout_secs) priv->fail_stop_id = g_idle_add(fail_stop, plugin); } +/** + * nm_vpn_service_plugin_set_config: + * + * Since: 1.2 + */ void nm_vpn_service_plugin_set_config(NMVpnServicePlugin *plugin, GVariant *config) { @@ -364,6 +384,11 @@ nm_vpn_service_plugin_set_config(NMVpnServicePlugin *plugin, GVariant *config) nm_vpn_service_plugin_set_state(plugin, NM_VPN_SERVICE_STATE_STARTED); } +/** + * nm_vpn_service_plugin_set_ip4_config: + * + * Since: 1.2 + */ void nm_vpn_service_plugin_set_ip4_config(NMVpnServicePlugin *plugin, GVariant *ip4_config) { @@ -422,6 +447,11 @@ nm_vpn_service_plugin_set_ip4_config(NMVpnServicePlugin *plugin, GVariant *ip4_c nm_vpn_service_plugin_set_state(plugin, NM_VPN_SERVICE_STATE_STARTED); } +/** + * nm_vpn_service_plugin_set_ip6_config: + * + * Since: 1.2 + */ void nm_vpn_service_plugin_set_ip6_config(NMVpnServicePlugin *plugin, GVariant *ip6_config) { diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build index 3f2e78a7..0c0e188b 100644 --- a/src/libnm-client-impl/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -44,3 +44,15 @@ foreach test_unit: test_units args: test_args + [exe.full_path()], ) endforeach + +if enable_introspection + test( + 'check-local-libnm-gir', + python, + args: [ + join_paths(meson.source_root(), 'src', 'libnm-client-impl', 'tests', 'test-gir.py'), + '--gir', libnm_gir[0], + '--ver', join_paths(meson.source_root(), 'src', 'libnm-client-impl', 'libnm.ver'), + ], + ) +endif diff --git a/src/libnm-client-impl/tests/test-gir.py b/src/libnm-client-impl/tests/test-gir.py new file mode 100755 index 00000000..d91849b8 --- /dev/null +++ b/src/libnm-client-impl/tests/test-gir.py @@ -0,0 +1,153 @@ +#!/usr/bin/env python +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Copyright (C) 2022 Red Hat, Inc. +# + +from __future__ import print_function +import xml.etree.ElementTree as ET +import argparse +import sys + +C_NS = "http://www.gtk.org/introspection/c/1.0" +CORE_NS = "http://www.gtk.org/introspection/core/1.0" +GLIB_NS = "http://www.gtk.org/introspection/glib/1.0" + + +def syms_from_gir(girfile): + def xml_symbols(xml, types): + ret = [] + for t in types: + ret += xml.findall("./{%s}namespace/{%s}%s" % (CORE_NS, CORE_NS, t)) + ret += xml.findall("./{%s}namespace/*/{%s}%s" % (CORE_NS, CORE_NS, t)) + return ret + + girxml = ET.parse(girfile) + c_syms = {} + for sym in xml_symbols(girxml, ("constructor", "function", "method")): + c_syms[sym.get("{%s}identifier" % C_NS)] = sym.get("version") + + for sym in xml_symbols( + girxml, ("bitfield", "class", "enumeration", "interface", "record") + ): + get_type = sym.get("{%s}get-type" % GLIB_NS) + if get_type is None: + continue + version = sym.get("version") + + if version is None: + # FIXME: The get_type() functions should be exported in the same + # version the type itself appeared. However, a large number of + # classes lack Since: tags in their doc blocks. Fall back to using + # the tag on _new() method for the test to be able to proceed + # reasonably. This should be fixed eventually. + constructor = sym.find("./{%s}constructor" % CORE_NS) + if constructor is not None: + version = constructor.get("version") + + c_syms[get_type] = version + return c_syms + + +# Older Python doesn't have str.removesuffix() +def str_removesuffix(string, suffix): + try: + return string.removesuffix(suffix) + except AttributeError: + if string.endswith(suffix): + return string[: -len(suffix)] + else: + return string + + +# Older Python doesn't have str.removeprefix() +def str_removeprefix(string, prefix): + try: + return string.removeprefix(prefix) + except AttributeError: + if string.startswith(prefix): + return string[len(prefix) :] + else: + return string + + +def syms_from_ver(verfile): + c_syms = {} + for line in open(verfile).readlines(): + line = line.strip() + + if line.endswith("{"): + line = str_removesuffix(line, " {") + line = str_removeprefix(line, "libnm_") + (major, minor, micro) = line.split("_") + if int(major) > 1 or int(minor) > 0: + if int(micro) > 0: + # Snap to next major version. Perhaps not + # exactly correct, but good for all symbols + # we export but nm_ethtool_optname_is_feature(). + minor = str(int(minor) + 2) + version = major + "." + minor + else: + version = None + elif ( + line.endswith(";") + and not line.startswith("}") + and not line.startswith("#") + and not line == "*;" + ): + c_syms[str_removesuffix(line, ";")] = version + + # This one is... messy. + c_syms["nm_ethtool_optname_is_feature"] = "1.20" + + return c_syms + + +parser = argparse.ArgumentParser() +parser.add_argument( + "--gir", + metavar="FILE", + help="NM-1.0.gir file", + required=True, +) +parser.add_argument( + "--ver", + metavar="FILE", + help="libnm.ver file", + required=True, +) + +args = parser.parse_args() + +gir_syms = syms_from_gir(args.gir) +ver_syms = syms_from_ver(args.ver) + +exit_code = 0 + +for (gir_sym, gir_ver) in gir_syms.items(): + if gir_sym not in ver_syms: + exit_code = 1 + print( + 'FAIL: "%s" found in "%s", but is not exported. Needs adding to "%s"?' + % (gir_sym, args.gir, args.ver), + file=sys.stderr, + ) + continue + if gir_ver != ver_syms[gir_sym]: + exit_code = 1 + print( + 'FAIL: "%s" exported in version "%s" but documented as available since "%s"' + % (gir_sym, ver_syms[gir_sym], gir_ver), + file=sys.stderr, + ) + +# In python2, dict.keys() returns lists, not sets. Cast them. +for sym in set(ver_syms.keys()) - set(gir_syms.keys()): + exit_code = 1 + print( + 'FAIL: "%s" found in "%s", but not in "%s". Maybe the doc comment is wrong or g-ir-scanner messed up?' + % (sym, args.ver, args.gir), + file=sys.stderr, + ) + +sys.exit(exit_code) diff --git a/src/libnm-client-public/nm-checkpoint.h b/src/libnm-client-public/nm-checkpoint.h index 456d7f6b..c47ff39c 100644 --- a/src/libnm-client-public/nm-checkpoint.h +++ b/src/libnm-client-public/nm-checkpoint.h @@ -29,6 +29,8 @@ G_BEGIN_DECLS /** * NMCheckpoint: + * + * Since: 1.12 */ typedef struct _NMCheckpoint NMCheckpoint; typedef struct _NMCheckpointClass NMCheckpointClass; diff --git a/src/libnm-client-public/nm-client.h b/src/libnm-client-public/nm-client.h index 6307f112..da5e509e 100644 --- a/src/libnm-client-public/nm-client.h +++ b/src/libnm-client-public/nm-client.h @@ -120,6 +120,11 @@ GQuark nm_client_error_quark(void); /* DNS stuff */ +/** + * NMDnsEntry: + * + * Since: 1.6 + */ typedef struct NMDnsEntry NMDnsEntry; NM_AVAILABLE_IN_1_6 diff --git a/src/libnm-client-public/nm-device-6lowpan.h b/src/libnm-client-public/nm-device-6lowpan.h index d5f8a7a5..7feba237 100644 --- a/src/libnm-client-public/nm-device-6lowpan.h +++ b/src/libnm-client-public/nm-device-6lowpan.h @@ -29,6 +29,8 @@ G_BEGIN_DECLS /** * NMDevice6Lowpan: + * + * Since: 1.14 */ typedef struct _NMDevice6Lowpan NMDevice6Lowpan; typedef struct _NMDevice6LowpanClass NMDevice6LowpanClass; @@ -36,13 +38,9 @@ typedef struct _NMDevice6LowpanClass NMDevice6LowpanClass; NM_AVAILABLE_IN_1_14 GType nm_device_6lowpan_get_type(void); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 NMDevice *nm_device_6lowpan_get_parent(NMDevice6Lowpan *device); -NM_AVAILABLE_IN_1_14 -NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) -const char *nm_device_6lowpan_get_hw_address(NMDevice6Lowpan *device); - G_END_DECLS #endif /* __NM_DEVICE_6LOWPAN_H__ */ diff --git a/src/libnm-client-public/nm-device-dummy.h b/src/libnm-client-public/nm-device-dummy.h index 8b2f7485..0e6c6fe6 100644 --- a/src/libnm-client-public/nm-device-dummy.h +++ b/src/libnm-client-public/nm-device-dummy.h @@ -28,6 +28,8 @@ G_BEGIN_DECLS /** * NMDeviceDummy: + * + * Since: 1.8 */ typedef struct _NMDeviceDummy NMDeviceDummy; typedef struct _NMDeviceDummyClass NMDeviceDummyClass; diff --git a/src/libnm-client-public/nm-device-ip-tunnel.h b/src/libnm-client-public/nm-device-ip-tunnel.h index 4f55dc0b..4b9b9f5b 100644 --- a/src/libnm-client-public/nm-device-ip-tunnel.h +++ b/src/libnm-client-public/nm-device-ip-tunnel.h @@ -41,6 +41,8 @@ G_BEGIN_DECLS /** * NMDeviceIPTunnel: + * + * Since: 1.2 */ typedef struct _NMDeviceIPTunnel NMDeviceIPTunnel; typedef struct _NMDeviceIPTunnelClass NMDeviceIPTunnelClass; diff --git a/src/libnm-client-public/nm-device-macsec.h b/src/libnm-client-public/nm-device-macsec.h index b1ec3637..f4f6f03d 100644 --- a/src/libnm-client-public/nm-device-macsec.h +++ b/src/libnm-client-public/nm-device-macsec.h @@ -41,6 +41,8 @@ G_BEGIN_DECLS /** * NMDeviceMacsec: + * + * Since: 1.6 */ typedef struct _NMDeviceMacsec NMDeviceMacsec; typedef struct _NMDeviceMacsecClass NMDeviceMacsecClass; @@ -48,7 +50,7 @@ typedef struct _NMDeviceMacsecClass NMDeviceMacsecClass; NM_AVAILABLE_IN_1_6 GType nm_device_macsec_get_type(void); -NM_AVAILABLE_IN_1_6 +NM_AVAILABLE_IN_1_40_4 NMDevice *nm_device_macsec_get_parent(NMDeviceMacsec *device); NM_AVAILABLE_IN_1_6 diff --git a/src/libnm-client-public/nm-device-macvlan.h b/src/libnm-client-public/nm-device-macvlan.h index 95699334..85292069 100644 --- a/src/libnm-client-public/nm-device-macvlan.h +++ b/src/libnm-client-public/nm-device-macvlan.h @@ -32,6 +32,8 @@ G_BEGIN_DECLS /** * NMDeviceMacvlan: + * + * Since: 1.2 */ typedef struct _NMDeviceMacvlan NMDeviceMacvlan; typedef struct _NMDeviceMacvlanClass NMDeviceMacvlanClass; diff --git a/src/libnm-client-public/nm-device-ovs-bridge.h b/src/libnm-client-public/nm-device-ovs-bridge.h index 8c454057..a6c9ff0b 100644 --- a/src/libnm-client-public/nm-device-ovs-bridge.h +++ b/src/libnm-client-public/nm-device-ovs-bridge.h @@ -29,6 +29,8 @@ G_BEGIN_DECLS /** * NMDeviceOvsBridge: + * + * Since: 1.10 */ typedef struct _NMDeviceOvsBridge NMDeviceOvsBridge; typedef struct _NMDeviceOvsBridgeClass NMDeviceOvsBridgeClass; diff --git a/src/libnm-client-public/nm-device-ovs-interface.h b/src/libnm-client-public/nm-device-ovs-interface.h index 1ba7ac3a..eb74ee48 100644 --- a/src/libnm-client-public/nm-device-ovs-interface.h +++ b/src/libnm-client-public/nm-device-ovs-interface.h @@ -28,6 +28,8 @@ G_BEGIN_DECLS /** * NMDeviceOvsInterface: + * + * Since: 1.10 */ typedef struct _NMDeviceOvsInterface NMDeviceOvsInterface; typedef struct _NMDeviceOvsInterfaceClass NMDeviceOvsInterfaceClass; diff --git a/src/libnm-client-public/nm-device-ovs-port.h b/src/libnm-client-public/nm-device-ovs-port.h index 7524cacb..8014ed91 100644 --- a/src/libnm-client-public/nm-device-ovs-port.h +++ b/src/libnm-client-public/nm-device-ovs-port.h @@ -29,6 +29,8 @@ G_BEGIN_DECLS /** * NMDeviceOvsPort: + * + * Since: 1.10 */ typedef struct _NMDeviceOvsPort NMDeviceOvsPort; typedef struct _NMDeviceOvsPortClass NMDeviceOvsPortClass; diff --git a/src/libnm-client-public/nm-device-ppp.h b/src/libnm-client-public/nm-device-ppp.h index 4003f901..4d56cd89 100644 --- a/src/libnm-client-public/nm-device-ppp.h +++ b/src/libnm-client-public/nm-device-ppp.h @@ -23,10 +23,13 @@ G_BEGIN_DECLS /** * NMDevicePpp: + * + * Since: 1.10 */ typedef struct _NMDevicePpp NMDevicePpp; typedef struct _NMDevicePppClass NMDevicePppClass; +NM_AVAILABLE_IN_1_10 GType nm_device_ppp_get_type(void); G_END_DECLS diff --git a/src/libnm-client-public/nm-device-tun.h b/src/libnm-client-public/nm-device-tun.h index e1e7310d..42690358 100644 --- a/src/libnm-client-public/nm-device-tun.h +++ b/src/libnm-client-public/nm-device-tun.h @@ -33,6 +33,8 @@ G_BEGIN_DECLS /** * NMDeviceTun: + * + * Since: 1.2 */ typedef struct _NMDeviceTun NMDeviceTun; typedef struct _NMDeviceTunClass NMDeviceTunClass; diff --git a/src/libnm-client-public/nm-device-veth.h b/src/libnm-client-public/nm-device-veth.h index 8f61ae20..9de27595 100644 --- a/src/libnm-client-public/nm-device-veth.h +++ b/src/libnm-client-public/nm-device-veth.h @@ -27,6 +27,8 @@ G_BEGIN_DECLS /** * NMDeviceVeth: + * + * Since: 1.30 */ typedef struct _NMDeviceVeth NMDeviceVeth; typedef struct _NMDeviceVethClass NMDeviceVethClass; @@ -34,7 +36,7 @@ typedef struct _NMDeviceVethClass NMDeviceVethClass; NM_AVAILABLE_IN_1_30 GType nm_device_veth_get_type(void); -NM_AVAILABLE_IN_1_30 +NM_AVAILABLE_IN_1_40_4 NMDevice *nm_device_veth_get_peer(NMDeviceVeth *device); G_END_DECLS diff --git a/src/libnm-client-public/nm-device-vrf.h b/src/libnm-client-public/nm-device-vrf.h index fbc8b202..82e0657d 100644 --- a/src/libnm-client-public/nm-device-vrf.h +++ b/src/libnm-client-public/nm-device-vrf.h @@ -24,6 +24,8 @@ G_BEGIN_DECLS /** * NMDeviceVrf: + * + * Since: 1.24 */ typedef struct _NMDeviceVrf NMDeviceVrf; typedef struct _NMDeviceVrfClass NMDeviceVrfClass; diff --git a/src/libnm-client-public/nm-device-vxlan.h b/src/libnm-client-public/nm-device-vxlan.h index 7939539d..fa7511e1 100644 --- a/src/libnm-client-public/nm-device-vxlan.h +++ b/src/libnm-client-public/nm-device-vxlan.h @@ -45,6 +45,8 @@ G_BEGIN_DECLS /** * NMDeviceVxlan: + * + * Since: 1.2 */ typedef struct _NMDeviceVxlan NMDeviceVxlan; typedef struct _NMDeviceVxlanClass NMDeviceVxlanClass; @@ -56,7 +58,7 @@ NM_AVAILABLE_IN_1_2 NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) const char *nm_device_vxlan_get_hw_address(NMDeviceVxlan *device); -NM_AVAILABLE_IN_1_2 +NM_AVAILABLE_IN_1_40_4 gboolean nm_device_vxlan_get_carrier(NMDeviceVxlan *device); NM_AVAILABLE_IN_1_2 NMDevice *nm_device_vxlan_get_parent(NMDeviceVxlan *device); @@ -84,7 +86,7 @@ NM_AVAILABLE_IN_1_2 guint nm_device_vxlan_get_limit(NMDeviceVxlan *device); NM_AVAILABLE_IN_1_2 gboolean nm_device_vxlan_get_proxy(NMDeviceVxlan *device); -NM_AVAILABLE_IN_1_2 +NM_AVAILABLE_IN_1_40_4 gboolean nm_device_vxlan_get_rsc(NMDeviceVxlan *device); NM_AVAILABLE_IN_1_2 gboolean nm_device_vxlan_get_l2miss(NMDeviceVxlan *device); diff --git a/src/libnm-client-public/nm-device-wifi-p2p.h b/src/libnm-client-public/nm-device-wifi-p2p.h index ad0ca436..31add1e3 100644 --- a/src/libnm-client-public/nm-device-wifi-p2p.h +++ b/src/libnm-client-public/nm-device-wifi-p2p.h @@ -44,7 +44,7 @@ NM_AVAILABLE_IN_1_16 NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) const char *nm_device_wifi_p2p_get_hw_address(NMDeviceWifiP2P *device); -NM_AVAILABLE_IN_1_16 +NM_AVAILABLE_IN_1_40_4 NMWifiP2PPeer *nm_device_wifi_p2p_get_peer_by_path(NMDeviceWifiP2P *device, const char *path); NM_AVAILABLE_IN_1_16 diff --git a/src/libnm-client-public/nm-device-wireguard.h b/src/libnm-client-public/nm-device-wireguard.h index 756dfb4e..fa167878 100644 --- a/src/libnm-client-public/nm-device-wireguard.h +++ b/src/libnm-client-public/nm-device-wireguard.h @@ -27,6 +27,8 @@ G_BEGIN_DECLS /** * NMDeviceWireGuard: + * + * Since: 1.14 */ typedef struct _NMDeviceWireGuard NMDeviceWireGuard; typedef struct _NMDeviceWireGuardClass NMDeviceWireGuardClass; diff --git a/src/libnm-client-public/nm-device-wpan.h b/src/libnm-client-public/nm-device-wpan.h index 8b011851..d6805040 100644 --- a/src/libnm-client-public/nm-device-wpan.h +++ b/src/libnm-client-public/nm-device-wpan.h @@ -27,6 +27,8 @@ G_BEGIN_DECLS /** * NMDeviceWpan: + * + * Since: 1.14 */ typedef struct _NMDeviceWpan NMDeviceWpan; typedef struct _NMDeviceWpanClass NMDeviceWpanClass; @@ -34,10 +36,6 @@ typedef struct _NMDeviceWpanClass NMDeviceWpanClass; NM_AVAILABLE_IN_1_14 GType nm_device_wpan_get_type(void); -NM_AVAILABLE_IN_1_14 -NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) -const char *nm_device_wpan_get_hw_address(NMDeviceWpan *device); - G_END_DECLS #endif /* __NM_DEVICE_WPAN_H__ */ diff --git a/src/libnm-client-public/nm-vpn-plugin-old.h b/src/libnm-client-public/nm-vpn-plugin-old.h index fe0d4bc2..cc6f6178 100644 --- a/src/libnm-client-public/nm-vpn-plugin-old.h +++ b/src/libnm-client-public/nm-vpn-plugin-old.h @@ -107,15 +107,9 @@ void nm_vpn_plugin_old_set_login_banner(NMVpnPluginOld *plugin, const char *bann NM_DEPRECATED_IN_1_2 void nm_vpn_plugin_old_failure(NMVpnPluginOld *plugin, NMVpnPluginFailure reason); -NM_DEPRECATED_IN_1_2 -void nm_vpn_plugin_old_set_config(NMVpnPluginOld *plugin, GVariant *config); - NM_DEPRECATED_IN_1_2 void nm_vpn_plugin_old_set_ip4_config(NMVpnPluginOld *plugin, GVariant *ip4_config); -NM_DEPRECATED_IN_1_2 -void nm_vpn_plugin_old_set_ip6_config(NMVpnPluginOld *plugin, GVariant *ip6_config); - NM_DEPRECATED_IN_1_2 gboolean nm_vpn_plugin_old_disconnect(NMVpnPluginOld *plugin, GError **err); diff --git a/src/libnm-client-public/nm-vpn-service-plugin.h b/src/libnm-client-public/nm-vpn-service-plugin.h index 5187d93d..baf5b3a6 100644 --- a/src/libnm-client-public/nm-vpn-service-plugin.h +++ b/src/libnm-client-public/nm-vpn-service-plugin.h @@ -35,6 +35,8 @@ G_BEGIN_DECLS /** * NMVpnServicePlugin: + * + * Since: 1.2 */ typedef struct { NM_AVAILABLE_IN_1_2 diff --git a/src/libnm-client-public/nm-wifi-p2p-peer.h b/src/libnm-client-public/nm-wifi-p2p-peer.h index eff27bcb..dd8a109f 100644 --- a/src/libnm-client-public/nm-wifi-p2p-peer.h +++ b/src/libnm-client-public/nm-wifi-p2p-peer.h @@ -37,6 +37,8 @@ G_BEGIN_DECLS /** * NMWifiP2PPeer: + * + * Since: 1.16 */ typedef struct _NMWifiP2PPeer NMWifiP2PPeer; typedef struct _NMWifiP2PPeerClass NMWifiP2PPeerClass; diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c index aed4be21..2f5bf357 100644 --- a/src/libnm-core-impl/nm-connection.c +++ b/src/libnm-core-impl/nm-connection.c @@ -228,8 +228,10 @@ _nm_connection_add_setting(NMConnection *connection, NMSetting *setting) priv = NM_CONNECTION_GET_PRIVATE(connection); s_old = priv->settings[setting_info->meta_type]; - if (s_old == setting) + if (s_old == setting) { + g_object_unref(s_old); return; + } priv->settings[setting_info->meta_type] = setting; @@ -3487,7 +3489,7 @@ nm_connection_get_setting_olpc_mesh(NMConnection *connection) * * Returns: (transfer none): an #NMSettingOvsBridge if the connection contains one, otherwise %NULL * - * Since: 1.10 + * Since: 1.14 **/ NMSettingOvsBridge * nm_connection_get_setting_ovs_bridge(NMConnection *connection) @@ -3503,7 +3505,7 @@ nm_connection_get_setting_ovs_bridge(NMConnection *connection) * * Returns: (transfer none): an #NMSettingOvsInterface if the connection contains one, otherwise %NULL * - * Since: 1.10 + * Since: 1.14 **/ NMSettingOvsInterface * nm_connection_get_setting_ovs_interface(NMConnection *connection) @@ -3520,7 +3522,7 @@ nm_connection_get_setting_ovs_interface(NMConnection *connection) * * Returns: (transfer none): an #NMSettingOvsPatch if the connection contains one, otherwise %NULL * - * Since: 1.10 + * Since: 1.14 **/ NMSettingOvsPatch * nm_connection_get_setting_ovs_patch(NMConnection *connection) @@ -3536,7 +3538,7 @@ nm_connection_get_setting_ovs_patch(NMConnection *connection) * * Returns: (transfer none): an #NMSettingOvsPort if the connection contains one, otherwise %NULL * - * Since: 1.10 + * Since: 1.14 **/ NMSettingOvsPort * nm_connection_get_setting_ovs_port(NMConnection *connection) @@ -3626,7 +3628,7 @@ nm_connection_get_setting_tc_config(NMConnection *connection) * * Returns: (transfer none): an #NMSettingTun if the connection contains one, otherwise %NULL * - * Since: 1.2 + * Since: 1.14 **/ NMSettingTun * nm_connection_get_setting_tun(NMConnection *connection) diff --git a/src/libnm-core-impl/nm-setting-6lowpan.c b/src/libnm-core-impl/nm-setting-6lowpan.c index 765af69b..21b3dbb9 100644 --- a/src/libnm-core-impl/nm-setting-6lowpan.c +++ b/src/libnm-core-impl/nm-setting-6lowpan.c @@ -29,6 +29,8 @@ typedef struct { * NMSetting6Lowpan: * * 6LoWPAN Settings + * + * Since: 1.14 */ struct _NMSetting6Lowpan { NMSetting parent; @@ -51,7 +53,7 @@ G_DEFINE_TYPE(NMSetting6Lowpan, nm_setting_6lowpan, NM_TYPE_SETTING) * * Returns: the #NMSetting6Lowpan:parent property of the setting * - * Since: 1.14 + * Since: 1.42, 1.40.4 **/ const char * nm_setting_6lowpan_get_parent(NMSetting6Lowpan *setting) @@ -139,7 +141,7 @@ nm_setting_6lowpan_init(NMSetting6Lowpan *setting) * * Returns: (transfer full): the new empty #NMSetting6Lowpan object * - * Since: 1.14 + * Since: 1.42, 1.40.4 **/ NMSetting * nm_setting_6lowpan_new(void) diff --git a/src/libnm-core-impl/nm-setting-bridge.c b/src/libnm-core-impl/nm-setting-bridge.c index 39a3fb60..89611147 100644 --- a/src/libnm-core-impl/nm-setting-bridge.c +++ b/src/libnm-core-impl/nm-setting-bridge.c @@ -926,7 +926,7 @@ _nm_setting_bridge_get_vlans(NMSettingBridge *setting) * * Returns: the #NMSettingBridge:group-address property of the setting * - * Since 1.24 + * Since: 1.24 **/ const char * nm_setting_bridge_get_group_address(const NMSettingBridge *setting) @@ -942,7 +942,7 @@ nm_setting_bridge_get_group_address(const NMSettingBridge *setting) * * Returns: the #NMSettingBridge:vlan-protocol property of the setting * - * Since 1.24 + * Since: 1.24 **/ const char * nm_setting_bridge_get_vlan_protocol(const NMSettingBridge *setting) @@ -958,7 +958,7 @@ nm_setting_bridge_get_vlan_protocol(const NMSettingBridge *setting) * * Returns: the #NMSettingBridge:vlan-stats-enabled property of the setting * - * Since 1.24 + * Since: 1.24 **/ gboolean nm_setting_bridge_get_vlan_stats_enabled(const NMSettingBridge *setting) @@ -974,7 +974,7 @@ nm_setting_bridge_get_vlan_stats_enabled(const NMSettingBridge *setting) * * Returns: the #NMSettingBridge:multicast-router property of the setting * - * Since 1.24 + * Since: 1.24 **/ const char * nm_setting_bridge_get_multicast_router(const NMSettingBridge *setting) @@ -990,7 +990,7 @@ nm_setting_bridge_get_multicast_router(const NMSettingBridge *setting) * * Returns: the #NMSettingBridge:multicast-query-use-ifaddr property of the setting * - * Since 1.24 + * Since: 1.24 **/ gboolean nm_setting_bridge_get_multicast_query_use_ifaddr(const NMSettingBridge *setting) @@ -1006,7 +1006,7 @@ nm_setting_bridge_get_multicast_query_use_ifaddr(const NMSettingBridge *setting) * * Returns: the #NMSettingBridge:multicast-querier property of the setting * - * Since 1.24 + * Since: 1.24 **/ gboolean nm_setting_bridge_get_multicast_querier(const NMSettingBridge *setting) @@ -1022,7 +1022,7 @@ nm_setting_bridge_get_multicast_querier(const NMSettingBridge *setting) * * Returns: the #NMSettingBridge:multicast-hash-max property of the setting * - * Since 1.26 + * Since: 1.26 **/ guint32 nm_setting_bridge_get_multicast_hash_max(const NMSettingBridge *setting) @@ -1038,7 +1038,7 @@ nm_setting_bridge_get_multicast_hash_max(const NMSettingBridge *setting) * * Returns: the #NMSettingBridge:multicast-last-member-count property of the setting * - * Since 1.26 + * Since: 1.26 **/ guint32 nm_setting_bridge_get_multicast_last_member_count(const NMSettingBridge *setting) @@ -1054,7 +1054,7 @@ nm_setting_bridge_get_multicast_last_member_count(const NMSettingBridge *setting * * Returns: the #NMSettingBridge:multicast-last-member-interval property of the setting * - * Since 1.26 + * Since: 1.26 **/ guint64 nm_setting_bridge_get_multicast_last_member_interval(const NMSettingBridge *setting) @@ -1070,7 +1070,7 @@ nm_setting_bridge_get_multicast_last_member_interval(const NMSettingBridge *sett * * Returns: the #NMSettingBridge:multicast-membership-interval property of the setting * - * Since 1.26 + * Since: 1.26 **/ guint64 nm_setting_bridge_get_multicast_membership_interval(const NMSettingBridge *setting) @@ -1086,7 +1086,7 @@ nm_setting_bridge_get_multicast_membership_interval(const NMSettingBridge *setti * * Returns: the #NMSettingBridge:multicast-querier-interval property of the setting * - * Since 1.26 + * Since: 1.26 **/ guint64 nm_setting_bridge_get_multicast_querier_interval(const NMSettingBridge *setting) @@ -1102,7 +1102,7 @@ nm_setting_bridge_get_multicast_querier_interval(const NMSettingBridge *setting) * * Returns: the #NMSettingBridge:multicast-query-interval property of the setting * - * Since 1.26 + * Since: 1.26 **/ guint64 nm_setting_bridge_get_multicast_query_interval(const NMSettingBridge *setting) @@ -1118,7 +1118,7 @@ nm_setting_bridge_get_multicast_query_interval(const NMSettingBridge *setting) * * Returns: the #NMSettingBridge:multicast-query-response-interval property of the setting * - * Since 1.26 + * Since: 1.26 **/ guint64 nm_setting_bridge_get_multicast_query_response_interval(const NMSettingBridge *setting) @@ -1134,7 +1134,7 @@ nm_setting_bridge_get_multicast_query_response_interval(const NMSettingBridge *s * * Returns: the #NMSettingBridge:multicast-query-response-interval property of the setting * - * Since 1.26 + * Since: 1.26 **/ guint32 nm_setting_bridge_get_multicast_startup_query_count(const NMSettingBridge *setting) @@ -1150,7 +1150,7 @@ nm_setting_bridge_get_multicast_startup_query_count(const NMSettingBridge *setti * * Returns: the #NMSettingBridge:multicast-startup-query-interval property of the setting * - * Since 1.26 + * Since: 1.26 **/ guint64 nm_setting_bridge_get_multicast_startup_query_interval(const NMSettingBridge *setting) diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c index cbce1c12..bc14c767 100644 --- a/src/libnm-core-impl/nm-setting-connection.c +++ b/src/libnm-core-impl/nm-setting-connection.c @@ -1023,7 +1023,7 @@ nm_setting_connection_get_dns_over_tls(NMSettingConnection *setting) * * Returns: the #NMSettingConnection:mptcp-flags property of the setting. * - * Since: 1.40 + * Since: 1.42, 1.40.4 **/ NMMptcpFlags nm_setting_connection_get_mptcp_flags(NMSettingConnection *setting) diff --git a/src/libnm-core-impl/nm-setting-ethtool.c b/src/libnm-core-impl/nm-setting-ethtool.c index 71179efd..1db6c335 100644 --- a/src/libnm-core-impl/nm-setting-ethtool.c +++ b/src/libnm-core-impl/nm-setting-ethtool.c @@ -23,20 +23,6 @@ /*****************************************************************************/ -static const GVariantType * -get_variant_type_from_ethtool_id(NMEthtoolID ethtool_id) -{ - if (nm_ethtool_id_is_feature(ethtool_id) || nm_ethtool_id_is_pause(ethtool_id)) - return G_VARIANT_TYPE_BOOLEAN; - - if (nm_ethtool_id_is_coalesce(ethtool_id) || nm_ethtool_id_is_ring(ethtool_id)) - return G_VARIANT_TYPE_UINT32; - - return NULL; -} - -/*****************************************************************************/ - /** * nm_ethtool_optname_is_feature: * @optname: (allow-none): the option name to check @@ -302,7 +288,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) NMEthtoolID ethtool_id; ethtool_id = nm_ethtool_id_get_by_name(optname); - variant_type = get_variant_type_from_ethtool_id(ethtool_id); + variant_type = nm_ethtool_id_get_variant_type(ethtool_id); if (!variant_type) { g_set_error_literal(error, @@ -365,7 +351,7 @@ get_variant_type(const NMSettInfoSetting *sett_info, const char *name, GError ** { const GVariantType *variant_type; - variant_type = get_variant_type_from_ethtool_id(nm_ethtool_id_get_by_name(name)); + variant_type = nm_ethtool_id_get_variant_type(nm_ethtool_id_get_by_name(name)); if (!variant_type) { g_set_error(error, diff --git a/src/libnm-core-impl/nm-setting-hostname.c b/src/libnm-core-impl/nm-setting-hostname.c index 276a75a8..8a5e50be 100644 --- a/src/libnm-core-impl/nm-setting-hostname.c +++ b/src/libnm-core-impl/nm-setting-hostname.c @@ -134,7 +134,7 @@ nm_setting_hostname_init(NMSettingHostname *setting) * * Returns: (transfer full): the new empty #NMSettingHostname object * - * Since: 1.30 + * Since: 1.42, 1.40.4 **/ NMSetting * nm_setting_hostname_new(void) diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c index 916a8038..73f98ab1 100644 --- a/src/libnm-core-impl/nm-setting-ip-config.c +++ b/src/libnm-core-impl/nm-setting-ip-config.c @@ -266,6 +266,8 @@ nm_ip_address_unref(NMIPAddress *address) * * Returns: 0 if the two objects have the same values (according to their flags) * or a integer indicating the compare order. + * + * Since: 1.22 **/ int nm_ip_address_cmp_full(const NMIPAddress *a, const NMIPAddress *b, NMIPAddressCmpFlags cmp_flags) @@ -4343,6 +4345,8 @@ nm_setting_ip_config_get_num_dns_options(NMSettingIPConfig *setting) * a default configuration, while the former explicitly means "no-options". * * Returns: whether DNS options are initialized or left unset (the default). + * + * Since: 1.2 **/ gboolean nm_setting_ip_config_has_dns_options(NMSettingIPConfig *setting) @@ -5291,7 +5295,7 @@ nm_setting_ip_config_get_required_timeout(NMSettingIPConfig *setting) * * Returns: the configured DHCP IAID (Identity Association Identifier) * - * Since: 1.22 + * Since: 1.42, 1.40.4 **/ const char * nm_setting_ip_config_get_dhcp_iaid(NMSettingIPConfig *setting) diff --git a/src/libnm-core-impl/nm-setting-ip-tunnel.c b/src/libnm-core-impl/nm-setting-ip-tunnel.c index d42e97b9..73416813 100644 --- a/src/libnm-core-impl/nm-setting-ip-tunnel.c +++ b/src/libnm-core-impl/nm-setting-ip-tunnel.c @@ -240,7 +240,7 @@ nm_setting_ip_tunnel_get_output_key(NMSettingIPTunnel *setting) * * Returns: the encapsulation limit value * - * Since: 1.2 + * Since: 1.42, 1.40.4 **/ guint nm_setting_ip_tunnel_get_encapsulation_limit(NMSettingIPTunnel *setting) @@ -258,7 +258,7 @@ nm_setting_ip_tunnel_get_encapsulation_limit(NMSettingIPTunnel *setting) * * Returns: the flow label value * - * Since: 1.2 + * Since: 1.42, 1.40.4 **/ guint nm_setting_ip_tunnel_get_flow_label(NMSettingIPTunnel *setting) @@ -286,7 +286,7 @@ nm_setting_ip_tunnel_get_mtu(NMSettingIPTunnel *setting) return NM_SETTING_IP_TUNNEL_GET_PRIVATE(setting)->mtu; } -/* +/** * nm_setting_ip_tunnel_get_flags: * @setting: the #NMSettingIPTunnel * diff --git a/src/libnm-core-impl/nm-setting-ip4-config.c b/src/libnm-core-impl/nm-setting-ip4-config.c index ff56834e..d991152c 100644 --- a/src/libnm-core-impl/nm-setting-ip4-config.c +++ b/src/libnm-core-impl/nm-setting-ip4-config.c @@ -138,7 +138,7 @@ nm_setting_ip4_config_get_dhcp_vendor_class_identifier(NMSettingIP4Config *setti * * Returns: the link-local configuration * - * Since: 1.40 + * Since: 1.42, 1.40.4 **/ NMSettingIP4LinkLocal nm_setting_ip4_config_get_link_local(NMSettingIP4Config *setting) @@ -898,7 +898,7 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) * a global connection default gets consulted. * If still unspecified, the DHCP option is not sent to the server. * - * Since 1.28 + * Since: 1.28 */ /* ---ifcfg-rh--- * property: dhcp-vendor-class-identifier @@ -928,7 +928,7 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) * falling back to "auto". Note that if "ipv4.method" is "disabled", then * link local addressing is always disabled too. The default is "default". * - * Since 1.40 + * Since: 1.40 */ /* ---ifcfg-rh--- * property: link-local diff --git a/src/libnm-core-impl/nm-setting-ovs-bridge.c b/src/libnm-core-impl/nm-setting-ovs-bridge.c index b15aab19..7dc9fda4 100644 --- a/src/libnm-core-impl/nm-setting-ovs-bridge.c +++ b/src/libnm-core-impl/nm-setting-ovs-bridge.c @@ -120,7 +120,7 @@ nm_setting_ovs_bridge_get_stp_enable(NMSettingOvsBridge *self) * * Returns: the #NMSettingOvsBridge:datapath_type property of the setting * - * Since: 1.20 + * Since: 1.42, 1.40.4 **/ const char * nm_setting_ovs_bridge_get_datapath_type(NMSettingOvsBridge *self) diff --git a/src/libnm-core-impl/nm-setting-ovs-external-ids.c b/src/libnm-core-impl/nm-setting-ovs-external-ids.c index 6b8d5d37..f4e31f81 100644 --- a/src/libnm-core-impl/nm-setting-ovs-external-ids.c +++ b/src/libnm-core-impl/nm-setting-ovs-external-ids.c @@ -195,6 +195,8 @@ _nm_setting_ovs_external_ids_get_data(NMSettingOvsExternalIDs *self) * * Returns: (array length=out_len) (transfer none): a * %NULL-terminated array containing each key from the table. + * + * Since: 1.30 **/ const char *const * nm_setting_ovs_external_ids_get_data_keys(NMSettingOvsExternalIDs *setting, guint *out_len) diff --git a/src/libnm-core-impl/nm-setting-sriov.c b/src/libnm-core-impl/nm-setting-sriov.c index 30dd8f54..f9bee21e 100644 --- a/src/libnm-core-impl/nm-setting-sriov.c +++ b/src/libnm-core-impl/nm-setting-sriov.c @@ -372,7 +372,7 @@ const NMVariantAttributeSpec *const _nm_sriov_vf_attribute_spec[] = { * * Returns: %TRUE if the attribute is valid, %FALSE otherwise * - * Since: 1.14 + * Since: 1.42, 1.40.4 */ gboolean nm_sriov_vf_attribute_validate(const char *name, GVariant *value, gboolean *known, GError **error) @@ -649,7 +649,7 @@ nm_sriov_vf_get_vlan_qos(const NMSriovVF *vf, guint vlan_id) return vlan->qos; } -/* +/** * nm_sriov_vf_get_vlan_protocol: * @vf: the #NMSriovVF * @vlan_id: the VLAN id diff --git a/src/libnm-core-impl/nm-setting-tc-config.c b/src/libnm-core-impl/nm-setting-tc-config.c index 08a7f94d..529bbca1 100644 --- a/src/libnm-core-impl/nm-setting-tc-config.c +++ b/src/libnm-core-impl/nm-setting-tc-config.c @@ -935,7 +935,7 @@ nm_tc_tfilter_get_parent(NMTCTfilter *tfilter) * * Returns: the action associated with a traffic filter. * - * Since: 1.12 + * Since: 1.42, 1.40.4 **/ NMTCAction * nm_tc_tfilter_get_action(NMTCTfilter *tfilter) @@ -956,7 +956,7 @@ nm_tc_tfilter_get_action(NMTCTfilter *tfilter) * * Sets the action associated with a traffic filter. * - * Since: 1.12 + * Since: 1.42, 1.40.4 **/ void nm_tc_tfilter_set_action(NMTCTfilter *tfilter, NMTCAction *action) diff --git a/src/libnm-core-impl/nm-setting-user.c b/src/libnm-core-impl/nm-setting-user.c index 0e95d38b..70bdc62a 100644 --- a/src/libnm-core-impl/nm-setting-user.c +++ b/src/libnm-core-impl/nm-setting-user.c @@ -35,6 +35,8 @@ typedef struct { * NMSettingUser: * * General User Profile Settings + * + * Since: 1.8 */ struct _NMSettingUser { NMSetting parent; @@ -216,6 +218,8 @@ _create_data_hash(void) * * Returns: (array length=out_len) (transfer none): a * %NULL-terminated array containing each key from the table. + * + * Since: 1.8 **/ const char *const * nm_setting_user_get_keys(NMSettingUser *setting, guint *out_len) @@ -498,6 +502,8 @@ nm_setting_user_init(NMSettingUser *self) * Creates a new #NMSettingUser object with default values. * * Returns: the new empty #NMSettingUser object + * + * Since: 1.8 **/ NMSetting * nm_setting_user_new(void) diff --git a/src/libnm-core-impl/nm-setting-vpn.c b/src/libnm-core-impl/nm-setting-vpn.c index 42f75fa2..7e6f18dd 100644 --- a/src/libnm-core-impl/nm-setting-vpn.c +++ b/src/libnm-core-impl/nm-setting-vpn.c @@ -147,6 +147,8 @@ nm_setting_vpn_get_user_name(NMSettingVpn *setting) * @setting: the #NMSettingVpn * * Returns: the #NMSettingVpn:persistent property of the setting + * + * Since: 1.42, 1.40.4 **/ gboolean nm_setting_vpn_get_persistent(NMSettingVpn *setting) diff --git a/src/libnm-core-impl/nm-setting-wireguard.c b/src/libnm-core-impl/nm-setting-wireguard.c index ad0f01d5..599ded3c 100644 --- a/src/libnm-core-impl/nm-setting-wireguard.c +++ b/src/libnm-core-impl/nm-setting-wireguard.c @@ -1437,7 +1437,7 @@ _peers_clear(NMSettingWireGuardPrivate *priv) } /** - * nm_setting_wireguard_: + * nm_setting_wireguard_clear_peers: * @self: the #NMSettingWireGuard instance * * Returns: the number of cleared peers. diff --git a/src/libnm-core-impl/nm-setting-wireless-security.c b/src/libnm-core-impl/nm-setting-wireless-security.c index d9c5afb8..ebefd504 100644 --- a/src/libnm-core-impl/nm-setting-wireless-security.c +++ b/src/libnm-core-impl/nm-setting-wireless-security.c @@ -561,7 +561,7 @@ nm_setting_wireless_security_clear_groups(NMSettingWirelessSecurity *setting) _notify(setting, PROP_GROUP); } -/* +/** * nm_setting_wireless_security_get_pmf: * @setting: the #NMSettingWirelessSecurity * @@ -798,7 +798,7 @@ nm_setting_wireless_security_get_wps_method(NMSettingWirelessSecurity *setting) return NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE(setting)->wps_method; } -/* +/** * nm_setting_wireless_security_get_fils: * @setting: the #NMSettingWirelessSecurity * diff --git a/src/libnm-core-impl/nm-setting-wpan.c b/src/libnm-core-impl/nm-setting-wpan.c index 9e25dd16..a3e56ded 100644 --- a/src/libnm-core-impl/nm-setting-wpan.c +++ b/src/libnm-core-impl/nm-setting-wpan.c @@ -53,6 +53,8 @@ typedef struct { * NMSettingWpan: * * IEEE 802.15.4 (WPAN) MAC Settings + * + * Since: 1.14 */ struct _NMSettingWpan { NMSetting parent; @@ -75,7 +77,7 @@ G_DEFINE_TYPE(NMSettingWpan, nm_setting_wpan, NM_TYPE_SETTING) * * Returns: the #NMSettingWpan:mac-address property of the setting * - * Since: 1.14 + * Since: 1.42, 1.40.4 **/ const char * nm_setting_wpan_get_mac_address(NMSettingWpan *setting) @@ -91,7 +93,7 @@ nm_setting_wpan_get_mac_address(NMSettingWpan *setting) * * Returns: the #NMSettingWpan:pan-id property of the setting * - * Since: 1.14 + * Since: 1.42, 1.40.4 **/ guint16 nm_setting_wpan_get_pan_id(NMSettingWpan *setting) @@ -107,7 +109,7 @@ nm_setting_wpan_get_pan_id(NMSettingWpan *setting) * * Returns: the #NMSettingWpan:short-address property of the setting * - * Since: 1.14 + * Since: 1.42, 1.40.4 **/ guint16 nm_setting_wpan_get_short_address(NMSettingWpan *setting) @@ -123,7 +125,7 @@ nm_setting_wpan_get_short_address(NMSettingWpan *setting) * * Returns: the #NMSettingWpan:page property of the setting * - * Since: 1.16 + * Since: 1.42, 1.40.4 **/ gint16 nm_setting_wpan_get_page(NMSettingWpan *setting) @@ -139,7 +141,7 @@ nm_setting_wpan_get_page(NMSettingWpan *setting) * * Returns: the #NMSettingWpan:channel property of the setting * - * Since: 1.16 + * Since: 1.42, 1.40.4 **/ gint16 nm_setting_wpan_get_channel(NMSettingWpan *setting) @@ -211,7 +213,7 @@ nm_setting_wpan_init(NMSettingWpan *setting) * * Returns: (transfer full): the new empty #NMSettingWpan object * - * Since: 1.14 + * Since: 1.42, 1.40.4 **/ NMSetting * nm_setting_wpan_new(void) diff --git a/src/libnm-core-impl/nm-setting.c b/src/libnm-core-impl/nm-setting.c index 35070bae..b6f72137 100644 --- a/src/libnm-core-impl/nm-setting.c +++ b/src/libnm-core-impl/nm-setting.c @@ -30,6 +30,20 @@ /*****************************************************************************/ +/* + * We use literal numbers in the header (as opposed to e.g. + * (1 << (1 + G_PARAM_USER_SHIFT))), because g-ir-scanner sometimes gets + * confused by unknown tokens and silently treats them as zero: + * https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/366 + */ + +G_STATIC_ASSERT(G_PARAM_USER_SHIFT == 8); +G_STATIC_ASSERT(NM_SETTING_PARAM_REQUIRED == (1 << (1 + G_PARAM_USER_SHIFT))); +G_STATIC_ASSERT(NM_SETTING_PARAM_SECRET == (1 << (2 + G_PARAM_USER_SHIFT))); +G_STATIC_ASSERT(NM_SETTING_PARAM_FUZZY_IGNORE == (1 << (3 + G_PARAM_USER_SHIFT))); + +/*****************************************************************************/ + typedef struct { GHashTable *hash; const char **names; @@ -3847,7 +3861,7 @@ nm_setting_option_clear_by_name(NMSetting *setting, NMUtilsPredicateStr predicat * Returns: (transfer none): the #GVariant or %NULL if the option * is not set. * - * Since: 1.26. + * Since: 1.26 */ GVariant * nm_setting_option_get(NMSetting *setting, const char *opt_name) diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index 3c4cbc65..be6ad4de 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -1942,6 +1942,8 @@ next: * include additional attributes. * * Returns: (transfer none): a new floating #GVariant representing @addresses. + * + * Since: 1.42, 1.40.4 **/ GVariant * nm_utils_ip_addresses_to_variant(GPtrArray *addresses) @@ -1995,6 +1997,8 @@ nm_utils_ip_addresses_to_variant(GPtrArray *addresses) * * Returns: (transfer full) (element-type NMIPAddress): a newly allocated * #GPtrArray of #NMIPAddress objects + * + * Since: 1.42, 1.40.4 **/ GPtrArray * nm_utils_ip_addresses_from_variant(GVariant *value, int family) @@ -2054,6 +2058,8 @@ nm_utils_ip_addresses_from_variant(GVariant *value, int family) * prefix, next hop, metric, and additional attributes). * * Returns: (transfer none): a new floating #GVariant representing @routes. + * + * Since: 1.42, 1.40.4 **/ GVariant * nm_utils_ip_routes_to_variant(GPtrArray *routes) @@ -2120,6 +2126,8 @@ nm_utils_ip_routes_to_variant(GPtrArray *routes) * * Returns: (transfer full) (element-type NMIPRoute): a newly allocated * #GPtrArray of #NMIPRoute objects + * + * Since: 1.42, 1.40.4 **/ GPtrArray * nm_utils_ip_routes_from_variant(GVariant *value, int family) @@ -4314,6 +4322,8 @@ nm_utils_is_valid_iface_name_utf8safe(const char *utf8safe_name) * * Before 1.20, this function did not accept %NULL as @name argument. If you * want to run against older versions of libnm, don't pass %NULL. + * + * Since: 1.6 */ gboolean nm_utils_is_valid_iface_name(const char *name, GError **error) @@ -5249,7 +5259,7 @@ next: return g_steal_pointer(&ht); } -/* +/** * nm_utils_format_variant_attributes: * @attributes: (element-type utf8 GVariant): a #GHashTable mapping attribute names to #GVariant values * @attr_separator: the attribute separator character @@ -5275,8 +5285,8 @@ nm_utils_format_variant_attributes(GHashTable *attributes, /*****************************************************************************/ -/* - * nm_utils_get_timestamp_msec(): +/** + * nm_utils_get_timestamp_msec: * * Gets current time in milliseconds of CLOCK_BOOTTIME. * @@ -5314,7 +5324,7 @@ nm_utils_get_timestamp_msec(void) * Returns: the version ID of the libnm version. That is, the %NM_VERSION * at runtime. * - * Since: 1.6.0 + * Since: 1.6 */ guint nm_utils_version(void) diff --git a/src/libnm-core-impl/nm-vpn-editor-plugin.c b/src/libnm-core-impl/nm-vpn-editor-plugin.c index 225f25ef..3a6abbc2 100644 --- a/src/libnm-core-impl/nm-vpn-editor-plugin.c +++ b/src/libnm-core-impl/nm-vpn-editor-plugin.c @@ -470,8 +470,20 @@ nm_vpn_editor_plugin_import(NMVpnEditorPlugin *plugin, const char *path, GError g_return_val_if_fail(NM_IS_VPN_EDITOR_PLUGIN(plugin), NULL); if (nm_vpn_editor_plugin_get_capabilities(plugin) & NM_VPN_EDITOR_PLUGIN_CAPABILITY_IMPORT) { + gs_free_error GError *error2 = NULL; + g_return_val_if_fail(NM_VPN_EDITOR_PLUGIN_GET_INTERFACE(plugin)->import_from_file != NULL, NULL); + + if (!error) { + /* Some VPN plugins crash if error argument is omitted. Work around that + * in libnm by always requesting an error. + * + * https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/-/blob/c7d197477c94c5bae0396f0ef826db4d835e487d/properties/nm-vpnc-editor-plugin.c#L281 + **/ + error = &error2; + } + return NM_VPN_EDITOR_PLUGIN_GET_INTERFACE(plugin)->import_from_file(plugin, path, error); } diff --git a/src/libnm-core-impl/nm-vpn-plugin-info.c b/src/libnm-core-impl/nm-vpn-plugin-info.c index 473063fb..baa19347 100644 --- a/src/libnm-core-impl/nm-vpn-plugin-info.c +++ b/src/libnm-core-impl/nm-vpn-plugin-info.c @@ -898,7 +898,7 @@ nm_vpn_plugin_info_get_program(NMVpnPluginInfo *self) * * Returns: %TRUE if the service supports multiple instances with different bus names, otherwise %FALSE * - * Since: 1.2 + * Since: 1.42, 1.40.4 */ gboolean nm_vpn_plugin_info_supports_multiple(NMVpnPluginInfo *self) diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c index 64b3dca7..a21f50db 100644 --- a/src/libnm-core-impl/tests/test-general.c +++ b/src/libnm-core-impl/tests/test-general.c @@ -3139,6 +3139,9 @@ test_setting_new_from_dbus_bad(void) NULL); nm_connection_add_setting(conn, setting); + /* Test assignment of same setting again. */ + nm_connection_add_setting(conn, g_object_ref(setting)); + setting = nm_setting_wireless_new(); ssid = g_bytes_new("my-ssid", 7); g_object_set(setting, diff --git a/src/libnm-core-public/nm-connection.h b/src/libnm-core-public/nm-connection.h index 93061f25..47004ce8 100644 --- a/src/libnm-core-public/nm-connection.h +++ b/src/libnm-core-public/nm-connection.h @@ -220,12 +220,13 @@ NMSettingMacsec *nm_connection_get_setting_macsec(NMConnection *connection); NM_AVAILABLE_IN_1_2 NMSettingMacvlan *nm_connection_get_setting_macvlan(NMConnection *connection); NMSettingOlpcMesh *nm_connection_get_setting_olpc_mesh(NMConnection *connection); -NM_AVAILABLE_IN_1_10 +NM_AVAILABLE_IN_1_14 NMSettingOvsBridge *nm_connection_get_setting_ovs_bridge(NMConnection *connection); -NM_AVAILABLE_IN_1_10 +NM_AVAILABLE_IN_1_14 NMSettingOvsInterface *nm_connection_get_setting_ovs_interface(NMConnection *connection); -NMSettingOvsPatch *nm_connection_get_setting_ovs_patch(NMConnection *connection); -NM_AVAILABLE_IN_1_10 +NM_AVAILABLE_IN_1_14 +NMSettingOvsPatch *nm_connection_get_setting_ovs_patch(NMConnection *connection); +NM_AVAILABLE_IN_1_14 NMSettingOvsPort *nm_connection_get_setting_ovs_port(NMConnection *connection); NMSettingPpp *nm_connection_get_setting_ppp(NMConnection *connection); NMSettingPppoe *nm_connection_get_setting_pppoe(NMConnection *connection); @@ -234,7 +235,7 @@ NMSettingProxy *nm_connection_get_setting_proxy(NMConnection *connection); NMSettingSerial *nm_connection_get_setting_serial(NMConnection *connection); NM_AVAILABLE_IN_1_12 NMSettingTCConfig *nm_connection_get_setting_tc_config(NMConnection *connection); -NM_AVAILABLE_IN_1_2 +NM_AVAILABLE_IN_1_14 NMSettingTun *nm_connection_get_setting_tun(NMConnection *connection); NMSettingVpn *nm_connection_get_setting_vpn(NMConnection *connection); NMSettingWimax *nm_connection_get_setting_wimax(NMConnection *connection); diff --git a/src/libnm-core-public/nm-dbus-interface.h b/src/libnm-core-public/nm-dbus-interface.h index 4557dde0..6e1a84a1 100644 --- a/src/libnm-core-public/nm-dbus-interface.h +++ b/src/libnm-core-public/nm-dbus-interface.h @@ -103,6 +103,8 @@ * The range 0x7000 - 0x7FFF of capabilities is guaranteed not to be * used by upstream NetworkManager. It could thus be used for downstream * extensions. + * + * Since: 1.6 */ typedef enum { NM_CAPABILITY_TEAM = 1, @@ -967,7 +969,7 @@ typedef enum { * * The flags for CheckpointCreate call * - * Since: 1.4 (gi flags generated since 1.12) + * Since: 1.12 (public since 1.4, g-ir since 1.12) */ typedef enum /*< flags >*/ { NM_CHECKPOINT_CREATE_FLAG_NONE = 0, diff --git a/src/libnm-core-public/nm-dbus-types.xml b/src/libnm-core-public/nm-dbus-types.xml index cb72820d..52ac4981 100644 --- a/src/libnm-core-public/nm-dbus-types.xml +++ b/src/libnm-core-public/nm-dbus-types.xml @@ -18,7 +18,7 @@ NMCapability - NMCapability names the numbers in the Capabilities property. Capabilities are positive numbers. They are part of stable API and a certain capability number is guaranteed not to change.The range 0x7000 - 0x7FFF of capabilities is guaranteed not to be used by upstream NetworkManager. It could thus be used for downstream extensions. + NMCapability names the numbers in the Capabilities property. Capabilities are positive numbers. They are part of stable API and a certain capability number is guaranteed not to change.The range 0x7000 - 0x7FFF of capabilities is guaranteed not to be used by upstream NetworkManager. It could thus be used for downstream extensions.Since: 1.6 Values @@ -1613,7 +1613,7 @@ NMCheckpointCreateFlags - The flags for CheckpointCreate callSince: 1.4 (gi flags generated since 1.12) + The flags for CheckpointCreate callSince: 1.12 (public since 1.4, g-ir since 1.12) Values diff --git a/src/libnm-core-public/nm-setting-6lowpan.h b/src/libnm-core-public/nm-setting-6lowpan.h index 358ccff6..ab2f7b44 100644 --- a/src/libnm-core-public/nm-setting-6lowpan.h +++ b/src/libnm-core-public/nm-setting-6lowpan.h @@ -33,10 +33,10 @@ typedef struct _NMSetting6LowpanClass NMSetting6LowpanClass; NM_AVAILABLE_IN_1_14 GType nm_setting_6lowpan_get_type(void); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 NMSetting *nm_setting_6lowpan_new(void); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 const char *nm_setting_6lowpan_get_parent(NMSetting6Lowpan *setting); G_END_DECLS diff --git a/src/libnm-core-public/nm-setting-connection.h b/src/libnm-core-public/nm-setting-connection.h index 4b6ce17c..4f6653bf 100644 --- a/src/libnm-core-public/nm-setting-connection.h +++ b/src/libnm-core-public/nm-setting-connection.h @@ -73,6 +73,8 @@ G_BEGIN_DECLS * * #NMSettingConnectionAutoconnectSlaves values indicate whether slave connections * should be activated when master is activated. + * + * Since: 1.2 */ typedef enum { NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT = -1, @@ -87,6 +89,8 @@ typedef enum { * @NM_SETTING_CONNECTION_LLDP_ENABLE_RX: enable reception of LLDP frames * * #NMSettingConnectionLldp values indicate whether LLDP should be enabled. + * + * Since: 1.2 */ typedef enum { NM_SETTING_CONNECTION_LLDP_DEFAULT = -1, @@ -217,7 +221,7 @@ NMSettingConnectionLlmnr nm_setting_connection_get_llmnr(NMSettingConnection *se NM_AVAILABLE_IN_1_34 NMSettingConnectionDnsOverTls nm_setting_connection_get_dns_over_tls(NMSettingConnection *setting); -NM_AVAILABLE_IN_1_40 +NM_AVAILABLE_IN_1_40_4 NMMptcpFlags nm_setting_connection_get_mptcp_flags(NMSettingConnection *setting); NM_AVAILABLE_IN_1_20 diff --git a/src/libnm-core-public/nm-setting-hostname.h b/src/libnm-core-public/nm-setting-hostname.h index f93e0efe..3fb71197 100644 --- a/src/libnm-core-public/nm-setting-hostname.h +++ b/src/libnm-core-public/nm-setting-hostname.h @@ -36,7 +36,7 @@ typedef struct _NMSettingHostnameClass NMSettingHostnameClass; NM_AVAILABLE_IN_1_30 GType nm_setting_hostname_get_type(void); -NM_AVAILABLE_IN_1_30 +NM_AVAILABLE_IN_1_40_4 NMSetting *nm_setting_hostname_new(void); NM_AVAILABLE_IN_1_30 diff --git a/src/libnm-core-public/nm-setting-ip-config.h b/src/libnm-core-public/nm-setting-ip-config.h index 6283ecc9..acbdec0f 100644 --- a/src/libnm-core-public/nm-setting-ip-config.h +++ b/src/libnm-core-public/nm-setting-ip-config.h @@ -480,7 +480,7 @@ NM_AVAILABLE_IN_1_2 int nm_setting_ip_config_get_dhcp_timeout(NMSettingIPConfig *setting); NM_AVAILABLE_IN_1_34 int nm_setting_ip_config_get_required_timeout(NMSettingIPConfig *setting); -NM_AVAILABLE_IN_1_22 +NM_AVAILABLE_IN_1_40_4 const char *nm_setting_ip_config_get_dhcp_iaid(NMSettingIPConfig *setting); NM_AVAILABLE_IN_1_22 diff --git a/src/libnm-core-public/nm-setting-ip-tunnel.h b/src/libnm-core-public/nm-setting-ip-tunnel.h index 34920099..62472f11 100644 --- a/src/libnm-core-public/nm-setting-ip-tunnel.h +++ b/src/libnm-core-public/nm-setting-ip-tunnel.h @@ -43,7 +43,7 @@ G_BEGIN_DECLS typedef struct _NMSettingIPTunnelClass NMSettingIPTunnelClass; -/* +/** * NMIPTunnelFlags: * @NM_IP_TUNNEL_FLAG_NONE: no flag * @NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT: don't add encapsulation limit @@ -94,9 +94,9 @@ NM_AVAILABLE_IN_1_2 const char *nm_setting_ip_tunnel_get_input_key(NMSettingIPTunnel *setting); NM_AVAILABLE_IN_1_2 const char *nm_setting_ip_tunnel_get_output_key(NMSettingIPTunnel *setting); -NM_AVAILABLE_IN_1_2 +NM_AVAILABLE_IN_1_40_4 guint nm_setting_ip_tunnel_get_encapsulation_limit(NMSettingIPTunnel *setting); -NM_AVAILABLE_IN_1_2 +NM_AVAILABLE_IN_1_40_4 guint nm_setting_ip_tunnel_get_flow_label(NMSettingIPTunnel *setting); NM_AVAILABLE_IN_1_2 guint nm_setting_ip_tunnel_get_mtu(NMSettingIPTunnel *setting); diff --git a/src/libnm-core-public/nm-setting-ip4-config.h b/src/libnm-core-public/nm-setting-ip4-config.h index 7991d682..66c457b9 100644 --- a/src/libnm-core-public/nm-setting-ip4-config.h +++ b/src/libnm-core-public/nm-setting-ip4-config.h @@ -113,7 +113,7 @@ const char *nm_setting_ip4_config_get_dhcp_fqdn(NMSettingIP4Config *setting); NM_AVAILABLE_IN_1_28 const char *nm_setting_ip4_config_get_dhcp_vendor_class_identifier(NMSettingIP4Config *setting); -NM_AVAILABLE_IN_1_40 +NM_AVAILABLE_IN_1_40_4 NMSettingIP4LinkLocal nm_setting_ip4_config_get_link_local(NMSettingIP4Config *setting); G_END_DECLS diff --git a/src/libnm-core-public/nm-setting-macvlan.h b/src/libnm-core-public/nm-setting-macvlan.h index 88ee81e7..25c41346 100644 --- a/src/libnm-core-public/nm-setting-macvlan.h +++ b/src/libnm-core-public/nm-setting-macvlan.h @@ -42,6 +42,8 @@ typedef struct _NMSettingMacvlanClass NMSettingMacvlanClass; * @NM_SETTING_MACVLAN_MODE_PRIVATE: private mode * @NM_SETTING_MACVLAN_MODE_PASSTHRU: passthru mode * @NM_SETTING_MACVLAN_MODE_SOURCE: source mode + * + * Since: 1.2 **/ typedef enum { NM_SETTING_MACVLAN_MODE_UNKNOWN = 0, diff --git a/src/libnm-core-public/nm-setting-ovs-bridge.h b/src/libnm-core-public/nm-setting-ovs-bridge.h index 33e8dffb..bc7d7e9b 100644 --- a/src/libnm-core-public/nm-setting-ovs-bridge.h +++ b/src/libnm-core-public/nm-setting-ovs-bridge.h @@ -49,7 +49,7 @@ NM_AVAILABLE_IN_1_10 gboolean nm_setting_ovs_bridge_get_rstp_enable(NMSettingOvsBridge *self); NM_AVAILABLE_IN_1_10 gboolean nm_setting_ovs_bridge_get_stp_enable(NMSettingOvsBridge *self); -NM_AVAILABLE_IN_1_20 +NM_AVAILABLE_IN_1_40_4 const char *nm_setting_ovs_bridge_get_datapath_type(NMSettingOvsBridge *self); G_END_DECLS diff --git a/src/libnm-core-public/nm-setting-sriov.h b/src/libnm-core-public/nm-setting-sriov.h index 93afde98..0438e800 100644 --- a/src/libnm-core-public/nm-setting-sriov.h +++ b/src/libnm-core-public/nm-setting-sriov.h @@ -109,7 +109,7 @@ NM_AVAILABLE_IN_1_14 const char **nm_sriov_vf_get_attribute_names(const NMSriovVF *vf); NM_AVAILABLE_IN_1_14 GVariant *nm_sriov_vf_get_attribute(const NMSriovVF *vf, const char *name); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 gboolean nm_sriov_vf_attribute_validate(const char *name, GVariant *value, gboolean *known, GError **error); diff --git a/src/libnm-core-public/nm-setting-tc-config.h b/src/libnm-core-public/nm-setting-tc-config.h index abd61683..ab1a9909 100644 --- a/src/libnm-core-public/nm-setting-tc-config.h +++ b/src/libnm-core-public/nm-setting-tc-config.h @@ -102,9 +102,9 @@ NM_AVAILABLE_IN_1_12 void nm_tc_tfilter_set_handle(NMTCTfilter *tfilter, guint32 handle); NM_AVAILABLE_IN_1_12 guint32 nm_tc_tfilter_get_parent(NMTCTfilter *tfilter); -NM_AVAILABLE_IN_1_12 +NM_AVAILABLE_IN_1_40_4 NMTCAction *nm_tc_tfilter_get_action(NMTCTfilter *tfilter); -NM_AVAILABLE_IN_1_12 +NM_AVAILABLE_IN_1_40_4 void nm_tc_tfilter_set_action(NMTCTfilter *tfilter, NMTCAction *action); #define NM_TYPE_SETTING_TC_CONFIG (nm_setting_tc_config_get_type()) diff --git a/src/libnm-core-public/nm-setting-team.h b/src/libnm-core-public/nm-setting-team.h index 63df4080..2e16ee20 100644 --- a/src/libnm-core-public/nm-setting-team.h +++ b/src/libnm-core-public/nm-setting-team.h @@ -25,6 +25,8 @@ G_BEGIN_DECLS * option 'validate_inactive' is enabled (set to true). * @NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS: the arp_ping link watcher option * 'send_always' is enabled (set to true). + * + * Since: 1.12 */ typedef enum /*< flags >*/ { NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE = 0, /*< skip >*/ diff --git a/src/libnm-core-public/nm-setting-tun.h b/src/libnm-core-public/nm-setting-tun.h index 8f808410..3575c644 100644 --- a/src/libnm-core-public/nm-setting-tun.h +++ b/src/libnm-core-public/nm-setting-tun.h @@ -39,6 +39,8 @@ G_BEGIN_DECLS * @NM_SETTING_TUN_MODE_TAP: a TAP device * * #NMSettingTunMode values indicate the device type (TUN/TAP) + * + * Since: 1.2 */ typedef enum { NM_SETTING_TUN_MODE_UNKNOWN = 0, diff --git a/src/libnm-core-public/nm-setting-vpn.h b/src/libnm-core-public/nm-setting-vpn.h index 151a293a..a00fa975 100644 --- a/src/libnm-core-public/nm-setting-vpn.h +++ b/src/libnm-core-public/nm-setting-vpn.h @@ -49,7 +49,9 @@ GType nm_setting_vpn_get_type(void); NMSetting *nm_setting_vpn_new(void); const char *nm_setting_vpn_get_service_type(NMSettingVpn *setting); const char *nm_setting_vpn_get_user_name(NMSettingVpn *setting); -gboolean nm_setting_vpn_get_persistent(NMSettingVpn *setting); + +NM_AVAILABLE_IN_1_40_4 +gboolean nm_setting_vpn_get_persistent(NMSettingVpn *setting); guint32 nm_setting_vpn_get_num_data_items(NMSettingVpn *setting); void nm_setting_vpn_add_data_item(NMSettingVpn *setting, const char *key, const char *item); diff --git a/src/libnm-core-public/nm-setting-wireless-security.h b/src/libnm-core-public/nm-setting-wireless-security.h index e564204b..b9fea123 100644 --- a/src/libnm-core-public/nm-setting-wireless-security.h +++ b/src/libnm-core-public/nm-setting-wireless-security.h @@ -74,6 +74,8 @@ typedef enum { * @NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED: require PMF and fail if not available * * These flags indicate whether PMF must be enabled. + * + * Since: 1.10 **/ typedef enum { NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT = 0, diff --git a/src/libnm-core-public/nm-setting-wireless.h b/src/libnm-core-public/nm-setting-wireless.h index 1f94060c..bb158112 100644 --- a/src/libnm-core-public/nm-setting-wireless.h +++ b/src/libnm-core-public/nm-setting-wireless.h @@ -132,6 +132,8 @@ typedef enum /*< flags >*/ { * @NM_SETTING_WIRELESS_POWERSAVE_ENABLE: enable powersave * * These flags indicate whether wireless powersave must be enabled. + * + * Since: 1.2 **/ typedef enum { NM_SETTING_WIRELESS_POWERSAVE_DEFAULT = 0, diff --git a/src/libnm-core-public/nm-setting-wpan.h b/src/libnm-core-public/nm-setting-wpan.h index 883b77e1..934ab196 100644 --- a/src/libnm-core-public/nm-setting-wpan.h +++ b/src/libnm-core-public/nm-setting-wpan.h @@ -38,18 +38,18 @@ typedef struct _NMSettingWpanClass NMSettingWpanClass; NM_AVAILABLE_IN_1_14 GType nm_setting_wpan_get_type(void); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 NMSetting *nm_setting_wpan_new(void); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 const char *nm_setting_wpan_get_mac_address(NMSettingWpan *setting); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 guint16 nm_setting_wpan_get_pan_id(NMSettingWpan *setting); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 guint16 nm_setting_wpan_get_short_address(NMSettingWpan *setting); -NM_AVAILABLE_IN_1_16 +NM_AVAILABLE_IN_1_40_4 gint16 nm_setting_wpan_get_page(NMSettingWpan *setting); -NM_AVAILABLE_IN_1_16 +NM_AVAILABLE_IN_1_40_4 gint16 nm_setting_wpan_get_channel(NMSettingWpan *setting); G_END_DECLS diff --git a/src/libnm-core-public/nm-setting.h b/src/libnm-core-public/nm-setting.h index ee2076c3..ae898458 100644 --- a/src/libnm-core-public/nm-setting.h +++ b/src/libnm-core-public/nm-setting.h @@ -24,15 +24,15 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING, NMSettingClass)) /* The property of the #NMSetting is required for the setting to be valid */ -#define NM_SETTING_PARAM_REQUIRED (1 << (1 + G_PARAM_USER_SHIFT)) +#define NM_SETTING_PARAM_REQUIRED 0x200 /* The property of the #NMSetting is a secret */ -#define NM_SETTING_PARAM_SECRET (1 << (2 + G_PARAM_USER_SHIFT)) +#define NM_SETTING_PARAM_SECRET 0x400 /* The property of the #NMSetting should be ignored during comparisons that * use the %NM_SETTING_COMPARE_FLAG_FUZZY flag. */ -#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT)) +#define NM_SETTING_PARAM_FUZZY_IGNORE 0x800 /* Note: all non-glib GParamFlags bits are reserved by NetworkManager */ @@ -122,6 +122,8 @@ typedef enum { * @NM_SETTING_MAC_RANDOMIZATION_ALWAYS: a random MAC address is used. * * Controls if and how the MAC address of a device is randomzied. + * + * Since: 1.2 **/ typedef enum { NM_SETTING_MAC_RANDOMIZATION_DEFAULT = 0, diff --git a/src/libnm-core-public/nm-utils.h b/src/libnm-core-public/nm-utils.h index 5faed75a..dc89f234 100644 --- a/src/libnm-core-public/nm-utils.h +++ b/src/libnm-core-public/nm-utils.h @@ -104,9 +104,13 @@ GPtrArray *nm_utils_ip6_addresses_from_variant(GVariant *value, char **out_gatew GVariant *nm_utils_ip6_routes_to_variant(GPtrArray *routes); GPtrArray *nm_utils_ip6_routes_from_variant(GVariant *value); -GVariant *nm_utils_ip_addresses_to_variant(GPtrArray *addresses); +NM_AVAILABLE_IN_1_40_4 +GVariant *nm_utils_ip_addresses_to_variant(GPtrArray *addresses); +NM_AVAILABLE_IN_1_40_4 GPtrArray *nm_utils_ip_addresses_from_variant(GVariant *value, int family); -GVariant *nm_utils_ip_routes_to_variant(GPtrArray *routes); +NM_AVAILABLE_IN_1_40_4 +GVariant *nm_utils_ip_routes_to_variant(GPtrArray *routes); +NM_AVAILABLE_IN_1_40_4 GPtrArray *nm_utils_ip_routes_from_variant(GVariant *value, int family); char *nm_utils_uuid_generate(void); diff --git a/src/libnm-core-public/nm-version-macros.h b/src/libnm-core-public/nm-version-macros.h index edd872e8..4dce57f6 100644 --- a/src/libnm-core-public/nm-version-macros.h +++ b/src/libnm-core-public/nm-version-macros.h @@ -30,7 +30,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (2) +#define NM_MICRO_VERSION (4) /** * NM_CHECK_VERSION: @@ -72,6 +72,7 @@ #define NM_VERSION_1_36 (NM_ENCODE_VERSION (1, 36, 0)) #define NM_VERSION_1_38 (NM_ENCODE_VERSION (1, 38, 0)) #define NM_VERSION_1_40 (NM_ENCODE_VERSION (1, 40, 0)) +#define NM_VERSION_1_40_4 (NM_ENCODE_VERSION (1, 40, 4)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * diff --git a/src/libnm-core-public/nm-version-macros.h.in b/src/libnm-core-public/nm-version-macros.h.in index 07e79899..fc854aef 100644 --- a/src/libnm-core-public/nm-version-macros.h.in +++ b/src/libnm-core-public/nm-version-macros.h.in @@ -72,6 +72,7 @@ #define NM_VERSION_1_36 (NM_ENCODE_VERSION (1, 36, 0)) #define NM_VERSION_1_38 (NM_ENCODE_VERSION (1, 38, 0)) #define NM_VERSION_1_40 (NM_ENCODE_VERSION (1, 40, 0)) +#define NM_VERSION_1_40_4 (NM_ENCODE_VERSION (1, 40, 4)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * diff --git a/src/libnm-core-public/nm-version.h b/src/libnm-core-public/nm-version.h index 9f6e3e78..d9f9a121 100644 --- a/src/libnm-core-public/nm-version.h +++ b/src/libnm-core-public/nm-version.h @@ -341,6 +341,12 @@ #define NM_AVAILABLE_IN_1_40 #endif +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_40_4 +#define NM_AVAILABLE_IN_1_40_4 G_UNAVAILABLE(1, 40.4) +#else +#define NM_AVAILABLE_IN_1_40_4 +#endif + /* * Synchronous API for calling D-Bus in libnm is deprecated. See * https://networkmanager.dev/docs/libnm/latest/usage.html#sync-api diff --git a/src/libnm-core-public/nm-vpn-plugin-info.h b/src/libnm-core-public/nm-vpn-plugin-info.h index aa319a57..167af52c 100644 --- a/src/libnm-core-public/nm-vpn-plugin-info.h +++ b/src/libnm-core-public/nm-vpn-plugin-info.h @@ -62,7 +62,7 @@ NM_AVAILABLE_IN_1_4 const char *nm_vpn_plugin_info_get_auth_dialog(NMVpnPluginInfo *self); NM_AVAILABLE_IN_1_4 gboolean nm_vpn_plugin_info_supports_hints(NMVpnPluginInfo *self); -NM_AVAILABLE_IN_1_2 +NM_AVAILABLE_IN_1_40_4 gboolean nm_vpn_plugin_info_supports_multiple(NMVpnPluginInfo *self); NM_AVAILABLE_IN_1_4 const char *const *nm_vpn_plugin_info_get_aliases(NMVpnPluginInfo *self); diff --git a/src/libnm-platform/nmp-object.c b/src/libnm-platform/nmp-object.c index d06aa9cd..6609a7d5 100644 --- a/src/libnm-platform/nmp-object.c +++ b/src/libnm-platform/nmp-object.c @@ -1318,10 +1318,9 @@ nmp_object_copy(NMPObject *dst, const NMPObject *src, gboolean id_only) g_return_if_fail(klass == NMP_OBJECT_GET_CLASS(src)); - if (id_only) { - if (klass->cmd_plobj_id_copy) - klass->cmd_plobj_id_copy(&dst->object, &src->object); - } else if (klass->cmd_obj_copy) + if (id_only && klass->cmd_plobj_id_copy) + klass->cmd_plobj_id_copy(&dst->object, &src->object); + else if (klass->cmd_obj_copy) klass->cmd_obj_copy(dst, src); else memcpy(&dst->object, &src->object, klass->sizeof_data); diff --git a/src/libnm-std-aux/nm-std-aux.h b/src/libnm-std-aux/nm-std-aux.h index 77243ab1..d49f7c43 100644 --- a/src/libnm-std-aux/nm-std-aux.h +++ b/src/libnm-std-aux/nm-std-aux.h @@ -170,8 +170,8 @@ typedef uint64_t _nm_bitwise nm_be64_t; #define NM_LIKELY(expr) (__builtin_expect(NM_BOOLEAN_EXPR(expr), 1)) #define NM_UNLIKELY(expr) (__builtin_expect(NM_BOOLEAN_EXPR(expr), 0)) #else -#define NM_LIKELY(expr) NM_BOOLEAN_EXPR(expr) -#define NM_UNLIKELY(expr) NM_BOOLEAN_EXPR(expr) +#define NM_LIKELY(expr) (NM_BOOLEAN_EXPR(expr)) +#define NM_UNLIKELY(expr) (NM_BOOLEAN_EXPR(expr)) #endif /*****************************************************************************/ diff --git a/src/libnmc-setting/settings-docs-input.xml b/src/libnmc-setting/settings-docs-input.xml index d9ce0e2d..77643955 100644 --- a/src/libnmc-setting/settings-docs-input.xml +++ b/src/libnmc-setting/settings-docs-input.xml @@ -132,9 +132,7 @@ This property is currently not implemented for DHCPv6. 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. 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. A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity. A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). - Set to 2147483647 (MAXINT32) for infinity. The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Since 1.28 The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. - - Since 1.28 Array of IP addresses of DNS servers. Array of IP addresses of DNS servers. Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are "attempts", "debug", "edns0", "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", "single-request-reopen", "timeout", "trust-ad", "use-vc". The "trust-ad" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have "trust-ad" enabled. When using a caching DNS plugin (dnsmasq or systemd-resolved in NetworkManager.conf) then "edns0" and "trust-ad" are automatically added. Array of DNS options as described in man 5 resolv.conf. + Set to 2147483647 (MAXINT32) for infinity. The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Array of IP addresses of DNS servers. Array of IP addresses of DNS servers. Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are "attempts", "debug", "edns0", "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", "single-request-reopen", "timeout", "trust-ad", "use-vc". The "trust-ad" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have "trust-ad" enabled. When using a caching DNS plugin (dnsmasq or systemd-resolved in NetworkManager.conf) then "edns0" and "trust-ad" are automatically added. Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. @@ -164,11 +162,9 @@ Setting the gateway causes NetworkManager to configure a standard default route with the gateway as next hop. This is ignored if "never-default" is set. An alternative is to configure the default route explicitly with a manual route and /0 as prefix length. - Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See "ip4-auto-default-route". When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. 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. 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. Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". Since 1.40 Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. - - When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". + Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See "ip4-auto-default-route". When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. When "method" is set to "auto" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the "dns" and "dns-search" properties, if any, are used. 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. 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. Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. - Since 1.40 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. 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. IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "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. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared. IP configuration method. + When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default". 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. 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. IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "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. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared. IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "auto", "manual", and "link-local". See the subclass-specific documentation for other values. diff --git a/src/libnmc-setting/settings-docs.h b/src/libnmc-setting/settings-docs.h index 1ed2f134..934ddff9 100644 --- a/src/libnmc-setting/settings-docs.h +++ b/src/libnmc-setting/settings-docs.h @@ -166,7 +166,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_REJECT_SERVERS N_("Array of servers from which DHCP offers must be rejected. This property is useful to avoid getting a lease from misconfigured or rogue servers. For DHCPv4, each element must be an IPv4 address, optionally followed by a slash and a prefix length (e.g. \"192.168.122.0/24\"). This property is currently not implemented for DHCPv6.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.") -#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER N_("The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Since 1.28") +#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER N_("The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS N_("Array of IP addresses of DNS servers.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". The \"trust-ad\" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have \"trust-ad\" enabled. When using a caching DNS plugin (dnsmasq or systemd-resolved in NetworkManager.conf) then \"edns0\" and \"trust-ad\" are automatically added.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting. A lower numerical value is better (higher priority). Negative values have the special effect of excluding other configurations with a greater numerical priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. To avoid all DNS leaks, set the priority of the profile that should be used to the most negative value of all active connections profiles. Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices. When using dns=default, servers with higher priority will be on top of resolv.conf. To prioritize a given server over another one within the same connection, just specify them in the desired order. Note that commonly the resolver tries name servers in /etc/resolv.conf in the order listed, proceeding with the next server in the list on failure. See for example the \"rotate\" option of the dns-options setting. If there are any negative DNS priorities, then only name servers from the devices with that lowest priority will be considered. When using a DNS resolver that supports Conditional Forwarding or Split DNS (with dns=dnsmasq or dns=systemd-resolved settings), each connection is used to query domains in its search list. The search domains determine which name servers to ask, and the DNS priority is used to prioritize name servers based on the domain. Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually). When multiple connections specify the same domain, the one with the best priority (lowest numerical value) wins. If a sub domain is configured on another interface it will be accepted regardless the priority, unless parent domain on the other interface has a negative priority, which causes the sub domain to be shadowed. With Split DNS one can avoid undesired DNS leaks by properly configuring DNS priorities and the search domains, so that only name servers of the desired interface are configured.") @@ -174,7 +174,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set. Setting the gateway causes NetworkManager to configure a standard default route with the gateway as next hop. This is ignored if \"never-default\" is set. An alternative is to configure the default route explicitly with a manual route and /0 as prefix length. Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See \"ip4-auto-default-route\".") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES N_("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.") -#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_LINK_LOCAL N_("Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to \"auto\", the value is dependent on \"ipv4.method\". When set to \"default\", it honors the global connection default, before falling back to \"auto\". Note that if \"ipv4.method\" is \"disabled\", then link local addressing is always disabled too. The default is \"default\". Since 1.40") +#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_LINK_LOCAL N_("Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to \"auto\", the value is dependent on \"ipv4.method\". When set to \"default\", it honors the global connection default, before falling back to \"auto\". Note that if \"ipv4.method\" is \"disabled\", then link local addressing is always disabled too. The default is \"default\".") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_MAY_FAIL N_("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.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_METHOD N_("IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"disabled\", \"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. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_NEVER_DEFAULT N_("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.") diff --git a/src/libnmc-setting/settings-docs.h.in b/src/libnmc-setting/settings-docs.h.in index 1ed2f134..934ddff9 100644 --- a/src/libnmc-setting/settings-docs.h.in +++ b/src/libnmc-setting/settings-docs.h.in @@ -166,7 +166,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_REJECT_SERVERS N_("Array of servers from which DHCP offers must be rejected. This property is useful to avoid getting a lease from misconfigured or rogue servers. For DHCPv4, each element must be an IPv4 address, optionally followed by a slash and a prefix length (e.g. \"192.168.122.0/24\"). This property is currently not implemented for DHCPv6.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.") -#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER N_("The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Since 1.28") +#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER N_("The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS N_("Array of IP addresses of DNS servers.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". The \"trust-ad\" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have \"trust-ad\" enabled. When using a caching DNS plugin (dnsmasq or systemd-resolved in NetworkManager.conf) then \"edns0\" and \"trust-ad\" are automatically added.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting. A lower numerical value is better (higher priority). Negative values have the special effect of excluding other configurations with a greater numerical priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. To avoid all DNS leaks, set the priority of the profile that should be used to the most negative value of all active connections profiles. Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices. When using dns=default, servers with higher priority will be on top of resolv.conf. To prioritize a given server over another one within the same connection, just specify them in the desired order. Note that commonly the resolver tries name servers in /etc/resolv.conf in the order listed, proceeding with the next server in the list on failure. See for example the \"rotate\" option of the dns-options setting. If there are any negative DNS priorities, then only name servers from the devices with that lowest priority will be considered. When using a DNS resolver that supports Conditional Forwarding or Split DNS (with dns=dnsmasq or dns=systemd-resolved settings), each connection is used to query domains in its search list. The search domains determine which name servers to ask, and the DNS priority is used to prioritize name servers based on the domain. Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually). When multiple connections specify the same domain, the one with the best priority (lowest numerical value) wins. If a sub domain is configured on another interface it will be accepted regardless the priority, unless parent domain on the other interface has a negative priority, which causes the sub domain to be shadowed. With Split DNS one can avoid undesired DNS leaks by properly configuring DNS priorities and the search domains, so that only name servers of the desired interface are configured.") @@ -174,7 +174,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set. Setting the gateway causes NetworkManager to configure a standard default route with the gateway as next hop. This is ignored if \"never-default\" is set. An alternative is to configure the default route explicitly with a manual route and /0 as prefix length. Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case. See \"ip4-auto-default-route\".") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured name servers and search domains are ignored and only name servers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES N_("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.") -#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_LINK_LOCAL N_("Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to \"auto\", the value is dependent on \"ipv4.method\". When set to \"default\", it honors the global connection default, before falling back to \"auto\". Note that if \"ipv4.method\" is \"disabled\", then link local addressing is always disabled too. The default is \"default\". Since 1.40") +#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_LINK_LOCAL N_("Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to \"auto\", the value is dependent on \"ipv4.method\". When set to \"default\", it honors the global connection default, before falling back to \"auto\". Note that if \"ipv4.method\" is \"disabled\", then link local addressing is always disabled too. The default is \"default\".") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_MAY_FAIL N_("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.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_METHOD N_("IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"disabled\", \"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. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_NEVER_DEFAULT N_("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.") diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c index d7b7b3cb..977e58b9 100644 --- a/src/nm-initrd-generator/tests/test-cmdline-reader.c +++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c @@ -13,6 +13,7 @@ #include #include "libnm-core-intern/nm-core-internal.h" +#include "libnm-glib-aux/nm-uuid.h" #include "nm-initrd-generator/nm-initrd-generator.h" @@ -114,6 +115,9 @@ test_auto(void) g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con), ==, -1); g_assert(nm_setting_connection_get_autoconnect(s_con)); + g_assert_cmpint(nm_setting_connection_get_autoconnect_priority(s_con), + ==, + NMI_AUTOCONNECT_PRIORITY_CMDLINE); s_wired = nm_connection_get_setting_wired(connection); g_assert(s_wired); @@ -174,6 +178,9 @@ test_dhcp_with_hostname(void) g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con), ==, -1); g_assert(nm_setting_connection_get_autoconnect(s_con)); + g_assert_cmpint(nm_setting_connection_get_autoconnect_priority(s_con), + ==, + NMI_AUTOCONNECT_PRIORITY_CMDLINE); s_wired = nm_connection_get_setting_wired(connection); g_assert(s_wired); @@ -219,6 +226,9 @@ test_dhcp_with_mtu(void) g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con), ==, -1); g_assert(nm_setting_connection_get_autoconnect(s_con)); + g_assert_cmpint(nm_setting_connection_get_autoconnect_priority(s_con), + ==, + NMI_AUTOCONNECT_PRIORITY_CMDLINE); s_wired = nm_connection_get_setting_wired(connection); g_assert(s_wired); @@ -279,6 +289,9 @@ test_dhcp_timeout(void) g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con), ==, -1); g_assert_cmpint(nm_setting_connection_get_autoconnect_retries(s_con), ==, 1); g_assert(nm_setting_connection_get_autoconnect(s_con)); + g_assert_cmpint(nm_setting_connection_get_autoconnect_priority(s_con), + ==, + NMI_AUTOCONNECT_PRIORITY_CMDLINE); s_ip4 = nm_connection_get_setting_ip4_config(connection); g_assert(s_ip4); @@ -1652,7 +1665,11 @@ test_ibft_ip_dev(void) { const char *const *ARGV = NM_MAKE_STRV("ip=eth0:ibft"); NMSettingConnection *s_con; - gs_unref_object NMConnection *connection = NULL; + gs_unref_object NMConnection *connection = NULL; + const char *s_hwaddr = "00:53:00:ab:00:01"; + const char *s_vlanid = "666"; + const char *s_ipaddr = "2001:0db8:0000:0000:0000:0000:0000:0002"; + gs_free char *expected_uuid = NULL; connection = _parse_con(ARGV, "eth0"); @@ -1662,6 +1679,17 @@ test_ibft_ip_dev(void) ==, NM_SETTING_VLAN_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, NULL); + + expected_uuid = nm_uuid_generate_from_strings("ibft", + s_hwaddr, + s_vlanid ? "V" : "v", + s_vlanid ? s_vlanid : "", + s_ipaddr ? "A" : "DHCP", + s_ipaddr ? s_ipaddr : "", + NULL); + + g_assert_cmpstr(expected_uuid, ==, "16d9bd1c-e2ab-31ef-9196-860078e81a23"); + g_assert_cmpstr(nm_connection_get_uuid(connection), ==, expected_uuid); } static void diff --git a/src/nm-initrd-generator/tests/test-ibft-reader.c b/src/nm-initrd-generator/tests/test-ibft-reader.c index 55925a9a..4aa4d7f3 100644 --- a/src/nm-initrd-generator/tests/test-ibft-reader.c +++ b/src/nm-initrd-generator/tests/test-ibft-reader.c @@ -72,6 +72,9 @@ test_read_ibft_dhcp(void) g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, NULL); g_assert_cmpint(nm_setting_connection_get_timestamp(s_con), ==, 0); g_assert(nm_setting_connection_get_autoconnect(s_con)); + g_assert_cmpint(nm_setting_connection_get_autoconnect_priority(s_con), + ==, + NMI_AUTOCONNECT_PRIORITY_FIRMWARE); s_wired = nm_connection_get_setting_wired(connection); g_assert(s_wired); @@ -121,6 +124,9 @@ test_read_ibft_static(void) g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, NULL); g_assert_cmpint(nm_setting_connection_get_timestamp(s_con), ==, 0); g_assert(nm_setting_connection_get_autoconnect(s_con)); + g_assert_cmpint(nm_setting_connection_get_autoconnect_priority(s_con), + ==, + NMI_AUTOCONNECT_PRIORITY_FIRMWARE); s_wired = nm_connection_get_setting_wired(connection); g_assert(s_wired); diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c index 43bd3724..9b7ebce3 100644 --- a/src/nmcli/devices.c +++ b/src/nmcli/devices.c @@ -2919,6 +2919,8 @@ do_devices_monitor(const NMCCommand *cmd, NmCli *nmc, int argc, const char *cons nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return; } + if (!devices) + return; } else { /* No devices specified. Monitor all. */ devices = nm_client_get_devices(nmc->client); diff --git a/src/nmcli/generate-docs-nm-settings-nmcli.xml b/src/nmcli/generate-docs-nm-settings-nmcli.xml index 371081b0..5da5c979 100644 --- a/src/nmcli/generate-docs-nm-settings-nmcli.xml +++ b/src/nmcli/generate-docs-nm-settings-nmcli.xml @@ -699,9 +699,9 @@ + description="The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server." /> + description="Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default"." /> diff --git a/src/nmcli/generate-docs-nm-settings-nmcli.xml.in b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in index 371081b0..5da5c979 100644 --- a/src/nmcli/generate-docs-nm-settings-nmcli.xml.in +++ b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in @@ -699,9 +699,9 @@ + description="The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server." /> + description="Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to "auto", the value is dependent on "ipv4.method". When set to "default", it honors the global connection default, before falling back to "auto". Note that if "ipv4.method" is "disabled", then link local addressing is always disabled too. The default is "default"." /> diff --git a/src/nmcli/meson.build b/src/nmcli/meson.build index a122e2af..be625fe0 100644 --- a/src/nmcli/meson.build +++ b/src/nmcli/meson.build @@ -87,7 +87,7 @@ if enable_docs ], ) else - settings_docs_source = configure_file( + gen_metadata_nm_settings_nmcli_xml = configure_file( input: 'generate-docs-nm-settings-nmcli.xml.in', output: '@BASENAME@', configuration: configuration_data(), -- cgit 1.3.0-6-gf8a5