From 2bfb3eb7d0323e69affca154395f51d8b577414d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 6 Apr 2016 00:46:19 +0200 Subject: Imported Upstream version 1.1.93 --- callouts/Makefile.am | 1 - callouts/Makefile.in | 1 - callouts/nm-dispatcher.xml | 119 +- callouts/tests/Makefile.am | 1 - callouts/tests/Makefile.in | 1 - clients/Makefile.am | 1 - clients/Makefile.in | 1 - clients/cli/Makefile.am | 1 - clients/cli/Makefile.in | 1 - clients/cli/connections.c | 59 +- clients/cli/settings.c | 31 +- clients/tui/Makefile.am | 1 - clients/tui/Makefile.in | 1 - config.h.in | 3 + configure | 51 +- configure.ac | 19 +- docs/api/Makefile.am | 23 +- docs/api/Makefile.in | 27 +- docs/api/html/NetworkManager.conf.html | 44 +- docs/api/html/NetworkManager.devhelp2 | 3 + docs/api/html/NetworkManager.html | 20 +- ...org.freedesktop.NetworkManager.AccessPoint.html | 43 +- ...rg.freedesktop.NetworkManager.AgentManager.html | 24 +- ...eedesktop.NetworkManager.Connection.Active.html | 79 +- ...org.freedesktop.NetworkManager.DHCP4Config.html | 6 +- ...org.freedesktop.NetworkManager.DHCP6Config.html | 6 +- ...org.freedesktop.NetworkManager.Device.Adsl.html | 3 +- ...reedesktop.NetworkManager.Device.Bluetooth.html | 11 +- ...org.freedesktop.NetworkManager.Device.Bond.html | 11 +- ...g.freedesktop.NetworkManager.Device.Bridge.html | 11 +- ....freedesktop.NetworkManager.Device.Generic.html | 6 +- ...freedesktop.NetworkManager.Device.IPTunnel.html | 37 +- ...eedesktop.NetworkManager.Device.Infiniband.html | 7 +- ....freedesktop.NetworkManager.Device.Macvlan.html | 12 +- ...rg.freedesktop.NetworkManager.Device.Modem.html | 14 +- ...freedesktop.NetworkManager.Device.OlpcMesh.html | 12 +- ...org.freedesktop.NetworkManager.Device.Team.html | 11 +- ...-org.freedesktop.NetworkManager.Device.Tun.html | 24 +- ...org.freedesktop.NetworkManager.Device.Veth.html | 3 +- ...org.freedesktop.NetworkManager.Device.Vlan.html | 13 +- ...rg.freedesktop.NetworkManager.Device.Vxlan.html | 58 +- ...rg.freedesktop.NetworkManager.Device.WiMax.html | 49 +- ...rg.freedesktop.NetworkManager.Device.Wired.html | 16 +- ...freedesktop.NetworkManager.Device.Wireless.html | 56 +- ...dbus-org.freedesktop.NetworkManager.Device.html | 194 +- ...s-org.freedesktop.NetworkManager.IP4Config.html | 42 +- ...s-org.freedesktop.NetworkManager.IP6Config.html | 33 +- .../gdbus-org.freedesktop.NetworkManager.PPP.html | 8 +- ...org.freedesktop.NetworkManager.SecretAgent.html | 61 +- ...desktop.NetworkManager.Settings.Connection.html | 76 +- ...us-org.freedesktop.NetworkManager.Settings.html | 89 +- ....freedesktop.NetworkManager.VPN.Connection.html | 18 +- ...-org.freedesktop.NetworkManager.VPN.Plugin.html | 94 +- .../html/gdbus-org.freedesktop.NetworkManager.html | 215 +- docs/api/html/index.html | 11 +- docs/api/html/index.sgml | 42 + docs/api/html/manpages.html | 13 +- docs/api/html/nm-online.html | 120 + docs/api/html/nm-settings-ifcfg-rh.html | 64 +- docs/api/html/nm-settings-keyfile.html | 54 +- docs/api/html/nm-settings.html | 89 +- docs/api/html/nmcli-examples.html | 871 ++-- docs/api/html/nmcli.html | 2282 ++++++++++ docs/api/html/nmtui.html | 88 + docs/api/network-manager-docs.xml | 81 +- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.am | 1 + docs/libnm-glib/Makefile.in | 1 + docs/libnm-glib/html/index.html | 2 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.am | 1 + docs/libnm-util/Makefile.in | 1 + docs/libnm-util/html/index.html | 2 +- .../libnm-util/html/libnm-util-NetworkManager.html | 39 +- .../html/libnm-util-NetworkManagerVPN.html | 12 +- docs/libnm-util/version.xml | 2 +- docs/libnm/Makefile.am | 1 + docs/libnm/Makefile.in | 1 + docs/libnm/html/NMSettingBond.html | 150 +- docs/libnm/html/NMSettingIPConfig.html | 10 + docs/libnm/html/NMWimaxNsp.html | 61 +- docs/libnm/html/api-index-full.html | 66 +- docs/libnm/html/index.html | 2 +- docs/libnm/html/index.sgml | 26 +- docs/libnm/html/libnm-nm-dbus-interface.html | 102 +- docs/libnm/html/libnm-nm-version.html | 32 + docs/libnm/html/libnm-nm-vpn-dbus-interface.html | 12 +- docs/libnm/html/libnm.devhelp2 | 26 +- docs/libnm/html/object-tree.html | 2 +- docs/libnm/libnm-sections.txt | 22 +- docs/libnm/version.xml | 2 +- examples/dispatcher/10-ifcfg-rh-routes.sh | 2 +- introspection/Makefile.am | 4 - introspection/Makefile.in | 10 +- introspection/all.xml.in | 74 - introspection/errors.xml | 24 - introspection/generic-types.xml | 50 - introspection/nm-access-point.xml | 176 +- introspection/nm-active-connection.xml | 258 +- introspection/nm-agent-manager.xml | 63 +- introspection/nm-device-adsl.xml | 25 +- introspection/nm-device-bond.xml | 50 +- introspection/nm-device-bridge.xml | 50 +- introspection/nm-device-bt.xml | 60 +- introspection/nm-device-ethernet.xml | 64 +- introspection/nm-device-generic.xml | 34 +- introspection/nm-device-infiniband.xml | 37 +- introspection/nm-device-ip-tunnel.xml | 142 +- introspection/nm-device-macvlan.xml | 54 +- introspection/nm-device-modem.xml | 75 +- introspection/nm-device-olpc-mesh.xml | 48 +- introspection/nm-device-team.xml | 50 +- introspection/nm-device-tun.xml | 104 +- introspection/nm-device-veth.xml | 25 +- introspection/nm-device-vlan.xml | 55 +- introspection/nm-device-vxlan.xml | 225 +- introspection/nm-device-wifi.xml | 232 +- introspection/nm-device-wimax.xml | 177 +- introspection/nm-device.xml | 1069 ++--- introspection/nm-dhcp4-config.xml | 42 +- introspection/nm-dhcp6-config.xml | 42 +- introspection/nm-ip4-config.xml | 155 +- introspection/nm-ip6-config.xml | 132 +- introspection/nm-manager.xml | 746 ++-- introspection/nm-secret-agent.xml | 311 +- introspection/nm-settings-connection.xml | 267 +- introspection/nm-settings.xml | 278 +- introspection/nm-vpn-connection.xml | 172 +- introspection/nm-vpn-plugin.xml | 383 +- introspection/nm-wimax-nsp.xml | 66 +- ...-org.freedesktop.NetworkManager.AccessPoint.xml | 39 +- ...reedesktop.NetworkManager.Connection.Active.xml | 78 +- ...org.freedesktop.NetworkManager.AgentManager.xml | 16 +- ...-org.freedesktop.NetworkManager.Device.Adsl.xml | 3 +- ...-org.freedesktop.NetworkManager.Device.Bond.xml | 11 +- ...rg.freedesktop.NetworkManager.Device.Bridge.xml | 11 +- ...freedesktop.NetworkManager.Device.Bluetooth.xml | 10 +- ...org.freedesktop.NetworkManager.Device.Wired.xml | 16 +- ...g.freedesktop.NetworkManager.Device.Generic.xml | 6 +- ...reedesktop.NetworkManager.Device.Infiniband.xml | 7 +- ....freedesktop.NetworkManager.Device.IPTunnel.xml | 37 +- ...g.freedesktop.NetworkManager.Device.Macvlan.xml | 12 +- ...org.freedesktop.NetworkManager.Device.Modem.xml | 12 +- ....freedesktop.NetworkManager.Device.OlpcMesh.xml | 12 +- ...evice-org.freedesktop.NetworkManager.Device.xml | 181 +- ...-org.freedesktop.NetworkManager.Device.Team.xml | 11 +- ...n-org.freedesktop.NetworkManager.Device.Tun.xml | 24 +- ...-org.freedesktop.NetworkManager.Device.Veth.xml | 3 +- ...-org.freedesktop.NetworkManager.Device.Vlan.xml | 13 +- ...org.freedesktop.NetworkManager.Device.Vxlan.xml | 58 +- ....freedesktop.NetworkManager.Device.Wireless.xml | 48 +- ...org.freedesktop.NetworkManager.Device.WiMax.xml | 47 +- ...-org.freedesktop.NetworkManager.DHCP4Config.xml | 6 +- ...-org.freedesktop.NetworkManager.DHCP6Config.xml | 6 +- ...ig-org.freedesktop.NetworkManager.IP4Config.xml | 42 +- ...ig-org.freedesktop.NetworkManager.IP6Config.xml | 33 +- ...dbus-manager-org.freedesktop.NetworkManager.xml | 184 +- ...-org.freedesktop.NetworkManager.SecretAgent.xml | 53 +- ...edesktop.NetworkManager.Settings.Connection.xml | 62 +- ...ngs-org.freedesktop.NetworkManager.Settings.xml | 75 +- ...g.freedesktop.NetworkManager.VPN.Connection.xml | 17 +- ...n-org.freedesktop.NetworkManager.VPN.Plugin.xml | 75 +- introspection/vpn-errors.xml | 60 - libnm-core/Makefile.am | 9 +- libnm-core/Makefile.in | 14 +- libnm-core/nm-core-enum-types.c | 21 + libnm-core/nm-core-enum-types.h | 2 + libnm-core/nm-core-internal.h | 12 + libnm-core/nm-dbus-interface.h | 47 +- libnm-core/nm-setting-bond.c | 197 +- libnm-core/nm-setting-bond.h | 42 +- libnm-core/nm-setting-bridge.c | 2 +- libnm-core/nm-setting-infiniband.c | 2 +- libnm-core/nm-setting-ip-config.c | 1 + libnm-core/nm-setting-ip-config.h | 1 + libnm-core/nm-setting-macvlan.c | 3 +- libnm-core/nm-setting-wired.c | 4 +- libnm-core/nm-setting-wireless.c | 4 +- libnm-core/nm-utils.c | 5 - libnm-core/nm-version.h | 14 + libnm-core/nm-vpn-dbus-interface.h | 8 - libnm-core/tests/Makefile.am | 2 +- libnm-core/tests/Makefile.in | 25 +- libnm-core/tests/test-setting-bond.c | 198 + libnm-glib/Makefile.am | 1 - libnm-glib/Makefile.in | 1 - libnm-glib/tests/Makefile.am | 1 - libnm-glib/tests/Makefile.in | 1 - libnm-util/Makefile.am | 1 - libnm-util/Makefile.in | 4 +- libnm-util/NetworkManager.h | 26 - libnm-util/NetworkManagerVPN.h | 8 - libnm-util/nm-utils.c | 5 - libnm-util/nm-version.h | 14 + libnm-util/tests/Makefile.am | 1 - libnm-util/tests/Makefile.in | 1 - libnm/Makefile.am | 11 +- libnm/Makefile.in | 10 +- libnm/nm-enum-types.c | 22 +- libnm/nm-enum-types.h | 2 - libnm/nm-keyfile-docs.xml | 12 +- libnm/nm-wimax-nsp.h | 16 - libnm/tests/Makefile.am | 1 - libnm/tests/Makefile.in | 1 - man/Makefile.am | 121 +- man/Makefile.in | 176 +- man/NetworkManager.8 | 8 +- man/NetworkManager.conf.5 | 6 +- man/NetworkManager.conf.xml | 10 +- man/NetworkManager.conf.xml.in | 10 +- man/NetworkManager.xml | 11 +- man/common.ent.in | 2 + man/nm-online.1 | 96 + man/nm-online.1.in | 76 - man/nm-online.xml | 171 + man/nm-settings-ifcfg-rh.5 | 22 +- man/nm-settings-ifcfg-rh.xml | 17 +- man/nm-settings-ifcfg-rh.xsl | 48 +- man/nm-settings-keyfile.5 | 36 +- man/nm-settings-keyfile.xml | 29 +- man/nm-settings-keyfile.xsl | 48 +- man/nm-settings.5 | 19 +- man/nm-settings.xml | 7 +- man/nm-settings.xsl | 41 +- man/nm-system-settings.conf.5.in | 25 - man/nmcli-examples.5 | 693 --- man/nmcli-examples.7 | 619 +++ man/nmcli-examples.xml | 759 ++-- man/nmcli.1 | 1905 ++++++++ man/nmcli.1.in | 1282 ------ man/nmcli.xml | 3116 +++++++++++++ man/nmtui.1 | 76 + man/nmtui.1.in | 66 - man/nmtui.xml | 137 + po/ar.po | 3659 +++++++-------- po/as.po | 3700 ++++++++-------- po/be@latin.po | 3667 +++++++-------- po/bg.po | 3690 ++++++++-------- po/bn_IN.po | 3704 ++++++++-------- po/bs.po | 3659 +++++++-------- po/ca.po | 4664 +++++++++----------- po/cs.po | 3690 ++++++++-------- po/da.po | 3687 ++++++++-------- po/de.po | 1175 +++-- po/dz.po | 3659 +++++++-------- po/el.po | 3696 ++++++++-------- po/en_CA.po | 3663 +++++++-------- po/en_GB.po | 3679 +++++++-------- po/eo.po | 3673 +++++++-------- po/es.po | 3712 ++++++++-------- po/et.po | 3669 +++++++-------- po/eu.po | 3677 +++++++-------- po/fi.po | 3678 +++++++-------- po/fr.po | 4282 +++++++++--------- po/gd.po | 3801 ++++++++-------- po/gl.po | 3676 +++++++-------- po/gu.po | 3696 ++++++++-------- po/he.po | 3659 +++++++-------- po/hi.po | 3700 ++++++++-------- po/hr.po | 3673 +++++++-------- po/hu.po | 3685 ++++++++-------- po/id.po | 3677 +++++++-------- po/it.po | 3709 ++++++++-------- po/ja.po | 3852 ++++++++-------- po/ka.po | 3664 +++++++-------- po/kn.po | 3705 ++++++++-------- po/ko.po | 3699 ++++++++-------- po/ku.po | 3659 +++++++-------- po/lt.po | 4131 ++++++++--------- po/lv.po | 3663 +++++++-------- po/mk.po | 3659 +++++++-------- po/ml.po | 3696 ++++++++-------- po/mr.po | 3701 ++++++++-------- po/nb.po | 3665 +++++++-------- po/ne.po | 3659 +++++++-------- po/nl.po | 3669 +++++++-------- po/oc.po | 3679 +++++++-------- po/or.po | 3697 ++++++++-------- po/pa.po | 3801 ++++++++-------- po/pl.po | 1200 ++--- po/pt.po | 3659 +++++++-------- po/pt_BR.po | 3713 ++++++++-------- po/ru.po | 3824 ++++++++-------- po/rw.po | 3659 +++++++-------- po/sk.po | 4562 +++++++++---------- po/sl.po | 3687 ++++++++-------- po/sq.po | 3659 +++++++-------- po/sr.po | 3678 +++++++-------- po/sr@latin.po | 3678 +++++++-------- po/sv.po | 3711 ++++++++-------- po/ta.po | 3705 ++++++++-------- po/te.po | 3700 ++++++++-------- po/th.po | 3664 +++++++-------- po/tr.po | 3706 ++++++++-------- po/uk.po | 3712 ++++++++-------- po/vi.po | 3672 +++++++-------- po/wa.po | 3659 +++++++-------- po/zh_CN.po | 3696 ++++++++-------- po/zh_HK.po | 3676 +++++++-------- po/zh_TW.po | 3696 ++++++++-------- shared/nm-default.h | 6 + shared/nm-version-macros.h | 3 +- shared/nm-version-macros.h.in | 1 + src/Makefile.am | 32 +- src/Makefile.in | 127 +- src/devices/adsl/Makefile.am | 1 - src/devices/adsl/Makefile.in | 1 - src/devices/bluetooth/Makefile.am | 1 - src/devices/bluetooth/Makefile.in | 3 +- src/devices/nm-device-bond.c | 52 +- src/devices/nm-device-factory.c | 19 +- src/devices/nm-device.c | 166 +- src/devices/nm-device.h | 108 +- src/devices/nm-lldp-listener.c | 39 +- src/devices/team/Makefile.am | 1 - src/devices/team/Makefile.in | 3 +- src/devices/tests/Makefile.am | 1 - src/devices/tests/Makefile.in | 1 - src/devices/tests/test-lldp.c | 11 +- src/devices/wifi/Makefile.am | 1 - src/devices/wifi/Makefile.in | 1 - src/devices/wifi/tests/Makefile.am | 1 - src/devices/wifi/tests/Makefile.in | 1 - src/devices/wwan/Makefile.am | 1 - src/devices/wwan/Makefile.in | 1 - src/dhcp-manager/Makefile.am | 1 - src/dhcp-manager/Makefile.in | 1 - src/dhcp-manager/tests/Makefile.am | 1 - src/dhcp-manager/tests/Makefile.in | 1 - src/dns-manager/nm-dns-manager.c | 38 +- src/dns-manager/nm-dns-manager.h | 2 + src/dnsmasq-manager/tests/Makefile.am | 1 - src/dnsmasq-manager/tests/Makefile.in | 1 - src/nm-auth-manager.c | 2 +- src/nm-core-utils.c | 2 +- src/nm-enum-types.c | 8 +- src/nm-exported-object.c | 420 +- src/nm-exported-object.h | 1 - src/nm-firewall-manager.c | 2 +- src/nm-firewall-manager.h | 2 + src/nm-manager.c | 519 +-- src/nm-manager.h | 10 +- src/nm-policy.c | 256 +- src/nm-policy.h | 3 + src/platform/nm-linux-platform.c | 61 +- src/platform/nm-platform.c | 12 + src/platform/nm-platform.h | 4 + src/platform/tests/Makefile.am | 6 +- src/platform/tests/Makefile.in | 265 +- src/ppp-manager/Makefile.am | 1 - src/ppp-manager/Makefile.in | 1 - src/rdisc/nm-lndp-rdisc.c | 126 +- src/rdisc/nm-rdisc.c | 3 + src/rdisc/tests/Makefile.am | 1 - src/rdisc/tests/Makefile.in | 1 - src/settings/nm-settings.c | 14 +- src/settings/plugins/ibft/Makefile.am | 1 - src/settings/plugins/ibft/Makefile.in | 1 - src/settings/plugins/ibft/tests/Makefile.am | 1 - src/settings/plugins/ibft/tests/Makefile.in | 1 - src/settings/plugins/ifcfg-rh/Makefile.am | 1 - src/settings/plugins/ifcfg-rh/Makefile.in | 1 - .../plugins/ifcfg-rh/nm-ifcfg-connection.c | 1 + src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml | 50 +- src/settings/plugins/ifcfg-rh/tests/Makefile.am | 1 - src/settings/plugins/ifcfg-rh/tests/Makefile.in | 1 - src/settings/plugins/ifnet/Makefile.am | 1 - src/settings/plugins/ifnet/Makefile.in | 1 - src/settings/plugins/ifnet/tests/Makefile.am | 1 - src/settings/plugins/ifnet/tests/Makefile.in | 1 - src/settings/plugins/ifupdown/Makefile.am | 1 - src/settings/plugins/ifupdown/Makefile.in | 1 - src/settings/plugins/ifupdown/tests/Makefile.am | 1 - src/settings/plugins/ifupdown/tests/Makefile.in | 1 - src/settings/plugins/keyfile/Makefile.am | 1 - src/settings/plugins/keyfile/Makefile.in | 1 - src/settings/plugins/keyfile/tests/Makefile.am | 1 - src/settings/plugins/keyfile/tests/Makefile.in | 1 - src/supplicant-manager/tests/Makefile.am | 1 - src/supplicant-manager/tests/Makefile.in | 1 - src/systemd/src/basic/utf8.h | 1 + .../src/libsystemd-network/dhcp-identifier.c | 2 +- .../src/libsystemd-network/dhcp-identifier.h | 41 +- .../src/libsystemd-network/dhcp6-protocol.h | 7 - src/systemd/src/libsystemd-network/lldp-neighbor.c | 47 +- src/systemd/src/libsystemd-network/lldp.h | 102 - .../src/libsystemd-network/network-internal.c | 29 + .../src/libsystemd-network/network-internal.h | 4 + .../src/libsystemd-network/sd-dhcp-client.c | 50 +- .../src/libsystemd-network/sd-dhcp6-client.c | 50 +- src/systemd/src/systemd/sd-dhcp-client.h | 2 + src/systemd/src/systemd/sd-dhcp6-client.h | 5 +- src/systemd/src/systemd/sd-lldp.h | 81 + src/tests/Makefile.am | 1 - src/tests/Makefile.in | 1 - src/tests/config/Makefile.am | 1 - src/tests/config/Makefile.in | 1 - 397 files changed, 140063 insertions(+), 127786 deletions(-) create mode 100644 docs/api/html/nm-online.html create mode 100644 docs/api/html/nmcli.html create mode 100644 docs/api/html/nmtui.html delete mode 100644 introspection/all.xml.in delete mode 100644 introspection/errors.xml delete mode 100644 introspection/generic-types.xml delete mode 100644 introspection/vpn-errors.xml create mode 100644 libnm-core/tests/test-setting-bond.c create mode 100644 man/common.ent.in create mode 100644 man/nm-online.1 delete mode 100644 man/nm-online.1.in create mode 100644 man/nm-online.xml delete mode 100644 man/nm-system-settings.conf.5.in delete mode 100644 man/nmcli-examples.5 create mode 100644 man/nmcli-examples.7 create mode 100644 man/nmcli.1 delete mode 100644 man/nmcli.1.in create mode 100644 man/nmcli.xml create mode 100644 man/nmtui.1 delete mode 100644 man/nmtui.1.in create mode 100644 man/nmtui.xml delete mode 100644 src/systemd/src/libsystemd-network/lldp.h diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 6440a4de..5279b2f4 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS = \ -I${top_builddir}/libnm-core \ $(GLIB_CFLAGS) \ -DNETWORKMANAGER_COMPILATION \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" diff --git a/callouts/Makefile.in b/callouts/Makefile.in index 2fa3d996..e7a7f2aa 100644 --- a/callouts/Makefile.in +++ b/callouts/Makefile.in @@ -544,7 +544,6 @@ AM_CPPFLAGS = \ -I${top_builddir}/libnm-core \ $(GLIB_CFLAGS) \ -DNETWORKMANAGER_COMPILATION \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" diff --git a/callouts/nm-dispatcher.xml b/callouts/nm-dispatcher.xml index e2e89a89..27f15fe5 100644 --- a/callouts/nm-dispatcher.xml +++ b/callouts/nm-dispatcher.xml @@ -1,93 +1,40 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index ee3f647d..6ac15874 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -8,7 +8,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/callouts \ -I$(top_builddir)/callouts \ -DNETWORKMANAGER_COMPILATION \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DSRCDIR=\"$(abs_srcdir)\" \ $(GLIB_CFLAGS) diff --git a/callouts/tests/Makefile.in b/callouts/tests/Makefile.in index eeaf70d6..6079f236 100644 --- a/callouts/tests/Makefile.in +++ b/callouts/tests/Makefile.in @@ -664,7 +664,6 @@ with_valgrind = @with_valgrind@ @ENABLE_TESTS_TRUE@ -I$(top_srcdir)/callouts \ @ENABLE_TESTS_TRUE@ -I$(top_builddir)/callouts \ @ENABLE_TESTS_TRUE@ -DNETWORKMANAGER_COMPILATION \ -@ENABLE_TESTS_TRUE@ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ @ENABLE_TESTS_TRUE@ -DSRCDIR=\"$(abs_srcdir)\" \ @ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) diff --git a/clients/Makefile.am b/clients/Makefile.am index 9c30eea1..4a526a65 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -8,7 +8,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/libnm \ -I${top_builddir}/libnm \ $(GLIB_CFLAGS) \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNMLOCALEDIR=\"$(datadir)/locale\" bin_PROGRAMS = nm-online diff --git a/clients/Makefile.in b/clients/Makefile.in index 243cd149..a34052e7 100644 --- a/clients/Makefile.in +++ b/clients/Makefile.in @@ -499,7 +499,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/libnm \ -I${top_builddir}/libnm \ $(GLIB_CFLAGS) \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNMLOCALEDIR=\"$(datadir)/locale\" nm_online_SOURCES = nm-online.c diff --git a/clients/cli/Makefile.am b/clients/cli/Makefile.am index dfcb1e96..7edbefad 100644 --- a/clients/cli/Makefile.am +++ b/clients/cli/Makefile.am @@ -15,7 +15,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/clients/common \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\""nmcli"\" \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" nmcli_SOURCES = \ diff --git a/clients/cli/Makefile.in b/clients/cli/Makefile.in index 9aa4aa49..d26384e1 100644 --- a/clients/cli/Makefile.in +++ b/clients/cli/Makefile.in @@ -480,7 +480,6 @@ with_valgrind = @with_valgrind@ @BUILD_NMCLI_TRUE@ -I${top_builddir}/libnm \ @BUILD_NMCLI_TRUE@ -I${top_srcdir}/clients/common \ @BUILD_NMCLI_TRUE@ $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\""nmcli"\" \ -@BUILD_NMCLI_TRUE@ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ @BUILD_NMCLI_TRUE@ -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \ @BUILD_NMCLI_TRUE@ $(am__append_1) @BUILD_NMCLI_TRUE@nmcli_SOURCES = agent.c agent.h common.c common.h \ diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 129a5298..3fca37f5 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -4768,43 +4768,46 @@ complete_slave (NMSettingConnection *s_con, gboolean ask, GError **error) { - char *master_ask = NULL; - const char *checked_master = NULL; + char *master_ask = NULL; + const char *checked_master = NULL; - if (type) - g_print (_("Warning: 'type' is ignored. " - "Use 'nmcli connection add \"%s\" ...' instead."), - type); - - if (nm_setting_connection_get_master (s_con)) { - /* Master already set. */ - if (master) { - g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: redundant 'master' option.")); - return FALSE; - } - return TRUE; - } + if (type) + g_print (_("Warning: 'type' is ignored. " + "Use 'nmcli connection add \"%s\" ...' instead."), + type); - if (!master && ask) - master = master_ask = nmc_readline (PROMPT_MASTER); - if (!master) { + if (nm_setting_connection_get_master (s_con)) { + /* Master already set. */ + if (master) { g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'master' is required.")); + _("Error: redundant 'master' option.")); return FALSE; } - /* Verify master argument */ - checked_master = normalized_master_for_slave (all_connections, master, slave_type, NULL); - - /* Change properties in 'connection' setting */ g_object_set (s_con, - NM_SETTING_CONNECTION_MASTER, checked_master, NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type, NULL); + return TRUE; + } - g_free (master_ask); + if (!master && ask) + master = master_ask = nmc_readline (PROMPT_MASTER); + if (!master) { + g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: 'master' is required.")); + return FALSE; + } + /* Verify master argument */ + checked_master = normalized_master_for_slave (all_connections, master, slave_type, NULL); - return TRUE; + /* Change properties in 'connection' setting */ + g_object_set (s_con, + NM_SETTING_CONNECTION_MASTER, checked_master, + NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type, + NULL); + + g_free (master_ask); + + return TRUE; } static gboolean @@ -7041,7 +7044,7 @@ do_connection_add (NmCli *nmc, int argc, char **argv) NM_SETTING_CONNECTION_TYPE, setting_name, NM_SETTING_CONNECTION_AUTOCONNECT, auto_bool, NM_SETTING_CONNECTION_INTERFACE_NAME, ifname, - NM_SETTING_CONNECTION_MASTER, checked_master, + NM_SETTING_CONNECTION_MASTER, checked_master, NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type, NULL); g_free (uuid); diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 3fb841a1..06e9fb47 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -1150,8 +1150,19 @@ nmc_property_bond_get_options (NMSetting *setting, NmcPropertyGetType get_type) bond_options_s = g_string_new (NULL); for (i = 0; i < nm_setting_bond_get_num_options (s_bond); i++) { const char *key, *value; + gs_free char *tmp_value = NULL; + char *p; nm_setting_bond_get_option (s_bond, i, &key, &value); + + if (nm_streq0 (key, NM_SETTING_BOND_OPTION_ARP_IP_TARGET)) { + value = tmp_value = g_strdup (value); + for (p = tmp_value; p && *p; p++) { + if (*p == ',') + *p = ' '; + } + } + g_string_append_printf (bond_options_s, "%s=%s,", key, value); } g_string_truncate (bond_options_s, bond_options_s->len-1); /* chop off trailing ',' */ @@ -3651,10 +3662,28 @@ _validate_bond_option_value (const char *option, const char *value, GError **err return value; } +static gboolean +_bond_add_option (NMSettingBond *setting, + const char *name, + const char *value) +{ + gs_free char *tmp_value = NULL; + char *p; + + if (nm_streq0 (name, NM_SETTING_BOND_OPTION_ARP_IP_TARGET)) { + value = tmp_value = g_strdup (value); + for (p = tmp_value; p && *p; p++) + if (*p == ' ') + *p = ','; + } + + return nm_setting_bond_add_option (setting, name, value); +} + DEFINE_SETTER_OPTIONS (nmc_property_bond_set_options, NM_SETTING_BOND, NMSettingBond, - nm_setting_bond_add_option, + _bond_add_option, nm_setting_bond_get_valid_options, _validate_bond_option_value) DEFINE_REMOVER_OPTION (nmc_property_bond_remove_option_options, diff --git a/clients/tui/Makefile.am b/clients/tui/Makefile.am index caf792ee..30ed9dde 100644 --- a/clients/tui/Makefile.am +++ b/clients/tui/Makefile.am @@ -16,7 +16,6 @@ AM_CPPFLAGS= \ $(NEWT_CFLAGS) \ $(GUDEV_CFLAGS) \ -DG_LOG_DOMAIN=\""nmtui"\" \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DLOCALEDIR=\""$(localedir)"\" \ $(NULL) diff --git a/clients/tui/Makefile.in b/clients/tui/Makefile.in index f489995d..82b89bdd 100644 --- a/clients/tui/Makefile.in +++ b/clients/tui/Makefile.in @@ -574,7 +574,6 @@ with_valgrind = @with_valgrind@ @BUILD_NMTUI_TRUE@ $(NEWT_CFLAGS) \ @BUILD_NMTUI_TRUE@ $(GUDEV_CFLAGS) \ @BUILD_NMTUI_TRUE@ -DG_LOG_DOMAIN=\""nmtui"\" \ -@BUILD_NMTUI_TRUE@ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ @BUILD_NMTUI_TRUE@ -DLOCALEDIR=\""$(localedir)"\" \ @BUILD_NMTUI_TRUE@ $(NULL) diff --git a/config.h.in b/config.h.in index c90fd77f..baabb793 100644 --- a/config.h.in +++ b/config.h.in @@ -128,6 +128,9 @@ /* Enable Gentoo hostname persist method */ #undef HOSTNAME_PERSIST_GENTOO +/* Enable Slackware hostname persist method */ +#undef HOSTNAME_PERSIST_SLACKWARE + /* Enable SuSE hostname persist method */ #undef HOSTNAME_PERSIST_SUSE diff --git a/configure b/configure index dfb9da76..8ebbd40f 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 1.1.92. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.1.93. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.1.92' -PACKAGE_STRING='NetworkManager 1.1.92' +PACKAGE_VERSION='1.1.93' +PACKAGE_STRING='NetworkManager 1.1.93' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1685,7 +1685,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.1.92 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.1.93 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1755,7 +1755,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.1.92:";; + short | recursive ) echo "Configuration of NetworkManager 1.1.93:";; esac cat <<\_ACEOF @@ -1844,7 +1844,7 @@ Optional Packages: 'no' not to install the udev rules --with-systemdsystemunitdir=DIR Directory for systemd service files - --with-hostname-persist=default|suse|gentoo + --with-hostname-persist=default|suse|gentoo|slackware Hostname persist method --with-systemd-journal=yes|no Use systemd journal for logging @@ -2062,7 +2062,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.1.92 +NetworkManager configure 1.1.93 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2789,7 +2789,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.1.92, which was +It was created by NetworkManager $as_me 1.1.93, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3659,7 +3659,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.1.92' + VERSION='1.1.93' cat >>confdefs.h <<_ACEOF @@ -17540,9 +17540,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 NM_MINOR_VERSION=1 -NM_MICRO_VERSION=92 -NM_VERSION=1.1.92 -NM_GIT_SHA=24caeb33b7f2a2a80ee4484844810bc08d32f28c +NM_MICRO_VERSION=93 +NM_VERSION=1.1.93 +NM_GIT_SHA=aab24b4e10e6a9ad0b51d3e573b5da7ddafbf50b @@ -22145,6 +22145,9 @@ fi if test "$with_hostname_persist" = "gentoo"; then : hostname_persist=gentoo fi +if test "$with_hostname_persist" = "slackware"; then : + hostname_persist=slackware +fi if test "$with_hostname_persist" = "default"; then : hostname_persist=default fi @@ -22155,6 +22158,9 @@ fi if test -z "$hostname_persist" -a "$distro_plugins" = "ifnet"; then : hostname_persist=gentoo fi +if test -z "$hostname_persist" -a -f /etc/slackware-version; then : + hostname_persist=slackware +fi if test -z "$hostname_persist"; then : hostname_persist=default fi @@ -22167,6 +22173,10 @@ elif test "$hostname_persist" = gentoo; then $as_echo "#define HOSTNAME_PERSIST_GENTOO 1" >>confdefs.h +elif test "$hostname_persist" = slackware; then + +$as_echo "#define HOSTNAME_PERSIST_SLACKWARE 1" >>confdefs.h + fi @@ -26451,11 +26461,14 @@ fi # check for pregenerated manpages to be installed install_pregen_manpages=no if test "$enable_gtk_doc" != "yes" \ + -a -f man/nmcli.1 \ + -a -f man/nmtui.1 \ + -a -f man/nm-online.1 \ -a -f man/NetworkManager.conf.5 \ -a -f man/nm-settings.5 \ -a -f man/nm-settings-keyfile.5 \ -a -f man/nm-settings-ifcfg-rh.5 \ - -a -f man/nmcli-examples.5 \ + -a -f man/nmcli-examples.7 \ -a -f man/NetworkManager.8; then install_pregen_manpages=yes fi @@ -26572,7 +26585,7 @@ fi -ac_config_files="$ac_config_files Makefile shared/Makefile shared/nm-version-macros.h src/Makefile src/tests/Makefile src/tests/config/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/dnsmasq-manager/tests/Makefile src/supplicant-manager/tests/Makefile src/supplicant-manager/tests/certs/Makefile src/ppp-manager/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ibft/Makefile src/settings/plugins/ibft/tests/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/platform/Makefile src/platform/tests/Makefile src/rdisc/Makefile src/rdisc/tests/Makefile src/devices/Makefile src/devices/tests/Makefile src/devices/adsl/Makefile src/devices/bluetooth/Makefile src/devices/team/Makefile src/devices/wifi/Makefile src/devices/wifi/tests/Makefile src/devices/wwan/Makefile libnm-core/Makefile libnm-core/tests/Makefile libnm/libnm.pc libnm/Makefile libnm/tests/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile clients/Makefile clients/cli/Makefile clients/tui/Makefile clients/tui/newt/Makefile introspection/Makefile introspection/all.xml man/Makefile man/nm-system-settings.conf.5 man/nm-online.1 man/nmcli.1 man/nmtui.1 po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/python/dbus/Makefile examples/python/gi/Makefile examples/python/python-networkmanager/Makefile examples/ruby/Makefile examples/lua/Makefile examples/lua/lgi/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile" +ac_config_files="$ac_config_files Makefile shared/Makefile shared/nm-version-macros.h src/Makefile src/tests/Makefile src/tests/config/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/dnsmasq-manager/tests/Makefile src/supplicant-manager/tests/Makefile src/supplicant-manager/tests/certs/Makefile src/ppp-manager/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ibft/Makefile src/settings/plugins/ibft/tests/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/platform/Makefile src/platform/tests/Makefile src/rdisc/Makefile src/rdisc/tests/Makefile src/devices/Makefile src/devices/tests/Makefile src/devices/adsl/Makefile src/devices/bluetooth/Makefile src/devices/team/Makefile src/devices/wifi/Makefile src/devices/wifi/tests/Makefile src/devices/wwan/Makefile libnm-core/Makefile libnm-core/tests/Makefile libnm/libnm.pc libnm/Makefile libnm/tests/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile clients/Makefile clients/cli/Makefile clients/tui/Makefile clients/tui/newt/Makefile introspection/Makefile man/Makefile man/common.ent po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/python/dbus/Makefile examples/python/gi/Makefile examples/python/python-networkmanager/Makefile examples/ruby/Makefile examples/lua/Makefile examples/lua/lgi/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile" @@ -27285,7 +27298,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.1.92, which was +This file was extended by NetworkManager $as_me 1.1.93, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27351,7 +27364,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 1.1.92 +NetworkManager config.status 1.1.93 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -27929,12 +27942,8 @@ do "clients/tui/Makefile") CONFIG_FILES="$CONFIG_FILES clients/tui/Makefile" ;; "clients/tui/newt/Makefile") CONFIG_FILES="$CONFIG_FILES clients/tui/newt/Makefile" ;; "introspection/Makefile") CONFIG_FILES="$CONFIG_FILES introspection/Makefile" ;; - "introspection/all.xml") CONFIG_FILES="$CONFIG_FILES introspection/all.xml" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; - "man/nm-system-settings.conf.5") CONFIG_FILES="$CONFIG_FILES man/nm-system-settings.conf.5" ;; - "man/nm-online.1") CONFIG_FILES="$CONFIG_FILES man/nm-online.1" ;; - "man/nmcli.1") CONFIG_FILES="$CONFIG_FILES man/nmcli.1" ;; - "man/nmtui.1") CONFIG_FILES="$CONFIG_FILES man/nmtui.1" ;; + "man/common.ent") CONFIG_FILES="$CONFIG_FILES man/common.ent" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "policy/Makefile") CONFIG_FILES="$CONFIG_FILES policy/Makefile" ;; "policy/org.freedesktop.NetworkManager.policy.in") CONFIG_FILES="$CONFIG_FILES policy/org.freedesktop.NetworkManager.policy.in" ;; diff --git a/configure.ac b/configure.ac index 578b077f..7ec52e36 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) dnl The NM version number m4_define([nm_major_version], [1]) m4_define([nm_minor_version], [1]) -m4_define([nm_micro_version], [92]) +m4_define([nm_micro_version], [93]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])]) @@ -350,21 +350,25 @@ PKG_CHECK_MODULES(SYSTEMD_200, [systemd >= 200], [have_systemd_200=yes],[have_sy AM_CONDITIONAL(HAVE_SYSTEMD_200, test "${have_systemd_200}" = "yes") # Hostname persist mode -AC_ARG_WITH(hostname-persist, AS_HELP_STRING([--with-hostname-persist=default|suse|gentoo], +AC_ARG_WITH(hostname-persist, AS_HELP_STRING([--with-hostname-persist=default|suse|gentoo|slackware], [Hostname persist method])) AS_IF([test "$with_hostname_persist" = "suse"], hostname_persist=suse) AS_IF([test "$with_hostname_persist" = "gentoo"], hostname_persist=gentoo) +AS_IF([test "$with_hostname_persist" = "slackware"], hostname_persist=slackware) AS_IF([test "$with_hostname_persist" = "default"], hostname_persist=default) # if the method was not explicitly set, try to guess it from the enabled plugins AS_IF([test -z "$hostname_persist" -a "$distro_plugins" = "ifcfg-suse"], hostname_persist=suse) AS_IF([test -z "$hostname_persist" -a "$distro_plugins" = "ifnet"], hostname_persist=gentoo) +AS_IF([test -z "$hostname_persist" -a -f /etc/slackware-version], hostname_persist=slackware) AS_IF([test -z "$hostname_persist"], hostname_persist=default) if test "$hostname_persist" = suse; then AC_DEFINE(HOSTNAME_PERSIST_SUSE, 1, [Enable SuSE hostname persist method]) elif test "$hostname_persist" = gentoo; then AC_DEFINE(HOSTNAME_PERSIST_GENTOO, 1, [Enable Gentoo hostname persist method]) +elif test "$hostname_persist" = slackware; then + AC_DEFINE(HOSTNAME_PERSIST_SLACKWARE, 1, [Enable Slackware hostname persist method]) fi AC_ARG_WITH(systemd-journal, AS_HELP_STRING([--with-systemd-journal=yes|no], [Use systemd journal for logging])) @@ -957,11 +961,14 @@ GTK_DOC_CHECK(1.0) # check for pregenerated manpages to be installed install_pregen_manpages=no if test "$enable_gtk_doc" != "yes" \ + -a -f man/nmcli.1 \ + -a -f man/nmtui.1 \ + -a -f man/nm-online.1 \ -a -f man/NetworkManager.conf.5 \ -a -f man/nm-settings.5 \ -a -f man/nm-settings-keyfile.5 \ -a -f man/nm-settings-ifcfg-rh.5 \ - -a -f man/nmcli-examples.5 \ + -a -f man/nmcli-examples.7 \ -a -f man/NetworkManager.8; then install_pregen_manpages=yes fi @@ -1068,12 +1075,8 @@ clients/cli/Makefile clients/tui/Makefile clients/tui/newt/Makefile introspection/Makefile -introspection/all.xml man/Makefile -man/nm-system-settings.conf.5 -man/nm-online.1 -man/nmcli.1 -man/nmtui.1 +man/common.ent po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 666bad00..aeba9d29 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -3,13 +3,6 @@ AUTOMAKE_OPTIONS = 1.7 XSLTPROC = xsltproc --xinclude --nonet XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) -OTHER_FILES= \ - $(top_builddir)/introspection/all.xml \ - $(top_srcdir)/introspection/generic-types.xml \ - $(top_srcdir)/introspection/errors.xml \ - $(top_srcdir)/introspection/vpn-errors.xml \ - $(top_srcdir)/introspection/generic-types.xml - GENERATED_FILES = if SETTING_DOCS_AVAILABLE @@ -47,11 +40,6 @@ MKHTML_OPTIONS=--path="$(abs_srcdir)" # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) content_files = \ - version.xml \ - ../../COPYING \ - $(NULL) - -expand_content_files = \ $(top_builddir)/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \ $(top_builddir)/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \ $(top_builddir)/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \ @@ -85,12 +73,21 @@ expand_content_files = \ $(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \ $(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \ $(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \ + $(top_builddir)/man/nmcli.xml \ + $(top_builddir)/man/nmtui.xml \ + $(top_builddir)/man/nm-online.xml \ $(top_builddir)/man/NetworkManager.xml \ $(top_builddir)/man/NetworkManager.conf.xml \ $(top_builddir)/man/nmcli-examples.xml \ $(top_builddir)/man/nm-settings.xml \ $(top_builddir)/man/nm-settings-keyfile.xml \ - $(top_builddir)/man/nm-settings-ifcfg-rh.xml + version.xml \ + ../../COPYING \ + $(NULL) + +if CONFIG_PLUGIN_IFCFG_RH +content_files += $(top_builddir)/man/nm-settings-ifcfg-rh.xml +endif include $(top_srcdir)/gtk-doc.make diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index 6a510fef..bccad102 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -94,7 +94,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @SETTING_DOCS_AVAILABLE_TRUE@am__append_1 = settings-spec.xml -@BUILD_SETTING_DOCS_TRUE@am__append_2 = settings-spec.xml +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_2 = $(top_builddir)/man/nm-settings-ifcfg-rh.xml +@BUILD_SETTING_DOCS_TRUE@am__append_3 = settings-spec.xml subdir = docs/api ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ @@ -406,13 +407,6 @@ with_valgrind = @with_valgrind@ AUTOMAKE_OPTIONS = 1.7 XSLTPROC = xsltproc --xinclude --nonet XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) -OTHER_FILES = \ - $(top_builddir)/introspection/all.xml \ - $(top_srcdir)/introspection/generic-types.xml \ - $(top_srcdir)/introspection/errors.xml \ - $(top_srcdir)/introspection/vpn-errors.xml \ - $(top_srcdir)/introspection/generic-types.xml - GENERATED_FILES = $(am__append_1) #################################### @@ -434,13 +428,7 @@ MKTMPL_OPTIONS = MKHTML_OPTIONS = --path="$(abs_srcdir)" # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) -content_files = \ - version.xml \ - ../../COPYING \ - $(NULL) - -expand_content_files = \ - $(top_builddir)/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \ +content_files = $(top_builddir)/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \ $(top_builddir)/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \ $(top_builddir)/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \ $(top_builddir)/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \ @@ -473,13 +461,14 @@ expand_content_files = \ $(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \ $(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \ $(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \ + $(top_builddir)/man/nmcli.xml $(top_builddir)/man/nmtui.xml \ + $(top_builddir)/man/nm-online.xml \ $(top_builddir)/man/NetworkManager.xml \ $(top_builddir)/man/NetworkManager.conf.xml \ $(top_builddir)/man/nmcli-examples.xml \ $(top_builddir)/man/nm-settings.xml \ - $(top_builddir)/man/nm-settings-keyfile.xml \ - $(top_builddir)/man/nm-settings-ifcfg-rh.xml - + $(top_builddir)/man/nm-settings-keyfile.xml version.xml \ + ../../COPYING $(NULL) $(am__append_2) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @@ -524,7 +513,7 @@ REPORT_FILES = \ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \ gtkdoc-check.test html/* tmpl/* xml/* \ NetworkManager-sections.txt NetworkManager-overrides.txt \ - $(am__append_2) + $(am__append_3) @GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = @GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index 5049ecfe..6823dddb 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -37,7 +37,7 @@

-

Description

+

Description

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

-

File Format

+

File Format

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

-

+

main section

@@ -148,7 +148,13 @@ plugins-=remove-me the connection files at startup, and when explicitly requested via the ReloadConnections D-Bus call. If this key is set to 'true', then NetworkManager will reload - connection files any time they changed.

+ connection files any time they changed. + Automatic reloading is not advised because there are race conditions + involved and it depends on the way how the editor updates the file. + In some situations, NetworkManager might first delete and add the + connection anew, instead of updating the existing one. Also, NetworkManager + might pick up incomplete settings while the user is still editing the files. +

@@ -324,7 +330,7 @@ no-auto-default=* sensitive information such as passwords or configuration settings.

- fatal-warnings: set g_log_set_always_fatal() + fatal-warnings: set g_log_set_always_fatal() to core dump on warning messages from glib. This is equivalent to the --g-fatal-warnings command line option.

@@ -334,7 +340,7 @@ no-auto-default=*

auth-polkit
-

+

keyfile section

This section contains keyfile-plugin-specific options, and is normally only used when you are not using any other @@ -386,7 +392,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth

-

+

ifupdown section

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

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

-

+

logging section

This section controls NetworkManager's logging. Any settings here are overridden by the --log-level @@ -493,7 +499,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth

-

+

connection section

Specify default values for connections.

@@ -507,7 +513,7 @@ ipv6.ip6-privacy=0

-

Supported Properties

+

Supported Properties

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

-

Sections

+

Sections

You can configure multiple connection sections, by having different sections with a name that all start @@ -654,7 +660,7 @@ ipv6.ip6-privacy=1

-

+

connectivity section

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

-

+

global-dns section

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

@@ -730,7 +736,7 @@ ipv6.ip6-privacy=1

-

+

global-dns-domain sections

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

-

+

.config sections

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

-

Plugins

+

Plugins

@@ -953,7 +959,7 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
-

Appendix

+

Appendix

Device List Format

@@ -1042,11 +1048,11 @@ interface-name:vboxnet*,except:interface-name:vboxnet2

-

See Also

+

See Also

NetworkManager(8), nmcli(1), - nmcli-examples(5), + nmcli-examples(7), nm-online(1), nm-settings(5), nm-applet(1), diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index d076d1ec..d210c50e 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -43,6 +43,9 @@ + + + diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html index f12e5b55..5f08219e 100644 --- a/docs/api/html/NetworkManager.html +++ b/docs/api/html/NetworkManager.html @@ -6,7 +6,7 @@ - + @@ -16,7 +16,7 @@ Home Up -Prev +Prev Next

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

NetworkManager [OPTIONS...]

-

Description

+

Description

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

-

Dispatcher scripts

+

Dispatcher scripts

NetworkManager will execute scripts in the /etc/NetworkManager/dispatcher.d directory or subdirectories in @@ -296,7 +296,7 @@

-

Options

+

Options

The following options are understood:

@@ -389,7 +389,7 @@
-

UDEV PROPERTIES

+

UDEV PROPERTIES

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

-

SIGNALS

+

SIGNALS

NetworkManager process handles the following signals:

@@ -458,7 +458,7 @@

-

DEBUGGING

+

DEBUGGING

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

-

See Also

+

See Also

NetworkManager.conf(5), nmcli(1), - nmcli-examples(5), + nmcli-examples(7), nm-online(1), nm-settings(5), nm-applet(1), diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html index 555898aa..6156a6f4 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html @@ -85,7 +85,10 @@ PropertiesChanged (a{sv} properties); 

 Flags  readable   u
-

Flags describing the capabilities of the access point.

+

Flags describing the capabilities of the access point. +

+

Returns: NM80211ApFlags +

@@ -93,7 +96,11 @@ Flags readable u 
 WpaFlags  readable   u
-

Flags describing the access point's capabilities according to WPA (Wifi Protected Access).

+

Flags describing the access point's capabilities according to WPA (Wifi + Protected Access). +

+

Returns: NM80211ApSecurityFlags +

@@ -101,7 +108,11 @@ WpaFlags readable u 
 RsnFlags  readable   u
-

Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.

+

Flags describing the access point's capabilities according to the RSN + (Robust Secure Network) protocol. +

+

Returns: NM80211ApSecurityFlags +

@@ -109,7 +120,8 @@ RsnFlags readable u 
 Ssid  readable   ay
-

The Service Set Identifier identifying the access point.

+

The Service Set Identifier identifying the access point. +

@@ -117,7 +129,8 @@ Ssid readable ay 
 Frequency  readable   u
-

The radio channel frequency in use by the access point, in MHz.

+

The radio channel frequency in use by the access point, in MHz. +

@@ -125,7 +138,8 @@ Frequency readable u 
 HwAddress  readable   s
-

The hardware address (BSSID) of the access point.

+

The hardware address (BSSID) of the access point. +

@@ -133,7 +147,10 @@ HwAddress readable s 
 Mode  readable   u
-

Describes the operating mode of the access point.

+

Describes the operating mode of the access point. +

+

Returns: NM80211Mode +

@@ -141,7 +158,9 @@ Mode readable u 
 MaxBitrate  readable   u
-

The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).

+

The maximum bitrate this access point is capable of, in kilobits/second + (Kb/s). +

@@ -149,7 +168,8 @@ MaxBitrate readable u 
 Strength  readable   y
-

The current signal quality of the access point, in percent.

+

The current signal quality of the access point, in percent. +

@@ -157,7 +177,10 @@ Strength readable y 
 LastSeen  readable   i
-

The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access point was found in scan results. A value of -1 means the access point has never been found in scan results.

+

The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access + point was found in scan results. A value of -1 means the access point has + never been found in scan results. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html index b1602bcf..c11ce86b 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html @@ -47,11 +47,13 @@

Method Details

-

The Register() method

+

The Register() method

 Register (IN  s identifier);
-

Called by secret Agents to register their ability to provide and save network secrets.

+

Called by secret Agents to register their ability to provide and save + network secrets. +

@@ -59,18 +61,19 @@ Register (IN s identifier); - +

IN s identifier:

Identifies this agent; only one agent in each user session may use the same identifier. Identifier formatting follows the same rules as D-Bus bus names with the exception that the ':' character is not allowed. The valid set of characters is "[A-Z][a-z][0-9]_-." and the identifier is limited in length to 255 characters with a minimum of 3 characters. An example valid identifier is 'org.gnome.nm-applet' (without quotes).

Identifies this agent; only one agent in each user session may use the same identifier. Identifier formatting follows the same rules as D-Bus bus names with the exception that the ':' character is not allowed. The valid set of characters is "[A-Z][a-z][0-9]_-." and the identifier is limited in length to 255 characters with a minimum of 3 characters. An example valid identifier is 'org.gnome.nm-applet' (without quotes).
-

The RegisterWithCapabilities() method

+

The RegisterWithCapabilities() method

 RegisterWithCapabilities (IN  s identifier,
                           IN  u capabilities);
-

Like Register() but indicates agent capabilities to NetworkManager.

+

Like Register() but indicates agent capabilities to NetworkManager. +

@@ -79,22 +82,25 @@ RegisterWithCapabilities (IN s identifier, - + - +

IN s identifier:

See the Register() method's identifier argument.

See the Register() method's identifier argument.

IN u capabilities:

Indicates various agent capabilities to NetworkManager.

(NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager.
-

The Unregister() method

+

The Unregister() method

 Unregister ();
-

Called by secret Agents to notify NetworkManager that they will no longer handle requests for network secrets. Agents are automatically unregistered when they disconnect from D-Bus.

+

Called by secret Agents to notify NetworkManager that they will no longer + handle requests for network secrets. Agents are automatically unregistered + when they disconnect from D-Bus. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html index 5d4db35f..cb21000b 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html @@ -61,7 +61,21 @@

Description

-

Objects that implement the Connection.Active interface represent an attempt to connect to a network using the details provided by a Connection object. The Connection.Active object tracks the life-cycle of the connection attempt and if successful indicates whether the connected network is the "default" or preferred network for access. NetworkManager has the concept of connections, which can be thought of as settings, a profile or a configuration that can be applied on a networking device. Such settings-connections are exposed as D-Bus object and the active-connection expresses this relationship between device and settings-connection. At any time a settings-connection can only be activated on one device and vice versa. However, during activation and deactivation multiple active-connections can reference the same device or settings-connection as they are waiting to be activated or to be deactivated.

+

Objects that implement the Connection.Active interface represent an + attempt to connect to a network using the details provided by a Connection + object. The Connection.Active object tracks the life-cycle of the + connection attempt and if successful indicates whether the connected + network is the "default" or preferred network for access. NetworkManager + has the concept of connections, which can be thought of as settings, a + profile or a configuration that can be applied on a networking device. + Such settings-connections are exposed as D-Bus object and the + active-connection expresses this relationship between device and + settings-connection. At any time a settings-connection can only be + activated on one device and vice versa. However, during activation and + deactivation multiple active-connections can reference the same device or + settings-connection as they are waiting to be activated or to be + deactivated. +

Signal Details

@@ -90,7 +104,8 @@ PropertiesChanged (a{sv} properties); 
 Connection  readable   o
-

The path of the connection.

+

The path of the connection. +

@@ -98,7 +113,10 @@ Connection readable o 
 SpecificObject  readable   o
-

A specific object associated with the active connection. This property reflects the specific object used during connection activation, and will not change over the lifetime of the ActiveConnection once set.

+

A specific object associated with the active connection. This property + reflects the specific object used during connection activation, and will + not change over the lifetime of the ActiveConnection once set. +

@@ -106,7 +124,9 @@ SpecificObject readable o 
 Id  readable   s
-

The ID of the connection, provided as a convenience so that clients do not have to retrieve all connection details.

+

The ID of the connection, provided as a convenience so that clients do not + have to retrieve all connection details. +

@@ -114,7 +134,9 @@ Id readable s 
 Uuid  readable   s
-

The UUID of the connection, provided as a convenience so that clients do not have to retrieve all connection details.

+

The UUID of the connection, provided as a convenience so that clients do + not have to retrieve all connection details. +

@@ -122,7 +144,9 @@ Uuid readable s 
 Type  readable   s
-

The type of the connection, provided as a convenience so that clients do not have to retrieve all connection details.

+

The type of the connection, provided as a convenience so that clients do + not have to retrieve all connection details. +

@@ -130,7 +154,9 @@ Type readable s 
 Devices  readable   ao
-

Array of object paths representing devices which are part of this active connection.

+

Array of object paths representing devices which are part of this active + connection. +

@@ -138,7 +164,10 @@ Devices readable ao 
 State  readable   u
-

The state of this active connection.

+

The state of this active connection. +

+

Returns: NMActiveConnectionState +

@@ -146,7 +175,9 @@ State readable u 
 Default  readable   b
-

Whether this active connection is the default IPv4 connection, i.e. whether it currently owns the default IPv4 route.

+

Whether this active connection is the default IPv4 connection, i.e. + whether it currently owns the default IPv4 route. +

@@ -154,7 +185,10 @@ Default readable b 
 Ip4Config  readable   o
-

Object path of the Ip4Config object describing the configuration of the connection. Only valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

+

Object path of the Ip4Config object describing the configuration of the + connection. Only valid when the connection is in the + NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. +

@@ -162,7 +196,10 @@ Ip4Config readable o 
 Dhcp4Config  readable   o
-

Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server (assuming the connection used DHCP). Only valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

+

Object path of the Dhcp4Config object describing the DHCP options returned + by the DHCP server (assuming the connection used DHCP). Only valid when + the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. +

@@ -170,7 +207,9 @@ Dhcp4Config readable o 
 Default6  readable   b
-

Whether this active connection is the default IPv6 connection, i.e. whether it currently owns the default IPv6 route.

+

Whether this active connection is the default IPv6 connection, i.e. + whether it currently owns the default IPv6 route. +

@@ -178,7 +217,10 @@ Default6 readable b 
 Ip6Config  readable   o
-

Object path of the Ip6Config object describing the configuration of the connection. Only valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

+

Object path of the Ip6Config object describing the configuration of the + connection. Only valid when the connection is in the + NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. +

@@ -186,7 +228,10 @@ Ip6Config readable o 
 Dhcp6Config  readable   o
-

Object path of the Dhcp6Config object describing the DHCP options returned by the DHCP server (assuming the connection used DHCP). Only valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

+

Object path of the Dhcp6Config object describing the DHCP options returned + by the DHCP server (assuming the connection used DHCP). Only valid when + the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. +

@@ -194,7 +239,8 @@ Dhcp6Config readable o 
 Vpn  readable   b
-

Whether this active connection is also a VPN connection.

+

Whether this active connection is also a VPN connection. +

@@ -202,7 +248,8 @@ Vpn readable b 
 Master  readable   o
-

The path to the master device if the connection is a slave.

+

The path to the master device if the connection is a slave. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html index 6f8fed9d..ea8eaa80 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html @@ -47,7 +47,8 @@

Description

-

Options and configuration returned by the IPv4 DHCP server.

+

Options and configuration returned by the IPv4 DHCP server. +

Signal Details

@@ -76,7 +77,8 @@ PropertiesChanged (a{sv} properties); 
 Options  readable   a{sv}
-

Configuration options returned by a DHCP server, if any.

+

Configuration options returned by a DHCP server, if any. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html index e1cdb43e..8634c505 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html @@ -47,7 +47,8 @@

Description

-

Options and configuration returned by the IPv6 DHCP server.

+

Options and configuration returned by the IPv6 DHCP server. +

Signal Details

@@ -76,7 +77,8 @@ PropertiesChanged (a{sv} properties); 
 Options  readable   a{sv}
-

Configuration options returned by a DHCP server, if any.

+

Configuration options returned by a DHCP server, if any. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html index 3c4c7c7e..85b8cca5 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html @@ -76,7 +76,8 @@ PropertiesChanged (a{sv} properties); 
 Carrier  readable   b
-

Indicates whether the physical carrier is found.

+

Indicates whether the physical carrier is found. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html index d9fc09cc..8aee9d96 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html @@ -78,7 +78,8 @@ PropertiesChanged (a{sv} properties); 
 HwAddress  readable   s
-

Bluetooth hardware address of the device.

+

Bluetooth hardware address of the device. +

@@ -86,7 +87,8 @@ HwAddress readable s 
 Name  readable   s
-

Bluetooth name of the device.

+

Bluetooth name of the device. +

@@ -94,7 +96,10 @@ Name readable s 
 BtCapabilities  readable   u
-

Bluetooth capabilities of the device (either DUN or NAP).

+

Bluetooth capabilities of the device (either DUN or NAP). +

+

Returns: NMBluetoothCapabilities +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html index 27bfc6f8..bb8000a3 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html @@ -78,7 +78,8 @@ PropertiesChanged (a{sv} properties); 
 HwAddress  readable   s
-

Hardware address of the device.

+

Hardware address of the device. +

@@ -86,7 +87,9 @@ HwAddress readable s 
 Carrier  readable   b
-

Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).

+

Indicates whether the physical carrier is found (e.g. whether a cable is + plugged in or not). +

@@ -94,7 +97,9 @@ Carrier readable b 
 Slaves  readable   ao
-

Array of object paths representing devices which are currently slaved to this device.

+

Array of object paths representing devices which are currently slaved to + this device. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html index 83f25082..8c3c0df6 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html @@ -78,7 +78,8 @@ PropertiesChanged (a{sv} properties); 
 HwAddress  readable   s
-

Hardware address of the device.

+

Hardware address of the device. +

@@ -86,7 +87,9 @@ HwAddress readable s 
 Carrier  readable   b
-

Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).

+

Indicates whether the physical carrier is found (e.g. whether a cable is + plugged in or not). +

@@ -94,7 +97,9 @@ Carrier readable b 
 Slaves  readable   ao
-

Array of object paths representing devices which are currently slaved to this device.

+

Array of object paths representing devices which are currently slaved to + this device. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html index 73fadb87..0ca0acc6 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html @@ -77,7 +77,8 @@ PropertiesChanged (a{sv} properties); 
 HwAddress  readable   s
-

Hardware address of the device.

+

Hardware address of the device. +

@@ -85,7 +86,8 @@ HwAddress readable s 
 TypeDescription  readable   s
-

A (non-localized) description of the interface type, if known.

+

A (non-localized) description of the interface type, if known. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html index ffc09320..8fc079b3 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html @@ -86,7 +86,8 @@ PropertiesChanged (a{sv} properties); 
 Mode  readable   u
-

The tunneling mode.

+

The tunneling mode. +

@@ -94,7 +95,8 @@ Mode readable u 
 Parent  readable   o
-

The object path of the parent device.

+

The object path of the parent device. +

@@ -102,7 +104,8 @@ Parent readable o 
 Local  readable   s
-

The local endpoint of the tunnel.

+

The local endpoint of the tunnel. +

@@ -110,7 +113,8 @@ Local readable s 
 Remote  readable   s
-

The remote endpoint of the tunnel.

+

The remote endpoint of the tunnel. +

@@ -118,7 +122,9 @@ Remote readable s 
 Ttl  readable   y
-

The TTL assigned to tunneled packets. 0 is a special value meaning that packets inherit the TTL value

+

The TTL assigned to tunneled packets. 0 is a special value meaning that + packets inherit the TTL value +

@@ -126,7 +132,9 @@ Ttl readable y 
 Tos  readable   y
-

The type of service (IPv4) or traffic class (IPv6) assigned to tunneled packets.

+

The type of service (IPv4) or traffic class (IPv6) assigned to tunneled + packets. +

@@ -134,7 +142,8 @@ Tos readable y 
 PathMtuDiscovery  readable   b
-

Whether path MTU discovery is enabled on this tunnel.

+

Whether path MTU discovery is enabled on this tunnel. +

@@ -142,7 +151,8 @@ PathMtuDiscovery readable b 
 InputKey  readable   s
-

The key used for incoming packets.

+

The key used for incoming packets. +

@@ -150,7 +160,8 @@ InputKey readable s 
 OutputKey  readable   s
-

The key used for outgoing packets.

+

The key used for outgoing packets. +

@@ -158,7 +169,9 @@ OutputKey readable s 
 EncapsulationLimit  readable   y
-

How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.

+

How many additional levels of encapsulation are permitted to be prepended + to packets. This property applies only to IPv6 tunnels. +

@@ -166,7 +179,9 @@ EncapsulationLimit readable y 
 FlowLabel  readable   u
-

The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.

+

The flow label to assign to tunnel packets. This property applies only to + IPv6 tunnels. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html index 6ba8403e..0be326c1 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html @@ -77,7 +77,8 @@ PropertiesChanged (a{sv} properties); 
 HwAddress  readable   s
-

Hardware address of the device.

+

Hardware address of the device. +

@@ -85,7 +86,9 @@ HwAddress readable s 
 Carrier  readable   b
-

Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).

+

Indicates whether the physical carrier is found (e.g. whether a cable is + plugged in or not). +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html index ab240f49..1cd289ce 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html @@ -79,7 +79,8 @@ PropertiesChanged (a{sv} properties); 
 Parent  readable   o
-

The object path of the parent device.

+

The object path of the parent device. +

@@ -87,7 +88,8 @@ Parent readable o 
 Mode  readable   s
-

The macvlan mode, one of "private", "vepa", "bridge", or "passthru".

+

The macvlan mode, one of "private", "vepa", "bridge", or "passthru". +

@@ -95,7 +97,8 @@ Mode readable s 
 NoPromisc  readable   b
-

Whether the device is blocked from going into promiscuous mode.

+

Whether the device is blocked from going into promiscuous mode. +

@@ -103,7 +106,8 @@ NoPromisc readable b 
 Tap  readable   b
-

Whether the device is a macvtap.

+

Whether the device is a macvtap. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html index a587a928..554ac256 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html @@ -77,7 +77,13 @@ PropertiesChanged (a{sv} properties); 
 ModemCapabilities  readable   u
-

The generic family of access technologies the modem supports. Not all capabilities are available at the same time however; some modems require a firmware reload or other reinitialization to switch between eg CDMA/EVDO and GSM/UMTS.

+

The generic family of access technologies the modem supports. Not all + capabilities are available at the same time however; some modems require a + firmware reload or other reinitialization to switch between eg CDMA/EVDO + and GSM/UMTS. +

+

Returns: NMDeviceModemCapabilities +

@@ -85,7 +91,11 @@ ModemCapabilities readable u 
 CurrentCapabilities  readable   u
-

The generic family of access technologies the modem currently supports without a firmware reload or reinitialization.

+

The generic family of access technologies the modem currently supports + without a firmware reload or reinitialization. +

+

Returns: NMDeviceModemCapabilities +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html index 24d43344..24cd507e 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html @@ -58,7 +58,8 @@ 
 PropertiesChanged (a{sv} properties);
-

Emitted when the wireless device's properties changed.

+

Emitted when the wireless device's properties changed. +

@@ -78,7 +79,8 @@ PropertiesChanged (a{sv} properties); 
 HwAddress  readable   s
-

The hardware address of the device.

+

The hardware address of the device. +

@@ -86,7 +88,8 @@ HwAddress readable s 
 Companion  readable   o
-

The object path of the companion device.

+

The object path of the companion device. +

@@ -94,7 +97,8 @@ Companion readable o 
 ActiveChannel  readable   u
-

The currently active channel.

+

The currently active channel. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html index bda719d3..24f6d5c6 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html @@ -78,7 +78,8 @@ PropertiesChanged (a{sv} properties); 
 HwAddress  readable   s
-

Hardware address of the device.

+

Hardware address of the device. +

@@ -86,7 +87,9 @@ HwAddress readable s 
 Carrier  readable   b
-

Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).

+

Indicates whether the physical carrier is found (e.g. whether a cable is + plugged in or not). +

@@ -94,7 +97,9 @@ Carrier readable b 
 Slaves  readable   ao
-

Array of object paths representing devices which are currently slaved to this device.

+

Array of object paths representing devices which are currently slaved to + this device. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html index 4815cf6e..fedfca40 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html @@ -82,7 +82,8 @@ PropertiesChanged (a{sv} properties); 
 Owner  readable   x
-

The uid of the tunnel owner, or -1 if it has no owner.

+

The uid of the tunnel owner, or -1 if it has no owner. +

@@ -90,7 +91,8 @@ Owner readable x 
 Group  readable   x
-

The gid of the tunnel group, or -1 if it has no owner.

+

The gid of the tunnel group, or -1 if it has no owner. +

@@ -98,7 +100,8 @@ Group readable x 
 Mode  readable   s
-

The tunnel mode, either "tun" or "tap".

+

The tunnel mode, either "tun" or "tap". +

@@ -106,7 +109,9 @@ Mode readable s 
 NoPi  readable   b
-

The tunnel's "TUN_NO_PI" flag; true if no protocol info is prepended to the tunnel packets.

+

The tunnel's "TUN_NO_PI" flag; true if no protocol info is prepended to + the tunnel packets. +

@@ -114,7 +119,9 @@ NoPi readable b 
 VnetHdr  readable   b
-

The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets include a virtio network header.

+

The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets include a + virtio network header. +

@@ -122,7 +129,9 @@ VnetHdr readable b 
 MultiQueue  readable   b
-

The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to the tap device multiple times, for multiple send/receive queues.

+

The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to the tap + device multiple times, for multiple send/receive queues. +

@@ -130,7 +139,8 @@ MultiQueue readable b 
 HwAddress  readable   s
-

Hardware address of the device.

+

Hardware address of the device. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html index 6bdc741f..c045a5ff 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html @@ -76,7 +76,8 @@ PropertiesChanged (a{sv} properties); 
 Peer  readable   o
-

The object path of the device's peer.

+

The object path of the device's peer. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html index 75d564bb..9b8fea75 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html @@ -79,7 +79,8 @@ PropertiesChanged (a{sv} properties); 
 HwAddress  readable   s
-

Hardware address of the device.

+

Hardware address of the device. +

@@ -87,7 +88,9 @@ HwAddress readable s 
 Carrier  readable   b
-

Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).

+

Indicates whether the physical carrier is found (e.g. whether a cable is + plugged in or not). +

@@ -95,7 +98,8 @@ Carrier readable b 
 Parent  readable   o
-

Object path of the parent device of this VLAN device.

+

Object path of the parent device of this VLAN device. +

@@ -103,7 +107,8 @@ Parent readable o 
 VlanId  readable   u
-

The VLAN ID of this VLAN interface.

+

The VLAN ID of this VLAN interface. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html index ec4a48d4..4d227329 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html @@ -92,7 +92,9 @@ PropertiesChanged (a{sv} properties); 
 Parent  readable   o
-

The object path of the parent device (if the VXLAN is not purely internal to this host).

+

The object path of the parent device (if the VXLAN is not purely internal + to this host). +

@@ -100,7 +102,8 @@ Parent readable o 
 HwAddress  readable   s
-

Hardware address of the device.

+

Hardware address of the device. +

@@ -108,7 +111,8 @@ HwAddress readable s 
 Id  readable   u
-

The VXLAN Network Identifier (VNI).

+

The VXLAN Network Identifier (VNI). +

@@ -116,7 +120,9 @@ Id readable u 
 Group  readable   s
-

The IP (v4 or v6) multicast group used to communicate with other physical hosts on this VXLAN.

+

The IP (v4 or v6) multicast group used to communicate with other physical + hosts on this VXLAN. +

@@ -124,7 +130,9 @@ Group readable s 
 Local  readable   s
-

The local IPv4 or IPv6 address to use when sending VXLAN packets to other physical hosts.

+

The local IPv4 or IPv6 address to use when sending VXLAN packets to other + physical hosts. +

@@ -132,7 +140,9 @@ Local readable s 
 Tos  readable   y
-

The value to use in the IP ToS field for VXLAN packets sent to other physical hosts.

+

The value to use in the IP ToS field for VXLAN packets sent to other + physical hosts. +

@@ -140,7 +150,9 @@ Tos readable y 
 Ttl  readable   y
-

The value to use in the IP TTL field for VXLAN packets sent to other physical hosts.

+

The value to use in the IP TTL field for VXLAN packets sent to other + physical hosts. +

@@ -148,7 +160,8 @@ Ttl readable y 
 Learning  readable   b
-

True if the VXLAN dynamically learns remote IP addresses.

+

True if the VXLAN dynamically learns remote IP addresses. +

@@ -156,7 +169,8 @@ Learning readable b 
 Ageing  readable   u
-

The interval in seconds at which the kernel purges stale cached addresses.

+

The interval in seconds at which the kernel purges stale cached addresses. +

@@ -164,7 +178,9 @@ Ageing readable u 
 Limit  readable   u
-

The maximum number of entries that can be added to the VXLAN's forwarding table.

+

The maximum number of entries that can be added to the VXLAN's forwarding + table. +

@@ -172,7 +188,8 @@ Limit readable u 
 DstPort  readable   q
-

Destination port for outgoing VXLAN packets.

+

Destination port for outgoing VXLAN packets. +

@@ -180,7 +197,8 @@ DstPort readable q 
 SrcPortMin  readable   q
-

The lowest source port number to use for outgoing VXLAN packets.

+

The lowest source port number to use for outgoing VXLAN packets. +

@@ -188,7 +206,8 @@ SrcPortMin readable q 
 SrcPortMax  readable   q
-

The highest source port number to use for outgoing VXLAN packets.

+

The highest source port number to use for outgoing VXLAN packets. +

@@ -196,7 +215,8 @@ SrcPortMax readable q 
 Proxy  readable   b
-

True if the VXLAN is implementing DOVE ARP proxying for remote clients.

+

True if the VXLAN is implementing DOVE ARP proxying for remote clients. +

@@ -204,7 +224,9 @@ Proxy readable b 
 Rsc  readable   b
-

True if the VXLAN is implementing DOVE route short-circuiting of known remote IP addresses.

+

True if the VXLAN is implementing DOVE route short-circuiting of known + remote IP addresses. +

@@ -212,7 +234,8 @@ Rsc readable b 
 L2miss  readable   b
-

True if the VXLAN will emit netlink notifications of L2 switch misses.

+

True if the VXLAN will emit netlink notifications of L2 switch misses. +

@@ -220,7 +243,8 @@ L2miss readable b 
 L3miss  readable   b
-

True if the VXLAN will emit netlink notifications of L3 switch misses.

+

True if the VXLAN will emit netlink notifications of L3 switch misses. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html index 3ef7947b..2bd82f0a 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html @@ -67,11 +67,12 @@

Method Details

-

The GetNspList() method

+

The GetNspList() method

 GetNspList (OUT ao nsps);
-

Get the list of NSPs visible to this device.

+

Get the list of NSPs visible to this device. +

@@ -91,7 +92,8 @@ GetNspList (OUT ao nsps); 
 PropertiesChanged (a{sv} properties);
-

Emitted when the WiMax device's properties changed.

+

Emitted when the WiMax device's properties changed. +

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

Emitted when a new NSP is found by the device.

+

Emitted when a new NSP is found by the device. +

@@ -127,7 +130,8 @@ NspAdded (o nsp); 
 NspRemoved (o nsp);
-

Emitted when an NSP disappears from view of the device.

+

Emitted when an NSP disappears from view of the device. +

@@ -147,7 +151,9 @@ NspRemoved (o nsp); 
 Nsps  readable   ao
-

List of object paths of Network Service Providers (NSPs) visible to this WiMAX device.

+

List of object paths of Network Service Providers (NSPs) visible to this + WiMAX device. +

@@ -155,7 +161,8 @@ Nsps readable ao 
 HwAddress  readable   s
-

Hardware address of the device.

+

Hardware address of the device. +

@@ -163,7 +170,10 @@ HwAddress readable s 
 CenterFrequency  readable   u
-

Center frequency (in KHz) of the radio channel the device is using to communicate with the network when connected. Has no meaning when the device is not connected.

+

Center frequency (in KHz) of the radio channel the device is using to + communicate with the network when connected. Has no meaning when the + device is not connected. +

@@ -171,7 +181,11 @@ CenterFrequency readable u 
 Rssi  readable   i
-

RSSI of the current radio link in dBm. This value indicates how strong the raw received RF signal from the base station is, but does not indicate the overall quality of the radio link. Has no meaning when the device is not connected.

+

RSSI of the current radio link in dBm. This value indicates how strong the + raw received RF signal from the base station is, but does not indicate the + overall quality of the radio link. Has no meaning when the device is not + connected. +

@@ -179,7 +193,10 @@ Rssi readable i 
 Cinr  readable   i
-

CINR (Carrier to Interference + Noise Ratio) of the current radio link in dB. CINR is a more accurate measure of radio link quality. Has no meaning when the device is not connected.

+

CINR (Carrier to Interference + Noise Ratio) of the current radio link in + dB. CINR is a more accurate measure of radio link quality. Has no meaning + when the device is not connected. +

@@ -187,7 +204,10 @@ Cinr readable i 
 TxPower  readable   i
-

Average power of the last burst transmitted by the device, in units of 0.5 dBm. i.e. a TxPower of -11 represents an actual device TX power of -5.5 dBm. Has no meaning when the device is not connected.

+

Average power of the last burst transmitted by the device, in units of 0.5 + dBm. i.e. a TxPower of -11 represents an actual device TX power of -5.5 + dBm. Has no meaning when the device is not connected. +

@@ -195,7 +215,9 @@ TxPower readable i 
 Bsid  readable   s
-

The ID of the serving base station as received from the network. Has no meaning when the device is not connected.

+

The ID of the serving base station as received from the network. Has no + meaning when the device is not connected. +

@@ -203,7 +225,8 @@ Bsid readable s 
 ActiveNsp  readable   o
-

Object path of the NSP currently used by the WiMax device.

+

Object path of the NSP currently used by the WiMax device. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html index 09de05da..498b1e9b 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html @@ -80,7 +80,8 @@ PropertiesChanged (a{sv} properties); 
 HwAddress  readable   s
-

Active hardware address of the device.

+

Active hardware address of the device. +

@@ -88,7 +89,8 @@ HwAddress readable s 
 PermHwAddress  readable   s
-

Permanent hardware address of the device.

+

Permanent hardware address of the device. +

@@ -96,7 +98,8 @@ PermHwAddress readable s 
 Speed  readable   u
-

Design speed of the device, in megabits/second (Mb/s).

+

Design speed of the device, in megabits/second (Mb/s). +

@@ -104,7 +107,8 @@ Speed readable u 
 S390Subchannels  readable   as
-

Array of S/390 subchannels for S/390 or z/Architecture devices.

+

Array of S/390 subchannels for S/390 or z/Architecture devices. +

@@ -112,7 +116,9 @@ S390Subchannels readable as 
 Carrier  readable   b
-

Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).

+

Indicates whether the physical carrier is found (e.g. whether a cable is + plugged in or not). +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html index 3230bac7..6992176a 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html @@ -68,11 +68,15 @@

Method Details

-

The GetAccessPoints() method

+

The GetAccessPoints() method

 GetAccessPoints (OUT ao access_points);
-

DEPRECATED. Get the list of access points visible to this device. Note that this list does not include access points which hide their SSID. To retrieve a list of all access points (including hidden ones) use the GetAllAccessPoints() method.

+

DEPRECATED. Get the list of access points visible to this device. Note + that this list does not include access points which hide their SSID. To + retrieve a list of all access points (including hidden ones) use the + GetAllAccessPoints() method. +

@@ -86,11 +90,13 @@ GetAccessPoints (OUT ao access_points);
-

The GetAllAccessPoints() method

+

The GetAllAccessPoints() method

 GetAllAccessPoints (OUT ao access_points);
-

Get the list of all access points visible to this device, including hidden ones for which the SSID is not yet known.

+

Get the list of all access points visible to this device, including hidden + ones for which the SSID is not yet known. +

@@ -104,11 +110,12 @@ GetAllAccessPoints (OUT ao access_points);
-

The RequestScan() method

+

The RequestScan() method

 RequestScan (IN  a{sv} options);
-

Request the device to scan

+

Request the device to scan +

@@ -116,7 +123,7 @@ RequestScan (IN a{sv} options); - +

IN a{sv} options:

Options of scan. Currently 'ssids' option with value of "aay" type is supported.

Options of scan. Currently 'ssids' option with value of "aay" type is supported.
@@ -128,7 +135,8 @@ RequestScan (IN a{sv} options); 
 PropertiesChanged (a{sv} properties);
-

Emitted when the wireless device's properties changed.

+

Emitted when the wireless device's properties changed. +

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

Emitted when a new access point is found by the device.

+

Emitted when a new access point is found by the device. +

@@ -164,7 +173,8 @@ AccessPointAdded (o access_point); 
 AccessPointRemoved (o access_point);
-

Emitted when an access point disappears from view of the device.

+

Emitted when an access point disappears from view of the device. +

@@ -184,7 +194,8 @@ AccessPointRemoved (o access_point); 
 HwAddress  readable   s
-

The active hardware address of the device.

+

The active hardware address of the device. +

@@ -192,7 +203,8 @@ HwAddress readable s 
 PermHwAddress  readable   s
-

The permanent hardware address of the device.

+

The permanent hardware address of the device. +

@@ -200,7 +212,10 @@ PermHwAddress readable s 
 Mode  readable   u
-

The operating mode of the wireless device.

+

The operating mode of the wireless device. +

+

Returns: NM80211Mode +

@@ -208,7 +223,9 @@ Mode readable u 
 Bitrate  readable   u
-

The bit rate currently used by the wireless device, in kilobits/second (Kb/s).

+

The bit rate currently used by the wireless device, in kilobits/second + (Kb/s). +

@@ -216,7 +233,8 @@ Bitrate readable u 
 AccessPoints  readable   ao
-

List of object paths of access point visible to this wireless device.

+

List of object paths of access point visible to this wireless device. +

@@ -224,7 +242,8 @@ AccessPoints readable ao 
 ActiveAccessPoint  readable   o
-

Object path of the access point currently used by the wireless device.

+

Object path of the access point currently used by the wireless device. +

@@ -232,7 +251,10 @@ ActiveAccessPoint readable o 
 WirelessCapabilities  readable   u
-

The capabilities of the wireless device.

+

The capabilities of the wireless device. +

+

Returns: NMDeviceWifiCapabilities +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html index ee7203c5..03f74ce4 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html @@ -92,13 +92,33 @@

Method Details

-

The Reapply() method

+

The Reapply() method

 Reapply (IN  a{sa{sv}} connection,
          IN  t         version_id,
          IN  u         flags);
-

Attempts to update the configuration of a device without deactivating it. NetworkManager has the concept of connections, which are profiles that contain the configuration for a networking device. Those connections are exposed via D-Bus as individual objects that can be created, modified and deleted. When activating such a settings-connection on a device, the settings-connection is cloned to become an applied-connection and used to configure the device (see GetAppliedConnection). Subsequent modification of the settings-connection don't propagate automatically to the device's applied-connection (with exception of the firewall-zone and the metered property). For the changes to take effect, you can either re-activate the settings-connection, or call Reapply. The Reapply call allows you to directly update the applied-connection and reconfigure the device. Reapply can also be useful if the currently applied-connection is equal to the connection that is about to be reapplied. This allows to reconfigure the device and revert external changes like removing or adding an IP address (which NetworkManager doesn't revert automatically because it is assumed that the user made these changes intentionally outside of NetworkManager). Reapply can make the applied-connection different from the settings-connection, just like updating the settings-connection can make them different.

+

Attempts to update the configuration of a device without deactivating it. + NetworkManager has the concept of connections, which are profiles that + contain the configuration for a networking device. Those connections are + exposed via D-Bus as individual objects that can be created, modified and + deleted. When activating such a settings-connection on a device, the + settings-connection is cloned to become an applied-connection and used to + configure the device (see GetAppliedConnection). Subsequent modification + of the settings-connection don't propagate automatically to the device's + applied-connection (with exception of the firewall-zone and the metered + property). For the changes to take effect, you can either re-activate the + settings-connection, or call Reapply. The Reapply call allows you to + directly update the applied-connection and reconfigure the device. Reapply + can also be useful if the currently applied-connection is equal to the + connection that is about to be reapplied. This allows to reconfigure the + device and revert external changes like removing or adding an IP address + (which NetworkManager doesn't revert automatically because it is assumed + that the user made these changes intentionally outside of NetworkManager). + Reapply can make the applied-connection different from the + settings-connection, just like updating the settings-connection can make + them different. +

@@ -107,28 +127,35 @@ Reapply (IN a{sa{sv}} connection, - + - + - +

IN a{sa{sv}} connection:

The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarly differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses.

The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarly differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses.

IN t version_id:

If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply.

If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply.

IN u flags:

Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0.

Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0.
-

The GetAppliedConnection() method

+

The GetAppliedConnection() method

 GetAppliedConnection (IN  u         flags,
                       OUT a{sa{sv}} connection,
                       OUT t         version_id);
-

Get the currently applied connection on the device. This is a snapshot of the last activated connection on the device, that is the configuration that is currently applied on the device. Usually this is the same as GetSettings of the referenced settings connection. However, it can differ if the settings connection was subsequently modified or the applied connection was modified by Reapply. The applied connection is set when activating a device or when calling Reapply.

+

Get the currently applied connection on the device. This is a snapshot of + the last activated connection on the device, that is the configuration + that is currently applied on the device. Usually this is the same as + GetSettings of the referenced settings connection. However, it can differ + if the settings connection was subsequently modified or the applied + connection was modified by Reapply. The applied connection is set when + activating a device or when calling Reapply. +

@@ -137,7 +164,7 @@ GetAppliedConnection (IN u flags, - + @@ -145,26 +172,31 @@ GetAppliedConnection (IN u flags, - +

IN u flags:

Flags which would modify the behavior of the GetAppliedConnection call. There are no flags defined currently and the users should use the value of 0.

Flags which would modify the behavior of the GetAppliedConnection call. There are no flags defined currently and the users should use the value of 0.

OUT a{sa{sv}} connection:

OUT t version_id:

The version-id of the currently applied connection. This can be specified during Reapply to avoid races where you first fetch the applied connection, modify it and try to reapply it. If the applied connection is modified in the meantime, the version_id gets incremented and Reapply will fail.

The version-id of the currently applied connection. This can be specified during Reapply to avoid races where you first fetch the applied connection, modify it and try to reapply it. If the applied connection is modified in the meantime, the version_id gets incremented and Reapply will fail.
-

The Disconnect() method

+

The Disconnect() method

 Disconnect ();
-

Disconnects a device and prevents the device from automatically activating further connections without user intervention.

+

Disconnects a device and prevents the device from automatically activating + further connections without user intervention. +

-

The Delete() method

+

The Delete() method

 Delete ();
-

Deletes a software device from NetworkManager and removes the interface from the system. The method returns an error when called for a hardware device.

+

Deletes a software device from NetworkManager and removes the interface + from the system. The method returns an error when called for a hardware + device. +

@@ -185,15 +217,15 @@ StateChanged (u new_state,

u new_state:

-

The new state of the device.

+

(NMDeviceState) The new state of the device.

u old_state:

-

The previous state of the device.

+

(NMDeviceState) The previous state of the device.

u reason:

-

A reason for the state transition.

+

(NMDeviceStateReason) A reason for the state transition.

@@ -206,7 +238,18 @@ StateChanged (u new_state, 
 Udi  readable   s
-

Operating-system specific transient device hardware identifier. This is an opaque string representing the underlying hardware for the device, and shouldn't be used to keep track of individual devices. For some device types (Bluetooth, Modems) it is an identifier used by the hardware service (ie bluez or ModemManager) to refer to that device, and client programs use it get additional information from those services which NM does not provide. The Udi is not guaranteed to be consistent across reboots or hotplugs of the hardware. If you're looking for a way to uniquely track each device in your application, use the object path. If you're looking for a way to track a specific piece of hardware across reboot or hotplug, use a MAC address or USB serial number.

+

Operating-system specific transient device hardware identifier. This is an + opaque string representing the underlying hardware for the device, and + shouldn't be used to keep track of individual devices. For some device + types (Bluetooth, Modems) it is an identifier used by the hardware service + (ie bluez or ModemManager) to refer to that device, and client programs + use it get additional information from those services which NM does not + provide. The Udi is not guaranteed to be consistent across reboots or + hotplugs of the hardware. If you're looking for a way to uniquely track + each device in your application, use the object path. If you're looking + for a way to track a specific piece of hardware across reboot or hotplug, + use a MAC address or USB serial number. +

@@ -214,7 +257,8 @@ Udi readable s 
 Interface  readable   s
-

The name of the device's control (and often data) interface.

+

The name of the device's control (and often data) interface. +

@@ -222,7 +266,11 @@ Interface readable s 
 IpInterface  readable   s
-

The name of the device's data interface when available. This property may not refer to the actual data interface until the device has successfully established a data connection, indicated by the device's State becoming ACTIVATED.

+

The name of the device's data interface when available. This property may + not refer to the actual data interface until the device has successfully + established a data connection, indicated by the device's State becoming + ACTIVATED. +

@@ -230,7 +278,8 @@ IpInterface readable s 
 Driver  readable   s
-

The driver handling the device.

+

The driver handling the device. +

@@ -238,7 +287,8 @@ Driver readable s 
 DriverVersion  readable   s
-

The version of the driver handling the device.

+

The version of the driver handling the device. +

@@ -246,7 +296,8 @@ DriverVersion readable s 
 FirmwareVersion  readable   s
-

The firmware version for the device.

+

The firmware version for the device. +

@@ -254,7 +305,10 @@ FirmwareVersion readable s 
 Capabilities  readable   u
-

Flags describing the capabilities of the device.

+

Flags describing the capabilities of the device. +

+

Returns: NMDeviceCapabilities +

@@ -262,7 +316,9 @@ Capabilities readable u 
 Ip4Address  readable   u
-

DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object instead.

+

DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object + instead. +

@@ -270,7 +326,10 @@ Ip4Address readable u 
 State  readable   u
-

The current state of the device.

+

The current state of the device. +

+

Returns: NMDeviceState +

@@ -278,7 +337,10 @@ State readable u 
 StateReason  readable   (uu)
-

The current state and reason for changing to that state.

+

The current state and reason for changing to that state. +

+

Returns: A tuple of NMDeviceState and NMDeviceStateReason. +

@@ -286,7 +348,11 @@ StateReason readable (uu) 
 ActiveConnection  readable   o
-

Object path of an ActiveConnection object that "owns" this device during activation. The ActiveConnection object tracks the life-cycle of a connection to a specific network and implements the org.freedesktop.NetworkManager.Connection.Active D-Bus interface.

+

Object path of an ActiveConnection object that "owns" this device during + activation. The ActiveConnection object tracks the life-cycle of a + connection to a specific network and implements the + org.freedesktop.NetworkManager.Connection.Active D-Bus interface. +

@@ -294,7 +360,10 @@ ActiveConnection readable o 
 Ip4Config  readable   o
-

Object path of the Ip4Config object describing the configuration of the device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.

+

Object path of the Ip4Config object describing the configuration of the + device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED + state. +

@@ -302,7 +371,10 @@ Ip4Config readable o 
 Dhcp4Config  readable   o
-

Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.

+

Object path of the Dhcp4Config object describing the DHCP options returned + by the DHCP server. Only valid when the device is in the + NM_DEVICE_STATE_ACTIVATED state. +

@@ -310,7 +382,10 @@ Dhcp4Config readable o 
 Ip6Config  readable   o
-

Object path of the Ip6Config object describing the configuration of the device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.

+

Object path of the Ip6Config object describing the configuration of the + device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED + state. +

@@ -318,7 +393,10 @@ Ip6Config readable o 
 Dhcp6Config  readable   o
-

Object path of the Dhcp6Config object describing the DHCP options returned by the DHCP server. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.

+

Object path of the Dhcp6Config object describing the DHCP options returned + by the DHCP server. Only valid when the device is in the + NM_DEVICE_STATE_ACTIVATED state. +

@@ -326,7 +404,11 @@ Dhcp6Config readable o 
 Managed  readwrite  b
-

Whether or not this device is managed by NetworkManager. Setting this property has a similar effect to configuring the device as unmanaged via the keyfile.unmanaged-devices setting in NetworkManager.conf. Changes to this value are not persistent and lost after NetworkManager restart.

+

Whether or not this device is managed by NetworkManager. Setting this + property has a similar effect to configuring the device as unmanaged via + the keyfile.unmanaged-devices setting in NetworkManager.conf. Changes to + this value are not persistent and lost after NetworkManager restart. +

@@ -334,7 +416,12 @@ Managed readwrite b 
 Autoconnect  readwrite  b
-

If TRUE, indicates the device is allowed to autoconnect. If FALSE, manual intervention is required before the device will automatically connect to a known network, such as activating a connection using the device, or setting this property to TRUE. This property cannot be set to TRUE for default-unmanaged devices, since they never autoconnect.

+

If TRUE, indicates the device is allowed to autoconnect. If FALSE, manual + intervention is required before the device will automatically connect to a + known network, such as activating a connection using the device, or + setting this property to TRUE. This property cannot be set to TRUE for + default-unmanaged devices, since they never autoconnect. +

@@ -342,7 +429,9 @@ Autoconnect readwrite b 
 FirmwareMissing  readable   b
-

If TRUE, indicates the device is likely missing firmware necessary for its operation.

+

If TRUE, indicates the device is likely missing firmware necessary for its + operation. +

@@ -350,7 +439,9 @@ FirmwareMissing readable b 
 NmPluginMissing  readable   b
-

If TRUE, indicates the NetworkManager plugin for the device is likely missing or misconfigured.

+

If TRUE, indicates the NetworkManager plugin for the device is likely + missing or misconfigured. +

@@ -358,7 +449,10 @@ NmPluginMissing readable b 
 DeviceType  readable   u
-

The general type of the network device; ie Ethernet, WiFi, etc.

+

The general type of the network device; ie Ethernet, WiFi, etc. +

+

Returns: NMDeviceType +

@@ -366,7 +460,9 @@ DeviceType readable u 
 AvailableConnections  readable   ao
-

An array of object paths of every configured connection that is currently 'available' through this device.

+

An array of object paths of every configured connection that is currently + 'available' through this device. +

@@ -374,7 +470,11 @@ AvailableConnections readable ao 
 PhysicalPortId  readable   s
-

If non-empty, an (opaque) indicator of the physical network port associated with the device. This can be used to recognize when two seemingly-separate hardware devices are actually just different virtual interfaces to the same physical port.

+

If non-empty, an (opaque) indicator of the physical network port + associated with the device. This can be used to recognize when two + seemingly-separate hardware devices are actually just different virtual + interfaces to the same physical port. +

@@ -382,7 +482,8 @@ PhysicalPortId readable s 
 Mtu  readable   u
-

The device MTU (maximum transmission unit).

+

The device MTU (maximum transmission unit). +

@@ -390,7 +491,11 @@ Mtu readable u 
 Metered  readable   u
-

Whether the amount of traffic flowing through the device is subject to limitations, for example set by service providers.

+

Whether the amount of traffic flowing through the device is subject to + limitations, for example set by service providers. +

+

Returns: NMMetered +

@@ -398,7 +503,9 @@ Metered readable u 
 LldpNeighbors  readable   aa{sv}
-

Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV names to variant boxed values.

+

Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV + names to variant boxed values. +

@@ -406,7 +513,10 @@ LldpNeighbors readable aa{sv} 
 Real  readable   b
-

True if the device exists, or False for placeholder devices that do not yet exist but could be automatically created by NetworkManager if one of their AvailableConnections was activated.

+

True if the device exists, or False for placeholder devices that do not + yet exist but could be automatically created by NetworkManager if one of + their AvailableConnections was activated. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html index 88aabf84..7405a23c 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html @@ -85,7 +85,10 @@ PropertiesChanged (a{sv} properties); 
 Addresses  readable   aau
-

Array of arrays of IPv4 address/prefix/gateway. All 3 elements of each array are in network byte order. Essentially: [(addr, prefix, gateway), (addr, prefix, gateway), ...] Deprecated: use AddressData and Gateway

+

Array of arrays of IPv4 address/prefix/gateway. All 3 elements of each + array are in network byte order. Essentially: [(addr, prefix, gateway), + (addr, prefix, gateway), ...] Deprecated: use AddressData and Gateway +

@@ -93,7 +96,10 @@ Addresses readable aau 
 AddressData  readable   aa{sv}
-

Array of IP address data objects. All addresses will include "address" (an IP address string), and "prefix" (a uint). Some addresses may include additional attributes.

+

Array of IP address data objects. All addresses will include "address" (an + IP address string), and "prefix" (a uint). Some addresses may include + additional attributes. +

@@ -101,7 +107,8 @@ AddressData readable aa{sv} 
 Gateway  readable   s
-

The gateway in use.

+

The gateway in use. +

@@ -109,7 +116,12 @@ Gateway readable s 
 Routes  readable   aau
-

Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of each tuple are in network byte order. 'route' and 'next hop' are IPv4 addresses, while prefix and metric are simple unsigned integers. Essentially: [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), ...] Deprecated: use RouteData

+

Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of each tuple + are in network byte order. 'route' and 'next hop' are IPv4 addresses, + while prefix and metric are simple unsigned integers. Essentially: + [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), + ...] Deprecated: use RouteData +

@@ -117,7 +129,10 @@ Routes readable aau 
 RouteData  readable   aa{sv}
-

Array of IP route data objects. All routes will include "dest" (an IP address string) and "prefix" (a uint). Some routes may include "next-hop" (an IP address string), "metric" (a uint), and additional attributes.

+

Array of IP route data objects. All routes will include "dest" (an IP + address string) and "prefix" (a uint). Some routes may include "next-hop" + (an IP address string), "metric" (a uint), and additional attributes. +

@@ -125,7 +140,8 @@ RouteData readable aa{sv} 
 Nameservers  readable   au
-

The nameservers in use.

+

The nameservers in use. +

@@ -133,7 +149,8 @@ Nameservers readable au 
 Domains  readable   as
-

A list of domains this address belongs to.

+

A list of domains this address belongs to. +

@@ -141,7 +158,8 @@ Domains readable as 
 Searches  readable   as
-

A list of dns searches.

+

A list of dns searches. +

@@ -149,7 +167,9 @@ Searches readable as 
 DnsOptions  readable   as
-

A list of DNS options that modify the behavior of the DNS resolver. See resolv.conf(5) manual page for the list of supported options.

+

A list of DNS options that modify the behavior of the DNS resolver. See + resolv.conf(5) manual page for the list of supported options. +

@@ -157,7 +177,9 @@ DnsOptions readable as 
 WinsServers  readable   au
-

The Windows Internet Name Service servers associated with the connection. Each address is in network byte order.

+

The Windows Internet Name Service servers associated with the connection. + Each address is in network byte order. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html index b369e2ab..fba5de80 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html @@ -84,7 +84,9 @@ PropertiesChanged (a{sv} properties); 
 Addresses  readable   a(ayuay)
-

Array of tuples of IPv6 address/prefix/gateway. Deprecated: use AddressData and Gateway.

+

Array of tuples of IPv6 address/prefix/gateway. Deprecated: use + AddressData and Gateway. +

@@ -92,7 +94,10 @@ Addresses readable a(ayuay) 
 AddressData  readable   aa{sv}
-

Array of IP address data objects. All addresses will include "address" (an IP address string), and "prefix" (a uint). Some addresses may include additional attributes.

+

Array of IP address data objects. All addresses will include "address" (an + IP address string), and "prefix" (a uint). Some addresses may include + additional attributes. +

@@ -100,7 +105,8 @@ AddressData readable aa{sv} 
 Gateway  readable   s
-

The gateway in use.

+

The gateway in use. +

@@ -108,7 +114,8 @@ Gateway readable s 
 Routes  readable   a(ayuayu)
-

Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData

+

Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData +

@@ -116,7 +123,10 @@ Routes readable a(ayuayu) 
 RouteData  readable   aa{sv}
-

Array of IP route data objects. All routes will include "dest" (an IP address string) and "prefix" (a uint). Some routes may include "next-hop" (an IP address string), "metric" (a uint), and additional attributes.

+

Array of IP route data objects. All routes will include "dest" (an IP + address string) and "prefix" (a uint). Some routes may include "next-hop" + (an IP address string), "metric" (a uint), and additional attributes. +

@@ -124,7 +134,8 @@ RouteData readable aa{sv} 
 Nameservers  readable   aay
-

The nameservers in use.

+

The nameservers in use. +

@@ -132,7 +143,8 @@ Nameservers readable aay 
 Domains  readable   as
-

A list of domains this address belongs to.

+

A list of domains this address belongs to. +

@@ -140,7 +152,8 @@ Domains readable as 
 Searches  readable   as
-

A list of dns searches.

+

A list of dns searches. +

@@ -148,7 +161,9 @@ Searches readable as 
 DnsOptions  readable   as
-

A list of DNS options that modify the behavior of the DNS resolver. See resolv.conf(5) manual page for the list of supported options.

+

A list of DNS options that modify the behavior of the DNS resolver. See + resolv.conf(5) manual page for the list of supported options. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html index a8466a8e..40a183dc 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html @@ -48,7 +48,7 @@

Method Details

-

The NeedSecrets() method

+

The NeedSecrets() method

 NeedSecrets (OUT s username,
              OUT s password);
@@ -73,7 +73,7 @@ NeedSecrets (OUT s username,
-

The SetIp4Config() method

+

The SetIp4Config() method

 SetIp4Config (IN  a{sv} config);
@@ -91,7 +91,7 @@ SetIp4Config (IN a{sv} config);
-

The SetIp6Config() method

+

The SetIp6Config() method

 SetIp6Config (IN  a{sv} config);
@@ -109,7 +109,7 @@ SetIp6Config (IN a{sv} config);
-

The SetState() method

+

The SetState() method

 SetState (IN  u state);
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html index d160c1a1..7899f99b 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html @@ -50,12 +50,21 @@

Description

-

Private D-Bus interface used by secret agents that store and provide secrets to NetworkManager. If an agent provides secrets to NetworkManager as part of connection creation, and the some of those secrets are "agent owned" the agent should store those secrets itself and should not expect its SaveSecrets() method to be called. SaveSecrets() will be called eg if some program other than the agent itself (like a connection editor) changes the secrets out of band. The agent should implement this D-Bus interface on an object with the path /org/freedesktop/NetworkManager/SecretAgent.

+

Private D-Bus interface used by secret agents that store and provide + secrets to NetworkManager. If an agent provides secrets to NetworkManager + as part of connection creation, and the some of those secrets are "agent + owned" the agent should store those secrets itself and should not expect + its SaveSecrets() method to be called. SaveSecrets() will be called eg if + some program other than the agent itself (like a connection editor) + changes the secrets out of band. The agent should implement this D-Bus + interface on an object with the path + /org/freedesktop/NetworkManager/SecretAgent. +

Method Details

-

The GetSecrets() method

+

The GetSecrets() method

 GetSecrets (IN  a{sa{sv}} connection,
             IN  o         connection_path,
@@ -64,7 +73,14 @@ GetSecrets (IN  a{sa{sv}} connection,
             IN  u         flags,
             OUT a{sa{sv}} secrets);
-

Retrieve and return stored secrets, if any, or request new secrets from the agent's user. If user interaction is allowed and the user enters new secrets, the agent is expected to save the new secrets to persistent storage (if the secret's flags include AGENT_OWNED) as NetworkManager will not send these secrets back to the same agent via a SaveSecrets() call. If the user canceled any interaction, the agent should return the UserCanceled error (see below).

+

Retrieve and return stored secrets, if any, or request new secrets from + the agent's user. If user interaction is allowed and the user enters new + secrets, the agent is expected to save the new secrets to persistent + storage (if the secret's flags include AGENT_OWNED) as NetworkManager will + not send these secrets back to the same agent via a SaveSecrets() call. If + the user canceled any interaction, the agent should return the + UserCanceled error (see below). +

@@ -73,11 +89,11 @@ GetSecrets (IN a{sa{sv}} connection, - + - + @@ -85,27 +101,30 @@ GetSecrets (IN a{sa{sv}} connection, - + - + - +

IN a{sa{sv}} connection:

Nested settings maps containing the connection for which secrets are being requested. This may contain system-owned secrets if the agent has successfully authenticated to modify system network settings and the GetSecrets request flags allow user interaction.

Nested settings maps containing the connection for which secrets are being requested. This may contain system-owned secrets if the agent has successfully authenticated to modify system network settings and the GetSecrets request flags allow user interaction.

IN o connection_path:

Object path of the connection for which secrets are being requested.

Object path of the connection for which secrets are being requested.

IN s setting_name:

IN as hints:

Array of strings of key names in the requested setting for which NetworkManager thinks a secrets may be required, and/or well-known identifiers and data that may be useful to the client in processing the secrets request. Note that it's not always possible to determine which secret is required, so in some cases no hints may be given. The Agent should return any secrets it has, or that it thinks are required, regardless of what hints NetworkManager sends in this request. Some hints have special prefixes that provide information to the agent; for example, VPN requests may send server-specific messages prefixed with "x-vpn-message:".

Array of strings of key names in the requested setting for which NetworkManager thinks a secrets may be required, and/or well-known identifiers and data that may be useful to the client in processing the secrets request. Note that it's not always possible to determine which secret is required, so in some cases no hints may be given. The Agent should return any secrets it has, or that it thinks are required, regardless of what hints NetworkManager sends in this request. Some hints have special prefixes that provide information to the agent; for example, VPN requests may send server-specific messages prefixed with "x-vpn-message:".

IN u flags:

Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.

(NMSecretAgentGetSecretsFlags) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.

OUT a{sa{sv}} secrets:

Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets.

Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets.
-

The CancelGetSecrets() method

+

The CancelGetSecrets() method

 CancelGetSecrets (IN  o connection_path,
                   IN  s setting_name);
-

Cancel a pending GetSecrets request for secrets of the given connection. Any GetSecrets request with the same 'connection_path' and 'setting_name' that are given in a CancelGetSecrets request should be canceled.

+

Cancel a pending GetSecrets request for secrets of the given connection. + Any GetSecrets request with the same 'connection_path' and 'setting_name' + that are given in a CancelGetSecrets request should be canceled. +

@@ -114,23 +133,24 @@ CancelGetSecrets (IN o connection_path, - + - +

IN o connection_path:

Object path of the connection for which, if secrets for the given 'setting_name' are being requested, the request should be canceled.

Object path of the connection for which, if secrets for the given 'setting_name' are being requested, the request should be canceled.

IN s setting_name:

Setting name for which secrets for this connection were originally being requested.

Setting name for which secrets for this connection were originally being requested.
-

The SaveSecrets() method

+

The SaveSecrets() method

 SaveSecrets (IN  a{sa{sv}} connection,
              IN  o         connection_path);
-

Save given secrets to backing storage.

+

Save given secrets to backing storage. +

@@ -139,23 +159,24 @@ SaveSecrets (IN a{sa{sv}} connection, - + - +

IN a{sa{sv}} connection:

Nested settings maps containing the entire connection (including secrets), for which the agent should save the secrets to backing storage. This method will not be called when the agent itself is the process creating or updating a connection; in that case the agent is assumed to have already saved those secrets since it had them already.

Nested settings maps containing the entire connection (including secrets), for which the agent should save the secrets to backing storage. This method will not be called when the agent itself is the process creating or updating a connection; in that case the agent is assumed to have already saved those secrets since it had them already.

IN o connection_path:

Object path of the connection for which the agent should save secrets to backing storage.

Object path of the connection for which the agent should save secrets to backing storage.
-

The DeleteSecrets() method

+

The DeleteSecrets() method

 DeleteSecrets (IN  a{sa{sv}} connection,
                IN  o         connection_path);
-

Delete secrets from backing storage.

+

Delete secrets from backing storage. +

@@ -164,11 +185,11 @@ DeleteSecrets (IN a{sa{sv}} connection, - + - +

IN a{sa{sv}} connection:

Nested settings maps containing the connection properties (sans secrets), for which the agent should delete the secrets from backing storage.

Nested settings maps containing the connection properties (sans secrets), for which the agent should delete the secrets from backing storage.

IN o connection_path:

Object path of the connection for which the agent should delete secrets from backing storage.

Object path of the connection for which the agent should delete secrets from backing storage.
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html index db2a7d57..b985416f 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html @@ -62,16 +62,22 @@

Description

-

Represents a single network connection configuration.

+

Represents a single network connection configuration. +

Method Details

-

The Update() method

+

The Update() method

 Update (IN  a{sa{sv}} properties);
-

Update the connection with new settings and properties (replacing all previous settings and properties) and save the connection to disk. Secrets may be part of the update request, and will be either stored in persistent storage or sent to a Secret Agent for storage, depending on the flags associated with each secret.

+

Update the connection with new settings and properties (replacing all + previous settings and properties) and save the connection to disk. Secrets + may be part of the update request, and will be either stored in persistent + storage or sent to a Secret Agent for storage, depending on the flags + associated with each secret. +

@@ -85,11 +91,19 @@ Update (IN a{sa{sv}} properties);
-

The UpdateUnsaved() method

+

The UpdateUnsaved() method

 UpdateUnsaved (IN  a{sa{sv}} properties);
-

Update the connection with new settings and properties (replacing all previous settings and properties) but do not immediately save the connection to disk. Secrets may be part of the update request and may sent to a Secret Agent for storage, depending on the flags associated with each secret. Use the 'Save' method to save these changes to disk. Note that unsaved changes will be lost if the connection is reloaded from disk (either automatically on file change or due to an explicit ReloadConnections call).

+

Update the connection with new settings and properties (replacing all + previous settings and properties) but do not immediately save the + connection to disk. Secrets may be part of the update request and may sent + to a Secret Agent for storage, depending on the flags associated with each + secret. Use the 'Save' method to save these changes to disk. Note that + unsaved changes will be lost if the connection is reloaded from disk + (either automatically on file change or due to an explicit + ReloadConnections call). +

@@ -103,19 +117,24 @@ UpdateUnsaved (IN a{sa{sv}} properties);
-

The Delete() method

+

The Delete() method

 Delete ();
-

Delete the connection.

+

Delete the connection. +

-

The GetSettings() method

+

The GetSettings() method

 GetSettings (OUT a{sa{sv}} settings);
-

Get the settings maps describing this network configuration. This will never include any secrets required for connection to the network, as those are often protected. Secrets must be requested separately using the GetSecrets() call.

+

Get the settings maps describing this network configuration. This will + never include any secrets required for connection to the network, as those + are often protected. Secrets must be requested separately using the + GetSecrets() call. +

@@ -129,12 +148,16 @@ GetSettings (OUT a{sa{sv}} settings);
-

The GetSecrets() method

+

The GetSecrets() method

 GetSecrets (IN  s         setting_name,
             OUT a{sa{sv}} secrets);
-

Get the secrets belonging to this network configuration. Only secrets from persistent storage or a Secret Agent running in the requestor's session will be returned. The user will never be prompted for secrets as a result of this request.

+

Get the secrets belonging to this network configuration. Only secrets from + persistent storage or a Secret Agent running in the requestor's session + will be returned. The user will never be prompted for secrets as a result + of this request. +

@@ -143,7 +166,7 @@ GetSecrets (IN s setting_name, - + @@ -154,19 +177,22 @@ GetSecrets (IN s setting_name,
-

The ClearSecrets() method

+

The ClearSecrets() method

 ClearSecrets ();
-

Clear the secrets belonging to this network connection profile.

+

Clear the secrets belonging to this network connection profile. +

-

The Save() method

+

The Save() method

 Save ();
-

Saves a "dirty" connection (that had previously been updated with UpdateUnsaved) to persistent storage.

+

Saves a "dirty" connection (that had previously been updated with + UpdateUnsaved) to persistent storage. +

@@ -176,7 +202,11 @@ Save (); 
 Updated ();
-

Emitted when any settings or permissions change. When handling this signal, clients should re-read the connection using the GetSettings method to get the changes and to ensure the client still has permission to access the connection.

+

Emitted when any settings or permissions change. When handling this + signal, clients should re-read the connection using the GetSettings method + to get the changes and to ensure the client still has permission to access + the connection. +

@@ -184,7 +214,11 @@ Updated (); 
 Removed ();
-

Emitted when this connection is no longer available. This happens when the connection is deleted or if it is no longer accessible by any of the system's logged-in users. After receipt of this signal, the object no longer exists. Also see the Settings.ConnectionRemoved signal.

+

Emitted when this connection is no longer available. This happens when the + connection is deleted or if it is no longer accessible by any of the + system's logged-in users. After receipt of this signal, the object no + longer exists. Also see the Settings.ConnectionRemoved signal. +

@@ -212,7 +246,11 @@ PropertiesChanged (a{sv} properties); 
 Unsaved  readable   b
-

If set, indicates that the in-memory state of the connection does not match the on-disk state. This flag will be set when UpdateUnsaved() is called or when any connection details change, and cleared when the connection is saved to disk via Save() or from internal operations.

+

If set, indicates that the in-memory state of the connection does not + match the on-disk state. This flag will be set when UpdateUnsaved() is + called or when any connection details change, and cleared when the + connection is saved to disk via Save() or from internal operations. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html index d4b243dc..e2064236 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html @@ -68,16 +68,19 @@

Description

-

The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.

+

The Settings interface allows clients to view and administrate the + connections stored and used by NetworkManager. +

Method Details

-

The ListConnections() method

+

The ListConnections() method

 ListConnections (OUT ao connections);
-

List the saved network connections known to NetworkManager.

+

List the saved network connections known to NetworkManager. +

IN s setting_name:

Name of the setting to return secrets for. If empty, all all secrets will be returned.

Name of the setting to return secrets for. If empty, all all secrets will be returned.

OUT a{sa{sv}} secrets:
@@ -91,12 +94,13 @@ ListConnections (OUT ao connections);
-

The GetConnectionByUuid() method

+

The GetConnectionByUuid() method

 GetConnectionByUuid (IN  s uuid,
                      OUT o connection);
-

Retrieve the object path of a connection, given that connection's UUID.

+

Retrieve the object path of a connection, given that connection's UUID. +

@@ -116,12 +120,16 @@ GetConnectionByUuid (IN s uuid,
-

The AddConnection() method

+

The AddConnection() method

 AddConnection (IN  a{sa{sv}} connection,
                OUT o         path);
-

Add new connection and save it to disk. This operation does not start the network connection unless (1) device is idle and able to connect to the network described by the new connection, and (2) the connection is allowed to be started automatically.

+

Add new connection and save it to disk. This operation does not start the + network connection unless (1) device is idle and able to connect to the + network described by the new connection, and (2) the connection is allowed + to be started automatically. +

@@ -141,12 +149,19 @@ AddConnection (IN a{sa{sv}} connection,
-

The AddConnectionUnsaved() method

+

The AddConnectionUnsaved() method

 AddConnectionUnsaved (IN  a{sa{sv}} connection,
                       OUT o         path);
-

Add new connection but do not save it to disk immediately. This operation does not start the network connection unless (1) device is idle and able to connect to the network described by the new connection, and (2) the connection is allowed to be started automatically. Use the 'Save' method on the connection to save these changes to disk. Note that unsaved changes will be lost if the connection is reloaded from disk (either automatically on file change or due to an explicit ReloadConnections call).

+

Add new connection but do not save it to disk immediately. This operation + does not start the network connection unless (1) device is idle and able + to connect to the network described by the new connection, and (2) the + connection is allowed to be started automatically. Use the 'Save' method + on the connection to save these changes to disk. Note that unsaved changes + will be lost if the connection is reloaded from disk (either automatically + on file change or due to an explicit ReloadConnections call). +

@@ -166,13 +181,19 @@ AddConnectionUnsaved (IN a{sa{sv}} connection,
-

The LoadConnections() method

+

The LoadConnections() method

 LoadConnections (IN  as filenames,
                  OUT b  status,
                  OUT as failures);
-

Loads or reloads the indicated connections from disk. You should call this after making changes directly to an on-disk connection file to make sure that NetworkManager sees the changes. (If "monitor-connection-files" in NetworkManager.conf is "true", then this will have no real effect, but is harmless.) As with AddConnection(), this operation does not necessarily start the network connection.

+

Loads or reloads the indicated connections from disk. You should call this + after making changes directly to an on-disk connection file to make sure + that NetworkManager sees the changes. (If "monitor-connection-files" in + NetworkManager.conf is "true", then this will have no real effect, but is + harmless.) As with AddConnection(), this operation does not necessarily + start the network connection. +

@@ -181,11 +202,11 @@ LoadConnections (IN as filenames, - + - + @@ -196,11 +217,16 @@ LoadConnections (IN as filenames,
-

The ReloadConnections() method

+

The ReloadConnections() method

 ReloadConnections (OUT b status);
-

Tells NetworkManager to reload all connection files from disk, including noticing any added or deleted connection files. By default, connections are re-read automatically any time they change, so you only need to use this command if you have set "monitor-connection-files=false" in NetworkManager.conf.

+

Tells NetworkManager to reload all connection files from disk, including + noticing any added or deleted connection files. By default, connections + are re-read automatically any time they change, so you only need to use + this command if you have set "monitor-connection-files=false" in + NetworkManager.conf. +

IN as filenames:

Array of paths to on-disk connection profiles in directories monitored by NetworkManager.

Array of paths to on-disk connection profiles in directories monitored by NetworkManager.

OUT b status:

Success or failure of the operation as a whole. True if NetworkManager at least tried to load the indicated connections, even if it did not succeed. False if an error occurred before trying to load the connections (eg, permission denied).

Success or failure of the operation as a whole. True if NetworkManager at least tried to load the indicated connections, even if it did not succeed. False if an error occurred before trying to load the connections (eg, permission denied).

OUT as failures:
@@ -214,11 +240,12 @@ ReloadConnections (OUT b status);
-

The SaveHostname() method

+

The SaveHostname() method

 SaveHostname (IN  s hostname);
-

Save the hostname to persistent configuration.

+

Save the hostname to persistent configuration. +

@@ -226,7 +253,7 @@ SaveHostname (IN s hostname); - +

IN s hostname:

The hostname to save to persistent configuration. If blank, the persistent hostname is cleared.

The hostname to save to persistent configuration. If blank, the persistent hostname is cleared.
@@ -256,7 +283,15 @@ PropertiesChanged (a{sv} properties); 
 NewConnection (o connection);
-

Emitted when a new connection has been added after NetworkManager has started up and initialized. This signal is not emitted for connections read while starting up, because NetworkManager's D-Bus service is only available after all connections have been read, and to prevent spamming listeners with too many signals at one time. To retrieve the initial connection list, call the ListConnections() method once, and then listen for individual Settings.NewConnection and Settings.Connection.Deleted signals for further updates.

+

Emitted when a new connection has been added after NetworkManager has + started up and initialized. This signal is not emitted for connections + read while starting up, because NetworkManager's D-Bus service is only + available after all connections have been read, and to prevent spamming + listeners with too many signals at one time. To retrieve the initial + connection list, call the ListConnections() method once, and then listen + for individual Settings.NewConnection and Settings.Connection.Deleted + signals for further updates. +

@@ -274,7 +309,12 @@ NewConnection (o connection); 
 ConnectionRemoved (o connection);
-

Emitted when a connection is no longer available. This happens when the connection is deleted or if it is no longer accessible by any of the system's logged-in users. After receipt of this signal, the connection no longer exists and cannot be used. Also see the Settings.Connection.Removed signal.

+

Emitted when a connection is no longer available. This happens when the + connection is deleted or if it is no longer accessible by any of the + system's logged-in users. After receipt of this signal, the connection no + longer exists and cannot be used. Also see the Settings.Connection.Removed + signal. +

@@ -294,7 +334,8 @@ ConnectionRemoved (o connection); 
 Connections  readable   ao
-

List of object paths of available network connection profiles.

+

List of object paths of available network connection profiles. +

@@ -302,7 +343,8 @@ Connections readable ao 
 Hostname  readable   s
-

The machine hostname stored in persistent configuration.

+

The machine hostname stored in persistent configuration. +

@@ -310,7 +352,8 @@ Hostname readable s 
 CanModify  readable   b
-

If true, adding and modifying connections is supported.

+

If true, adding and modifying connections is supported. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html index ea6bd031..331d3a5e 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html @@ -50,7 +50,8 @@

Description

-

Represents an active connection to a Virtual Private Network.

+

Represents an active connection to a Virtual Private Network. +

Signal Details

@@ -78,7 +79,8 @@ PropertiesChanged (a{sv} properties); VpnStateChanged (u state, u reason); -

Emitted when the state of the VPN connection has changed.

+

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

@@ -87,11 +89,11 @@ VpnStateChanged (u state, - + - +

u state:

The new state of the VPN connection.

(NMVpnConnectionState) The new state of the VPN connection.

u reason:

Reason code describing the change to the new state.

(NMVpnConnectionStateReason) Reason code describing the change to the new state.
@@ -104,7 +106,10 @@ VpnStateChanged (u state, 
 VpnState  readable   u
-

The VPN-specific state of the connection.

+

The VPN-specific state of the connection. +

+

Returns: NMVpnConnectionState +

@@ -112,7 +117,8 @@ VpnState readable u 
 Banner  readable   s
-

The banner string of the VPN connection.

+

The banner string of the VPN connection. +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html index 64517b2c..bc21c67c 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html @@ -70,16 +70,20 @@

Description

-

This interface is provided by plugins providing VPN services to the NetworkManager daemon.

+

This interface is provided by plugins providing VPN services to the + NetworkManager daemon. +

Method Details

-

The Connect() method

+

The Connect() method

 Connect (IN  a{sa{sv}} connection);
-

Tells the plugin to connect. Interactive secrets requests (eg, emitting the SecretsRequired signal) are not allowed.

+

Tells the plugin to connect. Interactive secrets requests (eg, emitting + the SecretsRequired signal) are not allowed. +

@@ -93,12 +97,15 @@ Connect (IN a{sa{sv}} connection);
-

The ConnectInteractive() method

+

The ConnectInteractive() method

 ConnectInteractive (IN  a{sa{sv}} connection,
                     IN  a{sv}     details);
-

Tells the plugin to connect, allowing interactive secrets requests (eg the plugin is allowed to emit the SecretsRequired signal if the VPN service indicates that it needs additional secrets during the connect process).

+

Tells the plugin to connect, allowing interactive secrets requests (eg the + plugin is allowed to emit the SecretsRequired signal if the VPN service + indicates that it needs additional secrets during the connect process). +

@@ -118,12 +125,14 @@ ConnectInteractive (IN a{sa{sv}} connection,
-

The NeedSecrets() method

+

The NeedSecrets() method

 NeedSecrets (IN  a{sa{sv}} settings,
              OUT s         setting_name);
-

Asks the plugin whether the provided connection will require secrets to connect successfully.

+

Asks the plugin whether the provided connection will require secrets to + connect successfully. +

@@ -143,19 +152,21 @@ NeedSecrets (IN a{sa{sv}} settings,
-

The Disconnect() method

+

The Disconnect() method

 Disconnect ();
-

Disconnect the plugin.

+

Disconnect the plugin. +

-

The SetConfig() method

+

The SetConfig() method

 SetConfig (IN  a{sv} config);
-

Set generic connection details on the connection.

+

Set generic connection details on the connection. +

@@ -169,11 +180,12 @@ SetConfig (IN a{sv} config);
-

The SetIp4Config() method

+

The SetIp4Config() method

 SetIp4Config (IN  a{sv} config);
-

Set IPv4 details on the connection.

+

Set IPv4 details on the connection. +

@@ -181,17 +193,18 @@ SetIp4Config (IN a{sv} config); - +

IN a{sv} config:

Ip4Config details for the connection. You must call SetConfig() before calling this.

Ip4Config details for the connection. You must call SetConfig() before calling this.
-

The SetIp6Config() method

+

The SetIp6Config() method

 SetIp6Config (IN  a{sv} config);
-

Set IPv6 details on the connection.

+

Set IPv6 details on the connection. +

@@ -199,17 +212,18 @@ SetIp6Config (IN a{sv} config); - +

IN a{sv} config:

Ip6Config details for the connection. You must call SetConfig() before calling this.

Ip6Config details for the connection. You must call SetConfig() before calling this.
-

The SetFailure() method

+

The SetFailure() method

 SetFailure (IN  s reason);
-

Indicate a failure to the plugin.

+

Indicate a failure to the plugin. +

@@ -223,11 +237,13 @@ SetFailure (IN s reason);
-

The NewSecrets() method

+

The NewSecrets() method

 NewSecrets (IN  a{sa{sv}} connection);
-

Called in response to a SecretsRequired signal to deliver updated secrets or other information to the plugin.

+

Called in response to a SecretsRequired signal to deliver updated secrets + or other information to the plugin. +

@@ -247,7 +263,8 @@ NewSecrets (IN a{sa{sv}} connection); 
 StateChanged (u state);
-

Emitted when the plugin state changes.

+

Emitted when the plugin state changes. +

@@ -255,7 +272,7 @@ StateChanged (u state); - +

u state:

The new state of the plugin.

(NMVpnServiceState) The new state of the plugin.
@@ -266,7 +283,10 @@ StateChanged (u state); SecretsRequired (s message, as secrets); -

Emitted during an ongoing ConnectInteractive() request when the plugin has determined that new secrets are required. NetworkManager will then call the NewSecrets() method with a connection hash including the new secrets.

+

Emitted during an ongoing ConnectInteractive() request when the plugin has + determined that new secrets are required. NetworkManager will then call + the NewSecrets() method with a connection hash including the new secrets. +

@@ -275,11 +295,11 @@ SecretsRequired (s message, - + - +

s message:

Informational message, if any, about the request. For example, if a second PIN is required, could indicate to the user to wait for the token code to change until entering the next PIN.

Informational message, if any, about the request. For example, if a second PIN is required, could indicate to the user to wait for the token code to change until entering the next PIN.

as secrets:

Array of strings of VPN secret names which the plugin thinks secrets may be required for, or other VPN-specific data to be processed by the VPN's front-end.

Array of strings of VPN secret names which the plugin thinks secrets may be required for, or other VPN-specific data to be processed by the VPN's front-end.
@@ -290,7 +310,8 @@ SecretsRequired (s message, 
 Config (a{sv} config);
-

The plugin obtained generic configuration information.

+

The plugin obtained generic configuration information. +

@@ -308,7 +329,8 @@ Config (a{sv} config); 
 Ip4Config (a{sv} ip4config);
-

The plugin obtained an IPv4 configuration.

+

The plugin obtained an IPv4 configuration. +

@@ -326,7 +348,8 @@ Ip4Config (a{sv} ip4config); 
 Ip6Config (a{sv} ip6config);
-

The plugin obtained an IPv6 configuration.

+

The plugin obtained an IPv6 configuration. +

@@ -344,7 +367,8 @@ Ip6Config (a{sv} ip6config); 
 LoginBanner (s banner);
-

Emitted when the plugin receives a login banner from the VPN service.

+

Emitted when the plugin receives a login banner from the VPN service. +

@@ -362,7 +386,8 @@ LoginBanner (s banner); 
 Failure (u reason);
-

Emitted when a failure in the VPN plugin occurs.

+

Emitted when a failure in the VPN plugin occurs. +

@@ -370,7 +395,7 @@ Failure (u reason); - +

u reason:

Reason code for the failure.

(NMVpnPluginFailure) Reason code for the failure.
@@ -382,7 +407,10 @@ Failure (u reason); 
 State  readable   u
-

The state of the plugin.

+

The state of the plugin. +

+

Returns: NMVpnServiceState +

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html index ec168881..d028c602 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html @@ -102,11 +102,12 @@

Method Details

-

The GetDevices() method

+

The GetDevices() method

 GetDevices (OUT ao devices);
-

Get the list of realized network devices.

+

Get the list of realized network devices. +

@@ -114,17 +115,18 @@ GetDevices (OUT ao devices); - +

OUT ao devices:

List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()).

List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()).
-

The GetAllDevices() method

+

The GetAllDevices() method

 GetAllDevices (OUT ao devices);
-

Get the list of all network devices.

+

Get the list of all network devices. +

@@ -132,18 +134,21 @@ GetAllDevices (OUT ao devices); - +

OUT ao devices:

List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated).

List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated).
-

The GetDeviceByIpIface() method

+

The GetDeviceByIpIface() method

 GetDeviceByIpIface (IN  s iface,
                     OUT o device);
-

Return the object path of the network device referenced by its IP interface name. Note that some devices (usually modems) only have an IP interface name when they are connected.

+

Return the object path of the network device referenced by its IP + interface name. Note that some devices (usually modems) only have an IP + interface name when they are connected. +

@@ -163,14 +168,15 @@ GetDeviceByIpIface (IN s iface,
-

The ActivateConnection() method

+

The ActivateConnection() method

 ActivateConnection (IN  o connection,
                     IN  o device,
                     IN  o specific_object,
                     OUT o active_connection);
-

Activate a connection using the supplied device.

+

Activate a connection using the supplied device. +

@@ -179,15 +185,15 @@ ActivateConnection (IN o connection, - + - + - + @@ -198,7 +204,7 @@ ActivateConnection (IN o connection,
-

The AddAndActivateConnection() method

+

The AddAndActivateConnection() method

 AddAndActivateConnection (IN  a{sa{sv}} connection,
                           IN  o         device,
@@ -206,7 +212,11 @@ AddAndActivateConnection (IN  a{sa{sv}} connection,
                           OUT o         path,
                           OUT o         active_connection);
-

Adds a new connection using the given details (if any) as a template (automatically filling in missing settings with the capabilities of the given device and specific object), then activate the new connection. Cannot be used for VPN connections at this time.

+

Adds a new connection using the given details (if any) as a template + (automatically filling in missing settings with the capabilities of the + given device and specific object), then activate the new connection. + Cannot be used for VPN connections at this time. +

IN o connection:

The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path.

The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path.

IN o device:

The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.

The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.

IN o specific_object:

The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.

The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.

OUT o active_connection:
@@ -215,7 +225,7 @@ AddAndActivateConnection (IN a{sa{sv}} connection, - + @@ -223,7 +233,7 @@ AddAndActivateConnection (IN a{sa{sv}} connection, - + @@ -238,11 +248,12 @@ AddAndActivateConnection (IN a{sa{sv}} connection,
-

The DeactivateConnection() method

+

The DeactivateConnection() method

 DeactivateConnection (IN  o active_connection);
-

Deactivate an active connection.

+

Deactivate an active connection. +

IN a{sa{sv}} connection:

Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.

Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.

IN o device:

IN o specific_object:

The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.

The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.

OUT o path:
@@ -256,11 +267,15 @@ DeactivateConnection (IN o active_connection);
-

The Sleep() method

+

The Sleep() method

 Sleep (IN  b sleep);
-

Control the NetworkManager daemon's sleep state. When asleep, all interfaces that it manages are deactivated. When awake, devices are available to be activated. This command should not be called directly by users or clients; it is intended for system suspend/resume tracking.

+

Control the NetworkManager daemon's sleep state. When asleep, all + interfaces that it manages are deactivated. When awake, devices are + available to be activated. This command should not be called directly by + users or clients; it is intended for system suspend/resume tracking. +

@@ -274,11 +289,16 @@ Sleep (IN b sleep);
-

The Enable() method

+

The Enable() method

 Enable (IN  b enable);
-

Control whether overall networking is enabled or disabled. When disabled, all interfaces that NM manages are deactivated. When enabled, all managed interfaces are re-enabled and available to be activated. This command should be used by clients that provide to users the ability to enable/disable all networking.

+

Control whether overall networking is enabled or disabled. When disabled, + all interfaces that NM manages are deactivated. When enabled, all managed + interfaces are re-enabled and available to be activated. This command + should be used by clients that provide to users the ability to + enable/disable all networking. +

@@ -286,17 +306,20 @@ Enable (IN b enable); - +

IN b enable:

If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices.

If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices.
-

The GetPermissions() method

+

The GetPermissions() method

 GetPermissions (OUT a{ss} permissions);
-

Returns the permissions a caller has for various authenticated operations that NetworkManager provides, like Enable/Disable networking, changing WiFi, WWAN, and WiMAX state, etc.

+

Returns the permissions a caller has for various authenticated operations + that NetworkManager provides, like Enable/Disable networking, changing + WiFi, WWAN, and WiMAX state, etc. +

@@ -304,18 +327,19 @@ GetPermissions (OUT a{ss} permissions); - +

OUT a{ss} permissions:

Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations.

Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations.
-

The SetLogging() method

+

The SetLogging() method

 SetLogging (IN  s level,
             IN  s domains);
-

Set logging verbosity and which operations are logged.

+

Set logging verbosity and which operations are logged. +

@@ -324,23 +348,24 @@ SetLogging (IN s level, - + - +

IN s level:

One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain.

One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain.

IN s domains:

A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged.

A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged.
-

The GetLogging() method

+

The GetLogging() method

 GetLogging (OUT s level,
             OUT s domains);
-

Get current logging verbosity level and operations domains.

+

Get current logging verbosity level and operations domains. +

@@ -353,18 +378,19 @@ GetLogging (OUT s level, - +

OUT s domains:

For available domains see SetLogging() call.

For available domains see SetLogging() call.
-

The CheckConnectivity() method

+

The CheckConnectivity() method

 CheckConnectivity (OUT u connectivity);
-

Re-check the network connectivity state.

+

Re-check the network connectivity state. +

@@ -372,17 +398,19 @@ CheckConnectivity (OUT u connectivity); - +

OUT u connectivity:

The current connectivity state.

(NMConnectivityState) The current connectivity state.
-

The state() method

+

The state() method

 state (OUT u state);
-

The overall networking state as determined by the NetworkManager daemon, based on the state of network devices under it's management.

+

The overall networking state as determined by the NetworkManager daemon, + based on the state of network devices under it's management. +

@@ -390,7 +418,7 @@ state (OUT u state); - +

OUT u state:

NMState
@@ -402,7 +430,9 @@ state (OUT u state); 
 CheckPermissions ();
-

Emitted when system authorization details change, indicating that clients may wish to recheck permissions with GetPermissions.

+

Emitted when system authorization details change, indicating that clients + may wish to recheck permissions with GetPermissions. +

@@ -410,7 +440,8 @@ CheckPermissions (); 
 StateChanged (u state);
-

NetworkManager's state changed.

+

NetworkManager's state changed. +

@@ -418,7 +449,7 @@ StateChanged (u state); - +

u state:

The new state of NetworkManager.

(NMState) The new state of NetworkManager.
@@ -428,7 +459,8 @@ StateChanged (u state); 
 PropertiesChanged (a{sv} properties);
-

NetworkManager's properties changed.

+

NetworkManager's properties changed. +

@@ -446,7 +478,8 @@ PropertiesChanged (a{sv} properties); 
 DeviceAdded (o device_path);
-

A device was added to the system

+

A device was added to the system +

@@ -464,7 +497,8 @@ DeviceAdded (o device_path); 
 DeviceRemoved (o device_path);
-

A device was removed from the system, and is no longer available.

+

A device was removed from the system, and is no longer available. +

@@ -484,7 +518,10 @@ DeviceRemoved (o device_path); 
 Devices  readable   ao
-

The list of realized network devices. Realized devices are those which have backing resources (eg from the kernel or a management daemon like ModemManager, teamd, etc).

+

The list of realized network devices. Realized devices are those which + have backing resources (eg from the kernel or a management daemon like + ModemManager, teamd, etc). +

@@ -492,7 +529,10 @@ Devices readable ao 
 AllDevices  readable   ao
-

The list of both realized and un-realized network devices. Un-realized devices are software devices which do not yet have backing resources, but for which backing resources can be created if the device is activated.

+

The list of both realized and un-realized network devices. Un-realized + devices are software devices which do not yet have backing resources, but + for which backing resources can be created if the device is activated. +

@@ -500,7 +540,9 @@ AllDevices readable ao 
 NetworkingEnabled  readable   b
-

Indicates if overall networking is currently enabled or not. See the Enable() method.

+

Indicates if overall networking is currently enabled or not. See the + Enable() method. +

@@ -508,7 +550,8 @@ NetworkingEnabled readable b 
 WirelessEnabled  readwrite  b
-

Indicates if wireless is currently enabled or not.

+

Indicates if wireless is currently enabled or not. +

@@ -516,7 +559,9 @@ WirelessEnabled readwrite b 
 WirelessHardwareEnabled  readable   b
-

Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.

+

Indicates if the wireless hardware is currently enabled, i.e. the state of + the RF kill switch. +

@@ -524,7 +569,8 @@ WirelessHardwareEnabled readable b 
 WwanEnabled  readwrite  b
-

Indicates if mobile broadband devices are currently enabled or not.

+

Indicates if mobile broadband devices are currently enabled or not. +

@@ -532,7 +578,9 @@ WwanEnabled readwrite b 
 WwanHardwareEnabled  readable   b
-

Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.

+

Indicates if the mobile broadband hardware is currently enabled, i.e. the + state of the RF kill switch. +

@@ -540,7 +588,8 @@ WwanHardwareEnabled readable b 
 WimaxEnabled  readwrite  b
-

Indicates if WiMAX devices are currently enabled or not.

+

Indicates if WiMAX devices are currently enabled or not. +

@@ -548,7 +597,9 @@ WimaxEnabled readwrite b 
 WimaxHardwareEnabled  readable   b
-

Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.

+

Indicates if the WiMAX hardware is currently enabled, i.e. the state of + the RF kill switch. +

@@ -556,7 +607,8 @@ WimaxHardwareEnabled readable b 
 ActiveConnections  readable   ao
-

List of active connection object paths.

+

List of active connection object paths. +

@@ -564,7 +616,12 @@ ActiveConnections readable ao 
 PrimaryConnection  readable   o
-

The object path of the "primary" active connection being used to access the network. In particular, if there is no VPN active, or the VPN does not have the default route, then this indicates the connection that has the default route. If there is a VPN active with the default route, then this indicates the connection that contains the route to the VPN endpoint.

+

The object path of the "primary" active connection being used to access + the network. In particular, if there is no VPN active, or the VPN does not + have the default route, then this indicates the connection that has the + default route. If there is a VPN active with the default route, then this + indicates the connection that contains the route to the VPN endpoint. +

@@ -572,7 +629,10 @@ PrimaryConnection readable o 
 PrimaryConnectionType  readable   s
-

The connection type of the "primary" active connection being used to access the network. This is the same as the Type property on the object indicated by PrimaryConnection.

+

The connection type of the "primary" active connection being used to + access the network. This is the same as the Type property on the object + indicated by PrimaryConnection. +

@@ -580,7 +640,11 @@ PrimaryConnectionType readable s 
 Metered  readable   u
-

Indicates whether the connectivity is metered. This is equivalent to the metered property of the device associated with the primary connection.

+

Indicates whether the connectivity is metered. This is equivalent to the + metered property of the device associated with the primary connection. +

+

Returns: NMMetered +

@@ -588,7 +652,10 @@ Metered readable u 
 ActivatingConnection  readable   o
-

The object path of an active connection that is currently being activated and which is expected to become the new PrimaryConnection when it finishes activating.

+

The object path of an active connection that is currently being activated + and which is expected to become the new PrimaryConnection when it finishes + activating. +

@@ -596,7 +663,10 @@ ActivatingConnection readable o 
 Startup  readable   b
-

Indicates whether NM is still starting up; this becomes FALSE when NM has finished attempting to activate every connection that it might be able to activate at startup.

+

Indicates whether NM is still starting up; this becomes FALSE when NM has + finished attempting to activate every connection that it might be able to + activate at startup. +

@@ -604,7 +674,8 @@ Startup readable b 
 Version  readable   s
-

NetworkManager version.

+

NetworkManager version. +

@@ -612,7 +683,10 @@ Version readable s 
 State  readable   u
-

The overall state of the NetworkManager daemon.

+

The overall state of the NetworkManager daemon. +

+

Returns: NMState +

@@ -620,7 +694,10 @@ State readable u 
 Connectivity  readable   u
-

The network connectivity state.

+

The network connectivity state. +

+

Returns: NMConnectivityState +

@@ -628,7 +705,15 @@ Connectivity readable u 
 GlobalDnsConfiguration  readwrite  a{sv}
-

Dictionary of global DNS settings where the key is one of "searches", "options" and "domains". The values for the "searches" and "options" keys are string arrays describing the list of search domains and resolver options, respectively. The value of the "domains" key is a second-level dictionary, where each key is a domain name, and each key's value is a third-level dictionary with the keys "servers" and "options". "servers" is a string array of DNS servers, "options" is a string array of domain-specific options.

+

Dictionary of global DNS settings where the key is one of "searches", + "options" and "domains". The values for the "searches" and "options" keys + are string arrays describing the list of search domains and resolver + options, respectively. The value of the "domains" key is a second-level + dictionary, where each key is a domain name, and each key's value is a + third-level dictionary with the keys "servers" and "options". "servers" is + a string array of DNS servers, "options" is a string array of + domain-specific options. +

diff --git a/docs/api/html/index.html b/docs/api/html/index.html index dccef7c9..79677afb 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -14,7 +14,7 @@
-

Version 1.1.92 +

Version 1.1.93

Copyright © 2012, 2016 The NetworkManager Authors

@@ -156,6 +156,15 @@
UNIX Manual Pages
+nmcli — command-line tool for controlling NetworkManager +
+
+nmtui — Text User Interface for controlling NetworkManager +
+
+nm-online — ask NetworkManager whether the network is connected +
+
NetworkManager — network management daemon
diff --git a/docs/api/html/index.sgml b/docs/api/html/index.sgml index dc84d959..583682f2 100644 --- a/docs/api/html/index.sgml +++ b/docs/api/html/index.sgml @@ -422,13 +422,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/api/html/manpages.html b/docs/api/html/manpages.html index 27015a54..36b8e931 100644 --- a/docs/api/html/manpages.html +++ b/docs/api/html/manpages.html @@ -7,7 +7,7 @@ - + @@ -17,13 +17,22 @@ Home Prev -Next +Next

UNIX Manual Pages

+nmcli — command-line tool for controlling NetworkManager +
+
+nmtui — Text User Interface for controlling NetworkManager +
+
+nm-online — ask NetworkManager whether the network is connected +
+
NetworkManager — network management daemon
diff --git a/docs/api/html/nm-online.html b/docs/api/html/nm-online.html new file mode 100644 index 00000000..90d3ecb5 --- /dev/null +++ b/docs/api/html/nm-online.html @@ -0,0 +1,120 @@ + + + + +nm-online: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

nm-online

+

nm-online — ask NetworkManager whether the network is connected

+
+
+

Synopsis

+

nm-online [OPTIONS...]

+
+
+

Description

+

nm-online is a utility to find out whether we are + online. It is done by asking NetworkManager about its status. When run, + nm-online waits until NetworkManager reports an active + connection, or specified timeout expires. On exit, the returned status code + should be checked (see the return codes below).

+

By default NetworkManager waits for IPv4 dynamic addressing to complete + but does not wait for the auto IPv6 dynamic addressing. To + wait for IPv6 addressing to complete, either (1) change the network + connection's IPv6 may-fail setting to no, + and/or (2) change the IPv6 addressing method to manual or + dhcp, to indicate that IPv6 connectivity is expected.

+
+
+

Options

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

+ -t | --timeout + seconds +

Time to wait for a connection, in seconds. If the option is not provided, + the default timeout is 30 seconds.

-x | --exit

Exit immediately if NetworkManager is not running or connecting.

-q | --quiet

Don't print anything.

-s | --wait-for-startup

Wait for NetworkManager startup to complete, rather than waiting for + network connectivity specifically. Startup is considered complete once + NetworkManager has activated (or attempted to activate) every auto-activate + connection which is available given the current network state. (This is + generally only useful at boot time; after startup has completed, + nm-online -s will just return immediately, regardless of the + current network state.)

+
+
+

Exit Status

+

nm-online exits with status 0 if it succeeds, a value + greater than 0 is returned if an error occurs.

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

0

Success – already online or connection established within given timeout.

1

Offline or not online within given timeout.

2

Unknown or unspecified error.

+
+
+

See Also

+

nmcli(1), + NetworkManager(8).

+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html index 7a92c0f9..7323d808 100644 --- a/docs/api/html/nm-settings-ifcfg-rh.html +++ b/docs/api/html/nm-settings-ifcfg-rh.html @@ -29,7 +29,7 @@
-

DESCRIPTION

+

Description

NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings(5) for details). The profiles can be @@ -53,7 +53,7 @@

-

File Format

+

File Format

The ifcfg-rh config format is a simple text file containing VARIABLE="value" lines. The format is described in sysconfig.txt @@ -178,7 +178,7 @@ DEVICETYPE=TeamPort

-

Differences against initscripts

+

Differences against initscripts

The main differences of NetworkManager ifcfg-rh plugin and traditional initscripts are: @@ -240,16 +240,16 @@ DEVICETYPE=TeamPort

See the next section for detailed mapping of NetworkManager properties and ifcfg-rh variables. Variable names, format and usage - differences in NetworkManager and initscripts are documented in the tables bellow. + differences in NetworkManager and initscripts are documented in the tables below.

-

DETAILS

+

Details

ifcfg-rh plugin variables marked with (+) are NetworkManager specific extensions not understood by traditional initscripts.

-

Table 69. 802-1x setting

+

Table 69. 802-1x setting

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

-

Table 70. bond setting

+

Table 70. bond setting

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

-

Table 71. bridge-port setting

+

Table 71. bridge-port setting

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

-

Table 72. bridge setting

+

Table 72. bridge setting

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

-

Table 73. connection setting

+

Table 73. connection setting

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

-

Table 74. dcb setting

+

Table 74. dcb setting

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

-

Table 75. infiniband setting

+

Table 75. infiniband setting

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

-

Table 76. ip-tunnel setting

+

Table 76. ip-tunnel setting

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

-

Table 77. ipv4 setting

+

Table 77. ipv4 setting

@@ -1160,7 +1160,7 @@ Example: DHCP_FQDN=foo.bar.com

-

Table 78. ipv6 setting

+

Table 78. ipv6 setting

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

-

Table 79. macvlan setting

+

Table 79. macvlan setting

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

-

Table 80. team-port setting

+

Table 80. team-port setting

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

-

Table 81. team setting

+

Table 81. team setting

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

-

Table 82. tun setting

+

Table 82. tun setting

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

-

Table 83. vlan setting

+

Table 83. vlan setting

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

-

Table 84. vxlan setting

+

Table 84. vxlan setting

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

-

Table 85. 802-3-ethernet setting

+

Table 85. 802-3-ethernet setting

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

-

Table 86. 802-11-wireless-security setting

+

Table 86. 802-11-wireless-security setting

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

-

Table 87. 802-11-wireless setting

+

Table 87. 802-11-wireless setting

@@ -1853,11 +1853,7 @@ Allowed values: default, never, always
-

AUTHOR

-

NetworkManager developers

-
-
-

FILES

+

Files

/etc/sysconfig/network-scripts/ifcfg-*

/etc/sysconfig/network-scripts/keys-*

/etc/sysconfig/network-scripts/route-*

@@ -1865,9 +1861,13 @@ Allowed values: default, never, always

/usr/share/doc/initscripts/sysconfig.txt

-

SEE ALSO

-

https://developer.gnome.org/NetworkManager/unstable/ref-settings.html

-

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

+

See Also

+

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

diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html index 35135634..428f8bd2 100644 --- a/docs/api/html/nm-settings-keyfile.html +++ b/docs/api/html/nm-settings-keyfile.html @@ -29,7 +29,7 @@
-

DESCRIPTION

+

Description

NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings(5) for details). The profiles can be @@ -48,7 +48,7 @@

-

File Format

+

File Format

The keyfile config format is a simple .ini-style format. It consists of sections (groups) of key-value pairs. Each section @@ -58,7 +58,7 @@ specification. The majority of properties of the specification is written in the same format into the keyfile too. However some values are inconvenient for people to use. These are stored in the - files in more readable ways. These properties are described bellow. + files in more readable ways. These properties are described below. An example could be IP addresses that are not written as integer arrays, but more reasonably as "1.2.3.4/12 1.2.3.254". More information of the generic key file format can be found at @@ -167,13 +167,13 @@ id=4

-

DETAILS

+

Details

keyfile plugin variables for the majority of NetworkManager properties have one-to-one mapping. It means a NetworkManager property is stored in the keyfile as a variable of the same name and in the same format. There are several exceptions to this rule, mainly for making keyfile syntax easier for humans. The exceptions handled specially by keyfile - plugin are listed bellow. Refer to + plugin are listed below. Refer to nm-settings(5) for all available settings and properties and their description.

@@ -188,7 +188,7 @@ id=4 802-11-wireless-security = wifi-security
-

Table 61. bridge setting (section)

+

Table 61. bridge setting (section)

@@ -205,7 +205,7 @@ id=4 - + @@ -213,7 +213,7 @@ Example: mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;1
mac-address mac-addressususal hex-digits-and-colons notationusual hex-digits-and-colons notation MAC address in traditional hex-digits-and-colons notation, or semicolon separated list of 6 decimal bytes (obsolete) Example: mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;121;162;

-

Table 62. infiniband setting (section)

+

Table 62. infiniband setting (section)

@@ -230,7 +230,7 @@ Example: mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;1 - + @@ -238,7 +238,7 @@ Example: mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:
mac-address mac-addressususal hex-digits-and-colons notationusual hex-digits-and-colons notation MAC address in traditional hex-digits-and-colons notation, or or semicolon separated list of 20 decimal bytes (obsolete) Example: mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01

-

Table 63. ipv4 setting (section)

+

Table 63. ipv4 setting (section)

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

-

Table 64. ipv6 setting (section)

+

Table 64. ipv6 setting (section)

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

-

Table 65. serial setting (section)

+

Table 65. serial setting (section)

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

-

Table 66. vpn setting (section)

+

Table 66. vpn setting (section)

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

-

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

+

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

@@ -418,13 +418,13 @@ Example: password=Popocatepetl - + - + @@ -439,7 +439,7 @@ Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
mac-address mac-addressususal hex-digits-and-colons notationusual hex-digits-and-colons notation MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162)
cloned-mac-address cloned-mac-addressususal hex-digits-and-colons notationusual hex-digits-and-colons notation Cloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).

-

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

+

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

@@ -465,13 +465,13 @@ Example: ssid=Quick Net - + - + @@ -506,17 +506,17 @@ Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
-

AUTHOR

-

NetworkManager developers

-
-
-

FILES

+

Files

/etc/NetworkManager/system-connections/*

-

SEE ALSO

-

https://developer.gnome.org/NetworkManager/unstable/ref-settings.html

-

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

+

See Also

+

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

diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html index 7a9b75e9..3a540262 100644 --- a/docs/api/html/nm-settings.html +++ b/docs/api/html/nm-settings.html @@ -29,7 +29,7 @@
mac-address mac-addressususal hex-digits-and-colons notationusual hex-digits-and-colons notation MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162).
cloned-mac-address cloned-mac-addressususal hex-digits-and-colons notationusual hex-digits-and-colons notation Cloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).
-

DESCRIPTION

+

Description

NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When @@ -94,7 +94,7 @@

-

Table 31. 802-1x setting

+

Table 31. 802-1x setting

@@ -257,13 +257,13 @@ - + - + @@ -293,13 +293,13 @@ - + - + @@ -323,7 +323,7 @@
phase2-private-key byte array  Contains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS12 format private keys and the blob scheme, this property should be set to the PKCS12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS12 certificate and key. When using PKCS12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS12 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 and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate.
phase2-private-key-password string  The password used to decrypt the "phase 2" private key specified in the "phase2-private-key" property when the private key either uses the path scheme, or is a PKCS12 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.
phase2-private-key-password-flagsprivate-key byte array  Contains the private key when the "eap" property is set to "tls". Key data is specified using a "scheme"; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending with a terminating NUL byte. When using PKCS12 format private keys and the blob scheme, this property should be set to the PKCS12 data and the "private-key-password" property must be set to password used to decrypt the PKCS12 certificate and key. When using PKCS12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS12 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 and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate. WARNING: "private-key" is not a "secret" property, and thus unencrypted private key data using the BLOB scheme may be readable by unprivileged users. Private keys should always be encrypted with a private key password to prevent unauthorized access to unencrypted private key data.
private-key-password string  The password used to decrypt the private key specified in the "private-key" property when the private key either uses the path scheme, or if the private key is a PKCS12 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.
private-key-password-flags

-

Table 32. adsl setting

+

Table 32. adsl setting

@@ -390,7 +390,7 @@

-

Table 33. bluetooth setting

+

Table 33. bluetooth setting

@@ -427,7 +427,7 @@

-

Table 34. bond setting

+

Table 34. bond setting

@@ -464,7 +464,7 @@

-

Table 35. bridge setting

+

Table 35. bridge setting

@@ -543,7 +543,7 @@

-

Table 36. bridge-port setting

+

Table 36. bridge-port setting

@@ -586,7 +586,7 @@

-

Table 37. cdma setting

+

Table 37. cdma setting

@@ -611,7 +611,7 @@ - + @@ -635,7 +635,7 @@
number string  The number to dial to establish the connection to the CDMA-based mobile broadband network, if any. If not specified, the default number (777) is used when required.The number to dial to establish the connection to the CDMA-based mobile broadband network, if any. If not specified, the default number (#777) is used when required.
password

-

Table 38. connection setting

+

Table 38. connection setting

@@ -762,7 +762,7 @@

-

Table 39. dcb setting

+

Table 39. dcb setting

@@ -877,7 +877,7 @@

-

Table 40. generic setting

+

Table 40. generic setting

@@ -900,7 +900,7 @@

-

Table 41. gsm setting

+

Table 41. gsm setting

@@ -997,7 +997,7 @@

-

Table 42. infiniband setting

+

Table 42. infiniband setting

@@ -1052,7 +1052,7 @@

-

Table 43. ipv4 setting

+

Table 43. ipv4 setting

@@ -1197,7 +1197,7 @@

-

Table 44. ipv6 setting

+

Table 44. ipv6 setting

@@ -1342,7 +1342,7 @@

-

Table 45. ip-tunnel setting

+

Table 45. ip-tunnel setting

@@ -1439,7 +1439,7 @@

-

Table 46. macvlan setting

+

Table 46. macvlan setting

@@ -1488,7 +1488,7 @@

-

Table 47. 802-11-olpc-mesh setting

+

Table 47. 802-11-olpc-mesh setting

@@ -1531,7 +1531,7 @@

-

Table 48. ppp setting

+

Table 48. ppp setting

@@ -1664,7 +1664,7 @@

-

Table 49. pppoe setting

+

Table 49. pppoe setting

@@ -1713,7 +1713,7 @@

-

Table 50. serial setting

+

Table 50. serial setting

@@ -1768,7 +1768,7 @@

-

Table 51. team setting

+

Table 51. team setting

@@ -1805,7 +1805,7 @@

-

Table 52. team-port setting

+

Table 52. team-port setting

@@ -1836,7 +1836,7 @@

-

Table 53. tun setting

+

Table 53. tun setting

@@ -1897,7 +1897,7 @@

-

Table 54. vlan setting

+

Table 54. vlan setting

@@ -1958,7 +1958,7 @@

-

Table 55. vpn setting

+

Table 55. vpn setting

@@ -2019,7 +2019,7 @@

-

Table 56. vxlan setting

+

Table 56. vxlan setting

@@ -2140,7 +2140,7 @@

-

Table 57. wimax setting

+

Table 57. wimax setting

@@ -2177,7 +2177,7 @@

-

Table 58. 802-3-ethernet setting

+

Table 58. 802-3-ethernet setting

@@ -2280,7 +2280,7 @@

-

Table 59. 802-11-wireless setting

+

Table 59. 802-11-wireless setting

@@ -2401,7 +2401,7 @@

-

Table 60. 802-11-wireless-security setting

+

Table 60. 802-11-wireless-security setting

@@ -2547,18 +2547,15 @@
-

AUTHOR

-

NetworkManager developers

+

Files

+

/etc/NetworkManager/system-connections or distro plugin-specific location

-

FILES

-

/etc/NetworkManager/system-connections

-

or distro plugin-specific location

-
-
-

SEE ALSO

-

https://wiki.gnome.org/Projects/NetworkManager/ConfigurationSpecification

-

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

+

See Also

+

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

diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html index e7ac079b..e903cd68 100644 --- a/docs/api/html/nmcli-examples.html +++ b/docs/api/html/nmcli-examples.html @@ -33,7 +33,7 @@

nmcli [OPTIONS...]

-

Description

+

Description

nmcli is a command-line client for NetworkManager. It allows controlling NetworkManager and reporting its status. For more information @@ -47,14 +47,11 @@

Note: this page has "work-in-progress" status.

-

Examples

+

Examples

-

Example 1. Listing available Wi-Fi APs

+

Example 1. Listing available Wi-Fi APs

-

-$ nmcli device wifi list
-
-
+
$ nmcli device wifi list
 *  SSID               MODE    CHAN  RATE       SIGNAL  BARS  SECURITY
    netdatacomm_local  Infra   6     54 Mbit/s  37      ▂▄__  WEP
 *  F1                 Infra   11    54 Mbit/s  98      ▂▄▆█  WPA1
@@ -66,67 +63,60 @@ $ nmcli device wifi list
    MARTINA            Infra   4     54 Mbit/s  32      ▂▄__  WPA2
    N24PU1             Infra   7     11 Mbit/s  22      ▂___  --
    alfa               Infra   1     54 Mbit/s  67      ▂▄▆_  WPA2
-   bertnet            Infra   5     54 Mbit/s  20      ▂___  WPA1 WPA2
-      

+   bertnet            Infra   5     54 Mbit/s  20      ▂___  WPA1 WPA2
+

+ This command shows how to list available Wi-Fi networks (APs). You can also use + --fields option for displaying different columns. + nmcli -f all dev wifi list will show all of them. +

-

- This command shows how to list available Wi-Fi networks (APs). You can also use - --fields option for displaying different columns. - nmcli -f all dev wifi list will show all of them. -

-
-

Example 2. Showing general information and properties for a Wi-Fi interface

+
+

Example 2. Showing general information and properties for a Wi-Fi interface

-

-$ nmcli -p -f general,wifi-properties device show wlan0
-
-
-===============================================================================
-                            Device details (wlan0)
-===============================================================================
-GENERAL.DEVICE:                         wlan0
-GENERAL.TYPE:                           wifi
-GENERAL.VENDOR:                         Intel Corporation
-GENERAL.PRODUCT:                        PRO/Wireless 5100 AGN [Shiloh] Network Connection
-GENERAL.DRIVER:                         iwlwifi
-GENERAL.DRIVER-VERSION:                 3.8.13-100.fc17.x86_64
-GENERAL.FIRMWARE-VERSION:               8.83.5.1 build 33692
-GENERAL.HWADDR:                         00:1E:65:37:A1:D3
-GENERAL.MTU:                            1500
-GENERAL.STATE:                          100 (connected)
-GENERAL.REASON:                         0 (No reason given)
-GENERAL.UDI:                            /sys/devices/pci0000:00/0000:00:1c.1/0000:03:00.0/net/wlan0
-GENERAL.IP-IFACE:                       wlan0
-GENERAL.IS-SOFTWARE:                    no
-GENERAL.NM-MANAGED:                     yes
-GENERAL.AUTOCONNECT:                    yes
-GENERAL.FIRMWARE-MISSING:               no
-GENERAL.CONNECTION:                     My Alfa WiFi
-GENERAL.CON-UUID:                       85194f4c-d496-4eec-bae0-d880b4cbcf26
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/10
--------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP:                    yes
-WIFI-PROPERTIES.WPA:                    yes
-WIFI-PROPERTIES.WPA2:                   yes
-WIFI-PROPERTIES.TKIP:                   yes
-WIFI-PROPERTIES.CCMP:                   yes
-WIFI-PROPERTIES.AP:                     no
-WIFI-PROPERTIES.ADHOC:                  yes
--------------------------------------------------------------------------------
-
+
$ nmcli -p -f general,wifi-properties device show wlan0
+===========================================================================
+                        Device details (wlan0)
+===========================================================================
+GENERAL.DEVICE:           wlan0
+GENERAL.TYPE:             wifi
+GENERAL.VENDOR:           Intel Corporation
+GENERAL.PRODUCT:          PRO/Wireless 5100 AGN [Shiloh] Network Connection
+GENERAL.DRIVER:           iwlwifi
+GENERAL.DRIVER-VERSION:   3.8.13-100.fc17.x86_64
+GENERAL.FIRMWARE-VERSION: 8.83.5.1 build 33692
+GENERAL.HWADDR:           00:1E:65:37:A1:D3
+GENERAL.MTU:              1500
+GENERAL.STATE:            100 (connected)
+GENERAL.REASON:           0 (No reason given)
+GENERAL.UDI:              /sys/devices/pci0000:00/0000:00:1c.1/net/wlan0
+GENERAL.IP-IFACE:         wlan0
+GENERAL.IS-SOFTWARE:      no
+GENERAL.NM-MANAGED:       yes
+GENERAL.AUTOCONNECT:      yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.CONNECTION:       My Alfa WiFi
+GENERAL.CON-UUID:         85194f4c-d496-4eec-bae0-d880b4cbcf26
+GENERAL.CON-PATH:         /org/freedesktop/NetworkManager/ActiveConnection/
+10
+---------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP:      yes
+WIFI-PROPERTIES.WPA:      yes
+WIFI-PROPERTIES.WPA2:     yes
+WIFI-PROPERTIES.TKIP:     yes
+WIFI-PROPERTIES.CCMP:     yes
+WIFI-PROPERTIES.AP:       no
+WIFI-PROPERTIES.ADHOC:    yes
+---------------------------------------------------------------------------
+

+ This command shows information about a Wi-Fi device. +

-

- This command shows information about a Wi-Fi device. -

-
-

Example 3. Listing NetworkManager polkit permissions

+
+

Example 3. Listing NetworkManager polkit permissions

-

-$ nmcli general permissions
-
-
+
$ nmcli general permissions
 PERMISSION                                                VALUE
 org.freedesktop.NetworkManager.enable-disable-network     yes
 org.freedesktop.NetworkManager.enable-disable-wifi        yes
@@ -138,229 +128,192 @@ org.freedesktop.NetworkManager.wifi.share.protected       yes
 org.freedesktop.NetworkManager.wifi.share.open            yes
 org.freedesktop.NetworkManager.settings.modify.system     yes
 org.freedesktop.NetworkManager.settings.modify.own        yes
-org.freedesktop.NetworkManager.settings.modify.hostname   auth
-      

-
-
-

- This command shows configured polkit permissions for various NetworkManager - operations. These permissions or actions (using polkit language) are configured - by a system administrator and are not meant to be changed by users. The usual - place for the polkit configuration is /usr/share/polkit-1/actions/org.freedesktop.NetworkManager.policy. - pkaction command can display description for polkit actions. -

+org.freedesktop.NetworkManager.settings.modify.hostname auth +

+ This command shows configured polkit permissions for various NetworkManager + operations. These permissions or actions (using polkit language) are configured + by a system administrator and are not meant to be changed by users. The usual + place for the polkit configuration is /usr/share/polkit-1/actions/org.freedesktop.NetworkManager.policy. + pkaction command can display description for polkit actions. + 


-pkaction --action-id org.freedesktop.NetworkManager.network-control --verbose
-
+ pkaction --action-id org.freedesktop.NetworkManager.network-control --verbose +

- More information about polkit can be found at http://www.freedesktop.org/wiki/Software/polkit. -

-
-

Example 4. Listing NetworkManager log level and domains

+ More information about polkit can be found at http://www.freedesktop.org/wiki/Software/polkit. +

+
+
+
+

Example 4. Listing NetworkManager log level and domains

-

-$ nmcli general logging
-
-
+
$ nmcli general logging
 LEVEL  DOMAINS
-INFO   PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,DBUS_PROPS,TEAM,CONCHECK,DCB,DISPATCH
-      

+INFO   PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,A
+UTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,
+WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,DBUS_PROPS,TEAM,CONCHECK,DC
+B,DISPATCH
+

+ This command shows current NetworkManager logging status. +

-

- This command shows current NetworkManager logging status. -

-
-

Example 5. Changing NetworkManager logging

-

-$ nmcli g log level DEBUG domains CORE,ETHER,IP
-$ nmcli g log level INFO domains DEFAULT
-
+
+

Example 5. Changing NetworkManager logging

+
+
$ nmcli g log level DEBUG domains CORE,ETHER,IP
+$ nmcli g log level INFO domains DEFAULT
+

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

-

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

-
-

Example 6. Adding a bonding master and two slave connection profiles

-

-$ nmcli con add type bond ifname mybond0 mode active-backup
-$ nmcli con add type ethernet ifname eth1 master mybond0
-$ nmcli con add type ethernet ifname eth2 master mybond0
-
-

- This example demonstrates adding a bond master connection and two slaves. The - first command adds a master bond connection, naming the bonding interface - mybond0 and using active-backup mode. - The next two commands add slaves connections, both enslaved to mybond0. - The first slave will be bound to eth1 interface, the second to - eth2. -

-
-

Example 7. Adding a team master and two slave connection profiles

-

-$ nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf
-$ nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1
-$ nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1
-
+
+

Example 6. Adding a bonding master and two slave connection profiles

+
+
$ nmcli con add type bond ifname mybond0 mode active-backup
+$ nmcli con add type ethernet ifname eth1 master mybond0
+$ nmcli con add type ethernet ifname eth2 master mybond0
+

+ This example demonstrates adding a bond master connection and two slaves. The + first command adds a master bond connection, naming the bonding interface + mybond0 and using active-backup mode. + The next two commands add slaves connections, both enslaved to mybond0. + The first slave will be bound to eth1 interface, the second to + eth2. +

-

- This example demonstrates adding a team master connection profile and two slaves. It is - very similar to the bonding example. The first command adds a master team profile, naming - the team interface and the profile Team1. The team configuration - for the master is read from team1-master-json.conf file. Later, you can - change the configuration with modify command - (nmcli con modify Team1 team.config team1-master-another-json.conf). - The last two commands add slaves profiles, both enslaved to Team1. - The first slave will be bound to em1 interface, the second to - em2. The slaves don't specify config and thus - teamd will use its default configuration. You will activate the whole setup - by activating both slaves: +

+
+

Example 7. Adding a team master and two slave connection profiles

+
+
$ nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf
+$ nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1
+$ nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1
+

+ This example demonstrates adding a team master connection profile and two slaves. It is + very similar to the bonding example. The first command adds a master team profile, naming + the team interface and the profile Team1. The team configuration + for the master is read from team1-master-json.conf file. Later, you can + change the configuration with modify command + (nmcli con modify Team1 team.config team1-master-another-json.conf). + The last two commands add slaves profiles, both enslaved to Team1. + The first slave will be bound to em1 interface, the second to + em2. The slaves don't specify config and thus + teamd will use its default configuration. You will activate the whole setup + by activating both slaves: +

+
  $ nmcli con up Team1-slave1
+  $ nmcli con up Team1-slave2
+

+ By default, the created profiles are marked for auto-activation. But if another + connection has been activated on the device, the new profile won't activate + automatically and you need to activate it manually.

-

-$ nmcli con up Team1-slave1
-$ nmcli con up Team1-slave2
-
+
+
+
+

Example 8. Adding a bridge and two slave profiles

+
+
$ nmcli con add type bridge con-name TowerBridge ifname TowerBridge
+$ nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge
+$ nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge
+$ nmcli con modify TowerBridge bridge.stp no

- By default, the created profiles are marked for auto-activation. But if another - connection has been activated on the device, the new profile won't activate - automatically and you need to activate it manually. -

-
-

Example 8. Adding a bridge and two slave profiles

-

-$ nmcli con add type bridge con-name TowerBridge ifname TowerBridge
-$ nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge
-$ nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge
-$ nmcli con modify TowerBridge bridge.stp no
-
+ This example demonstrates adding a bridge master connection and two slaves. The + first command adds a master bridge connection, naming the bridge interface and + the profile as TowerBridge. + The next two commands add slaves profiles, both will be enslaved to + TowerBridge. + The first slave will be tied to ens3 interface, the second to + ens4. + The last command will disable 802.1D STP for the TowerBridge profile. +

-

- This example demonstrates adding a bridge master connection and two slaves. The - first command adds a master bridge connection, naming the bridge interface and - the profile as TowerBridge. - The next two commands add slaves profiles, both will be enslaved to - TowerBridge. - The first slave will be tied to ens3 interface, the second to - ens4. - The last command will disable 802.1D STP for the TowerBridge profile. -

-
-

Example 9. Adding an ethernet connection profile with manual IP configuration

-
-        
-$ nmcli con add con-name my-con-em1 ifname em1 type ethernet ip4 192.168.100.100/24 gw4 192.168.100.1 ip4 1.2.3.4 ip6 abbe::cafe
-$ nmcli con mod my-con-em1 ipv4.dns "8.8.8.8 8.8.4.4"
-$ nmcli con mod my-con-em1 +ipv4.dns 1.2.3.4
-$ nmcli con mod my-con-em1 ipv6.dns "2001:4860:4860::8888 2001:4860:4860::8844"
-$ nmcli -p con show my-con-em1
-        
-
-

- The first command adds an Ethernet connection profile named my-con-em1 - that is bound to interface name em1. The profile is configured - with static IP addresses. Three addresses are added, two IPv4 addresses and one IPv6. - The first IP 192.168.100.100 has a prefix of 24 (netmask equivalent of 255.255.255.0). - Gateway entry will become the default route if this profile is activated on em1 interface - (and there is no connection with higher priority). The next two addresses do not - specify a prefix, so a default prefix will be used, i.e. 32 for IPv4 and 128 for IPv6. - The second, third and fourth commands modify DNS parameters of the new connection profile. - The last con show command displays the profile so that all - parameters can be reviewed. -

-
-

Example 10. Escaping colon characters in tabular mode

+
+

Example 9. Adding an ethernet connection profile with manual IP configuration

-
-        
-$ nmcli -t -f general -e yes -m tab dev show eth0
-        
-
-
-GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:e1000e:2.1.4-k:1.8-3:00\:22\:68\:15\:29\:21:1500:100 (connected):0 (No reason given):/sys/devices/pci0000\:00/0000\:00\:19.0/net/eth0:eth0:yes:yes:no:ethernet-13:89cbcbc6-dc85-456c-9c8b-bd828fee3917:/org/freedesktop/NetworkManager/ActiveConnection/9
-
+
$ nmcli con add con-name my-con-em1 ifname em1 type ethernet \
+  ip4 192.168.100.100/24 gw4 192.168.100.1 ip4 1.2.3.4 ip6 abbe::cafe
+$ nmcli con mod my-con-em1 ipv4.dns "8.8.8.8 8.8.4.4"
+$ nmcli con mod my-con-em1 +ipv4.dns 1.2.3.4
+$ nmcli con mod my-con-em1 ipv6.dns "2001:4860:4860::8888 2001:4860:4860::8844"
+$ nmcli -p con show my-con-em1
+

+ The first command adds an Ethernet connection profile named my-con-em1 + that is bound to interface name em1. The profile is configured + with static IP addresses. Three addresses are added, two IPv4 addresses and one IPv6. + The first IP 192.168.100.100 has a prefix of 24 (netmask equivalent of 255.255.255.0). + Gateway entry will become the default route if this profile is activated on em1 interface + (and there is no connection with higher priority). The next two addresses do not + specify a prefix, so a default prefix will be used, i.e. 32 for IPv4 and 128 for IPv6. + The second, third and fourth commands modify DNS parameters of the new connection profile. + The last con show command displays the profile so that all + parameters can be reviewed. +

-

- This example shows escaping colon characters in tabular mode. It may be - useful for script processing, because ':' is used as a field separator. -

-
-

Example 11. nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive

+
+

Example 10. Escaping colon characters in tabular mode

-
- - - - - - - 
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
#!/bin/bash
-export LC_ALL=C
+
$ nmcli -t -f general -e yes -m tab dev show eth0
+GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:
+e1000e:2.1.4-k:1.8-3:00\:22\:68\:15\:29\:21:1500:100 (connected):0 (No reas
+on given):/sys/devices/pci0000\:00/0000\:00\:19.0/net/eth0:eth0:yes:yes:no:
+ethernet-13:89cbcbc6-dc85-456c-9c8b-bd828fee3917:/org/freedesktop/NetworkMa
+nager/ActiveConnection/9

+

+        This example shows escaping colon characters in tabular mode. It may be
+        useful for script processing, because ':' is used as a field separator.
+      

+
+
+

+
Example 11. nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive

+

+
+#!/bin/bash
+export LC_ALL=C
 
-enable_disable_wifi ()
-{
-    result=$(nmcli dev | grep "ethernet" | grep -w "connected")
-    if [ -n "$result" ]; then
-        nmcli radio wifi off
-    else
-        nmcli radio wifi on
-    fi
-}
+enable_disable_wifi ()
+{
+    result=$(nmcli dev | grep "ethernet" | grep -w "connected")
+    if [ -n "$result" ]; then
+        nmcli radio wifi off
+    else
+        nmcli radio wifi on
+    fi
+}
 
-if [ "$2" = "up" ]; then
-    enable_disable_wifi
-fi
+if [ "$2" = "up" ]; then
+    enable_disable_wifi
+fi
 
-if [ "$2" = "down" ]; then
-    enable_disable_wifi
-fi
+if [ "$2" = "down" ]; then + enable_disable_wifi +fi + +

+ This dispatcher script makes Wi-Fi mutually exclusive with wired + networking. When a wired interface is connected, Wi-Fi will be set + to airplane mode (rfkilled). When the wired interface is disconnected, + Wi-Fi will be turned back on. + Name this script e.g. 70-wifi-wired-exclusive.sh and put it into /etc/NetworkManager/dispatcher.d/ + directory. + See NetworkManager(8) + manual page for more information about NetworkManager dispatcher scripts. +

-
-

- This dispatcher script makes Wi-Fi mutually exclusive with wired - networking. When a wired interface is connected, Wi-Fi will be set - to airplane mode (rfkilled). When the wired interface is disconnected, - Wi-Fi will be turned back on. - Name this script e.g. 70-wifi-wired-exclusive.sh and put it into /etc/NetworkManager/dispatcher.d/ - directory. - See NetworkManager(8) - manual page for more information about NetworkManager dispatcher scripts. -

-

Example sessions of interactive connection editor

+

Example sessions of interactive connection editor

-

Example 12. Adding an ethernet connection profile in interactive editor (a)

+

Example 12. Adding an ethernet connection profile in interactive editor (a)

-
-        
-$ nmcli connection edit type ethernet
-        
-
-
+
$ nmcli connection edit type ethernet
 
 ===| nmcli interactive connection editor |===
 
@@ -369,72 +322,75 @@ Adding a new '802-3-ethernet' connection
 Type 'help' or '?' for available commands.
 Type 'describe [<setting>.<prop>]' for detailed property description.
 
-You may edit the following settings: connection, 802-3-ethernet (ethernet), 802-1x, ipv4, ipv6, dcb
-nmcli> print
-===============================================================================
-                              Connection details
-===============================================================================
-connection.id:                          ethernet-4
-connection.uuid:                        de89cdeb-a3e1-4d53-8fa0-c22546c775f4
-connection.interface-name:              --
-connection.type:                        802-3-ethernet
-connection.autoconnect:                 yes
-connection.autoconnect-priority:        0
-connection.timestamp:                   0
-connection.read-only:                   no
-connection.permissions:                 
-connection.zone:                        --
-connection.master:                      --
-connection.slave-type:                  --
-connection.secondaries:                 
-connection.gateway-ping-timeout:        0
--------------------------------------------------------------------------------
-802-3-ethernet.port:                    --
-802-3-ethernet.speed:                   0
-802-3-ethernet.duplex:                  --
-802-3-ethernet.auto-negotiate:          yes
-802-3-ethernet.mac-address:             --
-802-3-ethernet.cloned-mac-address:      --
-802-3-ethernet.mac-address-blacklist:   
-802-3-ethernet.mtu:                     auto
-802-3-ethernet.s390-subchannels:        
-802-3-ethernet.s390-nettype:            --
-802-3-ethernet.s390-options:            
--------------------------------------------------------------------------------
-ipv4.method:                            auto
-ipv4.dns:                               
-ipv4.dns-search:                        
-ipv4.addresses:                         
-ipv4.gateway:                           --
-ipv4.routes:                            
-ipv4.route-metric:                      -1
-ipv4.ignore-auto-routes:                no
-ipv4.ignore-auto-dns:                   no
-ipv4.dhcp-client-id:                    --
-ipv4.dhcp-send-hostname:                yes
-ipv4.dhcp-hostname:                     --
-ipv4.never-default:                     no
-ipv4.may-fail:                          yes
--------------------------------------------------------------------------------
-ipv6.method:                            auto
-ipv6.dns:                               
-ipv6.dns-search:                        
-ipv6.addresses:                         
-ipv6.gateway:                           --
-ipv6.routes:                            
-ipv6.route-metric:                      -1
-ipv6.ignore-auto-routes:                no
-ipv6.ignore-auto-dns:                   no
-ipv6.never-default:                     no
-ipv6.may-fail:                          yes
-ipv6.ip6-privacy:                       -1 (unknown)
-ipv6.dhcp-hostname:                     --
--------------------------------------------------------------------------------
-nmcli> goto ethernet
-You may edit the following properties: port, speed, duplex, auto-negotiate, mac-address, cloned-mac-address, mac-address-blacklist, mtu, s390-subchannels, s390-nettype, s390-options
+You may edit the following settings: connection, 802-3-ethernet (ethernet),
+802-1x, ipv4, ipv6, dcb
+nmcli> print
+===========================================================================
+                          Connection details
+===========================================================================
+connection.id:                      ethernet-4
+connection.uuid:                    de89cdeb-a3e1-4d53-8fa0-c22546c775f4
+connection.interface-name:          --
+connection.type:                    802-3-ethernet
+connection.autoconnect:             yes
+connection.autoconnect-priority:    0
+connection.timestamp:               0
+connection.read-only:               no
+connection.permissions:
+connection.zone:                    --
+connection.master:                  --
+connection.slave-type:              --
+connection.secondaries:
+connection.gateway-ping-timeout:    0
+---------------------------------------------------------------------------
+802-3-ethernet.port:                --
+802-3-ethernet.speed:               0
+802-3-ethernet.duplex:              --
+802-3-ethernet.auto-negotiate:      yes
+802-3-ethernet.mac-address:         --
+802-3-ethernet.cloned-mac-address:  --
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:                 auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:        --
+802-3-ethernet.s390-options:
+---------------------------------------------------------------------------
+ipv4.method:                        auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.addresses:
+ipv4.gateway:                       --
+ipv4.routes:
+ipv4.route-metric:                  -1
+ipv4.ignore-auto-routes:            no
+ipv4.ignore-auto-dns:               no
+ipv4.dhcp-client-id:                --
+ipv4.dhcp-send-hostname:            yes
+ipv4.dhcp-hostname:                 --
+ipv4.never-default:                 no
+ipv4.may-fail:                      yes
+---------------------------------------------------------------------------
+ipv6.method:                        auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.addresses:
+ipv6.gateway:                       --
+ipv6.routes:
+ipv6.route-metric:                  -1
+ipv6.ignore-auto-routes:            no
+ipv6.ignore-auto-dns:               no
+ipv6.never-default:                 no
+ipv6.may-fail:                      yes
+ipv6.ip6-privacy:                   -1 (unknown)
+ipv6.dhcp-hostname:                 --
+---------------------------------------------------------------------------
+nmcli> goto ethernet
+You may edit the following properties: port, speed, duplex, auto-negotiate,
+ mac-address, cloned-mac-address, mac-address-blacklist, mtu, s390-subchann
+els, s390-nettype, s390-options
 nmcli 802-3-ethernet> set mtu 1492
 nmcli 802-3-ethernet> b
-nmcli> goto ipv4.addresses
+nmcli> goto ipv4.addresses
 nmcli ipv4.addresses> desc
 
 === [addresses] ===
@@ -455,144 +411,145 @@ nmcli ipv4.addresses> print
 addresses: 192.168.1.100/24
 nmcli ipv4.addresses> back
 nmcli ipv4> b
-nmcli> set ipv4.gateway 192.168.1.1
-nmcli> verify
+nmcli> set ipv4.gateway 192.168.1.1
+nmcli> verify
 Verify connection: OK
-nmcli> print
-===============================================================================
-                              Connection details
-===============================================================================
-connection.id:                          ethernet-4
-connection.uuid:                        de89cdeb-a3e1-4d53-8fa0-c22546c775f4
-connection.interface-name:              --
-connection.type:                        802-3-ethernet
-connection.autoconnect:                 yes
-connection.autoconnect-priority:        0
-connection.timestamp:                   0
-connection.read-only:                   no
-connection.permissions:                 
-connection.zone:                        --
-connection.master:                      --
-connection.slave-type:                  --
-connection.secondaries:                 
-connection.gateway-ping-timeout:        0
--------------------------------------------------------------------------------
-802-3-ethernet.port:                    --
-802-3-ethernet.speed:                   0
-802-3-ethernet.duplex:                  --
-802-3-ethernet.auto-negotiate:          yes
-802-3-ethernet.mac-address:             --
-802-3-ethernet.cloned-mac-address:      --
-802-3-ethernet.mac-address-blacklist:   
-802-3-ethernet.mtu:                     1492
-802-3-ethernet.s390-subchannels:        
-802-3-ethernet.s390-nettype:            --
-802-3-ethernet.s390-options:            
--------------------------------------------------------------------------------
-ipv4.method:                            manual
-ipv4.dns:                               
-ipv4.dns-search:                        
-ipv4.addresses:                         192.168.1.100/24
-ipv4.gateway:                           192.168.1.1
-ipv4.routes:                            
-ipv4.route-metric:                      -1
-ipv4.ignore-auto-routes:                no
-ipv4.ignore-auto-dns:                   no
-ipv4.dhcp-client-id:                    --
-ipv4.dhcp-send-hostname:                yes
-ipv4.dhcp-hostname:                     --
-ipv4.never-default:                     no
-ipv4.may-fail:                          yes
--------------------------------------------------------------------------------
-ipv6.method:                            auto
-ipv6.dns:                               
-ipv6.dns-search:                        
-ipv6.addresses:                         
-ipv6.routes:                            
-ipv6.route-metric:                      -1
-ipv6.ignore-auto-routes:                no
-ipv6.ignore-auto-dns:                   no
-ipv6.never-default:                     no
-ipv6.may-fail:                          yes
-ipv6.ip6-privacy:                       -1 (unknown)
-ipv6.dhcp-hostname:                     --
--------------------------------------------------------------------------------
-nmcli> set ipv4.dns 8.8.8.8 8.8.4.4
-nmcli> print
-===============================================================================
-                              Connection details
-===============================================================================
-connection.id:                          ethernet-4
-connection.uuid:                        de89cdeb-a3e1-4d53-8fa0-c22546c775f4
-connection.interface-name:              --
-connection.type:                        802-3-ethernet
-connection.autoconnect:                 yes
-connection.autoconnect-priority:        0
-connection.timestamp:                   0
-connection.read-only:                   no
-connection.permissions:                 
-connection.zone:                        --
-connection.master:                      --
-connection.slave-type:                  --
-connection.secondaries:                 
-connection.gateway-ping-timeout:        0
--------------------------------------------------------------------------------
-802-3-ethernet.port:                    --
-802-3-ethernet.speed:                   0
-802-3-ethernet.duplex:                  --
-802-3-ethernet.auto-negotiate:          yes
-802-3-ethernet.mac-address:             --
-802-3-ethernet.cloned-mac-address:      --
-802-3-ethernet.mac-address-blacklist:   
-802-3-ethernet.mtu:                     1492
-802-3-ethernet.s390-subchannels:        
-802-3-ethernet.s390-nettype:            --
-802-3-ethernet.s390-options:            
--------------------------------------------------------------------------------
-ipv4.method:                            manual
-ipv4.dns:                               8.8.8.8,8.8.4.4
-ipv4.dns-search:                        
-ipv4.addresses:                         192.168.1.100/24
-ipv4.gateway:                           192.168.1.1
-ipv4.routes:                            
-ipv4.route-metric:                      -1
-ipv4.ignore-auto-routes:                no
-ipv4.ignore-auto-dns:                   no
-ipv4.dhcp-client-id:                    --
-ipv4.dhcp-send-hostname:                yes
-ipv4.dhcp-hostname:                     --
-ipv4.never-default:                     no
-ipv4.may-fail:                          yes
--------------------------------------------------------------------------------
-ipv6.method:                            auto
-ipv6.dns:                               
-ipv6.dns-search:                        
-ipv6.addresses:                         
-ipv6.gateway:                           --
-ipv6.routes:                            
-ipv6.route-metric:                      -1
-ipv6.ignore-auto-routes:                no
-ipv6.ignore-auto-dns:                   no
-ipv6.never-default:                     no
-ipv6.may-fail:                          yes
-ipv6.ip6-privacy:                       -1 (unknown)
-ipv6.dhcp-hostname:                     --
--------------------------------------------------------------------------------
-nmcli> verify
+nmcli> print
+===========================================================================
+                          Connection details
+===========================================================================
+connection.id:                      ethernet-4
+connection.uuid:                    de89cdeb-a3e1-4d53-8fa0-c22546c775f4
+connection.interface-name:          --
+connection.type:                    802-3-ethernet
+connection.autoconnect:             yes
+connection.autoconnect-priority:    0
+connection.timestamp:               0
+connection.read-only:               no
+connection.permissions:
+connection.zone:                    --
+connection.master:                  --
+connection.slave-type:              --
+connection.secondaries:
+connection.gateway-ping-timeout:    0
+---------------------------------------------------------------------------
+802-3-ethernet.port:                --
+802-3-ethernet.speed:               0
+802-3-ethernet.duplex:              --
+802-3-ethernet.auto-negotiate:      yes
+802-3-ethernet.mac-address:         --
+802-3-ethernet.cloned-mac-address:  --
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:                 1492
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:        --
+802-3-ethernet.s390-options:
+---------------------------------------------------------------------------
+ipv4.method:                        manual
+ipv4.dns:
+ipv4.dns-search:
+ipv4.addresses:                     192.168.1.100/24
+ipv4.gateway:                       192.168.1.1
+ipv4.routes:
+ipv4.route-metric:                  -1
+ipv4.ignore-auto-routes:            no
+ipv4.ignore-auto-dns:               no
+ipv4.dhcp-client-id:                --
+ipv4.dhcp-send-hostname:            yes
+ipv4.dhcp-hostname:                 --
+ipv4.never-default:                 no
+ipv4.may-fail:                      yes
+---------------------------------------------------------------------------
+ipv6.method:                        auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.addresses:
+ipv6.routes:
+ipv6.route-metric:                  -1
+ipv6.ignore-auto-routes:            no
+ipv6.ignore-auto-dns:               no
+ipv6.never-default:                 no
+ipv6.may-fail:                      yes
+ipv6.ip6-privacy:                   -1 (unknown)
+ipv6.dhcp-hostname:                 --
+---------------------------------------------------------------------------
+nmcli> set ipv4.dns 8.8.8.8 8.8.4.4
+nmcli> print
+===========================================================================
+                          Connection details
+===========================================================================
+connection.id:                      ethernet-4
+connection.uuid:                    de89cdeb-a3e1-4d53-8fa0-c22546c775f4
+connection.interface-name:          --
+connection.type:                    802-3-ethernet
+connection.autoconnect:             yes
+connection.autoconnect-priority:    0
+connection.timestamp:               0
+connection.read-only:               no
+connection.permissions:
+connection.zone:                    --
+connection.master:                  --
+connection.slave-type:              --
+connection.secondaries:
+connection.gateway-ping-timeout:    0
+---------------------------------------------------------------------------
+802-3-ethernet.port:                --
+802-3-ethernet.speed:               0
+802-3-ethernet.duplex:              --
+802-3-ethernet.auto-negotiate:      yes
+802-3-ethernet.mac-address:         --
+802-3-ethernet.cloned-mac-address:  --
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:                 1492
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:        --
+802-3-ethernet.s390-options:
+---------------------------------------------------------------------------
+ipv4.method:                        manual
+ipv4.dns:                           8.8.8.8,8.8.4.4
+ipv4.dns-search:
+ipv4.addresses:                     192.168.1.100/24
+ipv4.gateway:                       192.168.1.1
+ipv4.routes:
+ipv4.route-metric:                  -1
+ipv4.ignore-auto-routes:            no
+ipv4.ignore-auto-dns:               no
+ipv4.dhcp-client-id:                --
+ipv4.dhcp-send-hostname:            yes
+ipv4.dhcp-hostname:                 --
+ipv4.never-default:                 no
+ipv4.may-fail:                      yes
+---------------------------------------------------------------------------
+ipv6.method:                        auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.addresses:
+ipv6.gateway:                       --
+ipv6.routes:
+ipv6.route-metric:                  -1
+ipv6.ignore-auto-routes:            no
+ipv6.ignore-auto-dns:               no
+ipv6.never-default:                 no
+ipv6.may-fail:                      yes
+ipv6.ip6-privacy:                   -1 (unknown)
+ipv6.dhcp-hostname:                 --
+---------------------------------------------------------------------------
+nmcli> verify
 Verify connection: OK
-nmcli> save
-Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully saved.
-nmcli> quit
-      

+nmcli> save
+Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully
+ saved.
+nmcli> quit
+

+ Example session in the nmcli interactive connection editor. + The scenario creates an Ethernet connection profile with static addressing (IPs and DNS). +

-

- Example session in the nmcli interactive connection editor. - The scenario creates an Ethernet connection profile with static addressing (IPs and DNS). -

+
-

See Also

+

See Also

nmcli(1), NetworkManager(8), diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html new file mode 100644 index 00000000..ef756f49 --- /dev/null +++ b/docs/api/html/nmcli.html @@ -0,0 +1,2282 @@ + + + + +nmcli: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +

+
+
+ + +
+

nmcli

+

nmcli — command-line tool for controlling NetworkManager

+
+
+

Synopsis

+

nmcli [OPTIONS...] { help | general | networking | radio | connection | device | agent | monitor } [COMMAND] [ARGUMENTS...]

+
+
+

Description

+

nmcli is a command-line tool for controlling + NetworkManager and reporting network status. It can be utilized as a + replacement for nm-applet or other graphical clients. + nmcli is used to create, display, edit, delete, activate, + and deactivate network connections, as well as control and display network + device status.

+

Typical uses include:

+
    +

  • Scripts: Utilize NetworkManager via nmcli instead of + managing network connections manually. nmcli supports a + terse output format which is better suited for script processing. Note that + NetworkManager can also execute scripts, called "dispatcher scripts", in + response to network events. See + NetworkManager(8) + for details about these dispatcher scripts.

    • +

  • Servers, headless machines, and terminals: nmcli can + be used to control NetworkManager without a GUI, including creating, editing, + starting and stopping network connections and viewing network status.

    • +
+
+
+

Options

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

-t | --terse

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

-p | --pretty

Output is pretty. This causes nmcli to produce easily + readable outputs for humans, i.e. values are aligned, headers are printed, + etc.

-m | --mode { tabular | multiline }

+

Switch between tabular and multiline output:

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

tabular

Output is a table where each line describes a single entry. + Columns define particular properties of the entry.

multiline

Each entry comprises multiple lines, each property on its + own line. The values are prefixed with the property name.

+

If omitted, default is tabular for most commands. + For the commands producing more structured information, that cannot be + displayed on a single line, default is multiline. + Currently, they are:

+
    +

  • nmcli connection show ID

    • +

  • nmcli device show

    • +
+

-c | --colors { yes | no | auto }

This option controls color output (using terminal escape sequences). + yes enables colors, no disables them, + auto only produces colors when standard output is directed + to a terminal. The default value is auto.

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

+

This option is used to specify what fields (column names) should be + printed. Valid field names differ for specific commands. List available fields + by providing an invalid value to the --fields option. + all is used to print all valid field values of the + command. common is used to print common field values of + the command.

+

If omitted, default is common. The option is + mandatory when --terse is used. In this case, generic values + all and common cannot be used. This + is to maintain compatibility when new fields are added in the future.

+

-e | --escape { yes | no }

+

Whether to escape : and \ characters in terse tabular mode. The + escape character is \.

+

If omitted, default is yes.

+

-n | --nocheck

This option can be used to force nmcli to skip + checking nmcli and NetworkManager + version compatibility. Use it with care, because using incompatible versions + may produce incorrect results.

-a | --ask

When using this option nmcli will stop and ask for any + missing required arguments, so do not use this option for non-interactive + purposes like scripts. This option controls, for example, whether you will be + prompted for a password if it is required for connecting to a network.

-s | --show-secrets

When using this option nmcli will display passwords + and secrets that might be present in an output of an operation. This option + also influences echoing passwords typed by user as an input.

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

 +

This option sets a timeout period for which nmcli will + wait for NetworkManager to finish operations. It is + especially useful for commands that may take a longer time to complete, e.g. + connection activation.

+

Specifying a value of 0 instructs + nmcli not to wait but to exit immediately with a status of + success. The default value depends on the executed command.

+

-v | --version

Show nmcli version.

-h | --help

Print help information.

+
+
+

General Commands

+

nmcli general { status | hostname | permissions | logging } [ARGUMENTS...]

+

Use this command to show NetworkManager status and permissions. You can also get + and change system hostname, as well as NetworkManager logging level and domains.

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

status

Show overall status of NetworkManager. This is the default action, when + no additional command is provided for nmcli general.

+ hostname + [hostname] +

+

Get and change system hostname. With no arguments, this prints currently + configured hostname. When you pass a hostname, it will be handed over to + NetworkManager to be set as a new system hostname.

+

Note that the term "system" hostname may also be referred to as + "persistent" or "static" by other programs or tools. The hostname is stored + in /etc/hostname file in most distributions. For example, + systemd-hostnamed service uses the term "static" hostname and it only reads + the /etc/hostname file when it starts.

+

permissions

Show the permissions a caller has for various authenticated operations + that NetworkManager provides, like enable and disable networking, changing + Wi-Fi and WWAN state, modifying connections, etc.

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

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

+
+
+

Networking Control Commands

+

nmcli networking { on | off | connectivity } [ARGUMENTS...]

+

Query NetworkManager networking status, enable and disable networking. +

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

on, off

Enable enable or disable networking control by NetworkManager. + All interfaces managed by NetworkManager are deactivated when networking + is disabled.

+ connectivity + [check] +

+

Get network connectivity state. The optional check + argument tells NetworkManager to re-check the connectivity, else the most + recent known connectivity state is displayed without re-checking.

+

Possible states are:

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

none

the host is not connected to any network.

portal

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

limited

the host is connected to a network, but it has no access to the Internet.

full

the host is connected to a network and has full access to the Internet.

unknown

the connectivity status cannot be found out.

+
+
+
+

Radio Transmission Control Commands

+

nmcli radio { all | wifi | wwan } [ARGUMENTS...]

+

Show radio switches status, or enable and disable the switches.

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

+ wifi + [ on | off ] +

Show or set status of Wi-Fi in NetworkManager. If no arguments are + supplied, Wi-Fi status is printed; on enables Wi-Fi; + off disables Wi-Fi.

+ wwan + [ on | off ] +

Show or set status of WWAN (mobile broadband) in NetworkManager. If no + arguments are supplied, mobile broadband status is printed; + on enables mobile broadband, off + disables it.

+ all + [ on | off ] +

Show or set all previously mentioned radio switches at the same time.

+
+
+

Activity Monitor

+

nmcli monitor

+

Observe NetworkManager activity. Watches for changes + in connectivity state, devices or connection profiles.

+

See also nmcli connection monitor + and nmcli device monitor to watch + for changes in certain devices or connections.

+
+
+

Connection Management Commands

+

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

+

NetworkManager stores all network configuration as "connections", + which are collections of data (Layer2 details, IP addressing, etc.) that + describe how to create or connect to a network. A connection is "active" + when a device uses that connection's configuration to create or connect to + a network. There may be multiple connections that apply to a device, but only + one of them can be active on that device at any given time. The additional + connections can be used to allow quick switching between different networks + and configurations.

+

Consider a machine which is usually connected to a DHCP-enabled network, + but sometimes connected to a testing network which uses static IP addressing. + Instead of manually reconfiguring eth0 each time the network is changed, the + settings can be saved as two connections which both apply to eth0, one for DHCP + (called default) and one with the static addressing details (called + testing). When connected to the DHCP-enabled network the user would run + nmcli con up default , and when connected to the static network the user + would run nmcli con up testing.

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

+ show + [--active] + [ + --order + [+-]category:... + ] +

+

List in-memory and on-disk connection profiles, some of which may also be + active if a device is using that connection profile. Without a parameter, all + profiles are listed. When --active option is specified, only + the active profiles are shown.

+

The --order option can be used to get custom + ordering of connections. The connections can be ordered by active status + (active), name (name), type + (type) or D-Bus path (path). If + connections are equal according to a sort order category, an additional + category can be specified. The default sorting order is equivalent to + --order active:name:path. + or no + prefix means sorting in ascending order (alphabetically or in numbers), + - means reverse (descending) order. The category names + can be abbreviated (e.g. --order -a:na).

+

+ show + [--active] + [ id | uuid | path | apath ] + ID... +

+

Show details for specified connections. By default, both static + configuration and active connection data are displayed. When + --active option is specified, only the active profiles are + taken into account. Use global --show-secrets option to + display secrets associated with the profile.

+

id, uuid, + path and apath keywords can be used + if ID is ambiguous. Optional + ID-specifying keywords are:

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

id

the ID denotes a connection name.

uuid

the ID denotes a connection UUID.

path

the ID denotes a D-Bus + static connection path in the format of + /org/freedesktop/NetworkManager/Settings/num + or just num.

apath

the ID denotes a D-Bus active connection path in the format of + /org/freedesktop/NetworkManager/ActiveConnection/num or just + num.

+

It is possible to filter the output using the global + --fields option. Use the following values:

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

profile

only shows static profile configuration.

active

only shows active connection data (when the profile is active).

+

You can also specify particular fields. For static configuration, use + setting and property names as described in + nm-settings(5) manual page. For active data use GENERAL, IP4, DHCP4, IP6, + DHCP6, VPN.

+

When no command is given to the nmcli connection, + the default action is nmcli connection show.

+

+ up + [ id | uuid | path ] + ID... + [ifname ifname] + [ap BSSID] + [passwd-file file] +

+

Activate a connection. The connection is identified by its name, UUID or + D-Bus path. If ID is ambiguous, a keyword id, + uuid or path can be used. When + requiring a particular device to activate the connection on, the + ifname option with interface name should be given. If the + ID is not given an ifname is required, and + NetworkManager will activate the best available connection for the given + ifname. In case of a VPN connection, the + ifname option specifies the device of the base connection. + The ap option specify what particular AP should be used in + case of a Wi-Fi connection.

+

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

+

See connection show above for the description of the + ID-specifying keywords.

+

Available options are:

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

ifname

interface that will be used for activation.

ap

BSSID of the AP which the command should connect to (for Wi-Fi connections).

passwd-file

 +

some networks may require credentials during activation. You can give + these credentials using this option. Each line of the file should contain one + password in the form: + +

+
setting_name.property_name:the password
+

+ + For example, for WPA Wi-Fi with PSK, the line would be + +

+
802-11-wireless-security.psk:secret12345
+

+ + For 802.1X password, the line would be + +

+
802-1x.password:my 1X password
+

+ + nmcli also accepts wifi-sec and wifi strings instead of + 802-11-wireless-security. When NetworkManager requires a password and it is + not given, nmcli will ask for it when run with --ask. + If --ask was not passed, NetworkManager can ask another secret + agent that may be running (typically a GUI secret agent, such as nm-applet or + gnome-shell).

+
+

+ down + [ id | uuid | path | apath ] + ID... +

+

Deactivate a connection from a device without preventing the device from + further auto-activation. Multiple connections can be passed to the + command.

+

Be aware that this command deactivates the specified active connection, + but the device on which the connection was active, is still ready to connect + and will perform auto-activation by looking for a suitable connection that has + the 'autoconnect' flag set. This includes the just deactivated connection. So + if the connection is set to auto-connect, it will be automatically started on + the disconnected device again.

+

In most cases you may want to use device disconnect + command instead.

+

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

+

See connection show above for the description of + the ID-specifying keywords.

+

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

+

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

+

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

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

ifname

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

con-name

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

autoconnect

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

save

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

master

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

slave-type

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

type

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

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

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

mac

MAC address of the device this connection is locked to.

cloned-mac

cloned MAC.

mtu

MTU.

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

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

ssid

SSID.

mac

MAC address of the device this connection is locked to.

cloned-mac

cloned MAC.

mode

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

mtu

MTU.

+ type wimax + [mac addr] + [nsp nsp] +

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

mac

MAC address of the device this connection is locked to.

nsp

Network Service Provider name.

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

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

username

PPPoE username.

password

Password for the PPPoE username.

service

PPPoE service name (if required by concentrator).

mtu

MTU.

mac

MAC address of the device this connection is locked to.

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

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

apn

APN - GSM Access Point Name.

user

user name.

password

password.

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

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

user

user name.

password

password.

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

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

mac

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

mtu

MTU.

transport-mode

InfiniBand transport mode.

parent

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

p-key

the InfiniBand P_Key (16-bit unsigned integer).

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

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

addr

Bluetooth device address (MAC).

bt-type

Bluetooth connection type.

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

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

dev

parent device this VLAN is on.

id

VLAN ID in range 0-4095.

flags

flags.

ingress

VLAN ingress priority mapping.

egress

VLAN egress priority mapping.

mtu

MTU.

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

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

mode

bonding mode (default: balance-rr).

primary

primary interface name (for active-backup mode).

miimon

miimon (default: 100).

downdelay

downdelay (default: 0).

updelay

updelay (default: 0).

arp-interval

ARP interval (default: 0).

arp-ip-target

ARP IP target.

+ type bond-slave + [master master] +

++++ + + + + +

master

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

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

++++ + + + + +

config

JSON configuration for team.

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

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

master

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

config

JSON configuration for team.

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

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

stp

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

priority

sets STP priority (default: 128).

forward-delay

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

hello-time

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

max-age

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

ageing-time

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

multicast-snooping

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

mac

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

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

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

master

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

priority

STP priority of this slave (default: 32).

path-cost

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

hairpin

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

+ type vpn + [type type] + [user username] +

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

vpn-type

VPN type.

user

VPN username.

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

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

ssid

SSID.

channel

channel to use for the network.

dhcp-anycast

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

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

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

username

ADSL user name.

protocol

ADSL protocol.

password

ADSL password.

encapsulation

ADSL encapsulation.

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

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

mode

Mode for the device.

owner

UID of the owner.

group

GID of the group.

pi

include packet information (~IFF_NO_PI flag).

vnet-hdr

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

multi-queue

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

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

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

mode

tunnel mode.

remote

IPv4 or IPv6 address of the remote tunnel endpoint.

local

IPv4 or IPv6 address of the local tunnel endpoint.

dev

device to use for tunnel endpoint communication.

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

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

dev

parent device this MACVLAN is on.

mode

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

tap

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

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

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

id

VXLAN Network Identifer to use.

remote

unicast destination IP address or multicast IP address to join.

dev

device to use for tunnel endpoint communication.

local

source IP address.

source-port-min

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

source-port-max

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

destination-port

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

ip4, gw4

IPv4 addresses.

ip6, gw6

IPv6 addresses.

--

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

+

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

+

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

+

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

+

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

+

Available options:

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

type

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

con-name

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

+

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

+

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

+

Modify one or more properties in the connection profile.

+

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

+

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

+

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

+

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

+

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

+

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

+

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

+

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

+

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

+

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

+

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

+

+ reload +

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

+ load + filename... +

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

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

+

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

+

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

+

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

+

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

+

Export a connection.

+

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

+
+
+
+

Device Management Commands

+

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

+

Show and manage network interfaces.

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

status

 +

Print status of devices.

+

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

+

+ show + [ifname] +

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

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

Set device properties.

+ connect + [ifname] +

+

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

+

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

+

+ reapply + [ifname] +

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

+ disconnect + [ifname...] +

+

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

+

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

+

+ delete + [ifname...] +

+

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

+

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

+

+ monitor + [ifname...] +

+

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

+

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

+

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

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

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

+

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

+

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

+

Available options are:

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

password

password for secured networks (WEP or WPA).

wep-key-type

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

ifname

interface that will be used for activation.

bssid

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

name

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

private

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

hidden

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

+

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

+

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

+

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

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

ifname

what Wi-Fi device is used.

con-name

name of the created hotspot connection profile.

ssid

SSID of the hotspot.

band

Wi-Fi band to use.

channel

Wi-Fi channel to use.

password

 +

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

+

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

+
+

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

+

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

+

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

+

+ lldp + [ + list + [ifname ifname] + ] +

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

+
+
+

Secret Agent

+

nmcli agent { secret | polkit | all }

+

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

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

secret

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

+ polkit +

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

+ all +

Runs nmcli as both NetworkManager secret and a polkit agent.

+
+
+

Environment Variables

+

nmcli's behavior is affected by the following + environment variables.

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

LC_ALL

If set to a non-empty string value, it overrides the values of all the + other internationalization variables.

LC_MESSAGES

Determines the locale to be used for internationalized messages.

LANG

Provides a default value for the internationalization variables that are + unset or null.

+
+
+

Internationalization notes

+

Be aware that nmcli is localized and that is why the + output depends on your environment. This is important to realize especially + when you parse the output.

+

Call nmcli as LC_ALL=C nmcli to + be sure the locale is set to C while executing in a script.

+

LC_ALL, LC_MESSAGES, LANG + variables specify the LC_MESSAGES locale category (in that + order), which determines the language that nmcli uses for + messages. The C locale is used if none of these variables are set, and this + locale uses English messages.

+
+
+

Exit Status

+

nmcli exits with status 0 if it succeeds, a value + greater than 0 is returned if an error occurs.

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

0

Success – indicates the operation succeeded.

1

Unknown or unspecified error.

2

Invalid user input, wrong nmcli + invocation.

3

Timeout expired (see --wait option).

4

Connection activation failed.

5

Connection deactivation failed.

6

Disconnecting device failed.

7

Connection deletion failed.

8

NetworkManager is not running.

9

nmcli and NetworkManager + versions mismatch.

10

Connection, device, or access point does not exist.

+
+
+

Examples

+

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

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

nmcli -t -f RUNNING general

tells you whether NetworkManager is running or not.

nmcli -t -f STATE general

shows the overall status of NetworkManager.

nmcli radio wifi off

switches Wi-Fi off.

nmcli connection show

lists all connections NetworkManager has.

nmcli -p -m multiline -f all con show

shows all configured connections in multi-line mode.

nmcli connection show --active

lists all currently active connections.

nmcli -f name,autoconnect c s

shows all connection profile names and their auto-connect property.

nmcli -p connection show "My default em1"

shows details for "My default em1" connection profile.

nmcli --show-secrets connection show "My Home WiFi"

shows details for "My Home WiFi" connection profile with all passwords. + Without --show-secrets option, secrets would not be + displayed.

nmcli -f active connection show "My default em1"

shows details for "My default em1" active connection, like IP, DHCP + information, etc.

nmcli -f profile con s "My wired connection"

shows static configuration details of the connection profile with "My + wired connection" name.

nmcli -p con up "My wired connection" ifname eth0

activates the connection profile with name "My wired connection" on + interface eth0. The -p option makes nmcli show progress of the + activation.

nmcli con up 6b028a27-6dc9-4411-9886-e9ad1dd43761 ap 00:3A:98:7C:42:D3

connects the Wi-Fi connection with UUID + 6b028a27-6dc9-4411-9886-e9ad1dd43761 to the AP with BSSID + 00:3A:98:7C:42:D3.

nmcli device status

shows the status for all devices.

nmcli dev disconnect em2

disconnects a connection on interface em2 and marks the device as + unavailable for auto-connecting. As a result, no connection will automatically + be activated on the device until the device's 'autoconnect' is set to TRUE or + the user manually activates a connection.

nmcli -f GENERAL,WIFI-PROPERTIES dev show wlan0

shows details for wlan0 interface; only GENERAL and WIFI-PROPERTIES + sections will be shown.

nmcli -f CONNECTIONS device show wlp3s0

shows all available connection profiles for your Wi-Fi interface + wlp3s0.

nmcli dev wifi

lists available Wi-Fi access points known to NetworkManager.

nmcli dev wifi con "Cafe Hotspot 1" password caffeine name "My cafe"

creates a new connection named "My cafe" and then connects it to "Cafe + Hotspot 1" SSID using password "caffeine". This is mainly useful when + connecting to "Cafe Hotspot 1" for the first time. Next time, it is better to + use nmcli con up id "My cafe" so that the + existing connection profile can be used and no additional is created.

nmcli -s dev wifi hotspot con-name QuickHotspot

creates a hotspot profile and connects it. Prints the hotspot password + the user should use to connect to the hotspot from other devices.

nmcli connection add type ethernet autoconnect no ifname eth0

non-interactively adds an Ethernet connection tied to eth0 interface with + automatic IP configuration (DHCP), and disables the connection's autoconnect + flag.

nmcli c a ifname Maxipes-fik type vlan dev eth0 id 55

non-interactively adds a VLAN connection with ID 55. The connection will + use eth0 and the VLAN interface will be named Maxipes-fik.

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

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

nmcli connection edit ethernet-em1-2

edits existing "ethernet-em1-2" connection in the interactive + editor.

nmcli connection edit type ethernet con-name "yet another Ethernet connection"

adds a new Ethernet connection in the interactive editor.

nmcli con mod ethernet-2 connection.autoconnect no

modifies 'autoconnect' property in the 'connection' setting of + 'ethernet-2' connection.

nmcli con mod "Home Wi-Fi" wifi.mtu 1350

modifies 'mtu' property in the 'wifi' setting of 'Home Wi-Fi' + connection.

nmcli con mod em1-1 ipv4.method manual ipv4.addr "192.168.1.23/24 192.168.1.1, 10.10.1.5/8, 10.0.0.11"

sets manual addressing and the addresses in em1-1 profile.

nmcli con modify ABC +ipv4.dns 8.8.8.8

appends a Google public DNS server to DNS servers in ABC profile.

nmcli con modify ABC -ipv4.addresses "192.168.100.25/24 192.168.1.1"

removes the specified IP address from (static) profile ABC.

nmcli con import type openvpn file ~/Downloads/frootvpn.ovpn

imports an OpenVPN configuration to NetworkManager.

nmcli con export corp-vpnc /home/joe/corpvpn.conf

exports NetworkManager VPN profile corp-vpnc as standard Cisco (vpnc) + configuration.

+
+
+

Notes

+

nmcli accepts abbreviations, as long as they are a unique prefix in the set + of possible options. As new options get added, these abbreviations are not guaranteed + to stay unique. For scripting and long term compatibility it is therefore strongly + advised to spell out the full option names.

+
+
+

Bugs

+

There are probably some bugs. If you find a bug, please report it to + https://bugzilla.gnome.org/ — product NetworkManager.

+
+
+

See Also

+

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

+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/nmtui.html b/docs/api/html/nmtui.html new file mode 100644 index 00000000..ca11c834 --- /dev/null +++ b/docs/api/html/nmtui.html @@ -0,0 +1,88 @@ + + + + +nmtui: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

nmtui

+

nmtui — Text User Interface for controlling NetworkManager

+
+
+

Synopsis

+

nmtui-edit | nmtui edit + { name | id } +

+

nmtui-connect | nmtui connect + { name | uuid | device | SSID } +

+

nmtui-hostname | nmtui hostname

+
+
+

Description

+

nmtui is a curses‐based TUI application for + interacting with NetworkManager. When starting nmtui, the + user is prompted to choose the activity to perform unless it was specified as + the first argument.

+

The supported activities are:

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

edit

Show a connection editor that supports adding, modifying, viewing and + deleting connections. It provides similar functionality as + nm-connection-editor.

connect

Show a list of available connections, with the option to activate or + deactivate them. It provides similar functionality as + nm-applet.

hostname

Set the system hostname.

+

Corresponding to above activities, nmtui also comes + with binaries named nmtui-edit, + nmtui-connect, and nmtui-hostname to skip + the selection of the activities.

+
+
+

See Also

+

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

+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml index 48f59265..3cf2c9ed 100644 --- a/docs/api/network-manager-docs.xml +++ b/docs/api/network-manager-docs.xml @@ -49,39 +49,39 @@ Interfaces - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -144,12 +144,15 @@ UNIX Manual Pages - - - - - - + + + + + + + + + diff --git a/docs/api/version.xml b/docs/api/version.xml index 99f6a00b..9a03ea63 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -1.1.92 +1.1.93 diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am index c38e6e34..b975f1b2 100644 --- a/docs/libnm-glib/Makefile.am +++ b/docs/libnm-glib/Makefile.am @@ -60,6 +60,7 @@ GTKDOC_CFLAGS = \ -I$(top_srcdir)/libnm-glib \ -I$(top_builddir)/libnm-glib \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ + -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in index 3f1a7c24..89ce2b2c 100644 --- a/docs/libnm-glib/Makefile.in +++ b/docs/libnm-glib/Makefile.in @@ -462,6 +462,7 @@ GTKDOC_CFLAGS = \ -I$(top_srcdir)/libnm-glib \ -I$(top_builddir)/libnm-glib \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ + -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index 980a66c1..5cc5b13c 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -15,7 +15,7 @@

- for libnm-glib 1.1.92 + for libnm-glib 1.1.93 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm-glib/0.9/. diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml index 99f6a00b..9a03ea63 100644 --- a/docs/libnm-glib/version.xml +++ b/docs/libnm-glib/version.xml @@ -1 +1 @@ -1.1.92 +1.1.93 diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index 17022310..b1386e60 100644 --- a/docs/libnm-util/Makefile.am +++ b/docs/libnm-util/Makefile.am @@ -55,6 +55,7 @@ extra_files = GTKDOC_CFLAGS = \ -I$(top_srcdir)/libnm-util \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ + -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in index ec84cbd3..a4d85d86 100644 --- a/docs/libnm-util/Makefile.in +++ b/docs/libnm-util/Makefile.in @@ -458,6 +458,7 @@ extra_files = GTKDOC_CFLAGS = \ -I$(top_srcdir)/libnm-util \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ + -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html index e0772888..b8dfdf90 100644 --- a/docs/libnm-util/html/index.html +++ b/docs/libnm-util/html/index.html @@ -15,7 +15,7 @@

- for libnm-util 1.1.92 + for libnm-util 1.1.93 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm-util/0.9/. diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html index 57851572..b525e187 100644 --- a/docs/libnm-util/html/libnm-util-NetworkManager.html +++ b/docs/libnm-util/html/libnm-util-NetworkManager.html @@ -510,9 +510,8 @@

enum NMState

NMState values indicate the current overall networking state.

-

(Corresponds to the NM_STATE type in nm-manager.xml.)

-

Members

+

Members

@@ -589,9 +588,8 @@

enum NMConnectivityState

-

(Corresponds to the NM_CONNECTIVITY type in nm-manager.xml.)

-

Members

+

Members

@@ -647,9 +645,8 @@

enum NMDeviceType

NMDeviceType values indicate the type of hardware represented by an NMDevice.

-

(Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.)

-

Members

+

Members

@@ -813,9 +810,8 @@ GSM/UMTS, or LTE network access protocols

enum NMDeviceCapabilities

General device capability flags.

-

(Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.)

-

Members

+

Members

@@ -859,9 +855,8 @@ GSM/UMTS, or LTE network access protocols

enum NMDeviceWifiCapabilities

802.11 specific device encryption and authentication capabilities.

-

(Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.)

-

Members

+

Members

@@ -961,9 +956,8 @@ GSM/UMTS, or LTE network access protocols

enum NM80211ApFlags

802.11 access point flags.

-

(Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.)

-

Members

+

Members

@@ -996,9 +990,8 @@ encryption (usually means WEP)

802.11 access point security and authentication flags. These flags describe the current security requirements of an access point as determined from the access point's beacon.

-

(Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.)

-

Members

+

Members

@@ -1098,9 +1091,8 @@ is supported

enum NM80211Mode

Indicates the 802.11 mode an access point or device is currently in.

-

(Corresponds to the NM_802_11_MODE type in generic-types.xml.)

-

Members

+

Members

@@ -1151,9 +1143,8 @@ is supported

enum NMBluetoothCapabilities

NMBluetoothCapabilities values indicate the usable capabilities of a Bluetooth device.

-

(Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.)

-

Members

+

Members

@@ -1193,9 +1184,8 @@ Bluetooth device.

technology families a modem device supports. For more information on the specific access technologies the device supports use the ModemManager D-Bus API.

-

(Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.)

-

Members

+

Members

@@ -1248,9 +1238,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

enum NMDeviceState

-

(Corresponds to the NM_DEVICE_STATE type in nm-device.xml.)

-

Members

+

Members

@@ -1379,9 +1368,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

enum NMDeviceStateReason

Device state change reason codes

-

(Corresponds to the NM_DEVICE_STATE_REASON type in nm-device.xml.)

-

Members

+

Members

@@ -1845,9 +1833,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

NMActiveConnectionState values indicate the state of a connection to a specific network while it is starting, connected, or disconnecting from that network.

-

(Corresponds to the NM_ACTIVE_CONNECTION_STATE type in nm-active-connection.xml.)

-

Members

+

Members

diff --git a/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html b/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html index cee007fc..6860917d 100644 --- a/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html +++ b/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html @@ -452,9 +452,8 @@

enum NMVPNServiceState

VPN daemon states

-

(Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.)

-

Members

+

Members

@@ -519,9 +518,8 @@

enum NMVPNConnectionState

VPN connection states

-

(Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.)

-

Members

+

Members

@@ -597,9 +595,8 @@

enum NMVPNConnectionStateReason

VPN connection state reasons

-

(Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.)

-

Members

+

Members

@@ -711,9 +708,8 @@

enum NMVPNPluginFailure

VPN plugin failure reasons

-

(Corresponds to the NM_VPN_PLUGIN_FAILURE type in nm-vpn-plugin.xml.)

-

Members

+

Members

diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml index 99f6a00b..9a03ea63 100644 --- a/docs/libnm-util/version.xml +++ b/docs/libnm-util/version.xml @@ -1 +1 @@ -1.1.92 +1.1.93 diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index 8efea77c..13175232 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -77,6 +77,7 @@ GTKDOC_CFLAGS = \ -I$(top_srcdir)/libnm \ -I$(top_builddir)/libnm \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ + -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) GTKDOC_LIBS = \ diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in index 2eed23bb..8006dc17 100644 --- a/docs/libnm/Makefile.in +++ b/docs/libnm/Makefile.in @@ -480,6 +480,7 @@ GTKDOC_CFLAGS = \ -I$(top_srcdir)/libnm \ -I$(top_builddir)/libnm \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ + -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) GTKDOC_LIBS = \ diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html index edf00c34..94a98924 100644 --- a/docs/libnm/html/NMSettingBond.html +++ b/docs/libnm/html/NMSettingBond.html @@ -205,6 +205,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define NM_SETTING_BOND_OPTION_LACP_RATE
#defineNM_SETTING_BOND_OPTION_ACTIVE_SLAVE
#defineNM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO
#defineNM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM
#defineNM_SETTING_BOND_OPTION_AD_USER_PORT_KEY
#defineNM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE
#defineNM_SETTING_BOND_OPTION_ARP_ALL_TARGETS
#defineNM_SETTING_BOND_OPTION_MIN_LINKS
#defineNM_SETTING_BOND_OPTION_NUM_GRAT_ARP
#defineNM_SETTING_BOND_OPTION_NUM_UNSOL_NA
#defineNM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE
#defineNM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB
#defineNM_SETTING_BOND_OPTION_LP_INTERVAL
@@ -557,91 +605,163 @@ the

NM_SETTING_BOND_OPTION_MODE

-
#define NM_SETTING_BOND_OPTION_MODE             "mode"
+
#define NM_SETTING_BOND_OPTION_MODE              "mode"

NM_SETTING_BOND_OPTION_MIIMON

-
#define NM_SETTING_BOND_OPTION_MIIMON           "miimon"
+
#define NM_SETTING_BOND_OPTION_MIIMON            "miimon"

NM_SETTING_BOND_OPTION_DOWNDELAY

-
#define NM_SETTING_BOND_OPTION_DOWNDELAY        "downdelay"
+
#define NM_SETTING_BOND_OPTION_DOWNDELAY         "downdelay"

NM_SETTING_BOND_OPTION_UPDELAY

-
#define NM_SETTING_BOND_OPTION_UPDELAY          "updelay"
+
#define NM_SETTING_BOND_OPTION_UPDELAY           "updelay"

NM_SETTING_BOND_OPTION_ARP_INTERVAL

-
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL     "arp_interval"
+
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL      "arp_interval"

NM_SETTING_BOND_OPTION_ARP_IP_TARGET

-
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET    "arp_ip_target"
+
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET     "arp_ip_target"

NM_SETTING_BOND_OPTION_ARP_VALIDATE

-
#define NM_SETTING_BOND_OPTION_ARP_VALIDATE     "arp_validate"
+
#define NM_SETTING_BOND_OPTION_ARP_VALIDATE      "arp_validate"

NM_SETTING_BOND_OPTION_PRIMARY

-
#define NM_SETTING_BOND_OPTION_PRIMARY          "primary"
+
#define NM_SETTING_BOND_OPTION_PRIMARY           "primary"

NM_SETTING_BOND_OPTION_PRIMARY_RESELECT

-
#define NM_SETTING_BOND_OPTION_PRIMARY_RESELECT "primary_reselect"
+
#define NM_SETTING_BOND_OPTION_PRIMARY_RESELECT  "primary_reselect"

NM_SETTING_BOND_OPTION_FAIL_OVER_MAC

-
#define NM_SETTING_BOND_OPTION_FAIL_OVER_MAC    "fail_over_mac"
+
#define NM_SETTING_BOND_OPTION_FAIL_OVER_MAC     "fail_over_mac"

NM_SETTING_BOND_OPTION_USE_CARRIER

-
#define NM_SETTING_BOND_OPTION_USE_CARRIER      "use_carrier"
+
#define NM_SETTING_BOND_OPTION_USE_CARRIER       "use_carrier"

NM_SETTING_BOND_OPTION_AD_SELECT

-
#define NM_SETTING_BOND_OPTION_AD_SELECT        "ad_select"
+
#define NM_SETTING_BOND_OPTION_AD_SELECT         "ad_select"

NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY

-
#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy"
+
#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY  "xmit_hash_policy"

NM_SETTING_BOND_OPTION_RESEND_IGMP

-
#define NM_SETTING_BOND_OPTION_RESEND_IGMP      "resend_igmp"
+
#define NM_SETTING_BOND_OPTION_RESEND_IGMP       "resend_igmp"

NM_SETTING_BOND_OPTION_LACP_RATE

-
#define NM_SETTING_BOND_OPTION_LACP_RATE        "lacp_rate"
+
#define NM_SETTING_BOND_OPTION_LACP_RATE         "lacp_rate"
+

+
+
+
+

NM_SETTING_BOND_OPTION_ACTIVE_SLAVE

+
#define NM_SETTING_BOND_OPTION_ACTIVE_SLAVE      "active_slave"
+
+
+
+
+

NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO

+
#define NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO "ad_actor_sys_prio"
+
+
+
+
+

NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM

+
#define NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM   "ad_actor_system"
+
+
+
+
+

NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY

+
#define NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY  "ad_user_port_key"
+
+
+
+
+

NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE

+
#define NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE "all_slaves_active"
+
+
+
+
+

NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS

+
#define NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS   "arp_all_targets"
+
+
+
+
+

NM_SETTING_BOND_OPTION_MIN_LINKS

+
#define NM_SETTING_BOND_OPTION_MIN_LINKS         "min_links"
+
+
+
+
+

NM_SETTING_BOND_OPTION_NUM_GRAT_ARP

+
#define NM_SETTING_BOND_OPTION_NUM_GRAT_ARP      "num_grat_arp"
+
+
+
+
+

NM_SETTING_BOND_OPTION_NUM_UNSOL_NA

+
#define NM_SETTING_BOND_OPTION_NUM_UNSOL_NA      "num_unsol_na"
+
+
+
+
+

NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE

+
#define NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE "packets_per_slave"
+
+
+
+
+

NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB

+
#define NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB    "tlb_dynamic_lb"
+
+
+
+
+

NM_SETTING_BOND_OPTION_LP_INTERVAL

+
#define NM_SETTING_BOND_OPTION_LP_INTERVAL       "lp_interval"
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html index cfa53456..f2a9fafc 100644 --- a/docs/libnm/html/NMSettingIPConfig.html +++ b/docs/libnm/html/NMSettingIPConfig.html @@ -913,6 +913,10 @@ #define NM_SETTING_DNS_OPTION_NO_TLD_QUERY + +#define +NM_SETTING_DNS_OPTION_USE_VC +
@@ -3718,6 +3722,12 @@ the particular kind of device.

#define NM_SETTING_DNS_OPTION_NO_TLD_QUERY              "no-tld-query"
+
+
+

NM_SETTING_DNS_OPTION_USE_VC

+
#define NM_SETTING_DNS_OPTION_USE_VC                    "use-vc"
+
+

Property Details

diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html index 8a73c9b9..ecaae0aa 100644 --- a/docs/libnm/html/NMWimaxNsp.html +++ b/docs/libnm/html/NMWimaxNsp.html @@ -58,7 +58,7 @@ -NMWimaxNspNetworkType +NMWimaxNspNetworkType nm_wimax_nsp_get_network_type () @@ -99,7 +99,7 @@ Read -NMWimaxNspNetworkType +NMWimaxNspNetworkType network-type Read @@ -131,18 +131,12 @@ #define NM_WIMAX_NSP_NETWORK_TYPE - -enum -NMWimaxNspNetworkType -

Object Hierarchy

-
    GEnum
-    ╰── NMWimaxNspNetworkType
-    GObject
+
    GObject
     ╰── NMObject
         ╰── NMWimaxNsp
 

@@ -206,7 +200,7 @@ nm_wimax_nsp_get_signal_quality (
 

 
nm_wimax_nsp_get_network_type ()

-
NMWimaxNspNetworkType
+
NMWimaxNspNetworkType
 nm_wimax_nsp_get_network_type (NMWimaxNsp *nsp);

 
Gets the network type of the wimax NSP.

 

@@ -331,51 +325,6 @@ against

 
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 

 

-

-

-
enum NMWimaxNspNetworkType

-
WiMAX network type.

-

-
Members

-

-----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-





NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

-
unknown network type

-		 
NM_WIMAX_NSP_NETWORK_TYPE_HOME

-
home network

-		 
NM_WIMAX_NSP_NETWORK_TYPE_PARTNER

-
partner network

-		 
NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER

-
roaming partner network

-		 

-

-

 

 

 
Property Details

@@ -389,7 +338,7 @@ against

 

 

 
The “network-type” property

-
  “network-type”             NMWimaxNspNetworkType

+
  “network-type”             NMWimaxNspNetworkType

 
The network type of the WiMAX NSP.

 
Flags: Read

 
Default value: NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index e4606198..fe6ccbeb 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -406,6 +406,10 @@
 NM_AVAILABLE_IN_1_2, macro in nm-version
+
+NM_AVAILABLE_IN_1_4, macro in nm-version +
+

B

NMBluetoothCapabilities, enum in nm-dbus-interface @@ -1438,6 +1442,14 @@
+NM_DEPRECATED_IN_1_4, macro in nm-version +
+
+
+NM_DEPRECATED_IN_1_4_FOR, macro in nm-version +
+
+
NMDevice::state-changed, object signal in NMDevice
@@ -5280,10 +5292,34 @@
+NM_SETTING_BOND_OPTION_ACTIVE_SLAVE, macro in NMSettingBond +
+
+
+NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM, macro in NMSettingBond +
+
+
+NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO, macro in NMSettingBond +
+
+
NM_SETTING_BOND_OPTION_AD_SELECT, macro in NMSettingBond
+NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY, macro in NMSettingBond +
+
+
+NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE, macro in NMSettingBond +
+
+
+NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS, macro in NMSettingBond +
+
+
NM_SETTING_BOND_OPTION_ARP_INTERVAL, macro in NMSettingBond
@@ -5308,14 +5344,34 @@
+NM_SETTING_BOND_OPTION_LP_INTERVAL, macro in NMSettingBond +
+
+
NM_SETTING_BOND_OPTION_MIIMON, macro in NMSettingBond
+NM_SETTING_BOND_OPTION_MIN_LINKS, macro in NMSettingBond +
+
+
NM_SETTING_BOND_OPTION_MODE, macro in NMSettingBond
+NM_SETTING_BOND_OPTION_NUM_GRAT_ARP, macro in NMSettingBond +
+
+
+NM_SETTING_BOND_OPTION_NUM_UNSOL_NA, macro in NMSettingBond +
+
+
+NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE, macro in NMSettingBond +
+
+
NM_SETTING_BOND_OPTION_PRIMARY, macro in NMSettingBond
@@ -5328,6 +5384,10 @@
+NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB, macro in NMSettingBond +
+
+
NM_SETTING_BOND_OPTION_UPDELAY, macro in NMSettingBond
@@ -5916,6 +5976,10 @@
+NM_SETTING_DNS_OPTION_USE_VC, macro in NMSettingIPConfig +
+
+
nm_setting_duplicate, function in NMSetting
@@ -8467,7 +8531,7 @@ NM_VPN_SERVICE_PLUGIN_STATE, macro in nm-vpn-service-plugin
-NMWimaxNspNetworkType, enum in NMWimaxNsp +NMWimaxNspNetworkType, enum in nm-dbus-interface
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index 891025a0..e004f345 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -15,7 +15,7 @@

- for libnm 1.1.92 + for libnm 1.1.93 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm/1.0/. diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml index b817d5b5..f0c50d66 100644 --- a/docs/libnm/html/index.sgml +++ b/docs/libnm/html/index.sgml @@ -418,6 +418,11 @@ + + + + + @@ -1018,6 +1023,18 @@ + + + + + + + + + + + + @@ -1426,6 +1443,7 @@ + @@ -2818,11 +2836,6 @@ - - - - - @@ -2967,6 +2980,7 @@ + @@ -2974,6 +2988,8 @@ + + diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html index 4322caee..0dae564f 100644 --- a/docs/libnm/html/libnm-nm-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-dbus-interface.html @@ -250,6 +250,10 @@ enum +NMWimaxNspNetworkType + + +enum NMDeviceState @@ -358,7 +362,8 @@ ├── NMDeviceType ├── NMIPTunnelMode ├── NMMetered - ╰── NMState + ├── NMState + ╰── NMWimaxNspNetworkType GFlags ├── NM80211ApFlags ├── NM80211ApSecurityFlags @@ -633,9 +638,8 @@

enum NMState

NMState values indicate the current overall networking state.

-

(Corresponds to the NM_STATE type in nm-manager.xml.)

-

Members

+

Members

@@ -706,9 +710,8 @@

enum NMConnectivityState

-

(Corresponds to the NM_CONNECTIVITY type in nm-manager.xml.)

-

Members

+

Members

@@ -763,9 +766,8 @@

enum NMDeviceType

NMDeviceType values indicate the type of hardware represented by an NMDevice.

-

(Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.)

-

Members

+

Members

@@ -929,9 +931,8 @@ GSM/UMTS, or LTE network access protocols

enum NMDeviceCapabilities

General device capability flags.

-

(Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.)

-

Members

+

Members

@@ -975,9 +976,8 @@ GSM/UMTS, or LTE network access protocols

enum NMDeviceWifiCapabilities

802.11 specific device encryption and authentication capabilities.

-

(Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.)

-

Members

+

Members

@@ -1077,9 +1077,8 @@ GSM/UMTS, or LTE network access protocols

enum NM80211ApFlags

802.11 access point flags.

-

(Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.)

-

Members

+

Members

@@ -1112,9 +1111,8 @@ encryption (usually means WEP)

802.11 access point security and authentication flags. These flags describe the current security requirements of an access point as determined from the access point's beacon.

-

(Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.)

-

Members

+

Members

@@ -1214,9 +1212,8 @@ is supported

enum NM80211Mode

Indicates the 802.11 mode an access point or device is currently in.

-

(Corresponds to the NM_802_11_MODE type in generic-types.xml.)

-

Members

+

Members

@@ -1267,9 +1264,8 @@ is supported

enum NMBluetoothCapabilities

NMBluetoothCapabilities values indicate the usable capabilities of a Bluetooth device.

-

(Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.)

-

Members

+

Members

@@ -1309,9 +1305,8 @@ Bluetooth device.

technology families a modem device supports. For more information on the specific access technologies the device supports use the ModemManager D-Bus API.

-

(Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.)

-

Members

+

Members

@@ -1363,8 +1358,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

-

enum NMDeviceState

-

(Corresponds to the NM_DEVICE_STATE type in nm-device.xml.)

+

enum NMWimaxNspNetworkType

+

WiMAX network type.

Members

@@ -1375,6 +1370,50 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

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

NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

 +

unknown network type

+		 

NM_WIMAX_NSP_NETWORK_TYPE_HOME

 +

home network

+		 

NM_WIMAX_NSP_NETWORK_TYPE_PARTNER

 +

partner network

+		 

NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER

 +

roaming partner network

+		 
+
+
+
+
+

enum NMDeviceState

+
+

Members

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

NM_DEVICE_STATE_UNKNOWN

the device's state is unknown

@@ -1495,9 +1534,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

enum NMDeviceStateReason

Device state change reason codes

-

(Corresponds to the NM_DEVICE_STATE_REASON type in nm-device.xml.)

-

Members

+

Members

@@ -1953,9 +1991,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

enum NMMetered

-

(Corresponds to the NM_METERED type in nm-device.xml.)

-

Members

+

Members

@@ -2009,9 +2046,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

NMActiveConnectionState values indicate the state of a connection to a specific network while it is starting, connected, or disconnecting from that network.

-

(Corresponds to the NM_ACTIVE_CONNECTION_STATE type in nm-active-connection.xml.)

-

Members

+

Members

@@ -2064,9 +2100,8 @@ network.

enum NMSecretAgentGetSecretsFlags

NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.

-

(Corresponds to the NM_SECRET_AGENT_GET_SECRETS_FLAGS type in nm-secret-agent.xml.)

-

Members

+

Members

@@ -2136,9 +2171,8 @@ network.

enum NMSecretAgentCapabilities

NMSecretAgentCapabilities indicate various capabilities of the agent.

-

(Corresponds to the NM_SECRET_AGENT_CAPABILITIES type in nm-secret-agent.xml.)

-

Members

+

Members

@@ -2279,7 +2313,7 @@ VPN plugin authentication dialogs.

enum NMIPTunnelMode

The tunneling mode.

-

Members

+

Members

diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html index 2cf12f47..5e1c3977 100644 --- a/docs/libnm/html/libnm-nm-version.html +++ b/docs/libnm/html/libnm-nm-version.html @@ -65,6 +65,12 @@ NM_DEPRECATED_IN_1_2_FOR() + + + +
#define +NM_DEPRECATED_IN_1_4_FOR() +
@@ -100,6 +106,14 @@
#define NM_AVAILABLE_IN_1_2
#defineNM_DEPRECATED_IN_1_4
#defineNM_AVAILABLE_IN_1_4
@@ -137,6 +151,12 @@ 
# define NM_DEPRECATED_IN_1_2_FOR(f)    G_DEPRECATED_FOR(f)
+
+
+

NM_DEPRECATED_IN_1_4_FOR()

+
# define NM_DEPRECATED_IN_1_4_FOR(f)    G_DEPRECATED_FOR(f)
+
+

Types and Values

@@ -174,6 +194,18 @@

NM_AVAILABLE_IN_1_2

#define             NM_AVAILABLE_IN_1_2
+
+
+

NM_DEPRECATED_IN_1_4

+
# define NM_DEPRECATED_IN_1_4           G_DEPRECATED
+
+
+
+
+

NM_AVAILABLE_IN_1_4

+
# define NM_AVAILABLE_IN_1_4            G_UNAVAILABLE(1,4)
+
+
diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html index b88d6dfc..299f1d09 100644 --- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html @@ -462,9 +462,8 @@

enum NMVpnServiceState

VPN daemon states

-

(Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.)

-

Members

+

Members

@@ -529,9 +528,8 @@

enum NMVpnConnectionState

VPN connection states

-

(Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.)

-

Members

+

Members

@@ -607,9 +605,8 @@

enum NMVpnConnectionStateReason

VPN connection state reasons

-

(Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.)

-

Members

+

Members

@@ -721,9 +718,8 @@

enum NMVpnPluginFailure

VPN plugin failure reasons

-

(Corresponds to the NM_VPN_PLUGIN_FAILURE type in nm-vpn-plugin.xml.)

-

Members

+

Members

diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2 index dd719805..6dd470c9 100644 --- a/docs/libnm/html/libnm.devhelp2 +++ b/docs/libnm/html/libnm.devhelp2 @@ -303,6 +303,7 @@ + @@ -695,6 +696,18 @@ + + + + + + + + + + + + @@ -1002,6 +1015,7 @@ + @@ -1991,7 +2005,6 @@ - @@ -2096,12 +2109,15 @@ + + + @@ -2341,6 +2357,10 @@ + + + + @@ -2535,10 +2555,6 @@ - - - - diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html index e08e9893..66f19502 100644 --- a/docs/libnm/html/object-tree.html +++ b/docs/libnm/html/object-tree.html @@ -144,7 +144,7 @@ ├── NMVpnPluginFailure ├── NMVpnServiceState ├── NMWepKeyType - ╰── NMWimaxNspNetworkType + ╰── NMWimaxNspNetworkType GBoxed ├── NMIPAddress ├── NMIPRoute diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt index e38f599e..fe4240b5 100644 --- a/docs/libnm/libnm-sections.txt +++ b/docs/libnm/libnm-sections.txt @@ -314,6 +314,7 @@ NM_TYPE_VPN_PLUGIN_ERROR NM_TYPE_VPN_PLUGIN_FAILURE NM_TYPE_VPN_SERVICE_STATE NM_TYPE_WEP_KEY_TYPE +NM_TYPE_WIMAX_NSP_NETWORK_TYPE nm_802_11_ap_flags_get_type nm_802_11_ap_security_flags_get_type nm_802_11_mode_get_type @@ -365,6 +366,7 @@ nm_vpn_plugin_error_get_type nm_vpn_plugin_failure_get_type nm_vpn_service_state_get_type nm_wep_key_type_get_type +nm_wimax_nsp_network_type_get_type
@@ -421,6 +423,7 @@ NM80211ApSecurityFlags NM80211Mode NMBluetoothCapabilities NMDeviceModemCapabilities +NMWimaxNspNetworkType NMDeviceState NMDeviceStateReason NMMetered @@ -1008,11 +1011,9 @@ nm_dhcp_config_get_type NM_TYPE_CLIENT_ERROR NM_TYPE_CLIENT_PERMISSION NM_TYPE_CLIENT_PERMISSION_RESULT -NM_TYPE_WIMAX_NSP_NETWORK_TYPE nm_client_error_get_type nm_client_permission_get_type nm_client_permission_result_get_type -nm_wimax_nsp_network_type_get_type
@@ -1397,6 +1398,18 @@ NM_SETTING_BOND_OPTION_AD_SELECT NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY NM_SETTING_BOND_OPTION_RESEND_IGMP NM_SETTING_BOND_OPTION_LACP_RATE +NM_SETTING_BOND_OPTION_ACTIVE_SLAVE +NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO +NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM +NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY +NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE +NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS +NM_SETTING_BOND_OPTION_MIN_LINKS +NM_SETTING_BOND_OPTION_NUM_GRAT_ARP +NM_SETTING_BOND_OPTION_NUM_UNSOL_NA +NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE +NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB +NM_SETTING_BOND_OPTION_LP_INTERVAL nm_setting_bond_new nm_setting_bond_get_num_options nm_setting_bond_get_option @@ -1779,6 +1792,7 @@ NM_SETTING_DNS_OPTION_EDNS0 NM_SETTING_DNS_OPTION_SINGLE_REQUEST NM_SETTING_DNS_OPTION_SINGLE_REQUEST_REOPEN NM_SETTING_DNS_OPTION_NO_TLD_QUERY +NM_SETTING_DNS_OPTION_USE_VC nm_setting_ip_config_get_method nm_setting_ip_config_get_num_dns nm_setting_ip_config_get_dns @@ -2581,6 +2595,9 @@ NM_AVAILABLE_IN_1_0 NM_DEPRECATED_IN_1_2 NM_DEPRECATED_IN_1_2_FOR NM_AVAILABLE_IN_1_2 +NM_DEPRECATED_IN_1_4 +NM_DEPRECATED_IN_1_4_FOR +NM_AVAILABLE_IN_1_4
@@ -2759,7 +2776,6 @@ NM_VPN_SERVICE_PLUGIN_GET_CLASS NM_WIMAX_NSP_NAME NM_WIMAX_NSP_SIGNAL_QUALITY NM_WIMAX_NSP_NETWORK_TYPE -NMWimaxNspNetworkType nm_wimax_nsp_get_name nm_wimax_nsp_get_signal_quality nm_wimax_nsp_get_network_type diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml index 99f6a00b..9a03ea63 100644 --- a/docs/libnm/version.xml +++ b/docs/libnm/version.xml @@ -1 +1 @@ -1.1.92 +1.1.93 diff --git a/examples/dispatcher/10-ifcfg-rh-routes.sh b/examples/dispatcher/10-ifcfg-rh-routes.sh index 59e44db5..b1d0314d 100755 --- a/examples/dispatcher/10-ifcfg-rh-routes.sh +++ b/examples/dispatcher/10-ifcfg-rh-routes.sh @@ -9,7 +9,7 @@ # dispatcher.d/pre-up.d/ # pre-up scripts delay activation of the device. To reduce the delay, -# it is adviced to install the script as symlink to no-wait.d directory. +# it is advised to install the script as symlink to no-wait.d directory. if [ "$2" != "pre-up" -a "$2" != "down" ]; then exit 0 diff --git a/introspection/Makefile.am b/introspection/Makefile.am index 4d2e1298..3a627930 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -136,10 +136,6 @@ BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS) CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ - all.xml.in \ - generic-types.xml \ - errors.xml \ - vpn-errors.xml \ nm-access-point.xml \ nm-active-connection.xml \ nm-agent-manager.xml \ diff --git a/introspection/Makefile.in b/introspection/Makefile.in index ea43b442..c6f4ba26 100644 --- a/introspection/Makefile.in +++ b/introspection/Makefile.in @@ -108,7 +108,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = all.xml +CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libnmdbus_la_LIBADD = @@ -194,7 +194,7 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/all.xml.in \ +am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -578,10 +578,6 @@ DBUS_INTERFACE_DOCS = \ BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS) CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ - all.xml.in \ - generic-types.xml \ - errors.xml \ - vpn-errors.xml \ nm-access-point.xml \ nm-active-connection.xml \ nm-agent-manager.xml \ @@ -651,8 +647,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -all.xml: $(top_builddir)/config.status $(srcdir)/all.xml.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) diff --git a/introspection/all.xml.in b/introspection/all.xml.in deleted file mode 100644 index 273c0fda..00000000 --- a/introspection/all.xml.in +++ /dev/null @@ -1,74 +0,0 @@ - - -NetworkManager D-Bus Interface Specification -@VERSION@ - - -Copyright (C) 2008 - 2016 Red Hat, Inc. -Copyright (C) 2008 - 2009 Novell, Inc. - - -

This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version.

- -

This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details.

- -

You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/introspection/errors.xml b/introspection/errors.xml deleted file mode 100644 index 34a0a7b9..00000000 --- a/introspection/errors.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - Copyright (C) 2008 Novell, Inc. - - - - - - - - - - - - - - diff --git a/introspection/generic-types.xml b/introspection/generic-types.xml deleted file mode 100644 index 2fb680af..00000000 --- a/introspection/generic-types.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/introspection/nm-access-point.xml b/introspection/nm-access-point.xml index 603be713..0c1ebf23 100644 --- a/introspection/nm-access-point.xml +++ b/introspection/nm-access-point.xml @@ -1,103 +1,101 @@ - - - + + - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml index 59bf78f4..a4e94170 100644 --- a/introspection/nm-active-connection.xml +++ b/introspection/nm-active-connection.xml @@ -1,154 +1,156 @@ - + + - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - - - - - - - - - - - - - - - - - - - diff --git a/introspection/nm-agent-manager.xml b/introspection/nm-agent-manager.xml index 52460eee..86b4404a 100644 --- a/introspection/nm-agent-manager.xml +++ b/introspection/nm-agent-manager.xml @@ -1,50 +1,37 @@ - - - + + - - - - - + --> + + - - NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager. + Like Register() but indicates agent capabilities to NetworkManager. - " /> - - - - - - + --> + + + - - - + + - diff --git a/introspection/nm-device-adsl.xml b/introspection/nm-device-adsl.xml index 68859d3b..5ad397e6 100644 --- a/introspection/nm-device-adsl.xml +++ b/introspection/nm-device-adsl.xml @@ -1,21 +1,20 @@ - - - + + + - - - + - - - + + diff --git a/introspection/nm-device-bond.xml b/introspection/nm-device-bond.xml index 9bc21225..fc0249d9 100644 --- a/introspection/nm-device-bond.xml +++ b/introspection/nm-device-bond.xml @@ -1,34 +1,36 @@ - - - + + - - - + --> + + + + - - - + + + + - - - + - diff --git a/introspection/nm-device-bridge.xml b/introspection/nm-device-bridge.xml index 6cf99a10..c2e8ffd3 100644 --- a/introspection/nm-device-bridge.xml +++ b/introspection/nm-device-bridge.xml @@ -1,34 +1,36 @@ - - - + + - - - + --> + + + + - - - + + + + - - - + - diff --git a/introspection/nm-device-bt.xml b/introspection/nm-device-bt.xml index 3b487158..6249085b 100644 --- a/introspection/nm-device-bt.xml +++ b/introspection/nm-device-bt.xml @@ -1,48 +1,36 @@ - - - + + - - - + --> + + + + + + + + + - - - + - - - - - - - - - - - - - - diff --git a/introspection/nm-device-ethernet.xml b/introspection/nm-device-ethernet.xml index 87b7f755..ddfa74bb 100644 --- a/introspection/nm-device-ethernet.xml +++ b/introspection/nm-device-ethernet.xml @@ -1,46 +1,50 @@ - - - + + - - - + --> + + + + + + + + + + + + + + - - - + - diff --git a/introspection/nm-device-generic.xml b/introspection/nm-device-generic.xml index 2f8fc7ee..e79ff700 100644 --- a/introspection/nm-device-generic.xml +++ b/introspection/nm-device-generic.xml @@ -1,27 +1,27 @@ - - - + + - - - + --> + + + + + - - - + - diff --git a/introspection/nm-device-infiniband.xml b/introspection/nm-device-infiniband.xml index 169c2c66..9848a074 100644 --- a/introspection/nm-device-infiniband.xml +++ b/introspection/nm-device-infiniband.xml @@ -1,27 +1,28 @@ - - - + + - - - + --> + - - - + + + + - - - + - diff --git a/introspection/nm-device-ip-tunnel.xml b/introspection/nm-device-ip-tunnel.xml index 3ca04ee6..45f3a3f7 100644 --- a/introspection/nm-device-ip-tunnel.xml +++ b/introspection/nm-device-ip-tunnel.xml @@ -1,86 +1,94 @@ - - - + + - - - + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - diff --git a/introspection/nm-device-macvlan.xml b/introspection/nm-device-macvlan.xml index d5d66068..876b685c 100644 --- a/introspection/nm-device-macvlan.xml +++ b/introspection/nm-device-macvlan.xml @@ -1,39 +1,41 @@ - - - + + - - - + --> + + + + + + + + + + + - - - + - diff --git a/introspection/nm-device-modem.xml b/introspection/nm-device-modem.xml index 67742c46..1d4bd65e 100644 --- a/introspection/nm-device-modem.xml +++ b/introspection/nm-device-modem.xml @@ -1,64 +1,35 @@ - - - + + + - - - + - - - - - NMDeviceModemCapabilities + --> + + + + diff --git a/introspection/nm-device-olpc-mesh.xml b/introspection/nm-device-olpc-mesh.xml index a92e7370..b2ab126e 100644 --- a/introspection/nm-device-olpc-mesh.xml +++ b/introspection/nm-device-olpc-mesh.xml @@ -1,34 +1,36 @@ - - - + + - - - + --> + + + + + + + + + - - - - + diff --git a/introspection/nm-device-team.xml b/introspection/nm-device-team.xml index 982b7670..05bbbafe 100644 --- a/introspection/nm-device-team.xml +++ b/introspection/nm-device-team.xml @@ -1,34 +1,36 @@ - - - + + - - - + --> + + + + - - - + + + + - - - + - diff --git a/introspection/nm-device-tun.xml b/introspection/nm-device-tun.xml index 0f74cf8c..a11461c1 100644 --- a/introspection/nm-device-tun.xml +++ b/introspection/nm-device-tun.xml @@ -1,61 +1,65 @@ - - - + + - - - + --> + + + + + + + + + + + + + + + + + + + + - - - + - diff --git a/introspection/nm-device-veth.xml b/introspection/nm-device-veth.xml index a3cff6da..b064874e 100644 --- a/introspection/nm-device-veth.xml +++ b/introspection/nm-device-veth.xml @@ -1,21 +1,20 @@ - - - + + - - - + --> + + - - - + - diff --git a/introspection/nm-device-vlan.xml b/introspection/nm-device-vlan.xml index bac220e8..7d8fbdce 100644 --- a/introspection/nm-device-vlan.xml +++ b/introspection/nm-device-vlan.xml @@ -1,39 +1,42 @@ - - - + + - - - + --> + + + + + + + + + + + - - - + - diff --git a/introspection/nm-device-vxlan.xml b/introspection/nm-device-vxlan.xml index de23020d..ec17717d 100644 --- a/introspection/nm-device-vxlan.xml +++ b/introspection/nm-device-vxlan.xml @@ -1,128 +1,139 @@ - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml index 2ece0ef0..c1f378d8 100644 --- a/introspection/nm-device-wifi.xml +++ b/introspection/nm-device-wifi.xml @@ -1,170 +1,124 @@ - - - + + - - - - - - + --> + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - + + + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/introspection/nm-device-wimax.xml b/introspection/nm-device-wimax.xml index e790e4fc..02539dbb 100644 --- a/introspection/nm-device-wimax.xml +++ b/introspection/nm-device-wimax.xml @@ -1,109 +1,112 @@ - - - + + - - - - - - + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - + + + + - - - - + - diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index 321cace1..d4535a84 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -1,798 +1,321 @@ - - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/introspection/nm-dhcp4-config.xml b/introspection/nm-dhcp4-config.xml index bca34fc5..e9363f9e 100644 --- a/introspection/nm-dhcp4-config.xml +++ b/introspection/nm-dhcp4-config.xml @@ -1,21 +1,27 @@ - + + - - - - - - - + + + + + + + + + + + + diff --git a/introspection/nm-dhcp6-config.xml b/introspection/nm-dhcp6-config.xml index 84e13b77..7ecdf35c 100644 --- a/introspection/nm-dhcp6-config.xml +++ b/introspection/nm-dhcp6-config.xml @@ -1,21 +1,27 @@ - + + - - - - - - - + + + + + + + + + + + + diff --git a/introspection/nm-ip4-config.xml b/introspection/nm-ip4-config.xml index 111e1acf..c2a0f068 100644 --- a/introspection/nm-ip4-config.xml +++ b/introspection/nm-ip4-config.xml @@ -1,72 +1,95 @@ - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - diff --git a/introspection/nm-ip6-config.xml b/introspection/nm-ip6-config.xml index 0cca33c4..606761dd 100644 --- a/introspection/nm-ip6-config.xml +++ b/introspection/nm-ip6-config.xml @@ -1,67 +1,87 @@ - - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - + - diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml index 8203020b..e5cb23a5 100644 --- a/introspection/nm-manager.xml +++ b/introspection/nm-manager.xml @@ -1,533 +1,385 @@ - - - + + - - - - - + --> + + - - + --> + - - - + - - - - - - - - + interface name. Note that some devices (usually modems) only have an IP + interface name when they are connected. + --> + + + - - - - - - - - - - - - - - + --> + + + + + - - - - - - - - - - - - - - - - - + --> + + + + + + - - - - - + --> + + + - - - - + + - - - - + - - - - - + --> + + - - - + + + + + + + - - - - - - - - + --> + + + + - - - - + - - NMState + The overall networking state as determined by the NetworkManager daemon, based on the state of network devices under it's management. - " /> - + --> + + - - - + --> + + + + + + + + + + + + + - - - + + + + + - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - NMConnectivityState + --> + + + + + + + + - - - - - + --> + + - - - - - + --> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/introspection/nm-secret-agent.xml b/introspection/nm-secret-agent.xml index ec7ede09..33296fb0 100644 --- a/introspection/nm-secret-agent.xml +++ b/introspection/nm-secret-agent.xml @@ -1,243 +1,92 @@ - + + - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + diff --git a/introspection/nm-settings-connection.xml b/introspection/nm-settings-connection.xml index fc62046c..15b38034 100644 --- a/introspection/nm-settings-connection.xml +++ b/introspection/nm-settings-connection.xml @@ -1,138 +1,131 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/introspection/nm-settings.xml b/introspection/nm-settings.xml index 62892025..7f5b546c 100644 --- a/introspection/nm-settings.xml +++ b/introspection/nm-settings.xml @@ -1,198 +1,170 @@ - + + - + - - - - - - + --> + + - - - - - - - - + --> + + + + - - - - - - - + + + - - - - - - - + + + - - - - - - - - - - + + + + - - - - + - - - - - + --> + + - - - + --> + + + + + + + + - - - + - - - - - + --> + + + - - - - + - - diff --git a/introspection/nm-vpn-connection.xml b/introspection/nm-vpn-connection.xml index 6a4fb37d..430998f3 100644 --- a/introspection/nm-vpn-connection.xml +++ b/introspection/nm-vpn-connection.xml @@ -1,148 +1,48 @@ - + + - - - + + + + - - - + - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/introspection/nm-vpn-plugin.xml b/introspection/nm-vpn-plugin.xml index ee8c69f8..7eed9721 100644 --- a/introspection/nm-vpn-plugin.xml +++ b/introspection/nm-vpn-plugin.xml @@ -1,313 +1,202 @@ - + + - + - + + - - - - - - - - - - - + + - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + + - - + --> + - - - - - - + --> + - - - + - - + --> + - - - + - - + --> + - - - + - - + --> + - - - + - - - - - NMVpnServiceState + --> + + + + + + - - - - - - - + + - - + --> + - - - - - - - - - + - - - - - + --> + + - - - - - + --> + + - - - - - + --> + + - - - - - + --> + + - - NMVpnPluginFailure) Reason code for the failure. + Emitted when a failure in the VPN plugin occurs. - " /> - - - + --> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/introspection/nm-wimax-nsp.xml b/introspection/nm-wimax-nsp.xml index 6174ad67..8b9a2fcc 100644 --- a/introspection/nm-wimax-nsp.xml +++ b/introspection/nm-wimax-nsp.xml @@ -1,44 +1,36 @@ - - - + + - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + diff --git a/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml b/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml index eae6fef6..af445f92 100644 --- a/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml +++ b/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml @@ -55,7 +55,9 @@ PropertiesChanged (a{sv} properties); Flags readable u -Flags describing the capabilities of the access point. + Flags describing the capabilities of the access point. + Returns: NM80211ApFlags + The "WpaFlags" property @@ -63,7 +65,10 @@ Flags readable u WpaFlags readable u -Flags describing the access point's capabilities according to WPA (Wifi Protected Access). + Flags describing the access point's capabilities according to WPA (Wifi + Protected Access). + Returns: NM80211ApSecurityFlags + The "RsnFlags" property @@ -71,7 +76,10 @@ WpaFlags readable u RsnFlags readable u -Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol. + Flags describing the access point's capabilities according to the RSN + (Robust Secure Network) protocol. + Returns: NM80211ApSecurityFlags + The "Ssid" property @@ -79,7 +87,8 @@ RsnFlags readable u Ssid readable ay -The Service Set Identifier identifying the access point. + The Service Set Identifier identifying the access point. + The "Frequency" property @@ -87,7 +96,8 @@ Ssid readable ay Frequency readable u -The radio channel frequency in use by the access point, in MHz. + The radio channel frequency in use by the access point, in MHz. + The "HwAddress" property @@ -95,7 +105,8 @@ Frequency readable u HwAddress readable s -The hardware address (BSSID) of the access point. + The hardware address (BSSID) of the access point. + The "Mode" property @@ -103,7 +114,9 @@ HwAddress readable s Mode readable u -Describes the operating mode of the access point. + Describes the operating mode of the access point. + Returns: NM80211Mode + The "MaxBitrate" property @@ -111,7 +124,9 @@ Mode readable u MaxBitrate readable u -The maximum bitrate this access point is capable of, in kilobits/second (Kb/s). + The maximum bitrate this access point is capable of, in kilobits/second + (Kb/s). + The "Strength" property @@ -119,7 +134,8 @@ MaxBitrate readable u Strength readable y -The current signal quality of the access point, in percent. + The current signal quality of the access point, in percent. + The "LastSeen" property @@ -127,7 +143,10 @@ Strength readable y LastSeen readable i -The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access point was found in scan results. A value of -1 means the access point has never been found in scan results. + The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access + point was found in scan results. A value of -1 means the access point has + never been found in scan results. + diff --git a/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml b/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml index a2a352f6..0f002e22 100644 --- a/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml +++ b/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml @@ -33,7 +33,21 @@ Description - Objects that implement the Connection.Active interface represent an attempt to connect to a network using the details provided by a Connection object. The Connection.Active object tracks the life-cycle of the connection attempt and if successful indicates whether the connected network is the "default" or preferred network for access. NetworkManager has the concept of connections, which can be thought of as settings, a profile or a configuration that can be applied on a networking device. Such settings-connections are exposed as D-Bus object and the active-connection expresses this relationship between device and settings-connection. At any time a settings-connection can only be activated on one device and vice versa. However, during activation and deactivation multiple active-connections can reference the same device or settings-connection as they are waiting to be activated or to be deactivated. + Objects that implement the Connection.Active interface represent an + attempt to connect to a network using the details provided by a Connection + object. The Connection.Active object tracks the life-cycle of the + connection attempt and if successful indicates whether the connected + network is the "default" or preferred network for access. NetworkManager + has the concept of connections, which can be thought of as settings, a + profile or a configuration that can be applied on a networking device. + Such settings-connections are exposed as D-Bus object and the + active-connection expresses this relationship between device and + settings-connection. At any time a settings-connection can only be + activated on one device and vice versa. However, during activation and + deactivation multiple active-connections can reference the same device or + settings-connection as they are waiting to be activated or to be + deactivated. + Signal Details @@ -60,7 +74,8 @@ PropertiesChanged (a{sv} properties); Connection readable o -The path of the connection. + The path of the connection. + The "SpecificObject" property @@ -68,7 +83,10 @@ Connection readable o SpecificObject readable o -A specific object associated with the active connection. This property reflects the specific object used during connection activation, and will not change over the lifetime of the ActiveConnection once set. + A specific object associated with the active connection. This property + reflects the specific object used during connection activation, and will + not change over the lifetime of the ActiveConnection once set. + The "Id" property @@ -76,7 +94,9 @@ SpecificObject readable o Id readable s -The ID of the connection, provided as a convenience so that clients do not have to retrieve all connection details. + The ID of the connection, provided as a convenience so that clients do not + have to retrieve all connection details. + The "Uuid" property @@ -84,7 +104,9 @@ Id readable s Uuid readable s -The UUID of the connection, provided as a convenience so that clients do not have to retrieve all connection details. + The UUID of the connection, provided as a convenience so that clients do + not have to retrieve all connection details. + The "Type" property @@ -92,7 +114,9 @@ Uuid readable s Type readable s -The type of the connection, provided as a convenience so that clients do not have to retrieve all connection details. + The type of the connection, provided as a convenience so that clients do + not have to retrieve all connection details. + The "Devices" property @@ -100,7 +124,9 @@ Type readable s Devices readable ao -Array of object paths representing devices which are part of this active connection. + Array of object paths representing devices which are part of this active + connection. + The "State" property @@ -108,7 +134,9 @@ Devices readable ao State readable u -The state of this active connection. + The state of this active connection. + Returns: NMActiveConnectionState + The "Default" property @@ -116,7 +144,9 @@ State readable u Default readable b -Whether this active connection is the default IPv4 connection, i.e. whether it currently owns the default IPv4 route. + Whether this active connection is the default IPv4 connection, i.e. + whether it currently owns the default IPv4 route. + The "Ip4Config" property @@ -124,7 +154,10 @@ Default readable b Ip4Config readable o -Object path of the Ip4Config object describing the configuration of the connection. Only valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + Object path of the Ip4Config object describing the configuration of the + connection. Only valid when the connection is in the + NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + The "Dhcp4Config" property @@ -132,7 +165,10 @@ Ip4Config readable o Dhcp4Config readable o -Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server (assuming the connection used DHCP). Only valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + Object path of the Dhcp4Config object describing the DHCP options returned + by the DHCP server (assuming the connection used DHCP). Only valid when + the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + The "Default6" property @@ -140,7 +176,9 @@ Dhcp4Config readable o Default6 readable b -Whether this active connection is the default IPv6 connection, i.e. whether it currently owns the default IPv6 route. + Whether this active connection is the default IPv6 connection, i.e. + whether it currently owns the default IPv6 route. + The "Ip6Config" property @@ -148,7 +186,10 @@ Default6 readable b Ip6Config readable o -Object path of the Ip6Config object describing the configuration of the connection. Only valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + Object path of the Ip6Config object describing the configuration of the + connection. Only valid when the connection is in the + NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + The "Dhcp6Config" property @@ -156,7 +197,10 @@ Ip6Config readable o Dhcp6Config readable o -Object path of the Dhcp6Config object describing the DHCP options returned by the DHCP server (assuming the connection used DHCP). Only valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + Object path of the Dhcp6Config object describing the DHCP options returned + by the DHCP server (assuming the connection used DHCP). Only valid when + the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + The "Vpn" property @@ -164,7 +208,8 @@ Dhcp6Config readable o Vpn readable b -Whether this active connection is also a VPN connection. + Whether this active connection is also a VPN connection. + The "Master" property @@ -172,7 +217,8 @@ Vpn readable b Master readable o -The path to the master device if the connection is a slave. + The path to the master device if the connection is a slave. + diff --git a/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml b/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml index 29bb71d7..2f074cbe 100644 --- a/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml +++ b/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml @@ -26,11 +26,13 @@ Register (IN s identifier); -Called by secret Agents to register their ability to provide and save network secrets. + Called by secret Agents to register their ability to provide and save + network secrets. + IN s identifier: - Identifies this agent; only one agent in each user session may use the same identifier. Identifier formatting follows the same rules as D-Bus bus names with the exception that the ':' character is not allowed. The valid set of characters is "[A-Z][a-z][0-9]_-." and the identifier is limited in length to 255 characters with a minimum of 3 characters. An example valid identifier is 'org.gnome.nm-applet' (without quotes). + Identifies this agent; only one agent in each user session may use the same identifier. Identifier formatting follows the same rules as D-Bus bus names with the exception that the ':' character is not allowed. The valid set of characters is "[A-Z][a-z][0-9]_-." and the identifier is limited in length to 255 characters with a minimum of 3 characters. An example valid identifier is 'org.gnome.nm-applet' (without quotes). @@ -41,7 +43,8 @@ Register (IN s identifier); RegisterWithCapabilities (IN s identifier, IN u capabilities); -Like Register() but indicates agent capabilities to NetworkManager. + Like Register() but indicates agent capabilities to NetworkManager. + IN s identifier: @@ -49,7 +52,7 @@ RegisterWithCapabilities (IN s identifier, IN u capabilities: - Indicates various agent capabilities to NetworkManager. + (NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager. @@ -59,7 +62,10 @@ RegisterWithCapabilities (IN s identifier, Unregister (); -Called by secret Agents to notify NetworkManager that they will no longer handle requests for network secrets. Agents are automatically unregistered when they disconnect from D-Bus. + Called by secret Agents to notify NetworkManager that they will no longer + handle requests for network secrets. Agents are automatically unregistered + when they disconnect from D-Bus. + diff --git a/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml b/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml index ab85429d..b4a15c7d 100644 --- a/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml +++ b/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml @@ -46,7 +46,8 @@ PropertiesChanged (a{sv} properties); Carrier readable b -Indicates whether the physical carrier is found. + Indicates whether the physical carrier is found. + diff --git a/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml b/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml index 22bd4ccf..1d9788ee 100644 --- a/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml +++ b/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml @@ -48,7 +48,8 @@ PropertiesChanged (a{sv} properties); HwAddress readable s -Hardware address of the device. + Hardware address of the device. + The "Carrier" property @@ -56,7 +57,9 @@ HwAddress readable s Carrier readable b -Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + Indicates whether the physical carrier is found (e.g. whether a cable is + plugged in or not). + The "Slaves" property @@ -64,7 +67,9 @@ Carrier readable b Slaves readable ao -Array of object paths representing devices which are currently slaved to this device. + Array of object paths representing devices which are currently slaved to + this device. + diff --git a/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml b/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml index 20946e34..7bfe783e 100644 --- a/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml +++ b/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml @@ -48,7 +48,8 @@ PropertiesChanged (a{sv} properties); HwAddress readable s -Hardware address of the device. + Hardware address of the device. + The "Carrier" property @@ -56,7 +57,9 @@ HwAddress readable s Carrier readable b -Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + Indicates whether the physical carrier is found (e.g. whether a cable is + plugged in or not). + The "Slaves" property @@ -64,7 +67,9 @@ Carrier readable b Slaves readable ao -Array of object paths representing devices which are currently slaved to this device. + Array of object paths representing devices which are currently slaved to + this device. + diff --git a/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml b/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml index 7cca9d2c..050fccf4 100644 --- a/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml +++ b/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml @@ -48,7 +48,8 @@ PropertiesChanged (a{sv} properties); HwAddress readable s -Bluetooth hardware address of the device. + Bluetooth hardware address of the device. + The "Name" property @@ -56,7 +57,8 @@ HwAddress readable s Name readable s -Bluetooth name of the device. + Bluetooth name of the device. + The "BtCapabilities" property @@ -64,7 +66,9 @@ Name readable s BtCapabilities readable u -Bluetooth capabilities of the device (either DUN or NAP). + Bluetooth capabilities of the device (either DUN or NAP). + Returns: NMBluetoothCapabilities + diff --git a/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml b/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml index ef6e7e8b..f97f8f37 100644 --- a/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml +++ b/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml @@ -50,7 +50,8 @@ PropertiesChanged (a{sv} properties); HwAddress readable s -Active hardware address of the device. + Active hardware address of the device. + The "PermHwAddress" property @@ -58,7 +59,8 @@ HwAddress readable s PermHwAddress readable s -Permanent hardware address of the device. + Permanent hardware address of the device. + The "Speed" property @@ -66,7 +68,8 @@ PermHwAddress readable s Speed readable u -Design speed of the device, in megabits/second (Mb/s). + Design speed of the device, in megabits/second (Mb/s). + The "S390Subchannels" property @@ -74,7 +77,8 @@ Speed readable u S390Subchannels readable as -Array of S/390 subchannels for S/390 or z/Architecture devices. + Array of S/390 subchannels for S/390 or z/Architecture devices. + The "Carrier" property @@ -82,7 +86,9 @@ S390Subchannels readable as Carrier readable b -Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + Indicates whether the physical carrier is found (e.g. whether a cable is + plugged in or not). + diff --git a/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml b/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml index 13d81172..dc2cdbe8 100644 --- a/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml +++ b/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml @@ -47,7 +47,8 @@ PropertiesChanged (a{sv} properties); HwAddress readable s -Hardware address of the device. + Hardware address of the device. + The "TypeDescription" property @@ -55,7 +56,8 @@ HwAddress readable s TypeDescription readable s -A (non-localized) description of the interface type, if known. + A (non-localized) description of the interface type, if known. + diff --git a/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml b/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml index bbafdbfc..f7957eed 100644 --- a/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml +++ b/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml @@ -47,7 +47,8 @@ PropertiesChanged (a{sv} properties); HwAddress readable s -Hardware address of the device. + Hardware address of the device. + The "Carrier" property @@ -55,7 +56,9 @@ HwAddress readable s Carrier readable b -Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + Indicates whether the physical carrier is found (e.g. whether a cable is + plugged in or not). + diff --git a/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml b/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml index f1a8bba7..3b59de03 100644 --- a/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml +++ b/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml @@ -56,7 +56,8 @@ PropertiesChanged (a{sv} properties); Mode readable u -The tunneling mode. + The tunneling mode. + The "Parent" property @@ -64,7 +65,8 @@ Mode readable u Parent readable o -The object path of the parent device. + The object path of the parent device. + The "Local" property @@ -72,7 +74,8 @@ Parent readable o Local readable s -The local endpoint of the tunnel. + The local endpoint of the tunnel. + The "Remote" property @@ -80,7 +83,8 @@ Local readable s Remote readable s -The remote endpoint of the tunnel. + The remote endpoint of the tunnel. + The "Ttl" property @@ -88,7 +92,9 @@ Remote readable s Ttl readable y -The TTL assigned to tunneled packets. 0 is a special value meaning that packets inherit the TTL value + The TTL assigned to tunneled packets. 0 is a special value meaning that + packets inherit the TTL value + The "Tos" property @@ -96,7 +102,9 @@ Ttl readable y Tos readable y -The type of service (IPv4) or traffic class (IPv6) assigned to tunneled packets. + The type of service (IPv4) or traffic class (IPv6) assigned to tunneled + packets. + The "PathMtuDiscovery" property @@ -104,7 +112,8 @@ Tos readable y PathMtuDiscovery readable b -Whether path MTU discovery is enabled on this tunnel. + Whether path MTU discovery is enabled on this tunnel. + The "InputKey" property @@ -112,7 +121,8 @@ PathMtuDiscovery readable b InputKey readable s -The key used for incoming packets. + The key used for incoming packets. + The "OutputKey" property @@ -120,7 +130,8 @@ InputKey readable s OutputKey readable s -The key used for outgoing packets. + The key used for outgoing packets. + The "EncapsulationLimit" property @@ -128,7 +139,9 @@ OutputKey readable s EncapsulationLimit readable y -How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels. + How many additional levels of encapsulation are permitted to be prepended + to packets. This property applies only to IPv6 tunnels. + The "FlowLabel" property @@ -136,7 +149,9 @@ EncapsulationLimit readable y FlowLabel readable u -The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels. + The flow label to assign to tunnel packets. This property applies only to + IPv6 tunnels. + diff --git a/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml b/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml index ca5d7367..b1b63d8b 100644 --- a/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml +++ b/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml @@ -49,7 +49,8 @@ PropertiesChanged (a{sv} properties); Parent readable o -The object path of the parent device. + The object path of the parent device. + The "Mode" property @@ -57,7 +58,8 @@ Parent readable o Mode readable s -The macvlan mode, one of "private", "vepa", "bridge", or "passthru". + The macvlan mode, one of "private", "vepa", "bridge", or "passthru". + The "NoPromisc" property @@ -65,7 +67,8 @@ Mode readable s NoPromisc readable b -Whether the device is blocked from going into promiscuous mode. + Whether the device is blocked from going into promiscuous mode. + The "Tap" property @@ -73,7 +76,8 @@ NoPromisc readable b Tap readable b -Whether the device is a macvtap. + Whether the device is a macvtap. + diff --git a/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml b/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml index 2143ef62..839f426c 100644 --- a/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml +++ b/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml @@ -47,7 +47,12 @@ PropertiesChanged (a{sv} properties); ModemCapabilities readable u -The generic family of access technologies the modem supports. Not all capabilities are available at the same time however; some modems require a firmware reload or other reinitialization to switch between eg CDMA/EVDO and GSM/UMTS. + The generic family of access technologies the modem supports. Not all + capabilities are available at the same time however; some modems require a + firmware reload or other reinitialization to switch between eg CDMA/EVDO + and GSM/UMTS. + Returns: NMDeviceModemCapabilities + The "CurrentCapabilities" property @@ -55,7 +60,10 @@ ModemCapabilities readable u CurrentCapabilities readable u -The generic family of access technologies the modem currently supports without a firmware reload or reinitialization. + The generic family of access technologies the modem currently supports + without a firmware reload or reinitialization. + Returns: NMDeviceModemCapabilities + diff --git a/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml b/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml index 4a512547..8eae57ef 100644 --- a/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml +++ b/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml @@ -31,7 +31,8 @@ PropertiesChanged (a{sv} properties); -Emitted when the wireless device's properties changed. + Emitted when the wireless device's properties changed. + a{sv} properties: @@ -48,7 +49,8 @@ PropertiesChanged (a{sv} properties); HwAddress readable s -The hardware address of the device. + The hardware address of the device. + The "Companion" property @@ -56,7 +58,8 @@ HwAddress readable s Companion readable o -The object path of the companion device. + The object path of the companion device. + The "ActiveChannel" property @@ -64,7 +67,8 @@ Companion readable o ActiveChannel readable u -The currently active channel. + The currently active channel. + diff --git a/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml b/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml index a5a0697b..883c5d75 100644 --- a/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml +++ b/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml @@ -71,19 +71,39 @@ Reapply (IN a{sa{sv}} connection, IN t version_id, IN u flags); -Attempts to update the configuration of a device without deactivating it. NetworkManager has the concept of connections, which are profiles that contain the configuration for a networking device. Those connections are exposed via D-Bus as individual objects that can be created, modified and deleted. When activating such a settings-connection on a device, the settings-connection is cloned to become an applied-connection and used to configure the device (see GetAppliedConnection). Subsequent modification of the settings-connection don't propagate automatically to the device's applied-connection (with exception of the firewall-zone and the metered property). For the changes to take effect, you can either re-activate the settings-connection, or call Reapply. The Reapply call allows you to directly update the applied-connection and reconfigure the device. Reapply can also be useful if the currently applied-connection is equal to the connection that is about to be reapplied. This allows to reconfigure the device and revert external changes like removing or adding an IP address (which NetworkManager doesn't revert automatically because it is assumed that the user made these changes intentionally outside of NetworkManager). Reapply can make the applied-connection different from the settings-connection, just like updating the settings-connection can make them different. + Attempts to update the configuration of a device without deactivating it. + NetworkManager has the concept of connections, which are profiles that + contain the configuration for a networking device. Those connections are + exposed via D-Bus as individual objects that can be created, modified and + deleted. When activating such a settings-connection on a device, the + settings-connection is cloned to become an applied-connection and used to + configure the device (see GetAppliedConnection). Subsequent modification + of the settings-connection don't propagate automatically to the device's + applied-connection (with exception of the firewall-zone and the metered + property). For the changes to take effect, you can either re-activate the + settings-connection, or call Reapply. The Reapply call allows you to + directly update the applied-connection and reconfigure the device. Reapply + can also be useful if the currently applied-connection is equal to the + connection that is about to be reapplied. This allows to reconfigure the + device and revert external changes like removing or adding an IP address + (which NetworkManager doesn't revert automatically because it is assumed + that the user made these changes intentionally outside of NetworkManager). + Reapply can make the applied-connection different from the + settings-connection, just like updating the settings-connection can make + them different. + IN a{sa{sv}} connection: - The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarly differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses. + The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarly differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses. IN t version_id: - If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply. + If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply. IN u flags: - Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0. + Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0. @@ -95,11 +115,18 @@ GetAppliedConnection (IN u flags, OUT a{sa{sv}} connection, OUT t version_id); -Get the currently applied connection on the device. This is a snapshot of the last activated connection on the device, that is the configuration that is currently applied on the device. Usually this is the same as GetSettings of the referenced settings connection. However, it can differ if the settings connection was subsequently modified or the applied connection was modified by Reapply. The applied connection is set when activating a device or when calling Reapply. + Get the currently applied connection on the device. This is a snapshot of + the last activated connection on the device, that is the configuration + that is currently applied on the device. Usually this is the same as + GetSettings of the referenced settings connection. However, it can differ + if the settings connection was subsequently modified or the applied + connection was modified by Reapply. The applied connection is set when + activating a device or when calling Reapply. + IN u flags: - Flags which would modify the behavior of the GetAppliedConnection call. There are no flags defined currently and the users should use the value of 0. + Flags which would modify the behavior of the GetAppliedConnection call. There are no flags defined currently and the users should use the value of 0. OUT a{sa{sv}} connection: @@ -107,7 +134,7 @@ GetAppliedConnection (IN u flags, OUT t version_id: - The version-id of the currently applied connection. This can be specified during Reapply to avoid races where you first fetch the applied connection, modify it and try to reapply it. If the applied connection is modified in the meantime, the version_id gets incremented and Reapply will fail. + The version-id of the currently applied connection. This can be specified during Reapply to avoid races where you first fetch the applied connection, modify it and try to reapply it. If the applied connection is modified in the meantime, the version_id gets incremented and Reapply will fail. @@ -117,7 +144,9 @@ GetAppliedConnection (IN u flags, Disconnect (); -Disconnects a device and prevents the device from automatically activating further connections without user intervention. + Disconnects a device and prevents the device from automatically activating + further connections without user intervention. + The Delete() method @@ -125,7 +154,10 @@ Disconnect (); Delete (); -Deletes a software device from NetworkManager and removes the interface from the system. The method returns an error when called for a hardware device. + Deletes a software device from NetworkManager and removes the interface + from the system. The method returns an error when called for a hardware + device. + @@ -142,15 +174,15 @@ StateChanged (u new_state, u new_state: - The new state of the device. + (NMDeviceState) The new state of the device. u old_state: - The previous state of the device. + (NMDeviceState) The previous state of the device. u reason: - A reason for the state transition. + (NMDeviceStateReason) A reason for the state transition. @@ -163,7 +195,18 @@ StateChanged (u new_state, Udi readable s -Operating-system specific transient device hardware identifier. This is an opaque string representing the underlying hardware for the device, and shouldn't be used to keep track of individual devices. For some device types (Bluetooth, Modems) it is an identifier used by the hardware service (ie bluez or ModemManager) to refer to that device, and client programs use it get additional information from those services which NM does not provide. The Udi is not guaranteed to be consistent across reboots or hotplugs of the hardware. If you're looking for a way to uniquely track each device in your application, use the object path. If you're looking for a way to track a specific piece of hardware across reboot or hotplug, use a MAC address or USB serial number. + Operating-system specific transient device hardware identifier. This is an + opaque string representing the underlying hardware for the device, and + shouldn't be used to keep track of individual devices. For some device + types (Bluetooth, Modems) it is an identifier used by the hardware service + (ie bluez or ModemManager) to refer to that device, and client programs + use it get additional information from those services which NM does not + provide. The Udi is not guaranteed to be consistent across reboots or + hotplugs of the hardware. If you're looking for a way to uniquely track + each device in your application, use the object path. If you're looking + for a way to track a specific piece of hardware across reboot or hotplug, + use a MAC address or USB serial number. + The "Interface" property @@ -171,7 +214,8 @@ Udi readable s Interface readable s -The name of the device's control (and often data) interface. + The name of the device's control (and often data) interface. + The "IpInterface" property @@ -179,7 +223,11 @@ Interface readable s IpInterface readable s -The name of the device's data interface when available. This property may not refer to the actual data interface until the device has successfully established a data connection, indicated by the device's State becoming ACTIVATED. + The name of the device's data interface when available. This property may + not refer to the actual data interface until the device has successfully + established a data connection, indicated by the device's State becoming + ACTIVATED. + The "Driver" property @@ -187,7 +235,8 @@ IpInterface readable s Driver readable s -The driver handling the device. + The driver handling the device. + The "DriverVersion" property @@ -195,7 +244,8 @@ Driver readable s DriverVersion readable s -The version of the driver handling the device. + The version of the driver handling the device. + The "FirmwareVersion" property @@ -203,7 +253,8 @@ DriverVersion readable s FirmwareVersion readable s -The firmware version for the device. + The firmware version for the device. + The "Capabilities" property @@ -211,7 +262,9 @@ FirmwareVersion readable s Capabilities readable u -Flags describing the capabilities of the device. + Flags describing the capabilities of the device. + Returns: NMDeviceCapabilities + The "Ip4Address" property @@ -219,7 +272,9 @@ Capabilities readable u Ip4Address readable u -DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object instead. + DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object + instead. + The "State" property @@ -227,7 +282,9 @@ Ip4Address readable u State readable u -The current state of the device. + The current state of the device. + Returns: NMDeviceState + The "StateReason" property @@ -235,7 +292,9 @@ State readable u StateReason readable (uu) -The current state and reason for changing to that state. + The current state and reason for changing to that state. + Returns: A tuple of NMDeviceState and NMDeviceStateReason. + The "ActiveConnection" property @@ -243,7 +302,11 @@ StateReason readable (uu) ActiveConnection readable o -Object path of an ActiveConnection object that "owns" this device during activation. The ActiveConnection object tracks the life-cycle of a connection to a specific network and implements the org.freedesktop.NetworkManager.Connection.Active D-Bus interface. + Object path of an ActiveConnection object that "owns" this device during + activation. The ActiveConnection object tracks the life-cycle of a + connection to a specific network and implements the + org.freedesktop.NetworkManager.Connection.Active D-Bus interface. + The "Ip4Config" property @@ -251,7 +314,10 @@ ActiveConnection readable o Ip4Config readable o -Object path of the Ip4Config object describing the configuration of the device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state. + Object path of the Ip4Config object describing the configuration of the + device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED + state. + The "Dhcp4Config" property @@ -259,7 +325,10 @@ Ip4Config readable o Dhcp4Config readable o -Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state. + Object path of the Dhcp4Config object describing the DHCP options returned + by the DHCP server. Only valid when the device is in the + NM_DEVICE_STATE_ACTIVATED state. + The "Ip6Config" property @@ -267,7 +336,10 @@ Dhcp4Config readable o Ip6Config readable o -Object path of the Ip6Config object describing the configuration of the device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state. + Object path of the Ip6Config object describing the configuration of the + device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED + state. + The "Dhcp6Config" property @@ -275,7 +347,10 @@ Ip6Config readable o Dhcp6Config readable o -Object path of the Dhcp6Config object describing the DHCP options returned by the DHCP server. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state. + Object path of the Dhcp6Config object describing the DHCP options returned + by the DHCP server. Only valid when the device is in the + NM_DEVICE_STATE_ACTIVATED state. + The "Managed" property @@ -283,7 +358,11 @@ Dhcp6Config readable o Managed readwrite b -Whether or not this device is managed by NetworkManager. Setting this property has a similar effect to configuring the device as unmanaged via the keyfile.unmanaged-devices setting in NetworkManager.conf. Changes to this value are not persistent and lost after NetworkManager restart. + Whether or not this device is managed by NetworkManager. Setting this + property has a similar effect to configuring the device as unmanaged via + the keyfile.unmanaged-devices setting in NetworkManager.conf. Changes to + this value are not persistent and lost after NetworkManager restart. + The "Autoconnect" property @@ -291,7 +370,12 @@ Managed readwrite b Autoconnect readwrite b -If TRUE, indicates the device is allowed to autoconnect. If FALSE, manual intervention is required before the device will automatically connect to a known network, such as activating a connection using the device, or setting this property to TRUE. This property cannot be set to TRUE for default-unmanaged devices, since they never autoconnect. + If TRUE, indicates the device is allowed to autoconnect. If FALSE, manual + intervention is required before the device will automatically connect to a + known network, such as activating a connection using the device, or + setting this property to TRUE. This property cannot be set to TRUE for + default-unmanaged devices, since they never autoconnect. + The "FirmwareMissing" property @@ -299,7 +383,9 @@ Autoconnect readwrite b FirmwareMissing readable b -If TRUE, indicates the device is likely missing firmware necessary for its operation. + If TRUE, indicates the device is likely missing firmware necessary for its + operation. + The "NmPluginMissing" property @@ -307,7 +393,9 @@ FirmwareMissing readable b NmPluginMissing readable b -If TRUE, indicates the NetworkManager plugin for the device is likely missing or misconfigured. + If TRUE, indicates the NetworkManager plugin for the device is likely + missing or misconfigured. + The "DeviceType" property @@ -315,7 +403,9 @@ NmPluginMissing readable b DeviceType readable u -The general type of the network device; ie Ethernet, WiFi, etc. + The general type of the network device; ie Ethernet, WiFi, etc. + Returns: NMDeviceType + The "AvailableConnections" property @@ -323,7 +413,9 @@ DeviceType readable u AvailableConnections readable ao -An array of object paths of every configured connection that is currently 'available' through this device. + An array of object paths of every configured connection that is currently + 'available' through this device. + The "PhysicalPortId" property @@ -331,7 +423,11 @@ AvailableConnections readable ao PhysicalPortId readable s -If non-empty, an (opaque) indicator of the physical network port associated with the device. This can be used to recognize when two seemingly-separate hardware devices are actually just different virtual interfaces to the same physical port. + If non-empty, an (opaque) indicator of the physical network port + associated with the device. This can be used to recognize when two + seemingly-separate hardware devices are actually just different virtual + interfaces to the same physical port. + The "Mtu" property @@ -339,7 +435,8 @@ PhysicalPortId readable s Mtu readable u -The device MTU (maximum transmission unit). + The device MTU (maximum transmission unit). + The "Metered" property @@ -347,7 +444,10 @@ Mtu readable u Metered readable u -Whether the amount of traffic flowing through the device is subject to limitations, for example set by service providers. + Whether the amount of traffic flowing through the device is subject to + limitations, for example set by service providers. + Returns: NMMetered + The "LldpNeighbors" property @@ -355,7 +455,9 @@ Metered readable u LldpNeighbors readable aa{sv} -Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV names to variant boxed values. + Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV + names to variant boxed values. + The "Real" property @@ -363,7 +465,10 @@ LldpNeighbors readable aa{sv} Real readable b -True if the device exists, or False for placeholder devices that do not yet exist but could be automatically created by NetworkManager if one of their AvailableConnections was activated. + True if the device exists, or False for placeholder devices that do not + yet exist but could be automatically created by NetworkManager if one of + their AvailableConnections was activated. + diff --git a/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml b/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml index 6d6ae5aa..5fc0d238 100644 --- a/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml +++ b/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml @@ -48,7 +48,8 @@ PropertiesChanged (a{sv} properties); HwAddress readable s -Hardware address of the device. + Hardware address of the device. + The "Carrier" property @@ -56,7 +57,9 @@ HwAddress readable s Carrier readable b -Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + Indicates whether the physical carrier is found (e.g. whether a cable is + plugged in or not). + The "Slaves" property @@ -64,7 +67,9 @@ Carrier readable b Slaves readable ao -Array of object paths representing devices which are currently slaved to this device. + Array of object paths representing devices which are currently slaved to + this device. + diff --git a/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml b/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml index c676e395..11c71961 100644 --- a/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml +++ b/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml @@ -52,7 +52,8 @@ PropertiesChanged (a{sv} properties); Owner readable x -The uid of the tunnel owner, or -1 if it has no owner. + The uid of the tunnel owner, or -1 if it has no owner. + The "Group" property @@ -60,7 +61,8 @@ Owner readable x Group readable x -The gid of the tunnel group, or -1 if it has no owner. + The gid of the tunnel group, or -1 if it has no owner. + The "Mode" property @@ -68,7 +70,8 @@ Group readable x Mode readable s -The tunnel mode, either "tun" or "tap". + The tunnel mode, either "tun" or "tap". + The "NoPi" property @@ -76,7 +79,9 @@ Mode readable s NoPi readable b -The tunnel's "TUN_NO_PI" flag; true if no protocol info is prepended to the tunnel packets. + The tunnel's "TUN_NO_PI" flag; true if no protocol info is prepended to + the tunnel packets. + The "VnetHdr" property @@ -84,7 +89,9 @@ NoPi readable b VnetHdr readable b -The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets include a virtio network header. + The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets include a + virtio network header. + The "MultiQueue" property @@ -92,7 +99,9 @@ VnetHdr readable b MultiQueue readable b -The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to the tap device multiple times, for multiple send/receive queues. + The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to the tap + device multiple times, for multiple send/receive queues. + The "HwAddress" property @@ -100,7 +109,8 @@ MultiQueue readable b HwAddress readable s -Hardware address of the device. + Hardware address of the device. + diff --git a/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml b/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml index f1e1d03a..b097e4f7 100644 --- a/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml +++ b/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml @@ -46,7 +46,8 @@ PropertiesChanged (a{sv} properties); Peer readable o -The object path of the device's peer. + The object path of the device's peer. + diff --git a/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml b/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml index fd07a398..2d0f9cfd 100644 --- a/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml +++ b/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml @@ -49,7 +49,8 @@ PropertiesChanged (a{sv} properties); HwAddress readable s -Hardware address of the device. + Hardware address of the device. + The "Carrier" property @@ -57,7 +58,9 @@ HwAddress readable s Carrier readable b -Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + Indicates whether the physical carrier is found (e.g. whether a cable is + plugged in or not). + The "Parent" property @@ -65,7 +68,8 @@ Carrier readable b Parent readable o -Object path of the parent device of this VLAN device. + Object path of the parent device of this VLAN device. + The "VlanId" property @@ -73,7 +77,8 @@ Parent readable o VlanId readable u -The VLAN ID of this VLAN interface. + The VLAN ID of this VLAN interface. + diff --git a/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml b/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml index b755dcb2..b36a9f09 100644 --- a/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml +++ b/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml @@ -62,7 +62,9 @@ PropertiesChanged (a{sv} properties); Parent readable o -The object path of the parent device (if the VXLAN is not purely internal to this host). + The object path of the parent device (if the VXLAN is not purely internal + to this host). + The "HwAddress" property @@ -70,7 +72,8 @@ Parent readable o HwAddress readable s -Hardware address of the device. + Hardware address of the device. + The "Id" property @@ -78,7 +81,8 @@ HwAddress readable s Id readable u -The VXLAN Network Identifier (VNI). + The VXLAN Network Identifier (VNI). + The "Group" property @@ -86,7 +90,9 @@ Id readable u Group readable s -The IP (v4 or v6) multicast group used to communicate with other physical hosts on this VXLAN. + The IP (v4 or v6) multicast group used to communicate with other physical + hosts on this VXLAN. + The "Local" property @@ -94,7 +100,9 @@ Group readable s Local readable s -The local IPv4 or IPv6 address to use when sending VXLAN packets to other physical hosts. + The local IPv4 or IPv6 address to use when sending VXLAN packets to other + physical hosts. + The "Tos" property @@ -102,7 +110,9 @@ Local readable s Tos readable y -The value to use in the IP ToS field for VXLAN packets sent to other physical hosts. + The value to use in the IP ToS field for VXLAN packets sent to other + physical hosts. + The "Ttl" property @@ -110,7 +120,9 @@ Tos readable y Ttl readable y -The value to use in the IP TTL field for VXLAN packets sent to other physical hosts. + The value to use in the IP TTL field for VXLAN packets sent to other + physical hosts. + The "Learning" property @@ -118,7 +130,8 @@ Ttl readable y Learning readable b -True if the VXLAN dynamically learns remote IP addresses. + True if the VXLAN dynamically learns remote IP addresses. + The "Ageing" property @@ -126,7 +139,8 @@ Learning readable b Ageing readable u -The interval in seconds at which the kernel purges stale cached addresses. + The interval in seconds at which the kernel purges stale cached addresses. + The "Limit" property @@ -134,7 +148,9 @@ Ageing readable u Limit readable u -The maximum number of entries that can be added to the VXLAN's forwarding table. + The maximum number of entries that can be added to the VXLAN's forwarding + table. + The "DstPort" property @@ -142,7 +158,8 @@ Limit readable u DstPort readable q -Destination port for outgoing VXLAN packets. + Destination port for outgoing VXLAN packets. + The "SrcPortMin" property @@ -150,7 +167,8 @@ DstPort readable q SrcPortMin readable q -The lowest source port number to use for outgoing VXLAN packets. + The lowest source port number to use for outgoing VXLAN packets. + The "SrcPortMax" property @@ -158,7 +176,8 @@ SrcPortMin readable q SrcPortMax readable q -The highest source port number to use for outgoing VXLAN packets. + The highest source port number to use for outgoing VXLAN packets. + The "Proxy" property @@ -166,7 +185,8 @@ SrcPortMax readable q Proxy readable b -True if the VXLAN is implementing DOVE ARP proxying for remote clients. + True if the VXLAN is implementing DOVE ARP proxying for remote clients. + The "Rsc" property @@ -174,7 +194,9 @@ Proxy readable b Rsc readable b -True if the VXLAN is implementing DOVE route short-circuiting of known remote IP addresses. + True if the VXLAN is implementing DOVE route short-circuiting of known + remote IP addresses. + The "L2miss" property @@ -182,7 +204,8 @@ Rsc readable b L2miss readable b -True if the VXLAN will emit netlink notifications of L2 switch misses. + True if the VXLAN will emit netlink notifications of L2 switch misses. + The "L3miss" property @@ -190,7 +213,8 @@ L2miss readable b L3miss readable b -True if the VXLAN will emit netlink notifications of L3 switch misses. + True if the VXLAN will emit netlink notifications of L3 switch misses. + diff --git a/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml b/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml index 1951a6f5..9ba7807d 100644 --- a/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml +++ b/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml @@ -45,7 +45,11 @@ GetAccessPoints (OUT ao access_points); -DEPRECATED. Get the list of access points visible to this device. Note that this list does not include access points which hide their SSID. To retrieve a list of all access points (including hidden ones) use the GetAllAccessPoints() method. + DEPRECATED. Get the list of access points visible to this device. Note + that this list does not include access points which hide their SSID. To + retrieve a list of all access points (including hidden ones) use the + GetAllAccessPoints() method. + OUT ao access_points: @@ -59,7 +63,9 @@ GetAccessPoints (OUT ao access_points); GetAllAccessPoints (OUT ao access_points); -Get the list of all access points visible to this device, including hidden ones for which the SSID is not yet known. + Get the list of all access points visible to this device, including hidden + ones for which the SSID is not yet known. + OUT ao access_points: @@ -73,11 +79,12 @@ GetAllAccessPoints (OUT ao access_points); RequestScan (IN a{sv} options); -Request the device to scan + Request the device to scan + IN a{sv} options: - Options of scan. Currently 'ssids' option with value of "aay" type is supported. + Options of scan. Currently 'ssids' option with value of "aay" type is supported. @@ -90,7 +97,8 @@ RequestScan (IN a{sv} options); PropertiesChanged (a{sv} properties); -Emitted when the wireless device's properties changed. + Emitted when the wireless device's properties changed. + a{sv} properties: @@ -104,7 +112,8 @@ PropertiesChanged (a{sv} properties); AccessPointAdded (o access_point); -Emitted when a new access point is found by the device. + Emitted when a new access point is found by the device. + o access_point: @@ -118,7 +127,8 @@ AccessPointAdded (o access_point); AccessPointRemoved (o access_point); -Emitted when an access point disappears from view of the device. + Emitted when an access point disappears from view of the device. + o access_point: @@ -135,7 +145,8 @@ AccessPointRemoved (o access_point); HwAddress readable s -The active hardware address of the device. + The active hardware address of the device. + The "PermHwAddress" property @@ -143,7 +154,8 @@ HwAddress readable s PermHwAddress readable s -The permanent hardware address of the device. + The permanent hardware address of the device. + The "Mode" property @@ -151,7 +163,9 @@ PermHwAddress readable s Mode readable u -The operating mode of the wireless device. + The operating mode of the wireless device. + Returns: NM80211Mode + The "Bitrate" property @@ -159,7 +173,9 @@ Mode readable u Bitrate readable u -The bit rate currently used by the wireless device, in kilobits/second (Kb/s). + The bit rate currently used by the wireless device, in kilobits/second + (Kb/s). + The "AccessPoints" property @@ -167,7 +183,8 @@ Bitrate readable u AccessPoints readable ao -List of object paths of access point visible to this wireless device. + List of object paths of access point visible to this wireless device. + The "ActiveAccessPoint" property @@ -175,7 +192,8 @@ AccessPoints readable ao ActiveAccessPoint readable o -Object path of the access point currently used by the wireless device. + Object path of the access point currently used by the wireless device. + The "WirelessCapabilities" property @@ -183,7 +201,9 @@ ActiveAccessPoint readable o WirelessCapabilities readable u -The capabilities of the wireless device. + The capabilities of the wireless device. + Returns: NMDeviceWifiCapabilities + diff --git a/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml b/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml index 5ad7234a..4ecc776f 100644 --- a/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml +++ b/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml @@ -44,7 +44,8 @@ GetNspList (OUT ao nsps); -Get the list of NSPs visible to this device. + Get the list of NSPs visible to this device. + OUT ao nsps: @@ -61,7 +62,8 @@ GetNspList (OUT ao nsps); PropertiesChanged (a{sv} properties); -Emitted when the WiMax device's properties changed. + Emitted when the WiMax device's properties changed. + a{sv} properties: @@ -75,7 +77,8 @@ PropertiesChanged (a{sv} properties); NspAdded (o nsp); -Emitted when a new NSP is found by the device. + Emitted when a new NSP is found by the device. + o nsp: @@ -89,7 +92,8 @@ NspAdded (o nsp); NspRemoved (o nsp); -Emitted when an NSP disappears from view of the device. + Emitted when an NSP disappears from view of the device. + o nsp: @@ -106,7 +110,9 @@ NspRemoved (o nsp); Nsps readable ao -List of object paths of Network Service Providers (NSPs) visible to this WiMAX device. + List of object paths of Network Service Providers (NSPs) visible to this + WiMAX device. + The "HwAddress" property @@ -114,7 +120,8 @@ Nsps readable ao HwAddress readable s -Hardware address of the device. + Hardware address of the device. + The "CenterFrequency" property @@ -122,7 +129,10 @@ HwAddress readable s CenterFrequency readable u -Center frequency (in KHz) of the radio channel the device is using to communicate with the network when connected. Has no meaning when the device is not connected. + Center frequency (in KHz) of the radio channel the device is using to + communicate with the network when connected. Has no meaning when the + device is not connected. + The "Rssi" property @@ -130,7 +140,11 @@ CenterFrequency readable u Rssi readable i -RSSI of the current radio link in dBm. This value indicates how strong the raw received RF signal from the base station is, but does not indicate the overall quality of the radio link. Has no meaning when the device is not connected. + RSSI of the current radio link in dBm. This value indicates how strong the + raw received RF signal from the base station is, but does not indicate the + overall quality of the radio link. Has no meaning when the device is not + connected. + The "Cinr" property @@ -138,7 +152,10 @@ Rssi readable i Cinr readable i -CINR (Carrier to Interference + Noise Ratio) of the current radio link in dB. CINR is a more accurate measure of radio link quality. Has no meaning when the device is not connected. + CINR (Carrier to Interference + Noise Ratio) of the current radio link in + dB. CINR is a more accurate measure of radio link quality. Has no meaning + when the device is not connected. + The "TxPower" property @@ -146,7 +163,10 @@ Cinr readable i TxPower readable i -Average power of the last burst transmitted by the device, in units of 0.5 dBm. i.e. a TxPower of -11 represents an actual device TX power of -5.5 dBm. Has no meaning when the device is not connected. + Average power of the last burst transmitted by the device, in units of 0.5 + dBm. i.e. a TxPower of -11 represents an actual device TX power of -5.5 + dBm. Has no meaning when the device is not connected. + The "Bsid" property @@ -154,7 +174,9 @@ TxPower readable i Bsid readable s -The ID of the serving base station as received from the network. Has no meaning when the device is not connected. + The ID of the serving base station as received from the network. Has no + meaning when the device is not connected. + The "ActiveNsp" property @@ -162,7 +184,8 @@ Bsid readable s ActiveNsp readable o -Object path of the NSP currently used by the WiMax device. + Object path of the NSP currently used by the WiMax device. + diff --git a/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml b/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml index 5c144868..615ce6da 100644 --- a/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml +++ b/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml @@ -19,7 +19,8 @@ Description - Options and configuration returned by the IPv4 DHCP server. + Options and configuration returned by the IPv4 DHCP server. + Signal Details @@ -46,7 +47,8 @@ PropertiesChanged (a{sv} properties); Options readable a{sv} -Configuration options returned by a DHCP server, if any. + Configuration options returned by a DHCP server, if any. + diff --git a/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml b/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml index 65c12825..8931bb6e 100644 --- a/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml +++ b/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml @@ -19,7 +19,8 @@ Description - Options and configuration returned by the IPv6 DHCP server. + Options and configuration returned by the IPv6 DHCP server. + Signal Details @@ -46,7 +47,8 @@ PropertiesChanged (a{sv} properties); Options readable a{sv} -Configuration options returned by a DHCP server, if any. + Configuration options returned by a DHCP server, if any. + diff --git a/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml b/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml index 08ddf98a..4383ae42 100644 --- a/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml +++ b/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml @@ -55,7 +55,10 @@ PropertiesChanged (a{sv} properties); Addresses readable aau -Array of arrays of IPv4 address/prefix/gateway. All 3 elements of each array are in network byte order. Essentially: [(addr, prefix, gateway), (addr, prefix, gateway), ...] Deprecated: use AddressData and Gateway + Array of arrays of IPv4 address/prefix/gateway. All 3 elements of each + array are in network byte order. Essentially: [(addr, prefix, gateway), + (addr, prefix, gateway), ...] Deprecated: use AddressData and Gateway + The "AddressData" property @@ -63,7 +66,10 @@ Addresses readable aau AddressData readable aa{sv} -Array of IP address data objects. All addresses will include "address" (an IP address string), and "prefix" (a uint). Some addresses may include additional attributes. + Array of IP address data objects. All addresses will include "address" (an + IP address string), and "prefix" (a uint). Some addresses may include + additional attributes. + The "Gateway" property @@ -71,7 +77,8 @@ AddressData readable aa{sv} Gateway readable s -The gateway in use. + The gateway in use. + The "Routes" property @@ -79,7 +86,12 @@ Gateway readable s Routes readable aau -Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of each tuple are in network byte order. 'route' and 'next hop' are IPv4 addresses, while prefix and metric are simple unsigned integers. Essentially: [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), ...] Deprecated: use RouteData + Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of each tuple + are in network byte order. 'route' and 'next hop' are IPv4 addresses, + while prefix and metric are simple unsigned integers. Essentially: + [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), + ...] Deprecated: use RouteData + The "RouteData" property @@ -87,7 +99,10 @@ Routes readable aau RouteData readable aa{sv} -Array of IP route data objects. All routes will include "dest" (an IP address string) and "prefix" (a uint). Some routes may include "next-hop" (an IP address string), "metric" (a uint), and additional attributes. + Array of IP route data objects. All routes will include "dest" (an IP + address string) and "prefix" (a uint). Some routes may include "next-hop" + (an IP address string), "metric" (a uint), and additional attributes. + The "Nameservers" property @@ -95,7 +110,8 @@ RouteData readable aa{sv} Nameservers readable au -The nameservers in use. + The nameservers in use. + The "Domains" property @@ -103,7 +119,8 @@ Nameservers readable au Domains readable as -A list of domains this address belongs to. + A list of domains this address belongs to. + The "Searches" property @@ -111,7 +128,8 @@ Domains readable as Searches readable as -A list of dns searches. + A list of dns searches. + The "DnsOptions" property @@ -119,7 +137,9 @@ Searches readable as DnsOptions readable as -A list of DNS options that modify the behavior of the DNS resolver. See resolv.conf(5) manual page for the list of supported options. + A list of DNS options that modify the behavior of the DNS resolver. See + resolv.conf(5) manual page for the list of supported options. + The "WinsServers" property @@ -127,7 +147,9 @@ DnsOptions readable as WinsServers readable au -The Windows Internet Name Service servers associated with the connection. Each address is in network byte order. + The Windows Internet Name Service servers associated with the connection. + Each address is in network byte order. + diff --git a/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml b/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml index a0e327eb..80dd9b4f 100644 --- a/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml +++ b/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml @@ -54,7 +54,9 @@ PropertiesChanged (a{sv} properties); Addresses readable a(ayuay) -Array of tuples of IPv6 address/prefix/gateway. Deprecated: use AddressData and Gateway. + Array of tuples of IPv6 address/prefix/gateway. Deprecated: use + AddressData and Gateway. + The "AddressData" property @@ -62,7 +64,10 @@ Addresses readable a(ayuay) AddressData readable aa{sv} -Array of IP address data objects. All addresses will include "address" (an IP address string), and "prefix" (a uint). Some addresses may include additional attributes. + Array of IP address data objects. All addresses will include "address" (an + IP address string), and "prefix" (a uint). Some addresses may include + additional attributes. + The "Gateway" property @@ -70,7 +75,8 @@ AddressData readable aa{sv} Gateway readable s -The gateway in use. + The gateway in use. + The "Routes" property @@ -78,7 +84,8 @@ Gateway readable s Routes readable a(ayuayu) -Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData + Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData + The "RouteData" property @@ -86,7 +93,10 @@ Routes readable a(ayuayu) RouteData readable aa{sv} -Array of IP route data objects. All routes will include "dest" (an IP address string) and "prefix" (a uint). Some routes may include "next-hop" (an IP address string), "metric" (a uint), and additional attributes. + Array of IP route data objects. All routes will include "dest" (an IP + address string) and "prefix" (a uint). Some routes may include "next-hop" + (an IP address string), "metric" (a uint), and additional attributes. + The "Nameservers" property @@ -94,7 +104,8 @@ RouteData readable aa{sv} Nameservers readable aay -The nameservers in use. + The nameservers in use. + The "Domains" property @@ -102,7 +113,8 @@ Nameservers readable aay Domains readable as -A list of domains this address belongs to. + A list of domains this address belongs to. + The "Searches" property @@ -110,7 +122,8 @@ Domains readable as Searches readable as -A list of dns searches. + A list of dns searches. + The "DnsOptions" property @@ -118,7 +131,9 @@ Searches readable as DnsOptions readable as -A list of DNS options that modify the behavior of the DNS resolver. See resolv.conf(5) manual page for the list of supported options. + A list of DNS options that modify the behavior of the DNS resolver. See + resolv.conf(5) manual page for the list of supported options. + diff --git a/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml b/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml index 10cc472e..26b499bb 100644 --- a/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml +++ b/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml @@ -79,11 +79,12 @@ GetDevices (OUT ao devices); -Get the list of realized network devices. + Get the list of realized network devices. + OUT ao devices: - List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()). + List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()). @@ -93,11 +94,12 @@ GetDevices (OUT ao devices); GetAllDevices (OUT ao devices); -Get the list of all network devices. + Get the list of all network devices. + OUT ao devices: - List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated). + List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated). @@ -108,7 +110,10 @@ GetAllDevices (OUT ao devices); GetDeviceByIpIface (IN s iface, OUT o device); -Return the object path of the network device referenced by its IP interface name. Note that some devices (usually modems) only have an IP interface name when they are connected. + Return the object path of the network device referenced by its IP + interface name. Note that some devices (usually modems) only have an IP + interface name when they are connected. + IN s iface: @@ -129,19 +134,20 @@ ActivateConnection (IN o connection, IN o specific_object, OUT o active_connection); -Activate a connection using the supplied device. + Activate a connection using the supplied device. + IN o connection: - The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path. + The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path. IN o device: - The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use. + The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use. IN o specific_object: - The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device. + The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device. OUT o active_connection: @@ -159,11 +165,15 @@ AddAndActivateConnection (IN a{sa{sv}} connection, OUT o path, OUT o active_connection); -Adds a new connection using the given details (if any) as a template (automatically filling in missing settings with the capabilities of the given device and specific object), then activate the new connection. Cannot be used for VPN connections at this time. + Adds a new connection using the given details (if any) as a template + (automatically filling in missing settings with the capabilities of the + given device and specific object), then activate the new connection. + Cannot be used for VPN connections at this time. + IN a{sa{sv}} connection: - Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object. + Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object. IN o device: @@ -171,7 +181,7 @@ AddAndActivateConnection (IN a{sa{sv}} connection, IN o specific_object: - The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection. + The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection. OUT o path: @@ -189,7 +199,8 @@ AddAndActivateConnection (IN a{sa{sv}} connection, DeactivateConnection (IN o active_connection); -Deactivate an active connection. + Deactivate an active connection. + IN o active_connection: @@ -203,7 +214,11 @@ DeactivateConnection (IN o active_connection); Sleep (IN b sleep); -Control the NetworkManager daemon's sleep state. When asleep, all interfaces that it manages are deactivated. When awake, devices are available to be activated. This command should not be called directly by users or clients; it is intended for system suspend/resume tracking. + Control the NetworkManager daemon's sleep state. When asleep, all + interfaces that it manages are deactivated. When awake, devices are + available to be activated. This command should not be called directly by + users or clients; it is intended for system suspend/resume tracking. + IN b sleep: @@ -217,11 +232,16 @@ Sleep (IN b sleep); Enable (IN b enable); -Control whether overall networking is enabled or disabled. When disabled, all interfaces that NM manages are deactivated. When enabled, all managed interfaces are re-enabled and available to be activated. This command should be used by clients that provide to users the ability to enable/disable all networking. + Control whether overall networking is enabled or disabled. When disabled, + all interfaces that NM manages are deactivated. When enabled, all managed + interfaces are re-enabled and available to be activated. This command + should be used by clients that provide to users the ability to + enable/disable all networking. + IN b enable: - If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices. + If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices. @@ -231,11 +251,14 @@ Enable (IN b enable); GetPermissions (OUT a{ss} permissions); -Returns the permissions a caller has for various authenticated operations that NetworkManager provides, like Enable/Disable networking, changing WiFi, WWAN, and WiMAX state, etc. + Returns the permissions a caller has for various authenticated operations + that NetworkManager provides, like Enable/Disable networking, changing + WiFi, WWAN, and WiMAX state, etc. + OUT a{ss} permissions: - Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations. + Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations. @@ -246,15 +269,16 @@ GetPermissions (OUT a{ss} permissions); SetLogging (IN s level, IN s domains); -Set logging verbosity and which operations are logged. + Set logging verbosity and which operations are logged. + IN s level: - One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain. + One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain. IN s domains: - A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged. + A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged. @@ -265,7 +289,8 @@ SetLogging (IN s level, GetLogging (OUT s level, OUT s domains); -Get current logging verbosity level and operations domains. + Get current logging verbosity level and operations domains. + OUT s level: @@ -283,11 +308,12 @@ GetLogging (OUT s level, CheckConnectivity (OUT u connectivity); -Re-check the network connectivity state. + Re-check the network connectivity state. + OUT u connectivity: - The current connectivity state. + (NMConnectivityState) The current connectivity state. @@ -297,11 +323,13 @@ CheckConnectivity (OUT u connectivity); state (OUT u state); -The overall networking state as determined by the NetworkManager daemon, based on the state of network devices under it's management. + The overall networking state as determined by the NetworkManager daemon, + based on the state of network devices under it's management. + OUT u state: - + NMState @@ -314,7 +342,9 @@ state (OUT u state); CheckPermissions (); -Emitted when system authorization details change, indicating that clients may wish to recheck permissions with GetPermissions. + Emitted when system authorization details change, indicating that clients + may wish to recheck permissions with GetPermissions. + The "StateChanged" signal @@ -322,11 +352,12 @@ CheckPermissions (); StateChanged (u state); -NetworkManager's state changed. + NetworkManager's state changed. + u state: - The new state of NetworkManager. + (NMState) The new state of NetworkManager. @@ -336,7 +367,8 @@ StateChanged (u state); PropertiesChanged (a{sv} properties); -NetworkManager's properties changed. + NetworkManager's properties changed. + a{sv} properties: @@ -350,7 +382,8 @@ PropertiesChanged (a{sv} properties); DeviceAdded (o device_path); -A device was added to the system + A device was added to the system + o device_path: @@ -364,7 +397,8 @@ DeviceAdded (o device_path); DeviceRemoved (o device_path); -A device was removed from the system, and is no longer available. + A device was removed from the system, and is no longer available. + o device_path: @@ -381,7 +415,10 @@ DeviceRemoved (o device_path); Devices readable ao -The list of realized network devices. Realized devices are those which have backing resources (eg from the kernel or a management daemon like ModemManager, teamd, etc). + The list of realized network devices. Realized devices are those which + have backing resources (eg from the kernel or a management daemon like + ModemManager, teamd, etc). + The "AllDevices" property @@ -389,7 +426,10 @@ Devices readable ao AllDevices readable ao -The list of both realized and un-realized network devices. Un-realized devices are software devices which do not yet have backing resources, but for which backing resources can be created if the device is activated. + The list of both realized and un-realized network devices. Un-realized + devices are software devices which do not yet have backing resources, but + for which backing resources can be created if the device is activated. + The "NetworkingEnabled" property @@ -397,7 +437,9 @@ AllDevices readable ao NetworkingEnabled readable b -Indicates if overall networking is currently enabled or not. See the Enable() method. + Indicates if overall networking is currently enabled or not. See the + Enable() method. + The "WirelessEnabled" property @@ -405,7 +447,8 @@ NetworkingEnabled readable b WirelessEnabled readwrite b -Indicates if wireless is currently enabled or not. + Indicates if wireless is currently enabled or not. + The "WirelessHardwareEnabled" property @@ -413,7 +456,9 @@ WirelessEnabled readwrite b WirelessHardwareEnabled readable b -Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch. + Indicates if the wireless hardware is currently enabled, i.e. the state of + the RF kill switch. + The "WwanEnabled" property @@ -421,7 +466,8 @@ WirelessHardwareEnabled readable b WwanEnabled readwrite b -Indicates if mobile broadband devices are currently enabled or not. + Indicates if mobile broadband devices are currently enabled or not. + The "WwanHardwareEnabled" property @@ -429,7 +475,9 @@ WwanEnabled readwrite b WwanHardwareEnabled readable b -Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch. + Indicates if the mobile broadband hardware is currently enabled, i.e. the + state of the RF kill switch. + The "WimaxEnabled" property @@ -437,7 +485,8 @@ WwanHardwareEnabled readable b WimaxEnabled readwrite b -Indicates if WiMAX devices are currently enabled or not. + Indicates if WiMAX devices are currently enabled or not. + The "WimaxHardwareEnabled" property @@ -445,7 +494,9 @@ WimaxEnabled readwrite b WimaxHardwareEnabled readable b -Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch. + Indicates if the WiMAX hardware is currently enabled, i.e. the state of + the RF kill switch. + The "ActiveConnections" property @@ -453,7 +504,8 @@ WimaxHardwareEnabled readable b ActiveConnections readable ao -List of active connection object paths. + List of active connection object paths. + The "PrimaryConnection" property @@ -461,7 +513,12 @@ ActiveConnections readable ao PrimaryConnection readable o -The object path of the "primary" active connection being used to access the network. In particular, if there is no VPN active, or the VPN does not have the default route, then this indicates the connection that has the default route. If there is a VPN active with the default route, then this indicates the connection that contains the route to the VPN endpoint. + The object path of the "primary" active connection being used to access + the network. In particular, if there is no VPN active, or the VPN does not + have the default route, then this indicates the connection that has the + default route. If there is a VPN active with the default route, then this + indicates the connection that contains the route to the VPN endpoint. + The "PrimaryConnectionType" property @@ -469,7 +526,10 @@ PrimaryConnection readable o PrimaryConnectionType readable s -The connection type of the "primary" active connection being used to access the network. This is the same as the Type property on the object indicated by PrimaryConnection. + The connection type of the "primary" active connection being used to + access the network. This is the same as the Type property on the object + indicated by PrimaryConnection. + The "Metered" property @@ -477,7 +537,10 @@ PrimaryConnectionType readable s Metered readable u -Indicates whether the connectivity is metered. This is equivalent to the metered property of the device associated with the primary connection. + Indicates whether the connectivity is metered. This is equivalent to the + metered property of the device associated with the primary connection. + Returns: NMMetered + The "ActivatingConnection" property @@ -485,7 +548,10 @@ Metered readable u ActivatingConnection readable o -The object path of an active connection that is currently being activated and which is expected to become the new PrimaryConnection when it finishes activating. + The object path of an active connection that is currently being activated + and which is expected to become the new PrimaryConnection when it finishes + activating. + The "Startup" property @@ -493,7 +559,10 @@ ActivatingConnection readable o Startup readable b -Indicates whether NM is still starting up; this becomes FALSE when NM has finished attempting to activate every connection that it might be able to activate at startup. + Indicates whether NM is still starting up; this becomes FALSE when NM has + finished attempting to activate every connection that it might be able to + activate at startup. + The "Version" property @@ -501,7 +570,8 @@ Startup readable b Version readable s -NetworkManager version. + NetworkManager version. + The "State" property @@ -509,7 +579,9 @@ Version readable s State readable u -The overall state of the NetworkManager daemon. + The overall state of the NetworkManager daemon. + Returns: NMState + The "Connectivity" property @@ -517,7 +589,9 @@ State readable u Connectivity readable u -The network connectivity state. + The network connectivity state. + Returns: NMConnectivityState + The "GlobalDnsConfiguration" property @@ -525,7 +599,15 @@ Connectivity readable u GlobalDnsConfiguration readwrite a{sv} -Dictionary of global DNS settings where the key is one of "searches", "options" and "domains". The values for the "searches" and "options" keys are string arrays describing the list of search domains and resolver options, respectively. The value of the "domains" key is a second-level dictionary, where each key is a domain name, and each key's value is a third-level dictionary with the keys "servers" and "options". "servers" is a string array of DNS servers, "options" is a string array of domain-specific options. + Dictionary of global DNS settings where the key is one of "searches", + "options" and "domains". The values for the "searches" and "options" keys + are string arrays describing the list of search domains and resolver + options, respectively. The value of the "domains" key is a second-level + dictionary, where each key is a domain name, and each key's value is a + third-level dictionary with the keys "servers" and "options". "servers" is + a string array of DNS servers, "options" is a string array of + domain-specific options. + diff --git a/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml b/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml index 36a683d6..0a77ec15 100644 --- a/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml +++ b/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml @@ -24,7 +24,16 @@ Description - Private D-Bus interface used by secret agents that store and provide secrets to NetworkManager. If an agent provides secrets to NetworkManager as part of connection creation, and the some of those secrets are "agent owned" the agent should store those secrets itself and should not expect its SaveSecrets() method to be called. SaveSecrets() will be called eg if some program other than the agent itself (like a connection editor) changes the secrets out of band. The agent should implement this D-Bus interface on an object with the path /org/freedesktop/NetworkManager/SecretAgent. + Private D-Bus interface used by secret agents that store and provide + secrets to NetworkManager. If an agent provides secrets to NetworkManager + as part of connection creation, and the some of those secrets are "agent + owned" the agent should store those secrets itself and should not expect + its SaveSecrets() method to be called. SaveSecrets() will be called eg if + some program other than the agent itself (like a connection editor) + changes the secrets out of band. The agent should implement this D-Bus + interface on an object with the path + /org/freedesktop/NetworkManager/SecretAgent. + Method Details @@ -39,15 +48,22 @@ GetSecrets (IN a{sa{sv}} connection, IN u flags, OUT a{sa{sv}} secrets); -Retrieve and return stored secrets, if any, or request new secrets from the agent's user. If user interaction is allowed and the user enters new secrets, the agent is expected to save the new secrets to persistent storage (if the secret's flags include AGENT_OWNED) as NetworkManager will not send these secrets back to the same agent via a SaveSecrets() call. If the user canceled any interaction, the agent should return the UserCanceled error (see below). + Retrieve and return stored secrets, if any, or request new secrets from + the agent's user. If user interaction is allowed and the user enters new + secrets, the agent is expected to save the new secrets to persistent + storage (if the secret's flags include AGENT_OWNED) as NetworkManager will + not send these secrets back to the same agent via a SaveSecrets() call. If + the user canceled any interaction, the agent should return the + UserCanceled error (see below). + IN a{sa{sv}} connection: - Nested settings maps containing the connection for which secrets are being requested. This may contain system-owned secrets if the agent has successfully authenticated to modify system network settings and the GetSecrets request flags allow user interaction. + Nested settings maps containing the connection for which secrets are being requested. This may contain system-owned secrets if the agent has successfully authenticated to modify system network settings and the GetSecrets request flags allow user interaction. IN o connection_path: - Object path of the connection for which secrets are being requested. + Object path of the connection for which secrets are being requested. IN s setting_name: @@ -55,15 +71,15 @@ GetSecrets (IN a{sa{sv}} connection, IN as hints: - Array of strings of key names in the requested setting for which NetworkManager thinks a secrets may be required, and/or well-known identifiers and data that may be useful to the client in processing the secrets request. Note that it's not always possible to determine which secret is required, so in some cases no hints may be given. The Agent should return any secrets it has, or that it thinks are required, regardless of what hints NetworkManager sends in this request. Some hints have special prefixes that provide information to the agent; for example, VPN requests may send server-specific messages prefixed with "x-vpn-message:". + Array of strings of key names in the requested setting for which NetworkManager thinks a secrets may be required, and/or well-known identifiers and data that may be useful to the client in processing the secrets request. Note that it's not always possible to determine which secret is required, so in some cases no hints may be given. The Agent should return any secrets it has, or that it thinks are required, regardless of what hints NetworkManager sends in this request. Some hints have special prefixes that provide information to the agent; for example, VPN requests may send server-specific messages prefixed with "x-vpn-message:". IN u flags: - Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user. + (NMSecretAgentGetSecretsFlags) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user. OUT a{sa{sv}} secrets: - Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets. + Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets. @@ -74,15 +90,18 @@ GetSecrets (IN a{sa{sv}} connection, CancelGetSecrets (IN o connection_path, IN s setting_name); -Cancel a pending GetSecrets request for secrets of the given connection. Any GetSecrets request with the same 'connection_path' and 'setting_name' that are given in a CancelGetSecrets request should be canceled. + Cancel a pending GetSecrets request for secrets of the given connection. + Any GetSecrets request with the same 'connection_path' and 'setting_name' + that are given in a CancelGetSecrets request should be canceled. + IN o connection_path: - Object path of the connection for which, if secrets for the given 'setting_name' are being requested, the request should be canceled. + Object path of the connection for which, if secrets for the given 'setting_name' are being requested, the request should be canceled. IN s setting_name: - Setting name for which secrets for this connection were originally being requested. + Setting name for which secrets for this connection were originally being requested. @@ -93,15 +112,16 @@ CancelGetSecrets (IN o connection_path, SaveSecrets (IN a{sa{sv}} connection, IN o connection_path); -Save given secrets to backing storage. + Save given secrets to backing storage. + IN a{sa{sv}} connection: - Nested settings maps containing the entire connection (including secrets), for which the agent should save the secrets to backing storage. This method will not be called when the agent itself is the process creating or updating a connection; in that case the agent is assumed to have already saved those secrets since it had them already. + Nested settings maps containing the entire connection (including secrets), for which the agent should save the secrets to backing storage. This method will not be called when the agent itself is the process creating or updating a connection; in that case the agent is assumed to have already saved those secrets since it had them already. IN o connection_path: - Object path of the connection for which the agent should save secrets to backing storage. + Object path of the connection for which the agent should save secrets to backing storage. @@ -112,15 +132,16 @@ SaveSecrets (IN a{sa{sv}} connection, DeleteSecrets (IN a{sa{sv}} connection, IN o connection_path); -Delete secrets from backing storage. + Delete secrets from backing storage. + IN a{sa{sv}} connection: - Nested settings maps containing the connection properties (sans secrets), for which the agent should delete the secrets from backing storage. + Nested settings maps containing the connection properties (sans secrets), for which the agent should delete the secrets from backing storage. IN o connection_path: - Object path of the connection for which the agent should delete secrets from backing storage. + Object path of the connection for which the agent should delete secrets from backing storage. diff --git a/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml b/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml index f5dd15ff..d2bb83f5 100644 --- a/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml +++ b/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml @@ -34,7 +34,8 @@ Description - Represents a single network connection configuration. + Represents a single network connection configuration. + Method Details @@ -44,7 +45,12 @@ Update (IN a{sa{sv}} properties); -Update the connection with new settings and properties (replacing all previous settings and properties) and save the connection to disk. Secrets may be part of the update request, and will be either stored in persistent storage or sent to a Secret Agent for storage, depending on the flags associated with each secret. + Update the connection with new settings and properties (replacing all + previous settings and properties) and save the connection to disk. Secrets + may be part of the update request, and will be either stored in persistent + storage or sent to a Secret Agent for storage, depending on the flags + associated with each secret. + IN a{sa{sv}} properties: @@ -58,7 +64,15 @@ Update (IN a{sa{sv}} properties); UpdateUnsaved (IN a{sa{sv}} properties); -Update the connection with new settings and properties (replacing all previous settings and properties) but do not immediately save the connection to disk. Secrets may be part of the update request and may sent to a Secret Agent for storage, depending on the flags associated with each secret. Use the 'Save' method to save these changes to disk. Note that unsaved changes will be lost if the connection is reloaded from disk (either automatically on file change or due to an explicit ReloadConnections call). + Update the connection with new settings and properties (replacing all + previous settings and properties) but do not immediately save the + connection to disk. Secrets may be part of the update request and may sent + to a Secret Agent for storage, depending on the flags associated with each + secret. Use the 'Save' method to save these changes to disk. Note that + unsaved changes will be lost if the connection is reloaded from disk + (either automatically on file change or due to an explicit + ReloadConnections call). + IN a{sa{sv}} properties: @@ -72,7 +86,8 @@ UpdateUnsaved (IN a{sa{sv}} properties); Delete (); -Delete the connection. + Delete the connection. + The GetSettings() method @@ -80,7 +95,11 @@ Delete (); GetSettings (OUT a{sa{sv}} settings); -Get the settings maps describing this network configuration. This will never include any secrets required for connection to the network, as those are often protected. Secrets must be requested separately using the GetSecrets() call. + Get the settings maps describing this network configuration. This will + never include any secrets required for connection to the network, as those + are often protected. Secrets must be requested separately using the + GetSecrets() call. + OUT a{sa{sv}} settings: @@ -95,11 +114,15 @@ GetSettings (OUT a{sa{sv}} settings); GetSecrets (IN s setting_name, OUT a{sa{sv}} secrets); -Get the secrets belonging to this network configuration. Only secrets from persistent storage or a Secret Agent running in the requestor's session will be returned. The user will never be prompted for secrets as a result of this request. + Get the secrets belonging to this network configuration. Only secrets from + persistent storage or a Secret Agent running in the requestor's session + will be returned. The user will never be prompted for secrets as a result + of this request. + IN s setting_name: - Name of the setting to return secrets for. If empty, all all secrets will be returned. + Name of the setting to return secrets for. If empty, all all secrets will be returned. OUT a{sa{sv}} secrets: @@ -113,7 +136,8 @@ GetSecrets (IN s setting_name, ClearSecrets (); -Clear the secrets belonging to this network connection profile. + Clear the secrets belonging to this network connection profile. + The Save() method @@ -121,7 +145,9 @@ ClearSecrets (); Save (); -Saves a "dirty" connection (that had previously been updated with UpdateUnsaved) to persistent storage. + Saves a "dirty" connection (that had previously been updated with + UpdateUnsaved) to persistent storage. + @@ -132,7 +158,11 @@ Save (); Updated (); -Emitted when any settings or permissions change. When handling this signal, clients should re-read the connection using the GetSettings method to get the changes and to ensure the client still has permission to access the connection. + Emitted when any settings or permissions change. When handling this + signal, clients should re-read the connection using the GetSettings method + to get the changes and to ensure the client still has permission to access + the connection. + The "Removed" signal @@ -140,7 +170,11 @@ Updated (); Removed (); -Emitted when this connection is no longer available. This happens when the connection is deleted or if it is no longer accessible by any of the system's logged-in users. After receipt of this signal, the object no longer exists. Also see the Settings.ConnectionRemoved signal. + Emitted when this connection is no longer available. This happens when the + connection is deleted or if it is no longer accessible by any of the + system's logged-in users. After receipt of this signal, the object no + longer exists. Also see the Settings.ConnectionRemoved signal. + The "PropertiesChanged" signal @@ -165,7 +199,11 @@ PropertiesChanged (a{sv} properties); Unsaved readable b -If set, indicates that the in-memory state of the connection does not match the on-disk state. This flag will be set when UpdateUnsaved() is called or when any connection details change, and cleared when the connection is saved to disk via Save() or from internal operations. + If set, indicates that the in-memory state of the connection does not + match the on-disk state. This flag will be set when UpdateUnsaved() is + called or when any connection details change, and cleared when the + connection is saved to disk via Save() or from internal operations. + diff --git a/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml b/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml index 0481b710..1186064b 100644 --- a/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml +++ b/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml @@ -40,7 +40,9 @@ Description - The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager. + The Settings interface allows clients to view and administrate the + connections stored and used by NetworkManager. + Method Details @@ -50,7 +52,8 @@ ListConnections (OUT ao connections); -List the saved network connections known to NetworkManager. + List the saved network connections known to NetworkManager. + OUT ao connections: @@ -65,7 +68,8 @@ ListConnections (OUT ao connections); GetConnectionByUuid (IN s uuid, OUT o connection); -Retrieve the object path of a connection, given that connection's UUID. + Retrieve the object path of a connection, given that connection's UUID. + IN s uuid: @@ -84,7 +88,11 @@ GetConnectionByUuid (IN s uuid, AddConnection (IN a{sa{sv}} connection, OUT o path); -Add new connection and save it to disk. This operation does not start the network connection unless (1) device is idle and able to connect to the network described by the new connection, and (2) the connection is allowed to be started automatically. + Add new connection and save it to disk. This operation does not start the + network connection unless (1) device is idle and able to connect to the + network described by the new connection, and (2) the connection is allowed + to be started automatically. + IN a{sa{sv}} connection: @@ -103,7 +111,14 @@ AddConnection (IN a{sa{sv}} connection, AddConnectionUnsaved (IN a{sa{sv}} connection, OUT o path); -Add new connection but do not save it to disk immediately. This operation does not start the network connection unless (1) device is idle and able to connect to the network described by the new connection, and (2) the connection is allowed to be started automatically. Use the 'Save' method on the connection to save these changes to disk. Note that unsaved changes will be lost if the connection is reloaded from disk (either automatically on file change or due to an explicit ReloadConnections call). + Add new connection but do not save it to disk immediately. This operation + does not start the network connection unless (1) device is idle and able + to connect to the network described by the new connection, and (2) the + connection is allowed to be started automatically. Use the 'Save' method + on the connection to save these changes to disk. Note that unsaved changes + will be lost if the connection is reloaded from disk (either automatically + on file change or due to an explicit ReloadConnections call). + IN a{sa{sv}} connection: @@ -123,15 +138,21 @@ LoadConnections (IN as filenames, OUT b status, OUT as failures); -Loads or reloads the indicated connections from disk. You should call this after making changes directly to an on-disk connection file to make sure that NetworkManager sees the changes. (If "monitor-connection-files" in NetworkManager.conf is "true", then this will have no real effect, but is harmless.) As with AddConnection(), this operation does not necessarily start the network connection. + Loads or reloads the indicated connections from disk. You should call this + after making changes directly to an on-disk connection file to make sure + that NetworkManager sees the changes. (If "monitor-connection-files" in + NetworkManager.conf is "true", then this will have no real effect, but is + harmless.) As with AddConnection(), this operation does not necessarily + start the network connection. + IN as filenames: - Array of paths to on-disk connection profiles in directories monitored by NetworkManager. + Array of paths to on-disk connection profiles in directories monitored by NetworkManager. OUT b status: - Success or failure of the operation as a whole. True if NetworkManager at least tried to load the indicated connections, even if it did not succeed. False if an error occurred before trying to load the connections (eg, permission denied). + Success or failure of the operation as a whole. True if NetworkManager at least tried to load the indicated connections, even if it did not succeed. False if an error occurred before trying to load the connections (eg, permission denied). OUT as failures: @@ -145,7 +166,12 @@ LoadConnections (IN as filenames, ReloadConnections (OUT b status); -Tells NetworkManager to reload all connection files from disk, including noticing any added or deleted connection files. By default, connections are re-read automatically any time they change, so you only need to use this command if you have set "monitor-connection-files=false" in NetworkManager.conf. + Tells NetworkManager to reload all connection files from disk, including + noticing any added or deleted connection files. By default, connections + are re-read automatically any time they change, so you only need to use + this command if you have set "monitor-connection-files=false" in + NetworkManager.conf. + OUT b status: @@ -159,11 +185,12 @@ ReloadConnections (OUT b status); SaveHostname (IN s hostname); -Save the hostname to persistent configuration. + Save the hostname to persistent configuration. + IN s hostname: - The hostname to save to persistent configuration. If blank, the persistent hostname is cleared. + The hostname to save to persistent configuration. If blank, the persistent hostname is cleared. @@ -190,7 +217,15 @@ PropertiesChanged (a{sv} properties); NewConnection (o connection); -Emitted when a new connection has been added after NetworkManager has started up and initialized. This signal is not emitted for connections read while starting up, because NetworkManager's D-Bus service is only available after all connections have been read, and to prevent spamming listeners with too many signals at one time. To retrieve the initial connection list, call the ListConnections() method once, and then listen for individual Settings.NewConnection and Settings.Connection.Deleted signals for further updates. + Emitted when a new connection has been added after NetworkManager has + started up and initialized. This signal is not emitted for connections + read while starting up, because NetworkManager's D-Bus service is only + available after all connections have been read, and to prevent spamming + listeners with too many signals at one time. To retrieve the initial + connection list, call the ListConnections() method once, and then listen + for individual Settings.NewConnection and Settings.Connection.Deleted + signals for further updates. + o connection: @@ -204,7 +239,12 @@ NewConnection (o connection); ConnectionRemoved (o connection); -Emitted when a connection is no longer available. This happens when the connection is deleted or if it is no longer accessible by any of the system's logged-in users. After receipt of this signal, the connection no longer exists and cannot be used. Also see the Settings.Connection.Removed signal. + Emitted when a connection is no longer available. This happens when the + connection is deleted or if it is no longer accessible by any of the + system's logged-in users. After receipt of this signal, the connection no + longer exists and cannot be used. Also see the Settings.Connection.Removed + signal. + o connection: @@ -221,7 +261,8 @@ ConnectionRemoved (o connection); Connections readable ao -List of object paths of available network connection profiles. + List of object paths of available network connection profiles. + The "Hostname" property @@ -229,7 +270,8 @@ Connections readable ao Hostname readable s -The machine hostname stored in persistent configuration. + The machine hostname stored in persistent configuration. + The "CanModify" property @@ -237,7 +279,8 @@ Hostname readable s CanModify readable b -If true, adding and modifying connections is supported. + If true, adding and modifying connections is supported. + diff --git a/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml b/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml index b52c7409..74964757 100644 --- a/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml +++ b/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml @@ -22,7 +22,8 @@ Description - Represents an active connection to a Virtual Private Network. + Represents an active connection to a Virtual Private Network. + Signal Details @@ -47,15 +48,16 @@ PropertiesChanged (a{sv} properties); VpnStateChanged (u state, u reason); -Emitted when the state of the VPN connection has changed. + Emitted when the state of the VPN connection has changed. + u state: - The new state of the VPN connection. + (NMVpnConnectionState) The new state of the VPN connection. u reason: - Reason code describing the change to the new state. + (NMVpnConnectionStateReason) Reason code describing the change to the new state. @@ -68,7 +70,9 @@ VpnStateChanged (u state, VpnState readable u -The VPN-specific state of the connection. + The VPN-specific state of the connection. + Returns: NMVpnConnectionState + The "Banner" property @@ -76,7 +80,8 @@ VpnState readable u Banner readable s -The banner string of the VPN connection. + The banner string of the VPN connection. + diff --git a/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml b/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml index a3c249b0..80eaebc3 100644 --- a/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml +++ b/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml @@ -42,7 +42,9 @@ Description - This interface is provided by plugins providing VPN services to the NetworkManager daemon. + This interface is provided by plugins providing VPN services to the + NetworkManager daemon. + Method Details @@ -52,7 +54,9 @@ Connect (IN a{sa{sv}} connection); -Tells the plugin to connect. Interactive secrets requests (eg, emitting the SecretsRequired signal) are not allowed. + Tells the plugin to connect. Interactive secrets requests (eg, emitting + the SecretsRequired signal) are not allowed. + IN a{sa{sv}} connection: @@ -67,7 +71,10 @@ Connect (IN a{sa{sv}} connection); ConnectInteractive (IN a{sa{sv}} connection, IN a{sv} details); -Tells the plugin to connect, allowing interactive secrets requests (eg the plugin is allowed to emit the SecretsRequired signal if the VPN service indicates that it needs additional secrets during the connect process). + Tells the plugin to connect, allowing interactive secrets requests (eg the + plugin is allowed to emit the SecretsRequired signal if the VPN service + indicates that it needs additional secrets during the connect process). + IN a{sa{sv}} connection: @@ -86,7 +93,9 @@ ConnectInteractive (IN a{sa{sv}} connection, NeedSecrets (IN a{sa{sv}} settings, OUT s setting_name); -Asks the plugin whether the provided connection will require secrets to connect successfully. + Asks the plugin whether the provided connection will require secrets to + connect successfully. + IN a{sa{sv}} settings: @@ -104,7 +113,8 @@ NeedSecrets (IN a{sa{sv}} settings, Disconnect (); -Disconnect the plugin. + Disconnect the plugin. + The SetConfig() method @@ -112,7 +122,8 @@ Disconnect (); SetConfig (IN a{sv} config); -Set generic connection details on the connection. + Set generic connection details on the connection. + IN a{sv} config: @@ -126,11 +137,12 @@ SetConfig (IN a{sv} config); SetIp4Config (IN a{sv} config); -Set IPv4 details on the connection. + Set IPv4 details on the connection. + IN a{sv} config: - Ip4Config details for the connection. You must call SetConfig() before calling this. + Ip4Config details for the connection. You must call SetConfig() before calling this. @@ -140,11 +152,12 @@ SetIp4Config (IN a{sv} config); SetIp6Config (IN a{sv} config); -Set IPv6 details on the connection. + Set IPv6 details on the connection. + IN a{sv} config: - Ip6Config details for the connection. You must call SetConfig() before calling this. + Ip6Config details for the connection. You must call SetConfig() before calling this. @@ -154,7 +167,8 @@ SetIp6Config (IN a{sv} config); SetFailure (IN s reason); -Indicate a failure to the plugin. + Indicate a failure to the plugin. + IN s reason: @@ -168,7 +182,9 @@ SetFailure (IN s reason); NewSecrets (IN a{sa{sv}} connection); -Called in response to a SecretsRequired signal to deliver updated secrets or other information to the plugin. + Called in response to a SecretsRequired signal to deliver updated secrets + or other information to the plugin. + IN a{sa{sv}} connection: @@ -185,11 +201,12 @@ NewSecrets (IN a{sa{sv}} connection); StateChanged (u state); -Emitted when the plugin state changes. + Emitted when the plugin state changes. + u state: - The new state of the plugin. + (NMVpnServiceState) The new state of the plugin. @@ -200,15 +217,18 @@ StateChanged (u state); SecretsRequired (s message, as secrets); -Emitted during an ongoing ConnectInteractive() request when the plugin has determined that new secrets are required. NetworkManager will then call the NewSecrets() method with a connection hash including the new secrets. + Emitted during an ongoing ConnectInteractive() request when the plugin has + determined that new secrets are required. NetworkManager will then call + the NewSecrets() method with a connection hash including the new secrets. + s message: - Informational message, if any, about the request. For example, if a second PIN is required, could indicate to the user to wait for the token code to change until entering the next PIN. + Informational message, if any, about the request. For example, if a second PIN is required, could indicate to the user to wait for the token code to change until entering the next PIN. as secrets: - Array of strings of VPN secret names which the plugin thinks secrets may be required for, or other VPN-specific data to be processed by the VPN's front-end. + Array of strings of VPN secret names which the plugin thinks secrets may be required for, or other VPN-specific data to be processed by the VPN's front-end. @@ -218,7 +238,8 @@ SecretsRequired (s message, Config (a{sv} config); -The plugin obtained generic configuration information. + The plugin obtained generic configuration information. + a{sv} config: @@ -232,7 +253,8 @@ Config (a{sv} config); Ip4Config (a{sv} ip4config); -The plugin obtained an IPv4 configuration. + The plugin obtained an IPv4 configuration. + a{sv} ip4config: @@ -246,7 +268,8 @@ Ip4Config (a{sv} ip4config); Ip6Config (a{sv} ip6config); -The plugin obtained an IPv6 configuration. + The plugin obtained an IPv6 configuration. + a{sv} ip6config: @@ -260,7 +283,8 @@ Ip6Config (a{sv} ip6config); LoginBanner (s banner); -Emitted when the plugin receives a login banner from the VPN service. + Emitted when the plugin receives a login banner from the VPN service. + s banner: @@ -274,11 +298,12 @@ LoginBanner (s banner); Failure (u reason); -Emitted when a failure in the VPN plugin occurs. + Emitted when a failure in the VPN plugin occurs. + u reason: - Reason code for the failure. + (NMVpnPluginFailure) Reason code for the failure. @@ -291,7 +316,9 @@ Failure (u reason); State readable u -The state of the plugin. + The state of the plugin. + Returns: NMVpnServiceState + diff --git a/introspection/vpn-errors.xml b/introspection/vpn-errors.xml deleted file mode 100644 index c1e02aac..00000000 --- a/introspection/vpn-errors.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am index 527a1c24..23aa042d 100644 --- a/libnm-core/Makefile.am +++ b/libnm-core/Makefile.am @@ -1,5 +1,7 @@ include $(GLIB_MAKEFILE) +@GNOME_CODE_COVERAGE_RULES@ + SUBDIRS = . tests AM_CPPFLAGS = \ @@ -10,8 +12,8 @@ AM_CPPFLAGS = \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DNMLIBDIR=\"$(nmlibdir)\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) noinst_LTLIBRARIES = libnm-core.la @@ -35,6 +37,9 @@ libnm_core_la_LIBADD = \ $(GLIB_LIBS) \ $(UUID_LIBS) +libnm_core_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) + if WITH_GNUTLS AM_CPPFLAGS += $(GNUTLS_CFLAGS) libnm_core_la_SOURCES += crypto_gnutls.c diff --git a/libnm-core/Makefile.in b/libnm-core/Makefile.in index 0661fc1e..62f1275f 100644 --- a/libnm-core/Makefile.in +++ b/libnm-core/Makefile.in @@ -188,6 +188,9 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +libnm_core_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_core_la_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -590,8 +593,8 @@ AM_CPPFLAGS = -I${top_srcdir}/shared -I${top_builddir}/shared \ -DG_LOG_DOMAIN=\""libnm"\" -DLOCALEDIR=\"$(datadir)/locale\" \ -DNMCONFDIR=\"$(nmconfdir)\" -DNMLIBDIR=\"$(nmlibdir)\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE $(GLIB_CFLAGS) \ - $(am__append_1) $(am__append_4) + $(GLIB_CFLAGS) $(CODE_COVERAGE_CFLAGS) $(am__append_1) \ + $(am__append_4) noinst_LTLIBRARIES = libnm-core.la core = $(top_srcdir)/libnm-core core_build = $(top_builddir)/libnm-core @@ -714,6 +717,9 @@ GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM libnm_core_la_LIBADD = $(GLIB_LIBS) $(UUID_LIBS) $(am__append_3) \ $(am__append_6) +libnm_core_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) + BUILT_SOURCES = $(GLIB_GENERATED) CLEANFILES = $(BUILT_SOURCES) all: $(BUILT_SOURCES) @@ -764,7 +770,7 @@ clean-noinstLTLIBRARIES: } libnm-core.la: $(libnm_core_la_OBJECTS) $(libnm_core_la_DEPENDENCIES) $(EXTRA_libnm_core_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libnm_core_la_OBJECTS) $(libnm_core_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libnm_core_la_LINK) $(libnm_core_la_OBJECTS) $(libnm_core_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1481,6 +1487,8 @@ uninstall-am: uninstall-libnmincludeHEADERS include $(GLIB_MAKEFILE) +@GNOME_CODE_COVERAGE_RULES@ + # 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/libnm-core/nm-core-enum-types.c b/libnm-core/nm-core-enum-types.c index 7d0f68ff..83f5e889 100644 --- a/libnm-core/nm-core-enum-types.c +++ b/libnm-core/nm-core-enum-types.c @@ -317,6 +317,27 @@ nm_device_modem_capabilities_get_type (void) return g_define_type_id__volatile; } GType +nm_wimax_nsp_network_type_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + + if (g_once_init_enter (&g_define_type_id__volatile)) + { + static const GEnumValue values[] = { + { NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN, "NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN", "unknown" }, + { NM_WIMAX_NSP_NETWORK_TYPE_HOME, "NM_WIMAX_NSP_NETWORK_TYPE_HOME", "home" }, + { NM_WIMAX_NSP_NETWORK_TYPE_PARTNER, "NM_WIMAX_NSP_NETWORK_TYPE_PARTNER", "partner" }, + { NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER, "NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER", "roaming-partner" }, + { 0, NULL, NULL } + }; + GType g_define_type_id = + g_enum_register_static (g_intern_static_string ("NMWimaxNspNetworkType"), values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + + return g_define_type_id__volatile; +} +GType nm_device_state_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; diff --git a/libnm-core/nm-core-enum-types.h b/libnm-core/nm-core-enum-types.h index be038761..d316b5e0 100644 --- a/libnm-core/nm-core-enum-types.h +++ b/libnm-core/nm-core-enum-types.h @@ -31,6 +31,8 @@ GType nm_bluetooth_capabilities_get_type (void) G_GNUC_CONST; #define NM_TYPE_BLUETOOTH_CAPABILITIES (nm_bluetooth_capabilities_get_type ()) GType nm_device_modem_capabilities_get_type (void) G_GNUC_CONST; #define NM_TYPE_DEVICE_MODEM_CAPABILITIES (nm_device_modem_capabilities_get_type ()) +GType nm_wimax_nsp_network_type_get_type (void) G_GNUC_CONST; +#define NM_TYPE_WIMAX_NSP_NETWORK_TYPE (nm_wimax_nsp_network_type_get_type ()) GType nm_device_state_get_type (void) G_GNUC_CONST; #define NM_TYPE_DEVICE_STATE (nm_device_state_get_type ()) GType nm_device_state_reason_get_type (void) G_GNUC_CONST; diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 9512ee56..082ebc9e 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -283,4 +283,16 @@ void _nm_setting_vlan_get_priorities (NMSettingVlan *setting, /***********************************************************/ +typedef enum { + NM_BOND_OPTION_TYPE_INT, + NM_BOND_OPTION_TYPE_STRING, + NM_BOND_OPTION_TYPE_BOTH, + NM_BOND_OPTION_TYPE_IP, + NM_BOND_OPTION_TYPE_MAC, + NM_BOND_OPTION_TYPE_IFNAME, +} NMBondOptionType; + +NMBondOptionType +_nm_setting_bond_get_option_type (NMSettingBond *setting, const char *name); + #endif diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index d76c5640..84e080af 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -94,8 +94,6 @@ * @NM_STATE_CONNECTED_GLOBAL: there is global IPv4 and/or IPv6 Internet connectivity * * #NMState values indicate the current overall networking state. - * - * (Corresponds to the NM_STATE type in nm-manager.xml.) **/ typedef enum { NM_STATE_UNKNOWN = 0, @@ -118,8 +116,6 @@ typedef enum { * does not appear to be able to reach the full Internet. * @NM_CONNECTIVITY_FULL: The host is connected to a network, and * appears to be able to reach the full Internet. - * - * (Corresponds to the NM_CONNECTIVITY type in nm-manager.xml.) */ typedef enum { NM_CONNECTIVITY_UNKNOWN, @@ -156,8 +152,6 @@ typedef enum { * * #NMDeviceType values indicate the type of hardware represented by * an #NMDevice. - * - * (Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.) **/ typedef enum { NM_DEVICE_TYPE_UNKNOWN = 0, @@ -191,8 +185,6 @@ typedef enum { * @NM_DEVICE_CAP_IS_SOFTWARE: this device is a software device * * General device capability flags. - * - * (Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.) **/ typedef enum { /*< flags >*/ NM_DEVICE_CAP_NONE = 0x00000000, @@ -218,8 +210,6 @@ typedef enum { /*< flags >*/ * @NM_WIFI_DEVICE_CAP_FREQ_5GHZ: device supports 5GHz frequencies * * 802.11 specific device encryption and authentication capabilities. - * - * (Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.) **/ typedef enum { /*< flags >*/ NM_WIFI_DEVICE_CAP_NONE = 0x00000000, @@ -244,8 +234,6 @@ typedef enum { /*< flags >*/ * encryption (usually means WEP) * * 802.11 access point flags. - * - * (Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.) **/ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/ NM_802_11_AP_FLAGS_NONE = 0x00000000, @@ -276,8 +264,6 @@ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/ * 802.11 access point security and authentication flags. These flags describe * the current security requirements of an access point as determined from the * access point's beacon. - * - * (Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.) **/ typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/ NM_802_11_AP_SEC_NONE = 0x00000000, @@ -307,8 +293,6 @@ typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/ * access point objects; used only for hotspot mode on the local machine. * * Indicates the 802.11 mode an access point or device is currently in. - * - * (Corresponds to the NM_802_11_MODE type in generic-types.xml.) **/ typedef enum { /*< underscore_name=nm_802_11_mode >*/ NM_802_11_MODE_UNKNOWN = 0, @@ -325,8 +309,6 @@ typedef enum { /*< underscore_name=nm_802_11_mode >*/ * * #NMBluetoothCapabilities values indicate the usable capabilities of a * Bluetooth device. - * - * (Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.) **/ typedef enum { /*< flags >*/ NM_BT_CAPABILITY_NONE = 0x00000000, @@ -349,8 +331,6 @@ typedef enum { /*< flags >*/ * technology families a modem device supports. For more information on the * specific access technologies the device supports use the ModemManager D-Bus * API. - * - * (Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.) **/ typedef enum { /*< flags >*/ NM_DEVICE_MODEM_CAPABILITY_NONE = 0x00000000, @@ -360,6 +340,21 @@ typedef enum { /*< flags >*/ NM_DEVICE_MODEM_CAPABILITY_LTE = 0x00000008, } NMDeviceModemCapabilities; +/** + * NMWimaxNspNetworkType: + * @NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN: unknown network type + * @NM_WIMAX_NSP_NETWORK_TYPE_HOME: home network + * @NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: partner network + * @NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: roaming partner network + * + * WiMAX network type. + */ +typedef enum { + NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN = 0, + NM_WIMAX_NSP_NETWORK_TYPE_HOME = 1, + NM_WIMAX_NSP_NETWORK_TYPE_PARTNER = 2, + NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 3 +} NMWimaxNspNetworkType; /** * NMDeviceState: @@ -398,8 +393,6 @@ typedef enum { /*< flags >*/ * that connection. The network connection may still be valid. * @NM_DEVICE_STATE_FAILED: the device failed to connect to the requested * network and is cleaning up the connection request - * - * (Corresponds to the NM_DEVICE_STATE type in nm-device.xml.) **/ typedef enum { NM_DEVICE_STATE_UNKNOWN = 0, @@ -484,8 +477,6 @@ typedef enum { * @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed * * Device state change reason codes - * - * (Corresponds to the NM_DEVICE_STATE_REASON type in nm-device.xml.) */ typedef enum { NM_DEVICE_STATE_REASON_NONE = 0, @@ -561,8 +552,6 @@ typedef enum { * @NM_METERED_GUESS_YES: Metered, the value was guessed * @NM_METERED_GUESS_NO: Not metered, the value was guessed * - * (Corresponds to the NM_METERED type in nm-device.xml.) - * * Since: 1.2 **/ NM_AVAILABLE_IN_1_2 @@ -587,8 +576,6 @@ typedef enum { * #NMActiveConnectionState values indicate the state of a connection to a * specific network while it is starting, connected, or disconnecting from that * network. - * - * (Corresponds to the NM_ACTIVE_CONNECTION_STATE type in nm-active-connection.xml.) **/ typedef enum { NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0, @@ -620,8 +607,6 @@ typedef enum { * the D-Bus API. * * #NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request. - * - * (Corresponds to the NM_SECRET_AGENT_GET_SECRETS_FLAGS type in nm-secret-agent.xml.) */ typedef enum { /*< flags >*/ NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0, @@ -642,8 +627,6 @@ typedef enum { /*< flags >*/ * @NM_SECRET_AGENT_CAPABILITY_LAST: bounds checking value; should not be used. * * #NMSecretAgentCapabilities indicate various capabilities of the agent. - * - * (Corresponds to the NM_SECRET_AGENT_CAPABILITIES type in nm-secret-agent.xml.) */ typedef enum /*< flags >*/ { NM_SECRET_AGENT_CAPABILITY_NONE = 0x0, diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c index 4d40de00..e008878d 100644 --- a/libnm-core/nm-setting-bond.c +++ b/libnm-core/nm-setting-bond.c @@ -32,6 +32,7 @@ #include "nm-utils-private.h" #include "nm-connection-private.h" #include "nm-setting-infiniband.h" +#include "nm-core-internal.h" /** * SECTION:nm-setting-bond @@ -57,14 +58,6 @@ enum { LAST_PROP }; -enum { - TYPE_INT, - TYPE_STR, - TYPE_BOTH, - TYPE_IP, - TYPE_IFNAME, -}; - typedef struct { const char *opt; const char *val; @@ -75,28 +68,40 @@ typedef struct { } BondDefault; static const BondDefault defaults[] = { - { NM_SETTING_BOND_OPTION_MODE, "balance-rr", TYPE_BOTH, 0, 6, + { NM_SETTING_BOND_OPTION_MODE, "balance-rr", NM_BOND_OPTION_TYPE_BOTH, 0, 6, { "balance-rr", "active-backup", "balance-xor", "broadcast", "802.3ad", "balance-tlb", "balance-alb", NULL } }, - { NM_SETTING_BOND_OPTION_MIIMON, "100", TYPE_INT, 0, G_MAXINT }, - { NM_SETTING_BOND_OPTION_DOWNDELAY, "0", TYPE_INT, 0, G_MAXINT }, - { NM_SETTING_BOND_OPTION_UPDELAY, "0", TYPE_INT, 0, G_MAXINT }, - { NM_SETTING_BOND_OPTION_ARP_INTERVAL, "0", TYPE_INT, 0, G_MAXINT }, - { NM_SETTING_BOND_OPTION_ARP_IP_TARGET, "", TYPE_IP }, - { NM_SETTING_BOND_OPTION_ARP_VALIDATE, "0", TYPE_BOTH, 0, 3, + { NM_SETTING_BOND_OPTION_MIIMON, "100", NM_BOND_OPTION_TYPE_INT, 0, G_MAXINT }, + { NM_SETTING_BOND_OPTION_DOWNDELAY, "0", NM_BOND_OPTION_TYPE_INT, 0, G_MAXINT }, + { NM_SETTING_BOND_OPTION_UPDELAY, "0", NM_BOND_OPTION_TYPE_INT, 0, G_MAXINT }, + { NM_SETTING_BOND_OPTION_ARP_INTERVAL, "0", NM_BOND_OPTION_TYPE_INT, 0, G_MAXINT }, + { NM_SETTING_BOND_OPTION_ARP_IP_TARGET, "", NM_BOND_OPTION_TYPE_IP }, + { NM_SETTING_BOND_OPTION_ARP_VALIDATE, "none", NM_BOND_OPTION_TYPE_BOTH, 0, 3, { "none", "active", "backup", "all", NULL } }, - { NM_SETTING_BOND_OPTION_PRIMARY, "", TYPE_IFNAME }, - { NM_SETTING_BOND_OPTION_PRIMARY_RESELECT, "0", TYPE_BOTH, 0, 2, + { NM_SETTING_BOND_OPTION_PRIMARY, "", NM_BOND_OPTION_TYPE_IFNAME }, + { NM_SETTING_BOND_OPTION_PRIMARY_RESELECT, "always", NM_BOND_OPTION_TYPE_BOTH, 0, 2, { "always", "better", "failure", NULL } }, - { NM_SETTING_BOND_OPTION_FAIL_OVER_MAC, "0", TYPE_BOTH, 0, 2, + { NM_SETTING_BOND_OPTION_FAIL_OVER_MAC, "none", NM_BOND_OPTION_TYPE_BOTH, 0, 2, { "none", "active", "follow", NULL } }, - { NM_SETTING_BOND_OPTION_USE_CARRIER, "1", TYPE_INT, 0, 1 }, - { NM_SETTING_BOND_OPTION_AD_SELECT, "0", TYPE_BOTH, 0, 2, + { NM_SETTING_BOND_OPTION_USE_CARRIER, "1", NM_BOND_OPTION_TYPE_INT, 0, 1 }, + { NM_SETTING_BOND_OPTION_AD_SELECT, "stable", NM_BOND_OPTION_TYPE_BOTH, 0, 2, { "stable", "bandwidth", "count", NULL } }, - { NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY, "0", TYPE_BOTH, 0, 2, + { NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY, "layer2", NM_BOND_OPTION_TYPE_BOTH, 0, 2, { "layer2", "layer3+4", "layer2+3", NULL } }, - { NM_SETTING_BOND_OPTION_RESEND_IGMP, "1", TYPE_INT, 0, 255 }, - { NM_SETTING_BOND_OPTION_LACP_RATE, "0", TYPE_BOTH, 0, 1, + { NM_SETTING_BOND_OPTION_RESEND_IGMP, "1", NM_BOND_OPTION_TYPE_INT, 0, 255 }, + { NM_SETTING_BOND_OPTION_LACP_RATE, "slow", NM_BOND_OPTION_TYPE_BOTH, 0, 1, { "slow", "fast", NULL } }, + { NM_SETTING_BOND_OPTION_ACTIVE_SLAVE, "", NM_BOND_OPTION_TYPE_IFNAME }, + { NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO,"65535", NM_BOND_OPTION_TYPE_INT, 1, 65535 }, + { NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM, "", NM_BOND_OPTION_TYPE_MAC }, + { NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY, "0", NM_BOND_OPTION_TYPE_INT, 0, 1023}, + { NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE,"0", NM_BOND_OPTION_TYPE_INT, 0, 1}, + { NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS, "any", NM_BOND_OPTION_TYPE_BOTH, 0, 1, {"any", "all"}}, + { NM_SETTING_BOND_OPTION_MIN_LINKS, "0", NM_BOND_OPTION_TYPE_INT, 0, G_MAXINT }, + { NM_SETTING_BOND_OPTION_NUM_GRAT_ARP, "1", NM_BOND_OPTION_TYPE_INT, 0, 255 }, + { NM_SETTING_BOND_OPTION_NUM_UNSOL_NA, "1", NM_BOND_OPTION_TYPE_INT, 0, 255 }, + { NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE,"1", NM_BOND_OPTION_TYPE_INT, 0, 65535 }, + { NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB, "1", NM_BOND_OPTION_TYPE_INT, 0, 1 }, + { NM_SETTING_BOND_OPTION_LP_INTERVAL, "1", NM_BOND_OPTION_TYPE_INT, 1, G_MAXINT }, }; /** @@ -268,16 +273,18 @@ nm_setting_bond_validate_option (const char *name, if (value == NULL) return TRUE; switch (defaults[i].opt_type) { - case TYPE_INT: + case NM_BOND_OPTION_TYPE_INT: return validate_int (name, value, &defaults[i]); - case TYPE_STR: + case NM_BOND_OPTION_TYPE_STRING: return validate_list (name, value, &defaults[i]); - case TYPE_BOTH: + case NM_BOND_OPTION_TYPE_BOTH: return ( validate_int (name, value, &defaults[i]) || validate_list (name, value, &defaults[i])); - case TYPE_IP: + case NM_BOND_OPTION_TYPE_IP: return validate_ip (name, value); - case TYPE_IFNAME: + case NM_BOND_OPTION_TYPE_MAC: + return nm_utils_hwaddr_valid (value, ETH_ALEN); + case NM_BOND_OPTION_TYPE_IFNAME: return validate_ifname (name, value); } return FALSE; @@ -433,6 +440,29 @@ nm_setting_bond_get_option_default (NMSettingBond *setting, const char *name) g_assert_not_reached (); } +/** + * nm_setting_bond_get_option_type: + * @setting: the #NMSettingBond + * @name: the name of the option + * + * Returns: the type of the bond option. + **/ +NMBondOptionType +_nm_setting_bond_get_option_type (NMSettingBond *setting, const char *name) +{ + guint i; + + g_return_val_if_fail (NM_IS_SETTING_BOND (setting), NM_BOND_OPTION_TYPE_INT); + g_return_val_if_fail (nm_setting_bond_validate_option (name, NULL), NM_BOND_OPTION_TYPE_INT); + + for (i = 0; i < G_N_ELEMENTS (defaults); i++) { + if (nm_streq0 (defaults[i].opt, name)) + return defaults[i].opt_type; + } + /* Any option that passes nm_setting_bond_validate_option() should also be found in defaults */ + g_assert_not_reached (); +} + static gboolean verify (NMSetting *setting, NMConnection *connection, GError **error) { @@ -440,6 +470,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) GHashTableIter iter; const char *key, *value; int mode, miimon = 0, arp_interval = 0; + int num_grat_arp = -1, num_unsol_na = -1; const char *mode_orig, *mode_new; const char *arp_ip_target = NULL; const char *lacp_rate; @@ -464,6 +495,12 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) value = g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_ARP_INTERVAL); if (value) arp_interval = atoi (value); + value = g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_NUM_GRAT_ARP); + if (value) + num_grat_arp = atoi (value); + value = g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_NUM_UNSOL_NA); + if (value) + num_unsol_na = atoi (value); /* Can only set one of miimon and arp_interval */ if (miimon > 0 && arp_interval > 0) { @@ -474,11 +511,12 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) NM_SETTING_BOND_OPTION_MIIMON, NM_SETTING_BOND_OPTION_ARP_INTERVAL); g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); + return FALSE; } /* Verify bond mode */ - mode_orig = value = g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_MODE); - if (!value) { + mode_orig = g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_MODE); + if (!mode_orig) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -487,7 +525,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } - mode = nm_utils_bond_mode_string_to_int (value); + mode = nm_utils_bond_mode_string_to_int (mode_orig); if (mode == -1) { g_set_error (error, NM_CONNECTION_ERROR, @@ -497,24 +535,24 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } - mode_new = value = nm_utils_bond_mode_int_to_string (mode); + mode_new = nm_utils_bond_mode_int_to_string (mode); /* Make sure mode is compatible with other settings */ - if ( strcmp (value, "balance-alb") == 0 - || strcmp (value, "balance-tlb") == 0) { + if ( strcmp (mode_new, "balance-alb") == 0 + || strcmp (mode_new, "balance-tlb") == 0) { if (arp_interval > 0) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, _("'%s=%s' is incompatible with '%s > 0'"), - NM_SETTING_BOND_OPTION_MODE, value, NM_SETTING_BOND_OPTION_ARP_INTERVAL); + NM_SETTING_BOND_OPTION_MODE, mode_new, NM_SETTING_BOND_OPTION_ARP_INTERVAL); g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } } primary = g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_PRIMARY); - if (strcmp (value, "active-backup") == 0) { + if (strcmp (mode_new, "active-backup") == 0) { if (primary && !nm_utils_iface_valid_name (primary)) { g_set_error (error, NM_CONNECTION_ERROR, @@ -538,12 +576,12 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } if (nm_connection_get_setting_infiniband (connection)) { - if (strcmp (value, "active-backup") != 0) { + if (strcmp (mode_new, "active-backup") != 0) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, _("'%s=%s' is not a valid configuration for '%s'"), - NM_SETTING_BOND_OPTION_MODE, value, NM_SETTING_INFINIBAND_SETTING_NAME); + NM_SETTING_BOND_OPTION_MODE, mode_new, NM_SETTING_INFINIBAND_SETTING_NAME); g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } @@ -629,8 +667,9 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) lacp_rate = g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_LACP_RATE); if ( lacp_rate - && (g_strcmp0 (value, "802.3ad") != 0 && g_strcmp0 (value, "4") != 0) - && (strcmp (lacp_rate, "slow") != 0 && strcmp (lacp_rate, "0") != 0)) { + && g_strcmp0 (mode_new, "802.3ad") + && strcmp (lacp_rate, "slow") != 0 + && strcmp (lacp_rate, "0") != 0) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -640,6 +679,18 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) return FALSE; } + if ( (num_grat_arp != -1 && num_unsol_na != -1) + && (num_grat_arp != num_unsol_na)) { + g_set_error (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("'%s' and '%s' cannot have different values"), + NM_SETTING_BOND_OPTION_NUM_GRAT_ARP, + NM_SETTING_BOND_OPTION_NUM_UNSOL_NA); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); + return FALSE; + } + if (!_nm_connection_verify_required_interface_name (connection, error)) return FALSE; @@ -658,6 +709,63 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) return TRUE; } +static gboolean +options_hash_match (NMSettingBond *s_bond, GHashTable *options1, GHashTable *options2) +{ + GHashTableIter iter; + const char *key, *value, *value2; + + g_hash_table_iter_init (&iter, options1); + while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &value)) { + value2 = g_hash_table_lookup (options2, key); + + if (!value2) { + if (nm_streq (key, "num_grat_arp")) + value2 = g_hash_table_lookup (options2, "num_unsol_na"); + else if (nm_streq (key, "num_unsol_na")) + value2 = g_hash_table_lookup (options2, "num_grat_arp"); + } + + if (value2) { + if (nm_streq (value, value2)) + continue; + } else { + if (nm_streq (value, nm_setting_bond_get_option_default (s_bond, key))) + continue; + } + + return FALSE; + } + + return TRUE; +} + +static gboolean +options_equal (NMSettingBond *s_bond, GHashTable *options1, GHashTable *options2) +{ + return options_hash_match (s_bond, options1, options2) + && options_hash_match (s_bond, options2, options1); +} + +static gboolean +compare_property (NMSetting *setting, + NMSetting *other, + const GParamSpec *prop_spec, + NMSettingCompareFlags flags) +{ + NMSettingClass *parent_class; + + if (nm_streq0 (prop_spec->name, NM_SETTING_BOND_OPTIONS)) { + return options_equal (NM_SETTING_BOND (setting), + NM_SETTING_BOND_GET_PRIVATE (setting)->options, + NM_SETTING_BOND_GET_PRIVATE (other)->options); + } + + /* Otherwise chain up to parent to handle generic compare */ + parent_class = NM_SETTING_CLASS (nm_setting_bond_parent_class); + return parent_class->compare_property (setting, other, prop_spec, flags); +} + static void nm_setting_bond_init (NMSettingBond *setting) { @@ -721,10 +829,11 @@ nm_setting_bond_class_init (NMSettingBondClass *setting_class) g_type_class_add_private (setting_class, sizeof (NMSettingBondPrivate)); /* virtual methods */ - object_class->set_property = set_property; - object_class->get_property = get_property; - object_class->finalize = finalize; - parent_class->verify = verify; + object_class->set_property = set_property; + object_class->get_property = get_property; + object_class->finalize = finalize; + parent_class->verify = verify; + parent_class->compare_property = compare_property; /* Properties */ /** diff --git a/libnm-core/nm-setting-bond.h b/libnm-core/nm-setting-bond.h index 055801a5..98fcc6d0 100644 --- a/libnm-core/nm-setting-bond.h +++ b/libnm-core/nm-setting-bond.h @@ -42,21 +42,33 @@ G_BEGIN_DECLS #define NM_SETTING_BOND_OPTIONS "options" /* Valid options for the 'options' property */ -#define NM_SETTING_BOND_OPTION_MODE "mode" -#define NM_SETTING_BOND_OPTION_MIIMON "miimon" -#define NM_SETTING_BOND_OPTION_DOWNDELAY "downdelay" -#define NM_SETTING_BOND_OPTION_UPDELAY "updelay" -#define NM_SETTING_BOND_OPTION_ARP_INTERVAL "arp_interval" -#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET "arp_ip_target" -#define NM_SETTING_BOND_OPTION_ARP_VALIDATE "arp_validate" -#define NM_SETTING_BOND_OPTION_PRIMARY "primary" -#define NM_SETTING_BOND_OPTION_PRIMARY_RESELECT "primary_reselect" -#define NM_SETTING_BOND_OPTION_FAIL_OVER_MAC "fail_over_mac" -#define NM_SETTING_BOND_OPTION_USE_CARRIER "use_carrier" -#define NM_SETTING_BOND_OPTION_AD_SELECT "ad_select" -#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy" -#define NM_SETTING_BOND_OPTION_RESEND_IGMP "resend_igmp" -#define NM_SETTING_BOND_OPTION_LACP_RATE "lacp_rate" +#define NM_SETTING_BOND_OPTION_MODE "mode" +#define NM_SETTING_BOND_OPTION_MIIMON "miimon" +#define NM_SETTING_BOND_OPTION_DOWNDELAY "downdelay" +#define NM_SETTING_BOND_OPTION_UPDELAY "updelay" +#define NM_SETTING_BOND_OPTION_ARP_INTERVAL "arp_interval" +#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET "arp_ip_target" +#define NM_SETTING_BOND_OPTION_ARP_VALIDATE "arp_validate" +#define NM_SETTING_BOND_OPTION_PRIMARY "primary" +#define NM_SETTING_BOND_OPTION_PRIMARY_RESELECT "primary_reselect" +#define NM_SETTING_BOND_OPTION_FAIL_OVER_MAC "fail_over_mac" +#define NM_SETTING_BOND_OPTION_USE_CARRIER "use_carrier" +#define NM_SETTING_BOND_OPTION_AD_SELECT "ad_select" +#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy" +#define NM_SETTING_BOND_OPTION_RESEND_IGMP "resend_igmp" +#define NM_SETTING_BOND_OPTION_LACP_RATE "lacp_rate" +#define NM_SETTING_BOND_OPTION_ACTIVE_SLAVE "active_slave" +#define NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO "ad_actor_sys_prio" +#define NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM "ad_actor_system" +#define NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY "ad_user_port_key" +#define NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE "all_slaves_active" +#define NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS "arp_all_targets" +#define NM_SETTING_BOND_OPTION_MIN_LINKS "min_links" +#define NM_SETTING_BOND_OPTION_NUM_GRAT_ARP "num_grat_arp" +#define NM_SETTING_BOND_OPTION_NUM_UNSOL_NA "num_unsol_na" +#define NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE "packets_per_slave" +#define NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB "tlb_dynamic_lb" +#define NM_SETTING_BOND_OPTION_LP_INTERVAL "lp_interval" struct _NMSettingBond { NMSetting parent; diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index fa934c46..7cfa7eb8 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -397,7 +397,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) **/ /* ---keyfile--- * property: mac-address - * format: ususal hex-digits-and-colons notation + * format: usual hex-digits-and-colons notation * description: MAC address in traditional hex-digits-and-colons notation, * or semicolon separated list of 6 decimal bytes (obsolete) * example: mac-address=00:22:68:12:79:A2 diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c index 3a71879d..6086f076 100644 --- a/libnm-core/nm-setting-infiniband.c +++ b/libnm-core/nm-setting-infiniband.c @@ -397,7 +397,7 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) **/ /* ---keyfile--- * property: mac-address - * format: ususal hex-digits-and-colons notation + * format: usual hex-digits-and-colons notation * description: MAC address in traditional hex-digits-and-colons notation, or * or semicolon separated list of 20 decimal bytes (obsolete) * example: mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01 diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index a69045b3..4e3088a9 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -59,6 +59,7 @@ const NMUtilsDNSOptionDesc _nm_utils_dns_option_descs[] = { { NM_SETTING_DNS_OPTION_SINGLE_REQUEST, FALSE, FALSE }, { NM_SETTING_DNS_OPTION_SINGLE_REQUEST_REOPEN, FALSE, FALSE }, { NM_SETTING_DNS_OPTION_NO_TLD_QUERY, FALSE, FALSE }, + { NM_SETTING_DNS_OPTION_USE_VC, FALSE, FALSE }, { NULL, FALSE, FALSE } }; diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h index 6d182338..39e4c9f0 100644 --- a/libnm-core/nm-setting-ip-config.h +++ b/libnm-core/nm-setting-ip-config.h @@ -163,6 +163,7 @@ void nm_ip_route_set_attribute (NMIPRoute *route, #define NM_SETTING_DNS_OPTION_SINGLE_REQUEST "single-request" #define NM_SETTING_DNS_OPTION_SINGLE_REQUEST_REOPEN "single-request-reopen" #define NM_SETTING_DNS_OPTION_NO_TLD_QUERY "no-tld-query" +#define NM_SETTING_DNS_OPTION_USE_VC "use-vc" struct _NMSettingIPConfig { NMSetting parent; diff --git a/libnm-core/nm-setting-macvlan.c b/libnm-core/nm-setting-macvlan.c index 00341acc..aec3b4f9 100644 --- a/libnm-core/nm-setting-macvlan.c +++ b/libnm-core/nm-setting-macvlan.c @@ -189,12 +189,11 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("non promiscuous operation is allowed only in passthru mode'")); + _("non promiscuous operation is allowed only in passthru mode")); g_prefix_error (error, "%s.%s: ", NM_SETTING_MACVLAN_SETTING_NAME, NM_SETTING_MACVLAN_PROMISCUOUS); return FALSE; - } return TRUE; diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 149ddb91..132f8e05 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -1004,7 +1004,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) **/ /* ---keyfile--- * property: mac-address - * format: ususal hex-digits-and-colons notation + * format: usual hex-digits-and-colons notation * description: MAC address in traditional hex-digits-and-colons notation * (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) * (e.g. 0;34;104;18;121;162) @@ -1036,7 +1036,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) **/ /* ---keyfile--- * property: cloned-mac-address - * format: ususal hex-digits-and-colons notation + * format: usual hex-digits-and-colons notation * description: Cloned MAC address in traditional hex-digits-and-colons notation * (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) * (e.g. 0;34;104;18;121;178). diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index 72fd77e4..ee4ac6f2 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -1213,7 +1213,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) **/ /* ---keyfile--- * property: mac-address - * format: ususal hex-digits-and-colons notation + * format: usual hex-digits-and-colons notation * description: MAC address in traditional hex-digits-and-colons notation * (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) * (e.g. 0;34;104;18;121;162). @@ -1244,7 +1244,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) **/ /* ---keyfile--- * property: cloned-mac-address - * format: ususal hex-digits-and-colons notation + * format: usual hex-digits-and-colons notation * description: Cloned MAC address in traditional hex-digits-and-colons notation * (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) * (e.g. 0;34;104;18;121;178). diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index a8467081..70c268fa 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -45,9 +45,6 @@ #include "nm-setting-wired.h" #include "nm-setting-wireless.h" -/* Embed the commit id in the build binary */ -static const char *const __nm_git_sha = NM_STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : ""; - /** * SECTION:nm-utils * @short_description: Utility functions @@ -223,8 +220,6 @@ _nm_utils_init (void) GModule *self; gpointer func; - (void) __nm_git_sha; - if (initialized) return; initialized = TRUE; diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index 859a3a8c..d7f112bf 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -90,4 +90,18 @@ # define NM_AVAILABLE_IN_1_2 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_4 +# define NM_DEPRECATED_IN_1_4 G_DEPRECATED +# define NM_DEPRECATED_IN_1_4_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_4 +# define NM_DEPRECATED_IN_1_4_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_4 +# define NM_AVAILABLE_IN_1_4 G_UNAVAILABLE(1,4) +#else +# define NM_AVAILABLE_IN_1_4 +#endif + #endif /* NM_VERSION_H */ diff --git a/libnm-core/nm-vpn-dbus-interface.h b/libnm-core/nm-vpn-dbus-interface.h index c4099be2..9226458d 100644 --- a/libnm-core/nm-vpn-dbus-interface.h +++ b/libnm-core/nm-vpn-dbus-interface.h @@ -78,8 +78,6 @@ * @NM_VPN_SERVICE_STATE_STOPPED: The plugin has disconnected from the VPN server. * * VPN daemon states - * - * (Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.) */ typedef enum { NM_VPN_SERVICE_STATE_UNKNOWN = 0, @@ -108,8 +106,6 @@ typedef enum { * @NM_VPN_CONNECTION_STATE_DISCONNECTED: The VPN connection is disconnected. * * VPN connection states - * - * (Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.) */ typedef enum { NM_VPN_CONNECTION_STATE_UNKNOWN = 0, @@ -150,8 +146,6 @@ typedef enum { * deleted from settings. * * VPN connection state reasons - * - * (Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.) */ typedef enum { NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0, @@ -176,8 +170,6 @@ typedef enum { * the VPN plugin. * * VPN plugin failure reasons - * - * (Corresponds to the NM_VPN_PLUGIN_FAILURE type in nm-vpn-plugin.xml.) */ typedef enum { NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED, diff --git a/libnm-core/tests/Makefile.am b/libnm-core/tests/Makefile.am index 92c816fd..1926c86f 100644 --- a/libnm-core/tests/Makefile.am +++ b/libnm-core/tests/Makefile.am @@ -17,7 +17,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libnm-core \ -I$(top_builddir)/libnm-core \ -DNETWORKMANAGER_COMPILATION \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ -DTEST_CERT_DIR=\"$(certsdir)\" @@ -28,6 +27,7 @@ noinst_PROGRAMS = \ test-keyfile \ test-secrets \ test-setting-8021x \ + test-setting-bond \ test-setting-dcb \ test-settings-defaults diff --git a/libnm-core/tests/Makefile.in b/libnm-core/tests/Makefile.in index 43892d75..356ce8df 100644 --- a/libnm-core/tests/Makefile.in +++ b/libnm-core/tests/Makefile.in @@ -92,6 +92,7 @@ host_triplet = @host@ @ENABLE_TESTS_TRUE@ test-crypto$(EXEEXT) test-general$(EXEEXT) \ @ENABLE_TESTS_TRUE@ test-keyfile$(EXEEXT) test-secrets$(EXEEXT) \ @ENABLE_TESTS_TRUE@ test-setting-8021x$(EXEEXT) \ +@ENABLE_TESTS_TRUE@ test-setting-bond$(EXEEXT) \ @ENABLE_TESTS_TRUE@ test-setting-dcb$(EXEEXT) \ @ENABLE_TESTS_TRUE@ test-settings-defaults$(EXEEXT) subdir = libnm-core/tests @@ -161,6 +162,12 @@ test_setting_8021x_LDADD = $(LDADD) @ENABLE_TESTS_TRUE@test_setting_8021x_DEPENDENCIES = \ @ENABLE_TESTS_TRUE@ $(top_builddir)/libnm-core/libnm-core.la \ @ENABLE_TESTS_TRUE@ $(am__DEPENDENCIES_1) +test_setting_bond_SOURCES = test-setting-bond.c +test_setting_bond_OBJECTS = test-setting-bond.$(OBJEXT) +test_setting_bond_LDADD = $(LDADD) +@ENABLE_TESTS_TRUE@test_setting_bond_DEPENDENCIES = \ +@ENABLE_TESTS_TRUE@ $(top_builddir)/libnm-core/libnm-core.la \ +@ENABLE_TESTS_TRUE@ $(am__DEPENDENCIES_1) test_setting_dcb_SOURCES = test-setting-dcb.c test_setting_dcb_OBJECTS = test-setting-dcb.$(OBJEXT) test_setting_dcb_LDADD = $(LDADD) @@ -209,10 +216,11 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = test-compare.c test-crypto.c $(test_general_SOURCES) \ test-keyfile.c test-secrets.c test-setting-8021x.c \ - test-setting-dcb.c test-settings-defaults.c + test-setting-bond.c test-setting-dcb.c \ + test-settings-defaults.c DIST_SOURCES = test-compare.c test-crypto.c \ $(am__test_general_SOURCES_DIST) test-keyfile.c test-secrets.c \ - test-setting-8021x.c test-setting-dcb.c \ + test-setting-8021x.c test-setting-bond.c test-setting-dcb.c \ test-settings-defaults.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -720,7 +728,6 @@ BUILT_SOURCES = $(GLIB_GENERATED) @ENABLE_TESTS_TRUE@ -I$(top_srcdir)/libnm-core \ @ENABLE_TESTS_TRUE@ -I$(top_builddir)/libnm-core \ @ENABLE_TESTS_TRUE@ -DNETWORKMANAGER_COMPILATION \ -@ENABLE_TESTS_TRUE@ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ @ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) \ @ENABLE_TESTS_TRUE@ -DTEST_CERT_DIR=\"$(certsdir)\" @@ -831,6 +838,10 @@ test-setting-8021x$(EXEEXT): $(test_setting_8021x_OBJECTS) $(test_setting_8021x_ @rm -f test-setting-8021x$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_setting_8021x_OBJECTS) $(test_setting_8021x_LDADD) $(LIBS) +test-setting-bond$(EXEEXT): $(test_setting_bond_OBJECTS) $(test_setting_bond_DEPENDENCIES) $(EXTRA_test_setting_bond_DEPENDENCIES) + @rm -f test-setting-bond$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_setting_bond_OBJECTS) $(test_setting_bond_LDADD) $(LIBS) + test-setting-dcb$(EXEEXT): $(test_setting_dcb_OBJECTS) $(test_setting_dcb_DEPENDENCIES) $(EXTRA_test_setting_dcb_DEPENDENCIES) @rm -f test-setting-dcb$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_setting_dcb_OBJECTS) $(test_setting_dcb_LDADD) $(LIBS) @@ -852,6 +863,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-keyfile.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-secrets.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setting-8021x.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setting-bond.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setting-dcb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-settings-defaults.Po@am__quote@ @@ -1117,6 +1129,13 @@ test-setting-8021x.log: test-setting-8021x$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test-setting-bond.log: test-setting-bond$(EXEEXT) + @p='test-setting-bond$(EXEEXT)'; \ + b='test-setting-bond'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) test-setting-dcb.log: test-setting-dcb$(EXEEXT) @p='test-setting-dcb$(EXEEXT)'; \ b='test-setting-dcb'; \ diff --git a/libnm-core/tests/test-setting-bond.c b/libnm-core/tests/test-setting-bond.c new file mode 100644 index 00000000..a6afa1c8 --- /dev/null +++ b/libnm-core/tests/test-setting-bond.c @@ -0,0 +1,198 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2016 Red Hat, Inc. + */ + +#include "nm-default.h" + +#include "nm-utils.h" +#include "nm-setting-bond.h" +#include "nm-connection.h" +#include "nm-simple-connection.h" +#include "nm-setting-connection.h" +#include "nm-errors.h" + +#include "nm-test-utils.h" + +static void +create_bond_connection (NMConnection **con, NMSettingBond **s_bond) +{ + NMSettingConnection *s_con; + + g_assert (con); + g_assert (s_bond); + + *con = nmtst_create_minimal_connection ("bond", + NULL, + NM_SETTING_BOND_SETTING_NAME, + &s_con); + g_assert (*con); + g_assert (s_con); + + g_object_set (s_con, NM_SETTING_CONNECTION_INTERFACE_NAME, "bond0", NULL); + + *s_bond = (NMSettingBond *) nm_setting_bond_new (); + g_assert (*s_bond); + + nm_connection_add_setting (*con, NM_SETTING (*s_bond)); +} + +#define test_verify_options(exp, ...) \ + G_STMT_START { \ + const char *__opts[] = { __VA_ARGS__ , NULL }; \ + \ + _test_verify_options (__opts, exp); \ + } G_STMT_END + +static void +_test_verify_options (const char **options, gboolean expected_result) +{ + gs_unref_object NMConnection *con = NULL; + NMSettingBond *s_bond; + GError *error = NULL; + gboolean success; + const char **option; + + create_bond_connection (&con, &s_bond); + + for (option = options; option[0] && option[1]; option += 2) + g_assert (nm_setting_bond_add_option (s_bond, option[0], option[1])); + + if (expected_result) { + nmtst_assert_connection_verifies_and_normalizable (con); + nmtst_connection_normalize (con); + success = nm_setting_verify ((NMSetting *) s_bond, con, &error); + nmtst_assert_success (success, error); + } else { + nmtst_assert_connection_unnormalizable (con, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY); + } +} + +static void +test_verify (void) +{ + test_verify_options (TRUE, + "mode", "3", + "arp_interval", "0"); + test_verify_options (FALSE, + /* arp_interval not supported in balance-alb mode */ + "mode", "balance-alb", + "arp_interval", "1", + "arp_ip_target", "1.2.3.4"); + test_verify_options (FALSE, + /* arp_ip_target requires arp_interval */ + "mode", "balance-rr", + "arp_ip_target", "1.2.3.4"); + test_verify_options (TRUE, + "mode", "balance-rr", + "arp_interval", "1", + "arp_ip_target", "1.2.3.4"); + test_verify_options (FALSE, + /* num_grat_arp, num_unsol_na cannot be different */ + "mode", "balance-rr", + "num_grat_arp", "3", + "num_unsol_na", "4"); + test_verify_options (TRUE, + "mode", "balance-rr", + "num_grat_arp", "5", + "num_unsol_na", "5"); + test_verify_options (TRUE, + "mode", "active-backup", + "primary", "eth0"); + test_verify_options (FALSE, + /* primary requires mode=active-backup */ + "mode", "802.3ad", + "primary", "eth0"); + test_verify_options (TRUE, + "mode", "802.3ad", + "lacp_rate", "fast"); + test_verify_options (FALSE, + /* lacp_rate=fast requires mode=802.3ad */ + "mode", "balance-rr", + "lacp_rate", "fast"); + test_verify_options (TRUE, + "mode", "802.3ad", + "ad_actor_system", "ae:00:11:33:44:55"); +} + +static void +test_compare_options (gboolean exp_res, const char **opts1, const char **opts2) +{ + gs_unref_object NMSettingBond *s_bond1 = NULL, *s_bond2 = NULL; + const char **p; + + s_bond1 = (NMSettingBond *) nm_setting_bond_new (); + g_assert (s_bond1); + s_bond2 = (NMSettingBond *) nm_setting_bond_new (); + g_assert (s_bond2); + + for (p = opts1; p[0] && p[1]; p += 2) + g_assert (nm_setting_bond_add_option (s_bond1, p[0], p[1])); + + for (p = opts2; p[0] && p[1]; p += 2) + g_assert (nm_setting_bond_add_option (s_bond2, p[0], p[1])); + + g_assert_cmpint (nm_setting_compare ((NMSetting *) s_bond1, + (NMSetting *) s_bond2, + NM_SETTING_COMPARE_FLAG_EXACT), + ==, + exp_res); +} + +static void +test_compare (void) +{ + test_compare_options (TRUE, + ((const char *[]){ "mode", "balance-rr", "miimon", "1", NULL }), + ((const char *[]){ "mode", "balance-rr", "miimon", "1", NULL })); + test_compare_options (FALSE, + ((const char *[]){ "mode", "balance-rr", "miimon", "1", NULL }), + ((const char *[]){ "mode", "balance-rr", "miimon", "2", NULL })); + + /* ignore default values */ + test_compare_options (TRUE, + ((const char *[]){ "miimon", "1", NULL }), + ((const char *[]){ "miimon", "1", "updelay", "0", NULL })); + + /* special handling of num_grat_arp, num_unsol_na */ + test_compare_options (FALSE, + ((const char *[]){ "num_grat_arp", "2", NULL }), + ((const char *[]){ "num_grat_arp", "1", NULL })); + test_compare_options (TRUE, + ((const char *[]){ "num_grat_arp", "3", NULL }), + ((const char *[]){ "num_unsol_na", "3", NULL })); + test_compare_options (TRUE, + ((const char *[]){ "num_grat_arp", "4", NULL }), + ((const char *[]){ "num_unsol_na", "4", "num_grat_arp", "4", NULL })); +} + +#define TPATH "/libnm/settings/bond/" + +NMTST_DEFINE (); + +int +main (int argc, char **argv) +{ + nmtst_init (&argc, &argv, TRUE); + + g_test_add_func (TPATH "verify", test_verify); + g_test_add_func (TPATH "compare", test_compare); + + return g_test_run (); +} diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 676b0671..c4068474 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -9,7 +9,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libnm-util \ -DG_LOG_DOMAIN=\""libnm-glib"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) diff --git a/libnm-glib/Makefile.in b/libnm-glib/Makefile.in index 25a9f7c0..02b90ab4 100644 --- a/libnm-glib/Makefile.in +++ b/libnm-glib/Makefile.in @@ -601,7 +601,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libnm-util \ -DG_LOG_DOMAIN=\""libnm-glib"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am index 138b2b32..3368d60c 100644 --- a/libnm-glib/tests/Makefile.am +++ b/libnm-glib/tests/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/libnm-glib/tests/Makefile.in b/libnm-glib/tests/Makefile.in index d1201dce..5a1b98de 100644 --- a/libnm-glib/tests/Makefile.in +++ b/libnm-glib/tests/Makefile.in @@ -684,7 +684,6 @@ with_valgrind = @with_valgrind@ @ENABLE_TESTS_TRUE@ -I$(top_builddir)/libnm-util \ @ENABLE_TESTS_TRUE@ -I$(top_srcdir)/libnm-glib \ @ENABLE_TESTS_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ -@ENABLE_TESTS_TRUE@ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ @ENABLE_TESTS_TRUE@ -DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \ @ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) \ @ENABLE_TESTS_TRUE@ $(DBUS_CFLAGS) diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index e9ccdae7..8f51fc37 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -9,7 +9,6 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\""libnm-util"\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(UUID_CFLAGS) diff --git a/libnm-util/Makefile.in b/libnm-util/Makefile.in index 9de83a6c..0b5513e2 100644 --- a/libnm-util/Makefile.in +++ b/libnm-util/Makefile.in @@ -590,8 +590,8 @@ AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/shared \ -I$(top_builddir)/shared -DG_LOG_DOMAIN=\""libnm-util"\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) $(UUID_CFLAGS) $(am__append_1) $(am__append_2) + $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(UUID_CFLAGS) $(am__append_1) \ + $(am__append_2) lib_LTLIBRARIES = libnm-util.la libnm_util_include_HEADERS = \ $(top_builddir)/shared/nm-version-macros.h \ diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h index c4105fd4..9053fad2 100644 --- a/libnm-util/NetworkManager.h +++ b/libnm-util/NetworkManager.h @@ -92,8 +92,6 @@ * @NM_STATE_CONNECTED_GLOBAL: there is global IPv4 and/or IPv6 Internet connectivity * * #NMState values indicate the current overall networking state. - * - * (Corresponds to the NM_STATE type in nm-manager.xml.) **/ typedef enum { NM_STATE_UNKNOWN = 0, @@ -120,8 +118,6 @@ typedef enum { * @NM_CONNECTIVITY_FULL: The host is connected to a network, and * appears to be able to reach the full Internet. * - * (Corresponds to the NM_CONNECTIVITY type in nm-manager.xml.) - * * Since: 0.9.8.6 */ typedef enum { @@ -159,8 +155,6 @@ typedef enum { * * #NMDeviceType values indicate the type of hardware represented by * an #NMDevice. - * - * (Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.) **/ typedef enum { NM_DEVICE_TYPE_UNKNOWN = 0, @@ -194,8 +188,6 @@ typedef enum { * @NM_DEVICE_CAP_IS_SOFTWARE: this device is a software device * * General device capability flags. - * - * (Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.) **/ typedef enum { /*< flags >*/ NM_DEVICE_CAP_NONE = 0x00000000, @@ -221,8 +213,6 @@ typedef enum { /*< flags >*/ * @NM_WIFI_DEVICE_CAP_FREQ_5GHZ: device supports 5GHz frequencies * * 802.11 specific device encryption and authentication capabilities. - * - * (Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.) **/ typedef enum { /*< flags >*/ NM_WIFI_DEVICE_CAP_NONE = 0x00000000, @@ -247,8 +237,6 @@ typedef enum { /*< flags >*/ * encryption (usually means WEP) * * 802.11 access point flags. - * - * (Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.) **/ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/ NM_802_11_AP_FLAGS_NONE = 0x00000000, @@ -279,8 +267,6 @@ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/ * 802.11 access point security and authentication flags. These flags describe * the current security requirements of an access point as determined from the * access point's beacon. - * - * (Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.) **/ typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/ NM_802_11_AP_SEC_NONE = 0x00000000, @@ -310,8 +296,6 @@ typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/ * access point objects; used only for hotspot mode on the local machine. * * Indicates the 802.11 mode an access point or device is currently in. - * - * (Corresponds to the NM_802_11_MODE type in generic-types.xml.) **/ typedef enum { /*< underscore_name=nm_802_11_mode >*/ NM_802_11_MODE_UNKNOWN = 0, @@ -328,8 +312,6 @@ typedef enum { /*< underscore_name=nm_802_11_mode >*/ * * #NMBluetoothCapabilities values indicate the usable capabilities of a * Bluetooth device. - * - * (Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.) **/ typedef enum { /*< flags >*/ NM_BT_CAPABILITY_NONE = 0x00000000, @@ -352,8 +334,6 @@ typedef enum { /*< flags >*/ * technology families a modem device supports. For more information on the * specific access technologies the device supports use the ModemManager D-Bus * API. - * - * (Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.) **/ typedef enum { /*< flags >*/ NM_DEVICE_MODEM_CAPABILITY_NONE = 0x00000000, @@ -401,8 +381,6 @@ typedef enum { /*< flags >*/ * that connection. The network connection may still be valid. * @NM_DEVICE_STATE_FAILED: the device failed to connect to the requested * network and is cleaning up the connection request - * - * (Corresponds to the NM_DEVICE_STATE type in nm-device.xml.) **/ typedef enum { NM_DEVICE_STATE_UNKNOWN = 0, @@ -488,8 +466,6 @@ typedef enum { * @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed * * Device state change reason codes - * - * (Corresponds to the NM_DEVICE_STATE_REASON type in nm-device.xml.) */ typedef enum { NM_DEVICE_STATE_REASON_NONE = 0, @@ -573,8 +549,6 @@ typedef enum { * #NMActiveConnectionState values indicate the state of a connection to a * specific network while it is starting, connected, or disconnecting from that * network. - * - * (Corresponds to the NM_ACTIVE_CONNECTION_STATE type in nm-active-connection.xml.) **/ typedef enum { NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0, diff --git a/libnm-util/NetworkManagerVPN.h b/libnm-util/NetworkManagerVPN.h index 882d3973..75661986 100644 --- a/libnm-util/NetworkManagerVPN.h +++ b/libnm-util/NetworkManagerVPN.h @@ -78,8 +78,6 @@ * @NM_VPN_SERVICE_STATE_STOPPED: The plugin has disconnected from the VPN server. * * VPN daemon states - * - * (Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.) */ typedef enum NMVPNServiceState { NM_VPN_SERVICE_STATE_UNKNOWN = 0, @@ -108,8 +106,6 @@ typedef enum NMVPNServiceState { * @NM_VPN_CONNECTION_STATE_DISCONNECTED: The VPN connection is disconnected. * * VPN connection states - * - * (Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.) */ typedef enum NMVPNConnectionState { NM_VPN_CONNECTION_STATE_UNKNOWN = 0, @@ -150,8 +146,6 @@ typedef enum NMVPNConnectionState { * deleted from settings. * * VPN connection state reasons - * - * (Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.) */ typedef enum NMVPNConnectionStateReason { NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0, @@ -176,8 +170,6 @@ typedef enum NMVPNConnectionStateReason { * the VPN plugin. * * VPN plugin failure reasons - * - * (Corresponds to the NM_VPN_PLUGIN_FAILURE type in nm-vpn-plugin.xml.) */ typedef enum { NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED, diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 084f0f54..717260af 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -37,9 +37,6 @@ #include "nm-setting-private.h" #include "crypto.h" -/* Embed the commit id in the build binary */ -static const char *const __nm_git_sha = NM_STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : ""; - /** * SECTION:nm-utils * @short_description: Utility functions @@ -234,8 +231,6 @@ static gboolean initialized = FALSE; gboolean nm_utils_init (GError **error) { - (void) __nm_git_sha; - if (!initialized) { initialized = TRUE; diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h index fd94e210..760151a6 100644 --- a/libnm-util/nm-version.h +++ b/libnm-util/nm-version.h @@ -90,4 +90,18 @@ # define NM_AVAILABLE_IN_1_2 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_4 +# define NM_DEPRECATED_IN_1_4 G_DEPRECATED +# define NM_DEPRECATED_IN_1_4_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_4 +# define NM_DEPRECATED_IN_1_4_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_4 +# define NM_AVAILABLE_IN_1_4 G_UNAVAILABLE(1,4) +#else +# define NM_AVAILABLE_IN_1_4 +#endif + #endif /* NM_VERSION_H */ diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am index eda212ed..30adafcf 100644 --- a/libnm-util/tests/Makefile.am +++ b/libnm-util/tests/Makefile.am @@ -5,7 +5,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/shared \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ -DBUILD_DIR=\"$(abs_builddir)\" \ diff --git a/libnm-util/tests/Makefile.in b/libnm-util/tests/Makefile.in index 8d5cd984..320249ac 100644 --- a/libnm-util/tests/Makefile.in +++ b/libnm-util/tests/Makefile.in @@ -716,7 +716,6 @@ with_valgrind = @with_valgrind@ @ENABLE_TESTS_TRUE@ -I$(top_builddir)/shared \ @ENABLE_TESTS_TRUE@ -I$(top_srcdir)/libnm-util \ @ENABLE_TESTS_TRUE@ -I$(top_builddir)/libnm-util \ -@ENABLE_TESTS_TRUE@ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ @ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) \ @ENABLE_TESTS_TRUE@ $(DBUS_CFLAGS) \ @ENABLE_TESTS_TRUE@ -DBUILD_DIR=\"$(abs_builddir)\" \ diff --git a/libnm/Makefile.am b/libnm/Makefile.am index 80cdccb0..e035b3cd 100644 --- a/libnm/Makefile.am +++ b/libnm/Makefile.am @@ -1,5 +1,7 @@ include $(GLIB_MAKEFILE) +@GNOME_CODE_COVERAGE_RULES@ + SUBDIRS = . tests AM_CPPFLAGS = \ @@ -12,10 +14,10 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libnm \ -DG_LOG_DOMAIN=\""libnm"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(GUDEV_CFLAGS) \ - -DNMRUNDIR=\"$(nmrundir)\" + -DNMRUNDIR=\"$(nmrundir)\" \ + $(CODE_COVERAGE_CFLAGS) include $(top_srcdir)/libnm-core/Makefile.libnm-core @@ -130,7 +132,7 @@ libnm_la_SOURCES = \ GLIB_GENERATED = nm-enum-types.h nm-enum-types.c nm_enum_types_sources = $(libnminclude_HEADERS) GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include \n' -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM +GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' libnm_la_LIBADD = \ $(top_builddir)/libnm-core/libnm-core.la \ @@ -139,6 +141,9 @@ libnm_la_LIBADD = \ $(UUID_LIBS) \ $(GUDEV_LIBS) +libnm_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) + SYMBOL_VIS_FILE=$(srcdir)/libnm.ver libnm_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ diff --git a/libnm/Makefile.in b/libnm/Makefile.in index 81d1aa4a..899dd6da 100644 --- a/libnm/Makefile.in +++ b/libnm/Makefile.in @@ -564,10 +564,10 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libnm \ -DG_LOG_DOMAIN=\""libnm"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(GUDEV_CFLAGS) \ - -DNMRUNDIR=\"$(nmrundir)\" + -DNMRUNDIR=\"$(nmrundir)\" \ + $(CODE_COVERAGE_CFLAGS) core = $(top_srcdir)/libnm-core core_build = $(top_builddir)/libnm-core @@ -786,7 +786,7 @@ libnm_la_SOURCES = \ GLIB_GENERATED = nm-enum-types.h nm-enum-types.c nm_enum_types_sources = $(libnminclude_HEADERS) GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include \n' -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM +GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' libnm_la_LIBADD = \ $(top_builddir)/libnm-core/libnm-core.la \ $(top_builddir)/introspection/libnmdbus.la \ @@ -794,10 +794,10 @@ libnm_la_LIBADD = \ $(UUID_LIBS) \ $(GUDEV_LIBS) -SYMBOL_VIS_FILE = $(srcdir)/libnm.ver libnm_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ -version-info "1:0:1" +SYMBOL_VIS_FILE = $(srcdir)/libnm.ver ### BUILT_SOURCES = $(GLIB_GENERATED) @@ -1370,6 +1370,8 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ include $(GLIB_MAKEFILE) +@GNOME_CODE_COVERAGE_RULES@ + -include $(INTROSPECTION_MAKEFILE) @HAVE_INTROSPECTION_TRUE@NM-1.0.gir: libnm.la diff --git a/libnm/nm-enum-types.c b/libnm/nm-enum-types.c index e10e9f78..b27ccd73 100644 --- a/libnm/nm-enum-types.c +++ b/libnm/nm-enum-types.c @@ -6,6 +6,7 @@ #include "config.h" #include "nm-enum-types.h" +#include "nm-default.h" #include "nm-version-macros.h" #include "NetworkManager.h" @@ -113,27 +114,6 @@ nm_client_error_get_type (void) return g_define_type_id__volatile; } -GType -nm_wimax_nsp_network_type_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - - if (g_once_init_enter (&g_define_type_id__volatile)) - { - static const GEnumValue values[] = { - { NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN, "NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN", "unknown" }, - { NM_WIMAX_NSP_NETWORK_TYPE_HOME, "NM_WIMAX_NSP_NETWORK_TYPE_HOME", "home" }, - { NM_WIMAX_NSP_NETWORK_TYPE_PARTNER, "NM_WIMAX_NSP_NETWORK_TYPE_PARTNER", "partner" }, - { NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER, "NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER", "roaming-partner" }, - { 0, NULL, NULL } - }; - GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMWimaxNspNetworkType"), values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - - return g_define_type_id__volatile; -} diff --git a/libnm/nm-enum-types.h b/libnm/nm-enum-types.h index 93d9eb8e..451c6964 100644 --- a/libnm/nm-enum-types.h +++ b/libnm/nm-enum-types.h @@ -16,8 +16,6 @@ GType nm_client_permission_result_get_type (void) G_GNUC_CONST; #define NM_TYPE_CLIENT_PERMISSION_RESULT (nm_client_permission_result_get_type ()) GType nm_client_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_CLIENT_ERROR (nm_client_error_get_type ()) -GType nm_wimax_nsp_network_type_get_type (void) G_GNUC_CONST; -#define NM_TYPE_WIMAX_NSP_NETWORK_TYPE (nm_wimax_nsp_network_type_get_type ()) G_END_DECLS #endif /* __NM_ENUM_TYPES_H__ */ diff --git a/libnm/nm-keyfile-docs.xml b/libnm/nm-keyfile-docs.xml index 663f8a2e..33635aa7 100644 --- a/libnm/nm-keyfile-docs.xml +++ b/libnm/nm-keyfile-docs.xml @@ -14,7 +14,7 @@ - @@ -29,7 +29,7 @@ or semicolon separated list of 6 decimal bytes (obsolete)"/> - @@ -81,10 +81,10 @@ under [vpn-secrets] section."/> - - @@ -93,10 +93,10 @@ under [vpn-secrets] section."/> - - diff --git a/libnm/nm-wimax-nsp.h b/libnm/nm-wimax-nsp.h index cdc7b236..5dd982ef 100644 --- a/libnm/nm-wimax-nsp.h +++ b/libnm/nm-wimax-nsp.h @@ -41,22 +41,6 @@ G_BEGIN_DECLS #define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality" #define NM_WIMAX_NSP_NETWORK_TYPE "network-type" -/** - * NMWimaxNspNetworkType: - * @NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN: unknown network type - * @NM_WIMAX_NSP_NETWORK_TYPE_HOME: home network - * @NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: partner network - * @NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: roaming partner network - * - * WiMAX network type. - */ -typedef enum { - NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN = 0, - NM_WIMAX_NSP_NETWORK_TYPE_HOME = 1, - NM_WIMAX_NSP_NETWORK_TYPE_PARTNER = 2, - NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 3 -} NMWimaxNspNetworkType; - struct _NMWimaxNsp { NMObject parent; }; diff --git a/libnm/tests/Makefile.am b/libnm/tests/Makefile.am index fd9edb6f..d2944c4c 100644 --- a/libnm/tests/Makefile.am +++ b/libnm/tests/Makefile.am @@ -8,7 +8,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libnm-core \ -I$(top_builddir)/libnm-core \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \ $(GLIB_CFLAGS) diff --git a/libnm/tests/Makefile.in b/libnm/tests/Makefile.in index 455a0761..15846792 100644 --- a/libnm/tests/Makefile.in +++ b/libnm/tests/Makefile.in @@ -701,7 +701,6 @@ with_valgrind = @with_valgrind@ @ENABLE_TESTS_TRUE@ -I$(top_srcdir)/libnm-core \ @ENABLE_TESTS_TRUE@ -I$(top_builddir)/libnm-core \ @ENABLE_TESTS_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -@ENABLE_TESTS_TRUE@ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ @ENABLE_TESTS_TRUE@ -DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \ @ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) diff --git a/man/Makefile.am b/man/Makefile.am index 65d8d007..ce84194c 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -17,10 +17,16 @@ XSLTPROC_MAN_FLAGS = \ if ENABLE_GTK_DOC -%.8: %.xml +%.1: %.xml common.ent $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< -%.5: %.xml +%.5: %.xml common.ent + $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< + +%.7: %.xml common.ent + $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< + +%.8: %.xml common.ent $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< endif @@ -38,25 +44,13 @@ NetworkManager.conf.xml: $(srcdir)/NetworkManager.conf.xml.in if BUILD_SETTING_DOCS nm-settings.xml: nm-settings.xsl $(top_builddir)/libnm/nm-setting-docs.xml - $(AM_V_GEN) xsltproc \ - --output $@ \ - --stringparam version $(NM_VERSION) \ - --stringparam date "`date +'%d %B %Y'`" \ - $^ + $(AM_V_GEN) xsltproc --output $@ $^ nm-settings-keyfile.xml: nm-settings-keyfile.xsl $(top_builddir)/libnm/nm-keyfile-docs.xml - $(AM_V_GEN) xsltproc \ - --output $@ \ - --stringparam version $(NM_VERSION) \ - --stringparam date "`date +'%d %B %Y'`" \ - $^ + $(AM_V_GEN) xsltproc --output $@ $^ nm-settings-ifcfg-rh.xml: nm-settings-ifcfg-rh.xsl $(top_builddir)/libnm/nm-ifcfg-rh-docs.xml - $(AM_V_GEN) xsltproc \ - --output $@ \ - --stringparam version $(NM_VERSION) \ - --stringparam date "`date +'%d %B %Y'`" \ - $^ + $(AM_V_GEN) xsltproc --output $@ $^ CLEANFILES += \ nm-settings.xml \ @@ -65,63 +59,78 @@ CLEANFILES += \ endif -configure_generated_man_pages = \ - nmcli.1 \ - nmtui.1 \ - nm-online.1 \ - nm-system-settings.conf.5 - -docbook_generated_man_pages = \ - NetworkManager.8 \ - NetworkManager.conf.5 \ - nmcli-examples.5 +man_pages = \ + nmcli.1 \ + nmtui.1 \ + nm-online.1 \ + NetworkManager.conf.5 \ + nmcli-examples.7 \ + NetworkManager.8 -docbook_autogenerated_man_pages = \ - nm-settings.5 \ +autogenerated_man_pages = \ + nm-settings.5 \ nm-settings-keyfile.5 if CONFIG_PLUGIN_IFCFG_RH -docbook_autogenerated_man_pages += nm-settings-ifcfg-rh.5 +autogenerated_man_pages += nm-settings-ifcfg-rh.5 else EXTRA_DIST += nm-settings-ifcfg-rh.5 endif -EXTRA_DIST += \ - nm-settings.xml \ - nm-settings.xsl \ - nm-settings-keyfile.xml \ - nm-settings-keyfile.xsl \ - nm-settings-ifcfg-rh.xml \ - nm-settings-ifcfg-rh.xsl \ - $(addsuffix .xml,$(basename $(docbook_generated_man_pages))) \ - $(docbook_generated_man_pages) \ - $(docbook_autogenerated_man_pages) - -man_MANS += $(configure_generated_man_pages) - -links = nmtui-edit nmtui-connect nmtui-hostname +EXTRA_DIST += \ + nm-settings.xml \ + nm-settings.xsl \ + nm-settings-keyfile.xml \ + nm-settings-keyfile.xsl \ + nm-settings-ifcfg-rh.xml \ + nm-settings-ifcfg-rh.xsl \ + $(addsuffix .xml,$(basename $(man_pages))) \ + $(man_pages) \ + $(autogenerated_man_pages) + +nmtui_links = nmtui-edit nmtui-connect nmtui-hostname +NetworkManager_conf_links = nm-system-settings.conf + +# Implement a || condition +if INSTALL_PREGEN_MANPAGES +install_manpages = true +else +if ENABLE_GTK_DOC +install_manpages = true +endif +endif install-data-hook: - for link in $(links); do \ - ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \ - done + if test -n "$(install_manpages)"; then \ + for link in $(nmtui_links); do \ + ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \ + done; \ + for link in $(NetworkManager_conf_links); do \ + ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/$$link.5; \ + done; \ + fi uninstall-hook: - for link in $(links); do \ - rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \ - done + if test -n "$(install_manpages)"; then \ + for link in $(nmtui_links); do \ + rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \ + done; \ + for link in $(NetworkManager_conf_links); do \ + rm -f $(DESTDIR)$(mandir)/man5/$$link.5; \ + done; \ + fi if ENABLE_GTK_DOC -man_MANS += $(docbook_generated_man_pages) -CLEANFILES += $(docbook_generated_man_pages) +man_MANS += $(man_pages) +CLEANFILES += $(man_pages) if SETTING_DOCS_AVAILABLE -man_MANS += $(docbook_autogenerated_man_pages) -CLEANFILES += $(docbook_autogenerated_man_pages) +man_MANS += $(autogenerated_man_pages) +CLEANFILES += $(autogenerated_man_pages) endif else if INSTALL_PREGEN_MANPAGES man_MANS += \ - $(docbook_generated_man_pages) \ - $(docbook_autogenerated_man_pages) + $(man_pages) \ + $(autogenerated_man_pages) endif endif diff --git a/man/Makefile.in b/man/Makefile.in index 07c8d369..551f1a90 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -94,13 +94,13 @@ host_triplet = @host@ @CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_2 = nm-settings-ifcfg-rh.5 @CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_3 = nm-settings-ifcfg-rh.5 -@ENABLE_GTK_DOC_TRUE@am__append_4 = $(docbook_generated_man_pages) -@ENABLE_GTK_DOC_TRUE@am__append_5 = $(docbook_generated_man_pages) -@ENABLE_GTK_DOC_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_6 = $(docbook_autogenerated_man_pages) -@ENABLE_GTK_DOC_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_7 = $(docbook_autogenerated_man_pages) +@ENABLE_GTK_DOC_TRUE@am__append_4 = $(man_pages) +@ENABLE_GTK_DOC_TRUE@am__append_5 = $(man_pages) +@ENABLE_GTK_DOC_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_6 = $(autogenerated_man_pages) +@ENABLE_GTK_DOC_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_7 = $(autogenerated_man_pages) @ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@am__append_8 = \ -@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@ $(docbook_generated_man_pages) \ -@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@ $(docbook_autogenerated_man_pages) +@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@ $(man_pages) \ +@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@ $(autogenerated_man_pages) subdir = man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -122,8 +122,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = nm-system-settings.conf.5 nm-online.1 nmcli.1 \ - nmtui.1 +CONFIG_CLEAN_FILES = common.ent CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -173,15 +172,14 @@ am__uninstall_files_from_dir = { \ } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(man8dir)" + "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" man5dir = $(mandir)/man5 +man7dir = $(mandir)/man7 man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/nm-online.1.in \ - $(srcdir)/nm-system-settings.conf.5.in $(srcdir)/nmcli.1.in \ - $(srcdir)/nmtui.1.in +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/common.ent.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -446,17 +444,14 @@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ with_valgrind = @with_valgrind@ -man_MANS = $(configure_generated_man_pages) $(am__append_4) \ - $(am__append_6) $(am__append_8) +man_MANS = $(am__append_4) $(am__append_6) $(am__append_8) CLEANFILES = NetworkManager.conf.xml $(am__append_1) $(am__append_5) \ $(am__append_7) EXTRA_DIST = NetworkManager.conf.xml.in $(am__append_3) \ nm-settings.xml nm-settings.xsl nm-settings-keyfile.xml \ nm-settings-keyfile.xsl nm-settings-ifcfg-rh.xml \ nm-settings-ifcfg-rh.xsl $(addsuffix .xml,$(basename \ - $(docbook_generated_man_pages))) \ - $(docbook_generated_man_pages) \ - $(docbook_autogenerated_man_pages) + $(man_pages))) $(man_pages) $(autogenerated_man_pages) XSLTPROC = xsltproc XSLTPROC_FLAGS = --xinclude --nonet XSLTPROC_MAN_FLAGS = \ @@ -468,20 +463,22 @@ XSLTPROC_MAN_FLAGS = \ --stringparam man.copyright.section.enabled 0 \ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl -configure_generated_man_pages = \ - nmcli.1 \ - nmtui.1 \ - nm-online.1 \ - nm-system-settings.conf.5 +man_pages = \ + nmcli.1 \ + nmtui.1 \ + nm-online.1 \ + NetworkManager.conf.5 \ + nmcli-examples.7 \ + NetworkManager.8 -docbook_generated_man_pages = \ - NetworkManager.8 \ - NetworkManager.conf.5 \ - nmcli-examples.5 - -docbook_autogenerated_man_pages = nm-settings.5 nm-settings-keyfile.5 \ +autogenerated_man_pages = nm-settings.5 nm-settings-keyfile.5 \ $(am__append_2) -links = nmtui-edit nmtui-connect nmtui-hostname +nmtui_links = nmtui-edit nmtui-connect nmtui-hostname +NetworkManager_conf_links = nm-system-settings.conf +@ENABLE_GTK_DOC_TRUE@@INSTALL_PREGEN_MANPAGES_FALSE@install_manpages = true + +# Implement a || condition +@INSTALL_PREGEN_MANPAGES_TRUE@install_manpages = true all: all-am .SUFFIXES: @@ -514,13 +511,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -nm-system-settings.conf.5: $(top_builddir)/config.status $(srcdir)/nm-system-settings.conf.5.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -nm-online.1: $(top_builddir)/config.status $(srcdir)/nm-online.1.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -nmcli.1: $(top_builddir)/config.status $(srcdir)/nmcli.1.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -nmtui.1: $(top_builddir)/config.status $(srcdir)/nmtui.1.in +common.ent: $(top_builddir)/config.status $(srcdir)/common.ent.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: @@ -614,6 +605,49 @@ uninstall-man5: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) +install-man7: $(man_MANS) + @$(NORMAL_INSTALL) + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man7dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.7[a-z]*$$/p'; \ + fi; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \ + done; } + +uninstall-man7: + @$(NORMAL_UNINSTALL) + @list=''; test -n "$(man7dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.7[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir) install-man8: $(man_MANS) @$(NORMAL_INSTALL) @list1=''; \ @@ -698,7 +732,7 @@ check-am: all-am check: check-am all-am: Makefile $(MANS) installdirs: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -769,7 +803,7 @@ install-info: install-info-am install-info-am: -install-man: install-man1 install-man5 install-man8 +install-man: install-man1 install-man5 install-man7 install-man8 install-pdf: install-pdf-am @@ -800,7 +834,8 @@ ps-am: uninstall-am: uninstall-man @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \ + uninstall-man8 .MAKE: install-am install-data-am install-strip uninstall-am @@ -811,20 +846,27 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 install-data-hook install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-man1 install-man5 \ - install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags-am uninstall uninstall-am uninstall-hook \ - uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 + install-man7 install-man8 install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-hook uninstall-man uninstall-man1 \ + uninstall-man5 uninstall-man7 uninstall-man8 .PRECIOUS: Makefile -@ENABLE_GTK_DOC_TRUE@%.8: %.xml +@ENABLE_GTK_DOC_TRUE@%.1: %.xml common.ent +@ENABLE_GTK_DOC_TRUE@ $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< + +@ENABLE_GTK_DOC_TRUE@%.5: %.xml common.ent +@ENABLE_GTK_DOC_TRUE@ $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< + +@ENABLE_GTK_DOC_TRUE@%.7: %.xml common.ent @ENABLE_GTK_DOC_TRUE@ $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< -@ENABLE_GTK_DOC_TRUE@%.5: %.xml +@ENABLE_GTK_DOC_TRUE@%.8: %.xml common.ent @ENABLE_GTK_DOC_TRUE@ $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< NetworkManager.conf.xml: $(srcdir)/NetworkManager.conf.xml.in $(AM_V_GEN) sed \ @@ -835,35 +877,33 @@ NetworkManager.conf.xml: $(srcdir)/NetworkManager.conf.xml.in $< >$@ @BUILD_SETTING_DOCS_TRUE@nm-settings.xml: nm-settings.xsl $(top_builddir)/libnm/nm-setting-docs.xml -@BUILD_SETTING_DOCS_TRUE@ $(AM_V_GEN) xsltproc \ -@BUILD_SETTING_DOCS_TRUE@ --output $@ \ -@BUILD_SETTING_DOCS_TRUE@ --stringparam version $(NM_VERSION) \ -@BUILD_SETTING_DOCS_TRUE@ --stringparam date "`date +'%d %B %Y'`" \ -@BUILD_SETTING_DOCS_TRUE@ $^ +@BUILD_SETTING_DOCS_TRUE@ $(AM_V_GEN) xsltproc --output $@ $^ @BUILD_SETTING_DOCS_TRUE@nm-settings-keyfile.xml: nm-settings-keyfile.xsl $(top_builddir)/libnm/nm-keyfile-docs.xml -@BUILD_SETTING_DOCS_TRUE@ $(AM_V_GEN) xsltproc \ -@BUILD_SETTING_DOCS_TRUE@ --output $@ \ -@BUILD_SETTING_DOCS_TRUE@ --stringparam version $(NM_VERSION) \ -@BUILD_SETTING_DOCS_TRUE@ --stringparam date "`date +'%d %B %Y'`" \ -@BUILD_SETTING_DOCS_TRUE@ $^ +@BUILD_SETTING_DOCS_TRUE@ $(AM_V_GEN) xsltproc --output $@ $^ @BUILD_SETTING_DOCS_TRUE@nm-settings-ifcfg-rh.xml: nm-settings-ifcfg-rh.xsl $(top_builddir)/libnm/nm-ifcfg-rh-docs.xml -@BUILD_SETTING_DOCS_TRUE@ $(AM_V_GEN) xsltproc \ -@BUILD_SETTING_DOCS_TRUE@ --output $@ \ -@BUILD_SETTING_DOCS_TRUE@ --stringparam version $(NM_VERSION) \ -@BUILD_SETTING_DOCS_TRUE@ --stringparam date "`date +'%d %B %Y'`" \ -@BUILD_SETTING_DOCS_TRUE@ $^ +@BUILD_SETTING_DOCS_TRUE@ $(AM_V_GEN) xsltproc --output $@ $^ install-data-hook: - for link in $(links); do \ - ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \ - done + if test -n "$(install_manpages)"; then \ + for link in $(nmtui_links); do \ + ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \ + done; \ + for link in $(NetworkManager_conf_links); do \ + ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/$$link.5; \ + done; \ + fi uninstall-hook: - for link in $(links); do \ - rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \ - done + if test -n "$(install_manpages)"; then \ + for link in $(nmtui_links); do \ + rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \ + done; \ + for link in $(NetworkManager_conf_links); do \ + rm -f $(DESTDIR)$(mandir)/man5/$$link.5; \ + done; \ + fi # 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. diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index 42768d74..35594cfe 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,12 +2,12 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 03/29/2016 +.\" Date: 04/05/2016 .\" Manual: Network management daemons -.\" Source: NetworkManager 1.2 +.\" Source: NetworkManager 1.1.93 .\" Language: English .\" -.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.2" "Network management daemons" +.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.1\&.93" "Network management daemons" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -301,7 +301,7 @@ to enable debug logging inside NetworkManager itself\&. .PP \fBNetworkManager.conf\fR(5), \fBnmcli\fR(1), -\fBnmcli-examples\fR(5), +\fBnmcli-examples\fR(7), \fBnm-online\fR(1), \fBnm-settings\fR(5), \fBnm-applet\fR(1), diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index d0f9acbb..72fbf38f 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,7 +2,7 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 03/29/2016 +.\" Date: 04/05/2016 .\" Manual: Configuration .\" Source: NetworkManager 1.2 .\" Language: English @@ -109,7 +109,7 @@ keyfile\&. .PP \fImonitor\-connection\-files\fR .RS 4 -Whether the configured settings plugin(s) should set up file monitors and immediately pick up changes made to connection files while NetworkManager is running\&. This is disabled by default; NetworkManager will only read the connection files at startup, and when explicitly requested via the ReloadConnections D\-Bus call\&. If this key is set to \*(Aqtrue\*(Aq, then NetworkManager will reload connection files any time they changed\&. +Whether the configured settings plugin(s) should set up file monitors and immediately pick up changes made to connection files while NetworkManager is running\&. This is disabled by default; NetworkManager will only read the connection files at startup, and when explicitly requested via the ReloadConnections D\-Bus call\&. If this key is set to \*(Aqtrue\*(Aq, then NetworkManager will reload connection files any time they changed\&. Automatic reloading is not advised because there are race conditions involved and it depends on the way how the editor updates the file\&. In some situations, NetworkManager might first delete and add the connection anew, instead of updating the existing one\&. Also, NetworkManager might pick up incomplete settings while the user is still editing the files\&. .RE .PP \fIauth\-polkit\fR @@ -898,7 +898,7 @@ interface\-name:vboxnet*,except:interface\-name:vboxnet2 .PP \fBNetworkManager\fR(8), \fBnmcli\fR(1), -\fBnmcli-examples\fR(5), +\fBnmcli-examples\fR(7), \fBnm-online\fR(1), \fBnm-settings\fR(5), \fBnm-applet\fR(1), diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 597f373f..3427cd64 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -138,7 +138,13 @@ plugins-=remove-me the connection files at startup, and when explicitly requested via the ReloadConnections D-Bus call. If this key is set to 'true', then NetworkManager will reload - connection files any time they changed. + connection files any time they changed. + Automatic reloading is not advised because there are race conditions + involved and it depends on the way how the editor updates the file. + In some situations, NetworkManager might first delete and add the + connection anew, instead of updating the existing one. Also, NetworkManager + might pick up incomplete settings while the user is still editing the files. + auth-polkit @@ -1004,7 +1010,7 @@ interface-name:vboxnet*,except:interface-name:vboxnet2 NetworkManager8, nmcli1, - nmcli-examples5, + nmcli-examples7, nm-online1, nm-settings5, nm-applet1, diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in index 2a847f8f..2736065e 100644 --- a/man/NetworkManager.conf.xml.in +++ b/man/NetworkManager.conf.xml.in @@ -138,7 +138,13 @@ plugins-=remove-me the connection files at startup, and when explicitly requested via the ReloadConnections D-Bus call. If this key is set to 'true', then NetworkManager will reload - connection files any time they changed. + connection files any time they changed. + Automatic reloading is not advised because there are race conditions + involved and it depends on the way how the editor updates the file. + In some situations, NetworkManager might first delete and add the + connection anew, instead of updating the existing one. Also, NetworkManager + might pick up incomplete settings while the user is still editing the files. + auth-polkit @@ -1004,7 +1010,7 @@ interface-name:vboxnet*,except:interface-name:vboxnet2 NetworkManager8, nmcli1, - nmcli-examples5, + nmcli-examples7, nm-online1, nm-settings5, nm-applet1, diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml index 39dfe484..3c4b733e 100644 --- a/man/NetworkManager.xml +++ b/man/NetworkManager.xml @@ -1,7 +1,10 @@ - + +"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +%entities; +]> + + + + + nm-online + NetworkManager developers + + + + nm-online + 1 + NetworkManager + General Commands Manual + &NM_VERSION; + + + + nm-online + ask NetworkManager whether the network is connected + + + + + nm-online + OPTIONS + + + + Description + nm-online is a utility to find out whether we are + online. It is done by asking NetworkManager about its status. When run, + nm-online waits until NetworkManager reports an active + connection, or specified timeout expires. On exit, the returned status code + should be checked (see the return codes below). + + By default NetworkManager waits for IPv4 dynamic addressing to complete + but does not wait for the auto IPv6 dynamic addressing. To + wait for IPv6 addressing to complete, either (1) change the network + connection's IPv6 may-fail setting to no, + and/or (2) change the IPv6 addressing method to manual or + dhcp, to indicate that IPv6 connectivity is expected. + + + Options + + + + + + + + seconds + + + + Time to wait for a connection, in seconds. If the option is not provided, + the default timeout is 30 seconds. + + + + + + + + + + + + Exit immediately if NetworkManager is not running or connecting. + + + + + + + + + + + Don't print anything. + + + + + + + + + + + Wait for NetworkManager startup to complete, rather than waiting for + network connectivity specifically. Startup is considered complete once + NetworkManager has activated (or attempted to activate) every auto-activate + connection which is available given the current network state. (This is + generally only useful at boot time; after startup has completed, + nm-online -s will just return immediately, regardless of the + current network state.) + + + + + + + Exit Status + + nm-online exits with status 0 if it succeeds, a value + greater than 0 is returned if an error occurs. + + + + 0 + + Success – already online or connection established within given timeout. + + + + + 1 + + Offline or not online within given timeout. + + + + + 2 + + Unknown or unspecified error. + + + + + + + See Also + nmcli1, + NetworkManager8. + + + diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index 7b848128..6eef8eb8 100644 --- a/man/nm-settings-ifcfg-rh.5 +++ b/man/nm-settings-ifcfg-rh.5 @@ -1,13 +1,13 @@ '\" t .\" Title: nm-settings-ifcfg-rh -.\" Author: [see the "AUTHOR" section] +.\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 29 March 2016 +.\" Date: 04/05/2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.1.92 +.\" Source: NetworkManager 1.1.93 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.1\&.92" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.1\&.93" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -312,7 +312,7 @@ is used, NetworkManager assigns the interface 10\&.42\&.0\&.1, or it uses the fi .PP See the next section for detailed mapping of NetworkManager properties and \fIifcfg\-rh\fR -variables\&. Variable names, format and usage differences in NetworkManager and initscripts are documented in the tables bellow\&. +variables\&. Variable names, format and usage differences in NetworkManager and initscripts are documented in the tables below\&. .SH "DETAILS" .PP \fIifcfg\-rh\fR @@ -2581,9 +2581,6 @@ ask unused \- in some situations it cannot be automatically determined that a secret is required or not\&. This flag hints that the secret is not required and should not be requested from the user\&. .RE -.SH "AUTHOR" -.PP -NetworkManager developers .SH "FILES" .PP /etc/sysconfig/network\-scripts/ifcfg\-* @@ -2597,6 +2594,9 @@ NetworkManager developers /usr/share/doc/initscripts/sysconfig\&.txt .SH "SEE ALSO" .PP -https://developer\&.gnome\&.org/NetworkManager/unstable/ref\-settings\&.html -.PP -nm\-settings(5), nm\-settings\-keyfile(5), NetworkManager(8), NetworkManager\&.conf(5), nmcli(1), nmcli\-examples(5) +\fBnm-settings\fR(5), +\fBnm-settings-keyfile\fR(5), +\fBNetworkManager\fR(8), +\fBNetworkManager.conf\fR(5), +\fBnmcli\fR(1), +\fBnmcli-examples\fR(7) diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index ef8e1df9..02b6bb14 100644 --- a/man/nm-settings-ifcfg-rh.xml +++ b/man/nm-settings-ifcfg-rh.xml @@ -1,6 +1,6 @@ -29 March 2016nm-settings-ifcfg-rh5NetworkManagerConfiguration1.1.92nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDESCRIPTION +nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.1.93nm-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 @@ -19,7 +19,7 @@ The main reason for using ifcfg-rh plugin is the compatibility with legacy configurations for ifup and ifdown (initscripts). - File Format + File Format The ifcfg-rh config format is a simple text file containing VARIABLE="value" lines. The format is described in sysconfig.txt of initscripts package. Note that the configuration files @@ -131,7 +131,7 @@ DEVICETYPE=TeamPort The UUID values in the config files must be unique. You can use uuidgen command line tool to generate such values. Alternatively, you can leave out UUID entirely. In that case NetworkManager will generate a UUID based on the file name. - Differences against initscripts + Differences against initscripts The main differences of NetworkManager ifcfg-rh plugin and traditional initscripts are: NM_CONTROLLED=yes|no @@ -164,8 +164,8 @@ DEVICETYPE=TeamPort if configured. See the next section for detailed mapping of NetworkManager properties and ifcfg-rh variables. Variable names, format and usage - differences in NetworkManager and initscripts are documented in the tables bellow. - DETAILSifcfg-rh plugin variables marked with (+) + differences in NetworkManager and initscripts are documented in the tables below. + Detailsifcfg-rh plugin variables marked with (+) are NetworkManager specific extensions not understood by traditional initscripts.
802-1x settingPropertyIfcfg-rh VariableDefaultDescriptioneapIEEE_8021X_EAP_METHODS(+)EAP method for 802.1X authentication. @@ -367,4 +367,9 @@ Allowed values: default, never, alwaysask - the associated password is not saved but it will be requested from the user each time it is required.unused - in some situations it cannot be automatically determined that a secret is required or not. This flag hints that the secret is not required and should - not be requested from the user.AUTHORNetworkManager developersFILES/etc/sysconfig/network-scripts/ifcfg-*/etc/sysconfig/network-scripts/keys-*/etc/sysconfig/network-scripts/route-*/etc/sysconfig/network-scripts/route6-*/usr/share/doc/initscripts/sysconfig.txtSEE ALSOhttps://developer.gnome.org/NetworkManager/unstable/ref-settings.htmlnm-settings(5), nm-settings-keyfile(5), NetworkManager(8), NetworkManager.conf(5), nmcli(1), nmcli-examples(5) + not be requested from the user.Files/etc/sysconfig/network-scripts/ifcfg-*/etc/sysconfig/network-scripts/keys-*/etc/sysconfig/network-scripts/route-*/etc/sysconfig/network-scripts/route6-*/usr/share/doc/initscripts/sysconfig.txtSee Alsonm-settings5, + nm-settings-keyfile5, + NetworkManager8, + NetworkManager.conf5, + nmcli1, + nmcli-examples7 diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl index c648e65f..5a9f8d6a 100644 --- a/man/nm-settings-ifcfg-rh.xsl +++ b/man/nm-settings-ifcfg-rh.xsl @@ -1,4 +1,8 @@ + +%entities; +]> @@ -12,28 +16,25 @@ doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" /> - - - - + nm-settings-ifcfg-rh + NetworkManager developers nm-settings-ifcfg-rh 5 NetworkManager Configuration - + &NM_VERSION; nm-settings-ifcfg-rh Description of ifcfg-rh settings plugin - - DESCRIPTION + Description NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings @@ -58,8 +59,7 @@ (initscripts). - - File Format + File Format The ifcfg-rh config format is a simple text file containing VARIABLE="value" lines. The format is described in sysconfig.txt @@ -205,8 +205,7 @@ DEVICETYPE=TeamPort - - Differences against initscripts + Differences against initscripts The main differences of NetworkManager ifcfg-rh plugin and traditional initscripts are: @@ -266,12 +265,11 @@ DEVICETYPE=TeamPort See the next section for detailed mapping of NetworkManager properties and ifcfg-rh variables. Variable names, format and usage - differences in NetworkManager and initscripts are documented in the tables bellow. + differences in NetworkManager and initscripts are documented in the tables below. - - DETAILS + Details ifcfg-rh plugin variables marked with (+) are NetworkManager specific extensions not understood by traditional initscripts. @@ -305,26 +303,20 @@ DEVICETYPE=TeamPort - - AUTHOR - - - NetworkManager developers - - - - - FILES + Files /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/network-scripts/keys-* /etc/sysconfig/network-scripts/route-* /etc/sysconfig/network-scripts/route6-* /usr/share/doc/initscripts/sysconfig.txt - - SEE ALSO - https://developer.gnome.org/NetworkManager/unstable/ref-settings.html - nm-settings(5), nm-settings-keyfile(5), NetworkManager(8), NetworkManager.conf(5), nmcli(1), nmcli-examples(5) + See Also + nm-settings5, + nm-settings-keyfile5, + NetworkManager8, + NetworkManager.conf5, + nmcli1, + nmcli-examples7 diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index ef5069ff..aa258355 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -1,13 +1,13 @@ '\" t .\" Title: nm-settings-keyfile -.\" Author: [see the "AUTHOR" section] +.\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 29 March 2016 +.\" Date: 04/05/2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.1.92 +.\" Source: NetworkManager 1.1.93 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.1\&.92" "Configuration" +.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.1\&.93" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -46,7 +46,7 @@ The \fIkeyfile\fR config format is a simple \&.ini\-style format\&. It consists of sections (groups) of key\-value pairs\&. Each section corresponds to a setting name as described in the settings specification (\fBnm-settings\fR(5))\&. Each configuration key/value pair in the section is one of the properties listed in the settings specification\&. The majority of properties of the specification is written in the same format into the \fIkeyfile\fR -too\&. However some values are inconvenient for people to use\&. These are stored in the files in more readable ways\&. These properties are described bellow\&. An example could be IP addresses that are not written as integer arrays, but more reasonably as "1\&.2\&.3\&.4/12 1\&.2\&.3\&.254"\&. More information of the generic key file format can be found at +too\&. However some values are inconvenient for people to use\&. These are stored in the files in more readable ways\&. These properties are described below\&. An example could be IP addresses that are not written as integer arrays, but more reasonably as "1\&.2\&.3\&.4/12 1\&.2\&.3\&.254"\&. More information of the generic key file format can be found at \m[blue]\fBGLib key file format\fR\m[]\&\s-2\u[1]\d\s+2 (Lines beginning with a \*(Aq#\*(Aq are comments, lists are separated by character ; @@ -207,7 +207,7 @@ id=4 \fIkeyfile\fR plugin variables for the majority of NetworkManager properties have one\-to\-one mapping\&. It means a NetworkManager property is stored in the keyfile as a variable of the same name and in the same format\&. There are several exceptions to this rule, mainly for making keyfile syntax easier for humans\&. The exceptions handled specially by \fIkeyfile\fR -plugin are listed bellow\&. Refer to +plugin are listed below\&. Refer to \fBnm-settings\fR(5) for all available settings and properties and their description\&. .PP @@ -251,7 +251,7 @@ mac\-address T}:T{ mac\-address T}:T{ -ususal hex\-digits\-and\-colons notation +usual hex\-digits\-and\-colons notation T}:T{ MAC address in traditional hex\-digits\-and\-colons notation, or semicolon separated list of 6 decimal bytes (obsolete)\fB @@ -284,7 +284,7 @@ mac\-address T}:T{ mac\-address T}:T{ -ususal hex\-digits\-and\-colons notation +usual hex\-digits\-and\-colons notation T}:T{ MAC address in traditional hex\-digits\-and\-colons notation, or or semicolon separated list of 20 decimal bytes (obsolete)\fB @@ -535,7 +535,7 @@ mac\-address T}:T{ mac\-address T}:T{ -ususal hex\-digits\-and\-colons notation +usual hex\-digits\-and\-colons notation T}:T{ MAC address in traditional hex\-digits\-and\-colons notation (e\&.g\&. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e\&.g\&. 0;34;104;18;121;162) T} @@ -544,7 +544,7 @@ cloned\-mac\-address T}:T{ cloned\-mac\-address T}:T{ -ususal hex\-digits\-and\-colons notation +usual hex\-digits\-and\-colons notation T}:T{ Cloned MAC address in traditional hex\-digits\-and\-colons notation (e\&.g\&. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e\&.g\&. 0;34;104;18;121;178)\&. T} @@ -600,7 +600,7 @@ mac\-address T}:T{ mac\-address T}:T{ -ususal hex\-digits\-and\-colons notation +usual hex\-digits\-and\-colons notation T}:T{ MAC address in traditional hex\-digits\-and\-colons notation (e\&.g\&. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e\&.g\&. 0;34;104;18;121;162)\&. T} @@ -609,7 +609,7 @@ cloned\-mac\-address T}:T{ cloned\-mac\-address T}:T{ -ususal hex\-digits\-and\-colons notation +usual hex\-digits\-and\-colons notation T}:T{ Cloned MAC address in traditional hex\-digits\-and\-colons notation (e\&.g\&. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e\&.g\&. 0;34;104;18;121;178)\&. T} @@ -679,17 +679,17 @@ variable is a decimal number (0 \- 7) defined as a sum of the following values: .\} 4 \- (not\-required) \- in some situations it cannot be automatically determined that a secret is required or not\&. This flag hints that the secret is not required and should not be requested from the user\&. .RE -.SH "AUTHOR" -.PP -NetworkManager developers .SH "FILES" .PP /etc/NetworkManager/system\-connections/* .SH "SEE ALSO" .PP -https://developer\&.gnome\&.org/NetworkManager/unstable/ref\-settings\&.html -.PP -nm\-settings(5), nm\-settings\-ifcfg\-rh(5), NetworkManager(8), NetworkManager\&.conf(5), nmcli(1), nmcli\-examples(5) +\fBnm-settings\fR(5), +\fBnm-settings-ifcfg-rh\fR(5), +\fBNetworkManager\fR(8), +\fBNetworkManager.conf\fR(5), +\fBnmcli\fR(1), +\fBnmcli-examples\fR(7) .SH "NOTES" .IP " 1." 4 GLib key file format diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index d8cdfe21..fe3c4423 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ -29 March 2016nm-settings-keyfile5NetworkManagerConfiguration1.1.92nm-settings-keyfileDescription of keyfile settings pluginDESCRIPTION +nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.1.93nm-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 @@ -14,7 +14,7 @@ For security, it will ignore files that are readable or writable by any user or group other than 'root' since private keys and passphrases may be stored in plaintext inside the file. - File Format + File Format The keyfile config format is a simple .ini-style format. It consists of sections (groups) of key-value pairs. Each section corresponds to a setting name as described in the settings specification @@ -23,7 +23,7 @@ specification. The majority of properties of the specification is written in the same format into the keyfile too. However some values are inconvenient for people to use. These are stored in the - files in more readable ways. These properties are described bellow. + files in more readable ways. These properties are described below. An example could be IP addresses that are not written as integer arrays, but more reasonably as "1.2.3.4/12 1.2.3.254". More information of the generic key file format can be found at @@ -122,12 +122,12 @@ type=vlan interface-name=VLAN-4A parent=eth0 id=4 - DETAILSkeyfile plugin variables for the majority of NetworkManager + Detailskeyfile plugin variables for the majority of NetworkManager properties have one-to-one mapping. It means a NetworkManager property is stored in the keyfile as a variable of the same name and in the same format. There are several exceptions to this rule, mainly for making keyfile syntax easier for humans. The exceptions handled specially by keyfile - plugin are listed bellow. Refer to + plugin are listed below. Refer to nm-settings5 for all available settings and properties and their description. Name aliases @@ -140,7 +140,7 @@ id=4
bridge setting (section)PropertyKeyfile VariableFormatDescription -mac-addressmac-addressususal hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation, or semicolon separated list of 6 decimal bytes (obsolete) +mac-addressmac-addressusual hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation, or semicolon separated list of 6 decimal bytes (obsolete) Example: mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;121;162;
@@ -150,7 +150,7 @@ Example: mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;121;16 infiniband setting (section)PropertyKeyfile VariableFormatDescription -mac-addressmac-addressususal hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation, or or semicolon separated list of 20 decimal bytes (obsolete) +mac-addressmac-addressusual hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation, or or semicolon separated list of 20 decimal bytes (obsolete) Example: mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01
@@ -208,8 +208,8 @@ Example: password=Popocatepetl 802-3-ethernet setting (section)PropertyKeyfile VariableFormatDescription -mac-addressmac-addressususal hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162) -cloned-mac-addresscloned-mac-addressususal hex-digits-and-colons notationCloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178). +mac-addressmac-addressusual hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162) +cloned-mac-addresscloned-mac-addressusual hex-digits-and-colons notationCloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).mac-address-blacklistmac-address-blacklistlist of MACs (separated with semicolons)MAC address blacklist. Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78 @@ -219,8 +219,8 @@ Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78ssidssidstring (or decimal-byte list - obsolete)SSID of Wi-Fi network. Example: ssid=Quick Net -mac-addressmac-addressususal hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162). -cloned-mac-addresscloned-mac-addressususal hex-digits-and-colons notationCloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178). +mac-addressmac-addressusual hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162). +cloned-mac-addresscloned-mac-addressusual hex-digits-and-colons notationCloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).mac-address-blacklistmac-address-blacklistlist of MACs (separated with semicolons)MAC address blacklist. Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78 @@ -234,4 +234,9 @@ Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:782 - (not-saved) - this secret should not be saved but should be requested from the user each time it is required.4 - (not-required) - in some situations it cannot be automatically determined that a secret is required or not. This flag hints that the secret is not required - and should not be requested from the user.AUTHORNetworkManager developersFILES/etc/NetworkManager/system-connections/*SEE ALSOhttps://developer.gnome.org/NetworkManager/unstable/ref-settings.htmlnm-settings(5), nm-settings-ifcfg-rh(5), NetworkManager(8), NetworkManager.conf(5), nmcli(1), nmcli-examples(5) + and should not be requested from the user.Files/etc/NetworkManager/system-connections/*See Alsonm-settings5, + nm-settings-ifcfg-rh5, + NetworkManager8, + NetworkManager.conf5, + nmcli1, + nmcli-examples7 diff --git a/man/nm-settings-keyfile.xsl b/man/nm-settings-keyfile.xsl index 980a573c..41e7dcdb 100644 --- a/man/nm-settings-keyfile.xsl +++ b/man/nm-settings-keyfile.xsl @@ -1,4 +1,8 @@ + +%entities; +]> @@ -8,27 +12,24 @@ doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" /> - - - - + nm-settings-keyfile + NetworkManager developers nm-settings-keyfile 5 NetworkManager Configuration - + &NM_VERSION; nm-settings-keyfile Description of keyfile settings plugin - - DESCRIPTION + Description NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings @@ -48,8 +49,7 @@ in plaintext inside the file. - - File Format + File Format The keyfile config format is a simple .ini-style format. It consists of sections (groups) of key-value pairs. Each section @@ -60,7 +60,7 @@ specification. The majority of properties of the specification is written in the same format into the keyfile too. However some values are inconvenient for people to use. These are stored in the - files in more readable ways. These properties are described bellow. + files in more readable ways. These properties are described below. An example could be IP addresses that are not written as integer arrays, but more reasonably as "1.2.3.4/12 1.2.3.254". More information of the generic key file format can be found at @@ -187,15 +187,14 @@ id=4 - - DETAILS + Details keyfile plugin variables for the majority of NetworkManager properties have one-to-one mapping. It means a NetworkManager property is stored in the keyfile as a variable of the same name and in the same format. There are several exceptions to this rule, mainly for making keyfile syntax easier for humans. The exceptions handled specially by keyfile - plugin are listed bellow. Refer to + plugin are listed below. Refer to nm-settings5 for all available settings and properties and their description. @@ -242,22 +241,17 @@ id=4 - - AUTHOR - - - NetworkManager developers - - - - - FILES + Files /etc/NetworkManager/system-connections/* - - SEE ALSO - https://developer.gnome.org/NetworkManager/unstable/ref-settings.html - nm-settings(5), nm-settings-ifcfg-rh(5), NetworkManager(8), NetworkManager.conf(5), nmcli(1), nmcli-examples(5) + + See Also + nm-settings5, + nm-settings-ifcfg-rh5, + NetworkManager8, + NetworkManager.conf5, + nmcli1, + nmcli-examples7 diff --git a/man/nm-settings.5 b/man/nm-settings.5 index d24d2fbe..d1c61ade 100644 --- a/man/nm-settings.5 +++ b/man/nm-settings.5 @@ -1,13 +1,13 @@ '\" t .\" Title: nm-settings -.\" Author: [see the "AUTHOR" section] +.\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 29 March 2016 +.\" Date: 04/05/2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.1.92 +.\" Source: NetworkManager 1.1.93 .\" Language: English .\" -.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.1\&.92" "Configuration" +.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.1\&.93" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -3849,16 +3849,13 @@ property is a bitfield that contains zero or more of the following values logica .\} 0x4 (not\-required) \- in some situations it cannot be automatically determined that a secret is required or not\&. This flag hints that the secret is not required and should not be requested from the user\&. .RE -.SH "AUTHOR" -.PP -NetworkManager developers .SH "FILES" .PP /etc/NetworkManager/system\-connections -.PP or distro plugin\-specific location .SH "SEE ALSO" .PP -https://wiki\&.gnome\&.org/Projects/NetworkManager/ConfigurationSpecification -.PP -NetworkManager(8), nmcli(1), nmcli\-examples(5), NetworkManager\&.conf(5) +\fBNetworkManager\fR(8), +\fBnmcli\fR(1), +\fBnmcli-examples\fR(7), +\fBNetworkManager.conf\fR(5) diff --git a/man/nm-settings.xml b/man/nm-settings.xml index 9b709621..b1ee7208 100644 --- a/man/nm-settings.xml +++ b/man/nm-settings.xml @@ -1,6 +1,6 @@ -29 March 2016nm-settings5NetworkManagerConfiguration1.1.92nm-settingsDescription of settings and properties of NetworkManager connection profilesDESCRIPTION +nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.1.93nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will @@ -412,4 +412,7 @@ this secret; when it is required, agents will be asked to provide it.0x2 (not-saved) - this secret should not be saved but should be requested from the user each time it is required. This flag should be used for One-Time-Pad secrets, PIN codes from hardware tokens, or if the user simply does not want to save the secret.0x4 (not-required) - in some situations it cannot be automatically determined that a secret - is required or not. This flag hints that the secret is not required and should not be requested from the user.AUTHORNetworkManager developersFILES/etc/NetworkManager/system-connectionsor distro plugin-specific locationSEE ALSOhttps://wiki.gnome.org/Projects/NetworkManager/ConfigurationSpecificationNetworkManager(8), nmcli(1), nmcli-examples(5), NetworkManager.conf(5) + is required or not. This flag hints that the secret is not required and should not be requested from the user.Files/etc/NetworkManager/system-connections or distro plugin-specific locationSee AlsoNetworkManager8, + nmcli1, + nmcli-examples7, + NetworkManager.conf5 diff --git a/man/nm-settings.xsl b/man/nm-settings.xsl index b6f564c7..0fe4cabe 100644 --- a/man/nm-settings.xsl +++ b/man/nm-settings.xsl @@ -1,4 +1,8 @@ + +%entities; +]> @@ -8,27 +12,25 @@ doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" /> - - - - + nm-settings + NetworkManager developers nm-settings 5 NetworkManager Configuration - + &NM_VERSION; nm-settings Description of settings and properties of NetworkManager connection profiles - - DESCRIPTION + + Description NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When @@ -109,23 +111,16 @@ - - AUTHOR - - - NetworkManager developers - - - - - FILES - /etc/NetworkManager/system-connections - or distro plugin-specific location + + Files + /etc/NetworkManager/system-connections or distro plugin-specific location - - SEE ALSO - https://wiki.gnome.org/Projects/NetworkManager/ConfigurationSpecification - NetworkManager(8), nmcli(1), nmcli-examples(5), NetworkManager.conf(5) + + See Also + NetworkManager8, + nmcli1, + nmcli-examples7, + NetworkManager.conf5 diff --git a/man/nm-system-settings.conf.5.in b/man/nm-system-settings.conf.5.in deleted file mode 100644 index 172db112..00000000 --- a/man/nm-system-settings.conf.5.in +++ /dev/null @@ -1,25 +0,0 @@ -.\" nm-system-settings.conf(5) manual page -.\" -.\" Copyright (C) 2010 Red Hat, Inc. -.\" -.TH "nm-system-settings.conf" "5" "1 February 2010" "" -.SH NAME -nm\-system\-settings.conf \- Deprecated NetworkManager configuration file -.SH SYNOPSIS -/etc/NetworkManager/nm\-system\-settings.conf -.br -or -.br -\fI\fP/NetworkManager/nm\-system\-settings.conf -.br -where depends on your distribution or build. -.SH DESCRIPTION -.P -.I nm\-system\-settings.conf -is a deprecated configuration file for \fBNetworkManager\fP (5). While this -file can still be used, NetworkManager now defaults to reading the config -file \fP/NetworkManager/NetworkManager.conf\fP instead, falling back -to nm\-system\-settings.conf if NetworkManager.conf does not exist. -.SH "SEE ALSO" -.BR NetworkManager (8), -.BR NetworkManager.conf (5). diff --git a/man/nmcli-examples.5 b/man/nmcli-examples.5 deleted file mode 100644 index e25f8717..00000000 --- a/man/nmcli-examples.5 +++ /dev/null @@ -1,693 +0,0 @@ -'\" t -.\" Title: nmcli-examples -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 19 November 2014 -.\" Manual: Examples -.\" Source: NetworkManager 1.2 -.\" Language: English -.\" -.TH "NMCLI\-EXAMPLES" "5" "" "NetworkManager 1\&.2" "Examples" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -nmcli-examples \- usage examples of nmcli -.SH "SYNOPSIS" -.HP \w'\fBnmcli\ \fR\fB[OPTIONS...]\fR\ 'u -\fBnmcli \fR\fB[OPTIONS...]\fR -.SH "DESCRIPTION" -.PP -\fInmcli\fR -is a command\-line client for NetworkManager\&. It allows controlling NetworkManager and reporting its status\&. For more information please refer to -\fBnmcli\fR(1) -manual page\&. -.PP -The purpose of this manual page is to provide you with various examples and usage scenarios of -\fInmcli\fR\&. -.PP -Note: this page has "work\-in\-progress" status\&. -.SH "EXAMPLES" -.PP -\fBExample\ \&1.\ \&Listing available Wi-Fi APs\fR -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fB -$ nmcli device wifi list - \fR -.fi -.if n \{\ -.RE -.\} -.sp -.if n \{\ -.RS 4 -.\} -.nf -* SSID MODE CHAN RATE SIGNAL BARS SECURITY - netdatacomm_local Infra 6 54 Mbit/s 37 ▂▄__ WEP -* F1 Infra 11 54 Mbit/s 98 ▂▄▆█ WPA1 - LoremCorp Infra 1 54 Mbit/s 62 ▂▄▆_ WPA2 802\&.1X - Internet Infra 6 54 Mbit/s 29 ▂___ WPA1 - HPB110a\&.F2672A Ad\-Hoc 6 54 Mbit/s 22 ▂___ \-\- - Jozinet Infra 1 54 Mbit/s 19 ▂___ WEP - VOIP Infra 1 54 Mbit/s 20 ▂___ WEP - MARTINA Infra 4 54 Mbit/s 32 ▂▄__ WPA2 - N24PU1 Infra 7 11 Mbit/s 22 ▂___ \-\- - alfa Infra 1 54 Mbit/s 67 ▂▄▆_ WPA2 - bertnet Infra 5 54 Mbit/s 20 ▂___ WPA1 WPA2 - -.fi -.if n \{\ -.RE -.\} -.PP -This command shows how to list available Wi\-Fi networks (APs)\&. You can also use -\fI\-\-fields\fR -option for displaying different columns\&. -\fBnmcli \-f all dev wifi list\fR -will show all of them\&. -.PP -\fBExample\ \&2.\ \&Showing general information and properties for a Wi-Fi interface\fR -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fB -$ nmcli \-p \-f general,wifi\-properties device show wlan0 - \fR -.fi -.if n \{\ -.RE -.\} -.sp -.if n \{\ -.RS 4 -.\} -.nf -=============================================================================== - Device details (wlan0) -=============================================================================== -GENERAL\&.DEVICE: wlan0 -GENERAL\&.TYPE: wifi -GENERAL\&.VENDOR: Intel Corporation -GENERAL\&.PRODUCT: PRO/Wireless 5100 AGN [Shiloh] Network Connection -GENERAL\&.DRIVER: iwlwifi -GENERAL\&.DRIVER\-VERSION: 3\&.8\&.13\-100\&.fc17\&.x86_64 -GENERAL\&.FIRMWARE\-VERSION: 8\&.83\&.5\&.1 build 33692 -GENERAL\&.HWADDR: 00:1E:65:37:A1:D3 -GENERAL\&.MTU: 1500 -GENERAL\&.STATE: 100 (connected) -GENERAL\&.REASON: 0 (No reason given) -GENERAL\&.UDI: /sys/devices/pci0000:00/0000:00:1c\&.1/0000:03:00\&.0/net/wlan0 -GENERAL\&.IP\-IFACE: wlan0 -GENERAL\&.IS\-SOFTWARE: no -GENERAL\&.NM\-MANAGED: yes -GENERAL\&.AUTOCONNECT: yes -GENERAL\&.FIRMWARE\-MISSING: no -GENERAL\&.CONNECTION: My Alfa WiFi -GENERAL\&.CON\-UUID: 85194f4c\-d496\-4eec\-bae0\-d880b4cbcf26 -GENERAL\&.CON\-PATH: /org/freedesktop/NetworkManager/ActiveConnection/10 -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -WIFI\-PROPERTIES\&.WEP: yes -WIFI\-PROPERTIES\&.WPA: yes -WIFI\-PROPERTIES\&.WPA2: yes -WIFI\-PROPERTIES\&.TKIP: yes -WIFI\-PROPERTIES\&.CCMP: yes -WIFI\-PROPERTIES\&.AP: no -WIFI\-PROPERTIES\&.ADHOC: yes -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- - -.fi -.if n \{\ -.RE -.\} -.PP -This command shows information about a Wi\-Fi device\&. -.PP -\fBExample\ \&3.\ \&Listing NetworkManager polkit permissions\fR -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fB -$ nmcli general permissions - \fR -.fi -.if n \{\ -.RE -.\} -.sp -.if n \{\ -.RS 4 -.\} -.nf -PERMISSION VALUE -org\&.freedesktop\&.NetworkManager\&.enable\-disable\-network yes -org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wifi yes -org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wwan yes -org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wimax yes -org\&.freedesktop\&.NetworkManager\&.sleep\-wake no -org\&.freedesktop\&.NetworkManager\&.network\-control yes -org\&.freedesktop\&.NetworkManager\&.wifi\&.share\&.protected yes -org\&.freedesktop\&.NetworkManager\&.wifi\&.share\&.open yes -org\&.freedesktop\&.NetworkManager\&.settings\&.modify\&.system yes -org\&.freedesktop\&.NetworkManager\&.settings\&.modify\&.own yes -org\&.freedesktop\&.NetworkManager\&.settings\&.modify\&.hostname auth - -.fi -.if n \{\ -.RE -.\} -.PP -This command shows configured polkit permissions for various NetworkManager operations\&. These permissions or actions (using polkit language) are configured by a system administrator and are not meant to be changed by users\&. The usual place for the polkit configuration is /usr/share/polkit\-1/actions/org\&.freedesktop\&.NetworkManager\&.policy\&. -\fIpkaction\fR -command can display description for polkit actions\&. -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fB -pkaction \-\-action\-id org\&.freedesktop\&.NetworkManager\&.network\-control \-\-verbose - \fR -.fi -.if n \{\ -.RE -.\} -.sp -More information about polkit can be found at http://www\&.freedesktop\&.org/wiki/Software/polkit\&. -.PP -\fBExample\ \&4.\ \&Listing NetworkManager log level and domains\fR -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fB -$ nmcli general logging - \fR -.fi -.if n \{\ -.RE -.\} -.sp -.if n \{\ -.RS 4 -.\} -.nf -LEVEL DOMAINS -INFO PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,DBUS_PROPS,TEAM,CONCHECK,DCB,DISPATCH - -.fi -.if n \{\ -.RE -.\} -.PP -This command shows current NetworkManager logging status\&. -.PP -\fBExample\ \&5.\ \&Changing NetworkManager logging\fR -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fB -$ nmcli g log level DEBUG domains CORE,ETHER,IP -$ nmcli g log level INFO domains DEFAULT - \fR -.fi -.if n \{\ -.RE -.\} -.PP -The first command makes NetworkManager log in DEBUG level, and only for CORE, ETHER and IP domains\&. The second command restores the default logging state\&. Please refer to the -\fBNetworkManager.conf\fR(5) -manual page for available logging levels and domains\&. -.PP -\fBExample\ \&6.\ \&Adding a bonding master and two slave connection profiles\fR -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fB -$ nmcli con add type bond ifname mybond0 mode active\-backup -$ nmcli con add type ethernet ifname eth1 master mybond0 -$ nmcli con add type ethernet ifname eth2 master mybond0 - \fR -.fi -.if n \{\ -.RE -.\} -.PP -This example demonstrates adding a bond master connection and two slaves\&. The first command adds a master bond connection, naming the bonding interface -\fImybond0\fR -and using -\fIactive\-backup\fR -mode\&. The next two commands add slaves connections, both enslaved to -\fImybond0\fR\&. The first slave will be bound to -\fIeth1\fR -interface, the second to -\fIeth2\fR\&. -.PP -\fBExample\ \&7.\ \&Adding a team master and two slave connection profiles\fR -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fB -$ nmcli con add type team con\-name Team1 ifname Team1 config team1\-master\-json\&.conf -$ nmcli con add type ethernet con\-name Team1\-slave1 ifname em1 master Team1 -$ nmcli con add type ethernet con\-name Team1\-slave2 ifname em2 master Team1 - \fR -.fi -.if n \{\ -.RE -.\} -.PP -This example demonstrates adding a team master connection profile and two slaves\&. It is very similar to the bonding example\&. The first command adds a master team profile, naming the team interface and the profile -\fITeam1\fR\&. The team configuration for the master is read from -\fIteam1\-master\-json\&.conf\fR -file\&. Later, you can change the configuration with -\fImodify\fR -command (\fBnmcli con modify Team1 team\&.config team1\-master\-another\-json\&.conf\fR)\&. The last two commands add slaves profiles, both enslaved to -\fITeam1\fR\&. The first slave will be bound to -\fIem1\fR -interface, the second to -\fIem2\fR\&. The slaves don\*(Aqt specify -\fIconfig\fR -and thus -\fIteamd\fR -will use its default configuration\&. You will activate the whole setup by activating both slaves: -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fB -$ nmcli con up Team1\-slave1 -$ nmcli con up Team1\-slave2 - \fR -.fi -.if n \{\ -.RE -.\} -.sp -By default, the created profiles are marked for auto\-activation\&. But if another connection has been activated on the device, the new profile won\*(Aqt activate automatically and you need to activate it manually\&. -.PP -\fBExample\ \&8.\ \&Adding a bridge and two slave profiles\fR -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fB -$ nmcli con add type bridge con\-name TowerBridge ifname TowerBridge -$ nmcli con add type ethernet con\-name br\-slave\-1 ifname ens3 master TowerBridge -$ nmcli con add type ethernet con\-name br\-slave\-2 ifname ens4 master TowerBridge -$ nmcli con modify TowerBridge bridge\&.stp no - \fR -.fi -.if n \{\ -.RE -.\} -.PP -This example demonstrates adding a bridge master connection and two slaves\&. The first command adds a master bridge connection, naming the bridge interface and the profile as -\fITowerBridge\fR\&. The next two commands add slaves profiles, both will be enslaved to -\fITowerBridge\fR\&. The first slave will be tied to -\fIens3\fR -interface, the second to -\fIens4\fR\&. The last command will disable 802\&.1D STP for the TowerBridge profile\&. -.PP -\fBExample\ \&9.\ \&Adding an ethernet connection profile with manual IP configuration\fR -.sp -.if n \{\ -.RS 4 -.\} -.nf - \fB -$ nmcli con add con\-name my\-con\-em1 ifname em1 type ethernet ip4 192\&.168\&.100\&.100/24 gw4 192\&.168\&.100\&.1 ip4 1\&.2\&.3\&.4 ip6 abbe::cafe -$ nmcli con mod my\-con\-em1 ipv4\&.dns "8\&.8\&.8\&.8 8\&.8\&.4\&.4" -$ nmcli con mod my\-con\-em1 +ipv4\&.dns 1\&.2\&.3\&.4 -$ nmcli con mod my\-con\-em1 ipv6\&.dns "2001:4860:4860::8888 2001:4860:4860::8844" -$ nmcli \-p con show my\-con\-em1 - \fR - -.fi -.if n \{\ -.RE -.\} -.PP -The first command adds an Ethernet connection profile named -\fImy\-con\-em1\fR -that is bound to interface name -\fIem1\fR\&. The profile is configured with static IP addresses\&. Three addresses are added, two IPv4 addresses and one IPv6\&. The first IP 192\&.168\&.100\&.100 has a prefix of 24 (netmask equivalent of 255\&.255\&.255\&.0)\&. Gateway entry will become the default route if this profile is activated on em1 interface (and there is no connection with higher priority)\&. The next two addresses do not specify a prefix, so a default prefix will be used, i\&.e\&. 32 for IPv4 and 128 for IPv6\&. The second, third and fourth commands modify DNS parameters of the new connection profile\&. The last -\fIcon show\fR -command displays the profile so that all parameters can be reviewed\&. -.PP -\fBExample\ \&10.\ \&Escaping colon characters in tabular mode\fR -.sp -.if n \{\ -.RS 4 -.\} -.nf - \fB -$ nmcli \-t \-f general \-e yes \-m tab dev show eth0 - \fR - -.fi -.if n \{\ -.RE -.\} -.sp -.if n \{\ -.RS 4 -.\} -.nf -GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:e1000e:2\&.1\&.4\-k:1\&.8\-3:00\e:22\e:68\e:15\e:29\e:21:1500:100 (connected):0 (No reason given):/sys/devices/pci0000\e:00/0000\e:00\e:19\&.0/net/eth0:eth0:yes:yes:no:ethernet\-13:89cbcbc6\-dc85\-456c\-9c8b\-bd828fee3917:/org/freedesktop/NetworkManager/ActiveConnection/9 - -.fi -.if n \{\ -.RE -.\} -.PP -This example shows escaping colon characters in tabular mode\&. It may be useful for script processing, because \*(Aq:\*(Aq is used as a field separator\&. -.PP -\fBExample\ \&11.\ \&nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive\fR -.sp -.if n \{\ -.RS 4 -.\} -.nf -#!/bin/bash -export LC_ALL=C - -enable_disable_wifi () -{ - result=$(nmcli dev | grep "ethernet" | grep \-w "connected") - if [ \-n "$result" ]; then - nmcli radio wifi off - else - nmcli radio wifi on - fi -} - -if [ "$2" = "up" ]; then - enable_disable_wifi -fi - -if [ "$2" = "down" ]; then - enable_disable_wifi -fi - -.fi -.if n \{\ -.RE -.\} -.PP -This dispatcher script makes Wi\-Fi mutually exclusive with wired networking\&. When a wired interface is connected, Wi\-Fi will be set to airplane mode (rfkilled)\&. When the wired interface is disconnected, Wi\-Fi will be turned back on\&. Name this script e\&.g\&. 70\-wifi\-wired\-exclusive\&.sh and put it into /etc/NetworkManager/dispatcher\&.d/ directory\&. See -\fBNetworkManager\fR(8) -manual page for more information about NetworkManager dispatcher scripts\&. -.PP -\fBExample sessions of interactive connection editor\fR -.PP -\fBExample\ \&12.\ \&Adding an ethernet connection profile in interactive editor (a)\fR -.sp -.if n \{\ -.RS 4 -.\} -.nf - \fB -$ nmcli connection edit type ethernet - \fR - -.fi -.if n \{\ -.RE -.\} -.sp -.if n \{\ -.RS 4 -.\} -.nf - -===| nmcli interactive connection editor |=== - -Adding a new \*(Aq802\-3\-ethernet\*(Aq connection - -Type \*(Aqhelp\*(Aq or \*(Aq?\*(Aq for available commands\&. -Type \*(Aqdescribe [\&.]\*(Aq for detailed property description\&. - -You may edit the following settings: connection, 802\-3\-ethernet (ethernet), 802\-1x, ipv4, ipv6, dcb -nmcli> print -=============================================================================== - Connection details -=============================================================================== -connection\&.id: ethernet\-4 -connection\&.uuid: de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4 -connection\&.interface\-name: \-\- -connection\&.type: 802\-3\-ethernet -connection\&.autoconnect: yes -connection\&.autoconnect\-priority: 0 -connection\&.timestamp: 0 -connection\&.read\-only: no -connection\&.permissions: -connection\&.zone: \-\- -connection\&.master: \-\- -connection\&.slave\-type: \-\- -connection\&.secondaries: -connection\&.gateway\-ping\-timeout: 0 -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -802\-3\-ethernet\&.port: \-\- -802\-3\-ethernet\&.speed: 0 -802\-3\-ethernet\&.duplex: \-\- -802\-3\-ethernet\&.auto\-negotiate: yes -802\-3\-ethernet\&.mac\-address: \-\- -802\-3\-ethernet\&.cloned\-mac\-address: \-\- -802\-3\-ethernet\&.mac\-address\-blacklist: -802\-3\-ethernet\&.mtu: auto -802\-3\-ethernet\&.s390\-subchannels: -802\-3\-ethernet\&.s390\-nettype: \-\- -802\-3\-ethernet\&.s390\-options: -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -ipv4\&.method: auto -ipv4\&.dns: -ipv4\&.dns\-search: -ipv4\&.addresses: -ipv4\&.gateway: \-\- -ipv4\&.routes: -ipv4\&.route\-metric: \-1 -ipv4\&.ignore\-auto\-routes: no -ipv4\&.ignore\-auto\-dns: no -ipv4\&.dhcp\-client\-id: \-\- -ipv4\&.dhcp\-send\-hostname: yes -ipv4\&.dhcp\-hostname: \-\- -ipv4\&.never\-default: no -ipv4\&.may\-fail: yes -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -ipv6\&.method: auto -ipv6\&.dns: -ipv6\&.dns\-search: -ipv6\&.addresses: -ipv6\&.gateway: \-\- -ipv6\&.routes: -ipv6\&.route\-metric: \-1 -ipv6\&.ignore\-auto\-routes: no -ipv6\&.ignore\-auto\-dns: no -ipv6\&.never\-default: no -ipv6\&.may\-fail: yes -ipv6\&.ip6\-privacy: \-1 (unknown) -ipv6\&.dhcp\-hostname: \-\- -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -nmcli> goto ethernet -You may edit the following properties: port, speed, duplex, auto\-negotiate, mac\-address, cloned\-mac\-address, mac\-address\-blacklist, mtu, s390\-subchannels, s390\-nettype, s390\-options -nmcli 802\-3\-ethernet> set mtu 1492 -nmcli 802\-3\-ethernet> b -nmcli> goto ipv4\&.addresses -nmcli ipv4\&.addresses> desc - -=== [addresses] === -[NM property description] -Array of IP addresses\&. - -[nmcli specific description] -Enter a list of IPv4 addresses formatted as: - ip[/prefix], ip[/prefix],\&.\&.\&. -Missing prefix is regarded as prefix of 32\&. - -Example: 192\&.168\&.1\&.5/24, 10\&.0\&.0\&.11/24 - -nmcli ipv4\&.addresses> set 192\&.168\&.1\&.100/24 -Do you also want to set \*(Aqipv4\&.method\*(Aq to \*(Aqmanual\*(Aq? [yes]: yes -nmcli ipv4\&.addresses> -nmcli ipv4\&.addresses> print -addresses: 192\&.168\&.1\&.100/24 -nmcli ipv4\&.addresses> back -nmcli ipv4> b -nmcli> set ipv4\&.gateway 192\&.168\&.1\&.1 -nmcli> verify -Verify connection: OK -nmcli> print -=============================================================================== - Connection details -=============================================================================== -connection\&.id: ethernet\-4 -connection\&.uuid: de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4 -connection\&.interface\-name: \-\- -connection\&.type: 802\-3\-ethernet -connection\&.autoconnect: yes -connection\&.autoconnect\-priority: 0 -connection\&.timestamp: 0 -connection\&.read\-only: no -connection\&.permissions: -connection\&.zone: \-\- -connection\&.master: \-\- -connection\&.slave\-type: \-\- -connection\&.secondaries: -connection\&.gateway\-ping\-timeout: 0 -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -802\-3\-ethernet\&.port: \-\- -802\-3\-ethernet\&.speed: 0 -802\-3\-ethernet\&.duplex: \-\- -802\-3\-ethernet\&.auto\-negotiate: yes -802\-3\-ethernet\&.mac\-address: \-\- -802\-3\-ethernet\&.cloned\-mac\-address: \-\- -802\-3\-ethernet\&.mac\-address\-blacklist: -802\-3\-ethernet\&.mtu: 1492 -802\-3\-ethernet\&.s390\-subchannels: -802\-3\-ethernet\&.s390\-nettype: \-\- -802\-3\-ethernet\&.s390\-options: -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -ipv4\&.method: manual -ipv4\&.dns: -ipv4\&.dns\-search: -ipv4\&.addresses: 192\&.168\&.1\&.100/24 -ipv4\&.gateway: 192\&.168\&.1\&.1 -ipv4\&.routes: -ipv4\&.route\-metric: \-1 -ipv4\&.ignore\-auto\-routes: no -ipv4\&.ignore\-auto\-dns: no -ipv4\&.dhcp\-client\-id: \-\- -ipv4\&.dhcp\-send\-hostname: yes -ipv4\&.dhcp\-hostname: \-\- -ipv4\&.never\-default: no -ipv4\&.may\-fail: yes -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -ipv6\&.method: auto -ipv6\&.dns: -ipv6\&.dns\-search: -ipv6\&.addresses: -ipv6\&.routes: -ipv6\&.route\-metric: \-1 -ipv6\&.ignore\-auto\-routes: no -ipv6\&.ignore\-auto\-dns: no -ipv6\&.never\-default: no -ipv6\&.may\-fail: yes -ipv6\&.ip6\-privacy: \-1 (unknown) -ipv6\&.dhcp\-hostname: \-\- -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -nmcli> set ipv4\&.dns 8\&.8\&.8\&.8 8\&.8\&.4\&.4 -nmcli> print -=============================================================================== - Connection details -=============================================================================== -connection\&.id: ethernet\-4 -connection\&.uuid: de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4 -connection\&.interface\-name: \-\- -connection\&.type: 802\-3\-ethernet -connection\&.autoconnect: yes -connection\&.autoconnect\-priority: 0 -connection\&.timestamp: 0 -connection\&.read\-only: no -connection\&.permissions: -connection\&.zone: \-\- -connection\&.master: \-\- -connection\&.slave\-type: \-\- -connection\&.secondaries: -connection\&.gateway\-ping\-timeout: 0 -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -802\-3\-ethernet\&.port: \-\- -802\-3\-ethernet\&.speed: 0 -802\-3\-ethernet\&.duplex: \-\- -802\-3\-ethernet\&.auto\-negotiate: yes -802\-3\-ethernet\&.mac\-address: \-\- -802\-3\-ethernet\&.cloned\-mac\-address: \-\- -802\-3\-ethernet\&.mac\-address\-blacklist: -802\-3\-ethernet\&.mtu: 1492 -802\-3\-ethernet\&.s390\-subchannels: -802\-3\-ethernet\&.s390\-nettype: \-\- -802\-3\-ethernet\&.s390\-options: -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -ipv4\&.method: manual -ipv4\&.dns: 8\&.8\&.8\&.8,8\&.8\&.4\&.4 -ipv4\&.dns\-search: -ipv4\&.addresses: 192\&.168\&.1\&.100/24 -ipv4\&.gateway: 192\&.168\&.1\&.1 -ipv4\&.routes: -ipv4\&.route\-metric: \-1 -ipv4\&.ignore\-auto\-routes: no -ipv4\&.ignore\-auto\-dns: no -ipv4\&.dhcp\-client\-id: \-\- -ipv4\&.dhcp\-send\-hostname: yes -ipv4\&.dhcp\-hostname: \-\- -ipv4\&.never\-default: no -ipv4\&.may\-fail: yes -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -ipv6\&.method: auto -ipv6\&.dns: -ipv6\&.dns\-search: -ipv6\&.addresses: -ipv6\&.gateway: \-\- -ipv6\&.routes: -ipv6\&.route\-metric: \-1 -ipv6\&.ignore\-auto\-routes: no -ipv6\&.ignore\-auto\-dns: no -ipv6\&.never\-default: no -ipv6\&.may\-fail: yes -ipv6\&.ip6\-privacy: \-1 (unknown) -ipv6\&.dhcp\-hostname: \-\- -\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -nmcli> verify -Verify connection: OK -nmcli> save -Connection \*(Aqethernet\-4\*(Aq (de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4) successfully saved\&. -nmcli> quit - -.fi -.if n \{\ -.RE -.\} -.PP -Example session in the nmcli interactive connection editor\&. The scenario creates an Ethernet connection profile with static addressing (IPs and DNS)\&. -.SH "SEE ALSO" -.PP -\fBnmcli\fR(1), -\fBNetworkManager\fR(8), -\fBNetworkManager.conf\fR(5), -\fBnm-settings\fR(5), -\fBnm-online\fR(1), -\fBnm-applet\fR(1), -\fBnm-connection-editor\fR(1) diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7 new file mode 100644 index 00000000..2bb5bb77 --- /dev/null +++ b/man/nmcli-examples.7 @@ -0,0 +1,619 @@ +'\" t +.\" Title: nmcli-examples +.\" Author: +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 04/05/2016 +.\" Manual: Examples +.\" Source: NetworkManager 1.1.93 +.\" Language: English +.\" +.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.1\&.93" "Examples" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +nmcli-examples \- usage examples of nmcli +.SH "SYNOPSIS" +.HP \w'\fBnmcli\ \fR\fB[OPTIONS...]\fR\ 'u +\fBnmcli \fR\fB[OPTIONS...]\fR +.SH "DESCRIPTION" +.PP +\fInmcli\fR +is a command\-line client for NetworkManager\&. It allows controlling NetworkManager and reporting its status\&. For more information please refer to +\fBnmcli\fR(1) +manual page\&. +.PP +The purpose of this manual page is to provide you with various examples and usage scenarios of +\fInmcli\fR\&. +.PP +Note: this page has "work\-in\-progress" status\&. +.SH "EXAMPLES" +.PP +\fBExample\ \&1.\ \&Listing available Wi-Fi APs\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB$ nmcli device wifi list\fR +* SSID MODE CHAN RATE SIGNAL BARS SECURITY + netdatacomm_local Infra 6 54 Mbit/s 37 ▂▄__ WEP +* F1 Infra 11 54 Mbit/s 98 ▂▄▆█ WPA1 + LoremCorp Infra 1 54 Mbit/s 62 ▂▄▆_ WPA2 802\&.1X + Internet Infra 6 54 Mbit/s 29 ▂___ WPA1 + HPB110a\&.F2672A Ad\-Hoc 6 54 Mbit/s 22 ▂___ \-\- + Jozinet Infra 1 54 Mbit/s 19 ▂___ WEP + VOIP Infra 1 54 Mbit/s 20 ▂___ WEP + MARTINA Infra 4 54 Mbit/s 32 ▂▄__ WPA2 + N24PU1 Infra 7 11 Mbit/s 22 ▂___ \-\- + alfa Infra 1 54 Mbit/s 67 ▂▄▆_ WPA2 + bertnet Infra 5 54 Mbit/s 20 ▂___ WPA1 WPA2 +.fi +.if n \{\ +.RE +.\} +.PP +This command shows how to list available Wi\-Fi networks (APs)\&. You can also use +\fI\-\-fields\fR +option for displaying different columns\&. +\fBnmcli \-f all dev wifi list\fR +will show all of them\&. +.PP +\fBExample\ \&2.\ \&Showing general information and properties for a Wi-Fi interface\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB$ nmcli \-p \-f general,wifi\-properties device show wlan0\fR +=========================================================================== + Device details (wlan0) +=========================================================================== +GENERAL\&.DEVICE: wlan0 +GENERAL\&.TYPE: wifi +GENERAL\&.VENDOR: Intel Corporation +GENERAL\&.PRODUCT: PRO/Wireless 5100 AGN [Shiloh] Network Connection +GENERAL\&.DRIVER: iwlwifi +GENERAL\&.DRIVER\-VERSION: 3\&.8\&.13\-100\&.fc17\&.x86_64 +GENERAL\&.FIRMWARE\-VERSION: 8\&.83\&.5\&.1 build 33692 +GENERAL\&.HWADDR: 00:1E:65:37:A1:D3 +GENERAL\&.MTU: 1500 +GENERAL\&.STATE: 100 (connected) +GENERAL\&.REASON: 0 (No reason given) +GENERAL\&.UDI: /sys/devices/pci0000:00/0000:00:1c\&.1/net/wlan0 +GENERAL\&.IP\-IFACE: wlan0 +GENERAL\&.IS\-SOFTWARE: no +GENERAL\&.NM\-MANAGED: yes +GENERAL\&.AUTOCONNECT: yes +GENERAL\&.FIRMWARE\-MISSING: no +GENERAL\&.CONNECTION: My Alfa WiFi +GENERAL\&.CON\-UUID: 85194f4c\-d496\-4eec\-bae0\-d880b4cbcf26 +GENERAL\&.CON\-PATH: /org/freedesktop/NetworkManager/ActiveConnection/ +10 +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +WIFI\-PROPERTIES\&.WEP: yes +WIFI\-PROPERTIES\&.WPA: yes +WIFI\-PROPERTIES\&.WPA2: yes +WIFI\-PROPERTIES\&.TKIP: yes +WIFI\-PROPERTIES\&.CCMP: yes +WIFI\-PROPERTIES\&.AP: no +WIFI\-PROPERTIES\&.ADHOC: yes +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +.fi +.if n \{\ +.RE +.\} +.PP +This command shows information about a Wi\-Fi device\&. +.PP +\fBExample\ \&3.\ \&Listing NetworkManager polkit permissions\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB$ nmcli general permissions\fR +PERMISSION VALUE +org\&.freedesktop\&.NetworkManager\&.enable\-disable\-network yes +org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wifi yes +org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wwan yes +org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wimax yes +org\&.freedesktop\&.NetworkManager\&.sleep\-wake no +org\&.freedesktop\&.NetworkManager\&.network\-control yes +org\&.freedesktop\&.NetworkManager\&.wifi\&.share\&.protected yes +org\&.freedesktop\&.NetworkManager\&.wifi\&.share\&.open yes +org\&.freedesktop\&.NetworkManager\&.settings\&.modify\&.system yes +org\&.freedesktop\&.NetworkManager\&.settings\&.modify\&.own yes +org\&.freedesktop\&.NetworkManager\&.settings\&.modify\&.hostname auth +.fi +.if n \{\ +.RE +.\} +.PP +This command shows configured polkit permissions for various NetworkManager operations\&. These permissions or actions (using polkit language) are configured by a system administrator and are not meant to be changed by users\&. The usual place for the polkit configuration is /usr/share/polkit\-1/actions/org\&.freedesktop\&.NetworkManager\&.policy\&. +\fIpkaction\fR +command can display description for polkit actions\&. +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB + pkaction \-\-action\-id org\&.freedesktop\&.NetworkManager\&.network\-control \-\-verbose + \fR +.fi +.if n \{\ +.RE +.\} +.sp +More information about polkit can be found at http://www\&.freedesktop\&.org/wiki/Software/polkit\&. +.PP +\fBExample\ \&4.\ \&Listing NetworkManager log level and domains\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB$ nmcli general logging\fR +LEVEL DOMAINS +INFO PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,A +UTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC, +WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,DBUS_PROPS,TEAM,CONCHECK,DC +B,DISPATCH +.fi +.if n \{\ +.RE +.\} +.PP +This command shows current NetworkManager logging status\&. +.PP +\fBExample\ \&5.\ \&Changing NetworkManager logging\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB$ nmcli g log level DEBUG domains CORE,ETHER,IP\fR +\fB$ nmcli g log level INFO domains DEFAULT\fR +.fi +.if n \{\ +.RE +.\} +.PP +The first command makes NetworkManager log in DEBUG level, and only for CORE, ETHER and IP domains\&. The second command restores the default logging state\&. Please refer to the +\fBNetworkManager.conf\fR(5) +manual page for available logging levels and domains\&. +.PP +\fBExample\ \&6.\ \&Adding a bonding master and two slave connection profiles\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB$ nmcli con add type bond ifname mybond0 mode active\-backup\fR +\fB$ nmcli con add type ethernet ifname eth1 master mybond0\fR +\fB$ nmcli con add type ethernet ifname eth2 master mybond0\fR +.fi +.if n \{\ +.RE +.\} +.PP +This example demonstrates adding a bond master connection and two slaves\&. The first command adds a master bond connection, naming the bonding interface +\fImybond0\fR +and using +\fIactive\-backup\fR +mode\&. The next two commands add slaves connections, both enslaved to +\fImybond0\fR\&. The first slave will be bound to +\fIeth1\fR +interface, the second to +\fIeth2\fR\&. +.PP +\fBExample\ \&7.\ \&Adding a team master and two slave connection profiles\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB$ nmcli con add type team con\-name Team1 ifname Team1 config team1\-master\-json\&.conf\fR +\fB$ nmcli con add type ethernet con\-name Team1\-slave1 ifname em1 master Team1\fR +\fB$ nmcli con add type ethernet con\-name Team1\-slave2 ifname em2 master Team1\fR +.fi +.if n \{\ +.RE +.\} +.PP +This example demonstrates adding a team master connection profile and two slaves\&. It is very similar to the bonding example\&. The first command adds a master team profile, naming the team interface and the profile +\fITeam1\fR\&. The team configuration for the master is read from +\fIteam1\-master\-json\&.conf\fR +file\&. Later, you can change the configuration with +\fImodify\fR +command (\fBnmcli con modify Team1 team\&.config team1\-master\-another\-json\&.conf\fR)\&. The last two commands add slaves profiles, both enslaved to +\fITeam1\fR\&. The first slave will be bound to +\fIem1\fR +interface, the second to +\fIem2\fR\&. The slaves don\*(Aqt specify +\fIconfig\fR +and thus +\fIteamd\fR +will use its default configuration\&. You will activate the whole setup by activating both slaves: +.sp +.if n \{\ +.RS 4 +.\} +.nf + \fB$ nmcli con up Team1\-slave1\fR + \fB$ nmcli con up Team1\-slave2\fR +.fi +.if n \{\ +.RE +.\} +.sp +By default, the created profiles are marked for auto\-activation\&. But if another connection has been activated on the device, the new profile won\*(Aqt activate automatically and you need to activate it manually\&. +.PP +\fBExample\ \&8.\ \&Adding a bridge and two slave profiles\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB$ nmcli con add type bridge con\-name TowerBridge ifname TowerBridge\fR +\fB$ nmcli con add type ethernet con\-name br\-slave\-1 ifname ens3 master TowerBridge\fR +\fB$ nmcli con add type ethernet con\-name br\-slave\-2 ifname ens4 master TowerBridge\fR +\fB$ nmcli con modify TowerBridge bridge\&.stp no\fR +.fi +.if n \{\ +.RE +.\} +.PP +This example demonstrates adding a bridge master connection and two slaves\&. The first command adds a master bridge connection, naming the bridge interface and the profile as +\fITowerBridge\fR\&. The next two commands add slaves profiles, both will be enslaved to +\fITowerBridge\fR\&. The first slave will be tied to +\fIens3\fR +interface, the second to +\fIens4\fR\&. The last command will disable 802\&.1D STP for the TowerBridge profile\&. +.PP +\fBExample\ \&9.\ \&Adding an ethernet connection profile with manual IP configuration\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB$ nmcli con add con\-name my\-con\-em1 ifname em1 type ethernet \e + ip4 192\&.168\&.100\&.100/24 gw4 192\&.168\&.100\&.1 ip4 1\&.2\&.3\&.4 ip6 abbe::cafe\fR +\fB$ nmcli con mod my\-con\-em1 ipv4\&.dns "8\&.8\&.8\&.8 8\&.8\&.4\&.4"\fR +\fB$ nmcli con mod my\-con\-em1 +ipv4\&.dns 1\&.2\&.3\&.4\fR +\fB$ nmcli con mod my\-con\-em1 ipv6\&.dns "2001:4860:4860::8888 2001:4860:4860::8844"\fR +\fB$ nmcli \-p con show my\-con\-em1\fR +.fi +.if n \{\ +.RE +.\} +.PP +The first command adds an Ethernet connection profile named +\fImy\-con\-em1\fR +that is bound to interface name +\fIem1\fR\&. The profile is configured with static IP addresses\&. Three addresses are added, two IPv4 addresses and one IPv6\&. The first IP 192\&.168\&.100\&.100 has a prefix of 24 (netmask equivalent of 255\&.255\&.255\&.0)\&. Gateway entry will become the default route if this profile is activated on em1 interface (and there is no connection with higher priority)\&. The next two addresses do not specify a prefix, so a default prefix will be used, i\&.e\&. 32 for IPv4 and 128 for IPv6\&. The second, third and fourth commands modify DNS parameters of the new connection profile\&. The last +\fIcon show\fR +command displays the profile so that all parameters can be reviewed\&. +.PP +\fBExample\ \&10.\ \&Escaping colon characters in tabular mode\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB$ nmcli \-t \-f general \-e yes \-m tab dev show eth0\fR +GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection: +e1000e:2\&.1\&.4\-k:1\&.8\-3:00\e:22\e:68\e:15\e:29\e:21:1500:100 (connected):0 (No reas +on given):/sys/devices/pci0000\e:00/0000\e:00\e:19\&.0/net/eth0:eth0:yes:yes:no: +ethernet\-13:89cbcbc6\-dc85\-456c\-9c8b\-bd828fee3917:/org/freedesktop/NetworkMa +nager/ActiveConnection/9 +.fi +.if n \{\ +.RE +.\} +.PP +This example shows escaping colon characters in tabular mode\&. It may be useful for script processing, because \*(Aq:\*(Aq is used as a field separator\&. +.PP +\fBExample\ \&11.\ \&nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf +#!/bin/bash +export LC_ALL=C + +enable_disable_wifi () +{ + result=$(nmcli dev | grep "ethernet" | grep \-w "connected") + if [ \-n "$result" ]; then + nmcli radio wifi off + else + nmcli radio wifi on + fi +} + +if [ "$2" = "up" ]; then + enable_disable_wifi +fi + +if [ "$2" = "down" ]; then + enable_disable_wifi +fi + +.fi +.if n \{\ +.RE +.\} +.PP +This dispatcher script makes Wi\-Fi mutually exclusive with wired networking\&. When a wired interface is connected, Wi\-Fi will be set to airplane mode (rfkilled)\&. When the wired interface is disconnected, Wi\-Fi will be turned back on\&. Name this script e\&.g\&. 70\-wifi\-wired\-exclusive\&.sh and put it into /etc/NetworkManager/dispatcher\&.d/ directory\&. See +\fBNetworkManager\fR(8) +manual page for more information about NetworkManager dispatcher scripts\&. +.PP +\fBExample sessions of interactive connection editor\fR +.PP +\fBExample\ \&12.\ \&Adding an ethernet connection profile in interactive editor (a)\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB$ nmcli connection edit type ethernet\fR + +===| nmcli interactive connection editor |=== + +Adding a new \*(Aq802\-3\-ethernet\*(Aq connection + +Type \*(Aqhelp\*(Aq or \*(Aq?\*(Aq for available commands\&. +Type \*(Aqdescribe [\&.]\*(Aq for detailed property description\&. + +You may edit the following settings: connection, 802\-3\-ethernet (ethernet), +802\-1x, ipv4, ipv6, dcb +nmcli> \fBprint\fR +=========================================================================== + Connection details +=========================================================================== +connection\&.id: ethernet\-4 +connection\&.uuid: de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4 +connection\&.interface\-name: \-\- +connection\&.type: 802\-3\-ethernet +connection\&.autoconnect: yes +connection\&.autoconnect\-priority: 0 +connection\&.timestamp: 0 +connection\&.read\-only: no +connection\&.permissions: +connection\&.zone: \-\- +connection\&.master: \-\- +connection\&.slave\-type: \-\- +connection\&.secondaries: +connection\&.gateway\-ping\-timeout: 0 +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +802\-3\-ethernet\&.port: \-\- +802\-3\-ethernet\&.speed: 0 +802\-3\-ethernet\&.duplex: \-\- +802\-3\-ethernet\&.auto\-negotiate: yes +802\-3\-ethernet\&.mac\-address: \-\- +802\-3\-ethernet\&.cloned\-mac\-address: \-\- +802\-3\-ethernet\&.mac\-address\-blacklist: +802\-3\-ethernet\&.mtu: auto +802\-3\-ethernet\&.s390\-subchannels: +802\-3\-ethernet\&.s390\-nettype: \-\- +802\-3\-ethernet\&.s390\-options: +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +ipv4\&.method: auto +ipv4\&.dns: +ipv4\&.dns\-search: +ipv4\&.addresses: +ipv4\&.gateway: \-\- +ipv4\&.routes: +ipv4\&.route\-metric: \-1 +ipv4\&.ignore\-auto\-routes: no +ipv4\&.ignore\-auto\-dns: no +ipv4\&.dhcp\-client\-id: \-\- +ipv4\&.dhcp\-send\-hostname: yes +ipv4\&.dhcp\-hostname: \-\- +ipv4\&.never\-default: no +ipv4\&.may\-fail: yes +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +ipv6\&.method: auto +ipv6\&.dns: +ipv6\&.dns\-search: +ipv6\&.addresses: +ipv6\&.gateway: \-\- +ipv6\&.routes: +ipv6\&.route\-metric: \-1 +ipv6\&.ignore\-auto\-routes: no +ipv6\&.ignore\-auto\-dns: no +ipv6\&.never\-default: no +ipv6\&.may\-fail: yes +ipv6\&.ip6\-privacy: \-1 (unknown) +ipv6\&.dhcp\-hostname: \-\- +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +nmcli> \fBgoto ethernet\fR +You may edit the following properties: port, speed, duplex, auto\-negotiate, + mac\-address, cloned\-mac\-address, mac\-address\-blacklist, mtu, s390\-subchann +els, s390\-nettype, s390\-options +nmcli 802\-3\-ethernet> set mtu 1492 +nmcli 802\-3\-ethernet> b +nmcli> \fBgoto ipv4\&.addresses\fR +nmcli ipv4\&.addresses> desc + +=== [addresses] === +[NM property description] +Array of IP addresses\&. + +[nmcli specific description] +Enter a list of IPv4 addresses formatted as: + ip[/prefix], ip[/prefix],\&.\&.\&. +Missing prefix is regarded as prefix of 32\&. + +Example: 192\&.168\&.1\&.5/24, 10\&.0\&.0\&.11/24 + +nmcli ipv4\&.addresses> set 192\&.168\&.1\&.100/24 +Do you also want to set \*(Aqipv4\&.method\*(Aq to \*(Aqmanual\*(Aq? [yes]: yes +nmcli ipv4\&.addresses> +nmcli ipv4\&.addresses> print +addresses: 192\&.168\&.1\&.100/24 +nmcli ipv4\&.addresses> back +nmcli ipv4> b +nmcli> \fBset ipv4\&.gateway 192\&.168\&.1\&.1\fR +nmcli> \fBverify\fR +Verify connection: OK +nmcli> \fBprint\fR +=========================================================================== + Connection details +=========================================================================== +connection\&.id: ethernet\-4 +connection\&.uuid: de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4 +connection\&.interface\-name: \-\- +connection\&.type: 802\-3\-ethernet +connection\&.autoconnect: yes +connection\&.autoconnect\-priority: 0 +connection\&.timestamp: 0 +connection\&.read\-only: no +connection\&.permissions: +connection\&.zone: \-\- +connection\&.master: \-\- +connection\&.slave\-type: \-\- +connection\&.secondaries: +connection\&.gateway\-ping\-timeout: 0 +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +802\-3\-ethernet\&.port: \-\- +802\-3\-ethernet\&.speed: 0 +802\-3\-ethernet\&.duplex: \-\- +802\-3\-ethernet\&.auto\-negotiate: yes +802\-3\-ethernet\&.mac\-address: \-\- +802\-3\-ethernet\&.cloned\-mac\-address: \-\- +802\-3\-ethernet\&.mac\-address\-blacklist: +802\-3\-ethernet\&.mtu: 1492 +802\-3\-ethernet\&.s390\-subchannels: +802\-3\-ethernet\&.s390\-nettype: \-\- +802\-3\-ethernet\&.s390\-options: +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +ipv4\&.method: manual +ipv4\&.dns: +ipv4\&.dns\-search: +ipv4\&.addresses: 192\&.168\&.1\&.100/24 +ipv4\&.gateway: 192\&.168\&.1\&.1 +ipv4\&.routes: +ipv4\&.route\-metric: \-1 +ipv4\&.ignore\-auto\-routes: no +ipv4\&.ignore\-auto\-dns: no +ipv4\&.dhcp\-client\-id: \-\- +ipv4\&.dhcp\-send\-hostname: yes +ipv4\&.dhcp\-hostname: \-\- +ipv4\&.never\-default: no +ipv4\&.may\-fail: yes +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +ipv6\&.method: auto +ipv6\&.dns: +ipv6\&.dns\-search: +ipv6\&.addresses: +ipv6\&.routes: +ipv6\&.route\-metric: \-1 +ipv6\&.ignore\-auto\-routes: no +ipv6\&.ignore\-auto\-dns: no +ipv6\&.never\-default: no +ipv6\&.may\-fail: yes +ipv6\&.ip6\-privacy: \-1 (unknown) +ipv6\&.dhcp\-hostname: \-\- +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +nmcli> \fBset ipv4\&.dns 8\&.8\&.8\&.8 8\&.8\&.4\&.4\fR +nmcli> \fBprint\fR +=========================================================================== + Connection details +=========================================================================== +connection\&.id: ethernet\-4 +connection\&.uuid: de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4 +connection\&.interface\-name: \-\- +connection\&.type: 802\-3\-ethernet +connection\&.autoconnect: yes +connection\&.autoconnect\-priority: 0 +connection\&.timestamp: 0 +connection\&.read\-only: no +connection\&.permissions: +connection\&.zone: \-\- +connection\&.master: \-\- +connection\&.slave\-type: \-\- +connection\&.secondaries: +connection\&.gateway\-ping\-timeout: 0 +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +802\-3\-ethernet\&.port: \-\- +802\-3\-ethernet\&.speed: 0 +802\-3\-ethernet\&.duplex: \-\- +802\-3\-ethernet\&.auto\-negotiate: yes +802\-3\-ethernet\&.mac\-address: \-\- +802\-3\-ethernet\&.cloned\-mac\-address: \-\- +802\-3\-ethernet\&.mac\-address\-blacklist: +802\-3\-ethernet\&.mtu: 1492 +802\-3\-ethernet\&.s390\-subchannels: +802\-3\-ethernet\&.s390\-nettype: \-\- +802\-3\-ethernet\&.s390\-options: +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +ipv4\&.method: manual +ipv4\&.dns: 8\&.8\&.8\&.8,8\&.8\&.4\&.4 +ipv4\&.dns\-search: +ipv4\&.addresses: 192\&.168\&.1\&.100/24 +ipv4\&.gateway: 192\&.168\&.1\&.1 +ipv4\&.routes: +ipv4\&.route\-metric: \-1 +ipv4\&.ignore\-auto\-routes: no +ipv4\&.ignore\-auto\-dns: no +ipv4\&.dhcp\-client\-id: \-\- +ipv4\&.dhcp\-send\-hostname: yes +ipv4\&.dhcp\-hostname: \-\- +ipv4\&.never\-default: no +ipv4\&.may\-fail: yes +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +ipv6\&.method: auto +ipv6\&.dns: +ipv6\&.dns\-search: +ipv6\&.addresses: +ipv6\&.gateway: \-\- +ipv6\&.routes: +ipv6\&.route\-metric: \-1 +ipv6\&.ignore\-auto\-routes: no +ipv6\&.ignore\-auto\-dns: no +ipv6\&.never\-default: no +ipv6\&.may\-fail: yes +ipv6\&.ip6\-privacy: \-1 (unknown) +ipv6\&.dhcp\-hostname: \-\- +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +nmcli> \fBverify\fR +Verify connection: OK +nmcli> \fBsave\fR +Connection \*(Aqethernet\-4\*(Aq (de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4) successfully + saved\&. +nmcli> \fBquit\fR +.fi +.if n \{\ +.RE +.\} +.PP +Example session in the nmcli interactive connection editor\&. The scenario creates an Ethernet connection profile with static addressing (IPs and DNS)\&. +.SH "SEE ALSO" +.PP +\fBnmcli\fR(1), +\fBNetworkManager\fR(8), +\fBNetworkManager.conf\fR(5), +\fBnm-settings\fR(5), +\fBnm-online\fR(1), +\fBnm-applet\fR(1), +\fBnm-connection-editor\fR(1) diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml index 0ce7dc72..9c28e15f 100644 --- a/man/nmcli-examples.xml +++ b/man/nmcli-examples.xml @@ -1,6 +1,10 @@ - - + + + +%entities; +]> + + + + + nmcli + NetworkManager developers + + + + nmcli + 1 + NetworkManager + General Commands Manual + &NM_VERSION; + + + + nmcli + command-line tool for controlling NetworkManager + + + + + nmcli + OPTIONS + + + + + + + + + + + COMMAND + ARGUMENTS + + + + Description + nmcli is a command-line tool for controlling + NetworkManager and reporting network status. It can be utilized as a + replacement for nm-applet or other graphical clients. + nmcli is used to create, display, edit, delete, activate, + and deactivate network connections, as well as control and display network + device status. + + Typical uses include: + + + Scripts: Utilize NetworkManager via nmcli instead of + managing network connections manually. nmcli supports a + terse output format which is better suited for script processing. Note that + NetworkManager can also execute scripts, called "dispatcher scripts", in + response to network events. See + NetworkManager8 + for details about these dispatcher scripts. + + + + Servers, headless machines, and terminals: nmcli can + be used to control NetworkManager without a GUI, including creating, editing, + starting and stopping network connections and viewing network status. + + + + + Options + + + + + + + + + + Output is terse. This mode is designed and suitable for computer (script) + processing. + + + + + + + + + + + Output is pretty. This causes nmcli to produce easily + readable outputs for humans, i.e. values are aligned, headers are printed, + etc. + + + + + + + + + tabular + multiline + + + + + Switch between tabular and multiline output: + + + + tabular + + Output is a table where each line describes a single entry. + Columns define particular properties of the entry. + + + + + multiline + + Each entry comprises multiple lines, each property on its + own line. The values are prefixed with the property name. + + + + + If omitted, default is tabular for most commands. + For the commands producing more structured information, that cannot be + displayed on a single line, default is multiline. + Currently, they are: + + + + nmcli connection show ID + + + + nmcli device show + + + + + + + + + + + + yes + no + auto + + + + + This option controls color output (using terminal escape sequences). + yes enables colors, no disables them, + auto only produces colors when standard output is directed + to a terminal. The default value is auto. + + + + + + + + + field + all + common + + + + + This option is used to specify what fields (column names) should be + printed. Valid field names differ for specific commands. List available fields + by providing an invalid value to the option. + all is used to print all valid field values of the + command. common is used to print common field values of + the command. + + If omitted, default is common. The option is + mandatory when is used. In this case, generic values + all and common cannot be used. This + is to maintain compatibility when new fields are added in the future. + + + + + + + + + yes + no + + + + + Whether to escape : and \ characters in terse tabular mode. The + escape character is \. + + If omitted, default is yes. + + + + + + + + + + + This option can be used to force nmcli to skip + checking nmcli and NetworkManager + version compatibility. Use it with care, because using incompatible versions + may produce incorrect results. + + + + + + + + + + + When using this option nmcli will stop and ask for any + missing required arguments, so do not use this option for non-interactive + purposes like scripts. This option controls, for example, whether you will be + prompted for a password if it is required for connecting to a network. + + + + + + + + + + + When using this option nmcli will display passwords + and secrets that might be present in an output of an operation. This option + also influences echoing passwords typed by user as an input. + + + + + + + + + + seconds + + + + This option sets a timeout period for which nmcli will + wait for NetworkManager to finish operations. It is + especially useful for commands that may take a longer time to complete, e.g. + connection activation. + + Specifying a value of 0 instructs + nmcli not to wait but to exit immediately with a status of + success. The default value depends on the executed command. + + + + + + + + + + + Show nmcli version. + + + + + + + + + + + Print help information. + + + + + + + General Commands + + + nmcli general + + status + hostname + permissions + logging + + ARGUMENTS + + + Use this command to show NetworkManager status and permissions. You can also get + and change system hostname, as well as NetworkManager logging level and domains. + + + + + status + + + Show overall status of NetworkManager. This is the default action, when + no additional command is provided for nmcli general. + + + + + + hostname + hostname + + + + Get and change system hostname. With no arguments, this prints currently + configured hostname. When you pass a hostname, it will be handed over to + NetworkManager to be set as a new system hostname. + + Note that the term "system" hostname may also be referred to as + "persistent" or "static" by other programs or tools. The hostname is stored + in /etc/hostname file in most distributions. For example, + systemd-hostnamed service uses the term "static" hostname and it only reads + the /etc/hostname file when it starts. + + + + + permissions + + + Show the permissions a caller has for various authenticated operations + that NetworkManager provides, like enable and disable networking, changing + Wi-Fi and WWAN state, modifying connections, etc. + + + + + + logging + level + domains + + + + Get and change NetworkManager logging level and + domains. Without any argument current logging level and domains are shown. In + order to change logging state, provide and, or, + parameters. See + NetworkManager.conf5 + for available level and domain values. + + + + + + Networking Control Commands + + + nmcli networking + + on + off + connectivity + + ARGUMENTS + + + Query NetworkManager networking status, enable and disable networking. + + + + + + on + off + + + Enable enable or disable networking control by NetworkManager. + All interfaces managed by NetworkManager are deactivated when networking + is disabled. + + + + + + connectivity + check + + + + Get network connectivity state. The optional + argument tells NetworkManager to re-check the connectivity, else the most + recent known connectivity state is displayed without re-checking. + + Possible states are: + + + + none + + the host is not connected to any network. + + + + portal + + the host is behind a captive portal and cannot reach the full Internet. + + + + limited + + the host is connected to a network, but it has no access to the Internet. + + + + full + + the host is connected to a network and has full access to the Internet. + + + + unknown + + the connectivity status cannot be found out. + + + + + + + + + + Radio Transmission Control Commands + + + nmcli radio + + all + wifi + wwan + + ARGUMENTS + + + Show radio switches status, or enable and disable the switches. + + + + + + wifi + + on + off + + + + + Show or set status of Wi-Fi in NetworkManager. If no arguments are + supplied, Wi-Fi status is printed; enables Wi-Fi; + disables Wi-Fi. + + + + + + wwan + + on + off + + + + + Show or set status of WWAN (mobile broadband) in NetworkManager. If no + arguments are supplied, mobile broadband status is printed; + enables mobile broadband, + disables it. + + + + + + all + + on + off + + + + + Show or set all previously mentioned radio switches at the same time. + + + + + + Activity Monitor + + + nmcli monitor + + + Observe NetworkManager activity. Watches for changes + in connectivity state, devices or connection profiles. + + See also nmcli connection monitor + and nmcli device monitor to watch + for changes in certain devices or connections. + + + Connection Management Commands + + + nmcli connection + + show + up + down + add + edit + modify + delete + monitor + reload + load + + ARGUMENTS + + + NetworkManager stores all network configuration as "connections", + which are collections of data (Layer2 details, IP addressing, etc.) that + describe how to create or connect to a network. A connection is "active" + when a device uses that connection's configuration to create or connect to + a network. There may be multiple connections that apply to a device, but only + one of them can be active on that device at any given time. The additional + connections can be used to allow quick switching between different networks + and configurations. + + Consider a machine which is usually connected to a DHCP-enabled network, + but sometimes connected to a testing network which uses static IP addressing. + Instead of manually reconfiguring eth0 each time the network is changed, the + settings can be saved as two connections which both apply to eth0, one for DHCP + (called default) and one with the static addressing details (called + testing). When connected to the DHCP-enabled network the user would run + nmcli con up default , and when connected to the static network the user + would run nmcli con up testing. + + + + + + show + + + + [+-]category: + + + + + List in-memory and on-disk connection profiles, some of which may also be + active if a device is using that connection profile. Without a parameter, all + profiles are listed. When option is specified, only + the active profiles are shown. + + The option can be used to get custom + ordering of connections. The connections can be ordered by active status + (active), name (name), type + (type) or D-Bus path (path). If + connections are equal according to a sort order category, an additional + category can be specified. The default sorting order is equivalent to + --order active:name:path. + or no + prefix means sorting in ascending order (alphabetically or in numbers), + - means reverse (descending) order. The category names + can be abbreviated (e.g. --order -a:na). + + + + + + show + + + + + + + + ID + + + + Show details for specified connections. By default, both static + configuration and active connection data are displayed. When + option is specified, only the active profiles are + taken into account. Use global option to + display secrets associated with the profile. + + , , + and keywords can be used + if ID is ambiguous. Optional + ID-specifying keywords are: + + + + + + the ID denotes a connection name. + + + + + + the ID denotes a connection UUID. + + + + + + the ID denotes a D-Bus + static connection path in the format of + /org/freedesktop/NetworkManager/Settings/num + or just num. + + + + + + the ID denotes a D-Bus active connection path in the format of + /org/freedesktop/NetworkManager/ActiveConnection/num or just + num. + + + + + It is possible to filter the output using the global + option. Use the following values: + + + + + + only shows static profile configuration. + + + + + + only shows active connection data (when the profile is active). + + + + + You can also specify particular fields. For static configuration, use + setting and property names as described in + nm-settings5 + manual page. For active data use GENERAL, IP4, DHCP4, IP6, + DHCP6, VPN. + + When no command is given to the nmcli connection, + the default action is nmcli connection show. + + + + + + + up + + + + + + ID + ifname + BSSID + file + + + + Activate a connection. The connection is identified by its name, UUID or + D-Bus path. If ID is ambiguous, a keyword , + or can be used. When + requiring a particular device to activate the connection on, the + option with interface name should be given. If the + ID is not given an is required, and + NetworkManager will activate the best available connection for the given + . In case of a VPN connection, the + option specifies the device of the base connection. + The option specify what particular AP should be used in + case of a Wi-Fi connection. + + If option is not specified, the default timeout will be 90 + seconds. + + See connection show above for the description of the + ID-specifying keywords. + + Available options are: + + + + + + interface that will be used for activation. + + + + + + BSSID of the AP which the command should connect to (for Wi-Fi connections). + + + + + + some networks may require credentials during activation. You can give + these credentials using this option. Each line of the file should contain one + password in the form: + + setting_name.property_name:the password + + For example, for WPA Wi-Fi with PSK, the line would be + + 802-11-wireless-security.psk:secret12345 + + For 802.1X password, the line would be + + 802-1x.password:my 1X password + + nmcli also accepts wifi-sec and wifi strings instead of + 802-11-wireless-security. When NetworkManager requires a password and it is + not given, nmcli will ask for it when run with . + If was not passed, NetworkManager can ask another secret + agent that may be running (typically a GUI secret agent, such as nm-applet or + gnome-shell). + + + + + + + + + + down + + + + + + + ID + + + + Deactivate a connection from a device without preventing the device from + further auto-activation. Multiple connections can be passed to the + command. + + Be aware that this command deactivates the specified active connection, + but the device on which the connection was active, is still ready to connect + and will perform auto-activation by looking for a suitable connection that has + the 'autoconnect' flag set. This includes the just deactivated connection. So + if the connection is set to auto-connect, it will be automatically started on + the disconnected device again. + + In most cases you may want to use device disconnect + command instead. + + The connection is identified by its name, UUID or D-Bus path. If + ID is ambiguous, a keyword , + , or + can be used. + + See connection show above for the description of + the ID-specifying keywords. + + If option is not specified, the default timeout + will be 10 seconds. + + + + + + add + ifname + con-name name + + + + yes + no + + + + + + yes + no + + + master master + slave-type type + type type + ARGUMENTS + ip4 addr + gw4 addr + ip6 addr + gw6 addr + + + + [+|-]setting.property + value + + + + + + Add a connection for NetworkManager. Arguments differ according to connection types, see below. + + + + + + + interface to bind the connection to. The connection will only be + applicable to this interface name. A special value of * + can be used for interface-independent connections. The + argument is mandatory for all connection types + except bond, team, bridge and vlan. Note: use quotes around + * to suppress shell expansion. + + + + + + + connection name (when not provided a default name is generated: + <type>[-<ifname>][-<num>]). + + + + + + + whether the connection profile can be automatically activated (default: + yes). + + + + + + + whether the connection should be persistent, i.e. NetworkManager should + store it on disk (default: yes). + + + + + + + master interface name, or connection UUID or ID of master connection + profile. The value can be prefixed with ifname/, + uuid/ or id/ to disambiguate it. + + + + + + + type of master connection. Only required when it can not be inferred + (i.e. the master connection does + not exist yet). + + + + + + + connection type; see below for allowed values. Note that types + , and + create connection + profiles. Their use is discouraged in favor of using a specific type with + option. + + + + + + + addr + addr + mtu + + + + + + + MAC address of the device this connection is locked to. + + + + + + + cloned MAC. + + + + + + + MTU. + + + + + + + + + + SSID + addr + addr + + + + infrastructure + ap + adhoc + + + mtu + + + + + + + SSID. + + + + + + + MAC address of the device this connection is locked to. + + + + + + + cloned MAC. + + + + + + + Wi-Fi network mode. If blank, infrastructure + is assumed. + + + + + + + MTU. + + + + + + + + + + addr + nsp + + + + + + + MAC address of the device this connection is locked to. + + + + + + + Network Service Provider name. + + + + + + + + + + user + passwd + name + mtu + addr + + + + + + + PPPoE username. + + + + + + + Password for the PPPoE username. + + + + + + + PPPoE service name (if required by concentrator). + + + + + + + MTU. + + + + + + + MAC address of the device this connection is locked to. + + + + + + + + + + APN + user + passwd + + + + + + + APN - GSM Access Point Name. + + + + + + + user name. + + + + + + + password. + + + + + + + + + + user + passwd + + + + + + + user name. + + + + + + + password. + + + + + + + + + + addr + mtu + + + + datagram + connected + + + device + key + + + + + + + MAC address of the device this connection is locked to + (InfiniBand MAC is 20 bytes). + + + + + + + MTU. + + + + + + + InfiniBand transport mode. + + + + + + + the interface name of the parent device (if any). + + + + + + + the InfiniBand P_Key (16-bit unsigned integer). + + + + + + + + + + addr + + + + panu + dun-gsm + dun-cdma + + + + + + + + + Bluetooth device address (MAC). + + + + + + + Bluetooth connection type. + + + + + + + + + + device + id + flags + mapping + mapping + mtu + + + + + + + parent device this VLAN is on. + + + + + + + VLAN ID in range 0-4095. + + + + + + + flags. + + + + + + + VLAN ingress priority mapping. + + + + + + + VLAN egress priority mapping. + + + + + + + MTU. + + + + + + + + + + + + + active-backup + balance-xor + broadcast + 802.3ad + balance-tlb + balance-alb + num + + + ifname + num + num + num + num + num + + + + + + + + bonding mode (default: balance-rr). + + + + + + + primary interface name (for active-backup mode). + + + + + + + miimon (default: 100). + + + + + + + downdelay (default: 0). + + + + + + + updelay (default: 0). + + + + + + + ARP interval (default: 0). + + + + + + + ARP IP target. + + + + + + + + + + master + + + + + + + master bond interface name, or connection UUID or + ID of bond master connection profile. The value can be + prefixed with ifname/, + uuid/ or id/ to + disambiguate it. + + + + + + + + + + + + + file + JSON + + + + + + + + + + JSON configuration for team. + + + + + + + + + + + + + + + + + + + + master team interface name, or connection UUID or + ID of team master connection profile. The value can be + prefixed with ifname/, + uuid/ or id/to + disambiguate it. + + + + + + + JSON configuration for team. + + + + + + + + + + + + + yes + no + + + num + 2-30 + 1-10 + 6-42 + 0-1000000 + + + + yes + no + + + addr + + + + + + + controls whether Spanning Tree Protocol (STP) is enabled for this bridge + (default: yes). + + + + + + + sets STP priority (default: 128). + + + + + + + STP forwarding delay, in seconds (default: 15). + + + + + + + STP hello time, in seconds (default: 2). + + + + + + + STP maximum message age, in seconds (default: 20). + + + + + + + the Ethernet MAC address aging time, in seconds (default: 300). + + + + + + + controls whether IGMP snooping is enabled (default: yes). + + + + + + + MAC address of the bridge (note: this requires a recent kernel feature, + originally introduced in 3.15 upstream kernel). + + + + + + + + + + master + num + 1-65535 + + + + yes + no + + + + + + + + + master bridge interface name, or connection UUID + or ID of bridge master connection profile. The value + can be prefixed with ifname/, + uuid/ or id/ + to disambiguate it. + + + + + + + STP priority of this slave (default: 32). + + + + + + + STP port cost for destinations via this slave (default: 100). + + + + + + + 'hairpin mode' for the slave, which allows frames to be sent back out + through the slave the frame was received on (default: yes). + + + + + + + + + + type + username + + + + + + + VPN type. + + + + + + + VPN username. + + + + + + + + + + SSID + 1-13 + MAC + + + + + + + SSID. + + + + + + + channel to use for the network. + + + + + + + anycast DHCP MAC address used when requesting an IP address via DHCP. + + + + + + + + + + username + + + + pppoa + pppoe + ipoatm + + + passwd + + + + vcmux + llc + + + + + + + + + ADSL user name. + + + + + + + ADSL protocol. + + + + + + + ADSL password. + + + + + + + ADSL encapsulation. + + + + + + + + + + + + + tun + tap + + + UID + GID + + + + yes + no + + + + + + yes + no + + + + + + yes + no + + + + + + + + + Mode for the device. + + + + + + + UID of the owner. + + + + + + + GID of the group. + + + + + + + include packet information (~IFF_NO_PI flag). + + + + + + + send and receive large (i.e. GSO) packets and packets with partial + checksums (IFF_VNET_HDR flag). + + + + + + + multi-queue support for tun/tap device (IFF_MULTI_QUEUE flag). + + + + + + + + + + + + + ipip + gre + sit + isatap + vti + ip6ip6 + ipip6 + ip6gre + vti6 + tun + + + addr + addr + device + + + + + + + tunnel mode. + + + + + + + IPv4 or IPv6 address of the remote tunnel endpoint. + + + + + + + IPv4 or IPv6 address of the local tunnel endpoint. + + + + + + + device to use for tunnel endpoint communication. + + + + + + + + + + device + + + + vepa + bridge + private + passthru + source + + + + + + yes + no + + + + + + + + + parent device this MACVLAN is on. + + + + + + + MACVLAN mode, which specifies the communication mechanism between + multiple MACVLANs on the same lower device. + + + + + + + controls the device type. If set to 'yes' a MACVTAP will be created + (default: no). + + + + + + + + + + id + addr + parent device (ifname or connection UUID) + addr + 0-65535 + 0-65535 + 0-65535 + + + + + + + VXLAN Network Identifer to use. + + + + + + + unicast destination IP address or multicast IP address to join. + + + + + + + device to use for tunnel endpoint communication. + + + + + + + source IP address. + + + + + + + minimum UDP source port to communicate to the remote VXLAN tunnel endpoint. + + + + + + + maximum UDP source port to communicate to the remote VXLAN tunnel endpoint. + + + + + + + UDP destination port to communicate to the remote VXLAN tunnel endpoint. + + + + + + + + + + + IPv4 addresses. + + + + + + + + IPv6 addresses. + + + + + + + If a argument is encountered, the rest of command + line is interpreted as property list in the same format as connection + modify command accepts. This makes it possible to adjust the + connection properties before it's added. + + + + + + + + + edit + + + + + + + + ID + + + type + name + + + + + + Edit an existing connection or add a new one, using an interactive editor. + + The existing connection is identified by its name, UUID or D-Bus path. If + ID is ambiguous, a keyword , + , or can be used. See + connection show above for the description of the + ID-specifying keywords. Not providing an + ID means that a new connection will be added. + + The interactive editor will guide you through the connection editing and + allow you to change connection parameters according to your needs by means of + a simple menu-driven interface. The editor indicates what settings and + properties can be modified and provides in-line help. + + Available options: + + + + + + type of the new connection; valid types are the same as for + connection add command. + + + + + + name for the new connection. It can be changed later in the editor. + + + + + See also + nm-settings5 + for all NetworkManager settings and property names, and their + descriptions; and + nmcli-examples7 + for sample editor sessions. + + + + + + modify + + + + + + + ID + + [+|-]setting.property + value + + + + + Modify one or more properties in the connection profile. + + The connection is identified by its name, UUID or D-Bus path. If + ID is ambiguous, a keyword , + or can be used. See + nm-settings5 + for setting and property names, their descriptions and default + values. This command supports abbreviations for setting + and property provided they are unique. Empty + value ("") removes the property value (sets + the property to the default value). The provided value overwrites the existing + property value. + + If you want to append an item to the existing value, use + + prefix for the property name. If you want to remove just + one item from container-type property, use - prefix for + the property name and specify a value or an zero-based index of the item to + remove (or option name for properties with named options) as + value. Of course, + and + - only have a real effect for multi-value (container) + properties like ipv4.dns, ipv4.addresses, + bond.options, etc. + + + + + + clone + + + + + + + ID + name + + + + Clone a connection. The connection to be cloned is identified by its + name, UUID or D-Bus path. If ID is ambiguous, a keyword + , or + can be used. See connection show above for the description + of the ID-specifying keywords. name is + the name of the new cloned connection. The new connection will be the exact + copy except the connection.id (name) and + connection.uuid (generated) properties. + + The new connection profile will be saved as persistent unless + option is specified, in which case the new profile + won't exist after NetworkManager restart. + + + + + + delete + + + + + + ID + + + + Delete a configured connection. The connection to be deleted is + identified by its name, UUID or D-Bus path. If ID is ambiguous, a + keyword , or can be used. + See connection show above for the description of + the ID-specifying keywords. + + If option is not specified, the default timeout will be 10 + seconds. + + + + + + monitor + + + + + + ID + + + + Monitor connection profile activity. This command prints a line whenever + the specified connection changes. The connection to be monitored is identified + by its name, UUID or D-Bus path. If ID is ambiguous, a keyword + , or + can be used. See connection show above for the description of the + ID-specifying keywords. + + Monitors all connection profiles in case none is specified. The command + terminates when all monitored connections disappear. If you want to monitor + connection creation consider using the global monitor with nmcli + monitor command. + + + + + + reload + + + + Reload all connection files from disk. + NetworkManager does not monitor changes to connection + files by default. So you need to use this command in order to tell + NetworkManager to re-read the connection profiles from + disk when a change was made to them. However, the auto-loading feature can be + enabled and then NetworkManager will reload connection + files any time they change (monitor-connection-files=true in + NetworkManager.conf5). + + + + + + + load + filename + + + + Load/reload one or more connection files from disk. Use this after + manually editing a connection file to ensure that + NetworkManager is aware of its latest state. + + + + + + import + + type + file + + + + Import an external/foreign configuration as a NetworkManager connection + profile. The type of the input file is specified by + option. + + Only VPN configurations are supported at the moment. The configuration is + imported by NetworkManager VPN plugins. values are + the same as for option in nmcli + connection add. VPN configurations are imported by VPN plugins. + Therefore the proper VPN plugin has to be installed so that nmcli could import + the data. + + The imported connection profile will be saved as persistent unless + option is specified, in which case the new profile + won't exist after NetworkManager restart. + + + + + + export + + + + + + ID + file + + + + Export a connection. + + Only VPN connections are supported at the moment. A proper VPN plugin has + to be installed so that nmcli could export a connection. If no + file is provided, the VPN configuration + data will be printed to standard output. + + + + + + Device Management Commands + + + nmcli device + + status + show + set + connect + reapply + disconnect + delete + monitor + wifi + lldp + + ARGUMENTS + + + Show and manage network interfaces. + + + + + status + + + Print status of devices. + + This is the default action if no command is specified to + nmcli device. + + + + + + show + ifname + + + + Show detailed information about devices. Without an argument, all + devices are examined. To get information for a specific device, the interface + name has to be provided. + + + + + + set + ifname + ifname + + + + yes + no + + + + + + yes + no + + + + + + Set device properties. + + + + + + connect + ifname + + + + Connect the device. NetworkManager will try to find a suitable connection + that will be activated. It will also consider connections that are not set to + auto connect. + + If option is not specified, the default timeout will be 90 + seconds. + + + + + + reapply + ifname + + + + Attempt to update device with changes to the currently active connection + made since it was last applied. + + + + + + disconnect + ifname + + + + Disconnect a device and prevent the device from automatically activating + further connections without user/manual intervention. Note that disconnecting + software devices may mean that the devices will disappear. + + If option is not specified, the default timeout + will be 10 seconds. + + + + + + + delete + ifname + + + + Delete a device. The command removes the interface from the system. Note + that this only works for software devices like bonds, bridges, teams, etc. + Hardware devices (like Ethernet) cannot be deleted by the command. + + If option is not specified, the default timeout will be 10 + seconds. + + + + + + monitor + ifname + + + + Monitor device activity. This command prints a line whenever the + specified devices change state. + + Monitors all devices in case no interface is specified. The monitor + terminates when all specified devices disappear. If you want to monitor device + addition consider using the global monitor with nmcli + monitor command. + + + + + + wifi + + list + ifname + BSSID + + + + + List available Wi-Fi access points. The and + options can be used to list APs for a particular + interface or with a specific BSSID, respectively. + + + + + + wifi + connect + (B)SSID + password + + + + key + phrase + + + ifname + BSSID + name + + + + yes + no + + + + + + yes + no + + + + + + Connect to a Wi-Fi network specified by SSID or BSSID. The command + creates a new connection and then activates it on a device. This is a + command-line counterpart of clicking an SSID in a GUI client. The command + always creates a new connection and thus it is mainly useful for connecting to + new Wi-Fi networks. If a connection for the network already exists, it is + better to bring up (activate) the existing connection as follows: + nmcli con up id name. Note that + only open, WEP and WPA-PSK networks are supported at the moment. It is also + supposed that IP configuration is obtained via DHCP. + + If option is not specified, the default timeout will be 90 + seconds. + + Available options are: + + + + + + password for secured networks (WEP or WPA). + + + + + + type of WEP secret, either for ASCII/HEX key or + for passphrase. + + + + + + interface that will be used for activation. + + + + + + if specified, the created connection will be restricted just for the + BSSID. + + + + + + if specified, the connection will use the name (else NM creates a name + itself). + + + + + + if set to yes, the connection will only be visible + to the user who created it. Otherwise the connection is system-wide, which is + the default. + + + + + + set to yes when connecting for the first time to an + AP not broadcasting its SSID. Otherwise the SSID would not be found and the + connection attempt would fail. + + + + + + + + + wifi + hotspot + ifname + name + SSID + + + + a + bg + + + channel + password + + + + Create a Wi-Fi hotspot. The command creates a hotspot connection profile + according to Wi-Fi device capabilities and activates it on the device. The + hotspot is secured with WPA if device/driver supports that, otherwise WEP is + used. Use connection down or device + disconnect to stop the hotspot. + + Parameters of the hotspot can be influenced by the optional + parameters: + + + + + + what Wi-Fi device is used. + + + + + + name of the created hotspot connection profile. + + + + + + SSID of the hotspot. + + + + + + Wi-Fi band to use. + + + + + + Wi-Fi channel to use. + + + + + + password to use for the created hotspot. If not provided, nmcli will + generate a password. The password is either WPA pre-shared key or WEP + key. + + Note that global option can be used to + print the hotspot password. It is useful especially when the password was + generated. + + + + + + + + + wifi + rescan + ifname + SSID + + + + Request that NetworkManager immediately re-scan for + available access points. NetworkManager scans Wi-Fi networks periodically, but + in some cases it can be useful to start scanning manually (e.g. after resuming + the computer). By using , it is possible to scan for a + specific SSID, which is useful for APs with hidden SSIDs. You can provide + multiple parameters in order to scan more + SSIDs. + + This command does not show the APs, use nmcli device wifi list + for that. + + + + + + lldp + + list + ifname + + + + + Display information about neighboring devices learned through the Link + Layer Discovery Protocol (LLDP). The option can be + used to list neighbors only for a given interface. The protocol must be enabled + in the connection settings. + + + + + + Secret Agent + + + nmcli agent + + secret + polkit + all + + + + Run nmcli as a NetworkManager secret agent, or polkit agent. + + + + + secret + + + Register nmcli as a NetworkManager secret agent and listen for secret + requests. You do usually not need this command, because nmcli can handle + secrets when connecting to networks. However, you may find the command useful + when you use another tool for activating connections and you do not have a + secret agent available (like nm-applet). + + + + + + polkit + + + + Register nmcli as a polkit agent for the user session and listen for + authorization requests. You do not usually need this command, because nmcli can + handle polkit actions related to NetworkManager operations (when run with + ). However, you may find the command useful when you want + to run a simple text based polkit agent and you do not have an agent of a desktop + environment. Note that running this command makes nmcli handle all polkit requests, + not only NetworkManager related ones, because only one polkit agent can run for the + session. + + + + + + all + + + + Runs nmcli as both NetworkManager secret and a polkit agent. + + + + + + + + Environment Variables + + nmcli's behavior is affected by the following + environment variables. + + + + LC_ALL + + If set to a non-empty string value, it overrides the values of all the + other internationalization variables. + + + + + LC_MESSAGES + + Determines the locale to be used for internationalized messages. + + + + + LANG + + Provides a default value for the internationalization variables that are + unset or null. + + + + + + + Internationalization notes + + Be aware that nmcli is localized and that is why the + output depends on your environment. This is important to realize especially + when you parse the output. + + Call nmcli as LC_ALL=C nmcli to + be sure the locale is set to C while executing in a script. + + LC_ALL, LC_MESSAGES, LANG + variables specify the LC_MESSAGES locale category (in that + order), which determines the language that nmcli uses for + messages. The C locale is used if none of these variables are set, and this + locale uses English messages. + + + + Exit Status + + nmcli exits with status 0 if it succeeds, a value + greater than 0 is returned if an error occurs. + + + + 0 + + Success – indicates the operation succeeded. + + + + + 1 + + Unknown or unspecified error. + + + + + 2 + + Invalid user input, wrong nmcli + invocation. + + + + + 3 + + Timeout expired (see option). + + + + + 4 + + Connection activation failed. + + + + + 5 + + Connection deactivation failed. + + + + + 6 + + Disconnecting device failed. + + + + + 7 + + Connection deletion failed. + + + + + 8 + + NetworkManager is not running. + + + + + 9 + + nmcli and NetworkManager + versions mismatch. + + + + + 10 + + Connection, device, or access point does not exist. + + + + + + Examples + + This section presents various examples of nmcli usage. If you want even + more, please refer to + nmcli-examples7 + manual page. + + + + nmcli -t -f RUNNING general + + tells you whether NetworkManager is running or not. + + + + + nmcli -t -f STATE general + + shows the overall status of NetworkManager. + + + + + nmcli radio wifi off + + switches Wi-Fi off. + + + + + nmcli connection show + + lists all connections NetworkManager has. + + + + + nmcli -p -m multiline -f all con show + + shows all configured connections in multi-line mode. + + + + + nmcli connection show --active + + lists all currently active connections. + + + + + nmcli -f name,autoconnect c s + + shows all connection profile names and their auto-connect property. + + + + + nmcli -p connection show "My default em1" + + shows details for "My default em1" connection profile. + + + + + nmcli --show-secrets connection show "My Home WiFi" + + shows details for "My Home WiFi" connection profile with all passwords. + Without option, secrets would not be + displayed. + + + + + nmcli -f active connection show "My default em1" + + shows details for "My default em1" active connection, like IP, DHCP + information, etc. + + + + + nmcli -f profile con s "My wired connection" + + shows static configuration details of the connection profile with "My + wired connection" name. + + + + + nmcli -p con up "My wired connection" ifname eth0 + + activates the connection profile with name "My wired connection" on + interface eth0. The -p option makes nmcli show progress of the + activation. + + + + + nmcli con up 6b028a27-6dc9-4411-9886-e9ad1dd43761 ap 00:3A:98:7C:42:D3 + + connects the Wi-Fi connection with UUID + 6b028a27-6dc9-4411-9886-e9ad1dd43761 to the AP with BSSID + 00:3A:98:7C:42:D3. + + + + + nmcli device status + + shows the status for all devices. + + + + + nmcli dev disconnect em2 + + disconnects a connection on interface em2 and marks the device as + unavailable for auto-connecting. As a result, no connection will automatically + be activated on the device until the device's 'autoconnect' is set to TRUE or + the user manually activates a connection. + + + + + nmcli -f GENERAL,WIFI-PROPERTIES dev show wlan0 + + shows details for wlan0 interface; only GENERAL and WIFI-PROPERTIES + sections will be shown. + + + + + nmcli -f CONNECTIONS device show wlp3s0 + + shows all available connection profiles for your Wi-Fi interface + wlp3s0. + + + + + nmcli dev wifi + + lists available Wi-Fi access points known to NetworkManager. + + + + + nmcli dev wifi con "Cafe Hotspot 1" password caffeine name "My cafe" + + creates a new connection named "My cafe" and then connects it to "Cafe + Hotspot 1" SSID using password "caffeine". This is mainly useful when + connecting to "Cafe Hotspot 1" for the first time. Next time, it is better to + use nmcli con up id "My cafe" so that the + existing connection profile can be used and no additional is created. + + + + + nmcli -s dev wifi hotspot con-name QuickHotspot + + creates a hotspot profile and connects it. Prints the hotspot password + the user should use to connect to the hotspot from other devices. + + + + + nmcli connection add type ethernet autoconnect no ifname eth0 + + non-interactively adds an Ethernet connection tied to eth0 interface with + automatic IP configuration (DHCP), and disables the connection's autoconnect + flag. + + + + + nmcli c a ifname Maxipes-fik type vlan dev eth0 id 55 + + non-interactively adds a VLAN connection with ID 55. The connection will + use eth0 and the VLAN interface will be named Maxipes-fik. + + + + + nmcli c a ifname eth0 type ethernet -- ipv4.method disabled ipv6.method link-local + + non-interactively adds a connection that will use eth0 Ethernet interface + and only have an IPv6 link-local address configured. + + + + + nmcli connection edit ethernet-em1-2 + + edits existing "ethernet-em1-2" connection in the interactive + editor. + + + + + nmcli connection edit type ethernet con-name "yet another Ethernet connection" + + adds a new Ethernet connection in the interactive editor. + + + + + nmcli con mod ethernet-2 connection.autoconnect no + + modifies 'autoconnect' property in the 'connection' setting of + 'ethernet-2' connection. + + + + + nmcli con mod "Home Wi-Fi" wifi.mtu 1350 + + modifies 'mtu' property in the 'wifi' setting of 'Home Wi-Fi' + connection. + + + + + nmcli con mod em1-1 ipv4.method manual ipv4.addr "192.168.1.23/24 192.168.1.1, 10.10.1.5/8, 10.0.0.11" + + sets manual addressing and the addresses in em1-1 profile. + + + + + nmcli con modify ABC +ipv4.dns 8.8.8.8 + + appends a Google public DNS server to DNS servers in ABC profile. + + + + + nmcli con modify ABC -ipv4.addresses "192.168.100.25/24 192.168.1.1" + + removes the specified IP address from (static) profile ABC. + + + + + nmcli con import type openvpn file ~/Downloads/frootvpn.ovpn + + imports an OpenVPN configuration to NetworkManager. + + + + + nmcli con export corp-vpnc /home/joe/corpvpn.conf + + exports NetworkManager VPN profile corp-vpnc as standard Cisco (vpnc) + configuration. + + + + + + Notes + nmcli accepts abbreviations, as long as they are a unique prefix in the set + of possible options. As new options get added, these abbreviations are not guaranteed + to stay unique. For scripting and long term compatibility it is therefore strongly + advised to spell out the full option names. + + + Bugs + There are probably some bugs. If you find a bug, please report it to + https://bugzilla.gnome.org/ — product NetworkManager. + + + See Also + nmcli-examples7, + nm-online1, + NetworkManager8, + NetworkManager.conf5, + nm-settings5, + nm-applet1, + nm-connection-editor1. + + + diff --git a/man/nmtui.1 b/man/nmtui.1 new file mode 100644 index 00000000..832d65d3 --- /dev/null +++ b/man/nmtui.1 @@ -0,0 +1,76 @@ +'\" t +.\" Title: nmtui +.\" Author: +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 04/05/2016 +.\" Manual: General Commands Manual +.\" Source: NetworkManager 1.1.93 +.\" Language: English +.\" +.TH "NMTUI" "1" "" "NetworkManager 1\&.1\&.93" "General Commands Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +nmtui \- Text User Interface for controlling NetworkManager +.SH "SYNOPSIS" +.HP \w'\fBnmtui\-edit\ |\ nmtui\ edit\ \fR\ 'u +\fBnmtui\-edit | nmtui\ edit \fR {\fIname\fR\ |\ \fIid\fR} +.HP \w'\fBnmtui\-connect\ |\ nmtui\ connect\ \fR\ 'u +\fBnmtui\-connect | nmtui\ connect \fR {\fIname\fR\ |\ \fIuuid\fR\ |\ \fIdevice\fR\ |\ \fISSID\fR} +.HP \w'\fBnmtui\-hostname\ |\ nmtui\ hostname\ \fR\ 'u +\fBnmtui\-hostname | nmtui\ hostname \fR +.SH "DESCRIPTION" +.PP +\fBnmtui\fR +is a curses\(hybased TUI application for interacting with NetworkManager\&. When starting +\fBnmtui\fR, the user is prompted to choose the activity to perform unless it was specified as the first argument\&. +.PP +The supported activities are: +.PP +\fBedit\fR +.RS 4 +Show a connection editor that supports adding, modifying, viewing and deleting connections\&. It provides similar functionality as +\fBnm\-connection\-editor\fR\&. +.RE +.PP +\fBconnect\fR +.RS 4 +Show a list of available connections, with the option to activate or deactivate them\&. It provides similar functionality as +\fBnm\-applet\fR\&. +.RE +.PP +\fBhostname\fR +.RS 4 +Set the system hostname\&. +.RE +.PP +Corresponding to above activities, +\fBnmtui\fR +also comes with binaries named +\fBnmtui\-edit\fR, +\fBnmtui\-connect\fR, and +\fBnmtui\-hostname\fR +to skip the selection of the activities\&. +.SH "SEE ALSO" +.PP +\fBnmcli\fR(1), +\fBnm-applet\fR(1), +\fBnm-connection-editor\fR(1), +\fBNetworkManager\fR(8)\&. diff --git a/man/nmtui.1.in b/man/nmtui.1.in deleted file mode 100644 index 977339db..00000000 --- a/man/nmtui.1.in +++ /dev/null @@ -1,66 +0,0 @@ -.\" nmtui (1) manual page -.\" -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public Licence along -.\" with this manual; if not, write to the Free Software Foundation, Inc., -.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -.\" -.\" Copyright 2014 Red Hat, Inc. -.\" -.TH NMTUI "1" "2014-11-06" "NetworkManager 1.2" - -.SH NAME -nmtui \- Text User Interface for controlling NetworkManager -.SH SYNOPSIS -.B nmtui -.RI " [ " edit " | " connect " | " hostname " ] [ ... ] " -.P -.B nmtui\-edit -.RI " [ " connection-id " | " connection-name " ] " -.P -.B nmtui\-connect -.RI " [ " connection-name " | " connection-uuid " | " device-name " | " Wi-Fi-SSID " ] " -.P -.B nmtui\-hostname - -.SH DESCRIPTION -.B nmtui -is a curses\(hybased TUI application for interacting with \fINetworkManager\fP. -.P -When starting \fInmtui\fP, the user is prompted to choose the activity to perform -unless it was specified as the first argument. -.P -The supported activities are: -.IP \(em 4 -\fIedit\fP: show a connection editor that supports adding, modifying, viewing and deleting -connections. It provides similar functionality as \fInm\-connection\-editor\fP. -.IP \(em 4 -\fIconnect\fP: show a list of available connections, with the option to activate or deactivate -them. It provides similar functionality as \fInm\-applet\fP. -.IP \(em 4 -\fIhostname\fP: set the system hostname. - -.P -Corresponding to above activities, \fInmtui\fP also comes with binaries named -\fInmtui\-edit\fP, \fInmtui\-connect\fP, and \fInmtui-hostname\fP to skip the selection -of the activities. - -.SH SEE ALSO -.BR NetworkManager(8), -.BR nmcli(1). -.BR nm\-applet(1). -.BR nm\-connection\-editor(1). diff --git a/man/nmtui.xml b/man/nmtui.xml new file mode 100644 index 00000000..d92f525b --- /dev/null +++ b/man/nmtui.xml @@ -0,0 +1,137 @@ + + + +%entities; +]> + + + + + + + nmtui + NetworkManager developers + + + + nmtui + 1 + NetworkManager + General Commands Manual + &NM_VERSION; + + + + nmtui + Text User Interface for controlling NetworkManager + + + + + + nmtui-edit + nmtui edit + + + + name + id + + + + + + nmtui-connect + nmtui connect + + + + name + uuid + device + SSID + + + + + + nmtui-hostname + nmtui hostname + + + + + Description + nmtui is a curses‐based TUI application for + interacting with NetworkManager. When starting nmtui, the + user is prompted to choose the activity to perform unless it was specified as + the first argument. + + The supported activities are: + + + + + + Show a connection editor that supports adding, modifying, viewing and + deleting connections. It provides similar functionality as + nm-connection-editor. + + + + + + + Show a list of available connections, with the option to activate or + deactivate them. It provides similar functionality as + nm-applet. + + + + + + + Set the system hostname. + + + + + Corresponding to above activities, nmtui also comes + with binaries named nmtui-edit, + nmtui-connect, and nmtui-hostname to skip + the selection of the activities. + + + See Also + nmcli1, + nm-applet1, + nm-connection-editor1, + NetworkManager8. + + + diff --git a/po/ar.po b/po/ar.po index ee715b51..751a7164 100644 --- a/po/ar.po +++ b/po/ar.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-23 14:07+0100\n" +"POT-Creation-Date: 2016-04-05 15:00+0200\n" "PO-Revision-Date: 2007-12-26 09:20+0100\n" "Last-Translator: Djihed Afifi \n" "Language-Team: Arabic \n" @@ -22,7 +22,7 @@ msgstr "" "X-Poedit-Language: Arabic\n" "X-Generator: KBabel 1.11.4\n" -#: ../clients/cli/agent.c:41 +#: ../clients/cli/agent.c:39 #, c-format msgid "" "Usage: nmcli agent { COMMAND | help }\n" @@ -31,7 +31,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/agent.c:49 +#: ../clients/cli/agent.c:47 #, c-format msgid "" "Usage: nmcli agent secret { help }\n" @@ -43,7 +43,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/agent.c:59 +#: ../clients/cli/agent.c:57 #, c-format msgid "" "Usage: nmcli agent polkit { help }\n" @@ -55,7 +55,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/agent.c:69 +#: ../clients/cli/agent.c:67 #, c-format msgid "" "Usage: nmcli agent all { help }\n" @@ -64,512 +64,511 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/agent.c:151 +#: ../clients/cli/agent.c:149 #, c-format msgid "nmcli successfully registered as a NetworkManager's secret agent.\n" msgstr "" -#: ../clients/cli/agent.c:153 +#: ../clients/cli/agent.c:151 #, c-format msgid "Error: secret agent initialization failed" msgstr "" -#: ../clients/cli/agent.c:168 +#: ../clients/cli/agent.c:166 #, c-format msgid "Error: polkit agent initialization failed: %s" msgstr "" -#: ../clients/cli/agent.c:176 +#: ../clients/cli/agent.c:174 #, c-format msgid "nmcli successfully registered as a polkit agent.\n" msgstr "" -#: ../clients/cli/agent.c:208 ../clients/cli/connections.c:10953 -#: ../clients/cli/devices.c:3552 ../clients/cli/general.c:344 -#: ../clients/cli/general.c:485 +#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050 +#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343 +#: ../clients/cli/general.c:484 #, c-format msgid "Error: NetworkManager is not running." msgstr "" -#: ../clients/cli/agent.c:244 +#: ../clients/cli/agent.c:242 #, c-format msgid "Error: 'agent' command '%s' is not valid." msgstr "" -#: ../clients/cli/common.c:40 ../clients/cli/common.c:53 -#: ../clients/cli/common.c:61 ../clients/cli/common.c:73 -#: ../clients/cli/connections.c:193 ../clients/cli/connections.c:215 +#: ../clients/cli/common.c:38 ../clients/cli/common.c:51 +#: ../clients/cli/common.c:59 ../clients/cli/common.c:71 +#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214 msgid "GROUP" msgstr "" #. 0 -#: ../clients/cli/common.c:41 ../clients/cli/common.c:62 +#: ../clients/cli/common.c:39 ../clients/cli/common.c:60 msgid "ADDRESS" msgstr "" #. 1 #. 2 -#: ../clients/cli/common.c:42 ../clients/cli/common.c:63 -#: ../clients/cli/connections.c:218 +#: ../clients/cli/common.c:40 ../clients/cli/common.c:61 +#: ../clients/cli/connections.c:217 msgid "GATEWAY" msgstr "" #. 2 -#: ../clients/cli/common.c:43 ../clients/cli/common.c:64 +#: ../clients/cli/common.c:41 ../clients/cli/common.c:62 msgid "ROUTE" msgstr "" #. 3 -#: ../clients/cli/common.c:44 ../clients/cli/common.c:65 +#: ../clients/cli/common.c:42 ../clients/cli/common.c:63 msgid "DNS" msgstr "" #. 4 -#: ../clients/cli/common.c:45 ../clients/cli/common.c:66 +#: ../clients/cli/common.c:43 ../clients/cli/common.c:64 msgid "DOMAIN" msgstr "" #. 5 -#: ../clients/cli/common.c:46 +#: ../clients/cli/common.c:44 msgid "WINS" msgstr "" #. 0 -#: ../clients/cli/common.c:54 ../clients/cli/common.c:74 +#: ../clients/cli/common.c:52 ../clients/cli/common.c:72 msgid "OPTION" msgstr "" -#: ../clients/cli/common.c:378 ../clients/cli/common.c:438 +#: ../clients/cli/common.c:376 ../clients/cli/common.c:436 #, c-format msgid "invalid prefix '%s'; <1-%d> allowed" msgstr "" -#: ../clients/cli/common.c:386 +#: ../clients/cli/common.c:384 #, c-format msgid "invalid IP address: %s" msgstr "" -#: ../clients/cli/common.c:450 +#: ../clients/cli/common.c:448 #, c-format msgid "" "the second component of route ('%s') is neither a next hop address nor a " "metric" msgstr "" -#: ../clients/cli/common.c:459 +#: ../clients/cli/common.c:457 #, c-format msgid "invalid metric '%s'" msgstr "" -#: ../clients/cli/common.c:467 +#: ../clients/cli/common.c:465 #, c-format msgid "invalid route: %s" msgstr "" -#: ../clients/cli/common.c:479 +#: ../clients/cli/common.c:477 msgid "default route cannot be added (NetworkManager handles it by itself)" msgstr "" -#: ../clients/cli/common.c:496 +#: ../clients/cli/common.c:494 msgid "unmanaged" msgstr "" -#: ../clients/cli/common.c:498 +#: ../clients/cli/common.c:496 msgid "unavailable" msgstr "" -#: ../clients/cli/common.c:500 ../clients/cli/general.c:246 +#: ../clients/cli/common.c:498 ../clients/cli/general.c:245 msgid "disconnected" msgstr "" -#: ../clients/cli/common.c:502 +#: ../clients/cli/common.c:500 msgid "connecting (prepare)" msgstr "" -#: ../clients/cli/common.c:504 +#: ../clients/cli/common.c:502 msgid "connecting (configuring)" msgstr "" -#: ../clients/cli/common.c:506 +#: ../clients/cli/common.c:504 msgid "connecting (need authentication)" msgstr "" -#: ../clients/cli/common.c:508 +#: ../clients/cli/common.c:506 msgid "connecting (getting IP configuration)" msgstr "" -#: ../clients/cli/common.c:510 +#: ../clients/cli/common.c:508 msgid "connecting (checking IP connectivity)" msgstr "" -#: ../clients/cli/common.c:512 +#: ../clients/cli/common.c:510 msgid "connecting (starting secondary connections)" msgstr "" -#: ../clients/cli/common.c:514 ../clients/cli/general.c:242 +#: ../clients/cli/common.c:512 ../clients/cli/general.c:241 msgid "connected" msgstr "" -#: ../clients/cli/common.c:516 ../clients/cli/connections.c:649 +#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648 msgid "deactivating" msgstr "" -#: ../clients/cli/common.c:518 +#: ../clients/cli/common.c:516 msgid "connection failed" msgstr "" -#: ../clients/cli/common.c:520 ../clients/cli/common.c:537 -#: ../clients/cli/connections.c:654 ../clients/cli/connections.c:677 -#: ../clients/cli/connections.c:1947 ../clients/cli/devices.c:1011 -#: ../clients/cli/devices.c:1052 ../clients/cli/devices.c:1054 -#: ../clients/cli/general.c:249 ../clients/cli/general.c:287 -#: ../clients/cli/general.c:433 ../clients/cli/general.c:449 -#: ../clients/cli/settings.c:864 ../clients/cli/settings.c:950 -#: ../clients/cli/settings.c:1277 ../clients/cli/settings.c:1888 -#: ../clients/cli/settings.c:3192 ../clients/cli/utils.c:1396 ../src/main.c:227 -#: ../src/main.c:371 ../src/main.c:426 +#: ../clients/cli/common.c:518 ../clients/cli/common.c:535 +#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676 +#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024 +#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067 +#: ../clients/cli/general.c:248 ../clients/cli/general.c:286 +#: ../clients/cli/general.c:432 ../clients/cli/general.c:448 +#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925 +#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901 +#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400 #, c-format msgid "unknown" msgstr "" #. "CAPABILITIES" -#: ../clients/cli/common.c:529 ../clients/cli/connections.c:934 -#: ../clients/cli/connections.c:936 ../clients/cli/connections.c:938 -#: ../clients/cli/connections.c:972 ../clients/cli/connections.c:1041 -#: ../clients/cli/connections.c:1042 ../clients/cli/connections.c:1044 -#: ../clients/cli/connections.c:3464 ../clients/cli/connections.c:8509 -#: ../clients/cli/connections.c:8510 ../clients/cli/devices.c:759 -#: ../clients/cli/devices.c:976 ../clients/cli/devices.c:977 -#: ../clients/cli/devices.c:978 ../clients/cli/devices.c:979 -#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:1015 -#: ../clients/cli/devices.c:1017 ../clients/cli/devices.c:1045 -#: ../clients/cli/devices.c:1046 ../clients/cli/devices.c:1047 -#: ../clients/cli/devices.c:1048 ../clients/cli/devices.c:1049 -#: ../clients/cli/devices.c:1050 ../clients/cli/devices.c:1051 -#: ../clients/cli/devices.c:1053 ../clients/cli/devices.c:1055 -#: ../clients/cli/general.c:443 ../clients/cli/settings.c:1870 -#: ../clients/cli/settings.c:3187 +#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933 +#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937 +#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040 +#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043 +#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563 +#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772 +#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990 +#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992 +#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028 +#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058 +#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060 +#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062 +#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064 +#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068 +#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200 msgid "yes" msgstr "" -#: ../clients/cli/common.c:531 ../clients/cli/connections.c:934 -#: ../clients/cli/connections.c:936 ../clients/cli/connections.c:938 -#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1042 -#: ../clients/cli/connections.c:1044 ../clients/cli/connections.c:3465 -#: ../clients/cli/connections.c:8509 ../clients/cli/connections.c:8510 -#: ../clients/cli/devices.c:759 ../clients/cli/devices.c:976 -#: ../clients/cli/devices.c:977 ../clients/cli/devices.c:978 -#: ../clients/cli/devices.c:979 ../clients/cli/devices.c:980 -#: ../clients/cli/devices.c:1015 ../clients/cli/devices.c:1017 -#: ../clients/cli/devices.c:1045 ../clients/cli/devices.c:1046 -#: ../clients/cli/devices.c:1047 ../clients/cli/devices.c:1048 -#: ../clients/cli/devices.c:1049 ../clients/cli/devices.c:1050 -#: ../clients/cli/devices.c:1051 ../clients/cli/devices.c:1053 -#: ../clients/cli/devices.c:1055 ../clients/cli/general.c:445 -#: ../clients/cli/settings.c:1868 ../clients/cli/settings.c:3189 +#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933 +#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937 +#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041 +#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451 +#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564 +#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989 +#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991 +#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993 +#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030 +#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059 +#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061 +#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063 +#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066 +#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444 +#: ../clients/cli/settings.c:3202 #, fuzzy msgid "no" msgstr "بلا" -#: ../clients/cli/common.c:533 +#: ../clients/cli/common.c:531 msgid "yes (guessed)" msgstr "" -#: ../clients/cli/common.c:535 +#: ../clients/cli/common.c:533 msgid "no (guessed)" msgstr "" -#: ../clients/cli/common.c:546 +#: ../clients/cli/common.c:544 msgid "No reason given" msgstr "" -#: ../clients/cli/common.c:549 ../clients/cli/connections.c:2988 +#. We should not really come here +#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976 #, c-format msgid "Unknown error" msgstr "" -#: ../clients/cli/common.c:552 +#: ../clients/cli/common.c:550 msgid "Device is now managed" msgstr "" -#: ../clients/cli/common.c:555 +#: ../clients/cli/common.c:553 msgid "Device is now unmanaged" msgstr "" -#: ../clients/cli/common.c:558 +#: ../clients/cli/common.c:556 msgid "The device could not be readied for configuration" msgstr "" -#: ../clients/cli/common.c:561 +#: ../clients/cli/common.c:559 msgid "" "IP configuration could not be reserved (no available address, timeout, etc.)" msgstr "" -#: ../clients/cli/common.c:564 +#: ../clients/cli/common.c:562 msgid "The IP configuration is no longer valid" msgstr "" -#: ../clients/cli/common.c:567 +#: ../clients/cli/common.c:565 msgid "Secrets were required, but not provided" msgstr "" -#: ../clients/cli/common.c:570 +#: ../clients/cli/common.c:568 msgid "802.1X supplicant disconnected" msgstr "" -#: ../clients/cli/common.c:573 +#: ../clients/cli/common.c:571 msgid "802.1X supplicant configuration failed" msgstr "" -#: ../clients/cli/common.c:576 +#: ../clients/cli/common.c:574 msgid "802.1X supplicant failed" msgstr "" -#: ../clients/cli/common.c:579 +#: ../clients/cli/common.c:577 msgid "802.1X supplicant took too long to authenticate" msgstr "" -#: ../clients/cli/common.c:582 +#: ../clients/cli/common.c:580 msgid "PPP service failed to start" msgstr "" -#: ../clients/cli/common.c:585 +#: ../clients/cli/common.c:583 msgid "PPP service disconnected" msgstr "" -#: ../clients/cli/common.c:588 +#: ../clients/cli/common.c:586 msgid "PPP failed" msgstr "" -#: ../clients/cli/common.c:591 +#: ../clients/cli/common.c:589 msgid "DHCP client failed to start" msgstr "" -#: ../clients/cli/common.c:594 +#: ../clients/cli/common.c:592 msgid "DHCP client error" msgstr "" -#: ../clients/cli/common.c:597 +#: ../clients/cli/common.c:595 msgid "DHCP client failed" msgstr "" -#: ../clients/cli/common.c:600 +#: ../clients/cli/common.c:598 msgid "Shared connection service failed to start" msgstr "" -#: ../clients/cli/common.c:603 +#: ../clients/cli/common.c:601 msgid "Shared connection service failed" msgstr "" -#: ../clients/cli/common.c:606 +#: ../clients/cli/common.c:604 msgid "AutoIP service failed to start" msgstr "" -#: ../clients/cli/common.c:609 +#: ../clients/cli/common.c:607 msgid "AutoIP service error" msgstr "" -#: ../clients/cli/common.c:612 +#: ../clients/cli/common.c:610 msgid "AutoIP service failed" msgstr "" -#: ../clients/cli/common.c:615 +#: ../clients/cli/common.c:613 msgid "The line is busy" msgstr "" -#: ../clients/cli/common.c:618 +#: ../clients/cli/common.c:616 msgid "No dial tone" msgstr "" -#: ../clients/cli/common.c:621 +#: ../clients/cli/common.c:619 msgid "No carrier could be established" msgstr "" -#: ../clients/cli/common.c:624 +#: ../clients/cli/common.c:622 msgid "The dialing request timed out" msgstr "" -#: ../clients/cli/common.c:627 +#: ../clients/cli/common.c:625 msgid "The dialing attempt failed" msgstr "" -#: ../clients/cli/common.c:630 +#: ../clients/cli/common.c:628 msgid "Modem initialization failed" msgstr "" -#: ../clients/cli/common.c:633 +#: ../clients/cli/common.c:631 msgid "Failed to select the specified APN" msgstr "" -#: ../clients/cli/common.c:636 +#: ../clients/cli/common.c:634 msgid "Not searching for networks" msgstr "" -#: ../clients/cli/common.c:639 +#: ../clients/cli/common.c:637 msgid "Network registration denied" msgstr "" -#: ../clients/cli/common.c:642 +#: ../clients/cli/common.c:640 msgid "Network registration timed out" msgstr "" -#: ../clients/cli/common.c:645 +#: ../clients/cli/common.c:643 msgid "Failed to register with the requested network" msgstr "" -#: ../clients/cli/common.c:648 +#: ../clients/cli/common.c:646 msgid "PIN check failed" msgstr "" -#: ../clients/cli/common.c:651 +#: ../clients/cli/common.c:649 msgid "Necessary firmware for the device may be missing" msgstr "" -#: ../clients/cli/common.c:654 +#: ../clients/cli/common.c:652 msgid "The device was removed" msgstr "" -#: ../clients/cli/common.c:657 +#: ../clients/cli/common.c:655 msgid "NetworkManager went to sleep" msgstr "" -#: ../clients/cli/common.c:660 +#: ../clients/cli/common.c:658 msgid "The device's active connection disappeared" msgstr "" -#: ../clients/cli/common.c:663 +#: ../clients/cli/common.c:661 msgid "Device disconnected by user or client" msgstr "" -#: ../clients/cli/common.c:666 +#: ../clients/cli/common.c:664 msgid "Carrier/link changed" msgstr "" -#: ../clients/cli/common.c:669 +#: ../clients/cli/common.c:667 msgid "The device's existing connection was assumed" msgstr "" -#: ../clients/cli/common.c:672 +#: ../clients/cli/common.c:670 msgid "The supplicant is now available" msgstr "" -#: ../clients/cli/common.c:675 +#: ../clients/cli/common.c:673 msgid "The modem could not be found" msgstr "" -#: ../clients/cli/common.c:678 +#: ../clients/cli/common.c:676 msgid "The Bluetooth connection failed or timed out" msgstr "" -#: ../clients/cli/common.c:681 +#: ../clients/cli/common.c:679 msgid "GSM Modem's SIM card not inserted" msgstr "" -#: ../clients/cli/common.c:684 +#: ../clients/cli/common.c:682 msgid "GSM Modem's SIM PIN required" msgstr "" -#: ../clients/cli/common.c:687 +#: ../clients/cli/common.c:685 msgid "GSM Modem's SIM PUK required" msgstr "" -#: ../clients/cli/common.c:690 +#: ../clients/cli/common.c:688 msgid "GSM Modem's SIM wrong" msgstr "" -#: ../clients/cli/common.c:693 +#: ../clients/cli/common.c:691 msgid "InfiniBand device does not support connected mode" msgstr "" -#: ../clients/cli/common.c:696 +#: ../clients/cli/common.c:694 msgid "A dependency of the connection failed" msgstr "" -#: ../clients/cli/common.c:699 +#: ../clients/cli/common.c:697 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge" msgstr "" -#: ../clients/cli/common.c:702 +#: ../clients/cli/common.c:700 msgid "ModemManager is unavailable" msgstr "" -#: ../clients/cli/common.c:705 +#: ../clients/cli/common.c:703 msgid "The Wi-Fi network could not be found" msgstr "" -#: ../clients/cli/common.c:708 +#: ../clients/cli/common.c:706 msgid "A secondary connection of the base connection failed" msgstr "" -#: ../clients/cli/common.c:711 +#: ../clients/cli/common.c:709 msgid "DCB or FCoE setup failed" msgstr "" -#: ../clients/cli/common.c:714 +#: ../clients/cli/common.c:712 msgid "teamd control failed" msgstr "" -#: ../clients/cli/common.c:717 +#: ../clients/cli/common.c:715 msgid "Modem failed or no longer available" msgstr "" -#: ../clients/cli/common.c:720 +#: ../clients/cli/common.c:718 msgid "Modem now ready and available" msgstr "" -#: ../clients/cli/common.c:723 +#: ../clients/cli/common.c:721 msgid "SIM PIN was incorrect" msgstr "" -#: ../clients/cli/common.c:726 +#: ../clients/cli/common.c:724 msgid "New connection activation was enqueued" msgstr "" -#: ../clients/cli/common.c:729 +#: ../clients/cli/common.c:727 msgid "The device's parent changed" msgstr "" -#: ../clients/cli/common.c:732 +#: ../clients/cli/common.c:730 msgid "The device parent's management changed" msgstr "" #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) -#: ../clients/cli/common.c:736 ../libnm-glib/nm-device.c:1874 -#: ../libnm/nm-device.c:1825 +#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888 +#: ../libnm/nm-device.c:1839 msgid "Unknown" msgstr "" -#: ../clients/cli/common.c:778 +#: ../clients/cli/common.c:776 #, c-format msgid "invalid priority map '%s'" msgstr "" -#: ../clients/cli/common.c:785 ../clients/cli/common.c:791 +#: ../clients/cli/common.c:783 ../clients/cli/common.c:789 #, c-format msgid "priority '%s' is not valid (<0-%ld>)" msgstr "" -#: ../clients/cli/common.c:858 +#: ../clients/cli/common.c:856 #, c-format msgid "'%s' is not a valid team configuration or file name." msgstr "" -#: ../clients/cli/common.c:960 +#: ../clients/cli/common.c:958 #, c-format msgid "Error: openconnect failed: %s\n" msgstr "" -#: ../clients/cli/common.c:967 +#: ../clients/cli/common.c:965 #, c-format msgid "Error: openconnect failed with status %d\n" msgstr "" -#: ../clients/cli/common.c:969 +#: ../clients/cli/common.c:967 #, c-format msgid "Error: openconnect failed with signal %d\n" msgstr "" -#: ../clients/cli/common.c:1047 +#: ../clients/cli/common.c:1045 #, c-format msgid "" "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask " @@ -577,70 +576,70 @@ msgid "" msgstr "" #. define some prompts for connection editor -#: ../clients/cli/connections.c:42 +#: ../clients/cli/connections.c:41 msgid "Setting name? " msgstr "" -#: ../clients/cli/connections.c:43 +#: ../clients/cli/connections.c:42 msgid "Property name? " msgstr "" -#: ../clients/cli/connections.c:44 +#: ../clients/cli/connections.c:43 msgid "Enter connection type: " msgstr "" #. define some other prompts -#: ../clients/cli/connections.c:47 +#: ../clients/cli/connections.c:46 #, fuzzy msgid "Connection type: " msgstr "إتّصالات VPN" -#: ../clients/cli/connections.c:48 +#: ../clients/cli/connections.c:47 msgid "VPN type: " msgstr "" -#: ../clients/cli/connections.c:49 +#: ../clients/cli/connections.c:48 msgid "Master: " msgstr "" -#: ../clients/cli/connections.c:50 +#: ../clients/cli/connections.c:49 msgid "Connection (name, UUID, or path): " msgstr "" -#: ../clients/cli/connections.c:51 +#: ../clients/cli/connections.c:50 msgid "VPN connection (name, UUID, or path): " msgstr "" -#: ../clients/cli/connections.c:52 +#: ../clients/cli/connections.c:51 msgid "Connection(s) (name, UUID, or path): " msgstr "" -#: ../clients/cli/connections.c:53 +#: ../clients/cli/connections.c:52 msgid "Connection(s) (name, UUID, path or apath): " msgstr "" -#: ../clients/cli/connections.c:54 +#: ../clients/cli/connections.c:53 msgid "Tunnel mode: " msgstr "" -#: ../clients/cli/connections.c:55 +#: ../clients/cli/connections.c:54 msgid "MACVLAN mode: " msgstr "" #. 0 -#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194 -#: ../clients/cli/devices.c:56 ../clients/cli/devices.c:90 -#: ../clients/cli/devices.c:100 ../clients/cli/devices.c:111 -#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:138 -#: ../clients/cli/devices.c:151 ../clients/cli/devices.c:177 -#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201 -#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:252 +#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193 +#: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89 +#: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110 +#: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137 +#: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176 +#: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200 +#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251 msgid "NAME" msgstr "" #. 0 #. 1 -#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:195 +#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194 msgid "UUID" msgstr "" @@ -648,35 +647,35 @@ msgstr "" #. 0 #. 1 #. 2 -#: ../clients/cli/connections.c:76 ../clients/cli/connections.c:216 -#: ../clients/cli/devices.c:42 ../clients/cli/devices.c:58 -#: ../clients/cli/devices.c:180 +#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215 +#: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57 +#: ../clients/cli/devices.c:179 msgid "TYPE" msgstr "" #. 2 -#: ../clients/cli/connections.c:77 +#: ../clients/cli/connections.c:76 msgid "TIMESTAMP" msgstr "" #. 3 -#: ../clients/cli/connections.c:78 +#: ../clients/cli/connections.c:77 msgid "TIMESTAMP-REAL" msgstr "" #. 4 #. 16 -#: ../clients/cli/connections.c:79 ../clients/cli/devices.c:73 +#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72 msgid "AUTOCONNECT" msgstr "" #. 5 -#: ../clients/cli/connections.c:80 +#: ../clients/cli/connections.c:79 msgid "AUTOCONNECT-PRIORITY" msgstr "" #. 6 -#: ../clients/cli/connections.c:81 +#: ../clients/cli/connections.c:80 msgid "READONLY" msgstr "" @@ -685,17 +684,17 @@ msgstr "" #. 2 #. 15 #. 5 -#: ../clients/cli/connections.c:82 ../clients/cli/connections.c:202 -#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:167 -#: ../clients/cli/devices.c:183 +#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201 +#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166 +#: ../clients/cli/devices.c:182 msgid "DBUS-PATH" msgstr "" #. 8 #. 13 #. 4 -#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:165 -#: ../clients/cli/devices.c:182 +#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164 +#: ../clients/cli/devices.c:181 msgid "ACTIVE" msgstr "" @@ -704,9 +703,9 @@ msgstr "" #. 12 #. 3 #. 0 -#: ../clients/cli/connections.c:84 ../clients/cli/devices.c:41 -#: ../clients/cli/devices.c:57 ../clients/cli/devices.c:164 -#: ../clients/cli/devices.c:181 ../clients/cli/devices.c:253 +#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40 +#: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163 +#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252 msgid "DEVICE" msgstr "" @@ -715,42 +714,42 @@ msgstr "" #. 1 #. 10 #. 1 -#: ../clients/cli/connections.c:85 ../clients/cli/connections.c:197 -#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:67 -#: ../clients/cli/general.c:37 +#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196 +#: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66 +#: ../clients/cli/general.c:36 msgid "STATE" msgstr "" #. 11 -#: ../clients/cli/connections.c:86 +#: ../clients/cli/connections.c:85 msgid "ACTIVE-PATH" msgstr "" #. 2 -#: ../clients/cli/connections.c:196 +#: ../clients/cli/connections.c:195 msgid "DEVICES" msgstr "" #. 4 -#: ../clients/cli/connections.c:198 +#: ../clients/cli/connections.c:197 msgid "DEFAULT" msgstr "" #. 5 -#: ../clients/cli/connections.c:199 +#: ../clients/cli/connections.c:198 msgid "DEFAULT6" msgstr "" #. 6 -#: ../clients/cli/connections.c:200 +#: ../clients/cli/connections.c:199 msgid "SPEC-OBJECT" msgstr "" #. 7 #. 4 #. Ask for optional 'vpn' arguments. -#: ../clients/cli/connections.c:201 ../clients/cli/connections.c:239 -#: ../clients/cli/connections.c:4183 ../clients/tui/nm-editor-utils.c:234 +#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238 +#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233 #: ../clients/tui/nmt-connect-connection-list.c:405 msgid "VPN" msgstr "" @@ -758,70 +757,70 @@ msgstr "" #. 9 #. 5 #. 22 -#: ../clients/cli/connections.c:203 ../clients/cli/devices.c:47 -#: ../clients/cli/devices.c:79 +#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46 +#: ../clients/cli/devices.c:78 msgid "CON-PATH" msgstr "" #. 10 -#: ../clients/cli/connections.c:204 +#: ../clients/cli/connections.c:203 msgid "ZONE" msgstr "" #. 11 -#: ../clients/cli/connections.c:205 +#: ../clients/cli/connections.c:204 msgid "MASTER-PATH" msgstr "" #. 1 -#: ../clients/cli/connections.c:217 +#: ../clients/cli/connections.c:216 msgid "USERNAME" msgstr "" #. 3 -#: ../clients/cli/connections.c:219 +#: ../clients/cli/connections.c:218 msgid "BANNER" msgstr "" #. 4 -#: ../clients/cli/connections.c:220 +#: ../clients/cli/connections.c:219 msgid "VPN-STATE" msgstr "" #. 5 -#: ../clients/cli/connections.c:221 +#: ../clients/cli/connections.c:220 msgid "CFG" msgstr "" -#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:226 +#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225 msgid "GENERAL" msgstr "" #. 0 #. 6 -#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233 +#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232 msgid "IP4" msgstr "" #. 1 #. 7 -#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234 +#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233 msgid "DHCP4" msgstr "" #. 2 #. 8 -#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235 +#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234 msgid "IP6" msgstr "" #. 3 #. 9 -#: ../clients/cli/connections.c:238 ../clients/cli/devices.c:236 +#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235 msgid "DHCP6" msgstr "" -#: ../clients/cli/connections.c:273 +#: ../clients/cli/connections.c:272 #, c-format msgid "" "Usage: nmcli connection { COMMAND | help }\n" @@ -862,7 +861,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:295 +#: ../clients/cli/connections.c:294 #, c-format msgid "" "Usage: nmcli connection show { ARGUMENTS | help }\n" @@ -889,7 +888,7 @@ msgid "" "well.\n" msgstr "" -#: ../clients/cli/connections.c:316 +#: ../clients/cli/connections.c:315 #, c-format msgid "" "Usage: nmcli connection up { ARGUMENTS | help }\n" @@ -914,7 +913,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:337 +#: ../clients/cli/connections.c:336 #, c-format msgid "" "Usage: nmcli connection down { ARGUMENTS | help }\n" @@ -928,7 +927,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:349 +#: ../clients/cli/connections.c:348 #, c-format msgid "" "Usage: nmcli connection add { ARGUMENTS | help }\n" @@ -1071,7 +1070,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:461 +#: ../clients/cli/connections.c:460 #, c-format msgid "" "Usage: nmcli connection modify { ARGUMENTS | help }\n" @@ -1096,7 +1095,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:484 +#: ../clients/cli/connections.c:483 #, c-format msgid "" "Usage: nmcli connection clone { ARGUMENTS | help }\n" @@ -1110,7 +1109,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:496 +#: ../clients/cli/connections.c:495 #, c-format msgid "" "Usage: nmcli connection edit { ARGUMENTS | help }\n" @@ -1126,7 +1125,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:511 +#: ../clients/cli/connections.c:510 #, c-format msgid "" "Usage: nmcli connection delete { ARGUMENTS | help }\n" @@ -1138,7 +1137,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:522 +#: ../clients/cli/connections.c:521 #, c-format msgid "" "Usage: nmcli connection monitor { ARGUMENTS | help }\n" @@ -1151,7 +1150,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:534 +#: ../clients/cli/connections.c:533 #, c-format msgid "" "Usage: nmcli connection reload { help }\n" @@ -1160,7 +1159,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:542 +#: ../clients/cli/connections.c:541 #, c-format msgid "" "Usage: nmcli connection load { ARGUMENTS | help }\n" @@ -1174,7 +1173,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:554 +#: ../clients/cli/connections.c:553 #, c-format msgid "" "Usage: nmcli connection import { ARGUMENTS | help }\n" @@ -1189,7 +1188,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:567 +#: ../clients/cli/connections.c:566 #, c-format msgid "" "Usage: nmcli connection export { ARGUMENTS | help }\n" @@ -1201,402 +1200,398 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:645 +#: ../clients/cli/connections.c:644 msgid "activating" msgstr "" -#: ../clients/cli/connections.c:647 +#: ../clients/cli/connections.c:646 msgid "activated" msgstr "" -#: ../clients/cli/connections.c:651 +#: ../clients/cli/connections.c:650 msgid "deactivated" msgstr "" -#: ../clients/cli/connections.c:663 +#: ../clients/cli/connections.c:662 #, fuzzy msgid "VPN connecting (prepare)" msgstr "إتّصالات VPN" -#: ../clients/cli/connections.c:665 +#: ../clients/cli/connections.c:664 msgid "VPN connecting (need authentication)" msgstr "" -#: ../clients/cli/connections.c:667 +#: ../clients/cli/connections.c:666 #, fuzzy msgid "VPN connecting" msgstr "إتّصالات VPN" -#: ../clients/cli/connections.c:669 +#: ../clients/cli/connections.c:668 msgid "VPN connecting (getting IP configuration)" msgstr "" -#: ../clients/cli/connections.c:671 +#: ../clients/cli/connections.c:670 #, fuzzy msgid "VPN connected" msgstr "إتّصالات VPN" -#: ../clients/cli/connections.c:673 +#: ../clients/cli/connections.c:672 #, fuzzy msgid "VPN connection failed" msgstr "إتّصالات VPN" -#: ../clients/cli/connections.c:675 +#: ../clients/cli/connections.c:674 #, fuzzy msgid "VPN disconnected" msgstr "إتّصالات VPN" -#: ../clients/cli/connections.c:745 +#: ../clients/cli/connections.c:744 #, c-format msgid "Error updating secrets for %s: %s\n" msgstr "" -#: ../clients/cli/connections.c:765 +#: ../clients/cli/connections.c:764 msgid "Connection profile details" msgstr "" -#: ../clients/cli/connections.c:777 ../clients/cli/connections.c:1170 +#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169 #, fuzzy, c-format msgid "Error: 'connection show': %s" msgstr "خطأ أثناء فتح اتصال VPN '%s'" -#: ../clients/cli/connections.c:933 ../clients/cli/settings.c:1884 +#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897 msgid "never" msgstr "" -#: ../clients/cli/connections.c:1158 +#: ../clients/cli/connections.c:1157 msgid "Activate connection details" msgstr "" -#: ../clients/cli/connections.c:1394 +#: ../clients/cli/connections.c:1393 #, c-format msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s" msgstr "" -#: ../clients/cli/connections.c:1409 ../clients/cli/connections.c:1417 +#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416 #, c-format msgid "'%s' has to be alone" msgstr "" #. Add headers -#: ../clients/cli/connections.c:1632 +#: ../clients/cli/connections.c:1634 msgid "NetworkManager active profiles" msgstr "" -#: ../clients/cli/connections.c:1633 +#: ../clients/cli/connections.c:1635 msgid "NetworkManager connection profiles" msgstr "" -#: ../clients/cli/connections.c:1679 ../clients/cli/connections.c:2387 -#: ../clients/cli/connections.c:2409 ../clients/cli/connections.c:2418 -#: ../clients/cli/connections.c:2427 ../clients/cli/connections.c:2586 -#: ../clients/cli/connections.c:10059 ../clients/cli/connections.c:10176 -#: ../clients/cli/connections.c:10308 ../clients/cli/connections.c:10441 -#: ../clients/cli/connections.c:10551 ../clients/cli/connections.c:10562 -#: ../clients/cli/connections.c:10661 ../clients/cli/devices.c:2221 -#: ../clients/cli/devices.c:2229 ../clients/cli/devices.c:2552 -#: ../clients/cli/devices.c:2559 ../clients/cli/devices.c:2573 -#: ../clients/cli/devices.c:2580 ../clients/cli/devices.c:2597 -#: ../clients/cli/devices.c:2605 ../clients/cli/devices.c:2618 -#: ../clients/cli/devices.c:2982 ../clients/cli/devices.c:2989 -#: ../clients/cli/devices.c:2996 ../clients/cli/devices.c:3008 -#: ../clients/cli/devices.c:3021 ../clients/cli/devices.c:3028 -#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3207 -#: ../clients/cli/devices.c:3380 +#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389 +#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420 +#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588 +#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273 +#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538 +#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659 +#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344 +#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675 +#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696 +#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720 +#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741 +#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112 +#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131 +#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151 +#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330 +#: ../clients/cli/devices.c:3503 #, c-format msgid "Error: %s argument is missing." msgstr "" -#: ../clients/cli/connections.c:1694 +#: ../clients/cli/connections.c:1696 #, c-format msgid "Error: %s - no such connection profile." msgstr "" -#: ../clients/cli/connections.c:1753 ../clients/cli/connections.c:2450 -#: ../clients/cli/connections.c:11065 ../clients/cli/devices.c:3169 -#: ../clients/cli/devices.c:3655 ../clients/cli/general.c:540 -#: ../clients/cli/general.c:589 ../clients/cli/general.c:606 -#: ../clients/cli/general.c:645 ../clients/cli/general.c:659 -#: ../clients/cli/general.c:777 ../clients/cli/general.c:824 -#: ../clients/cli/general.c:844 +#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452 +#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292 +#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539 +#: ../clients/cli/general.c:588 ../clients/cli/general.c:605 +#: ../clients/cli/general.c:644 ../clients/cli/general.c:658 +#: ../clients/cli/general.c:776 ../clients/cli/general.c:823 +#: ../clients/cli/general.c:843 #, c-format msgid "Error: %s." msgstr "" -#: ../clients/cli/connections.c:1849 +#: ../clients/cli/connections.c:1851 #, c-format msgid "no active connection on device '%s'" msgstr "" -#: ../clients/cli/connections.c:1857 +#: ../clients/cli/connections.c:1859 msgid "no active connection or device" msgstr "" -#: ../clients/cli/connections.c:1908 +#: ../clients/cli/connections.c:1910 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "" -#: ../clients/cli/connections.c:1911 +#: ../clients/cli/connections.c:1913 #, fuzzy, c-format msgid "no device found for connection '%s'" msgstr "خطأ أثناء فتح اتصال VPN '%s'" -#: ../clients/cli/connections.c:1923 +#: ../clients/cli/connections.c:1925 msgid "unknown reason" msgstr "" -#: ../clients/cli/connections.c:1925 ../clients/cli/general.c:278 +#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277 msgid "none" msgstr "بلا" -#: ../clients/cli/connections.c:1927 +#: ../clients/cli/connections.c:1929 msgid "the user was disconnected" msgstr "" -#: ../clients/cli/connections.c:1929 +#: ../clients/cli/connections.c:1931 msgid "the base network connection was interrupted" msgstr "" -#: ../clients/cli/connections.c:1931 +#: ../clients/cli/connections.c:1933 msgid "the VPN service stopped unexpectedly" msgstr "" -#: ../clients/cli/connections.c:1933 +#: ../clients/cli/connections.c:1935 msgid "the VPN service returned invalid configuration" msgstr "" -#: ../clients/cli/connections.c:1935 +#: ../clients/cli/connections.c:1937 msgid "the connection attempt timed out" msgstr "" -#: ../clients/cli/connections.c:1937 +#: ../clients/cli/connections.c:1939 msgid "the VPN service did not start in time" msgstr "" -#: ../clients/cli/connections.c:1939 +#: ../clients/cli/connections.c:1941 msgid "the VPN service failed to start" msgstr "" -#: ../clients/cli/connections.c:1941 +#: ../clients/cli/connections.c:1943 msgid "no valid VPN secrets" msgstr "" -#: ../clients/cli/connections.c:1943 +#: ../clients/cli/connections.c:1945 msgid "invalid VPN secrets" msgstr "" -#: ../clients/cli/connections.c:1945 +#: ../clients/cli/connections.c:1947 msgid "the connection was removed" msgstr "" -#: ../clients/cli/connections.c:1967 ../clients/cli/connections.c:1995 -#: ../clients/cli/connections.c:2156 ../clients/cli/connections.c:8400 +#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997 +#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454 #, c-format msgid "Connection successfully activated (D-Bus active path: %s)\n" msgstr "" -#: ../clients/cli/connections.c:1974 +#: ../clients/cli/connections.c:1976 #, c-format msgid "" "Connection successfully activated (master waiting for slaves) (D-Bus active " "path: %s)\n" msgstr "" -#: ../clients/cli/connections.c:1978 ../clients/cli/connections.c:2000 +#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002 #, c-format msgid "Error: Connection activation failed." msgstr "" -#: ../clients/cli/connections.c:2051 +#: ../clients/cli/connections.c:2053 #, c-format msgid "VPN connection successfully activated (D-Bus active path: %s)\n" msgstr "" -#: ../clients/cli/connections.c:2059 +#: ../clients/cli/connections.c:2061 #, c-format msgid "Error: Connection activation failed: %s." msgstr "" -#: ../clients/cli/connections.c:2078 ../clients/cli/devices.c:1413 +#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426 #, c-format msgid "Error: Timeout %d sec expired." msgstr "" -#: ../clients/cli/connections.c:2138 +#: ../clients/cli/connections.c:2140 #, c-format msgid "Error: Connection activation failed: %s" msgstr "" -#: ../clients/cli/connections.c:2223 +#: ../clients/cli/connections.c:2225 #, c-format msgid "failed to read passwd-file '%s': %s" msgstr "" -#: ../clients/cli/connections.c:2235 +#: ../clients/cli/connections.c:2237 #, c-format msgid "missing colon in 'password' entry '%s'" msgstr "" -#: ../clients/cli/connections.c:2243 +#: ../clients/cli/connections.c:2245 #, c-format msgid "missing dot in 'password' entry '%s'" msgstr "" -#: ../clients/cli/connections.c:2256 +#: ../clients/cli/connections.c:2258 #, c-format msgid "invalid setting name in 'password' entry '%s'" msgstr "" -#: ../clients/cli/connections.c:2303 ../clients/cli/connections.c:2451 -msgid "unknown error" -msgstr "" - -#: ../clients/cli/connections.c:2312 +#: ../clients/cli/connections.c:2314 #, c-format msgid "unknown device '%s'." msgstr "" -#: ../clients/cli/connections.c:2317 +#: ../clients/cli/connections.c:2319 msgid "neither a valid connection nor device given" msgstr "" -#: ../clients/cli/connections.c:2400 +#: ../clients/cli/connections.c:2402 #, c-format msgid "Error: Connection '%s' does not exist." msgstr "" -#: ../clients/cli/connections.c:2435 ../clients/cli/devices.c:1312 -#: ../clients/cli/devices.c:2235 ../clients/cli/devices.c:2629 -#: ../clients/cli/devices.c:3213 +#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325 +#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752 +#: ../clients/cli/devices.c:3336 #, c-format msgid "Unknown parameter: %s\n" msgstr "" -#: ../clients/cli/connections.c:2460 +#: ../clients/cli/connections.c:2462 msgid "preparing" msgstr "" -#: ../clients/cli/connections.c:2481 +#: ../clients/cli/connections.c:2483 #, c-format msgid "Connection '%s' (%s) successfully deleted.\n" msgstr "" -#: ../clients/cli/connections.c:2497 +#: ../clients/cli/connections.c:2499 #, c-format msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n" msgstr "" -#: ../clients/cli/connections.c:2568 ../clients/cli/connections.c:10294 -#: ../clients/cli/connections.c:10493 +#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391 +#: ../clients/cli/connections.c:10590 #, c-format msgid "Error: No connection specified." msgstr "" -#: ../clients/cli/connections.c:2600 +#: ../clients/cli/connections.c:2602 #, c-format msgid "Error: '%s' is not an active connection.\n" msgstr "" -#: ../clients/cli/connections.c:2601 ../clients/cli/connections.c:10323 +#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420 #, c-format msgid "Error: not all active connections found." msgstr "" -#: ../clients/cli/connections.c:2610 +#: ../clients/cli/connections.c:2612 #, c-format msgid "Error: no active connection provided." msgstr "" -#: ../clients/cli/connections.c:2967 ../clients/cli/utils.c:698 +#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702 #, c-format msgid "'%s' not among [%s]" msgstr "" -#: ../clients/cli/connections.c:3046 +#: ../clients/cli/connections.c:3032 #, c-format msgid "Error: '%s': '%s' is not a valid %s MAC address." msgstr "" #. Ask for optional arguments -#: ../clients/cli/connections.c:3047 ../clients/cli/connections.c:3579 -#: ../clients/tui/nm-editor-utils.c:164 ../libnm-core/nm-connection.c:1646 -#: ../libnm-glib/nm-device.c:1862 ../libnm/nm-device.c:1813 +#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565 +#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716 +#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812 msgid "InfiniBand" msgstr "" -#: ../clients/cli/connections.c:3047 ../clients/tui/nm-editor-utils.c:147 -#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1801 +#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146 +#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800 msgid "Ethernet" msgstr "" -#: ../clients/cli/connections.c:3067 +#: ../clients/cli/connections.c:3053 #, c-format msgid "Error: 'mtu': '%s' is not a valid MTU." msgstr "" -#: ../clients/cli/connections.c:3083 +#: ../clients/cli/connections.c:3069 #, c-format msgid "Error: 'parent': '%s' is not a valid interface name." msgstr "" -#: ../clients/cli/connections.c:3104 +#: ../clients/cli/connections.c:3090 #, c-format msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY." msgstr "" -#: ../clients/cli/connections.c:3119 +#: ../clients/cli/connections.c:3105 #, c-format msgid "Error: '%s' is not a valid UID/GID." msgstr "" -#: ../clients/cli/connections.c:3163 +#: ../clients/cli/connections.c:3149 #, c-format msgid "Error: '%s': '%s' is not a valid %s %s." msgstr "" -#: ../clients/cli/connections.c:3176 +#: ../clients/cli/connections.c:3162 msgid "Wi-Fi mode" msgstr "" -#: ../clients/cli/connections.c:3185 +#: ../clients/cli/connections.c:3171 msgid "InfiniBand transport mode" msgstr "" -#: ../clients/cli/connections.c:3197 +#: ../clients/cli/connections.c:3183 msgid "ADSL protocol" msgstr "" -#: ../clients/cli/connections.c:3208 +#: ../clients/cli/connections.c:3194 msgid "ADSL encapsulation" msgstr "" -#: ../clients/cli/connections.c:3217 +#: ../clients/cli/connections.c:3203 msgid "TUN device mode" msgstr "" -#: ../clients/cli/connections.c:3230 +#: ../clients/cli/connections.c:3216 #, c-format msgid "Error: 'flags': '%s' is not valid; use <0-7>." msgstr "" -#: ../clients/cli/connections.c:3252 +#: ../clients/cli/connections.c:3238 #, c-format msgid "Error: '%s': '%s' is not valid; %s " msgstr "" -#: ../clients/cli/connections.c:3430 +#: ../clients/cli/connections.c:3416 #, c-format msgid "Warning: master='%s' doesn't refer to any existing profile.\n" msgstr "" -#: ../clients/cli/connections.c:3455 +#: ../clients/cli/connections.c:3441 #, c-format msgid "Error: '%s': '%s' is not valid; use <%u-%u>." msgstr "" #. Ask for optional arguments. -#: ../clients/cli/connections.c:3511 +#: ../clients/cli/connections.c:3497 #, c-format msgid "There is %d optional argument for '%s' connection type.\n" msgid_plural "There are %d optional arguments for '%s' connection type.\n" @@ -1605,7 +1600,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: ../clients/cli/connections.c:3514 +#: ../clients/cli/connections.c:3500 #, c-format msgid "Do you want to provide it? %s" msgid_plural "Do you want to provide them? %s" @@ -1615,873 +1610,875 @@ msgstr[2] "" msgstr[3] "" #. Ask for optional arguments -#: ../clients/cli/connections.c:3531 +#: ../clients/cli/connections.c:3517 msgid "ethernet" msgstr "" -#: ../clients/cli/connections.c:3536 ../clients/cli/connections.c:3584 -#: ../clients/cli/connections.c:3718 ../clients/cli/connections.c:3797 +#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570 +#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783 msgid "MTU [auto]: " msgstr "" -#: ../clients/cli/connections.c:3547 ../clients/cli/connections.c:3595 -#: ../clients/cli/connections.c:3690 ../clients/cli/connections.c:3729 -#: ../clients/cli/connections.c:4115 +#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581 +#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715 +#: ../clients/cli/connections.c:4101 msgid "MAC [none]: " msgstr "" -#: ../clients/cli/connections.c:3558 +#: ../clients/cli/connections.c:3544 msgid "Cloned MAC [none]: " msgstr "" -#: ../clients/cli/connections.c:3606 +#: ../clients/cli/connections.c:3592 #, c-format msgid "Transport mode %s" msgstr "" -#: ../clients/cli/connections.c:3619 +#: ../clients/cli/connections.c:3605 msgid "Parent interface [none]: " msgstr "" -#: ../clients/cli/connections.c:3630 +#: ../clients/cli/connections.c:3616 msgid "P_KEY [none]: " msgstr "" -#: ../clients/cli/connections.c:3640 +#: ../clients/cli/connections.c:3626 #, c-format msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n" msgstr "" #. Ask for optional arguments -#: ../clients/cli/connections.c:3657 ../clients/tui/nm-editor-utils.c:155 -#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1803 +#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154 +#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802 msgid "Wi-Fi" msgstr "" -#: ../clients/cli/connections.c:3665 ../clients/cli/connections.c:6069 +#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199 #, c-format msgid "Mode %s" msgstr "" #. Ask for optional 'wimax' arguments. -#: ../clients/cli/connections.c:3685 ../libnm-glib/nm-device.c:1858 -#: ../libnm/nm-device.c:1809 +#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857 +#: ../libnm/nm-device.c:1808 msgid "WiMAX" msgstr "" #. Ask for optional 'pppoe' arguments. -#: ../clients/cli/connections.c:3708 +#: ../clients/cli/connections.c:3694 msgid "PPPoE" msgstr "" -#: ../clients/cli/connections.c:3712 ../clients/cli/connections.c:3750 -#: ../clients/cli/connections.c:4237 +#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736 +#: ../clients/cli/connections.c:4223 msgid "Password [none]: " msgstr "" -#: ../clients/cli/connections.c:3714 +#: ../clients/cli/connections.c:3700 msgid "Service [none]: " msgstr "" #. Ask for optional 'gsm' or 'cdma' arguments. -#: ../clients/cli/connections.c:3744 +#: ../clients/cli/connections.c:3730 msgid "mobile broadband" msgstr "" -#: ../clients/cli/connections.c:3748 ../clients/cli/connections.c:4187 +#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173 msgid "Username [none]: " msgstr "" #. Ask for optional 'bluetooth' arguments. -#: ../clients/cli/connections.c:3763 +#: ../clients/cli/connections.c:3749 msgid "bluetooth" msgstr "" -#: ../clients/cli/connections.c:3770 +#: ../clients/cli/connections.c:3756 #, c-format msgid "Bluetooth type %s" msgstr "" -#: ../clients/cli/connections.c:3776 +#: ../clients/cli/connections.c:3762 #, c-format msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n" msgstr "" #. Ask for optional 'vlan' arguments. #. 13 -#: ../clients/cli/connections.c:3792 ../clients/cli/devices.c:240 -#: ../clients/tui/nm-editor-utils.c:218 ../clients/tui/nmt-page-vlan.c:95 -#: ../libnm-core/nm-connection.c:1644 ../libnm-glib/nm-device.c:1870 -#: ../libnm-util/nm-connection.c:1600 ../libnm/nm-device.c:1821 +#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239 +#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94 +#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869 +#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820 msgid "VLAN" msgstr "" -#: ../clients/cli/connections.c:3808 +#: ../clients/cli/connections.c:3794 msgid "VLAN flags (<0-7>) [none]: " msgstr "" -#: ../clients/cli/connections.c:3819 +#: ../clients/cli/connections.c:3805 msgid "Ingress priority maps [none]: " msgstr "" -#: ../clients/cli/connections.c:3830 +#: ../clients/cli/connections.c:3816 msgid "Egress priority maps [none]: " msgstr "" -#: ../clients/cli/connections.c:3841 +#: ../clients/cli/connections.c:3827 msgid "Bonding mode [balance-rr]: " msgstr "" #. Ask for optional 'bond' arguments. -#: ../clients/cli/connections.c:3857 +#: ../clients/cli/connections.c:3843 msgid "bond" msgstr "" -#: ../clients/cli/connections.c:3879 +#: ../clients/cli/connections.c:3865 msgid "Bonding primary interface [none]: " msgstr "" -#: ../clients/cli/connections.c:3882 +#: ../clients/cli/connections.c:3868 #, c-format msgid "Error: 'primary': '%s' is not a valid interface name.\n" msgstr "" -#: ../clients/cli/connections.c:3890 +#: ../clients/cli/connections.c:3876 #, c-format msgid "Bonding monitoring mode %s" msgstr "" -#: ../clients/cli/connections.c:3896 +#: ../clients/cli/connections.c:3882 #, c-format msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n" msgstr "" -#: ../clients/cli/connections.c:3905 +#: ../clients/cli/connections.c:3891 msgid "Bonding miimon [100]: " msgstr "" -#: ../clients/cli/connections.c:3908 +#: ../clients/cli/connections.c:3894 #, c-format msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n" msgstr "" -#: ../clients/cli/connections.c:3916 +#: ../clients/cli/connections.c:3902 msgid "Bonding downdelay [0]: " msgstr "" -#: ../clients/cli/connections.c:3919 +#: ../clients/cli/connections.c:3905 #, c-format msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n" msgstr "" -#: ../clients/cli/connections.c:3927 +#: ../clients/cli/connections.c:3913 msgid "Bonding updelay [0]: " msgstr "" -#: ../clients/cli/connections.c:3930 +#: ../clients/cli/connections.c:3916 #, c-format msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n" msgstr "" -#: ../clients/cli/connections.c:3939 +#: ../clients/cli/connections.c:3925 msgid "Bonding arp-interval [0]: " msgstr "" -#: ../clients/cli/connections.c:3942 +#: ../clients/cli/connections.c:3928 #, c-format msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n" msgstr "" #. FIXME: verify the string -#: ../clients/cli/connections.c:3950 +#: ../clients/cli/connections.c:3936 msgid "Bonding arp-ip-target [none]: " msgstr "" -#: ../clients/cli/connections.c:3957 +#: ../clients/cli/connections.c:3943 msgid "LACP rate ('slow' or 'fast') [slow]: " msgstr "" -#: ../clients/cli/connections.c:3963 +#: ../clients/cli/connections.c:3949 #, c-format msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n" msgstr "" -#: ../clients/cli/connections.c:3986 +#: ../clients/cli/connections.c:3972 msgid "Team JSON configuration [none]: " msgstr "" -#: ../clients/cli/connections.c:4003 +#: ../clients/cli/connections.c:3989 msgid "team" msgstr "" -#: ../clients/cli/connections.c:4009 +#: ../clients/cli/connections.c:3995 msgid "team-slave" msgstr "" #. Ask for optional 'bridge' arguments. -#: ../clients/cli/connections.c:4021 +#: ../clients/cli/connections.c:4007 msgid "bridge" msgstr "" -#: ../clients/cli/connections.c:4027 +#: ../clients/cli/connections.c:4013 #, c-format msgid "Enable STP %s" msgstr "" -#: ../clients/cli/connections.c:4032 +#: ../clients/cli/connections.c:4018 #, c-format msgid "Error: 'stp': %s.\n" msgstr "" -#: ../clients/cli/connections.c:4040 +#: ../clients/cli/connections.c:4026 msgid "STP priority [32768]: " msgstr "" -#: ../clients/cli/connections.c:4044 +#: ../clients/cli/connections.c:4030 #, c-format msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n" msgstr "" -#: ../clients/cli/connections.c:4052 +#: ../clients/cli/connections.c:4038 msgid "Forward delay [15]: " msgstr "" -#: ../clients/cli/connections.c:4056 +#: ../clients/cli/connections.c:4042 #, c-format msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n" msgstr "" -#: ../clients/cli/connections.c:4065 +#: ../clients/cli/connections.c:4051 msgid "Hello time [2]: " msgstr "" -#: ../clients/cli/connections.c:4069 +#: ../clients/cli/connections.c:4055 #, c-format msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n" msgstr "" -#: ../clients/cli/connections.c:4077 +#: ../clients/cli/connections.c:4063 msgid "Max age [20]: " msgstr "" -#: ../clients/cli/connections.c:4081 +#: ../clients/cli/connections.c:4067 #, c-format msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n" msgstr "" -#: ../clients/cli/connections.c:4089 +#: ../clients/cli/connections.c:4075 msgid "MAC address ageing time [300]: " msgstr "" -#: ../clients/cli/connections.c:4093 +#: ../clients/cli/connections.c:4079 #, c-format msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n" msgstr "" -#: ../clients/cli/connections.c:4102 +#: ../clients/cli/connections.c:4088 #, c-format msgid "Enable IGMP snooping %s" msgstr "" -#: ../clients/cli/connections.c:4107 +#: ../clients/cli/connections.c:4093 #, c-format msgid "Error: 'multicast-snooping': %s.\n" msgstr "" #. Ask for optional 'bridge-slave' arguments. -#: ../clients/cli/connections.c:4134 +#: ../clients/cli/connections.c:4120 msgid "bridge-slave" msgstr "" -#: ../clients/cli/connections.c:4139 +#: ../clients/cli/connections.c:4125 msgid "Bridge port priority [32]: " msgstr "" -#: ../clients/cli/connections.c:4152 +#: ../clients/cli/connections.c:4138 msgid "Bridge port STP path cost [100]: " msgstr "" -#: ../clients/cli/connections.c:4166 +#: ../clients/cli/connections.c:4152 #, c-format msgid "Hairpin %s" msgstr "" -#: ../clients/cli/connections.c:4171 +#: ../clients/cli/connections.c:4157 #, c-format msgid "Error: 'hairpin': %s.\n" msgstr "" #. Ask for optional 'olpc' arguments. -#: ../clients/cli/connections.c:4198 ../libnm-glib/nm-device.c:1856 -#: ../libnm/nm-device.c:1807 +#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855 +#: ../libnm/nm-device.c:1806 msgid "OLPC Mesh" msgstr "" -#: ../clients/cli/connections.c:4203 +#: ../clients/cli/connections.c:4189 msgid "OLPC Mesh channel [1]: " msgstr "" -#: ../clients/cli/connections.c:4206 +#: ../clients/cli/connections.c:4192 #, c-format msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n" msgstr "" -#: ../clients/cli/connections.c:4214 +#: ../clients/cli/connections.c:4200 msgid "DHCP anycast MAC address [none]: " msgstr "" #. Ask for optional 'adsl' arguments. -#: ../clients/cli/connections.c:4233 ../libnm-glib/nm-device.c:1872 -#: ../libnm/nm-device.c:1823 +#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871 +#: ../libnm/nm-device.c:1822 msgid "ADSL" msgstr "" -#: ../clients/cli/connections.c:4241 +#: ../clients/cli/connections.c:4227 #, c-format msgid "ADSL encapsulation %s" msgstr "" #. Ask for optional 'macvlan' arguments. -#: ../clients/cli/connections.c:4259 +#: ../clients/cli/connections.c:4245 msgid "macvlan" msgstr "" -#: ../clients/cli/connections.c:4265 +#: ../clients/cli/connections.c:4251 #, c-format msgid "Tap %s" msgstr "" -#: ../clients/cli/connections.c:4270 +#: ../clients/cli/connections.c:4256 #, c-format msgid "Error: 'tap': %s.\n" msgstr "" #. Ask for optional 'vxlan' arguments. -#: ../clients/cli/connections.c:4286 +#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875 +#: ../libnm/nm-device.c:1826 msgid "VXLAN" msgstr "" -#: ../clients/cli/connections.c:4291 ../clients/cli/connections.c:4615 +#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601 msgid "Parent device [none]: " msgstr "" -#: ../clients/cli/connections.c:4296 ../clients/cli/connections.c:4620 +#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606 #, c-format msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n" msgstr "" -#: ../clients/cli/connections.c:4305 +#: ../clients/cli/connections.c:4291 msgid "Local address [none]: " msgstr "" -#: ../clients/cli/connections.c:4310 +#: ../clients/cli/connections.c:4296 #, c-format msgid "Error: 'local': '%s' is not a valid IP address.\n" msgstr "" -#: ../clients/cli/connections.c:4319 +#: ../clients/cli/connections.c:4305 msgid "Minimum source port [0]: " msgstr "" -#: ../clients/cli/connections.c:4323 +#: ../clients/cli/connections.c:4309 #, c-format msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n" msgstr "" -#: ../clients/cli/connections.c:4332 +#: ../clients/cli/connections.c:4318 msgid "Maximum source port [0]: " msgstr "" -#: ../clients/cli/connections.c:4336 +#: ../clients/cli/connections.c:4322 #, c-format msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n" msgstr "" -#: ../clients/cli/connections.c:4345 +#: ../clients/cli/connections.c:4331 msgid "Destination port [8472]: " msgstr "" -#: ../clients/cli/connections.c:4349 +#: ../clients/cli/connections.c:4335 #, c-format msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n" msgstr "" -#: ../clients/cli/connections.c:4388 +#: ../clients/cli/connections.c:4374 msgid "IPv4 address (IP[/plen]) [none]: " msgstr "" -#: ../clients/cli/connections.c:4390 +#: ../clients/cli/connections.c:4376 msgid "IPv6 address (IP[/plen]) [none]: " msgstr "" -#: ../clients/cli/connections.c:4404 +#: ../clients/cli/connections.c:4390 #, c-format msgid " Address successfully added: %s\n" msgstr "" -#: ../clients/cli/connections.c:4406 +#: ../clients/cli/connections.c:4392 #, c-format msgid " Warning: address already present: %s\n" msgstr "" -#: ../clients/cli/connections.c:4408 +#: ../clients/cli/connections.c:4394 #, c-format msgid " Warning: ignoring garbage at the end: '%s'\n" msgstr "" -#: ../clients/cli/connections.c:4410 ../clients/cli/connections.c:5591 -#: ../clients/cli/connections.c:6451 ../clients/cli/connections.c:6577 -#: ../clients/cli/connections.c:6610 +#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605 +#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569 +#: ../clients/cli/connections.c:6602 msgid "Error: " msgstr "" -#: ../clients/cli/connections.c:4430 +#: ../clients/cli/connections.c:4416 msgid "IPv4 gateway [none]: " msgstr "" -#: ../clients/cli/connections.c:4433 +#: ../clients/cli/connections.c:4419 msgid "IPv6 gateway [none]: " msgstr "" -#: ../clients/cli/connections.c:4453 +#: ../clients/cli/connections.c:4439 #, c-format msgid "Error: invalid gateway address '%s'\n" msgstr "" #. Ask for IP addresses -#: ../clients/cli/connections.c:4466 +#: ../clients/cli/connections.c:4452 #, c-format msgid "Do you want to add IP addresses? %s" msgstr "" -#: ../clients/cli/connections.c:4474 +#: ../clients/cli/connections.c:4460 #, c-format msgid "Press to finish adding addresses.\n" msgstr "" #. Ask for optional 'tun' arguments. -#: ../clients/cli/connections.c:4518 +#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879 +#: ../libnm/nm-device.c:1830 msgid "Tun" msgstr "" -#: ../clients/cli/connections.c:4523 +#: ../clients/cli/connections.c:4509 msgid "User ID [none]: " msgstr "" -#: ../clients/cli/connections.c:4536 +#: ../clients/cli/connections.c:4522 msgid "Group ID [none]: " msgstr "" -#: ../clients/cli/connections.c:4550 +#: ../clients/cli/connections.c:4536 #, c-format msgid "Enable PI %s" msgstr "" -#: ../clients/cli/connections.c:4555 +#: ../clients/cli/connections.c:4541 #, c-format msgid "Error: 'pi': %s.\n" msgstr "" -#: ../clients/cli/connections.c:4563 +#: ../clients/cli/connections.c:4549 #, c-format msgid "Enable VNET header %s" msgstr "" -#: ../clients/cli/connections.c:4568 +#: ../clients/cli/connections.c:4554 #, c-format msgid "Error: 'vnet-hdr': %s.\n" msgstr "" -#: ../clients/cli/connections.c:4576 +#: ../clients/cli/connections.c:4562 #, c-format msgid "Enable multi queue %s" msgstr "" -#: ../clients/cli/connections.c:4581 +#: ../clients/cli/connections.c:4567 #, c-format msgid "Error: 'multi-queue': %s.\n" msgstr "" #. Ask for optional 'ip-tunnel' arguments. -#: ../clients/cli/connections.c:4595 +#: ../clients/cli/connections.c:4581 msgid "IP Tunnel" msgstr "" -#: ../clients/cli/connections.c:4600 +#: ../clients/cli/connections.c:4586 msgid "Local endpoint [none]: " msgstr "" -#: ../clients/cli/connections.c:4606 +#: ../clients/cli/connections.c:4592 #, c-format msgid "Error: 'local': '%s' is not valid; must be an IP address\n" msgstr "" -#: ../clients/cli/connections.c:4661 ../clients/cli/connections.c:10087 +#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184 #, c-format msgid "Error: . argument is missing." msgstr "" -#: ../clients/cli/connections.c:4666 +#: ../clients/cli/connections.c:4663 #, c-format msgid "Error: value for '%s' is missing." msgstr "" -#: ../clients/cli/connections.c:4684 +#: ../clients/cli/connections.c:4681 #, c-format msgid "Error: invalid . '%s'." msgstr "" -#: ../clients/cli/connections.c:4691 +#: ../clients/cli/connections.c:4689 #, c-format msgid "Error: invalid or not allowed setting '%s': %s." msgstr "" -#: ../clients/cli/connections.c:4702 +#: ../clients/cli/connections.c:4700 #, c-format msgid "Error: don't know how to create '%s' setting." msgstr "" -#: ../clients/cli/connections.c:4712 +#: ../clients/cli/connections.c:4710 #, c-format msgid "Error: invalid property '%s': %s." msgstr "" -#: ../clients/cli/connections.c:4724 +#: ../clients/cli/connections.c:4722 #, c-format msgid "Error: failed to modify %s.%s: %s." msgstr "" -#: ../clients/cli/connections.c:4743 +#: ../clients/cli/connections.c:4741 #, c-format msgid "Error: failed to remove a value from %s.%s: %s." msgstr "" -#: ../clients/cli/connections.c:4776 +#: ../clients/cli/connections.c:4775 #, c-format msgid "" "Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead." msgstr "" -#: ../clients/cli/connections.c:4784 +#: ../clients/cli/connections.c:4783 msgid "Error: redundant 'master' option." msgstr "" -#: ../clients/cli/connections.c:4794 +#: ../clients/cli/connections.c:4796 msgid "Error: 'master' is required." msgstr "" -#: ../clients/cli/connections.c:4948 +#: ../clients/cli/connections.c:4950 #, c-format msgid "Error: 'parent': not valid without 'p-key'." msgstr "" -#: ../clients/cli/connections.c:5003 ../clients/cli/connections.c:5839 +#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967 msgid "SSID: " msgstr "" -#: ../clients/cli/connections.c:5006 ../clients/cli/connections.c:5842 +#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970 msgid "Error: 'ssid' is required." msgstr "" -#: ../clients/cli/connections.c:5070 +#: ../clients/cli/connections.c:5072 msgid "WiMAX NSP name: " msgstr "" -#: ../clients/cli/connections.c:5073 +#: ../clients/cli/connections.c:5075 msgid "Error: 'nsp' is required." msgstr "" -#: ../clients/cli/connections.c:5125 +#: ../clients/cli/connections.c:5127 msgid "PPPoE username: " msgstr "" -#: ../clients/cli/connections.c:5128 ../clients/cli/connections.c:5909 +#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037 msgid "Error: 'username' is required." msgstr "" -#: ../clients/cli/connections.c:5197 +#: ../clients/cli/connections.c:5199 msgid "APN: " msgstr "" -#: ../clients/cli/connections.c:5200 +#: ../clients/cli/connections.c:5202 msgid "Error: 'apn' is required." msgstr "" -#: ../clients/cli/connections.c:5258 +#: ../clients/cli/connections.c:5260 msgid "Bluetooth device address: " msgstr "" -#: ../clients/cli/connections.c:5261 +#: ../clients/cli/connections.c:5263 msgid "Error: 'addr' is required." msgstr "" -#: ../clients/cli/connections.c:5302 +#: ../clients/cli/connections.c:5304 #, c-format msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]." msgstr "" -#: ../clients/cli/connections.c:5346 +#: ../clients/cli/connections.c:5348 msgid "VLAN parent device or connection UUID: " msgstr "" -#: ../clients/cli/connections.c:5349 ../clients/cli/connections.c:5978 +#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108 msgid "Error: 'dev' is required." msgstr "" -#: ../clients/cli/connections.c:5353 -msgid "VLAN ID <0-4095>: " +#: ../clients/cli/connections.c:5355 +msgid "VLAN ID <0-4094>: " msgstr "" -#: ../clients/cli/connections.c:5356 ../clients/cli/connections.c:6294 +#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424 msgid "Error: 'id' is required." msgstr "" -#: ../clients/cli/connections.c:5362 +#: ../clients/cli/connections.c:5364 #, c-format -msgid "Error: 'id': '%s' is not valid; use <0-4095>." +msgid "Error: 'id': '%s' is not valid; use <0-4094>." msgstr "" -#: ../clients/cli/connections.c:5372 ../clients/cli/connections.c:5986 +#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116 #, c-format msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC." msgstr "" -#: ../clients/cli/connections.c:5504 +#: ../clients/cli/connections.c:5506 #, c-format msgid "Error: 'mode': %s." msgstr "" -#: ../clients/cli/connections.c:5513 +#: ../clients/cli/connections.c:5515 #, c-format msgid "Error: 'primary': '%s' is not a valid interface name." msgstr "" -#: ../clients/cli/connections.c:5681 +#: ../clients/cli/connections.c:5738 #, c-format msgid "Error: 'stp': %s." msgstr "" -#: ../clients/cli/connections.c:5690 +#: ../clients/cli/connections.c:5747 #, c-format msgid "Error: 'multicast-snooping': %s." msgstr "" -#: ../clients/cli/connections.c:5787 +#: ../clients/cli/connections.c:5866 +#, c-format +msgid "Error: 'hairpin': %s." +msgstr "" + +#: ../clients/cli/connections.c:5915 msgid "Error: 'vpn-type' is required." msgstr "" -#: ../clients/cli/connections.c:5794 +#: ../clients/cli/connections.c:5922 #, c-format msgid "Warning: 'vpn-type': %s not known.\n" msgstr "" -#: ../clients/cli/connections.c:5855 +#: ../clients/cli/connections.c:5983 #, c-format msgid "Error: 'channel': '%s' is not valid; use <1-13>." msgstr "" -#: ../clients/cli/connections.c:5906 +#: ../clients/cli/connections.c:6034 msgid "Username: " msgstr "" -#: ../clients/cli/connections.c:5915 +#: ../clients/cli/connections.c:6043 #, c-format msgid "Protocol %s" msgstr "" -#: ../clients/cli/connections.c:5918 +#: ../clients/cli/connections.c:6046 msgid "Error: 'protocol' is required." msgstr "" -#: ../clients/cli/connections.c:5975 +#: ../clients/cli/connections.c:6105 msgid "MACVLAN parent device or connection UUID: " msgstr "" -#: ../clients/cli/connections.c:5995 ../clients/cli/connections.c:6075 -#: ../clients/cli/connections.c:6177 +#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205 +#: ../clients/cli/connections.c:6307 msgid "Error: 'mode' is required." msgstr "" -#: ../clients/cli/connections.c:6001 +#: ../clients/cli/connections.c:6131 msgid "Error: 'mode' is not valid." msgstr "" -#: ../clients/cli/connections.c:6014 +#: ../clients/cli/connections.c:6144 #, c-format msgid "Error: 'tap': %s." msgstr "" -#: ../clients/cli/connections.c:6100 +#: ../clients/cli/connections.c:6230 #, c-format msgid "Error: 'pi': %s." msgstr "" -#: ../clients/cli/connections.c:6111 +#: ../clients/cli/connections.c:6241 #, c-format msgid "Error: 'vnet-hdr': %s." msgstr "" -#: ../clients/cli/connections.c:6122 +#: ../clients/cli/connections.c:6252 #, c-format msgid "Error: 'multi-queue': %s." msgstr "" -#: ../clients/cli/connections.c:6191 +#: ../clients/cli/connections.c:6321 #, c-format msgid "Error: 'mode': '%s' is not valid, use one of %s" msgstr "" -#: ../clients/cli/connections.c:6197 +#: ../clients/cli/connections.c:6327 msgid "Remote endpoint: " msgstr "" -#: ../clients/cli/connections.c:6200 ../clients/cli/connections.c:6302 +#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432 msgid "Error: 'remote' is required." msgstr "" -#: ../clients/cli/connections.c:6207 +#: ../clients/cli/connections.c:6337 #, c-format msgid "Error: 'remote': '%s' is not valid; must be an IP address" msgstr "" -#: ../clients/cli/connections.c:6221 +#: ../clients/cli/connections.c:6351 #, c-format msgid "Error: 'local': '%s' is not valid; must be an IP address" msgstr "" -#: ../clients/cli/connections.c:6230 ../clients/cli/connections.c:6325 +#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455 #, c-format msgid "Error: 'dev': '%s' is neither UUID nor interface name." msgstr "" -#: ../clients/cli/connections.c:6291 +#: ../clients/cli/connections.c:6421 msgid "VXLAN ID: " msgstr "" -#: ../clients/cli/connections.c:6299 +#: ../clients/cli/connections.c:6429 msgid "Remote: " msgstr "" -#: ../clients/cli/connections.c:6308 +#: ../clients/cli/connections.c:6438 #, c-format msgid "Error: 'id': '%s' is not valid; use <0-16777215>." msgstr "" -#: ../clients/cli/connections.c:6334 +#: ../clients/cli/connections.c:6464 #, c-format msgid "Error: 'remote': '%s' is not a valid IP address" msgstr "" -#: ../clients/cli/connections.c:6343 +#: ../clients/cli/connections.c:6473 #, c-format msgid "Error: 'local': '%s' is not a valid IP address" msgstr "" -#: ../clients/cli/connections.c:6352 +#: ../clients/cli/connections.c:6482 #, c-format msgid "Error: 'source-port-min': %s is not valid; use <0-65535>." msgstr "" -#: ../clients/cli/connections.c:6361 +#: ../clients/cli/connections.c:6491 #, c-format msgid "Error: 'source-port-max': %s is not valid; use <0-65535>." msgstr "" -#: ../clients/cli/connections.c:6370 +#: ../clients/cli/connections.c:6500 #, c-format msgid "Error: 'destination-port': %s is not valid; use <0-65535>." msgstr "" -#: ../clients/cli/connections.c:6410 +#: ../clients/cli/connections.c:6540 #, c-format msgid "Error: '%s' is not a valid connection type." msgstr "" -#: ../clients/cli/connections.c:6517 -#, c-format -msgid "Error: 'hairpin': %s." -msgstr "" - -#: ../clients/cli/connections.c:6589 +#: ../clients/cli/connections.c:6581 #, c-format msgid "Error: IPv4 gateway specified without IPv4 addresses" msgstr "" -#: ../clients/cli/connections.c:6593 +#: ../clients/cli/connections.c:6585 #, c-format msgid "Error: multiple IPv4 gateways specified" msgstr "" -#: ../clients/cli/connections.c:6597 +#: ../clients/cli/connections.c:6589 #, c-format msgid "Error: Invalid IPv4 gateway '%s'" msgstr "" -#: ../clients/cli/connections.c:6622 +#: ../clients/cli/connections.c:6614 #, c-format msgid "Error: IPv6 gateway specified without IPv6 addresses" msgstr "" -#: ../clients/cli/connections.c:6626 +#: ../clients/cli/connections.c:6618 #, c-format msgid "Error: multiple IPv6 gateways specified" msgstr "" -#: ../clients/cli/connections.c:6630 +#: ../clients/cli/connections.c:6622 #, c-format msgid "Error: Invalid IPv6 gateway '%s'" msgstr "" -#: ../clients/cli/connections.c:6678 ../clients/cli/connections.c:10126 +#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223 #, fuzzy, c-format msgid "Error: Failed to add '%s' connection: %s" msgstr "خطأ أثناء فتح اتصال VPN '%s'" -#: ../clients/cli/connections.c:6683 +#: ../clients/cli/connections.c:6675 #, c-format msgid "Connection '%s' (%s) successfully added.\n" msgstr "" -#: ../clients/cli/connections.c:6959 ../clients/cli/connections.c:10581 +#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678 #, c-format msgid "Error: 'type' argument is required." msgstr "" -#: ../clients/cli/connections.c:6967 +#: ../clients/cli/connections.c:6959 #, fuzzy, c-format msgid "Error: invalid connection type; %s." msgstr "خطأ أثناء فتح اتصال VPN '%s'" -#: ../clients/cli/connections.c:6976 ../clients/cli/devices.c:2041 +#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164 #, c-format msgid "Error: 'autoconnect': %s." msgstr "" -#: ../clients/cli/connections.c:6986 +#: ../clients/cli/connections.c:6978 #, c-format msgid "Error: 'save': %s." msgstr "" -#: ../clients/cli/connections.c:7003 +#: ../clients/cli/connections.c:6995 msgid "Interface name [*]: " msgstr "" -#: ../clients/cli/connections.c:7008 +#: ../clients/cli/connections.c:7000 #, c-format msgid "Error: 'ifname' argument is required." msgstr "" -#: ../clients/cli/connections.c:7010 +#: ../clients/cli/connections.c:7002 #, c-format msgid "Error: mandatory 'ifname' not seen before '%s'." msgstr "" -#: ../clients/cli/connections.c:7019 +#: ../clients/cli/connections.c:7011 #, c-format msgid "Error: 'ifname': '%s' is not a valid interface nor '*'." msgstr "" -#: ../clients/cli/connections.c:7981 +#: ../clients/cli/connections.c:8035 #, c-format msgid "['%s' setting values]\n" msgstr "" @@ -2489,7 +2486,7 @@ msgstr "" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:8063 +#: ../clients/cli/connections.c:8117 #, c-format msgid "" "---[ Main menu ]---\n" @@ -2508,7 +2505,7 @@ msgid "" "quit :: exit nmcli\n" msgstr "" -#: ../clients/cli/connections.c:8090 +#: ../clients/cli/connections.c:8144 #, c-format msgid "" "goto [.] | :: enter setting/property for editing\n" @@ -2520,7 +2517,7 @@ msgid "" " nmcli> goto ipv4.addresses\n" msgstr "" -#: ../clients/cli/connections.c:8097 +#: ../clients/cli/connections.c:8151 #, c-format msgid "" "remove [.] :: remove setting or reset property value\n" @@ -2533,7 +2530,7 @@ msgid "" " nmcli> remove eth.mtu\n" msgstr "" -#: ../clients/cli/connections.c:8104 +#: ../clients/cli/connections.c:8158 #, c-format msgid "" "set [. ] :: set property value\n" @@ -2543,7 +2540,7 @@ msgid "" "Example: nmcli> set con.id My connection\n" msgstr "" -#: ../clients/cli/connections.c:8109 +#: ../clients/cli/connections.c:8163 #, c-format msgid "" "describe [.] :: describe property\n" @@ -2552,7 +2549,7 @@ msgid "" "see all NM settings and properties.\n" msgstr "" -#: ../clients/cli/connections.c:8114 +#: ../clients/cli/connections.c:8168 #, c-format msgid "" "print [all] :: print setting or connection values\n" @@ -2562,7 +2559,7 @@ msgid "" "Example: nmcli ipv4> print all\n" msgstr "" -#: ../clients/cli/connections.c:8119 +#: ../clients/cli/connections.c:8173 #, c-format msgid "" "verify [all | fix] :: verify setting or connection validity\n" @@ -2577,7 +2574,7 @@ msgid "" " nmcli bond> verify\n" msgstr "" -#: ../clients/cli/connections.c:8128 +#: ../clients/cli/connections.c:8182 #, c-format msgid "" "save [persistent|temporary] :: save the connection\n" @@ -2593,7 +2590,7 @@ msgid "" "profile must be deleted.\n" msgstr "" -#: ../clients/cli/connections.c:8139 +#: ../clients/cli/connections.c:8193 #, c-format msgid "" "activate [] [/|] :: activate the connection\n" @@ -2606,21 +2603,21 @@ msgid "" "specified)\n" msgstr "" -#: ../clients/cli/connections.c:8146 ../clients/cli/connections.c:8305 +#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359 #, c-format msgid "" "back :: go to upper menu level\n" "\n" msgstr "" -#: ../clients/cli/connections.c:8149 +#: ../clients/cli/connections.c:8203 #, c-format msgid "" "help/? [] :: help for the nmcli commands\n" "\n" msgstr "" -#: ../clients/cli/connections.c:8152 +#: ../clients/cli/connections.c:8206 #, c-format msgid "" "nmcli [ ] :: nmcli configuration\n" @@ -2636,7 +2633,7 @@ msgid "" " nmcli> nmcli prompt-color 3\n" msgstr "" -#: ../clients/cli/connections.c:8174 ../clients/cli/connections.c:8311 +#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365 #, c-format msgid "" "quit :: exit nmcli\n" @@ -2645,8 +2642,8 @@ msgid "" "user is asked to confirm the action.\n" msgstr "" -#: ../clients/cli/connections.c:8179 ../clients/cli/connections.c:8316 -#: ../clients/cli/connections.c:8740 ../clients/cli/connections.c:9645 +#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370 +#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742 #, c-format msgid "Unknown command: '%s'\n" msgstr "" @@ -2654,7 +2651,7 @@ msgstr "" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:8245 +#: ../clients/cli/connections.c:8299 #, c-format msgid "" "---[ Property menu ]---\n" @@ -2670,7 +2667,7 @@ msgid "" "quit :: exit nmcli\n" msgstr "" -#: ../clients/cli/connections.c:8270 +#: ../clients/cli/connections.c:8324 #, c-format msgid "" "set [] :: set new value\n" @@ -2678,7 +2675,7 @@ msgid "" "This command sets provided to this property\n" msgstr "" -#: ../clients/cli/connections.c:8274 +#: ../clients/cli/connections.c:8328 #, c-format msgid "" "add [] :: append new value to the property\n" @@ -2688,7 +2685,7 @@ msgid "" "(same as 'set').\n" msgstr "" -#: ../clients/cli/connections.c:8280 +#: ../clients/cli/connections.c:8334 #, c-format msgid "" "change :: change current value\n" @@ -2696,7 +2693,7 @@ msgid "" "Displays current value and allows editing it.\n" msgstr "" -#: ../clients/cli/connections.c:8284 +#: ../clients/cli/connections.c:8338 #, c-format msgid "" "remove [||