From 73e152af6e3fb4f5848bfb8394484026ff119003 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 11 May 2016 17:08:25 +0200 Subject: Imported Upstream version 1.2.2 --- AUTHORS | 7 +- Makefile.in | 4 +- NEWS | 17 + clients/cli/agent.c | 3 - clients/cli/common.c | 4 - clients/cli/connections.c | 15 +- clients/cli/devices.c | 98 +- clients/cli/general.c | 3 - clients/cli/nmcli-completion | 7 +- clients/cli/nmcli.c | 4 +- clients/cli/nmcli.h | 6 +- clients/cli/settings-docs.c | 2 +- clients/cli/settings.c | 7 - clients/cli/utils.c | 116 - clients/cli/utils.h | 4 - clients/common/nm-vpn-helpers.c | 9 +- configure | 26 +- configure.ac | 2 +- docs/api/Makefile.am | 2 + docs/api/Makefile.in | 2 + docs/api/html/NetworkManager.conf.html | 2 +- docs/api/html/NetworkManager.devhelp2 | 239 + docs/api/html/dbus-types.html | 27 + ...org.freedesktop.NetworkManager.AccessPoint.html | 8 +- ...rg.freedesktop.NetworkManager.AgentManager.html | 2 +- ...eedesktop.NetworkManager.Connection.Active.html | 2 +- ...reedesktop.NetworkManager.Device.Bluetooth.html | 2 +- ...rg.freedesktop.NetworkManager.Device.Modem.html | 4 +- ...freedesktop.NetworkManager.Device.Wireless.html | 4 +- ...dbus-org.freedesktop.NetworkManager.Device.html | 16 +- ...org.freedesktop.NetworkManager.SecretAgent.html | 6 +- ....freedesktop.NetworkManager.VPN.Connection.html | 6 +- ...-org.freedesktop.NetworkManager.VPN.Plugin.html | 6 +- .../html/gdbus-org.freedesktop.NetworkManager.html | 12 +- docs/api/html/index.html | 11 +- docs/api/html/index.sgml | 24 + docs/api/html/ix01.html | 49 + docs/api/html/nm-dbus-types.html | 3120 +++++++++ docs/api/html/nm-settings.html | 2 +- docs/api/html/nm-vpn-dbus-types.html | 560 ++ docs/api/html/nmcli.html | 12 - docs/api/html/ref-settings.html | 6 +- docs/api/html/spec.html | 9 + docs/api/network-manager-docs.xml | 5 + docs/api/settings-spec.xml | 2 +- docs/api/version.xml | 2 +- docs/libnm-glib/html/index.html | 2 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/html/NMConnection.html | 2 +- docs/libnm-util/html/NMSetting.html | 2 +- docs/libnm-util/html/NMSetting8021x.html | 2 +- docs/libnm-util/html/NMSettingAdsl.html | 2 +- docs/libnm-util/html/NMSettingBluetooth.html | 2 +- docs/libnm-util/html/NMSettingBond.html | 2 +- docs/libnm-util/html/NMSettingBridge.html | 2 +- docs/libnm-util/html/NMSettingBridgePort.html | 2 +- docs/libnm-util/html/NMSettingCdma.html | 2 +- docs/libnm-util/html/NMSettingConnection.html | 2 +- docs/libnm-util/html/NMSettingDcb.html | 2 +- docs/libnm-util/html/NMSettingGeneric.html | 2 +- docs/libnm-util/html/NMSettingGsm.html | 2 +- docs/libnm-util/html/NMSettingIP4Config.html | 4 +- docs/libnm-util/html/NMSettingIP6Config.html | 4 +- docs/libnm-util/html/NMSettingInfiniband.html | 2 +- docs/libnm-util/html/NMSettingOlpcMesh.html | 2 +- docs/libnm-util/html/NMSettingPPP.html | 2 +- docs/libnm-util/html/NMSettingPPPOE.html | 2 +- docs/libnm-util/html/NMSettingSerial.html | 2 +- docs/libnm-util/html/NMSettingTeam.html | 2 +- docs/libnm-util/html/NMSettingTeamPort.html | 2 +- docs/libnm-util/html/NMSettingVPN.html | 2 +- docs/libnm-util/html/NMSettingVlan.html | 2 +- docs/libnm-util/html/NMSettingWimax.html | 2 +- docs/libnm-util/html/NMSettingWired.html | 2 +- docs/libnm-util/html/NMSettingWireless.html | 2 +- .../libnm-util/html/NMSettingWirelessSecurity.html | 2 +- docs/libnm-util/html/index.html | 2 +- docs/libnm-util/html/libnm-util-nm-utils.html | 2 +- docs/libnm-util/html/object-tree.html | 4 +- docs/libnm-util/version.xml | 2 +- docs/libnm/Makefile.am | 2 - docs/libnm/Makefile.in | 2 - docs/libnm/html/NMAccessPoint.html | 74 +- docs/libnm/html/NMActiveConnection.html | 90 +- docs/libnm/html/NMClient.html | 258 +- docs/libnm/html/NMConnection.html | 2519 +++++++ docs/libnm/html/NMDevice.html | 268 +- docs/libnm/html/NMDeviceAdsl.html | 28 +- docs/libnm/html/NMDeviceBond.html | 30 +- docs/libnm/html/NMDeviceBridge.html | 30 +- docs/libnm/html/NMDeviceBt.html | 30 +- docs/libnm/html/NMDeviceEthernet.html | 38 +- docs/libnm/html/NMDeviceGeneric.html | 22 +- docs/libnm/html/NMDeviceIPTunnel.html | 62 +- docs/libnm/html/NMDeviceInfiniband.html | 26 +- docs/libnm/html/NMDeviceMacvlan.html | 38 +- docs/libnm/html/NMDeviceModem.html | 26 +- docs/libnm/html/NMDeviceOlpcMesh.html | 30 +- docs/libnm/html/NMDeviceTeam.html | 30 +- docs/libnm/html/NMDeviceTun.html | 42 +- docs/libnm/html/NMDeviceVlan.html | 34 +- docs/libnm/html/NMDeviceVxlan.html | 90 +- docs/libnm/html/NMDeviceWifi.html | 70 +- docs/libnm/html/NMDeviceWimax.html | 58 +- docs/libnm/html/NMDhcpConfig.html | 30 +- docs/libnm/html/NMIPConfig.html | 50 +- docs/libnm/html/NMObject.html | 22 +- docs/libnm/html/NMRemoteConnection.html | 66 +- docs/libnm/html/NMSecretAgentOld.html | 82 +- docs/libnm/html/NMSetting.html | 28 +- docs/libnm/html/NMSetting8021x.html | 11 +- docs/libnm/html/NMSettingAdsl.html | 9 + docs/libnm/html/NMSettingBluetooth.html | 9 + docs/libnm/html/NMSettingBond.html | 9 + docs/libnm/html/NMSettingBridge.html | 9 + docs/libnm/html/NMSettingBridgePort.html | 9 + docs/libnm/html/NMSettingCdma.html | 9 + docs/libnm/html/NMSettingConnection.html | 14 +- docs/libnm/html/NMSettingDcb.html | 11 +- docs/libnm/html/NMSettingGeneric.html | 17 +- docs/libnm/html/NMSettingGsm.html | 9 + docs/libnm/html/NMSettingIP4Config.html | 9 + docs/libnm/html/NMSettingIP6Config.html | 19 +- docs/libnm/html/NMSettingIPConfig.html | 11 +- docs/libnm/html/NMSettingIPTunnel.html | 9 + docs/libnm/html/NMSettingInfiniband.html | 9 + docs/libnm/html/NMSettingMacvlan.html | 13 +- docs/libnm/html/NMSettingOlpcMesh.html | 9 + docs/libnm/html/NMSettingPpp.html | 9 + docs/libnm/html/NMSettingPppoe.html | 9 + docs/libnm/html/NMSettingSerial.html | 11 +- docs/libnm/html/NMSettingTeam.html | 9 + docs/libnm/html/NMSettingTeamPort.html | 9 + docs/libnm/html/NMSettingTun.html | 11 +- docs/libnm/html/NMSettingVlan.html | 17 +- docs/libnm/html/NMSettingVpn.html | 9 + docs/libnm/html/NMSettingVxlan.html | 9 + docs/libnm/html/NMSettingWimax.html | 9 + docs/libnm/html/NMSettingWired.html | 11 +- docs/libnm/html/NMSettingWireless.html | 11 +- docs/libnm/html/NMSettingWirelessSecurity.html | 11 +- docs/libnm/html/NMSimpleConnection.html | 66 +- docs/libnm/html/NMVpnConnection.html | 26 +- docs/libnm/html/NMVpnEditorPlugin.html | 22 +- docs/libnm/html/NMWimaxNsp.html | 46 +- docs/libnm/html/api-index-full.html | 766 ++- docs/libnm/html/ch03.html | 6 +- docs/libnm/html/index.html | 4 +- docs/libnm/html/index.sgml | 239 +- docs/libnm/html/libnm-NMConnection.html | 2519 ------- docs/libnm/html/libnm-nm-dbus-interface.html | 8 +- docs/libnm/html/libnm-nm-errors.html | 18 +- docs/libnm/html/libnm-nm-utils.html | 2 +- docs/libnm/html/libnm-nm-vpn-dbus-interface.html | 2 +- docs/libnm/html/libnm.devhelp2 | 201 +- docs/libnm/html/object-tree.html | 11 +- docs/libnm/libnm-sections.txt | 189 +- docs/libnm/version.xml | 2 +- libnm-core/Makefile.am | 8 +- libnm-core/Makefile.in | 8 +- libnm-core/nm-connection.c | 12 +- libnm-core/nm-dbus-interface.h | 4 +- libnm-core/nm-dbus-types.xml | 1291 ++++ libnm-core/nm-setting-8021x.h | 3 + libnm-core/nm-setting-adsl.h | 3 + libnm-core/nm-setting-bluetooth.h | 3 + libnm-core/nm-setting-bond.h | 3 + libnm-core/nm-setting-bridge-port.h | 3 + libnm-core/nm-setting-bridge.h | 3 + libnm-core/nm-setting-cdma.h | 3 + libnm-core/nm-setting-dcb.h | 4 +- libnm-core/nm-setting-generic.h | 3 + libnm-core/nm-setting-gsm.h | 3 + libnm-core/nm-setting-infiniband.h | 3 + libnm-core/nm-setting-ip-config.h | 3 + libnm-core/nm-setting-ip-tunnel.h | 3 + libnm-core/nm-setting-ip4-config.h | 3 + libnm-core/nm-setting-ip6-config.c | 8 +- libnm-core/nm-setting-ip6-config.h | 3 + libnm-core/nm-setting-macvlan.h | 3 + libnm-core/nm-setting-olpc-mesh.h | 3 + libnm-core/nm-setting-ppp.h | 3 + libnm-core/nm-setting-pppoe.h | 3 + libnm-core/nm-setting-serial.h | 3 + libnm-core/nm-setting-team-port.h | 3 + libnm-core/nm-setting-team.h | 3 + libnm-core/nm-setting-tun.h | 3 + libnm-core/nm-setting-vlan.h | 3 + libnm-core/nm-setting-vpn.h | 3 + libnm-core/nm-setting-vxlan.h | 3 + libnm-core/nm-setting-wimax.h | 3 + libnm-core/nm-setting-wired.h | 3 + libnm-core/nm-setting-wireless-security.h | 3 + libnm-core/nm-setting-wireless.h | 4 +- libnm-core/nm-simple-connection.h | 3 + libnm-core/nm-vpn-dbus-types.xml | 246 + libnm-core/nm-vpn-editor-plugin.c | 142 +- libnm-core/nm-vpn-plugin-info.h | 3 + libnm/nm-access-point.h | 4 +- libnm/nm-active-connection.h | 3 + libnm/nm-client.h | 3 + libnm/nm-device-adsl.h | 3 + libnm/nm-device-bond.h | 3 + libnm/nm-device-bridge.h | 3 + libnm/nm-device-bt.h | 3 + libnm/nm-device-ethernet.h | 3 + libnm/nm-device-generic.h | 3 + libnm/nm-device-infiniband.h | 3 + libnm/nm-device-ip-tunnel.h | 3 + libnm/nm-device-macvlan.h | 3 + libnm/nm-device-modem.h | 3 + libnm/nm-device-olpc-mesh.h | 3 + libnm/nm-device-team.h | 3 + libnm/nm-device-tun.h | 3 + libnm/nm-device-vlan.h | 3 + libnm/nm-device-vxlan.h | 3 + libnm/nm-device-wifi.h | 3 + libnm/nm-device-wimax.h | 3 + libnm/nm-device.h | 3 + libnm/nm-dhcp-config.h | 3 + libnm/nm-dhcp4-config.h | 3 + libnm/nm-dhcp6-config.h | 3 + libnm/nm-ip-config.h | 3 + libnm/nm-ip4-config.h | 3 + libnm/nm-ip6-config.h | 3 + libnm/nm-manager.h | 3 + libnm/nm-object.h | 3 + libnm/nm-property-docs.xml | 2 +- libnm/nm-remote-connection.h | 3 + libnm/nm-remote-settings.h | 3 + libnm/nm-secret-agent-old.h | 3 + libnm/nm-setting-docs.xml | 2 +- libnm/nm-vpn-connection.h | 3 + libnm/nm-vpn-plugin-old.h | 3 + libnm/nm-vpn-service-plugin.h | 3 + libnm/nm-wimax-nsp.h | 3 + man/NetworkManager.8 | 6 +- man/NetworkManager.conf.5 | 8 +- man/nm-online.1 | 6 +- man/nm-settings-ifcfg-rh.5 | 6 +- man/nm-settings-ifcfg-rh.xml | 2 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 8 +- man/nm-settings.xml | 4 +- man/nmcli-examples.7 | 6 +- man/nmcli.1 | 25 +- man/nmcli.xml | 22 - man/nmtui.1 | 6 +- po/ar.po | 16 - po/as.po | 22 - po/be@latin.po | 16 - po/bg.po | 16 - po/bn_IN.po | 22 - po/bs.po | 16 - po/ca.po | 22 - po/cs.po | 22 - po/da.po | 16 - po/de.po | 23 - po/dz.po | 16 - po/el.po | 24 - po/en_CA.po | 16 - po/en_GB.po | 22 - po/eo.po | 16 - po/es.po | 23 - po/et.po | 16 - po/eu.po | 16 - po/fi.po | 16 - po/fr.po | 23 - po/gd.po | 16 - po/gl.po | 22 - po/gu.po | 22 - po/he.po | 16 - po/hi.po | 22 - po/hr.po | 24 - po/hu.po | 23 - po/id.po | 22 - po/it.po | 24 - po/ja.po | 23 - po/ka.po | 16 - po/kn.po | 22 - po/ko.po | 22 - po/ku.po | 16 - po/lt.po | 22 - po/lv.po | 16 - po/mk.po | 16 - po/ml.po | 22 - po/mr.po | 22 - po/nb.po | 16 - po/ne.po | 16 - po/nl.po | 16 - po/oc.po | 16 - po/or.po | 22 - po/pa.po | 22 - po/pl.po | 1555 +++-- po/pt.po | 16 - po/pt_BR.po | 1756 +++-- po/ru.po | 22 - po/rw.po | 16 - po/sk.po | 16 - po/sl.po | 22 - po/sq.po | 16 - po/sr.po | 16 - po/sr@latin.po | 16 - po/sv.po | 1667 +++-- po/ta.po | 23 - po/te.po | 22 - po/th.po | 16 - po/tr.po | 22 - po/uk.po | 24 - po/vi.po | 16 - po/wa.po | 16 - po/zh_CN.po | 6883 ++++++++++---------- po/zh_HK.po | 16 - po/zh_TW.po | 22 - shared/nm-shared-utils.c | 47 +- shared/nm-version-macros.h | 8 +- shared/nm-version-macros.h.in | 6 +- src/Makefile.am | 1 + src/Makefile.in | 1 + src/devices/bluetooth/nm-bluez-device.c | 2 +- src/devices/nm-device-ethernet.c | 37 +- src/devices/nm-device-factory.c | 10 +- src/devices/nm-device.c | 139 +- src/devices/wwan/nm-modem-broadband.c | 23 +- src/devices/wwan/nm-modem.c | 3 +- src/dhcp-manager/nm-dhcp-client.c | 58 +- src/dhcp-manager/nm-dhcp-systemd.c | 9 +- src/dns-manager/nm-dns-dnsmasq.c | 332 +- src/dns-manager/nm-dns-plugin.c | 106 +- src/dnsmasq-manager/nm-dnsmasq-manager.c | 16 +- src/nm-auth-subject.c | 15 +- src/nm-core-utils.c | 168 +- src/nm-core-utils.h | 5 + src/org.freedesktop.NetworkManager.conf | 10 + src/platform/nm-linux-platform.c | 5 +- src/settings/nm-settings.c | 84 +- src/settings/plugins/ifnet/connection_parser.c | 11 +- src/settings/plugins/ifupdown/interface_parser.c | 16 +- src/tests/Makefile.am | 1 + src/tests/Makefile.in | 1 + src/tests/test-utils.c | 6 +- tools/Makefile.am | 3 +- tools/Makefile.in | 3 +- tools/enums-to-docbook.pl | 198 + 345 files changed, 17677 insertions(+), 11919 deletions(-) create mode 100644 docs/api/html/dbus-types.html create mode 100644 docs/api/html/nm-dbus-types.html create mode 100644 docs/api/html/nm-vpn-dbus-types.html create mode 100644 docs/libnm/html/NMConnection.html delete mode 100644 docs/libnm/html/libnm-NMConnection.html create mode 100644 libnm-core/nm-dbus-types.xml create mode 100644 libnm-core/nm-vpn-dbus-types.xml create mode 100755 tools/enums-to-docbook.pl diff --git a/AUTHORS b/AUTHORS index f5d97bc5..bf4f84de 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1 @@ -Current authors: -Dan Williams -Tambet Ingo - -Previous authors: -Robert Love +The NetworkManager Team diff --git a/Makefile.in b/Makefile.in index 2a294c11..f23ec31e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -216,8 +216,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/NetworkManager.pc.in \ $(top_srcdir)/build-aux/tap-driver.sh ABOUT-NLS AUTHORS \ COPYING ChangeLog INSTALL NEWS README TODO build-aux/compile \ build-aux/config.guess build-aux/config.rpath \ - build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \ - build-aux/missing + build-aux/config.sub build-aux/depcomp build-aux/install-sh \ + build-aux/ltmain.sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/NEWS b/NEWS index 19afd6d0..93c6c61e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,20 @@ +============================================ +NetworkManager-1.2.2 +Overview of changes since NetworkManager-1.2 +============================================ + +This is a new stable release of NetworkManager. Notable changes include: + +* The dnsmasq DNS management mode now uses D-Bus API of dnsmasq to make signal + nameserver changes. +* Hostname is now correctly read on Slackware. +* IPv6 addresses for default wired connections now stay stable. +* Reading portname on s390 systems on 4.4 kernels and newer has been corrected. +* nmcli no longer warns about version mismatches. +* Updated translations. +* Improved developer documentations. +* Multiple minor bugfixes. + ============================================ NetworkManager-1.2 Overview of changes since NetworkManager-1.0 diff --git a/clients/cli/agent.c b/clients/cli/agent.c index 0e39ba97..b8a56d23 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -207,9 +207,6 @@ do_agent (NmCli *nmc, int argc, char **argv) nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; return nmc->return_value; } - /* Compare NM and nmcli versions */ - if (!nmc_versions_match (nmc)) - return nmc->return_value; if (argc == 0) { nmc->return_value = do_agent_all (nmc, 0, NULL); diff --git a/clients/cli/common.c b/clients/cli/common.c index 0aa5efc2..0888f063 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -1170,10 +1170,6 @@ nmc_set_in_readline (gboolean in_readline) pthread_mutex_unlock (&readline_mutex); } -/* Global variable defined in nmcli.c */ -extern NmCli nm_cli; - - static char * nmc_readline_helper (const char *prompt) { diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 3fca37f5..1f1dae59 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -261,9 +261,6 @@ typedef struct { } TabCompletionInfo; static TabCompletionInfo nmc_tab_completion = {NULL, NULL, NULL, NULL}; -/* Global variable defined in nmcli.c - used for TAB completion */ -extern NmCli nm_cli; - static char *gen_connection_types (const char *text, int state); static void @@ -1970,12 +1967,19 @@ device_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data) nm_object_get_path (NM_OBJECT (active))); quit (); } else if ( ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING - && state >= NM_DEVICE_STATE_IP_CONFIG) { + && state >= NM_DEVICE_STATE_IP_CONFIG + && state <= NM_DEVICE_STATE_ACTIVATED) { if (nmc->print_output == NMC_PRINT_PRETTY) nmc_terminal_erase_line (); g_print (_("Connection successfully activated (master waiting for slaves) (D-Bus active path: %s)\n"), nm_object_get_path (NM_OBJECT (active))); quit (); + } else if ( ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING + && state == NM_DEVICE_STATE_FAILED) { + if (nmc->print_output == NMC_PRINT_PRETTY) + nmc_terminal_erase_line (); + g_print (_("Error: Connection activation failed.")); + quit (); } else if (active && ac_state != NM_ACTIVE_CONNECTION_STATE_ACTIVATING) { g_string_printf (nmc->return_text, _("Error: Connection activation failed.")); nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; @@ -11051,9 +11055,6 @@ do_connections (NmCli *nmc, int argc, char **argv) nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; return nmc->return_value; } - /* Compare NM and nmcli versions */ - if (!nmc_versions_match (nmc)) - return nmc->return_value; /* Get the connection list */ nmc->connections = nm_client_get_connections (nmc->client); diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 449fa7db..65c4be72 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -286,7 +286,7 @@ usage (void) " show []\n\n" " set [ifname] [autoconnect yes|no] [managed yes|no]\n\n" " connect \n\n" - " reapply ...\n\n" + " reapply \n\n" " disconnect ...\n\n" " delete ...\n\n" " monitor ...\n\n" @@ -342,7 +342,7 @@ usage_device_reapply (void) { g_printerr (_("Usage: nmcli device reapply { ARGUMENTS | help }\n" "\n" - "ARGUMENTS := ...\n" + "ARGUMENTS := \n" "\n" "Attempts to update device with changes to the currently active connection\n" "made since it was last applied.\n\n")); @@ -1835,11 +1835,10 @@ reapply_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) GError *error = NULL; if (!nm_device_reapply_finish (device, result, &error)) { - g_string_printf (nmc->return_text, _("Error: not all connections reapplied.")); - g_printerr (_("Error: Reapplying connection to device '%s' (%s) failed: %s\n"), - nm_device_get_iface (device), - nm_object_get_path (NM_OBJECT (device)), - error->message); + g_string_printf (nmc->return_text, _("Error: Reapplying connection to device '%s' (%s) failed: %s"), + nm_device_get_iface (device), + nm_object_get_path (NM_OBJECT (device)), + error->message); g_error_free (error); nmc->return_value = NMC_RESULT_ERROR_DEV_DISCONNECT; device_cb_info_finish (info, device); @@ -1847,7 +1846,7 @@ reapply_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) if (nmc->print_output == NMC_PRINT_PRETTY) nmc_terminal_erase_line (); g_print (_("Connection successfully reapplied to device '%s'.\n"), - nm_device_get_iface (device)); + nm_device_get_iface (device)); device_cb_info_finish (info, device); } } @@ -1855,14 +1854,14 @@ reapply_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) static NMCResultCode do_device_reapply (NmCli *nmc, int argc, char **argv) { - NMDevice **devices; - NMDevice *device; + gs_free NMDevice **devices = NULL; + NMDevice *device = NULL; DeviceCbInfo *info = NULL; - GSList *queue = NULL, *iter; - char **arg_arr = NULL; char **arg_ptr = argv; int arg_num = argc; int i; + gs_free char *device_name_free = NULL; + const char *device_name = NULL; /* Set default timeout for reapply operation. */ if (nmc->timeout == -1) @@ -1870,69 +1869,48 @@ do_device_reapply (NmCli *nmc, int argc, char **argv) if (argc == 0) { if (nmc->ask) { - char *line = nmc_readline (PROMPT_INTERFACES); - nmc_string_to_arg_array (line, NULL, FALSE, &arg_arr, &arg_num); - g_free (line); - arg_ptr = arg_arr; + device_name_free = nmc_readline (PROMPT_INTERFACE); + device_name = device_name_free; } - if (arg_num == 0) { + if (!device_name) { g_string_printf (nmc->return_text, _("Error: No interface specified.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return nmc->return_value; } + } else if (argc == 1) { + device_name = arg_ptr[0]; + next_arg (&arg_num, &arg_ptr); + } else { + next_arg (&arg_num, &arg_ptr); + g_string_printf (nmc->return_text, _("Error: unsupported argument '%s'."), *arg_ptr); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + return nmc->return_value; } devices = get_devices_sorted (nmc->client); - while (arg_num > 0) { - device = NULL; - for (i = 0; devices[i]; i++) { - if (!g_strcmp0 (nm_device_get_iface (devices[i]), *arg_ptr)) { - device = devices[i]; - break; - } - } - - if (device) { - if (!g_slist_find (queue, device)) - queue = g_slist_prepend (queue, device); - else - g_printerr (_("Warning: argument '%s' is duplicated.\n"), *arg_ptr); - } else { - g_printerr (_("Error: Device '%s' not found.\n"), *arg_ptr); - g_string_printf (nmc->return_text, _("Error: not all devices found.")); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + for (i = 0; devices[i]; i++) { + if (!g_strcmp0 (nm_device_get_iface (devices[i]), device_name)) { + device = devices[i]; + break; } - - /* Take next argument */ - next_arg (&arg_num, &arg_ptr); } - g_free (devices); - if (!queue) { - g_string_printf (nmc->return_text, _("Error: no valid device provided.")); + if (!device) { + g_string_printf (nmc->return_text, _("Error: device '%s' not found."), device_name); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; + return nmc->return_value; } - queue = g_slist_reverse (queue); - - info = g_slice_new0 (DeviceCbInfo); - info->nmc = nmc; nmc->nowait_flag = (nmc->timeout == 0); nmc->should_wait = TRUE; - for (iter = queue; iter; iter = g_slist_next (iter)) { - device = iter->data; - - info->queue = g_slist_prepend (info->queue, g_object_ref (device)); + info = g_slice_new0 (DeviceCbInfo); + info->nmc = nmc; + info->queue = g_slist_prepend (info->queue, g_object_ref (device)); - /* Now reapply the connection to the device */ - nm_device_reapply_async (device, NULL, 0, 0, NULL, reapply_device_cb, info); - } + /* Now reapply the connection to the device */ + nm_device_reapply_async (device, NULL, 0, 0, NULL, reapply_device_cb, info); -error: - g_strfreev (arg_arr); - g_slist_free (queue); return nmc->return_value; } @@ -3594,9 +3572,6 @@ is_single_word (const char* line) return FALSE; } -/* Global variable defined in nmcli.c */ -extern NmCli nm_cli; - static char * gen_func_ifnames (const char *text, int state) { @@ -3670,9 +3645,6 @@ do_devices (NmCli *nmc, int argc, char **argv) nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; return nmc->return_value; } - /* Compare NM and nmcli versions */ - if (!nmc_versions_match (nmc)) - return nmc->return_value; if (argc == 0) { if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) diff --git a/clients/cli/general.c b/clients/cli/general.c index 15e73e28..0704688f 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -345,9 +345,6 @@ show_nm_status (NmCli *nmc, const char *pretty_header_name, const char *print_fl return FALSE; } - if (!nmc_versions_match (nmc)) - return FALSE; - state = nm_client_get_state (nmc->client); startup = nm_client_get_startup (nmc->client); connectivity = nm_client_get_connectivity (nmc->client); diff --git a/clients/cli/nmcli-completion b/clients/cli/nmcli-completion index 7f79180f..3c87f6f9 100644 --- a/clients/cli/nmcli-completion +++ b/clients/cli/nmcli-completion @@ -178,9 +178,6 @@ _nmcli_compl_OPTIONS() pretty) _nmcli_array_delete_at words 0 ;; - nocheck) - _nmcli_array_delete_at words 0 - ;; ask) _nmcli_array_delete_at words 0 ;; @@ -804,7 +801,7 @@ _nmcli() local COMMAND_CONNECTION_ACTIVE="" HELP_ONLY_AS_FIRST= - local LONG_OPTIONS=(terse pretty mode fields colors escape nocheck ask show-secrets wait version help) + local LONG_OPTIONS=(terse pretty mode fields colors escape ask show-secrets wait version help) _nmcli_compl_OPTIONS i=$? @@ -1428,12 +1425,12 @@ _nmcli() fi ;; sh|sho|show| \ + r|re|rea|reap|reapp|reappl|reapply| \ c|co|con|conn|conne|connec|connect) if [[ ${#words[@]} -eq 3 ]]; then _nmcli_compl_COMMAND_nl "${words[2]}" "$(_nmcli_dev_status DEVICE)" fi ;; - r|re|rea|reap|reapp|reappl|reapply| \ d|di|dis|disc|disco|discon|disconn|disconne|disconnec|disconnect| \ de|del|dele|delet|delete| \ m|mo|mon|moni|monit|monito|monitor) diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index a7f21161..7e788654 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -89,7 +89,6 @@ usage (const char *prog_name) " -c[olors] auto|yes|no whether to use colors in output\n" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in values\n" - " -n[ocheck] don't check nmcli and NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for finishing operations\n" @@ -254,7 +253,7 @@ parse_command_line (NmCli *nmc, int argc, char **argv) } nmc->required_fields = g_strdup (argv[1]); } else if (matches (opt, "-nocheck") == 0) { - nmc->nocheck_ver = TRUE; + /* ignore for backward compatibility */ } else if (matches (opt, "-ask") == 0) { nmc->ask = TRUE; } else if (matches (opt, "-show-secrets") == 0) { @@ -545,7 +544,6 @@ nmc_init (NmCli *nmc) nmc->required_fields = NULL; nmc->output_data = g_ptr_array_new_full (20, g_free); memset (&nmc->print_fields, '\0', sizeof (NmcPrintFields)); - nmc->nocheck_ver = FALSE; nmc->ask = FALSE; nmc->show_secrets = FALSE; nmc->use_colors = NMC_USE_COLOR_AUTO; diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index 1b9a08b8..34100f00 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -59,7 +59,7 @@ typedef enum { /* NetworkManager is not running */ NMC_RESULT_ERROR_NM_NOT_RUNNING = 8, - /* nmcli and NetworkManager versions mismatch */ + /* No more used, keep to preserve API */ NMC_RESULT_ERROR_VERSIONS_MISMATCH = 9, /* Connection/Device/AP not found */ @@ -152,7 +152,6 @@ typedef struct _NmCli { char *required_fields; /* Required fields in output: '--fields' option */ GPtrArray *output_data; /* GPtrArray of arrays of NmcOutputField structs - accumulates data for output */ NmcPrintFields print_fields; /* Structure with field indices to print */ - gboolean nocheck_ver; /* Don't check nmcli and NM versions: option '--nocheck' */ gboolean ask; /* Ask for missing parameters: option '--ask' */ gboolean show_secrets; /* Whether to display secrets (both input and output): option '--show-secrets' */ gboolean in_editor; /* Whether running the editor - nmcli con edit' */ @@ -162,6 +161,8 @@ typedef struct _NmCli { NmcTermColor editor_prompt_color; /* Color of prompt in connection editor */ } NmCli; +extern NmCli nm_cli; + /* Error quark for GError domain */ #define NMCLI_ERROR (nmcli_error_quark ()) GQuark nmcli_error_quark (void); @@ -170,5 +171,4 @@ gboolean nmc_seen_sigint (void); void nmc_clear_sigint (void); void nmc_set_sigquit_internal (void); - #endif /* NMC_NMCLI_H */ diff --git a/clients/cli/settings-docs.c b/clients/cli/settings-docs.c index 0f882c9b..f4fb6a15 100644 --- a/clients/cli/settings-docs.c +++ b/clients/cli/settings-docs.c @@ -264,7 +264,7 @@ NmcPropertyDesc setting_ipv4[] = { }; NmcPropertyDesc setting_ipv6[] = { - { "addr-gen-mode", "Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: \"eui64\", \"stable-privacy\" or unset. If the property is set to \"eui64\", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of \"stable-privacy\" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option." }, + { "addr-gen-mode", "Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: \"eui64\", or \"stable-privacy\". If the property is set to \"eui64\", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of \"stable-privacy\" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling \"stable-privacy\". For keyfile plugin, the absence of the setting on disk means \"eui64\" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option." }, { "addresses", "Array of IP addresses." }, { "dad-timeout", "Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds). A value greater than zero is a timeout in milliseconds." }, { "dhcp-hostname", "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time." }, diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 06e9fb47..1651aab2 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -2082,13 +2082,6 @@ typedef struct { NmcPropertyFuncsFields } NmcPropertyFuncs; -/* - * We need NmCli in some _set_property functions, and they aren't passed NmCli. - * So use the global variable. - */ -/* Global variable defined in nmcli.c */ -extern NmCli nm_cli; - NMSetting * nmc_setting_new_for_name (const char *name) { diff --git a/clients/cli/utils.c b/clients/cli/utils.c index d05ea285..a406eee4 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -181,60 +181,6 @@ ssid_to_hex (const char *str, gsize len) return printable_str; } -/* - * Converts IPv4 address from guint32 in network-byte order to text representation. - * Returns: text form of the IP or NULL (then error is set) - */ -char * -nmc_ip4_address_as_string (guint32 ip, GError **error) -{ - guint32 tmp_addr; - char buf[INET_ADDRSTRLEN]; - - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - memset (&buf, '\0', sizeof (buf)); - tmp_addr = ip; - - if (inet_ntop (AF_INET, &tmp_addr, buf, INET_ADDRSTRLEN)) { - return g_strdup (buf); - } else { - g_set_error (error, NMCLI_ERROR, 0, _("Error converting IP4 address '0x%X' to text form"), - ntohl (tmp_addr)); - return NULL; - } -} - -/* - * Converts IPv6 address in in6_addr structure to text representation. - * Returns: text form of the IP or NULL (then error is set) - */ -char * -nmc_ip6_address_as_string (const struct in6_addr *ip, GError **error) -{ - char buf[INET6_ADDRSTRLEN]; - - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - memset (&buf, '\0', sizeof (buf)); - - if (inet_ntop (AF_INET6, ip, buf, INET6_ADDRSTRLEN)) { - return g_strdup (buf); - } else { - if (error) { - int j; - GString *ip6_str = g_string_new (NULL); - g_string_append_printf (ip6_str, "%02X", ip->s6_addr[0]); - for (j = 1; j < 16; j++) - g_string_append_printf (ip6_str, " %02X", ip->s6_addr[j]); - g_set_error (error, NMCLI_ERROR, 0, _("Error converting IP6 address '%s' to text form"), - ip6_str->str); - g_string_free (ip6_str, TRUE); - } - return NULL; - } -} - /* * Erase terminal line using ANSI escape sequences. * It prints [2K sequence to erase the line and then \r to return back @@ -706,23 +652,6 @@ finish: return ret; } -/* - * Convert string array (char **) to GSList. - * - * Returns: pointer to newly created GSList. Caller should free it. - */ -GSList * -nmc_util_strv_to_slist (char **strv) -{ - GSList *list = NULL; - guint i = 0; - - while (strv && strv[i]) - list = g_slist_prepend (list, g_strdup (strv[i++])); - - return g_slist_reverse (list); -} - /* * Convert string array (char **) to description string in the form of: * "[string1, string2, ]" @@ -1359,48 +1288,3 @@ print_data (NmCli *nmc) } } -/* -* Compare versions of nmcli and NM daemon. -* Return: TRUE - the versions match (when only major and minor match, print a warning) -* FALSE - versions mismatch -*/ -gboolean -nmc_versions_match (NmCli *nmc) -{ - const char *nm_ver = NULL; - const char *dot; - gboolean match = FALSE; - - g_return_val_if_fail (nmc != NULL, FALSE); - - /* --nocheck option - don't compare the versions */ - if (nmc->nocheck_ver) - return TRUE; - - nmc->get_client (nmc); - nm_ver = nm_client_get_version (nmc->client); - if (nm_ver) { - if (!strcmp (nm_ver, VERSION)) - match = TRUE; - else { - dot = strchr (nm_ver, '.'); - if (dot) { - dot = strchr (dot + 1, '.'); - if (dot && !strncmp (nm_ver, VERSION, dot-nm_ver)) { - g_printerr (_("Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --nocheck to suppress the warning.\n"), - VERSION, nm_ver); - match = TRUE; - } - } - } - } - - if (!match) { - g_string_printf (nmc->return_text, _("Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force execution using --nocheck, but the results are unpredictable."), - VERSION, nm_ver ? nm_ver : _("unknown")); - nmc->return_value = NMC_RESULT_ERROR_VERSIONS_MISMATCH; - } - - return match; -} - diff --git a/clients/cli/utils.h b/clients/cli/utils.h index 8047fe7f..eab60d3a 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -69,8 +69,6 @@ gboolean nmc_string_to_uint (const char *str, unsigned long int *value); gboolean nmc_string_to_bool (const char *str, gboolean *val_bool, GError **error); gboolean nmc_string_to_tristate (const char *str, NMCTriStateValue *val, GError **error); -char *nmc_ip4_address_as_string (guint32 ip, GError **error); -char *nmc_ip6_address_as_string (const struct in6_addr *ip, GError **error); void nmc_terminal_erase_line (void); void nmc_terminal_show_progress (const char *str); const char *nmc_term_color_sequence (NmcTermColor color); @@ -83,7 +81,6 @@ char *nmc_get_user_input (const char *ask_str); int nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquote, char ***argv, int *argc); const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error); -GSList *nmc_util_strv_to_slist (char **strv); char * nmc_util_strv_for_display (const char **strv, gboolean brackets); char **nmc_strsplit_set (const char *str, const char *delimiter, int max_tokens); int nmc_string_screen_width (const char *start, const char *end); @@ -105,6 +102,5 @@ NmcOutputField *nmc_dup_fields_array (NmcOutputField fields[], size_t size, guin void nmc_empty_output_fields (NmCli *nmc); void print_required_fields (NmCli *nmc, const NmcOutputField field_values[]); void print_data (NmCli *nmc); -gboolean nmc_versions_match (NmCli *nmc); #endif /* NMC_UTILS_H */ diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index 1d2a6b0f..880b6ecd 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -99,6 +99,10 @@ nm_vpn_get_secret_names (const char *vpn_type) { const char *type; static VpnPasswordName generic_vpn_secrets[] = { {"password", N_("Password")}, {NULL, NULL} }; + static VpnPasswordName openvpn_secrets[] = { {"password", N_("Password")}, + {"cert-pass", N_("Certificate password")}, + {"http-proxy-password", N_("HTTP proxy password")}, + {NULL, NULL} }; static VpnPasswordName vpnc_secrets[] = { {"Xauth password", N_("Password")}, {"IPSec secret", N_("Group password")}, {NULL, NULL} }; @@ -118,13 +122,14 @@ nm_vpn_get_secret_names (const char *vpn_type) else type = vpn_type; - if ( !g_strcmp0 (type, "openvpn") - || !g_strcmp0 (type, "pptp") + if ( !g_strcmp0 (type, "pptp") || !g_strcmp0 (type, "iodine") || !g_strcmp0 (type, "ssh") || !g_strcmp0 (type, "l2tp") || !g_strcmp0 (type, "fortisslvpn")) return generic_vpn_secrets; + else if (!g_strcmp0 (type, "openvpn")) + return openvpn_secrets; else if (!g_strcmp0 (type, "vpnc")) return vpnc_secrets; else if ( !g_strcmp0 (type, "openswan") diff --git a/configure b/configure index fd20c533..153d5c91 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 1.2.0. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.2.2. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.2.0' -PACKAGE_STRING='NetworkManager 1.2.0' +PACKAGE_VERSION='1.2.2' +PACKAGE_STRING='NetworkManager 1.2.2' 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.2.0 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.2.2 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.2.0:";; + short | recursive ) echo "Configuration of NetworkManager 1.2.2:";; esac cat <<\_ACEOF @@ -2062,7 +2062,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.2.0 +NetworkManager configure 1.2.2 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.2.0, which was +It was created by NetworkManager $as_me 1.2.2, 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.2.0' + VERSION='1.2.2' cat >>confdefs.h <<_ACEOF @@ -17540,9 +17540,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 NM_MINOR_VERSION=2 -NM_MICRO_VERSION=0 -NM_VERSION=1.2.0 -NM_GIT_SHA=d3d648f9ef1086fdba8f5c320b380ff962f674db +NM_MICRO_VERSION=2 +NM_VERSION=1.2.2 +NM_GIT_SHA=8f6d416768cf69932999b1fc2ab4231321761657 @@ -27298,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.2.0, which was +This file was extended by NetworkManager $as_me 1.2.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27364,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.2.0 +NetworkManager config.status 1.2.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ab2993a5..7bb3779e 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], [2]) -m4_define([nm_micro_version], [0]) +m4_define([nm_micro_version], [2]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) 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 ])]) diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index aeba9d29..5aafc262 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -73,6 +73,8 @@ 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)/libnm-core/nm-dbus-types.xml \ + $(top_builddir)/libnm-core/nm-vpn-dbus-types.xml \ $(top_builddir)/man/nmcli.xml \ $(top_builddir)/man/nmtui.xml \ $(top_builddir)/man/nm-online.xml \ diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index bccad102..7407f4fa 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -461,6 +461,8 @@ content_files = $(top_builddir)/introspection/nmdbus-access-point-org.freedeskto $(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \ $(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \ $(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \ + $(top_builddir)/libnm-core/nm-dbus-types.xml \ + $(top_builddir)/libnm-core/nm-vpn-dbus-types.xml \ $(top_builddir)/man/nmcli.xml $(top_builddir)/man/nmtui.xml \ $(top_builddir)/man/nm-online.xml \ $(top_builddir)/man/NetworkManager.xml \ diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index 049fdd41..0c05211a 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -363,7 +363,7 @@ no-auto-default=*

path

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

diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 2f5ab8cf..850ff2e2 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -48,6 +48,10 @@ + + + + @@ -345,5 +349,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/api/html/dbus-types.html b/docs/api/html/dbus-types.html new file mode 100644 index 00000000..e63be172 --- /dev/null +++ b/docs/api/html/dbus-types.html @@ -0,0 +1,27 @@ + + + + +Types: NetworkManager Reference Manual + + + + + + + + + + + + + + + + +

+Types

+ + + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html index 8669fdc9..25c4e853 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html @@ -87,7 +87,7 @@ Flags readable u

Flags describing the capabilities of the access point.

-

Returns: NM80211ApFlags +

Returns: NM80211ApFlags


@@ -99,7 +99,7 @@ WpaFlags readable u

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

-

Returns: NM80211ApSecurityFlags +

Returns: NM80211ApSecurityFlags


@@ -111,7 +111,7 @@ RsnFlags readable u

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

-

Returns: NM80211ApSecurityFlags +

Returns: NM80211ApSecurityFlags


@@ -149,7 +149,7 @@ Mode readable u

Describes the operating mode of the access point.

-

Returns: NM80211Mode +

Returns: NM80211Mode


diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html index 91c82cd9..81414d7f 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html @@ -86,7 +86,7 @@ RegisterWithCapabilities (IN s identifier,

IN u capabilities:

-

(NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager.

+

(NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager.

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 5078108b..71956c75 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html @@ -166,7 +166,7 @@ State readable u

The state of this active connection.

-

Returns: NMActiveConnectionState +

Returns: NMActiveConnectionState


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 96d7124e..e675f1ad 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html @@ -98,7 +98,7 @@ BtCapabilities readable u

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

-

Returns: NMBluetoothCapabilities +

Returns: NMBluetoothCapabilities

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 d375b528..b56f2acb 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html @@ -82,7 +82,7 @@ ModemCapabilities readable u firmware reload or other reinitialization to switch between eg CDMA/EVDO and GSM/UMTS.

-

Returns: NMDeviceModemCapabilities +

Returns: NMDeviceModemCapabilities


@@ -94,7 +94,7 @@ CurrentCapabilities readable u

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

-

Returns: NMDeviceModemCapabilities +

Returns: NMDeviceModemCapabilities

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 afe7fec5..9dda293d 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html @@ -214,7 +214,7 @@ Mode readable u

The operating mode of the wireless device.

-

Returns: NM80211Mode +

Returns: NM80211Mode


@@ -253,7 +253,7 @@ WirelessCapabilities readable u

The capabilities of the wireless device.

-

Returns: NMDeviceWifiCapabilities +

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 4bcc0ccb..c0a8a22d 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html @@ -217,15 +217,15 @@ StateChanged (u new_state,

u new_state:

-

(NMDeviceState) The new state of the device.

+

(NMDeviceState) The new state of the device.

u old_state:

-

(NMDeviceState) The previous state of the device.

+

(NMDeviceState) The previous state of the device.

u reason:

-

(NMDeviceStateReason) A reason for the state transition.

+

(NMDeviceStateReason) A reason for the state transition.

@@ -307,7 +307,7 @@ Capabilities readable u

Flags describing the capabilities of the device.

-

Returns: NMDeviceCapabilities +

Returns: NMDeviceCapabilities


@@ -328,7 +328,7 @@ State readable u

The current state of the device.

-

Returns: NMDeviceState +

Returns: NMDeviceState


@@ -339,7 +339,7 @@ StateReason readable (uu)

The current state and reason for changing to that state.

-

Returns: A tuple of NMDeviceState and NMDeviceStateReason. +

Returns: A tuple of NMDeviceState and NMDeviceStateReason.


@@ -451,7 +451,7 @@ DeviceType readable u

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

-

Returns: NMDeviceType +

Returns: NMDeviceType


@@ -494,7 +494,7 @@ Metered readable u

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

-

Returns: NMMetered +

Returns: NMMetered


diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html index 23201a1f..2b116264 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ Home Up Prev -Next +Next
@@ -105,7 +105,7 @@ GetSecrets (IN a{sa{sv}} connection,

IN u flags:

-

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

+

(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:

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 4bb08ff8..848a0d63 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html @@ -89,11 +89,11 @@ VpnStateChanged (u state,

u state:

-

(NMVpnConnectionState) The new state of the VPN connection.

+

(NMVpnConnectionState) The new state of the VPN connection.

u reason:

-

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

+

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

@@ -108,7 +108,7 @@ VpnState readable u

The VPN-specific state of the connection.

-

Returns: NMVpnConnectionState +

Returns: NMVpnConnectionState


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 87db2178..5868c7ac 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html @@ -272,7 +272,7 @@ StateChanged (u state);

u state:

-

(NMVpnServiceState) The new state of the plugin.

+

(NMVpnServiceState) The new state of the plugin.

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

u reason:

-

(NMVpnPluginFailure) Reason code for the failure.

+

(NMVpnPluginFailure) Reason code for the failure.

@@ -409,7 +409,7 @@ State readable u

The state of the plugin.

-

Returns: NMVpnServiceState +

Returns: NMVpnServiceState

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html index a3468b7e..c72f1e26 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html @@ -398,7 +398,7 @@ CheckConnectivity (OUT u connectivity);

OUT u connectivity:

-

(NMConnectivityState) The current connectivity state.

+

(NMConnectivityState) The current connectivity state.

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

OUT u state:

-

NMState

+

NMState

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

u state:

-

(NMState) The new state of NetworkManager.

+

(NMState) The new state of NetworkManager.

@@ -643,7 +643,7 @@ Metered readable u

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

-

Returns: NMMetered +

Returns: NMMetered


@@ -685,7 +685,7 @@ State readable u

The overall state of the NetworkManager daemon.

-

Returns: NMState +

Returns: NMState


@@ -696,7 +696,7 @@ Connectivity readable u

The network connectivity state.

-

Returns: NMConnectivityState +

Returns: NMConnectivityState


diff --git a/docs/api/html/index.html b/docs/api/html/index.html index e31a7500..15870791 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -14,7 +14,7 @@
-

Version 1.2.0 +

Version 1.2.2

@@ -177,6 +177,15 @@ org.freedesktop.NetworkManager.SecretAgent +
Types
+
+
+NetworkManager D-Bus API Types +
+
+VPN Plugin D-Bus API Types +
+
Network Configuration Setting Specification
diff --git a/docs/api/html/index.sgml b/docs/api/html/index.sgml index 4b1a83ec..49e4a4c1 100644 --- a/docs/api/html/index.sgml +++ b/docs/api/html/index.sgml @@ -474,3 +474,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 1747da1c..c74a0c5f 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -630,6 +630,55 @@
+

N

+
+
NM80211ApFlags, enum NM80211ApFlags +
+
NM80211ApSecurityFlags, enum NM80211ApSecurityFlags +
+
NM80211Mode, enum NM80211Mode +
+
NMActiveConnectionState, enum NMActiveConnectionState +
+
NMBluetoothCapabilities, enum NMBluetoothCapabilities +
+
NMConnectivityState, enum NMConnectivityState +
+
NMDeviceCapabilities, enum NMDeviceCapabilities +
+
NMDeviceModemCapabilities, enum NMDeviceModemCapabilities +
+
NMDeviceState, enum NMDeviceState +
+
NMDeviceStateReason, enum NMDeviceStateReason +
+
NMDeviceType, enum NMDeviceType +
+
NMDeviceWifiCapabilities, enum NMDeviceWifiCapabilities +
+
NMIPTunnelMode, enum NMIPTunnelMode +
+
NMMetered, enum NMMetered +
+
NMSecretAgentCapabilities, enum NMSecretAgentCapabilities +
+
NMSecretAgentGetSecretsFlags, enum NMSecretAgentGetSecretsFlags +
+
NMState, enum NMState +
+
NMVpnConnectionState, enum NMVpnConnectionState +
+
NMVpnConnectionStateReason, enum NMVpnConnectionStateReason +
+
NMVpnPluginFailure, enum NMVpnPluginFailure +
+
NMVpnServiceState, enum NMVpnServiceState +
+
NMWimaxNspNetworkType, enum NMWimaxNspNetworkType +
+
+
+

P

org.freedesktop.NetworkManager.PPP, org.freedesktop.NetworkManager.PPP diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html new file mode 100644 index 00000000..6d044dd3 --- /dev/null +++ b/docs/api/html/nm-dbus-types.html @@ -0,0 +1,3120 @@ + + + + +NetworkManager D-Bus API Types: NetworkManager Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

NetworkManager D-Bus API Types

+

NetworkManager D-Bus API Types

+
+
+

enum NMState

+

NMState values indicate the current overall networking state.

+

+
+

Values

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

NM_STATE_UNKNOWN

+

+
+

= 0

+

+
+

networking state is unknown

+

+
 
+

NM_STATE_ASLEEP

+

+
+

= 10

+

+
+

networking is not enabled

+

+
 
+

NM_STATE_DISCONNECTED

+

+
+

= 20

+

+
+

there is no active network connection

+

+
 
+

NM_STATE_DISCONNECTING

+

+
+

= 30

+

+
+

network connections are being cleaned up

+

+
 
+

NM_STATE_CONNECTING

+

+
+

= 40

+

+
+

a network connection is being started

+

+
 
+

NM_STATE_CONNECTED_LOCAL

+

+
+

= 50

+

+
+

there is only local IPv4 and/or IPv6 connectivity

+

+
 
+

NM_STATE_CONNECTED_SITE

+

+
+

= 60

+

+
+

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

+

+
 
+

NM_STATE_CONNECTED_GLOBAL

+

+
+

= 70

+

+
+

there is global IPv4 and/or IPv6 Internet connectivity

+

+
 
+
+
+
+
+

enum NMConnectivityState

+

+
+

Values

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

NM_CONNECTIVITY_UNKNOWN

+

+
+

= 1

+

+
+

Network connectivity is unknown.

+

+
 
+

NM_CONNECTIVITY_NONE

+

+
+

= 2

+

+
+

The host is not connected to any network.

+

+
 
+

NM_CONNECTIVITY_PORTAL

+

+
+

= 3

+

+
+

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

+

+
 
+

NM_CONNECTIVITY_LIMITED

+

+
+

= 4

+

+
+

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

+

+
 
+

NM_CONNECTIVITY_FULL

+

+
+

= 5

+

+
+

The host is connected to a network, and appears to be able to reach the full Internet.

+

+
 
+
+
+
+
+

enum NMDeviceType

+

NMDeviceType values indicate the type of hardware represented by a device object.

+

+
+

Values

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

NM_DEVICE_TYPE_UNKNOWN

+

+
+

= 0

+

+
+

unknown device

+

+
 
+

NM_DEVICE_TYPE_GENERIC

+

+
+

= 14

+

+
+

generic support for unrecognized device types

+

+
 
+

NM_DEVICE_TYPE_ETHERNET

+

+
+

= 1

+

+
+

a wired ethernet device

+

+
 
+

NM_DEVICE_TYPE_WIFI

+

+
+

= 2

+

+
+

an 802.11 WiFi device

+

+
 
+

NM_DEVICE_TYPE_UNUSED1

+

+
+

= 3

+

+
+

not used

+

+
 
+

NM_DEVICE_TYPE_UNUSED2

+

+
+

= 4

+

+
+

not used

+

+
 
+

NM_DEVICE_TYPE_BT

+

+
+

= 5

+

+
+

a Bluetooth device supporting PAN or DUN access protocols

+

+
 
+

NM_DEVICE_TYPE_OLPC_MESH

+

+
+

= 6

+

+
+

an OLPC XO mesh networking device

+

+
 
+

NM_DEVICE_TYPE_WIMAX

+

+
+

= 7

+

+
+

an 802.16e Mobile WiMAX broadband device

+

+
 
+

NM_DEVICE_TYPE_MODEM

+

+
+

= 8

+

+
+

a modem supporting analog telephone, CDMA/EVDO, GSM/UMTS, or LTE network access protocols

+

+
 
+

NM_DEVICE_TYPE_INFINIBAND

+

+
+

= 9

+

+
+

an IP-over-InfiniBand device

+

+
 
+

NM_DEVICE_TYPE_BOND

+

+
+

= 10

+

+
+

a bond master interface

+

+
 
+

NM_DEVICE_TYPE_VLAN

+

+
+

= 11

+

+
+

an 802.1Q VLAN interface

+

+
 
+

NM_DEVICE_TYPE_ADSL

+

+
+

= 12

+

+
+

ADSL modem

+

+
 
+

NM_DEVICE_TYPE_BRIDGE

+

+
+

= 13

+

+
+

a bridge master interface

+

+
 
+

NM_DEVICE_TYPE_TEAM

+

+
+

= 15

+

+
+

a team master interface

+

+
 
+

NM_DEVICE_TYPE_TUN

+

+
+

= 16

+

+
+

a TUN or TAP interface

+

+
 
+

NM_DEVICE_TYPE_IP_TUNNEL

+

+
+

= 17

+

+
+

a IP tunnel interface

+

+
 
+

NM_DEVICE_TYPE_MACVLAN

+

+
+

= 18

+

+
+

a MACVLAN interface

+

+
 
+

NM_DEVICE_TYPE_VXLAN

+

+
+

= 19

+

+
+

a VXLAN interface

+

+
 
+

NM_DEVICE_TYPE_VETH

+

+
+

= 20

+

+
+

a VETH interface

+

+
 
+
+
+
+
+

enum NMDeviceCapabilities

+

General device capability flags.

+

+
+

Values

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

NM_DEVICE_CAP_NONE

+

+
+

= 0x00000000

+

+
+

device has no special capabilities

+

+
 
+

NM_DEVICE_CAP_NM_SUPPORTED

+

+
+

= 0x00000001

+

+
+

NetworkManager supports this device

+

+
 
+

NM_DEVICE_CAP_CARRIER_DETECT

+

+
+

= 0x00000002

+

+
+

this device can indicate carrier status

+

+
 
+

NM_DEVICE_CAP_IS_SOFTWARE

+

+
+

= 0x00000004

+

+
+

this device is a software device

+

+
 
+
+
+
+
+

enum NMDeviceWifiCapabilities

+

802.11 specific device encryption and authentication capabilities.

+

+
+

Values

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

NM_WIFI_DEVICE_CAP_NONE

+

+
+

= 0x00000000

+

+
+

device has no encryption/authentication capabilities

+

+
 
+

NM_WIFI_DEVICE_CAP_CIPHER_WEP40

+

+
+

= 0x00000001

+

+
+

device supports 40/64-bit WEP encryption

+

+
 
+

NM_WIFI_DEVICE_CAP_CIPHER_WEP104

+

+
+

= 0x00000002

+

+
+

device supports 104/128-bit WEP encryption

+

+
 
+

NM_WIFI_DEVICE_CAP_CIPHER_TKIP

+

+
+

= 0x00000004

+

+
+

device supports TKIP encryption

+

+
 
+

NM_WIFI_DEVICE_CAP_CIPHER_CCMP

+

+
+

= 0x00000008

+

+
+

device supports AES/CCMP encryption

+

+
 
+

NM_WIFI_DEVICE_CAP_WPA

+

+
+

= 0x00000010

+

+
+

device supports WPA1 authentication

+

+
 
+

NM_WIFI_DEVICE_CAP_RSN

+

+
+

= 0x00000020

+

+
+

device supports WPA2/RSN authentication

+

+
 
+

NM_WIFI_DEVICE_CAP_AP

+

+
+

= 0x00000040

+

+
+

device supports Access Point mode

+

+
 
+

NM_WIFI_DEVICE_CAP_ADHOC

+

+
+

= 0x00000080

+

+
+

device supports Ad-Hoc mode

+

+
 
+

NM_WIFI_DEVICE_CAP_FREQ_VALID

+

+
+

= 0x00000100

+

+
+

device reports frequency capabilities

+

+
 
+

NM_WIFI_DEVICE_CAP_FREQ_2GHZ

+

+
+

= 0x00000200

+

+
+

device supports 2.4GHz frequencies

+

+
 
+

NM_WIFI_DEVICE_CAP_FREQ_5GHZ

+

+
+

= 0x00000400

+

+
+

device supports 5GHz frequencies

+

+
 
+
+
+
+
+

enum NM80211ApFlags

+

802.11 access point flags.

+

+
+

Values

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

NM_802_11_AP_FLAGS_NONE

+

+
+

= 0x00000000

+

+
+

access point has no special capabilities

+

+
 
+

NM_802_11_AP_FLAGS_PRIVACY

+

+
+

= 0x00000001

+

+
+

access point requires authentication and encryption (usually means WEP)

+

+
 
+
+
+
+
+

enum NM80211ApSecurityFlags

+

802.11 access point security and authentication flags. These flags describe the current security requirements of an access point as determined from the access point's beacon.

+

+
+

Values

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

NM_802_11_AP_SEC_NONE

+

+
+

= 0x00000000

+

+
+

the access point has no special security requirements

+

+
 
+

NM_802_11_AP_SEC_PAIR_WEP40

+

+
+

= 0x00000001

+

+
+

40/64-bit WEP is supported for pairwise/unicast encryption

+

+
 
+

NM_802_11_AP_SEC_PAIR_WEP104

+

+
+

= 0x00000002

+

+
+

104/128-bit WEP is supported for pairwise/unicast encryption

+

+
 
+

NM_802_11_AP_SEC_PAIR_TKIP

+

+
+

= 0x00000004

+

+
+

TKIP is supported for pairwise/unicast encryption

+

+
 
+

NM_802_11_AP_SEC_PAIR_CCMP

+

+
+

= 0x00000008

+

+
+

AES/CCMP is supported for pairwise/unicast encryption

+

+
 
+

NM_802_11_AP_SEC_GROUP_WEP40

+

+
+

= 0x00000010

+

+
+

40/64-bit WEP is supported for group/broadcast encryption

+

+
 
+

NM_802_11_AP_SEC_GROUP_WEP104

+

+
+

= 0x00000020

+

+
+

104/128-bit WEP is supported for group/broadcast encryption

+

+
 
+

NM_802_11_AP_SEC_GROUP_TKIP

+

+
+

= 0x00000040

+

+
+

TKIP is supported for group/broadcast encryption

+

+
 
+

NM_802_11_AP_SEC_GROUP_CCMP

+

+
+

= 0x00000080

+

+
+

AES/CCMP is supported for group/broadcast encryption

+

+
 
+

NM_802_11_AP_SEC_KEY_MGMT_PSK

+

+
+

= 0x00000100

+

+
+

WPA/RSN Pre-Shared Key encryption is supported

+

+
 
+

NM_802_11_AP_SEC_KEY_MGMT_802_1X

+

+
+

= 0x00000200

+

+
+

802.1x authentication and key management is supported

+

+
 
+
+
+
+
+

enum NM80211Mode

+

Indicates the 802.11 mode an access point or device is currently in.

+

+
+

Values

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

NM_802_11_MODE_UNKNOWN

+

+
+

= 0

+

+
+

the device or access point mode is unknown

+

+
 
+

NM_802_11_MODE_ADHOC

+

+
+

= 1

+

+
+

for both devices and access point objects, indicates the object is part of an Ad-Hoc 802.11 network without a central coordinating access point.

+

+
 
+

NM_802_11_MODE_INFRA

+

+
+

= 2

+

+
+

the device or access point is in infrastructure mode. For devices, this indicates the device is an 802.11 client/station. For access point objects, this indicates the object is an access point that provides connectivity to clients.

+

+
 
+

NM_802_11_MODE_AP

+

+
+

= 3

+

+
+

the device is an access point/hotspot. Not valid for access point objects; used only for hotspot mode on the local machine.

+

+
 
+
+
+
+
+

enum NMBluetoothCapabilities

+

NMBluetoothCapabilities values indicate the usable capabilities of a Bluetooth device.

+

+
+

Values

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

NM_BT_CAPABILITY_NONE

+

+
+

= 0x00000000

+

+
+

device has no usable capabilities

+

+
 
+

NM_BT_CAPABILITY_DUN

+

+
+

= 0x00000001

+

+
+

device provides Dial-Up Networking capability

+

+
 
+

NM_BT_CAPABILITY_NAP

+

+
+

= 0x00000002

+

+
+

device provides Network Access Point capability

+

+
 
+
+
+
+
+

enum NMDeviceModemCapabilities

+

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

+

+
+

Values

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

NM_DEVICE_MODEM_CAPABILITY_NONE

+

+
+

= 0x00000000

+

+
+

modem has no usable capabilities

+

+
 
+

NM_DEVICE_MODEM_CAPABILITY_POTS

+

+
+

= 0x00000001

+

+
+

modem uses the analog wired telephone network and is not a wireless/cellular device

+

+
 
+

NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO

+

+
+

= 0x00000002

+

+
+

modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO revision A, or EVDO revision B

+

+
 
+

NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS

+

+
+

= 0x00000004

+

+
+

modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

+

+
 
+

NM_DEVICE_MODEM_CAPABILITY_LTE

+

+
+

= 0x00000008

+

+
+

modem has LTE data capability

+

+
 
+
+
+
+
+

enum NMWimaxNspNetworkType

+

WiMAX network type.

+

+
+

Values

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

NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

+

+
+

= 0

+

+
+

unknown network type

+

+
 
+

NM_WIMAX_NSP_NETWORK_TYPE_HOME

+

+
+

= 1

+

+
+

home network

+

+
 
+

NM_WIMAX_NSP_NETWORK_TYPE_PARTNER

+

+
+

= 2

+

+
+

partner network

+

+
 
+

NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER

+

+
+

= 3

+

+
+

roaming partner network

+

+
 
+
+
+
+
+

enum NMDeviceState

+

+
+

Values

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

NM_DEVICE_STATE_UNKNOWN

+

+
+

= 0

+

+
+

the device's state is unknown

+

+
 
+

NM_DEVICE_STATE_UNMANAGED

+

+
+

= 10

+

+
+

the device is recognized, but not managed by NetworkManager

+

+
 
+

NM_DEVICE_STATE_UNAVAILABLE

+

+
+

= 20

+

+
+

the device is managed by NetworkManager, but is not available for use. Reasons may include the wireless switched off, missing firmware, no ethernet carrier, missing supplicant or modem manager, etc.

+

+
 
+

NM_DEVICE_STATE_DISCONNECTED

+

+
+

= 30

+

+
+

the device can be activated, but is currently idle and not connected to a network.

+

+
 
+

NM_DEVICE_STATE_PREPARE

+

+
+

= 40

+

+
+

the device is preparing the connection to the network. This may include operations like changing the MAC address, setting physical link properties, and anything else required to connect to the requested network.

+

+
 
+

NM_DEVICE_STATE_CONFIG

+

+
+

= 50

+

+
+

the device is connecting to the requested network. This may include operations like associating with the WiFi AP, dialing the modem, connecting to the remote Bluetooth device, etc.

+

+
 
+

NM_DEVICE_STATE_NEED_AUTH

+

+
+

= 60

+

+
+

the device requires more information to continue connecting to the requested network. This includes secrets like WiFi passphrases, login passwords, PIN codes, etc.

+

+
 
+

NM_DEVICE_STATE_IP_CONFIG

+

+
+

= 70

+

+
+

the device is requesting IPv4 and/or IPv6 addresses and routing information from the network.

+

+
 
+

NM_DEVICE_STATE_IP_CHECK

+

+
+

= 80

+

+
+

the device is checking whether further action is required for the requested network connection. This may include checking whether only local network access is available, whether a captive portal is blocking access to the Internet, etc.

+

+
 
+

NM_DEVICE_STATE_SECONDARIES

+

+
+

= 90

+

+
+

the device is waiting for a secondary connection (like a VPN) which must activated before the device can be activated

+

+
 
+

NM_DEVICE_STATE_ACTIVATED

+

+
+

= 100

+

+
+

the device has a network connection, either local or global.

+

+
 
+

NM_DEVICE_STATE_DEACTIVATING

+

+
+

= 110

+

+
+

a disconnection from the current network connection was requested, and the device is cleaning up resources used for that connection. The network connection may still be valid.

+

+
 
+

NM_DEVICE_STATE_FAILED

+

+
+

= 120

+

+
+

the device failed to connect to the requested network and is cleaning up the connection request

+

+
 
+
+
+
+
+

enum NMDeviceStateReason

+

Device state change reason codes

+

+
+

Values

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

NM_DEVICE_STATE_REASON_NONE

+

+
+

= 0

+

+
+

No reason given

+

+
 
+

NM_DEVICE_STATE_REASON_UNKNOWN

+

+
+

= 1

+

+
+

Unknown error

+

+
 
+

NM_DEVICE_STATE_REASON_NOW_MANAGED

+

+
+

= 2

+

+
+

Device is now managed

+

+
 
+

NM_DEVICE_STATE_REASON_NOW_UNMANAGED

+

+
+

= 3

+

+
+

Device is now unmanaged

+

+
 
+

NM_DEVICE_STATE_REASON_CONFIG_FAILED

+

+
+

= 4

+

+
+

The device could not be readied for configuration

+

+
 
+

NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE

+

+
+

= 5

+

+
+

IP configuration could not be reserved (no available address, timeout, etc)

+

+
 
+

NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED

+

+
+

= 6

+

+
+

The IP config is no longer valid

+

+
 
+

NM_DEVICE_STATE_REASON_NO_SECRETS

+

+
+

= 7

+

+
+

Secrets were required, but not provided

+

+
 
+

NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT

+

+
+

= 8

+

+
+

802.1x supplicant disconnected

+

+
 
+

NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED

+

+
+

= 9

+

+
+

802.1x supplicant configuration failed

+

+
 
+

NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED

+

+
+

= 10

+

+
+

802.1x supplicant failed

+

+
 
+

NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT

+

+
+

= 11

+

+
+

802.1x supplicant took too long to authenticate

+

+
 
+

NM_DEVICE_STATE_REASON_PPP_START_FAILED

+

+
+

= 12

+

+
+

PPP service failed to start

+

+
 
+

NM_DEVICE_STATE_REASON_PPP_DISCONNECT

+

+
+

= 13

+

+
+

PPP service disconnected

+

+
 
+

NM_DEVICE_STATE_REASON_PPP_FAILED

+

+
+

= 14

+

+
+

PPP failed

+

+
 
+

NM_DEVICE_STATE_REASON_DHCP_START_FAILED

+

+
+

= 15

+

+
+

DHCP client failed to start

+

+
 
+

NM_DEVICE_STATE_REASON_DHCP_ERROR

+

+
+

= 16

+

+
+

DHCP client error

+

+
 
+

NM_DEVICE_STATE_REASON_DHCP_FAILED

+

+
+

= 17

+

+
+

DHCP client failed

+

+
 
+

NM_DEVICE_STATE_REASON_SHARED_START_FAILED

+

+
+

= 18

+

+
+

Shared connection service failed to start

+

+
 
+

NM_DEVICE_STATE_REASON_SHARED_FAILED

+

+
+

= 19

+

+
+

Shared connection service failed

+

+
 
+

NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED

+

+
+

= 20

+

+
+

AutoIP service failed to start

+

+
 
+

NM_DEVICE_STATE_REASON_AUTOIP_ERROR

+

+
+

= 21

+

+
+

AutoIP service error

+

+
 
+

NM_DEVICE_STATE_REASON_AUTOIP_FAILED

+

+
+

= 22

+

+
+

AutoIP service failed

+

+
 
+

NM_DEVICE_STATE_REASON_MODEM_BUSY

+

+
+

= 23

+

+
+

The line is busy

+

+
 
+

NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE

+

+
+

= 24

+

+
+

No dial tone

+

+
 
+

NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER

+

+
+

= 25

+

+
+

No carrier could be established

+

+
 
+

NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT

+

+
+

= 26

+

+
+

The dialing request timed out

+

+
 
+

NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED

+

+
+

= 27

+

+
+

The dialing attempt failed

+

+
 
+

NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED

+

+
+

= 28

+

+
+

Modem initialization failed

+

+
 
+

NM_DEVICE_STATE_REASON_GSM_APN_FAILED

+

+
+

= 29

+

+
+

Failed to select the specified APN

+

+
 
+

NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING

+

+
+

= 30

+

+
+

Not searching for networks

+

+
 
+

NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED

+

+
+

= 31

+

+
+

Network registration denied

+

+
 
+

NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT

+

+
+

= 32

+

+
+

Network registration timed out

+

+
 
+

NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED

+

+
+

= 33

+

+
+

Failed to register with the requested network

+

+
 
+

NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED

+

+
+

= 34

+

+
+

PIN check failed

+

+
 
+

NM_DEVICE_STATE_REASON_FIRMWARE_MISSING

+

+
+

= 35

+

+
+

Necessary firmware for the device may be missing

+

+
 
+

NM_DEVICE_STATE_REASON_REMOVED

+

+
+

= 36

+

+
+

The device was removed

+

+
 
+

NM_DEVICE_STATE_REASON_SLEEPING

+

+
+

= 37

+

+
+

NetworkManager went to sleep

+

+
 
+

NM_DEVICE_STATE_REASON_CONNECTION_REMOVED

+

+
+

= 38

+

+
+

The device's active connection disappeared

+

+
 
+

NM_DEVICE_STATE_REASON_USER_REQUESTED

+

+
+

= 39

+

+
+

Device disconnected by user or client

+

+
 
+

NM_DEVICE_STATE_REASON_CARRIER

+

+
+

= 40

+

+
+

Carrier/link changed

+

+
 
+

NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED

+

+
+

= 41

+

+
+

The device's existing connection was assumed

+

+
 
+

NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE

+

+
+

= 42

+

+
+

The supplicant is now available

+

+
 
+

NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND

+

+
+

= 43

+

+
+

The modem could not be found

+

+
 
+

NM_DEVICE_STATE_REASON_BT_FAILED

+

+
+

= 44

+

+
+

The Bluetooth connection failed or timed out

+

+
 
+

NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED

+

+
+

= 45

+

+
+

GSM Modem's SIM Card not inserted

+

+
 
+

NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED

+

+
+

= 46

+

+
+

GSM Modem's SIM Pin required

+

+
 
+

NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED

+

+
+

= 47

+

+
+

GSM Modem's SIM Puk required

+

+
 
+

NM_DEVICE_STATE_REASON_GSM_SIM_WRONG

+

+
+

= 48

+

+
+

GSM Modem's SIM wrong

+

+
 
+

NM_DEVICE_STATE_REASON_INFINIBAND_MODE

+

+
+

= 49

+

+
+

InfiniBand device does not support connected mode

+

+
 
+

NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED

+

+
+

= 50

+

+
+

A dependency of the connection failed

+

+
 
+

NM_DEVICE_STATE_REASON_BR2684_FAILED

+

+
+

= 51

+

+
+

Problem with the RFC 2684 Ethernet over ADSL bridge

+

+
 
+

NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE

+

+
+

= 52

+

+
+

ModemManager not running

+

+
 
+

NM_DEVICE_STATE_REASON_SSID_NOT_FOUND

+

+
+

= 53

+

+
+

The WiFi network could not be found

+

+
 
+

NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED

+

+
+

= 54

+

+
+

A secondary connection of the base connection failed

+

+
 
+

NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED

+

+
+

= 55

+

+
+

DCB or FCoE setup failed

+

+
 
+

NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED

+

+
+

= 56

+

+
+

teamd control failed

+

+
 
+

NM_DEVICE_STATE_REASON_MODEM_FAILED

+

+
+

= 57

+

+
+

Modem failed or no longer available

+

+
 
+

NM_DEVICE_STATE_REASON_MODEM_AVAILABLE

+

+
+

= 58

+

+
+

Modem now ready and available

+

+
 
+

NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT

+

+
+

= 59

+

+
+

SIM PIN was incorrect

+

+
 
+

NM_DEVICE_STATE_REASON_NEW_ACTIVATION

+

+
+

= 60

+

+
+

New connection activation was enqueued

+

+
 
+

NM_DEVICE_STATE_REASON_PARENT_CHANGED

+

+
+

= 61

+

+
+

the device's parent changed

+

+
 
+

NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED

+

+
+

= 62

+

+
+

the device parent's management changed

+

+
 
+
+
+
+
+

enum NMMetered

+

Since: 1.2

+

+
+

Values

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

NM_METERED_UNKNOWN

+

+
+

= 0

+

+
+

The metered status is unknown

+

+
 
+

NM_METERED_YES

+

+
+

= 1

+

+
+

Metered, the value was statically set

+

+
 
+

NM_METERED_NO

+

+
+

= 2

+

+
+

Not metered, the value was statically set

+

+
 
+

NM_METERED_GUESS_YES

+

+
+

= 3

+

+
+

Metered, the value was guessed

+

+
 
+

NM_METERED_GUESS_NO

+

+
+

= 4

+

+
+

Not metered, the value was guessed

+

+
 
+
+
+
+
+

enum NMActiveConnectionState

+

NMActiveConnectionState values indicate the state of a connection to a specific network while it is starting, connected, or disconnecting from that network.

+

+
+

Values

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

NM_ACTIVE_CONNECTION_STATE_UNKNOWN

+

+
+

= 0

+

+
+

the state of the connection is unknown

+

+
 
+

NM_ACTIVE_CONNECTION_STATE_ACTIVATING

+

+
+

= 1

+

+
+

a network connection is being prepared

+

+
 
+

NM_ACTIVE_CONNECTION_STATE_ACTIVATED

+

+
+

= 2

+

+
+

there is a connection to the network

+

+
 
+

NM_ACTIVE_CONNECTION_STATE_DEACTIVATING

+

+
+

= 3

+

+
+

the network connection is being torn down and cleaned up

+

+
 
+

NM_ACTIVE_CONNECTION_STATE_DEACTIVATED

+

+
+

= 4

+

+
+

the network connection is disconnected and will be removed

+

+
 
+
+
+
+
+

enum NMSecretAgentGetSecretsFlags

+

NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.

+

+
+

Values

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

NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE

+

+
+

= 0x0

+

+
+

no special behavior; by default no user interaction is allowed and requests for secrets are fulfilled from persistent storage, or if no secrets are available an error is returned.

+

+
 
+

NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION

+

+
+

= 0x1

+

+
+

allows the request to interact with the user, possibly prompting via UI for secrets if any are required, or if none are found in persistent storage.

+

+
 
+

NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW

+

+
+

= 0x2

+

+
+

explicitly prompt for new secrets from the user. This flag signals that NetworkManager thinks any existing secrets are invalid or wrong. This flag implies that interaction is allowed.

+

+
 
+

NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED

+

+
+

= 0x4

+

+
+

set if the request was initiated by user-requested action via the D-Bus interface, as opposed to automatically initiated by NetworkManager in response to (for example) scan results or carrier changes.

+

+
 
+

NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM

+

+
+

= 0x80000000

+

+
+

Internal flag, not part of the D-Bus API.

+

+
 
+

NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS

+

+
+

= 0x40000000

+

+
+

Internal flag, not part of the D-Bus API.

+

+
 
+
+
+
+
+

enum NMSecretAgentCapabilities

+

NMSecretAgentCapabilities indicate various capabilities of the agent.

+

+
+

Values

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

NM_SECRET_AGENT_CAPABILITY_NONE

+

+
+

= 0x0

+

+
+

the agent supports no special capabilities

+

+
 
+

NM_SECRET_AGENT_CAPABILITY_VPN_HINTS

+

+
+

= 0x1

+

+
+

the agent supports passing hints to VPN plugin authentication dialogs.

+

+
 
+
+
+
+
+

enum NMIPTunnelMode

+

The tunneling mode.

+

Since: 1.2

+

+
+

Values

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

NM_IP_TUNNEL_MODE_UNKNOWN

+

+
+

= 0

+

+
+

Unknown/unset tunnel mode

+

+
 
+

NM_IP_TUNNEL_MODE_IPIP

+

+
+

= 1

+

+
+

IP in IP tunnel

+

+
 
+

NM_IP_TUNNEL_MODE_GRE

+

+
+

= 2

+

+
+

GRE tunnel

+

+
 
+

NM_IP_TUNNEL_MODE_SIT

+

+
+

= 3

+

+
+

SIT tunnel

+

+
 
+

NM_IP_TUNNEL_MODE_ISATAP

+

+
+

= 4

+

+
+

ISATAP tunnel

+

+
 
+

NM_IP_TUNNEL_MODE_VTI

+

+
+

= 5

+

+
+

VTI tunnel

+

+
 
+

NM_IP_TUNNEL_MODE_IP6IP6

+

+
+

= 6

+

+
+

IPv6 in IPv6 tunnel

+

+
 
+

NM_IP_TUNNEL_MODE_IPIP6

+

+
+

= 7

+

+
+

IPv4 in IPv6 tunnel

+

+
 
+

NM_IP_TUNNEL_MODE_IP6GRE

+

+
+

= 8

+

+
+

IPv6 GRE tunnel

+

+
 
+

NM_IP_TUNNEL_MODE_VTI6

+

+
+

= 9

+

+
+

IPv6 VTI tunnel

+

+
 
+
+
+
+ + + \ No newline at end of file diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html index 9077d8e3..b677ece9 100644 --- a/docs/api/html/nm-settings.html +++ b/docs/api/html/nm-settings.html @@ -1216,7 +1216,7 @@ addr-gen-mode int32 1 -Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", "stable-privacy" or unset. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option. +Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option. address-data diff --git a/docs/api/html/nm-vpn-dbus-types.html b/docs/api/html/nm-vpn-dbus-types.html new file mode 100644 index 00000000..8e1ac031 --- /dev/null +++ b/docs/api/html/nm-vpn-dbus-types.html @@ -0,0 +1,560 @@ + + + + +VPN Plugin D-Bus API Types: NetworkManager Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

VPN Plugin D-Bus API Types

+

VPN Plugin D-Bus API Types

+
+
+

enum NMVpnServiceState

+

VPN daemon states

+

+
+

Values

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

NM_VPN_SERVICE_STATE_UNKNOWN

+

+
+

= 0

+

+
+

The state of the VPN plugin is unknown.

+

+
 
+

NM_VPN_SERVICE_STATE_INIT

+

+
+

= 1

+

+
+

The VPN plugin is initialized.

+

+
 
+

NM_VPN_SERVICE_STATE_SHUTDOWN

+

+
+

= 2

+

+
+

Not used.

+

+
 
+

NM_VPN_SERVICE_STATE_STARTING

+

+
+

= 3

+

+
+

The plugin is attempting to connect to a VPN server.

+

+
 
+

NM_VPN_SERVICE_STATE_STARTED

+

+
+

= 4

+

+
+

The plugin has connected to a VPN server.

+

+
 
+

NM_VPN_SERVICE_STATE_STOPPING

+

+
+

= 5

+

+
+

The plugin is disconnecting from the VPN server.

+

+
 
+

NM_VPN_SERVICE_STATE_STOPPED

+

+
+

= 6

+

+
+

The plugin has disconnected from the VPN server.

+

+
 
+
+
+
+
+

enum NMVpnConnectionState

+

VPN connection states

+

+
+

Values

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

NM_VPN_CONNECTION_STATE_UNKNOWN

+

+
+

= 0

+

+
+

The state of the VPN connection is unknown.

+

+
 
+

NM_VPN_CONNECTION_STATE_PREPARE

+

+
+

= 1

+

+
+

The VPN connection is preparing to connect.

+

+
 
+

NM_VPN_CONNECTION_STATE_NEED_AUTH

+

+
+

= 2

+

+
+

The VPN connection needs authorization credentials.

+

+
 
+

NM_VPN_CONNECTION_STATE_CONNECT

+

+
+

= 3

+

+
+

The VPN connection is being established.

+

+
 
+

NM_VPN_CONNECTION_STATE_IP_CONFIG_GET

+

+
+

= 4

+

+
+

The VPN connection is getting an IP address.

+

+
 
+

NM_VPN_CONNECTION_STATE_ACTIVATED

+

+
+

= 5

+

+
+

The VPN connection is active.

+

+
 
+

NM_VPN_CONNECTION_STATE_FAILED

+

+
+

= 6

+

+
+

The VPN connection failed.

+

+
 
+

NM_VPN_CONNECTION_STATE_DISCONNECTED

+

+
+

= 7

+

+
+

The VPN connection is disconnected.

+

+
 
+
+
+
+
+

enum NMVpnConnectionStateReason

+

VPN connection state reasons

+

+
+

Values

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

NM_VPN_CONNECTION_STATE_REASON_UNKNOWN

+

+
+

= 0

+

+
+

The reason for the VPN connection state change is unknown.

+

+
 
+

NM_VPN_CONNECTION_STATE_REASON_NONE

+

+
+

= 1

+

+
+

No reason was given for the VPN connection state change.

+

+
 
+

NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED

+

+
+

= 2

+

+
+

The VPN connection changed state because the user disconnected it.

+

+
 
+

NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED

+

+
+

= 3

+

+
+

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

+

+
 
+

NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED

+

+
+

= 4

+

+
+

The service providing the VPN connection was stopped.

+

+
 
+

NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID

+

+
+

= 5

+

+
+

The IP config of the VPN connection was invalid.

+

+
 
+

NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT

+

+
+

= 6

+

+
+

The connection attempt to the VPN service timed out.

+

+
 
+

NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT

+

+
+

= 7

+

+
+

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

+

+
 
+

NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED

+

+
+

= 8

+

+
+

Starting the service starting the service providing the VPN connection failed.

+

+
 
+

NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS

+

+
+

= 9

+

+
+

Necessary secrets for the VPN connection were not provided.

+

+
 
+

NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED

+

+
+

= 10

+

+
+

Authentication to the VPN server failed.

+

+
 
+

NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED

+

+
+

= 11

+

+
+

The connection was deleted from settings.

+

+
 
+
+
+
+
+

enum NMVpnPluginFailure

+

VPN plugin failure reasons

+

+
+

Values

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

NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED

+

+
+

= 1

+

+
+

Login failed.

+

+
 
+

NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED

+

+
+

= 2

+

+
+

Connect failed.

+

+
 
+

NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG

+

+
+

= 3

+

+
+

Invalid IP configuration returned from the VPN plugin.

+

+
 
+
+
+
+ + + \ No newline at end of file diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html index 91d1e2b5..d66bcb34 100644 --- a/docs/api/html/nmcli.html +++ b/docs/api/html/nmcli.html @@ -136,13 +136,6 @@ -

-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 @@ -2073,11 +2066,6 @@

NetworkManager is not running.

-

9

-

nmcli and NetworkManager - versions mismatch.

- -

10

Connection, device, or access point does not exist.

diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index e66100c7..ab610728 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -6,7 +6,7 @@ - + @@ -16,7 +16,7 @@ Home -Prev +Prev Next
@@ -1172,7 +1172,7 @@
addr-gen-mode
int32
1
-Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", "stable-privacy" or unset. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option. +Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.
address-data
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html index 8259f088..641e217c 100644 --- a/docs/api/html/spec.html +++ b/docs/api/html/spec.html @@ -125,6 +125,15 @@ org.freedesktop.NetworkManager.SecretAgent
+
Types
+
+
+NetworkManager D-Bus API Types +
+
+VPN Plugin D-Bus API Types +
+

This part documents the D-Bus interface used to access the diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml index ff1cb82d..722e33fd 100644 --- a/docs/api/network-manager-docs.xml +++ b/docs/api/network-manager-docs.xml @@ -99,6 +99,11 @@ +

+ Types + + +
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml index 9814af91..8bcbf25e 100644 --- a/docs/api/settings-spec.xml +++ b/docs/api/settings-spec.xml @@ -171,7 +171,7 @@ routesarray of array of uint32[]Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'. Array of IPv4 route structures. Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. If the metric is 0, NM will choose an appropriate default metric for the device. (There is no way to explicitly specify an actual metric of 0 with this property.) ipv6 settingKey NameValue TypeDefault ValueValue Description - addr-gen-modeint321Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", "stable-privacy" or unset. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option. + addr-gen-modeint321Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.address-dataarray of vardictArray of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.addressesarray of legacy IPv6 address struct (a(ayuay))[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'. Array of IPv6 address structures. Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.dad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds). A value greater than zero is a timeout in milliseconds. diff --git a/docs/api/version.xml b/docs/api/version.xml index 26aaba0e..23aa8390 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -1.2.0 +1.2.2 diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index 33e38b22..f1594682 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -15,7 +15,7 @@

- for libnm-glib 1.2.0 + for libnm-glib 1.2.2 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm-glib/stable/. diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml index 26aaba0e..23aa8390 100644 --- a/docs/libnm-glib/version.xml +++ b/docs/libnm-glib/version.xml @@ -1 +1 @@ -1.2.0 +1.2.2 diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html index 7572c017..6fbcc515 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -598,7 +598,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMConnectionError
     GObject
     ╰── NMConnection
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 3ce89683..83dc3b25 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -271,7 +271,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingCompareFlags
     ├── NMSettingDiffResult
     ├── NMSettingError
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index 05d9516c..c36eaff5 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -923,7 +923,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSetting8021xCKFormat
     ├── NMSetting8021xCKScheme
     ╰── NMSetting8021xError
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
index 165177b5..a1ecee9b 100644
--- a/docs/libnm-util/html/NMSettingAdsl.html
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -236,7 +236,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingAdslError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index b011f98f..885a378b 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -139,7 +139,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingBluetoothError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index 8d0e4d48..ac2fdc8e 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -244,7 +244,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingBondError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
index 71cdd58f..6eb6900c 100644
--- a/docs/libnm-util/html/NMSettingBridge.html
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -233,7 +233,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingBridgeError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
index bc204181..53126856 100644
--- a/docs/libnm-util/html/NMSettingBridgePort.html
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -148,7 +148,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingBridgePortError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index 43980d9d..c96324ad 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -165,7 +165,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingCdmaError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index ba73eb00..db0dc6ed 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -403,7 +403,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingConnectionError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingDcb.html b/docs/libnm-util/html/NMSettingDcb.html
index 5cd1cd53..fd94edf0 100644
--- a/docs/libnm-util/html/NMSettingDcb.html
+++ b/docs/libnm-util/html/NMSettingDcb.html
@@ -418,7 +418,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingDcbError
     ╰── NMSettingDcbFlags
     GObject
diff --git a/docs/libnm-util/html/NMSettingGeneric.html b/docs/libnm-util/html/NMSettingGeneric.html
index b6cc9066..18fbdb85 100644
--- a/docs/libnm-util/html/NMSettingGeneric.html
+++ b/docs/libnm-util/html/NMSettingGeneric.html
@@ -84,7 +84,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingGenericError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index 1e725b02..4a1d9629 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -296,7 +296,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingGsmError
     ├── NMSettingGsmNetworkBand
     ╰── NMSettingGsmNetworkType
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index b14b4721..d48a7338 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -710,10 +710,10 @@
 

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ├── NMIP4Address
     ╰── NMIP4Route
-    GEnum
+    GEnum
     ╰── NMSettingIP4ConfigError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index eb42de11..76fd5ef4 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -677,10 +677,10 @@
 

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ├── NMIP6Address
     ╰── NMIP6Route
-    GEnum
+    GEnum
     ├── NMSettingIP6ConfigError
     ╰── NMSettingIP6ConfigPrivacy
     GObject
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index 82db623e..de8975e2 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -182,7 +182,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingInfinibandError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index d9a5d1d0..fbcb946d 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -148,7 +148,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingOlpcMeshError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index c66bd595..543868a4 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -404,7 +404,7 @@ that require PPP to deliver IP capability

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingPPPError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index c7abaffe..0d2355a7 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -165,7 +165,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingPPPOEError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 43c21e9e..b371e910 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -183,7 +183,7 @@ serial communications

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingSerialError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingTeam.html b/docs/libnm-util/html/NMSettingTeam.html
index 2e40a312..846f6179 100644
--- a/docs/libnm-util/html/NMSettingTeam.html
+++ b/docs/libnm-util/html/NMSettingTeam.html
@@ -131,7 +131,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingTeamError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingTeamPort.html b/docs/libnm-util/html/NMSettingTeamPort.html
index c08a4eb0..37a4495b 100644
--- a/docs/libnm-util/html/NMSettingTeamPort.html
+++ b/docs/libnm-util/html/NMSettingTeamPort.html
@@ -112,7 +112,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingTeamPortError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index e3243206..884fbf32 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -256,7 +256,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingVpnError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index df603abd..9f003de2 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -261,7 +261,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingVlanError
     ├── NMVlanFlags
     ╰── NMVlanPriorityMap
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index 26544076..242b8222 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -131,7 +131,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWimaxError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index 75184b1b..9a6619aa 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -369,7 +369,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWiredError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 1db2d508..9aab30bc 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -435,7 +435,7 @@
 

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWirelessError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index d091dda2..36b60f5f 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -498,7 +498,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingWirelessSecurityError
     ╰── NMWepKeyType
     GObject
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 974ce75b..d7a5b342 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,7 +15,7 @@
 

- for libnm-util 1.2.0 + for libnm-util 1.2.2 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm-util/stable/. diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html index 9507d0ab..350ba973 100644 --- a/docs/libnm-util/html/libnm-util-nm-utils.html +++ b/docs/libnm-util/html/libnm-util-nm-utils.html @@ -480,7 +480,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMUtilsSecurityType
 
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html index 9c2eaa40..4c668702 100644 --- a/docs/libnm-util/html/object-tree.html +++ b/docs/libnm-util/html/object-tree.html @@ -52,7 +52,7 @@ │ ├── NMSettingWirelessSecurity │ ╰── NMSettingVPN ╰── NMConnection - GEnum + GEnum ├── NMConnectionError ├── NMSetting8021xCKFormat ├── NMSetting8021xCKScheme @@ -95,7 +95,7 @@ ├── NMVlanFlags ├── NMVlanPriorityMap ╰── NMWepKeyType - GBoxed + GBoxed ├── NMIP4Address ├── NMIP4Route ├── NMIP6Address diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml index 26aaba0e..23aa8390 100644 --- a/docs/libnm-util/version.xml +++ b/docs/libnm-util/version.xml @@ -1 +1 @@ -1.2.0 +1.2.2 diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index 13175232..f3f0cf7e 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -38,7 +38,6 @@ IGNORE_HFILES= \ crypto.h \ nm-dbus-helpers.h \ nm-core-internal.h \ - nm-core-types.h \ nm-core-types-internal.h \ nm-device-private.h \ nm-dhcp4-config.h \ @@ -52,7 +51,6 @@ IGNORE_HFILES= \ nm-remote-connection-private.h \ nm-remote-settings.h \ nm-setting-private.h \ - nm-types.h \ nm-utils-private.h \ nm-core-tests-enum-types.h \ nm-keyfile-internal.h \ diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in index 8006dc17..74eaa53f 100644 --- a/docs/libnm/Makefile.in +++ b/docs/libnm/Makefile.in @@ -441,7 +441,6 @@ IGNORE_HFILES = \ crypto.h \ nm-dbus-helpers.h \ nm-core-internal.h \ - nm-core-types.h \ nm-core-types-internal.h \ nm-device-private.h \ nm-dhcp4-config.h \ @@ -455,7 +454,6 @@ IGNORE_HFILES = \ nm-remote-connection-private.h \ nm-remote-settings.h \ nm-setting-private.h \ - nm-types.h \ nm-utils-private.h \ nm-core-tests-enum-types.h \ nm-keyfile-internal.h \ diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html index 2fbd6507..56a6c893 100644 --- a/docs/libnm/html/NMAccessPoint.html +++ b/docs/libnm/html/NMAccessPoint.html @@ -16,7 +16,8 @@ Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home @@ -261,6 +262,10 @@ #define NM_ACCESS_POINT_HW_ADDRESS + +  +NMAccessPoint +
@@ -272,6 +277,12 @@
+

Implemented Interfaces

+

+NMAccessPoint implements + GInitable and GAsyncInitable.

+
+

Description

@@ -282,7 +293,7 @@ nm_access_point_get_flags (NMAccessPoint *ap);

Gets the flags of the access point.

-

Parameters

+

Parameters

@@ -297,7 +308,7 @@ nm_access_point_get_flags ( -

Returns

+

Returns

the flags

@@ -308,7 +319,7 @@ nm_access_point_get_flags (NMAccessPoint *ap);

Gets the WPA (version 1) flags of the access point.

-

Parameters

+

Parameters

@@ -323,7 +334,7 @@ nm_access_point_get_wpa_flags (
-

Returns

+

Returns

the WPA flags

@@ -335,7 +346,7 @@ nm_access_point_get_rsn_flags (Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access point.

-

Parameters

+

Parameters

@@ -350,7 +361,7 @@ point.

-

Returns

+

Returns

the RSN flags

@@ -361,7 +372,7 @@ point.

nm_access_point_get_ssid (NMAccessPoint *ap);

Gets the SSID of the access point.

-

Parameters

+

Parameters

@@ -376,7 +387,7 @@ nm_access_point_get_ssid ( -

Returns

+

Returns

the GBytes containing the SSID, or NULL if the SSID is unknown.

[transfer none]

@@ -389,7 +400,7 @@ SSID is unknown.

nm_access_point_get_bssid (NMAccessPoint *ap);

Gets the Basic Service Set ID (BSSID) of the Wi-Fi access point.

-

Parameters

+

Parameters

@@ -404,7 +415,7 @@ nm_access_point_get_bssid ( -

Returns

+

Returns

the BSSID of the access point. This is an internal string and must not be modified or freed.

@@ -416,7 +427,7 @@ not be modified or freed.

nm_access_point_get_frequency (NMAccessPoint *ap);

Gets the frequency of the access point.

-

Parameters

+

Parameters

@@ -431,7 +442,7 @@ nm_access_point_get_frequency (
-

Returns

+

Returns

the frequency

@@ -442,7 +453,7 @@ nm_access_point_get_frequency (NMAccessPoint *ap);

Gets the mode of the access point.

-

Parameters

+

Parameters

@@ -457,7 +468,7 @@ nm_access_point_get_mode ( -

Returns

+

Returns

the mode

@@ -468,7 +479,7 @@ nm_access_point_get_mode (NMAccessPoint *ap);

Gets the maximum bit rate of the access point in kbit/s.

-

Parameters

+

Parameters

@@ -483,7 +494,7 @@ nm_access_point_get_max_bitrate (
-

Returns

+

Returns

the maximum bit rate (kbit/s)

@@ -494,7 +505,7 @@ nm_access_point_get_max_bitrate (NMAccessPoint *ap);

Gets the current signal strength of the access point.

-

Parameters

+

Parameters

@@ -509,7 +520,7 @@ nm_access_point_get_strength ( -

Returns

+

Returns

the signal strength

@@ -522,7 +533,7 @@ nm_access_point_get_last_seen (
-

Parameters

+

Parameters

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

-

Returns

+

Returns

the last seen time in seconds

Since: 1.2

@@ -558,7 +569,7 @@ use NMDevice using nm_device_filter_connections() and finally filter that list with this function.

-

Parameters

+

Parameters

@@ -573,7 +584,7 @@ with this function.

- @@ -581,9 +592,9 @@ filter.

connections

an array of NMConnections to +

an array of NMConnections to filter.

[element-type NMConnection]
-

Returns

+

Returns

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

[transfer container][element-type NMConnection]

@@ -594,14 +605,14 @@ be freed with g_ptr_array_unref() when it is no lo

nm_access_point_connection_valid ()

gboolean
 nm_access_point_connection_valid (NMAccessPoint *ap,
-                                  NMConnection *connection);
+ NMConnection *connection);

Validates a given connection against a given Wi-Fi access point to ensure that the connection may be activated with that AP. The connection must match the ap 's SSID, (if given) BSSID, and other attributes like security settings, channel, band, etc.

-

Parameters

+

Parameters

@@ -617,7 +628,7 @@ against

- @@ -625,7 +636,7 @@ against

connection

an NMConnection to validate against ap +

an NMConnection to validate against ap

 
-

Returns

+

Returns

TRUE if the connection may be activated with this Wi-Fi AP, FALSE if it cannot be.

@@ -698,6 +709,11 @@ against

#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
 
+
+
+

NMAccessPoint

+
typedef struct _NMAccessPoint NMAccessPoint;
+

Property Details

diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html index 55266de2..8ef75fb1 100644 --- a/docs/libnm/html/NMActiveConnection.html +++ b/docs/libnm/html/NMActiveConnection.html @@ -16,7 +16,8 @@ Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home @@ -325,6 +326,10 @@ #define NM_ACTIVE_CONNECTION_MASTER + +  +NMActiveConnection +
@@ -337,6 +342,12 @@
+

Implemented Interfaces

+

+NMActiveConnection implements + GInitable and GAsyncInitable.

+
+

Description

@@ -348,7 +359,7 @@ nm_active_connection_get_connection (Gets the NMRemoteConnection associated with connection .

-

Parameters

+

Parameters

@@ -363,7 +374,7 @@ nm_active_connection_get_connection (
-

Returns

+

Returns

the NMRemoteConnection which this NMActiveConnection is an active instance of.

[transfer none]

@@ -374,9 +385,9 @@ nm_active_connection_get_connection (

nm_active_connection_get_id ()

const char *
 nm_active_connection_get_id (NMActiveConnection *connection);
-

Gets the NMConnection's ID.

+

Gets the NMConnection's ID.

-

Parameters

+

Parameters

@@ -391,8 +402,8 @@ nm_active_connection_get_id ( -

Returns

-

the ID of the NMConnection that backs the NMActiveConnection. +

Returns

+

the ID of the NMConnection that backs the NMActiveConnection. This is the internal string used by the connection, and must not be modified.

@@ -401,9 +412,9 @@ This is the internal string used by the connection, and must not be modified.

nm_active_connection_get_uuid ()

const char *
 nm_active_connection_get_uuid (NMActiveConnection *connection);
-

Gets the NMConnection's UUID.

+

Gets the NMConnection's UUID.

-

Parameters

+

Parameters

@@ -418,8 +429,8 @@ nm_active_connection_get_uuid (
-

Returns

-

the UUID of the NMConnection that backs the NMActiveConnection. +

Returns

+

the UUID of the NMConnection that backs the NMActiveConnection. This is the internal string used by the connection, and must not be modified.

@@ -429,9 +440,9 @@ This is the internal string used by the connection, and must not be modified.

const char * nm_active_connection_get_connection_type (NMActiveConnection *connection); -

Gets the NMConnection's type.

+

Gets the NMConnection's type.

-

Parameters

+

Parameters

@@ -446,8 +457,8 @@ nm_active_connection_get_connection_type
-

Returns

-

the type of the NMConnection that backs the NMActiveConnection. +

Returns

+

the type of the NMConnection that backs the NMActiveConnection. This is the internal string used by the connection, and must not be modified.

@@ -465,7 +476,7 @@ is based on other information. (Eg, if connectionNMAccessPoint, and you can resolve it with nm_device_wifi_get_access_point_by_path().)

-

Parameters

+

Parameters

@@ -480,7 +491,7 @@ resolve it with -

Returns

+

Returns

the specific object's D-Bus path. This is the internal string used by the connection, and must not be modified.

@@ -492,7 +503,7 @@ by the connection, and must not be modified.

nm_active_connection_get_devices (NMActiveConnection *connection);

Gets the NMDevices used for the active connections.

-

Parameters

+

Parameters

@@ -507,7 +518,7 @@ nm_active_connection_get_devices (
-

Returns

+

Returns

the GPtrArray containing NMDevices. This is the internal copy used by the connection, and must not be modified.

[element-type NMDevice]

@@ -520,7 +531,7 @@ This is the internal copy used by the connection, and must not be modified.

nm_active_connection_get_state (NMActiveConnection *connection);

Gets the active connection's state.

-

Parameters

+

Parameters

@@ -535,7 +546,7 @@ nm_active_connection_get_state (
-

Returns

+

Returns

the state

@@ -546,7 +557,7 @@ nm_active_connection_get_state (NMActiveConnection *connection);

Gets the master NMDevice of the connection.

-

Parameters

+

Parameters

@@ -561,7 +572,7 @@ nm_active_connection_get_master (
-

Returns

+

Returns

the master NMDevice of the NMActiveConnection.

[transfer none]

@@ -574,7 +585,7 @@ nm_active_connection_get_default (Whether the active connection is the default IPv4 one (that is, is used for the default IPv4 route and DNS information).

-

Parameters

+

Parameters

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

-

Returns

+

Returns

TRUE if the active connection is the default IPv4 connection

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

nm_active_connection_get_ip4_config (NMActiveConnection *connection);

Gets the current IPv4 NMIPConfig associated with the NMActiveConnection.

-

Parameters

+

Parameters

@@ -615,7 +626,7 @@ nm_active_connection_get_ip4_config (
-

Returns

+

Returns

the IPv4 NMIPConfig, or NULL if the connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

[transfer none]

@@ -629,7 +640,7 @@ nm_active_connection_get_dhcp4_config (NMDhcpConfig (if any) associated with the NMActiveConnection.

-

Parameters

+

Parameters

@@ -644,7 +655,7 @@ nm_active_connection_get_dhcp4_config ( -

Returns

+

Returns

the IPv4 NMDhcpConfig, or NULL if the connection does not use DHCP, or is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

@@ -659,7 +670,7 @@ nm_active_connection_get_default6 (Whether the active connection is the default IPv6 one (that is, is used for the default IPv6 route and DNS information).

-

Parameters

+

Parameters

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

-

Returns

+

Returns

TRUE if the active connection is the default IPv6 connection

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

nm_active_connection_get_ip6_config (NMActiveConnection *connection);

Gets the current IPv6 NMIPConfig associated with the NMActiveConnection.

-

Parameters

+

Parameters

@@ -700,7 +711,7 @@ nm_active_connection_get_ip6_config (
-

Returns

+

Returns

the IPv6 NMIPConfig, or NULL if the connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

[transfer none]

@@ -714,7 +725,7 @@ nm_active_connection_get_dhcp6_config (NMDhcpConfig (if any) associated with the NMActiveConnection.

-

Parameters

+

Parameters

@@ -729,7 +740,7 @@ nm_active_connection_get_dhcp6_config ( -

Returns

+

Returns

the IPv6 NMDhcpConfig, or NULL if the connection does not use DHCPv6, or is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

@@ -743,7 +754,7 @@ state.

nm_active_connection_get_vpn (NMActiveConnection *connection);

Whether the active connection is a VPN connection.

-

Parameters

+

Parameters

@@ -758,7 +769,7 @@ nm_active_connection_get_vpn ( -

Returns

+

Returns

TRUE if the active connection is a VPN connection

@@ -854,6 +865,11 @@ nm_active_connection_get_vpn (#define NM_ACTIVE_CONNECTION_MASTER "master" +
+
+

NMActiveConnection

+
typedef struct _NMActiveConnection NMActiveConnection;
+

Property Details

diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html index a990346a..e5449080 100644 --- a/docs/libnm/html/NMClient.html +++ b/docs/libnm/html/NMClient.html @@ -16,7 +16,8 @@
@@ -788,12 +789,16 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties  |  Signals #define NM_CLIENT_ERROR
 NMClient

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMClientError
     ├── NMClientPermission
     ╰── NMClientPermissionResult
@@ -802,6 +807,12 @@
 
+

Implemented Interfaces

+

+NMClient implements + GInitable and GAsyncInitable.

+
+

Description

@@ -812,7 +823,7 @@ nm_client_error_quark (void);

Registers an error quark for NMClient if necessary.

-

Returns

+

Returns

the error quark used for NMClient errors.

@@ -827,7 +838,7 @@ nm_client_new (GCancellablenm_client_new_async() if you want to avoid that.

-

Parameters

+

Parameters

@@ -849,7 +860,7 @@ that.

-

Returns

+

Returns

a new NMClient or NULL on an error

@@ -866,7 +877,7 @@ nm_client_new_async (GCancellable nm_client_new_finish() to get the result. Note that on an error, the callback can be invoked with two first parameters as NULL.

-

Parameters

+

Parameters

@@ -902,7 +913,7 @@ nm_client_new_finish (GAsyncResul GError **error);

Gets the result of an nm_client_new_async() call.

-

Parameters

+

Parameters

@@ -924,7 +935,7 @@ nm_client_new_finish (GAsyncResul
-

Returns

+

Returns

a new NMClient, or NULL on error

@@ -935,7 +946,7 @@ nm_client_new_finish (GAsyncResul nm_client_get_version (NMClient *client);

Gets NetworkManager version.

-

Parameters

+

Parameters

@@ -950,7 +961,7 @@ nm_client_get_version ( -

Returns

+

Returns

string with the version (or NULL if NetworkManager is not running)

@@ -961,7 +972,7 @@ nm_client_get_version (NMClient *client);

Gets the current daemon state.

-

Parameters

+

Parameters

@@ -976,7 +987,7 @@ nm_client_get_state ( -

Returns

+

Returns

the current NMState

@@ -988,7 +999,7 @@ nm_client_get_startup ( -

Parameters

+

Parameters

@@ -1003,7 +1014,7 @@ connections at startup.

-

Returns

+

Returns

whether the daemon is still starting up

@@ -1014,7 +1025,7 @@ connections at startup.

nm_client_get_nm_running (NMClient *client);

Determines whether the daemon is running.

-

Parameters

+

Parameters

@@ -1029,7 +1040,7 @@ nm_client_get_nm_running ( -

Returns

+

Returns

TRUE if the daemon is running

@@ -1040,7 +1051,7 @@ nm_client_get_nm_running (NMClient *client);

Whether networking is enabled or disabled.

-

Parameters

+

Parameters

@@ -1055,7 +1066,7 @@ nm_client_networking_get_enabled (
-

Returns

+

Returns

TRUE if networking is enabled, FALSE if networking is disabled

@@ -1070,7 +1081,7 @@ nm_client_networking_set_enabled (
-

Parameters

+

Parameters

@@ -1097,7 +1108,7 @@ all controlled interfaces are available for activation.

-

Returns

+

Returns

TRUE on success, FALSE otherwise

@@ -1108,7 +1119,7 @@ all controlled interfaces are available for activation.

nm_client_wireless_get_enabled (NMClient *client);

Determines whether the wireless is enabled.

-

Parameters

+

Parameters

@@ -1123,7 +1134,7 @@ nm_client_wireless_get_enabled (
-

Returns

+

Returns

TRUE if wireless is enabled

@@ -1135,7 +1146,7 @@ nm_client_wireless_set_enabled (gboolean enabled);

Enables or disables wireless devices.

-

Parameters

+

Parameters

@@ -1165,7 +1176,7 @@ nm_client_wireless_hardware_get_enabled (NMClient *client);

Determines whether the wireless hardware is enabled.

-

Parameters

+

Parameters

@@ -1180,7 +1191,7 @@ nm_client_wireless_hardware_get_enabled
-

Returns

+

Returns

TRUE if the wireless hardware is enabled

@@ -1191,7 +1202,7 @@ nm_client_wireless_hardware_get_enabled nm_client_wwan_get_enabled (NMClient *client);

Determines whether WWAN is enabled.

-

Parameters

+

Parameters

@@ -1206,7 +1217,7 @@ nm_client_wwan_get_enabled ( -

Returns

+

Returns

TRUE if WWAN is enabled

@@ -1218,7 +1229,7 @@ nm_client_wwan_set_enabled (gboolean enabled);

Enables or disables WWAN devices.

-

Parameters

+

Parameters

@@ -1247,7 +1258,7 @@ nm_client_wwan_set_enabled (NMClient *client);

Determines whether the WWAN hardware is enabled.

-

Parameters

+

Parameters

@@ -1262,7 +1273,7 @@ nm_client_wwan_hardware_get_enabled (
-

Returns

+

Returns

TRUE if the WWAN hardware is enabled

@@ -1273,7 +1284,7 @@ nm_client_wwan_hardware_get_enabled (NMClient *client);

Determines whether WiMAX is enabled.

-

Parameters

+

Parameters

@@ -1288,7 +1299,7 @@ nm_client_wimax_get_enabled ( -

Returns

+

Returns

TRUE if WiMAX is enabled

@@ -1300,7 +1311,7 @@ nm_client_wimax_set_enabled (gboolean enabled);

Enables or disables WiMAX devices.

-

Parameters

+

Parameters

@@ -1329,7 +1340,7 @@ nm_client_wimax_set_enabled (NMClient *client);

Determines whether the WiMAX hardware is enabled.

-

Parameters

+

Parameters

@@ -1344,7 +1355,7 @@ nm_client_wimax_hardware_get_enabled ( -

Returns

+

Returns

TRUE if the WiMAX hardware is enabled

@@ -1358,7 +1369,7 @@ nm_client_get_logging (GError **error);

Gets NetworkManager current logging level and domains.

-

Parameters

+

Parameters

@@ -1391,7 +1402,7 @@ a list of domains separated by ",".

-

Returns

+

Returns

TRUE on success, FALSE otherwise

@@ -1405,7 +1416,7 @@ nm_client_set_logging (GError **error);

Sets NetworkManager logging level and/or domains.

-

Parameters

+

Parameters

@@ -1438,7 +1449,7 @@ domains separated by ",". (NULL or an empty string
-

Returns

+

Returns

TRUE on success, FALSE otherwise

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

-

Parameters

+

Parameters

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

-

Returns

+

Returns

the permission's result, one of NMClientPermissionResult

@@ -1487,7 +1498,7 @@ nm_client_get_connectivity (nm_client_check_connectivity_async(), which re-check the connectivity state first before returning any information.

-

Parameters

+

Parameters

@@ -1502,7 +1513,7 @@ connectivity state first before returning any information.

-

Returns

+

Returns

the current connectivity state

@@ -1519,7 +1530,7 @@ the most recent known state without re-checking.

This is a blocking call; use nm_client_check_connectivity_async() if you do not want to block.

-

Parameters

+

Parameters

@@ -1546,7 +1557,7 @@ if you do not want to block.

-

Returns

+

Returns

the (new) current connectivity state

@@ -1564,7 +1575,7 @@ nm_client_check_connectivity_async (nm_client_check_connectivity(), which blocks.

-

Parameters

+

Parameters

@@ -1607,7 +1618,7 @@ nm_client_check_connectivity_finish (Retrieves the result of an nm_client_check_connectivity_async() call.

-

Parameters

+

Parameters

@@ -1634,7 +1645,7 @@ call.

-

Returns

+

Returns

the (new) current connectivity state

@@ -1649,7 +1660,7 @@ nm_client_save_hostname ( -

Parameters

+

Parameters

@@ -1682,7 +1693,7 @@ clear any existing persistent hostname.

-

Returns

+

Returns

TRUE if the request was successful, FALSE if it failed

@@ -1698,7 +1709,7 @@ nm_client_save_hostname_async (Requests that the machine's persistent hostname be set to the specified value or cleared.

-

Parameters

+

Parameters

@@ -1746,7 +1757,7 @@ nm_client_save_hostname_finish (GError **error);

Gets the result of an nm_client_save_hostname_async() call.

-

Parameters

+

Parameters

@@ -1773,7 +1784,7 @@ nm_client_save_hostname_finish (
-

Returns

+

Returns

TRUE if the request was successful, FALSE if it failed

@@ -1787,7 +1798,7 @@ nm_client_get_devices (nm_device_ethernet_get_hw_address().

-

Parameters

+

Parameters

@@ -1802,7 +1813,7 @@ methods such as -

Returns

+

Returns

a GPtrArray containing all the NMDevices. The returned array is owned by the NMClient object and should not be modified.

@@ -1823,7 +1834,7 @@ a placeholder.

what kind of device each member of the returned array is, and then you may use device-specific methods such as nm_device_ethernet_get_hw_address().

-

Parameters

+

Parameters

@@ -1838,7 +1849,7 @@ use device-specific methods such as -

Returns

+

Returns

a GPtrArray containing all the NMDevices. The returned array is owned by the NMClient object and should not be modified.

@@ -1854,7 +1865,7 @@ nm_client_get_device_by_path (const char *object_path);

Gets a NMDevice from a NMClient.

-

Parameters

+

Parameters

@@ -1876,7 +1887,7 @@ nm_client_get_device_by_path ( -

Returns

+

Returns

the NMDevice for the given object_path or NULL if none is found.

[transfer none]

@@ -1890,7 +1901,7 @@ nm_client_get_device_by_iface (const char *iface);

Gets a NMDevice from a NMClient.

-

Parameters

+

Parameters

@@ -1912,7 +1923,7 @@ nm_client_get_device_by_iface (
-

Returns

+

Returns

the NMDevice for the given iface or NULL if none is found.

[transfer none]

@@ -1925,7 +1936,7 @@ or NULL if none is found.

nm_client_get_active_connections (NMClient *client);

Gets the active connections.

-

Parameters

+

Parameters

@@ -1940,7 +1951,7 @@ nm_client_get_active_connections (
-

Returns

+

Returns

a GPtrArray containing all the active NMActiveConnections. The returned array is owned by the client and should not be modified.

@@ -1962,7 +1973,7 @@ route to the VPN endpoint.

If there is no default route, or the default route is over a non-NetworkManager-recognized device, this will return NULL.

-

Parameters

+

Parameters

@@ -1977,7 +1988,7 @@ non-NetworkManager-recognized device, this will return NUL
-

Returns

+

Returns

the appropriate NMActiveConnection, if any.

[transfer none]

@@ -1992,7 +2003,7 @@ nm_client_get_activating_connection (“primary-connection” upon successful activation.

-

Parameters

+

Parameters

@@ -2007,7 +2018,7 @@ currently-activating connection that is expected to become the new
-

Returns

+

Returns

the appropriate NMActiveConnection, if any.

[transfer none]

@@ -2018,7 +2029,7 @@ any.

nm_client_activate_connection_async ()

void
 nm_client_activate_connection_async (NMClient *client,
-                                     NMConnection *connection,
+                                     NMConnection *connection,
                                      NMDevice *device,
                                      const char *specific_object,
                                      GCancellable *cancellable,
@@ -2043,7 +2054,7 @@ the new connection, not when it finishes. You can used the returned
 NMActiveConnection object (in particular, “state”) to
 track the activation to its completion.

-

Parameters

+

Parameters

@@ -2058,7 +2069,7 @@ track the activation to its completion.

- + @@ -2107,7 +2118,7 @@ nm_client_activate_connection_finish (GError **error);

Gets the result of a call to nm_client_activate_connection_async().

-

Parameters

+

Parameters

connection

an NMConnection.

an NMConnection.

[allow-none]
@@ -2134,7 +2145,7 @@ nm_client_activate_connection_finish ( -

Returns

+

Returns

the new NMActiveConnection on success, NULL on failure, in which case error will be set.

@@ -2147,7 +2158,7 @@ will be set.

void
 nm_client_add_and_activate_connection_async
                                (NMClient *client,
-                                NMConnection *partial,
+                                NMConnection *partial,
                                 NMDevice *device,
                                 const char *specific_object,
                                 GCancellable *cancellable,
@@ -2163,7 +2174,7 @@ the new connection, not when it finishes. You can used the returned
 NMActiveConnection object (in particular, “state”) to
 track the activation to its completion.

-

Parameters

+

Parameters

@@ -2178,7 +2189,7 @@ track the activation to its completion.

- @@ -327,7 +328,7 @@ + + + +

partial

an NMConnection to add; the connection may be +

an NMConnection to add; the connection may be partially filled (or even NULL) and will be completed by NetworkManager using the given device and specific_object @@ -2232,9 +2243,9 @@ nm_client_add_and_activate_connection_finish GError **error);

Gets the result of a call to nm_client_add_and_activate_connection_async().

You can call nm_active_connection_get_connection() on the returned -NMActiveConnection to find the path of the created NMConnection.

+NMActiveConnection to find the path of the created NMConnection.

-

Parameters

+

Parameters

@@ -2261,7 +2272,7 @@ nm_client_add_and_activate_connection_finish
-

Returns

+

Returns

the new NMActiveConnection on success, NULL on failure, in which case error will be set.

@@ -2278,7 +2289,7 @@ nm_client_deactivate_connection (GError **error);

Deactivates an active NMActiveConnection.

-

Parameters

+

Parameters

@@ -2310,7 +2321,7 @@ nm_client_deactivate_connection (
-

Returns

+

Returns

success or failure

@@ -2325,7 +2336,7 @@ nm_client_deactivate_connection_async (gpointer user_data);

Asynchronously deactivates an active NMActiveConnection.

-

Parameters

+

Parameters

@@ -2373,7 +2384,7 @@ nm_client_deactivate_connection_finish GError **error);

Gets the result of a call to nm_client_deactivate_connection_async().

-

Parameters

+

Parameters

@@ -2400,7 +2411,7 @@ nm_client_deactivate_connection_finish
-

Returns

+

Returns

success or failure

@@ -2410,7 +2421,7 @@ nm_client_deactivate_connection_finish
const GPtrArray *
 nm_client_get_connections (NMClient *client);
-

Parameters

+

Parameters

@@ -2425,12 +2436,12 @@ nm_client_get_connections ( -

Returns

+

Returns

an array containing all connections provided by the remote settings service. The returned array is owned by the NMClient object and should not be modified.

The connections are as received from D-Bus and might not validate according -to nm_connection_verify().

+to nm_connection_verify().

[transfer none][element-type NMRemoteConnection]

@@ -2443,7 +2454,7 @@ nm_client_get_connection_by_id (Returns the first matching NMRemoteConnection matching a given id .

-

Parameters

+

Parameters

@@ -2465,11 +2476,11 @@ nm_client_get_connection_by_id (
-

Returns

+

Returns

the remote connection object on success, or NULL if no matching object was found.

The connection is as received from D-Bus and might not validate according -to nm_connection_verify().

+to nm_connection_verify().

[transfer none]

@@ -2482,7 +2493,7 @@ nm_client_get_connection_by_path (Returns the NMRemoteConnection representing the connection at path .

-

Parameters

+

Parameters

@@ -2504,11 +2515,11 @@ nm_client_get_connection_by_path (
-

Returns

+

Returns

the remote connection object on success, or NULL if the object was not known

The connection is as received from D-Bus and might not validate according -to nm_connection_verify().

+to nm_connection_verify().

[transfer none]

@@ -2521,7 +2532,7 @@ nm_client_get_connection_by_uuid (Returns the NMRemoteConnection identified by uuid .

-

Parameters

+

Parameters

@@ -2543,11 +2554,11 @@ nm_client_get_connection_by_uuid (
-

Returns

+

Returns

the remote connection object on success, or NULL if the object was not known

The connection is as received from D-Bus and might not validate according -to nm_connection_verify().

+to nm_connection_verify().

[transfer none]

@@ -2556,7 +2567,7 @@ to

nm_client_add_connection_async ()

void
 nm_client_add_connection_async (NMClient *client,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 gboolean save_to_disk,
                                 GCancellable *cancellable,
                                 GAsyncReadyCallback callback,
@@ -2579,7 +2590,7 @@ identical settings to connection
  as NetworkManager may perform automatic
 completion and/or normalization of connection properties.

-

Parameters

+

Parameters

@@ -2632,7 +2643,7 @@ nm_client_add_connection_finish (GError **error);

Gets the result of a call to nm_client_add_connection_async().

-

Parameters

+

Parameters

@@ -2659,7 +2670,7 @@ nm_client_add_connection_finish (
-

Returns

+

Returns

the new NMRemoteConnection on success, NULL on failure, in which case error will be set.

@@ -2688,7 +2699,7 @@ then failures will be set to a NULL-terminated array of the filenames that failed to load.

-

Parameters

+

Parameters

@@ -2726,7 +2737,7 @@ filenames that failed to load.

-

Returns

+

Returns

TRUE if NetworkManager at least tried to load filenames , FALSE if an error occurred (eg, permission denied).

@@ -2745,7 +2756,7 @@ nm_client_load_connections_async (

See nm_client_load_connections() for more details.

-

Parameters

+

Parameters

@@ -2794,7 +2805,7 @@ nm_client_load_connections_finish (Gets the result of an nm_client_load_connections_async() call.

See nm_client_load_connections() for more details.

-

Parameters

+

Parameters

@@ -2827,7 +2838,7 @@ filenames that failed to load.

-

Returns

+

Returns

TRUE if NetworkManager at least tried to load filenames , FALSE if an error occurred (eg, permission denied).

@@ -2844,7 +2855,7 @@ nm_client_reload_connections ( -

Parameters

+

Parameters

@@ -2871,7 +2882,7 @@ the in-memory state matches the on-disk state.

-

Returns

+

Returns

TRUE on success, FALSE on failure

@@ -2887,7 +2898,7 @@ nm_client_reload_connections_async (
-

Parameters

+

Parameters

@@ -2929,7 +2940,7 @@ nm_client_reload_connections_finish (GError **error);

Gets the result of an nm_client_reload_connections_async() call.

-

Parameters

+

Parameters

@@ -2956,7 +2967,7 @@ nm_client_reload_connections_finish (
-

Returns

+

Returns

TRUE on success, FALSE on failure

@@ -3136,7 +3147,7 @@ nm_client_reload_connections_finish (NMClientPermission values indicate various permissions that NetworkManager clients can obtain to perform certain tasks on behalf of the current user.

-

Members

+

Members

@@ -3256,7 +3267,7 @@ clients can obtain to perform certain tasks on behalf of the current user.

NMClientPermissionResult values indicate what authorizations and permissions the user requires to obtain a given NMClientPermission

-

Members

+

Members

@@ -3305,7 +3316,7 @@ the user requires to obtain a given NMManagerError, NMSettingsError, NMAgentManagerError, and NMConnectionError.

-

Members

+

Members

@@ -3348,6 +3359,11 @@ the user requires to obtain a given #define NM_CLIENT_ERROR nm_client_error_quark () +
+
+

NMClient

+
typedef struct _NMClient NMClient;
+

Property Details

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

-

Parameters

+

Parameters

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

-

Parameters

+

Parameters

@@ -3609,9 +3625,9 @@ regular devices and placeholder devices.

user_function (NMClient *client, NMRemoteConnection *connection, gpointer user_data) -

Notifies that a NMConnection has been added.

+

Notifies that a NMConnection has been added.

-

Parameters

+

Parameters

@@ -3646,9 +3662,9 @@ user_function (NMClient *client, NMRemoteConnection *connection, gpointer user_data) -

Notifies that a NMConnection has been removed.

+

Notifies that a NMConnection has been removed.

-

Parameters

+

Parameters

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

-

Parameters

+

Parameters

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

-

Parameters

+

Parameters

@@ -3762,7 +3778,7 @@ user_function (gpointer user_data)

Notifies that a permission has changed

-

Parameters

+

Parameters

diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html new file mode 100644 index 00000000..b5b09562 --- /dev/null +++ b/docs/libnm/html/NMConnection.html @@ -0,0 +1,2519 @@ + + + + +NMConnection: libnm Reference Manual + + + + + + + + + +
+ + + + + + +
+
+
+ + +
+

NMConnection

+

NMConnection — Describes a connection to specific network or provider

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+void + +nm_connection_add_setting () +
+void + +nm_connection_remove_setting () +
+NMSetting * + +nm_connection_get_setting () +
+NMSetting * + +nm_connection_get_setting_by_name () +
+GVariant * + +nm_connection_to_dbus () +
+gboolean + +nm_connection_replace_settings () +
+void + +nm_connection_replace_settings_from_connection () +
+void + +nm_connection_clear_settings () +
+gboolean + +nm_connection_compare () +
+gboolean + +nm_connection_diff () +
+gboolean + +nm_connection_verify () +
+gboolean + +nm_connection_verify_secrets () +
+gboolean + +nm_connection_normalize () +
const char * + +nm_connection_need_secrets () +
+void + +nm_connection_clear_secrets () +
+void + +nm_connection_clear_secrets_with_flags () +
+gboolean + +nm_connection_update_secrets () +
+void + +nm_connection_set_path () +
const char * + +nm_connection_get_path () +
const char * + +nm_connection_get_interface_name () +
+gboolean + +nm_connection_is_type () +
+void + +nm_connection_for_each_setting_value () +
+void + +nm_connection_dump () +
const char * + +nm_connection_get_uuid () +
const char * + +nm_connection_get_id () +
const char * + +nm_connection_get_connection_type () +
+gboolean + +nm_connection_is_virtual () +
+char * + +nm_connection_get_virtual_device_description () +
+NMSetting8021x * + +nm_connection_get_setting_802_1x () +
+NMSettingBluetooth * + +nm_connection_get_setting_bluetooth () +
+NMSettingBond * + +nm_connection_get_setting_bond () +
+NMSettingTeam * + +nm_connection_get_setting_team () +
+NMSettingTeamPort * + +nm_connection_get_setting_team_port () +
+NMSettingBridge * + +nm_connection_get_setting_bridge () +
+NMSettingBridgePort * + +nm_connection_get_setting_bridge_port () +
+NMSettingCdma * + +nm_connection_get_setting_cdma () +
+NMSettingConnection * + +nm_connection_get_setting_connection () +
+NMSettingDcb * + +nm_connection_get_setting_dcb () +
+NMSettingGeneric * + +nm_connection_get_setting_generic () +
+NMSettingGsm * + +nm_connection_get_setting_gsm () +
+NMSettingInfiniband * + +nm_connection_get_setting_infiniband () +
+NMSettingIPTunnel * + +nm_connection_get_setting_ip_tunnel () +
+NMSettingIPConfig * + +nm_connection_get_setting_ip4_config () +
+NMSettingIPConfig * + +nm_connection_get_setting_ip6_config () +
+NMSettingMacvlan * + +nm_connection_get_setting_macvlan () +
+NMSettingOlpcMesh * + +nm_connection_get_setting_olpc_mesh () +
+NMSettingPpp * + +nm_connection_get_setting_ppp () +
+NMSettingPppoe * + +nm_connection_get_setting_pppoe () +
+NMSettingSerial * + +nm_connection_get_setting_serial () +
+NMSettingTun * + +nm_connection_get_setting_tun () +
+NMSettingVpn * + +nm_connection_get_setting_vpn () +
+NMSettingWimax * + +nm_connection_get_setting_wimax () +
+NMSettingAdsl * + +nm_connection_get_setting_adsl () +
+NMSettingWired * + +nm_connection_get_setting_wired () +
+NMSettingWireless * + +nm_connection_get_setting_wireless () +
+NMSettingWirelessSecurity * + +nm_connection_get_setting_wireless_security () +
+NMSettingVlan * + +nm_connection_get_setting_vlan () +
+NMSettingVxlan * + +nm_connection_get_setting_vxlan () +
+
+ +
+

Object Hierarchy

+
    GFlags
+    ╰── NMConnectionSerializationFlags
+
+
+
+

Description

+

An NMConnection describes all the settings and configuration values that +are necessary to configure network devices for operation on a specific +network. Connections are the fundamental operating object for +NetworkManager; no device is connected without a NMConnection, or +disconnected without having been connected with a NMConnection.

+

Each NMConnection contains a list of NMSetting objects usually referenced +by name (using nm_connection_get_setting_by_name()) or by type (with +nm_connection_get_setting()). The settings describe the actual parameters +with which the network devices are configured, including device-specific +parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters +(addresses, routes, addressing methods, etc).

+
+
+

Functions

+
+

nm_connection_add_setting ()

+
void
+nm_connection_add_setting (NMConnection *connection,
+                           NMSetting *setting);
+

Adds a NMSetting to the connection, replacing any previous NMSetting of the +same name which has previously been added to the NMConnection. The +connection takes ownership of the NMSetting object and does not increase +the setting object's reference count.

+
+

Parameters

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

connection

a NMConnection

 

setting

the NMSetting to add to the connection object.

[transfer full]
+
+
+
+
+

nm_connection_remove_setting ()

+
void
+nm_connection_remove_setting (NMConnection *connection,
+                              GType setting_type);
+

Removes the NMSetting with the given GType from the NMConnection. This +operation dereferences the NMSetting object.

+
+

Parameters

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

connection

a NMConnection

 

setting_type

the GType of the setting object to remove

 
+
+
+
+
+

nm_connection_get_setting ()

+
NMSetting *
+nm_connection_get_setting (NMConnection *connection,
+                           GType setting_type);
+

Gets the NMSetting with the given GType, if one has been previously added +to the NMConnection.

+
+

Parameters

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

connection

a NMConnection

 

setting_type

the GType of the setting object to return

 
+
+
+

Returns

+

the NMSetting, or NULL if no setting of that type was previously +added to the NMConnection.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_by_name ()

+
NMSetting *
+nm_connection_get_setting_by_name (NMConnection *connection,
+                                   const char *name);
+

Gets the NMSetting with the given name, if one has been previously added +the NMConnection.

+
+

Parameters

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

connection

a NMConnection

 

name

a setting name

 
+
+
+

Returns

+

the NMSetting, or NULL if no setting with that name was previously +added to the NMConnection.

+

[transfer none]

+
+
+
+
+

nm_connection_to_dbus ()

+
GVariant *
+nm_connection_to_dbus (NMConnection *connection,
+                       NMConnectionSerializationFlags flags);
+

Converts the NMConnection into a GVariant of type +NM_VARIANT_TYPE_CONNECTION describing the connection, suitable for +marshalling over D-Bus or otherwise serializing.

+
+

Parameters

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

connection

the NMConnection

 

flags

serialization flags, e.g. NM_CONNECTION_SERIALIZE_ALL

 
+
+
+

Returns

+

a new floating GVariant describing the connection, +its settings, and each setting's properties.

+

[transfer none]

+
+
+
+
+

nm_connection_replace_settings ()

+
gboolean
+nm_connection_replace_settings (NMConnection *connection,
+                                GVariant *new_settings,
+                                GError **error);
+

Replaces connection +'s settings with new_settings + (which must be +syntactically valid, and describe a known type of connection, but does not +need to result in a connection that passes nm_connection_verify()).

+
+

Parameters

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

connection

a NMConnection

 

new_settings

a GVariant of type NM_VARIANT_TYPE_CONNECTION, with the new settings

 

error

location to store error, or NULL

 
+
+
+

Returns

+

TRUE if connection was updated, FALSE if new_settings +could not +be deserialized (in which case connection +will be unchanged).

+
+
+
+
+

nm_connection_replace_settings_from_connection ()

+
void
+nm_connection_replace_settings_from_connection
+                               (NMConnection *connection,
+                                NMConnection *new_connection);
+

Deep-copies the settings of new_connection + and replaces the settings of connection + +with the copied settings.

+
+

Parameters

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

connection

a NMConnection

 

new_connection

a NMConnection to replace the settings of connection +with

 
+
+
+
+
+

nm_connection_clear_settings ()

+
void
+nm_connection_clear_settings (NMConnection *connection);
+

Deletes all of connection +'s settings.

+
+

Parameters

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

connection

a NMConnection

 
+
+
+
+
+

nm_connection_compare ()

+
gboolean
+nm_connection_compare (NMConnection *a,
+                       NMConnection *b,
+                       NMSettingCompareFlags flags);
+

Compares two NMConnection objects for similarity, with comparison behavior +modified by a set of flags. See nm_setting_compare() for a description of +each flag's behavior.

+
+

Parameters

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

a

a NMConnection

 

b

a second NMConnection to compare with the first

 

flags

compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT

 
+
+
+

Returns

+

TRUE if the comparison succeeds, FALSE if it does not

+
+
+
+
+

nm_connection_diff ()

+
gboolean
+nm_connection_diff (NMConnection *a,
+                    NMConnection *b,
+                    NMSettingCompareFlags flags,
+                    GHashTable **out_settings);
+

Compares two NMConnection objects for similarity, with comparison behavior +modified by a set of flags. See nm_setting_compare() for a description of +each flag's behavior. If the connections differ, settings and keys within +each setting that differ are added to the returned out_settings + hash table. +No values are returned, only key names.

+
+

Parameters

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

a

a NMConnection

 

b

a second NMConnection to compare with the first

 

flags

compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT

 

out_settings

if the +connections differ, on return a hash table mapping setting names to +second-level GHashTable (utf8 to guint32), which contains the key names that +differ mapped to one or more of NMSettingDiffResult as a bitfield.

[element-type utf8 GLib.HashTable]
+
+
+

Returns

+

TRUE if the connections contain the same values, FALSE if they do +not

+
+
+
+
+

nm_connection_verify ()

+
gboolean
+nm_connection_verify (NMConnection *connection,
+                      GError **error);
+

Validates the connection and all its settings. Each setting's properties +have allowed values, and some values are dependent on other values. For +example, if a Wi-Fi connection is security enabled, the NMSettingWireless +setting object's 'security' property must contain the setting name of the +NMSettingWirelessSecurity object, which must also be present in the +connection for the connection to be valid. As another example, the +NMSettingWired object's 'mac-address' property must be a validly formatted +MAC address. The returned GError contains information about which +setting and which property failed validation, and how it failed validation.

+
+

Parameters

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

connection

the NMConnection to verify

 

error

location to store error, or NULL

 
+
+
+

Returns

+

TRUE if the connection is valid, FALSE if it is not

+
+
+
+
+

nm_connection_verify_secrets ()

+
gboolean
+nm_connection_verify_secrets (NMConnection *connection,
+                              GError **error);
+

Verifies the secrets in the connection.

+
+

Parameters

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

connection

the NMConnection to verify in

 

error

location to store error, or NULL

 
+
+
+

Returns

+

TRUE if the secrets are valid, FALSE if they are not

+
+

Since: 1.2

+
+
+
+

nm_connection_normalize ()

+
gboolean
+nm_connection_normalize (NMConnection *connection,
+                         GHashTable *parameters,
+                         gboolean *modified,
+                         GError **error);
+

Does some basic normalization and fixup of well known inconsistencies +and deprecated fields. If the connection was modified in any way, +the output parameter modified + is set TRUE.

+

Finally the connection will be verified and TRUE returns if the connection +is valid. As this function only performs some specific normalization steps +it cannot repair all connections. If the connection has errors that +cannot be normalized, the connection will not be modified.

+
+

Parameters

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

connection

the NMConnection to normalize

 

parameters

a GHashTable with +normalization parameters to allow customization of the normalization by providing +specific arguments. Unknown arguments will be ignored and the default will be +used. The keys must be strings, hashed by g_str_hash() and g_str_equal() functions. +The values are opaque and depend on the parameter name.

[allow-none][element-type utf8 gpointer]

modified

outputs whether any settings were modified.

[out][allow-none]

error

location to store error, or NULL. Contains the reason, +why the connection is invalid, if the function returns an error.

 
+
+
+

Returns

+

TRUE if the connection is valid, FALSE if it is not

+
+
+
+
+

nm_connection_need_secrets ()

+
const char *
+nm_connection_need_secrets (NMConnection *connection,
+                            GPtrArray **hints);
+

Returns the name of the first setting object in the connection which would +need secrets to make a successful connection. The returned hints are only +intended as a guide to what secrets may be required, because in some +circumstances, there is no way to conclusively determine exactly which +secrets are needed.

+
+

Parameters

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

connection

the NMConnection

 

hints

the address of a pointer to a GPtrArray, initialized to NULL, which on +return points to an allocated GPtrArray containing the property names of +secrets of the NMSetting which may be required; the caller owns the array +and must free the array itself with g_ptr_array_free(), but not free its +elements.

[out][element-type utf8][allow-none][transfer container]
+
+
+

Returns

+

the setting name of the NMSetting object which has invalid or +missing secrets

+
+
+
+
+

nm_connection_clear_secrets ()

+
void
+nm_connection_clear_secrets (NMConnection *connection);
+

Clears and frees any secrets that may be stored in the connection, to avoid +keeping secret data in memory when not needed.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+
+
+

nm_connection_clear_secrets_with_flags ()

+
void
+nm_connection_clear_secrets_with_flags
+                               (NMConnection *connection,
+                                NMSettingClearSecretsWithFlagsFn func,
+                                gpointer user_data);
+

Clears and frees secrets determined by func +.

+
+

Parameters

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

connection

the NMConnection

 

func

function to be called to determine whether a +specific secret should be cleared or not.

[scope call]

user_data

caller-supplied data passed to func +

 
+
+
+
+
+

nm_connection_update_secrets ()

+
gboolean
+nm_connection_update_secrets (NMConnection *connection,
+                              const char *setting_name,
+                              GVariant *secrets,
+                              GError **error);
+

Update the specified setting's secrets, given a dictionary of secrets +intended for that setting (deserialized from D-Bus for example). Will also +extract the given setting's secrets hash if given a connection dictionary. +If setting_name + is NULL, expects a fully serialized NMConnection as +returned by nm_connection_to_dbus() and will update all secrets from all +settings contained in secrets +.

+
+

Parameters

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

connection

the NMConnection

 

setting_name

the setting object name to which the secrets apply

 

secrets

a GVariant of secrets, of type NM_VARIANT_TYPE_CONNECTION +or NM_VARIANT_TYPE_SETTING

 

error

location to store error, or NULL

 
+
+
+

Returns

+

TRUE if the secrets were successfully updated, FALSE if the update +failed (tried to update secrets for a setting that doesn't exist, etc)

+
+
+
+
+

nm_connection_set_path ()

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

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

+
+

Parameters

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

connection

the NMConnection

 

path

the D-Bus path of the connection as given by the settings service +which provides the connection

 
+
+
+
+
+

nm_connection_get_path ()

+
const char *
+nm_connection_get_path (NMConnection *connection);
+

Returns the connection's D-Bus path.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

the D-Bus path of the connection, previously set by a call to +nm_connection_set_path().

+
+
+
+
+

nm_connection_get_interface_name ()

+
const char *
+nm_connection_get_interface_name (NMConnection *connection);
+

Returns the interface name as stored in NMSettingConnection:interface_name. +If the connection contains no NMSettingConnection, it will return NULL.

+

For hardware devices and software devices created outside of NetworkManager, +this name is used to match the device. for software devices created by +NetworkManager, this is the name of the created interface.

+
+

Parameters

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

connection

The NMConnection

 
+
+
+

Returns

+

Name of the kernel interface or NULL

+
+
+
+
+

nm_connection_is_type ()

+
gboolean
+nm_connection_is_type (NMConnection *connection,
+                       const char *type);
+

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

+
+

Parameters

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

connection

the NMConnection

 

type

a setting name to check the connection's type against (like +NM_SETTING_WIRELESS_SETTING_NAME or NM_SETTING_WIRED_SETTING_NAME)

 
+
+
+

Returns

+

TRUE if the connection is of the given type +, FALSE if not

+
+
+
+
+

nm_connection_for_each_setting_value ()

+
void
+nm_connection_for_each_setting_value (NMConnection *connection,
+                                      NMSettingValueIterFn func,
+                                      gpointer user_data);
+

Iterates over the properties of each NMSetting object in the NMConnection, +calling the supplied user function for each property.

+
+

Parameters

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

connection

the NMConnection

 

func

user-supplied function called for each setting's property.

[scope call]

user_data

user data passed to func +at each invocation

 
+
+
+
+
+

nm_connection_dump ()

+
void
+nm_connection_dump (NMConnection *connection);
+

Print the connection to stdout. For debugging purposes ONLY, should NOT +be used for serialization of the connection or machine-parsed in any way. The +output format is not guaranteed to be stable and may change at any time.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+
+
+

nm_connection_get_uuid ()

+
const char *
+nm_connection_get_uuid (NMConnection *connection);
+

A shortcut to return the UUID from the connection's NMSettingConnection.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

the UUID from the connection's 'connection' setting

+
+
+
+
+

nm_connection_get_id ()

+
const char *
+nm_connection_get_id (NMConnection *connection);
+

A shortcut to return the ID from the connection's NMSettingConnection.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

the ID from the connection's 'connection' setting

+
+
+
+
+

nm_connection_get_connection_type ()

+
const char *
+nm_connection_get_connection_type (NMConnection *connection);
+

A shortcut to return the type from the connection's NMSettingConnection.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

the type from the connection's 'connection' setting

+
+
+
+
+

nm_connection_is_virtual ()

+
gboolean
+nm_connection_is_virtual (NMConnection *connection);
+

Checks if connection + refers to a virtual device (and thus can potentially be +activated even if the device it refers to doesn't exist).

+
+

Parameters

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

connection

an NMConnection

 
+
+
+

Returns

+

whether connection +refers to a virtual device

+
+
+
+
+

nm_connection_get_virtual_device_description ()

+
char *
+nm_connection_get_virtual_device_description
+                               (NMConnection *connection);
+

Returns the name that nm_device_disambiguate_names() would +return for the virtual device that would be created for connection +. +Eg, "VLAN (eth1.1)".

+
+

Parameters

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

connection

an NMConnection for a virtual device type

 
+
+
+

Returns

+

the name of connection +'s device, +or NULL if connection +is not a virtual connection type.

+

[transfer full]

+
+
+
+
+

nm_connection_get_setting_802_1x ()

+
NMSetting8021x *
+nm_connection_get_setting_802_1x (NMConnection *connection);
+

A shortcut to return any NMSetting8021x the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSetting8021x if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_bluetooth ()

+
NMSettingBluetooth *
+nm_connection_get_setting_bluetooth (NMConnection *connection);
+

A shortcut to return any NMSettingBluetooth the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingBluetooth if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_bond ()

+
NMSettingBond *
+nm_connection_get_setting_bond (NMConnection *connection);
+

A shortcut to return any NMSettingBond the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingBond if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_team ()

+
NMSettingTeam *
+nm_connection_get_setting_team (NMConnection *connection);
+

A shortcut to return any NMSettingTeam the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingTeam if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_team_port ()

+
NMSettingTeamPort *
+nm_connection_get_setting_team_port (NMConnection *connection);
+

A shortcut to return any NMSettingTeamPort the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingTeamPort if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_bridge ()

+
NMSettingBridge *
+nm_connection_get_setting_bridge (NMConnection *connection);
+

A shortcut to return any NMSettingBridge the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingBridge if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_bridge_port ()

+
NMSettingBridgePort *
+nm_connection_get_setting_bridge_port (NMConnection *connection);
+

A shortcut to return any NMSettingBridgePort the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingBridgePort if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_cdma ()

+
NMSettingCdma *
+nm_connection_get_setting_cdma (NMConnection *connection);
+

A shortcut to return any NMSettingCdma the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingCdma if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_connection ()

+
NMSettingConnection *
+nm_connection_get_setting_connection (NMConnection *connection);
+

A shortcut to return any NMSettingConnection the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingConnection if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_dcb ()

+
NMSettingDcb *
+nm_connection_get_setting_dcb (NMConnection *connection);
+

A shortcut to return any NMSettingDcb the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingDcb if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_generic ()

+
NMSettingGeneric *
+nm_connection_get_setting_generic (NMConnection *connection);
+

A shortcut to return any NMSettingGeneric the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingGeneric if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_gsm ()

+
NMSettingGsm *
+nm_connection_get_setting_gsm (NMConnection *connection);
+

A shortcut to return any NMSettingGsm the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingGsm if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_infiniband ()

+
NMSettingInfiniband *
+nm_connection_get_setting_infiniband (NMConnection *connection);
+

A shortcut to return any NMSettingInfiniband the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingInfiniband if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_ip_tunnel ()

+
NMSettingIPTunnel *
+nm_connection_get_setting_ip_tunnel (NMConnection *connection);
+

A shortcut to return any NMSettingIPTunnel the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingIPTunnel if the connection contains one, otherwise NULL.

+

[transfer none]

+
+

Since: 1.2

+
+
+
+

nm_connection_get_setting_ip4_config ()

+
NMSettingIPConfig *
+nm_connection_get_setting_ip4_config (NMConnection *connection);
+

A shortcut to return any NMSettingIP4Config the connection might contain.

+

Note that it returns the value as type NMSettingIPConfig, since the vast +majority of IPv4-setting-related methods are on that type, not +NMSettingIP4Config.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingIP4Config if the +connection contains one, otherwise NULL.

+

[type NMSettingIP4Config][transfer none]

+
+
+
+
+

nm_connection_get_setting_ip6_config ()

+
NMSettingIPConfig *
+nm_connection_get_setting_ip6_config (NMConnection *connection);
+

A shortcut to return any NMSettingIP6Config the connection might contain.

+

Note that it returns the value as type NMSettingIPConfig, since the vast +majority of IPv6-setting-related methods are on that type, not +NMSettingIP6Config.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingIP6Config if the +connection contains one, otherwise NULL.

+

[type NMSettingIP6Config][transfer none]

+
+
+
+
+

nm_connection_get_setting_macvlan ()

+
NMSettingMacvlan *
+nm_connection_get_setting_macvlan (NMConnection *connection);
+

A shortcut to return any NMSettingMacvlan the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingMacvlan if the connection contains one, otherwise NULL.

+

[transfer none]

+
+

Since: 1.2

+
+
+
+

nm_connection_get_setting_olpc_mesh ()

+
NMSettingOlpcMesh *
+nm_connection_get_setting_olpc_mesh (NMConnection *connection);
+

A shortcut to return any NMSettingOlpcMesh the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingOlpcMesh if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_ppp ()

+
NMSettingPpp *
+nm_connection_get_setting_ppp (NMConnection *connection);
+

A shortcut to return any NMSettingPpp the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingPpp if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_pppoe ()

+
NMSettingPppoe *
+nm_connection_get_setting_pppoe (NMConnection *connection);
+

A shortcut to return any NMSettingPppoe the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingPppoe if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_serial ()

+
NMSettingSerial *
+nm_connection_get_setting_serial (NMConnection *connection);
+

A shortcut to return any NMSettingSerial the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingSerial if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_tun ()

+
NMSettingTun *
+nm_connection_get_setting_tun (NMConnection *connection);
+

A shortcut to return any NMSettingTun the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingTun if the connection contains one, otherwise NULL.

+

[transfer none]

+
+

Since: 1.2

+
+
+
+

nm_connection_get_setting_vpn ()

+
NMSettingVpn *
+nm_connection_get_setting_vpn (NMConnection *connection);
+

A shortcut to return any NMSettingVpn the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingVpn if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_wimax ()

+
NMSettingWimax *
+nm_connection_get_setting_wimax (NMConnection *connection);
+

A shortcut to return any NMSettingWimax the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingWimax if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_adsl ()

+
NMSettingAdsl *
+nm_connection_get_setting_adsl (NMConnection *connection);
+

A shortcut to return any NMSettingAdsl the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingAdsl if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_wired ()

+
NMSettingWired *
+nm_connection_get_setting_wired (NMConnection *connection);
+

A shortcut to return any NMSettingWired the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingWired if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_wireless ()

+
NMSettingWireless *
+nm_connection_get_setting_wireless (NMConnection *connection);
+

A shortcut to return any NMSettingWireless the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingWireless if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_wireless_security ()

+
NMSettingWirelessSecurity *
+nm_connection_get_setting_wireless_security
+                               (NMConnection *connection);
+

A shortcut to return any NMSettingWirelessSecurity the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingWirelessSecurity if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_vlan ()

+
NMSettingVlan *
+nm_connection_get_setting_vlan (NMConnection *connection);
+

A shortcut to return any NMSettingVlan the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingVlan if the connection contains one, otherwise NULL.

+

[transfer none]

+
+
+
+
+

nm_connection_get_setting_vxlan ()

+
NMSettingVxlan *
+nm_connection_get_setting_vxlan (NMConnection *connection);
+

A shortcut to return any NMSettingVxlan the connection might contain.

+
+

Parameters

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

connection

the NMConnection

 
+
+
+

Returns

+

an NMSettingVxlan if the connection contains one, otherwise NULL.

+

[transfer none]

+
+

Since: 1.2

+
+
+
+

Types and Values

+
+

NM_CONNECTION_SECRETS_UPDATED

+
#define NM_CONNECTION_SECRETS_UPDATED "secrets-updated"
+
+
+
+
+

NM_CONNECTION_SECRETS_CLEARED

+
#define NM_CONNECTION_SECRETS_CLEARED "secrets-cleared"
+
+
+
+
+

NM_CONNECTION_CHANGED

+
#define NM_CONNECTION_CHANGED         "changed"
+
+
+
+
+

NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD

+
#define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD "ip6-config-method"
+
+
+
+
+

NMConnectionInterface

+
typedef struct {
+	GTypeInterface parent;
+
+	/* Signals */
+	void (*secrets_updated) (NMConnection *connection,
+	                         const char   *setting);
+	void (*secrets_cleared) (NMConnection *connection);
+	void (*changed)         (NMConnection *connection);
+} NMConnectionInterface;
+
+
+

Members

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

GTypeInterface parent;

the parent interace struct

 

secrets_updated ()

emitted when the connection's secrets are updated

 

secrets_cleared ()

emitted when the connection's secrets are cleared

 

changed ()

emitted when any change to the connection's settings occurs

 
+
+
+
+
+

NM_VARIANT_TYPE_SETTING

+
#define NM_VARIANT_TYPE_SETTING G_VARIANT_TYPE_VARDICT
+
+

GVariantType for a dictionary mapping from property names to values. This is +an alias for G_VARIANT_TYPE_VARDICT, and is the type of each element of +an NM_VARIANT_TYPE_CONNECTION dictionary.

+
+
+
+

enum NMConnectionSerializationFlags

+

These flags determine which properties are serialized when calling when +calling nm_connection_to_dbus().

+
+

Members

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

NM_CONNECTION_SERIALIZE_ALL

+

serialize all properties (including secrets)

+
 

NM_CONNECTION_SERIALIZE_NO_SECRETS

+

do not include secrets

+
 

NM_CONNECTION_SERIALIZE_ONLY_SECRETS

+

only serialize secrets

+
 
+
+
+
+
+ + + \ No newline at end of file diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html index 6dd8dd36..016bad3d 100644 --- a/docs/libnm/html/NMDevice.html +++ b/docs/libnm/html/NMDevice.html @@ -16,7 +16,8 @@
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties  |  Signals
-NMConnection * +NMConnection * nm_device_get_applied_connection () @@ -343,7 +344,7 @@
-NMConnection * +NMConnection * nm_device_get_applied_connection_finish () @@ -781,12 +782,16 @@ #define NM_DEVICE_LLDP_NEIGHBORS
 NMDevice

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── NMLldpNeighbor
     GObject
     ╰── NMObject
@@ -811,6 +816,12 @@
 
+

Implemented Interfaces

+

+NMDevice implements + GInitable and GAsyncInitable.

+
+

Description

@@ -821,7 +832,7 @@ nm_device_get_iface (NMDevice *device);

Gets the interface name of the NMDevice.

-

Parameters

+

Parameters

@@ -836,7 +847,7 @@ nm_device_get_iface ( -

Returns

+

Returns

the interface of the device. This is the internal string used by the device, and must not be modified.

@@ -849,7 +860,7 @@ nm_device_get_ip_iface (NMDevice over which IP traffic flows when the device is in the ACTIVATED state.

-

Parameters

+

Parameters

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

-

Returns

+

Returns

the IP traffic interface of the device. This is the internal string used by the device, and must not be modified.

@@ -876,7 +887,7 @@ used by the device, and must not be modified.

nm_device_get_device_type (NMDevice *device);

Returns the numeric type of the NMDevice, ie Ethernet, Wi-Fi, etc.

-

Parameters

+

Parameters

@@ -891,7 +902,7 @@ nm_device_get_device_type ( -

Returns

+

Returns

the device type

@@ -902,7 +913,7 @@ nm_device_get_device_type (NMDevice *device);

Gets the Unique Device Identifier of the NMDevice.

-

Parameters

+

Parameters

@@ -917,7 +928,7 @@ nm_device_get_udi ( -

Returns

+

Returns

the Unique Device Identifier of the device. This identifier may be used to gather more information about the device from various operating system services like udev or sysfs.

@@ -930,7 +941,7 @@ system services like udev or sysfs.

nm_device_get_driver (NMDevice *device);

Gets the driver of the NMDevice.

-

Parameters

+

Parameters

@@ -945,7 +956,7 @@ nm_device_get_driver ( -

Returns

+

Returns

the driver of the device. This is the internal string used by the device, and must not be modified.

@@ -957,7 +968,7 @@ device, and must not be modified.

nm_device_get_driver_version (NMDevice *device);

Gets the driver version of the NMDevice.

-

Parameters

+

Parameters

@@ -972,7 +983,7 @@ nm_device_get_driver_version ( -

Returns

+

Returns

the version of the device driver. This is the internal string used by the device, and must not be modified.

@@ -984,7 +995,7 @@ device, and must not be modified.

nm_device_get_firmware_version (NMDevice *device);

Gets the firmware version of the NMDevice.

-

Parameters

+

Parameters

@@ -999,7 +1010,7 @@ nm_device_get_firmware_version (
-

Returns

+

Returns

the firmware version of the device. This is the internal string used by the device, and must not be modified.

@@ -1013,7 +1024,7 @@ nm_device_get_type_description (device is.

-

Parameters

+

Parameters

@@ -1028,7 +1039,7 @@ nm_device_get_type_description (
-

Returns

+

Returns

the type description of the device. This is the internal string used by the device, and must not be modified.

@@ -1041,7 +1052,7 @@ nm_device_get_hw_address (device .

-

Parameters

+

Parameters

@@ -1056,7 +1067,7 @@ nm_device_get_hw_address ( -

Returns

+

Returns

the current MAC of the device, or NULL. This is the internal string used by the device, and must not be modified.

@@ -1068,7 +1079,7 @@ This is the internal string used by the device, and must not be modified.

nm_device_get_capabilities (NMDevice *device);

Gets the device' capabilities.

-

Parameters

+

Parameters

@@ -1083,7 +1094,7 @@ nm_device_get_capabilities ( -

Returns

+

Returns

the capabilities

@@ -1094,7 +1105,7 @@ nm_device_get_capabilities (NMDevice *device);

Whether the NMDevice is managed by NetworkManager.

-

Parameters

+

Parameters

@@ -1109,7 +1120,7 @@ nm_device_get_managed ( -

Returns

+

Returns

TRUE if the device is managed by NetworkManager

@@ -1121,7 +1132,7 @@ nm_device_set_managed (gboolean managed);

Enables or disables management of NMDevice by NetworkManager.

-

Parameters

+

Parameters

@@ -1151,7 +1162,7 @@ nm_device_set_managed (NMDevice *device);

Whether the NMDevice can be autoconnected.

-

Parameters

+

Parameters

@@ -1166,7 +1177,7 @@ nm_device_get_autoconnect ( -

Returns

+

Returns

TRUE if the device is allowed to be autoconnected

@@ -1178,7 +1189,7 @@ nm_device_set_autoconnect (gboolean autoconnect);

Enables or disables automatic activation of the NMDevice.

-

Parameters

+

Parameters

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

-

Parameters

+

Parameters

@@ -1223,7 +1234,7 @@ to be missing.

-

Returns

+

Returns

TRUE if firmware required for the device's operation is likely to be missing.

@@ -1235,7 +1246,7 @@ to be missing.

nm_device_get_nm_plugin_missing (NMDevice *device);

Indicates that the NetworkManager plugin for the device is not installed.

-

Parameters

+

Parameters

@@ -1250,7 +1261,7 @@ nm_device_get_nm_plugin_missing (
-

Returns

+

Returns

TRUE if the device plugin not installed.

Since: 1.2

@@ -1264,7 +1275,7 @@ nm_device_get_ip4_config (nm_active_connection_get_ip4_config(), which also works with VPN connections.

-

Parameters

+

Parameters

@@ -1279,7 +1290,7 @@ works with VPN connections.

-

Returns

+

Returns

the IPv4 NMIPConfig, or NULL if the device is not activated.

[transfer none]

@@ -1294,7 +1305,7 @@ nm_device_get_dhcp4_config (nm_active_connection_get_dhcp4_config(), which also works with VPN connections.

-

Parameters

+

Parameters

@@ -1309,7 +1320,7 @@ works with VPN connections.

-

Returns

+

Returns

the IPv4 NMDhcpConfig, or NULL if the device is not activated or not using DHCP.

[transfer none]

@@ -1324,7 +1335,7 @@ nm_device_get_ip6_config (nm_active_connection_get_ip6_config(), which also works with VPN connections.

-

Parameters

+

Parameters

@@ -1339,7 +1350,7 @@ works with VPN connections.

-

Returns

+

Returns

the IPv6 NMIPConfig or NULL if the device is not activated.

[transfer none]

@@ -1353,7 +1364,7 @@ nm_device_get_dhcp6_config (nm_active_connection_get_dhcp6_config(), which also works with VPN connections.

-

Parameters

+

Parameters

@@ -1368,7 +1379,7 @@ works with VPN connections.

-

Returns

+

Returns

the IPv6 NMDhcpConfig, or NULL if the device is not activated or not using DHCPv6.

[transfer none]

@@ -1381,7 +1392,7 @@ not activated or not using DHCPv6.

nm_device_get_state (NMDevice *device);

Gets the current NMDevice state.

-

Parameters

+

Parameters

@@ -1396,7 +1407,7 @@ nm_device_get_state ( -

Returns

+

Returns

the current device state

@@ -1407,7 +1418,7 @@ nm_device_get_state (NMDevice *device);

Gets the reason for entering the current NMDevice state.

-

Parameters

+

Parameters

@@ -1422,7 +1433,7 @@ nm_device_get_state_reason ( -

Returns

+

Returns

the reason for entering the current device state

@@ -1433,7 +1444,7 @@ nm_device_get_state_reason (NMDevice *device);

Gets the NMActiveConnection object which owns this device during activation.

-

Parameters

+

Parameters

@@ -1448,7 +1459,7 @@ nm_device_get_active_connection (
-

Returns

+

Returns

the NMActiveConnection or NULL if the device is not part of an active connection.

[transfer none]

@@ -1463,7 +1474,7 @@ nm_device_get_available_connections (device .

-

Parameters

+

Parameters

@@ -1478,7 +1489,7 @@ be activated on device
-

Returns

+

Returns

the GPtrArray containing NMRemoteConnections. This is the internal copy used by the connection, and must not be modified.

@@ -1495,7 +1506,7 @@ an opaque string that can be used to recognize when seemingly-unrelated NMDevices are actually just different virtual ports on a single physical port. (Eg, NPAR / SR-IOV.)

-

Parameters

+

Parameters

@@ -1510,7 +1521,7 @@ ports on a single physical port. (Eg, NPAR / SR-IOV.)

-

Returns

+

Returns

the physical port ID of the device, or NULL if the port ID is unknown. This is the internal string used by the device and must not be modified.

@@ -1523,7 +1534,7 @@ must not be modified.

nm_device_get_mtu (NMDevice *device);

Gets the MTU of the NMDevice.

-

Parameters

+

Parameters

@@ -1538,7 +1549,7 @@ nm_device_get_mtu ( -

Returns

+

Returns

the MTU of the device.

@@ -1548,7 +1559,7 @@ nm_device_get_mtu (gboolean nm_device_is_real (NMDevice *device);
-

Parameters

+

Parameters

@@ -1563,7 +1574,7 @@ nm_device_is_real ( -

Returns

+

Returns

TRUE if the device exists, or FALSE if it is a placeholder device that could be automatically created by NetworkManager if one of its “available-connections” was activated.

@@ -1577,7 +1588,7 @@ that could be automatically created by NetworkManager if one of its nm_device_is_software (NMDevice *device);

Whether the device is a software device.

-

Parameters

+

Parameters

@@ -1592,7 +1603,7 @@ nm_device_is_software ( -

Returns

+

Returns

TRUE if device is a software device, FALSE if it is a hardware device.

@@ -1604,7 +1615,7 @@ is a software device, FALSE if it is a hardware dev nm_device_get_product (NMDevice *device);

Gets the product string of the NMDevice.

-

Parameters

+

Parameters

@@ -1619,7 +1630,7 @@ nm_device_get_product ( -

Returns

+

Returns

the product name of the device. This is the internal string used by the device, and must not be modified.

@@ -1631,7 +1642,7 @@ device, and must not be modified.

nm_device_get_vendor (NMDevice *device);

Gets the vendor string of the NMDevice.

-

Parameters

+

Parameters

@@ -1646,7 +1657,7 @@ nm_device_get_vendor ( -

Returns

+

Returns

the vendor name of the device. This is the internal string used by the device, and must not be modified.

@@ -1659,7 +1670,7 @@ nm_device_get_description (device , based on its vendor and product names.

-

Parameters

+

Parameters

@@ -1674,7 +1685,7 @@ nm_device_get_description ( -

Returns

+

Returns

a description of device . If either the vendor or the product name is unknown, this returns the interface name.

@@ -1687,7 +1698,7 @@ product name is unknown, this returns the interface name.

nm_device_get_metered (NMDevice *device);

Gets the metered setting of a NMDevice.

-

Parameters

+

Parameters

@@ -1702,7 +1713,7 @@ nm_device_get_metered ( -

Returns

+

Returns

the metered setting.

Since: 1.2

@@ -1714,7 +1725,7 @@ nm_device_get_metered (NMDevice *device);

Gets the list of neighbors discovered through LLDP.

-

Parameters

+

Parameters

@@ -1729,7 +1740,7 @@ nm_device_get_lldp_neighbors ( -

Returns

+

Returns

the GPtrArray containing NMLldpNeighbors. This is the internal copy used by the device and must not be modified. The library never modifies the returned @@ -1748,7 +1759,7 @@ nm_device_disambiguate_names (devices .

-

Parameters

+

Parameters

@@ -1771,7 +1782,7 @@ devices in devices
-

Returns

+

Returns

the device names.

[transfer full][array zero-terminated=1]

@@ -1781,7 +1792,7 @@ devices in devices

nm_device_reapply ()

gboolean
 nm_device_reapply (NMDevice *device,
-                   NMConnection *connection,
+                   NMConnection *connection,
                    guint64 version_id,
                    guint32 flags,
                    GCancellable *cancellable,
@@ -1789,7 +1800,7 @@ nm_device_reapply (
-

Parameters

+

Parameters

@@ -1804,7 +1815,7 @@ made since it was last applied.

- + @@ -1833,7 +1844,7 @@ catch concurrent accesses.

connection

the NMConnection to replace the applied settings with or NULL to reuse existing

the NMConnection to replace the applied settings with or NULL to reuse existing

 
-

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -1844,7 +1855,7 @@ will be set.

nm_device_reapply_async ()

void
 nm_device_reapply_async (NMDevice *device,
-                         NMConnection *connection,
+                         NMConnection *connection,
                          guint64 version_id,
                          guint32 flags,
                          GCancellable *cancellable,
@@ -1853,7 +1864,7 @@ nm_device_reapply_async (
-

Parameters

+

Parameters

@@ -1868,7 +1879,7 @@ currently active connection made since it was last applied.

- + @@ -1913,7 +1924,7 @@ nm_device_reapply_finish (GError **error);

Gets the result of a call to nm_device_reapply_async().

-

Parameters

+

Parameters

connection

the NMConnection to replace the applied settings with or NULL to reuse existing

the NMConnection to replace the applied settings with or NULL to reuse existing

 
@@ -1940,7 +1951,7 @@ nm_device_reapply_finish ( -

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -1949,7 +1960,7 @@ will be set.


nm_device_get_applied_connection ()

-
NMConnection *
+
NMConnection *
 nm_device_get_applied_connection (NMDevice *device,
                                   guint32 flags,
                                   guint64 *version_id,
@@ -1957,7 +1968,7 @@ nm_device_get_applied_connection (GError **error);

Fetch the currently applied connection on the device.

-

Parameters

+

Parameters

@@ -1995,11 +2006,11 @@ the applied connection.

-

Returns

-

a NMConnection with the currently applied settings +

Returns

+

a NMConnection with the currently applied settings or NULL on error.

The connection is as received from D-Bus and might not validate according -to nm_connection_verify().

+to nm_connection_verify().

[transfer full]

Since: 1.2

@@ -2016,7 +2027,7 @@ nm_device_get_applied_connection_async gpointer user_data);

Asynchronously begins an get the a currently applied connection.

-

Parameters

+

Parameters

@@ -2058,7 +2069,7 @@ nm_device_get_applied_connection_async

nm_device_get_applied_connection_finish ()

-
NMConnection *
+
NMConnection *
 nm_device_get_applied_connection_finish
                                (NMDevice *device,
                                 GAsyncResult *result,
@@ -2066,7 +2077,7 @@ nm_device_get_applied_connection_finish
                                 GError **error);

Gets the result of a call to nm_device_get_applied_connection_async().

-

Parameters

+

Parameters

@@ -2099,11 +2110,11 @@ connection.

-

Returns

-

a currently applied NMConnection or NULL in case +

Returns

+

a currently applied NMConnection or NULL in case of error.

The connection is as received from D-Bus and might not validate according -to nm_connection_verify().

+to nm_connection_verify().

[transfer full]

Since: 1.2

@@ -2119,7 +2130,7 @@ nm_device_disconnect ( -

Parameters

+

Parameters

@@ -2146,7 +2157,7 @@ request.

-

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -2163,7 +2174,7 @@ nm_device_disconnect_async ( -

Parameters

+

Parameters

@@ -2205,7 +2216,7 @@ nm_device_disconnect_finish (GError **error);

Gets the result of a call to nm_device_disconnect_async().

-

Parameters

+

Parameters

@@ -2232,7 +2243,7 @@ nm_device_disconnect_finish ( -

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -2246,7 +2257,7 @@ nm_device_delete (GError **error);

Deletes the software device. Hardware devices can't be deleted.

-

Parameters

+

Parameters

@@ -2273,7 +2284,7 @@ nm_device_delete ( -

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -2289,7 +2300,7 @@ nm_device_delete_async ( -

Parameters

+

Parameters

@@ -2331,7 +2342,7 @@ nm_device_delete_finish (GError **error);

Gets the result of a call to nm_device_delete_async().

-

Parameters

+

Parameters

@@ -2358,7 +2369,7 @@ nm_device_delete_finish ( -

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

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

-

Parameters

+

Parameters

@@ -2395,16 +2406,16 @@ incompatible with the device. To get the full list of connections see - +

connections

an array of NMConnections to filter.

an array of NMConnections to filter.

[element-type NMConnection]
-

Returns

+

Returns

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

[transfer container][element-type NMConnection]

@@ -2415,7 +2426,7 @@ should be freed with g_ptr_array_unref() when it i

nm_device_connection_valid ()

gboolean
 nm_device_connection_valid (NMDevice *device,
-                            NMConnection *connection);
+ NMConnection *connection);

Validates a given connection for a given NMDevice object and returns whether the connection may be activated with the device. For example if device @@ -2425,7 +2436,7 @@ network, and will not be valid if it describes a WPA network, or if it is an Ethernet, Bluetooth, WWAN, etc connection that is incompatible with the device.

-

Parameters

+

Parameters

@@ -2441,7 +2452,7 @@ against

- @@ -2449,7 +2460,7 @@ against

connection

an NMConnection to validate against device +

an NMConnection to validate against device

 
-

Returns

+

Returns

TRUE if the connection may be activated with this device, FALSE if is incompatible with the device's capabilities and characteristics.

@@ -2459,7 +2470,7 @@ if is incompatible with the device's capabilities and characteristics.

nm_device_connection_compatible ()

gboolean
 nm_device_connection_compatible (NMDevice *device,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  GError **error);

Validates a given connection for a given NMDevice object and returns whether the connection may be activated with the device. For example if @@ -2473,7 +2484,7 @@ device.

compatibility of the given device and connection. But, in addition, it sets GError when FALSE is returned.

-

Parameters

+

Parameters

@@ -2489,7 +2500,7 @@ against

- @@ -2502,7 +2513,7 @@ against

connection

an NMConnection to validate against device +

an NMConnection to validate against device

 
-

Returns

+

Returns

TRUE if the connection may be activated with this device, FALSE if is incompatible with the device's capabilities and characteristics.

@@ -2516,7 +2527,7 @@ nm_device_get_setting_type (device .

-

Parameters

+

Parameters

@@ -2531,7 +2542,7 @@ that can be used on device
-

Returns

+

Returns

device 's associated NMSetting type

@@ -2543,7 +2554,7 @@ that can be used on device nm_lldp_neighbor_new (void);

Creates a new NMLldpNeighbor object.

-

Returns

+

Returns

the new NMLldpNeighbor object.

[transfer full]

@@ -2556,7 +2567,7 @@ nm_lldp_neighbor_new (void nm_lldp_neighbor_ref (NMLldpNeighbor *neighbor);

Increases the reference count of the object.

-

Parameters

+

Parameters

@@ -2580,7 +2591,7 @@ nm_lldp_neighbor_unref ( -

Parameters

+

Parameters

@@ -2604,7 +2615,7 @@ nm_lldp_neighbor_get_attr_names (Gets an array of attribute names available for neighbor .

-

Parameters

+

Parameters

@@ -2619,7 +2630,7 @@ nm_lldp_neighbor_get_attr_names (
-

Returns

+

Returns

a NULL-terminated array of attribute names.

[transfer full]

@@ -2637,7 +2648,7 @@ nm_lldp_neighbor_get_attr_string_value on neighbor

-

Parameters

+

Parameters

@@ -2664,7 +2675,7 @@ nm_lldp_neighbor_get_attr_string_value
-

Returns

+

Returns

TRUE if a string attribute with name name was found, FALSE otherwise

@@ -2681,7 +2692,7 @@ nm_lldp_neighbor_get_attr_uint_value (neighbor

-

Parameters

+

Parameters

@@ -2708,7 +2719,7 @@ nm_lldp_neighbor_get_attr_uint_value ( -

Returns

+

Returns

TRUE if a uint attribute with name name was found, FALSE otherwise

@@ -2722,7 +2733,7 @@ nm_lldp_neighbor_get_attr_type (char *name);

Get the type of an attribute.

-

Parameters

+

Parameters

@@ -2744,7 +2755,7 @@ nm_lldp_neighbor_get_attr_type (
-

Returns

+

Returns

the GVariantType of the attribute with name name

@@ -2914,6 +2925,11 @@ nm_lldp_neighbor_get_attr_type (#define NM_DEVICE_LLDP_NEIGHBORS "lldp-neighbors" +
+
+

NMDevice

+
typedef struct _NMDevice NMDevice;
+

Property Details

@@ -3152,7 +3168,7 @@ user_function (gpointer user_data)

Notifies the state change of a NMDevice.

-

Parameters

+

Parameters

diff --git a/docs/libnm/html/NMDeviceAdsl.html b/docs/libnm/html/NMDeviceAdsl.html index 7c9c5612..f64abd16 100644 --- a/docs/libnm/html/NMDeviceAdsl.html +++ b/docs/libnm/html/NMDeviceAdsl.html @@ -16,7 +16,8 @@ @@ -72,10 +73,16 @@ - + + - + + + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home
#define NM_DEVICE_ADSL_CARRIER
 NMDeviceAdsl
@@ -87,6 +94,12 @@
+

Implemented Interfaces

+

+NMDeviceAdsl implements + GInitable and GAsyncInitable.

+
+

Description

@@ -97,7 +110,7 @@ nm_device_adsl_get_carrier (NMDeviceAdsl *device);

Whether the device has carrier.

-

Parameters

+

Parameters

@@ -112,7 +125,7 @@ nm_device_adsl_get_carrier ( -

Returns

+

Returns

TRUE if the device has carrier

@@ -124,6 +137,11 @@ nm_device_adsl_get_carrier (#define NM_DEVICE_ADSL_CARRIER "carrier" +
+
+

NMDeviceAdsl

+
typedef struct _NMDeviceAdsl NMDeviceAdsl;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html index b99d8ba3..b135cfb0 100644 --- a/docs/libnm/html/NMDeviceBond.html +++ b/docs/libnm/html/NMDeviceBond.html @@ -16,7 +16,8 @@
@@ -115,6 +116,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_DEVICE_BOND_SLAVES
 NMDeviceBond
@@ -127,6 +132,12 @@
+

Implemented Interfaces

+

+NMDeviceBond implements + GInitable and GAsyncInitable.

+
+

Description

@@ -137,7 +148,7 @@ nm_device_bond_get_hw_address (NMDeviceBond *device);

Gets the hardware (MAC) address of the NMDeviceBond

-

Parameters

+

Parameters

@@ -152,7 +163,7 @@ nm_device_bond_get_hw_address (
-

Returns

+

Returns

the hardware address. This is the internal string used by the device, and must not be modified.

@@ -164,7 +175,7 @@ device, and must not be modified.

nm_device_bond_get_carrier (NMDeviceBond *device);

Whether the device has carrier.

-

Parameters

+

Parameters

@@ -179,7 +190,7 @@ nm_device_bond_get_carrier ( -

Returns

+

Returns

TRUE if the device has carrier

@@ -191,7 +202,7 @@ nm_device_bond_get_slaves (device .

-

Parameters

+

Parameters

@@ -206,7 +217,7 @@ nm_device_bond_get_slaves ( -

Returns

+

Returns

the GPtrArray containing NMDevices that are slaves of device . This is the internal @@ -234,6 +245,11 @@ copy used by the device, and must not be modified.

#define NM_DEVICE_BOND_SLAVES      "slaves"
 
+
+
+

NMDeviceBond

+
typedef struct _NMDeviceBond NMDeviceBond;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html index dee83c75..4015e5b6 100644 --- a/docs/libnm/html/NMDeviceBridge.html +++ b/docs/libnm/html/NMDeviceBridge.html @@ -16,7 +16,8 @@
@@ -115,6 +116,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_DEVICE_BRIDGE_SLAVES
 NMDeviceBridge
@@ -127,6 +132,12 @@
+

Implemented Interfaces

+

+NMDeviceBridge implements + GInitable and GAsyncInitable.

+
+

Description

@@ -137,7 +148,7 @@ nm_device_bridge_get_hw_address (NMDeviceBridge *device);

Gets the hardware (MAC) address of the NMDeviceBridge

-

Parameters

+

Parameters

@@ -152,7 +163,7 @@ nm_device_bridge_get_hw_address (
-

Returns

+

Returns

the hardware address. This is the internal string used by the device, and must not be modified.

@@ -164,7 +175,7 @@ device, and must not be modified.

nm_device_bridge_get_carrier (NMDeviceBridge *device);

Whether the device has carrier.

-

Parameters

+

Parameters

@@ -179,7 +190,7 @@ nm_device_bridge_get_carrier ( -

Returns

+

Returns

TRUE if the device has carrier

@@ -191,7 +202,7 @@ nm_device_bridge_get_slaves (device .

-

Parameters

+

Parameters

@@ -206,7 +217,7 @@ nm_device_bridge_get_slaves ( -

Returns

+

Returns

the GPtrArray containing NMDevices that are slaves of device . This is the internal @@ -234,6 +245,11 @@ copy used by the device, and must not be modified.

#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
 
+
+
+

NMDeviceBridge

+
typedef struct _NMDeviceBridge NMDeviceBridge;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceBt.html b/docs/libnm/html/NMDeviceBt.html index b8cb2689..9d3b379b 100644 --- a/docs/libnm/html/NMDeviceBt.html +++ b/docs/libnm/html/NMDeviceBt.html @@ -16,7 +16,8 @@
@@ -115,6 +116,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_DEVICE_BT_CAPABILITIES
 NMDeviceBt
@@ -127,6 +132,12 @@
+

Implemented Interfaces

+

+NMDeviceBt implements + GInitable and GAsyncInitable.

+
+

Description

@@ -137,7 +148,7 @@ nm_device_bt_get_hw_address (NMDeviceBt *device);

Gets the hardware (MAC) address of the NMDeviceBt

-

Parameters

+

Parameters

@@ -152,7 +163,7 @@ nm_device_bt_get_hw_address ( -

Returns

+

Returns

the hardware address. This is the internal string used by the device, and must not be modified.

@@ -164,7 +175,7 @@ device, and must not be modified.

nm_device_bt_get_name (NMDeviceBt *device);

Gets the name of the NMDeviceBt.

-

Parameters

+

Parameters

@@ -179,7 +190,7 @@ nm_device_bt_get_name ( -

Returns

+

Returns

the name of the device

@@ -190,7 +201,7 @@ nm_device_bt_get_name (NMDeviceBt *device);

Returns the Bluetooth device's usable capabilities.

-

Parameters

+

Parameters

@@ -205,7 +216,7 @@ nm_device_bt_get_capabilities (
-

Returns

+

Returns

a combination of NMBluetoothCapabilities

@@ -229,6 +240,11 @@ nm_device_bt_get_capabilities (#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities" +
+
+

NMDeviceBt

+
typedef struct _NMDeviceBt NMDeviceBt;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceEthernet.html b/docs/libnm/html/NMDeviceEthernet.html index 0b6dc4a2..68bfbd7a 100644 --- a/docs/libnm/html/NMDeviceEthernet.html +++ b/docs/libnm/html/NMDeviceEthernet.html @@ -16,7 +16,8 @@
@@ -148,6 +149,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_DEVICE_ETHERNET_S390_SUBCHANNELS
 NMDeviceEthernet
@@ -160,6 +165,12 @@
+

Implemented Interfaces

+

+NMDeviceEthernet implements + GInitable and GAsyncInitable.

+
+

Description

@@ -170,7 +181,7 @@ nm_device_ethernet_get_hw_address (NMDeviceEthernet *device);

Gets the active hardware (MAC) address of the NMDeviceEthernet

-

Parameters

+

Parameters

@@ -185,7 +196,7 @@ nm_device_ethernet_get_hw_address (
-

Returns

+

Returns

the active hardware address. This is the internal string used by the device, and must not be modified.

@@ -198,7 +209,7 @@ nm_device_ethernet_get_permanent_hw_address (NMDeviceEthernet *device);

Gets the permanent hardware (MAC) address of the NMDeviceEthernet

-

Parameters

+

Parameters

@@ -213,7 +224,7 @@ nm_device_ethernet_get_permanent_hw_address
-

Returns

+

Returns

the permanent hardware address. This is the internal string used by the device, and must not be modified.

@@ -225,7 +236,7 @@ device, and must not be modified.

nm_device_ethernet_get_speed (NMDeviceEthernet *device);

Gets the speed of the NMDeviceEthernet.

-

Parameters

+

Parameters

@@ -240,7 +251,7 @@ nm_device_ethernet_get_speed ( -

Returns

+

Returns

the speed of the device

@@ -251,7 +262,7 @@ nm_device_ethernet_get_speed (NMDeviceEthernet *device);

Whether the device has carrier.

-

Parameters

+

Parameters

@@ -266,7 +277,7 @@ nm_device_ethernet_get_carrier (
-

Returns

+

Returns

TRUE if the device has carrier

@@ -278,7 +289,7 @@ nm_device_ethernet_get_s390_subchannels (NMDeviceEthernet *device);

Return the list of s390 subchannels if the device supports them.

-

Parameters

+

Parameters

@@ -293,7 +304,7 @@ nm_device_ethernet_get_s390_subchannels
-

Returns

+

Returns

array of strings, each specifying one subchannel the s390 device uses to communicate to the host.

[transfer none][element-type utf8]

@@ -332,6 +343,11 @@ one subchannel the s390 device uses to communicate to the host.

#define NM_DEVICE_ETHERNET_S390_SUBCHANNELS "s390-subchannels"
 
+
+
+

NMDeviceEthernet

+
typedef struct _NMDeviceEthernet NMDeviceEthernet;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceGeneric.html b/docs/libnm/html/NMDeviceGeneric.html index 8144c52f..e446b89d 100644 --- a/docs/libnm/html/NMDeviceGeneric.html +++ b/docs/libnm/html/NMDeviceGeneric.html @@ -16,7 +16,8 @@ Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home @@ -89,6 +90,10 @@ #define NM_DEVICE_GENERIC_TYPE_DESCRIPTION + +  +NMDeviceGeneric +
@@ -101,6 +106,12 @@
+

Implemented Interfaces

+

+NMDeviceGeneric implements + GInitable and GAsyncInitable.

+
+

Description

@@ -111,7 +122,7 @@ nm_device_generic_get_hw_address (NMDeviceGeneric *device);

Gets the hardware address of the NMDeviceGeneric

-

Parameters

+

Parameters

@@ -126,7 +137,7 @@ nm_device_generic_get_hw_address (
-

Returns

+

Returns

the hardware address. This is the internal string used by the device, and must not be modified.

@@ -145,6 +156,11 @@ device, and must not be modified.

#define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description"
 
+
+
+

NMDeviceGeneric

+
typedef struct _NMDeviceGeneric NMDeviceGeneric;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceIPTunnel.html b/docs/libnm/html/NMDeviceIPTunnel.html index 771b9c45..310bf608 100644 --- a/docs/libnm/html/NMDeviceIPTunnel.html +++ b/docs/libnm/html/NMDeviceIPTunnel.html @@ -16,7 +16,8 @@
@@ -252,6 +253,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_DEVICE_IP_TUNNEL_FLOW_LABEL
 NMDeviceIPTunnel
@@ -264,6 +269,12 @@
+

Implemented Interfaces

+

+NMDeviceIPTunnel implements + GInitable and GAsyncInitable.

+
+

Description

@@ -273,7 +284,7 @@
NMDevice *
 nm_device_ip_tunnel_get_parent (NMDeviceIPTunnel *device);
-

Parameters

+

Parameters

@@ -288,7 +299,7 @@ nm_device_ip_tunnel_get_parent (
-

Returns

+

Returns

the device's parent device.

[transfer none]

@@ -300,7 +311,7 @@ nm_device_ip_tunnel_get_parent (NMIPTunnelMode nm_device_ip_tunnel_get_mode (NMDeviceIPTunnel *device);
-

Parameters

+

Parameters

@@ -315,7 +326,7 @@ nm_device_ip_tunnel_get_mode ( -

Returns

+

Returns

the tunneling mode

Since: 1.2

@@ -326,7 +337,7 @@ nm_device_ip_tunnel_get_mode (const char * nm_device_ip_tunnel_get_local (NMDeviceIPTunnel *device);
-

Parameters

+

Parameters

@@ -341,7 +352,7 @@ nm_device_ip_tunnel_get_local (
-

Returns

+

Returns

the local endpoint of the tunnel

Since: 1.2

@@ -352,7 +363,7 @@ nm_device_ip_tunnel_get_local (const char * nm_device_ip_tunnel_get_remote (NMDeviceIPTunnel *device);
-

Parameters

+

Parameters

@@ -367,7 +378,7 @@ nm_device_ip_tunnel_get_remote (
-

Returns

+

Returns

the remote endpoint of the tunnel

Since: 1.2

@@ -378,7 +389,7 @@ nm_device_ip_tunnel_get_remote (guint8 nm_device_ip_tunnel_get_ttl (NMDeviceIPTunnel *device);
-

Parameters

+

Parameters

@@ -393,7 +404,7 @@ nm_device_ip_tunnel_get_ttl ( -

Returns

+

Returns

the TTL assigned to tunneled packets

Since: 1.2

@@ -404,7 +415,7 @@ nm_device_ip_tunnel_get_ttl (guint8 nm_device_ip_tunnel_get_tos (NMDeviceIPTunnel *device);
-

Parameters

+

Parameters

@@ -419,7 +430,7 @@ nm_device_ip_tunnel_get_tos ( -

Returns

+

Returns

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

@@ -432,7 +443,7 @@ to tunneled packets.

nm_device_ip_tunnel_get_path_mtu_discovery (NMDeviceIPTunnel *device);
-

Parameters

+

Parameters

@@ -447,7 +458,7 @@ nm_device_ip_tunnel_get_path_mtu_discovery
-

Returns

+

Returns

whether path MTU discovery is enabled

Since: 1.2

@@ -458,7 +469,7 @@ nm_device_ip_tunnel_get_path_mtu_discovery
const char *
 nm_device_ip_tunnel_get_input_key (NMDeviceIPTunnel *device);
-

Parameters

+

Parameters

@@ -473,7 +484,7 @@ nm_device_ip_tunnel_get_input_key (
-

Returns

+

Returns

the key used for incoming packets

Since: 1.2

@@ -484,7 +495,7 @@ nm_device_ip_tunnel_get_input_key (const char * nm_device_ip_tunnel_get_output_key (NMDeviceIPTunnel *device);
-

Parameters

+

Parameters

@@ -499,7 +510,7 @@ nm_device_ip_tunnel_get_output_key (
-

Returns

+

Returns

the key used for outgoing packets

Since: 1.2

@@ -511,7 +522,7 @@ nm_device_ip_tunnel_get_output_key (NMDeviceIPTunnel *device);
-

Parameters

+

Parameters

@@ -526,7 +537,7 @@ nm_device_ip_tunnel_get_encapsulation_limit
-

Returns

+

Returns

the maximum permitted encapsulation level

Since: 1.2

@@ -537,7 +548,7 @@ nm_device_ip_tunnel_get_encapsulation_limit
guint
 nm_device_ip_tunnel_get_flow_label (NMDeviceIPTunnel *device);
-

Parameters

+

Parameters

@@ -552,7 +563,7 @@ nm_device_ip_tunnel_get_flow_label (
-

Returns

+

Returns

the flow label assigned to tunnel packets

Since: 1.2

@@ -625,6 +636,11 @@ nm_device_ip_tunnel_get_flow_label (#define NM_DEVICE_IP_TUNNEL_FLOW_LABEL "flow-label" +
+
+

NMDeviceIPTunnel

+
typedef struct _NMDeviceIPTunnel NMDeviceIPTunnel;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceInfiniband.html b/docs/libnm/html/NMDeviceInfiniband.html index ccfcbef2..b6b52604 100644 --- a/docs/libnm/html/NMDeviceInfiniband.html +++ b/docs/libnm/html/NMDeviceInfiniband.html @@ -16,7 +16,8 @@
@@ -98,6 +99,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_DEVICE_INFINIBAND_CARRIER
 NMDeviceInfiniband
@@ -110,6 +115,12 @@
+

Implemented Interfaces

+

+NMDeviceInfiniband implements + GInitable and GAsyncInitable.

+
+

Description

@@ -120,7 +131,7 @@ nm_device_infiniband_get_hw_address (NMDeviceInfiniband *device);

Gets the hardware (MAC) address of the NMDeviceInfiniband

-

Parameters

+

Parameters

@@ -135,7 +146,7 @@ nm_device_infiniband_get_hw_address (
-

Returns

+

Returns

the hardware address. This is the internal string used by the device, and must not be modified.

@@ -147,7 +158,7 @@ device, and must not be modified.

nm_device_infiniband_get_carrier (NMDeviceInfiniband *device);

Whether the device has carrier.

-

Parameters

+

Parameters

@@ -162,7 +173,7 @@ nm_device_infiniband_get_carrier (
-

Returns

+

Returns

TRUE if the device has carrier

@@ -180,6 +191,11 @@ nm_device_infiniband_get_carrier (#define NM_DEVICE_INFINIBAND_CARRIER "carrier" +
+
+

NMDeviceInfiniband

+
typedef struct _NMDeviceInfiniband NMDeviceInfiniband;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceMacvlan.html b/docs/libnm/html/NMDeviceMacvlan.html index f5866285..e8850687 100644 --- a/docs/libnm/html/NMDeviceMacvlan.html +++ b/docs/libnm/html/NMDeviceMacvlan.html @@ -16,7 +16,8 @@
@@ -150,6 +151,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_DEVICE_MACVLAN_HW_ADDRESS
 NMDeviceMacvlan
@@ -162,6 +167,12 @@
+

Implemented Interfaces

+

+NMDeviceMacvlan implements + GInitable and GAsyncInitable.

+
+

Description

@@ -171,7 +182,7 @@
NMDevice *
 nm_device_macvlan_get_parent (NMDeviceMacvlan *device);
-

Parameters

+

Parameters

@@ -186,7 +197,7 @@ nm_device_macvlan_get_parent ( -

Returns

+

Returns

the device's parent device.

[transfer none]

@@ -199,7 +210,7 @@ nm_device_macvlan_get_parent (NMDeviceMacvlan *device);

Gets the MACVLAN mode of the device.

-

Parameters

+

Parameters

@@ -214,7 +225,7 @@ nm_device_macvlan_get_mode ( -

Returns

+

Returns

the MACVLAN mode. This is the internal string used by the device, and must not be modified.

@@ -227,7 +238,7 @@ device, and must not be modified.

nm_device_macvlan_get_no_promisc (NMDeviceMacvlan *device);

Gets the no-promiscuous flag of the device.

-

Parameters

+

Parameters

@@ -242,7 +253,7 @@ nm_device_macvlan_get_no_promisc (
-

Returns

+

Returns

the no-promiscuous flag of the device.

Since: 1.2

@@ -254,7 +265,7 @@ nm_device_macvlan_get_no_promisc (NMDeviceMacvlan *device);

Gets the device type (MACVLAN or MACVTAP).

-

Parameters

+

Parameters

@@ -269,7 +280,7 @@ nm_device_macvlan_get_tap ( -

Returns

+

Returns

TRUE if the device is a MACVTAP, FALSE if it is a MACVLAN.

Since: 1.2

@@ -281,7 +292,7 @@ nm_device_macvlan_get_tap (NMDeviceMacvlan *device);

Gets the hardware (MAC) address of the NMDeviceMacvlan

-

Parameters

+

Parameters

@@ -296,7 +307,7 @@ nm_device_macvlan_get_hw_address (
-

Returns

+

Returns

the hardware address. This is the internal string used by the device, and must not be modified.

@@ -334,6 +345,11 @@ device, and must not be modified.

#define NM_DEVICE_MACVLAN_HW_ADDRESS  "hw-address"
 
+
+
+

NMDeviceMacvlan

+
typedef struct _NMDeviceMacvlan NMDeviceMacvlan;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceModem.html b/docs/libnm/html/NMDeviceModem.html index 48227b60..f30e5846 100644 --- a/docs/libnm/html/NMDeviceModem.html +++ b/docs/libnm/html/NMDeviceModem.html @@ -16,7 +16,8 @@
@@ -98,6 +99,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES
 NMDeviceModem
@@ -110,6 +115,12 @@
+

Implemented Interfaces

+

+NMDeviceModem implements + GInitable and GAsyncInitable.

+
+

Description

@@ -123,7 +134,7 @@ nm_device_modem_get_modem_capabilities supports. Not all capabilities are available concurrently however; some may require a firmware reload or reinitialization.

-

Parameters

+

Parameters

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

-

Returns

+

Returns

the generic access technology families the modem supports

@@ -152,7 +163,7 @@ nm_device_modem_get_current_capabilities supports without a firmware reload or reinitialization. This value represents the network types the modem can immediately connect to.

-

Parameters

+

Parameters

@@ -167,7 +178,7 @@ represents the network types the modem can immediately connect to.

-

Returns

+

Returns

the generic access technology families the modem supports without a firmware reload or other reinitialization

@@ -186,6 +197,11 @@ a firmware reload or other reinitialization

#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 
+
+
+

NMDeviceModem

+
typedef struct _NMDeviceModem NMDeviceModem;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceOlpcMesh.html b/docs/libnm/html/NMDeviceOlpcMesh.html index 92f9a5e6..df5a3297 100644 --- a/docs/libnm/html/NMDeviceOlpcMesh.html +++ b/docs/libnm/html/NMDeviceOlpcMesh.html @@ -16,7 +16,8 @@ Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home @@ -116,6 +117,10 @@ #define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL + +  +NMDeviceOlpcMesh +
@@ -128,6 +133,12 @@
+

Implemented Interfaces

+

+NMDeviceOlpcMesh implements + GInitable and GAsyncInitable.

+
+

Description

@@ -138,7 +149,7 @@ nm_device_olpc_mesh_get_hw_address (NMDeviceOlpcMesh *device);

Gets the hardware (MAC) address of the NMDeviceOlpcMesh

-

Parameters

+

Parameters

@@ -153,7 +164,7 @@ nm_device_olpc_mesh_get_hw_address (
-

Returns

+

Returns

the hardware address. This is the internal string used by the device, and must not be modified.

@@ -165,7 +176,7 @@ device, and must not be modified.

nm_device_olpc_mesh_get_companion (NMDeviceOlpcMesh *device);

Gets the companion device of the NMDeviceOlpcMesh.

-

Parameters

+

Parameters

@@ -180,7 +191,7 @@ nm_device_olpc_mesh_get_companion (
-

Returns

+

Returns

the companion of the device of NULL.

[transfer none]

@@ -193,7 +204,7 @@ nm_device_olpc_mesh_get_active_channel (NMDeviceOlpcMesh *device);

Returns the active channel of the NMDeviceOlpcMesh device.

-

Parameters

+

Parameters

@@ -208,7 +219,7 @@ nm_device_olpc_mesh_get_active_channel
-

Returns

+

Returns

active channel of the device

@@ -232,6 +243,11 @@ nm_device_olpc_mesh_get_active_channel
#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
 
+
+
+

NMDeviceOlpcMesh

+
typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html index e166abba..ecfce255 100644 --- a/docs/libnm/html/NMDeviceTeam.html +++ b/docs/libnm/html/NMDeviceTeam.html @@ -16,7 +16,8 @@ Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home @@ -115,6 +116,10 @@ #define NM_DEVICE_TEAM_SLAVES + +  +NMDeviceTeam +
@@ -127,6 +132,12 @@
+

Implemented Interfaces

+

+NMDeviceTeam implements + GInitable and GAsyncInitable.

+
+

Description

@@ -137,7 +148,7 @@ nm_device_team_get_hw_address (NMDeviceTeam *device);

Gets the hardware (MAC) address of the NMDeviceTeam

-

Parameters

+

Parameters

@@ -152,7 +163,7 @@ nm_device_team_get_hw_address (
-

Returns

+

Returns

the hardware address. This is the internal string used by the device, and must not be modified.

@@ -164,7 +175,7 @@ device, and must not be modified.

nm_device_team_get_carrier (NMDeviceTeam *device);

Whether the device has carrier.

-

Parameters

+

Parameters

@@ -179,7 +190,7 @@ nm_device_team_get_carrier ( -

Returns

+

Returns

TRUE if the device has carrier

@@ -191,7 +202,7 @@ nm_device_team_get_slaves (device .

-

Parameters

+

Parameters

@@ -206,7 +217,7 @@ nm_device_team_get_slaves ( -

Returns

+

Returns

the GPtrArray containing NMDevices that are slaves of device . This is the internal @@ -234,6 +245,11 @@ copy used by the device, and must not be modified.

#define NM_DEVICE_TEAM_SLAVES      "slaves"
 
+
+
+

NMDeviceTeam

+
typedef struct _NMDeviceTeam NMDeviceTeam;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceTun.html b/docs/libnm/html/NMDeviceTun.html index 24157784..0fbc5942 100644 --- a/docs/libnm/html/NMDeviceTun.html +++ b/docs/libnm/html/NMDeviceTun.html @@ -16,7 +16,8 @@
@@ -183,6 +184,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_DEVICE_TUN_MULTI_QUEUE
 NMDeviceTun
@@ -195,6 +200,12 @@
+

Implemented Interfaces

+

+NMDeviceTun implements + GInitable and GAsyncInitable.

+
+

Description

@@ -205,7 +216,7 @@ nm_device_tun_get_hw_address (NMDeviceTun *device);

Gets the hardware (MAC) address of the NMDeviceTun

-

Parameters

+

Parameters

@@ -220,7 +231,7 @@ nm_device_tun_get_hw_address ( -

Returns

+

Returns

the hardware address. This is the internal string used by the device, and must not be modified.

@@ -233,7 +244,7 @@ device, and must not be modified.

nm_device_tun_get_mode (NMDeviceTun *device);

Returns the TUN/TAP mode for the device.

-

Parameters

+

Parameters

@@ -248,7 +259,7 @@ nm_device_tun_get_mode ( -

Returns

+

Returns

'tun' or 'tap'

Since: 1.2

@@ -260,7 +271,7 @@ nm_device_tun_get_mode (NMDeviceTun *device);

Gets the tunnel owner.

-

Parameters

+

Parameters

@@ -275,7 +286,7 @@ nm_device_tun_get_owner ( -

Returns

+

Returns

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

Since: 1.2

@@ -287,7 +298,7 @@ nm_device_tun_get_owner (NMDeviceTun *device);

Gets the tunnel group.

-

Parameters

+

Parameters

@@ -302,7 +313,7 @@ nm_device_tun_get_group ( -

Returns

+

Returns

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

Since: 1.2

@@ -320,7 +331,7 @@ nm_device_tun_get_no_pi (NMDeviceTun *device);

Returns whether the NMDeviceTun has the IFF_VNET_HDR flag.

-

Parameters

+

Parameters

@@ -335,7 +346,7 @@ nm_device_tun_get_vnet_hdr ( -

Returns

+

Returns

TRUE if the device has the flag, FALSE otherwise

Since: 1.2

@@ -347,7 +358,7 @@ nm_device_tun_get_vnet_hdr (NMDeviceTun *device);

Returns whether the NMDeviceTun has the IFF_MULTI_QUEUE flag.

-

Parameters

+

Parameters

@@ -362,7 +373,7 @@ nm_device_tun_get_multi_queue (
-

Returns

+

Returns

TRUE if the device doesn't have the flag, FALSE otherwise

Since: 1.2

@@ -411,6 +422,11 @@ nm_device_tun_get_multi_queue (#define NM_DEVICE_TUN_MULTI_QUEUE "multi-queue" +
+
+

NMDeviceTun

+
typedef struct _NMDeviceTun NMDeviceTun;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceVlan.html b/docs/libnm/html/NMDeviceVlan.html index 08ab3bf0..6acd104f 100644 --- a/docs/libnm/html/NMDeviceVlan.html +++ b/docs/libnm/html/NMDeviceVlan.html @@ -16,7 +16,8 @@
@@ -133,6 +134,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_DEVICE_VLAN_VLAN_ID
 NMDeviceVlan
@@ -145,6 +150,12 @@
+

Implemented Interfaces

+

+NMDeviceVlan implements + GInitable and GAsyncInitable.

+
+

Description

@@ -155,7 +166,7 @@ nm_device_vlan_get_hw_address (NMDeviceVlan *device);

Gets the hardware (MAC) address of the NMDeviceVlan

-

Parameters

+

Parameters

@@ -170,7 +181,7 @@ nm_device_vlan_get_hw_address (
-

Returns

+

Returns

the hardware address. This is the internal string used by the device, and must not be modified.

@@ -182,7 +193,7 @@ device, and must not be modified.

nm_device_vlan_get_carrier (NMDeviceVlan *device);

Whether the device has carrier.

-

Parameters

+

Parameters

@@ -197,7 +208,7 @@ nm_device_vlan_get_carrier ( -

Returns

+

Returns

TRUE if the device has carrier

@@ -207,7 +218,7 @@ nm_device_vlan_get_carrier (NMDevice * nm_device_vlan_get_parent (NMDeviceVlan *device);
-

Parameters

+

Parameters

@@ -222,7 +233,7 @@ nm_device_vlan_get_parent ( -

Returns

+

Returns

the device's parent device.

[transfer none]

@@ -233,7 +244,7 @@ nm_device_vlan_get_parent (guint nm_device_vlan_get_vlan_id (NMDeviceVlan *device);
-

Parameters

+

Parameters

@@ -248,7 +259,7 @@ nm_device_vlan_get_vlan_id ( -

Returns

+

Returns

the device's VLAN ID

@@ -278,6 +289,11 @@ nm_device_vlan_get_vlan_id (#define NM_DEVICE_VLAN_VLAN_ID "vlan-id" +
+
+

NMDeviceVlan

+
typedef struct _NMDeviceVlan NMDeviceVlan;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceVxlan.html b/docs/libnm/html/NMDeviceVxlan.html index 074a37fb..98ce3d82 100644 --- a/docs/libnm/html/NMDeviceVxlan.html +++ b/docs/libnm/html/NMDeviceVxlan.html @@ -16,7 +16,8 @@
@@ -371,6 +372,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_DEVICE_VXLAN_DST_PORT
 NMDeviceVxlan
@@ -383,6 +388,12 @@
+

Implemented Interfaces

+

+NMDeviceVxlan implements + GInitable and GAsyncInitable.

+
+

Description

@@ -393,7 +404,7 @@ nm_device_vxlan_get_hw_address (NMDeviceVxlan *device);

Gets the hardware (MAC) address of the NMDeviceVxlan

-

Parameters

+

Parameters

@@ -408,7 +419,7 @@ nm_device_vxlan_get_hw_address (
-

Returns

+

Returns

the hardware address. This is the internal string used by the device, and must not be modified.

@@ -421,7 +432,7 @@ device, and must not be modified.

nm_device_vxlan_get_carrier (NMDeviceVxlan *device);

Whether the device has carrier.

-

Parameters

+

Parameters

@@ -436,7 +447,7 @@ nm_device_vxlan_get_carrier ( -

Returns

+

Returns

TRUE if the device has carrier.

Since: 1.2

@@ -447,7 +458,7 @@ nm_device_vxlan_get_carrier (NMDevice * nm_device_vxlan_get_parent (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -462,7 +473,7 @@ nm_device_vxlan_get_parent ( -

Returns

+

Returns

the device's parent device.

[transfer none]

@@ -474,7 +485,7 @@ nm_device_vxlan_get_parent (guint nm_device_vxlan_get_id (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -489,7 +500,7 @@ nm_device_vxlan_get_id ( -

Returns

+

Returns

the device's VXLAN ID.

Since: 1.2

@@ -500,7 +511,7 @@ nm_device_vxlan_get_id (const char * nm_device_vxlan_get_group (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -515,7 +526,7 @@ nm_device_vxlan_get_group ( -

Returns

+

Returns

The unicast destination IP address or the multicast IP address joined

@@ -527,7 +538,7 @@ IP address joined

const char *
 nm_device_vxlan_get_local (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -542,7 +553,7 @@ nm_device_vxlan_get_local ( -

Returns

+

Returns

the source IP address to use in outgoing packets

Since: 1.2

@@ -553,7 +564,7 @@ nm_device_vxlan_get_local (guint nm_device_vxlan_get_src_port_min (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -568,7 +579,7 @@ nm_device_vxlan_get_src_port_min (
-

Returns

+

Returns

the minimum UDP source port

Since: 1.2

@@ -579,7 +590,7 @@ nm_device_vxlan_get_src_port_min (guint nm_device_vxlan_get_src_port_max (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -594,7 +605,7 @@ nm_device_vxlan_get_src_port_max (
-

Returns

+

Returns

the maximum UDP source port

Since: 1.2

@@ -605,7 +616,7 @@ nm_device_vxlan_get_src_port_max (guint nm_device_vxlan_get_dst_port (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -620,7 +631,7 @@ nm_device_vxlan_get_dst_port ( -

Returns

+

Returns

the UDP destination port

Since: 1.2

@@ -631,7 +642,7 @@ nm_device_vxlan_get_dst_port (gboolean nm_device_vxlan_get_learning (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -646,7 +657,7 @@ nm_device_vxlan_get_learning ( -

Returns

+

Returns

whether address learning is enabled

Since: 1.2

@@ -657,7 +668,7 @@ nm_device_vxlan_get_learning (guint nm_device_vxlan_get_ageing (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -672,7 +683,7 @@ nm_device_vxlan_get_ageing ( -

Returns

+

Returns

the lifetime in seconds of FDB entries learnt by the kernel

Since: 1.2

@@ -683,7 +694,7 @@ nm_device_vxlan_get_ageing (guint nm_device_vxlan_get_tos (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -698,7 +709,7 @@ nm_device_vxlan_get_tos ( -

Returns

+

Returns

the TOS value to use in outgoing packets

Since: 1.2

@@ -709,7 +720,7 @@ nm_device_vxlan_get_tos (guint nm_device_vxlan_get_ttl (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -724,7 +735,7 @@ nm_device_vxlan_get_ttl ( -

Returns

+

Returns

the time-to-live value to use in outgoing packets

Since: 1.2

@@ -735,7 +746,7 @@ nm_device_vxlan_get_ttl (guint nm_device_vxlan_get_limit (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -750,7 +761,7 @@ nm_device_vxlan_get_limit ( -

Returns

+

Returns

the maximum number of entries that can be added to the forwarding table

@@ -762,7 +773,7 @@ forwarding table

gboolean
 nm_device_vxlan_get_proxy (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -777,7 +788,7 @@ nm_device_vxlan_get_proxy ( -

Returns

+

Returns

whether ARP proxy is turned on

Since: 1.2

@@ -788,7 +799,7 @@ nm_device_vxlan_get_proxy (gboolean nm_device_vxlan_get_rsc (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -803,7 +814,7 @@ nm_device_vxlan_get_rsc ( -

Returns

+

Returns

whether route short circuit is turned on

Since: 1.2

@@ -814,7 +825,7 @@ nm_device_vxlan_get_rsc (gboolean nm_device_vxlan_get_l2miss (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -829,7 +840,7 @@ nm_device_vxlan_get_l2miss ( -

Returns

+

Returns

whether netlink LL ADDR miss notifications are generated

Since: 1.2

@@ -840,7 +851,7 @@ nm_device_vxlan_get_l2miss (gboolean nm_device_vxlan_get_l3miss (NMDeviceVxlan *device);
-

Parameters

+

Parameters

@@ -855,7 +866,7 @@ nm_device_vxlan_get_l3miss ( -

Returns

+

Returns

wether netlink IP ADDR miss notifications are generated

Since: 1.2

@@ -970,6 +981,11 @@ nm_device_vxlan_get_l3miss (#define NM_DEVICE_VXLAN_DST_PORT "dst-port" +
+
+

NMDeviceVxlan

+
typedef struct _NMDeviceVxlan NMDeviceVxlan;
+

Property Details

diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html index c9c6128c..bb85020c 100644 --- a/docs/libnm/html/NMDeviceWifi.html +++ b/docs/libnm/html/NMDeviceWifi.html @@ -16,7 +16,8 @@
@@ -255,6 +256,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties  |  Signals #define NM_DEVICE_WIFI_ACCESS_POINTS
 NMDeviceWifi
@@ -267,6 +272,12 @@
+

Implemented Interfaces

+

+NMDeviceWifi implements + GInitable and GAsyncInitable.

+
+

Description

@@ -277,7 +288,7 @@ nm_device_wifi_get_hw_address (NMDeviceWifi *device);

Gets the actual hardware (MAC) address of the NMDeviceWifi

-

Parameters

+

Parameters

@@ -292,7 +303,7 @@ nm_device_wifi_get_hw_address (
-

Returns

+

Returns

the actual hardware address. This is the internal string used by the device, and must not be modified.

@@ -305,7 +316,7 @@ nm_device_wifi_get_permanent_hw_address (NMDeviceWifi *device);

Gets the permanent hardware (MAC) address of the NMDeviceWifi

-

Parameters

+

Parameters

@@ -320,7 +331,7 @@ nm_device_wifi_get_permanent_hw_address
-

Returns

+

Returns

the permanent hardware address. This is the internal string used by the device, and must not be modified.

@@ -332,7 +343,7 @@ device, and must not be modified.

nm_device_wifi_get_mode (NMDeviceWifi *device);

Gets the NMDeviceWifi mode.

-

Parameters

+

Parameters

@@ -347,7 +358,7 @@ nm_device_wifi_get_mode ( -

Returns

+

Returns

the mode

@@ -358,7 +369,7 @@ nm_device_wifi_get_mode (NMDeviceWifi *device);

Gets the bit rate of the NMDeviceWifi in kbit/s.

-

Parameters

+

Parameters

@@ -373,7 +384,7 @@ nm_device_wifi_get_bitrate ( -

Returns

+

Returns

the bit rate (kbit/s)

@@ -384,7 +395,7 @@ nm_device_wifi_get_bitrate (NMDeviceWifi *device);

Gets the Wi-Fi capabilities of the NMDeviceWifi.

-

Parameters

+

Parameters

@@ -399,7 +410,7 @@ nm_device_wifi_get_capabilities (
-

Returns

+

Returns

the capabilities

@@ -411,7 +422,7 @@ nm_device_wifi_get_active_access_point (NMDeviceWifi *device);

Gets the active NMAccessPoint.

-

Parameters

+

Parameters

@@ -426,7 +437,7 @@ nm_device_wifi_get_active_access_point
-

Returns

+

Returns

the access point or NULL if none is active.

[transfer none]

@@ -440,7 +451,7 @@ nm_device_wifi_get_access_point_by_path const char *path);

Gets a NMAccessPoint by path.

-

Parameters

+

Parameters

@@ -462,7 +473,7 @@ nm_device_wifi_get_access_point_by_path
-

Returns

+

Returns

the access point or NULL if none is found.

[transfer none]

@@ -474,7 +485,7 @@ nm_device_wifi_get_access_point_by_path nm_device_wifi_get_access_points (NMDeviceWifi *device);

Gets all the scanned access points of the NMDeviceWifi.

-

Parameters

+

Parameters

@@ -489,7 +500,7 @@ nm_device_wifi_get_access_points (
-

Returns

+

Returns

a GPtrArray containing all the scanned NMAccessPoints. The returned array is owned by the client and should not be modified.

@@ -508,7 +519,7 @@ nm_device_wifi_request_scan ( -

Parameters

+

Parameters

@@ -535,7 +546,7 @@ after that for the scan to complete.

-

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -560,7 +571,7 @@ for the scanning. The argument is the dictionary passed to -

Parameters

+

Parameters

@@ -592,7 +603,7 @@ D-Bus call. Valid otions inside the dictionary are:
-

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -613,7 +624,7 @@ nm_device_wifi_request_scan_async (
-

Parameters

+

Parameters

@@ -668,7 +679,7 @@ for the scanning. The argument is the dictionary passed to -

Parameters

+

Parameters

@@ -716,7 +727,7 @@ nm_device_wifi_request_scan_finish (GError **error);

Gets the result of a call to nm_device_wifi_request_scan_async().

-

Parameters

+

Parameters

@@ -743,7 +754,7 @@ nm_device_wifi_request_scan_finish (
-

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -793,6 +804,11 @@ set.

#define NM_DEVICE_WIFI_ACCESS_POINTS       "access-points"
 
+
+
+

NMDeviceWifi

+
typedef struct _NMDeviceWifi NMDeviceWifi;
+

Property Details

@@ -860,7 +876,7 @@ user_function (gpointer user_data)

Notifies that a NMAccessPoint is added to the Wi-Fi device.

-

Parameters

+

Parameters

@@ -897,7 +913,7 @@ user_function (gpointer user_data)

Notifies that a NMAccessPoint is removed from the Wi-Fi device.

-

Parameters

+

Parameters

diff --git a/docs/libnm/html/NMDeviceWimax.html b/docs/libnm/html/NMDeviceWimax.html index 24c99f8e..5f751d77 100644 --- a/docs/libnm/html/NMDeviceWimax.html +++ b/docs/libnm/html/NMDeviceWimax.html @@ -16,7 +16,8 @@ @@ -232,6 +233,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties  |  Signals #define NM_DEVICE_WIMAX_NSPS
 NMDeviceWimax
@@ -244,6 +249,12 @@
+

Implemented Interfaces

+

+NMDeviceWimax implements + GInitable and GAsyncInitable.

+
+

Description

@@ -258,7 +269,7 @@ nm_device_wimax_get_hw_address (

Gets the hardware (MAC) address of the NMDeviceWimax

-

Parameters

+

Parameters

@@ -273,7 +284,7 @@ nm_device_wimax_get_hw_address (
-

Returns

+

Returns

the hardware address. This is the internal string used by the device, and must not be modified.

@@ -289,7 +300,7 @@ nm_device_wimax_get_active_nsp (

Gets the active NMWimaxNsp.

-

Parameters

+

Parameters

@@ -304,7 +315,7 @@ nm_device_wimax_get_active_nsp (
-

Returns

+

Returns

the access point or NULL if none is active.

[transfer full]

@@ -321,7 +332,7 @@ nm_device_wimax_get_nsp_by_path (

Gets a NMWimaxNsp by path.

-

Parameters

+

Parameters

@@ -343,7 +354,7 @@ nm_device_wimax_get_nsp_by_path (
-

Returns

+

Returns

the access point or NULL if none is found.

[transfer none]

@@ -359,7 +370,7 @@ nm_device_wimax_get_nsps (NMDeviceWimax.

-

Parameters

+

Parameters

@@ -374,7 +385,7 @@ nm_device_wimax_get_nsps ( -

Returns

+

Returns

a GPtrArray containing all the scanned NMWimaxNsps. The returned array is owned by the client and should not be modified.

@@ -394,7 +405,7 @@ nm_device_wimax_get_center_frequency ( -

Parameters

+

Parameters

@@ -409,7 +420,7 @@ device is not connected.

-

Returns

+

Returns

the center frequency in KHz, or 0

@@ -427,7 +438,7 @@ strong the raw received RF signal from the base station is, but does not indicate the overall quality of the radio link. Has no meaning when the device is not connected.

-

Parameters

+

Parameters

@@ -442,7 +453,7 @@ device is not connected.

-

Returns

+

Returns

the RSSI in dBm, or 0

@@ -459,7 +470,7 @@ nm_device_wimax_get_cinr ( -

Parameters

+

Parameters

@@ -474,7 +485,7 @@ meaning when the device is not connected.

-

Returns

+

Returns

the CINR in dB, or 0

@@ -491,7 +502,7 @@ nm_device_wimax_get_tx_power ( -

Parameters

+

Parameters

@@ -506,7 +517,7 @@ nm_device_wimax_get_tx_power ( -

Returns

+

Returns

the TX power in dBm, or 0

@@ -521,7 +532,7 @@ nm_device_wimax_get_bsid ( -

Parameters

+

Parameters

@@ -536,7 +547,7 @@ nm_device_wimax_get_bsid ( -

Returns

+

Returns

the ID of the serving Base Station, or NULL

@@ -590,6 +601,11 @@ nm_device_wimax_get_bsid (#define NM_DEVICE_WIMAX_NSPS "nsps" +
+
+

NMDeviceWimax

+
typedef struct _NMDeviceWimax NMDeviceWimax;
+

Property Details

@@ -708,7 +724,7 @@ user_function (<

WiMAX is no longer supported.

-

Parameters

+

Parameters

@@ -749,7 +765,7 @@ user_function (<

WiMAX is no longer supported.

-

Parameters

+

Parameters

diff --git a/docs/libnm/html/NMDhcpConfig.html b/docs/libnm/html/NMDhcpConfig.html index b506c4b1..407a1341 100644 --- a/docs/libnm/html/NMDhcpConfig.html +++ b/docs/libnm/html/NMDhcpConfig.html @@ -16,7 +16,8 @@ @@ -99,6 +100,10 @@ + + + + @@ -117,6 +122,12 @@
+

Implemented Interfaces

+

+NMDhcpConfig implements + GInitable and GAsyncInitable.

+
+

Description

@@ -127,7 +138,7 @@ nm_dhcp_config_get_family (NMDhcpConfig *config);

Gets the IP address family of the configuration

-

Parameters

+

Parameters

Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home
 NMDhcpConfig
#define NM_DHCP_CONFIG_FAMILY
@@ -142,7 +153,7 @@ nm_dhcp_config_get_family ( -

Returns

+

Returns

the IP address family; either AF_INET or AF_INET6

@@ -154,7 +165,7 @@ nm_dhcp_config_get_family (NMDhcpConfig *config);

Gets all the options contained in the configuration.

-

Parameters

+

Parameters

@@ -169,7 +180,7 @@ nm_dhcp_config_get_options ( -

Returns

+

Returns

the GHashTable containing strings for keys and values. This is the internal copy used by the configuration, and must not be modified.

@@ -184,7 +195,7 @@ nm_dhcp_config_get_one_option (const char *option);

Gets one option by option name.

-

Parameters

+

Parameters

@@ -206,7 +217,7 @@ nm_dhcp_config_get_one_option (
-

Returns

+

Returns

the configuration option's value. This is the internal string used by the configuration, and must not be modified.

@@ -215,6 +226,11 @@ configuration, and must not be modified.

Types and Values

+

NMDhcpConfig

+
typedef struct _NMDhcpConfig NMDhcpConfig;
+
+
+

NM_DHCP_CONFIG_FAMILY

#define NM_DHCP_CONFIG_FAMILY  "family"
 
diff --git a/docs/libnm/html/NMIPConfig.html b/docs/libnm/html/NMIPConfig.html index b21fc882..6435caa6 100644 --- a/docs/libnm/html/NMIPConfig.html +++ b/docs/libnm/html/NMIPConfig.html @@ -16,7 +16,8 @@
@@ -167,6 +168,10 @@ + + + + @@ -209,6 +214,12 @@
+

Implemented Interfaces

+

+NMIPConfig implements + GInitable and GAsyncInitable.

+
+

Description

@@ -219,7 +230,7 @@ nm_ip_config_get_family (NMIPConfig *config);

Gets the IP address family

-

Parameters

+

Parameters

Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home
 NMIPConfig
#define NM_IP_CONFIG_FAMILY
@@ -234,7 +245,7 @@ nm_ip_config_get_family ( -

Returns

+

Returns

the IP address family; either AF_INET or AF_INET6

@@ -246,7 +257,7 @@ nm_ip_config_get_family (NMIPConfig *config);

Gets the IP gateway address.

-

Parameters

+

Parameters

@@ -261,7 +272,7 @@ nm_ip_config_get_gateway ( -

Returns

+

Returns

the IP address of the gateway.

[transfer none]

@@ -273,7 +284,7 @@ nm_ip_config_get_gateway (NMIPConfig *config);

Gets the IP addresses (containing the address, prefix, and gateway).

-

Parameters

+

Parameters

@@ -288,7 +299,7 @@ nm_ip_config_get_addresses ( -

Returns

+

Returns

the GPtrArray containing NMIPAddresses. This is the internal copy used by the configuration and must not be modified. The library never modifies the @@ -303,7 +314,7 @@ returned array and thus it is safe for callers to reference and keep using it. < nm_ip_config_get_routes (NMIPConfig *config);

Gets the routes.

-

Parameters

+

Parameters

@@ -318,7 +329,7 @@ nm_ip_config_get_routes ( -

Returns

+

Returns

the GPtrArray containing NMIPRoutes. This is the internal copy used by the configuration, and must not be modified. The library never modifies the returned array and thus it is @@ -333,7 +344,7 @@ safe for callers to reference and keep using it.

nm_ip_config_get_nameservers (NMIPConfig *config);

Gets the domain name servers (DNS).

-

Parameters

+

Parameters

@@ -348,7 +359,7 @@ nm_ip_config_get_nameservers ( -

Returns

+

Returns

the array of nameserver IP addresses.

[transfer none]

@@ -360,7 +371,7 @@ nm_ip_config_get_nameservers (NMIPConfig *config);

Gets the domain names.

-

Parameters

+

Parameters

@@ -375,7 +386,7 @@ nm_ip_config_get_domains ( -

Returns

+

Returns

the array of domains. (This is never NULL, though it may be 0-length).

[transfer none]

@@ -388,7 +399,7 @@ nm_ip_config_get_domains (NMIPConfig *config);

Gets the DNS searches.

-

Parameters

+

Parameters

@@ -403,7 +414,7 @@ nm_ip_config_get_searches ( -

Returns

+

Returns

the array of DNS search strings. (This is never NULL, though it may be 0-length).

[transfer none]

@@ -416,7 +427,7 @@ nm_ip_config_get_searches (NMIPConfig *config);

Gets the Windows Internet Name Service servers (WINS).

-

Parameters

+

Parameters

@@ -431,7 +442,7 @@ nm_ip_config_get_wins_servers (
-

Returns

+

Returns

the arry of WINS server IP address strings. (This is never NULL, though it may be 0-length.).

[transfer none]

@@ -441,6 +452,11 @@ nm_ip_config_get_wins_servers (

Types and Values

+

NMIPConfig

+
typedef struct _NMIPConfig NMIPConfig;
+
+
+

NM_IP_CONFIG_FAMILY

#define NM_IP_CONFIG_FAMILY "family"
 
diff --git a/docs/libnm/html/NMObject.html b/docs/libnm/html/NMObject.html index c9779152..ccb3f2c9 100644 --- a/docs/libnm/html/NMObject.html +++ b/docs/libnm/html/NMObject.html @@ -16,7 +16,8 @@
@@ -94,6 +95,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_OBJECT_DBUS_CONNECTION
 NMObject
@@ -111,6 +116,12 @@
+

Implemented Interfaces

+

+NMObject implements + GInitable and GAsyncInitable.

+
+

Description

@@ -121,7 +132,7 @@ nm_object_get_path (NMObject *object);

Gets the DBus path of the NMObject.

-

Parameters

+

Parameters

@@ -136,7 +147,7 @@ nm_object_get_path ( -

Returns

+

Returns

the object's path. This is the internal string used by the device, and must not be modified.

@@ -155,6 +166,11 @@ device, and must not be modified.

#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 
+
+
+

NMObject

+
typedef struct _NMObject NMObject;
+

Property Details

diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html index 48fc088c..47dbcbcc 100644 --- a/docs/libnm/html/NMRemoteConnection.html +++ b/docs/libnm/html/NMRemoteConnection.html @@ -16,7 +16,8 @@
@@ -202,6 +203,10 @@ + + + +
Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_REMOTE_CONNECTION_VISIBLE
 NMRemoteConnection
@@ -213,6 +218,12 @@
+

Implemented Interfaces

+

+NMRemoteConnection implements + GInitable, GAsyncInitable and NMConnection.

+
+

Description

@@ -230,7 +241,7 @@ NetworkManager. If save_to_disk is TRUE, the updated connection will be saved to disk; if FALSE, then only the in-memory representation will be changed.

-

Parameters

+

Parameters

@@ -262,7 +273,7 @@ disk; if FALSE, then only the in-memory representat
-

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -284,7 +295,7 @@ nm_remote_connection_commit_changes_async be saved to disk; if FALSE, then only the in-memory representation will be changed.

-

Parameters

+

Parameters

@@ -332,7 +343,7 @@ nm_remote_connection_commit_changes_finish GError **error);

Gets the result of a call to nm_remote_connection_commit_changes_async().

-

Parameters

+

Parameters

@@ -359,7 +370,7 @@ nm_remote_connection_commit_changes_finish
-

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -374,7 +385,7 @@ nm_remote_connection_save ( -

Parameters

+

Parameters

@@ -401,7 +412,7 @@ been written to disk, or if the connection has never been saved.

-

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -417,7 +428,7 @@ nm_remote_connection_save_async (Saves the connection to disk if the connection has changes that have not yet been written to disk, or if the connection has never been saved.

-

Parameters

+

Parameters

@@ -459,7 +470,7 @@ nm_remote_connection_save_finish (GError **error);

Gets the result of a call to nm_remote_connection_save_async().

-

Parameters

+

Parameters

@@ -486,7 +497,7 @@ nm_remote_connection_save_finish (
-

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -500,7 +511,7 @@ nm_remote_connection_delete (GError **error);

Deletes the connection.

-

Parameters

+

Parameters

@@ -527,7 +538,7 @@ nm_remote_connection_delete ( -

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -542,7 +553,7 @@ nm_remote_connection_delete_async (gpointer user_data);

Asynchronously deletes the connection.

-

Parameters

+

Parameters

@@ -584,7 +595,7 @@ nm_remote_connection_delete_finish (GError **error);

Gets the result of a call to nm_remote_connection_delete_async().

-

Parameters

+

Parameters

@@ -611,7 +622,7 @@ nm_remote_connection_delete_finish (
-

Returns

+

Returns

TRUE on success, FALSE on error, in which case error will be set.

@@ -627,7 +638,7 @@ nm_remote_connection_get_secrets (Request the connection's secrets. Note that this is a blocking D-Bus call, not a simple property accessor.

-

Parameters

+

Parameters

@@ -659,7 +670,7 @@ not a simple property accessor.

-

Returns

+

Returns

a GVariant of type NM_VARIANT_TYPE_CONNECTION containing connection 's secrets, or NULL on error.

@@ -677,7 +688,7 @@ nm_remote_connection_get_secrets_async gpointer user_data);

Asynchronously requests the connection's secrets.

-

Parameters

+

Parameters

@@ -725,7 +736,7 @@ nm_remote_connection_get_secrets_finish GError **error);

Gets the result of a call to nm_remote_connection_get_secrets_async().

-

Parameters

+

Parameters

@@ -752,7 +763,7 @@ nm_remote_connection_get_secrets_finish
-

Returns

+

Returns

a GVariant of type NM_VARIANT_TYPE_CONNECTION containing connection 's secrets, or NULL on error.

@@ -765,7 +776,7 @@ containing connection
gboolean
 nm_remote_connection_get_unsaved (NMRemoteConnection *connection);
-

Parameters

+

Parameters

@@ -780,7 +791,7 @@ nm_remote_connection_get_unsaved (
-

Returns

+

Returns

TRUE if the remote connection contains changes that have not been saved to disk, FALSE if the connection is the same as its on-disk representation.

@@ -800,7 +811,7 @@ non-visible connections to callers, but it is possible for a connection's visibility to change after you already have a reference to it.)

-

Parameters

+

Parameters

@@ -815,7 +826,7 @@ reference to it.)

-

Returns

+

Returns

TRUE if the remote connection is visible to the current user, FALSE if not.

@@ -846,6 +857,11 @@ user, FALSE if not.

#define NM_REMOTE_CONNECTION_VISIBLE         "visible"
 
+
+
+

NMRemoteConnection

+
typedef struct _NMRemoteConnection NMRemoteConnection;
+

Property Details

diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html index 3fb7ca3a..b7654a05 100644 --- a/docs/libnm/html/NMSecretAgentOld.html +++ b/docs/libnm/html/NMSecretAgentOld.html @@ -16,7 +16,8 @@ Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home @@ -205,6 +206,10 @@ #define NM_SECRET_AGENT_OLD_CAPABILITIES + +  +NMSecretAgentOld +
@@ -215,6 +220,12 @@
+

Implemented Interfaces

+

+NMSecretAgentOld implements + GInitable and GAsyncInitable.

+
+

Description

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

NMSecretAgentOldGetSecretsFunc ()

void
 (*NMSecretAgentOldGetSecretsFunc) (NMSecretAgentOld *agent,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    GVariant *secrets,
                                    GError *error,
                                    gpointer user_data);
@@ -234,7 +245,7 @@ those secrets or the error.

To easily create the dictionary to return the Wi-Fi PSK, you could do something like this:

-

Example 1. Creating a secrets dictionary

+

Example 1. Creating a secrets dictionary

@@ -264,8 +275,8 @@ something like this:

g_object_set (G_OBJECT (s_wsec), NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK", NULL); -nm_connection_add_setting (secrets, NM_SETTING (s_wsec)); -secrets_dict = nm_connection_to_dbus (secrets, NM_CONNECTION_SERIALIZE_ALL); +nm_connection_add_setting (secrets, NM_SETTING (s_wsec)); +secrets_dict = nm_connection_to_dbus (secrets, NM_CONNECTION_SERIALIZE_ALL);(call the NMSecretAgentOldGetSecretsFunc with secrets_dict) @@ -278,7 +289,7 @@ something like this:


-

Parameters

+

Parameters

@@ -302,9 +313,9 @@ has returned.

@@ -328,14 +339,14 @@ and the value is the secret

NMSecretAgentOldSaveSecretsFunc ()

void
 (*NMSecretAgentOldSaveSecretsFunc) (NMSecretAgentOld *agent,
-                                    NMConnection *connection,
+                                    NMConnection *connection,
                                     GError *error,
                                     gpointer user_data);

Called as a result of a request by NM to save secrets. When the NMSecretAgentOld subclass has finished saving the secrets, this function should be called.

-

Parameters

+

Parameters

secrets

the GVariant of type NM_VARIANT_TYPE_CONNECTION containing the requested -secrets (as created by nm_connection_to_dbus() for example). Each key in secrets +secrets (as created by nm_connection_to_dbus() for example). Each key in secrets should be the name of a NMSetting object (like "802-11-wireless-security") -and each value should be an NM_VARIANT_TYPE_SETTING variant. The sub-dicts +and each value should be an NM_VARIANT_TYPE_SETTING variant. The sub-dicts map string:value, where the string is the setting property name (like "psk") and the value is the secret

 
@@ -375,14 +386,14 @@ has returned.

NMSecretAgentOldDeleteSecretsFunc ()

void
 (*NMSecretAgentOldDeleteSecretsFunc) (NMSecretAgentOld *agent,
-                                      NMConnection *connection,
+                                      NMConnection *connection,
                                       GError *error,
                                       gpointer user_data);

Called as a result of a request by NM to delete secrets. When the NMSecretAgentOld subclass has finished deleting the secrets, this function should be called.

-

Parameters

+

Parameters

@@ -430,7 +441,7 @@ secrets for connections on behalf of its user.

It is a programmer error to attempt to register an agent that is already registered, or in the process of registering.

-

Parameters

+

Parameters

@@ -457,7 +468,7 @@ registered, or in the process of registering.

-

Returns

+

Returns

TRUE if registration was successful, FALSE on error.

@@ -475,7 +486,7 @@ save secrets for connections on behalf of its user.

It is a programmer error to attempt to register an agent that is already registered, or in the process of registering.

-

Parameters

+

Parameters

@@ -517,7 +528,7 @@ nm_secret_agent_old_register_finish (GError **error);

Gets the result of a call to nm_secret_agent_old_register_async().

-

Parameters

+

Parameters

@@ -544,7 +555,7 @@ nm_secret_agent_old_register_finish (
-

Returns

+

Returns

TRUE if registration was successful, FALSE on error.

@@ -559,7 +570,7 @@ nm_secret_agent_old_unregister (
-

Parameters

+

Parameters

@@ -586,7 +597,7 @@ store secrets on behalf of this user.

-

Returns

+

Returns

TRUE if unregistration was successful, FALSE on error

@@ -602,7 +613,7 @@ nm_secret_agent_old_unregister_async ( -

Parameters

+

Parameters

@@ -644,7 +655,7 @@ nm_secret_agent_old_unregister_finish (GError **error);

Gets the result of a call to nm_secret_agent_old_unregister_async().

-

Parameters

+

Parameters

@@ -671,7 +682,7 @@ nm_secret_agent_old_unregister_finish ( -

Returns

+

Returns

TRUE if unregistration was successful, FALSE on error.

@@ -681,7 +692,7 @@ nm_secret_agent_old_unregister_finish (gboolean nm_secret_agent_old_get_registered (NMSecretAgentOld *self);
-

Parameters

+

Parameters

@@ -696,7 +707,7 @@ nm_secret_agent_old_get_registered (
-

Returns

+

Returns

a TRUE if the agent is registered, FALSE if it is not.

@@ -705,7 +716,7 @@ nm_secret_agent_old_get_registered (

nm_secret_agent_old_get_secrets ()

void
 nm_secret_agent_old_get_secrets (NMSecretAgentOld *self,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  const char *setting_name,
                                  const char **hints,
                                  NMSecretAgentGetSecretsFlags flags,
@@ -721,7 +732,7 @@ existing secrets without user interaction, or requesting entirely new
 secrets from the user.

Virtual: get_secrets

-

Parameters

+

Parameters

@@ -736,7 +747,7 @@ secrets from the user.

- + @@ -774,7 +785,7 @@ secrets from the user.

nm_secret_agent_old_save_secrets ()

void
 nm_secret_agent_old_save_secrets (NMSecretAgentOld *self,
-                                  NMConnection *connection,
+                                  NMConnection *connection,
                                   NMSecretAgentOldSaveSecretsFunc callback,
                                   gpointer user_data);

Asynchronously ensures that all secrets inside connection @@ -782,7 +793,7 @@ nm_secret_agent_old_save_secrets (

Virtual: save_secrets

-

Parameters

+

Parameters

connection

the NMConnection for which we're asked secrets

the NMConnection for which we're asked secrets

 
@@ -797,7 +808,7 @@ disk.

- + @@ -820,7 +831,7 @@ disk.

nm_secret_agent_old_delete_secrets ()

void
 nm_secret_agent_old_delete_secrets (NMSecretAgentOld *self,
-                                    NMConnection *connection,
+                                    NMConnection *connection,
                                     NMSecretAgentOldDeleteSecretsFunc callback,
                                     gpointer user_data);

Asynchronously asks the agent to delete all saved secrets belonging to @@ -828,7 +839,7 @@ nm_secret_agent_old_delete_secrets (

Virtual: delete_secrets

-

Parameters

+

Parameters

connection

a NMConnection

a NMConnection

 
@@ -843,7 +854,7 @@ nm_secret_agent_old_delete_secrets ( - + @@ -887,6 +898,11 @@ nm_secret_agent_old_delete_secrets (#define NM_SECRET_AGENT_OLD_CAPABILITIES "capabilities" +
+
+

NMSecretAgentOld

+
typedef struct _NMSecretAgentOld NMSecretAgentOld;
+

Property Details

diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html index 1a8a870f..c392ec1f 100644 --- a/docs/libnm/html/NMSetting.html +++ b/docs/libnm/html/NMSetting.html @@ -207,8 +207,8 @@
- - + + @@ -219,11 +219,11 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingCompareFlags
     ├── NMSettingDiffResult
     ╰── NMSettingMacRandomization
-    GFlags
+    GFlags
     ╰── NMSettingSecretFlags
     GObject
     ╰── NMSetting
@@ -263,7 +263,7 @@
 

Each NMSetting contains properties that describe configuration that applies to a specific network layer (like IPv4 or IPv6 configuration) or device type (like Ethernet, or Wi-Fi). A collection of individual settings together -make up an NMConnection. Each property is strongly typed and usually has +make up an NMConnection. Each property is strongly typed and usually has a number of allowed values. See each NMSetting subclass for a description of properties and allowed values.

@@ -320,7 +320,7 @@ of properties and allowed values.

- + @@ -467,7 +467,7 @@ like 'ppp' or 'wireless' or 'wired'.

nm_setting_verify ()

gboolean
 nm_setting_verify (NMSetting *setting,
-                   NMConnection *connection,
+                   NMConnection *connection,
                    GError **error);

Validates the setting. Each setting's properties have allowed values, and some are dependent on other values (hence the need for connection @@ -490,7 +490,7 @@ failed validation, and in what way that property failed validation.

- @@ -514,7 +514,7 @@ is being verified in isolation.

nm_setting_verify_secrets ()

gboolean
 nm_setting_verify_secrets (NMSetting *setting,
-                           NMConnection *connection,
+                           NMConnection *connection,
                            GError **error);

Verifies the secrets in the setting. The returned GError contains information about which secret of the setting @@ -537,7 +537,7 @@ in some cases connection failure is not desired just for the secrets.

- @@ -994,7 +994,7 @@ two connections.

@@ -1004,7 +1004,7 @@ two connections.

+ + + +

connection

a NMConnection

a NMConnection

 
NMSettingMacRandomization
structNMSetting NMSetting
enum

user_data

User data passed to nm_connection_clear_secrets_with_flags()

User data passed to nm_connection_clear_secrets_with_flags()

 

connection

the NMConnection that setting +

the NMConnection that setting came from, or NULL if setting is being verified in isolation.

connection

the NMConnection that setting +

the NMConnection that setting came from, or NULL if setting is being verified in isolation.

NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT

if this flag is set, - nm_setting_diff() and nm_connection_diff() will also include properties that + nm_setting_diff() and nm_connection_diff() will also include properties that are set to their default value. See also NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT .

NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT

if this flag is set, - nm_setting_diff() and nm_connection_diff() will not include properties that + nm_setting_diff() and nm_connection_diff() will not include properties that are set to their default value. This is the opposite of NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT . If both flags are set together, @@ -1074,8 +1074,8 @@ overridden by user-controlled defaults configuration, is "never".


-

struct NMSetting

-
struct NMSetting;
+

NMSetting

+
typedef struct _NMSetting NMSetting;

The NMSetting struct contains only private data. It should only be accessed through the functions described below.

diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html index a71d5022..16c019d5 100644 --- a/docs/libnm/html/NMSetting8021x.html +++ b/docs/libnm/html/NMSetting8021x.html @@ -952,12 +952,16 @@
#define NM_SETTING_802_1X_SYSTEM_CA_CERTS
 NMSetting8021x

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSetting8021xCKFormat
     ╰── NMSetting8021xCKScheme
     GObject
@@ -3650,6 +3654,11 @@ to a file containing the certificate or key data

#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
 
+
+
+

NMSetting8021x

+
typedef struct _NMSetting8021x NMSetting8021x;
+

Property Details

diff --git a/docs/libnm/html/NMSettingAdsl.html b/docs/libnm/html/NMSettingAdsl.html index 3b890722..ce039df3 100644 --- a/docs/libnm/html/NMSettingAdsl.html +++ b/docs/libnm/html/NMSettingAdsl.html @@ -215,6 +215,10 @@ #define NM_SETTING_ADSL_ENCAPSULATION_LLC + +  +NMSettingAdsl +
@@ -497,6 +501,11 @@ nm_setting_adsl_get_password_flags (#define NM_SETTING_ADSL_ENCAPSULATION_LLC "llc" +
+
+

NMSettingAdsl

+
typedef struct _NMSettingAdsl NMSettingAdsl;
+

Property Details

diff --git a/docs/libnm/html/NMSettingBluetooth.html b/docs/libnm/html/NMSettingBluetooth.html index dc9095c9..51ce06b7 100644 --- a/docs/libnm/html/NMSettingBluetooth.html +++ b/docs/libnm/html/NMSettingBluetooth.html @@ -118,6 +118,10 @@ #define NM_SETTING_BLUETOOTH_TYPE_PANU + +  +NMSettingBluetooth +
@@ -240,6 +244,11 @@ DUN profile.

Connection type describing a connection to devices that support the Bluetooth NAP (Network Access Point) protocol, which accepts connections via PANU.

+
+
+

NMSettingBluetooth

+
typedef struct _NMSettingBluetooth NMSettingBluetooth;
+

Property Details

diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html index 94a98924..1da953e2 100644 --- a/docs/libnm/html/NMSettingBond.html +++ b/docs/libnm/html/NMSettingBond.html @@ -253,6 +253,10 @@ #define NM_SETTING_BOND_OPTION_LP_INTERVAL + +  +NMSettingBond +
@@ -764,6 +768,11 @@ the #define NM_SETTING_BOND_OPTION_LP_INTERVAL "lp_interval" +
+
+

NMSettingBond

+
typedef struct _NMSettingBond NMSettingBond;
+

Property Details

diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html index a5286057..1752d4d5 100644 --- a/docs/libnm/html/NMSettingBridge.html +++ b/docs/libnm/html/NMSettingBridge.html @@ -212,6 +212,10 @@ #define NM_SETTING_BRIDGE_MULTICAST_SNOOPING + +  +NMSettingBridge +
@@ -498,6 +502,11 @@ nm_setting_bridge_get_multicast_snooping
#define NM_SETTING_BRIDGE_MULTICAST_SNOOPING "multicast-snooping"
 
+
+
+

NMSettingBridge

+
typedef struct _NMSettingBridge NMSettingBridge;
+

Property Details

diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html index b6aee68e..f6b9cb84 100644 --- a/docs/libnm/html/NMSettingBridgePort.html +++ b/docs/libnm/html/NMSettingBridgePort.html @@ -127,6 +127,10 @@ #define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE + +  +NMSettingBridgePort +
@@ -257,6 +261,11 @@ nm_setting_bridge_port_get_hairpin_mode
#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
 
+
+
+

NMSettingBridgePort

+
typedef struct _NMSettingBridgePort NMSettingBridgePort;
+

Property Details

diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html index 18180f06..d3533f79 100644 --- a/docs/libnm/html/NMSettingCdma.html +++ b/docs/libnm/html/NMSettingCdma.html @@ -144,6 +144,10 @@ #define NM_SETTING_CDMA_PASSWORD_FLAGS + +  +NMSettingCdma +
@@ -304,6 +308,11 @@ nm_setting_cdma_get_password_flags (#define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags" +
+
+

NMSettingCdma

+
typedef struct _NMSettingCdma NMSettingCdma;
+

Property Details

diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html index 0cb7806e..89b3f606 100644 --- a/docs/libnm/html/NMSettingConnection.html +++ b/docs/libnm/html/NMSettingConnection.html @@ -465,15 +465,15 @@ NMSettingConnectionLldp -struct -NMSettingConnection +  +NMSettingConnection

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingConnectionAutoconnectSlaves
     ╰── NMSettingConnectionLldp
     GObject
@@ -484,8 +484,8 @@
 

Description

The NMSettingConnection object is a NMSetting subclass that describes -properties that apply to all NMConnection objects, regardless of what type -of network connection they describe. Each NMConnection object must contain +properties that apply to all NMConnection objects, regardless of what type +of network connection they describe. Each NMConnection object must contain a NMSettingConnection setting.

@@ -1566,8 +1566,8 @@ should be activated when master is activated.


-

struct NMSettingConnection

-
struct NMSettingConnection;
+

NMSettingConnection

+
typedef struct _NMSettingConnection NMSettingConnection;

The NMSettingConnection struct contains only private data. It should only be accessed through the functions described below.

diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html index a662d108..78829261 100644 --- a/docs/libnm/html/NMSettingDcb.html +++ b/docs/libnm/html/NMSettingDcb.html @@ -397,12 +397,16 @@ #define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS + +  +NMSettingDcb +

Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMSettingDcbFlags
     GObject
     ╰── NMSetting
@@ -1238,6 +1242,11 @@ peer configuration advertisements

#define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS    "priority-traffic-class"
 
+
+
+

NMSettingDcb

+
typedef struct _NMSettingDcb NMSettingDcb;
+

Property Details

diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html index 81cb154a..42d890ef 100644 --- a/docs/libnm/html/NMSettingGeneric.html +++ b/docs/libnm/html/NMSettingGeneric.html @@ -56,10 +56,16 @@ - + + #define NM_SETTING_GENERIC_SETTING_NAME - + + +  +NMSettingGeneric + +
@@ -75,7 +81,7 @@ optional properties that apply to "generic" devices (ie, devices that NetworkManager does not specifically recognize).

There are currently no properties on this object; it exists only to be -the "connection type" setting on NMConnections for generic devices.

+the "connection type" setting on NMConnections for generic devices.

Functions

@@ -98,6 +104,11 @@ nm_setting_generic_new (void#define NM_SETTING_GENERIC_SETTING_NAME "generic"
+
+
+

NMSettingGeneric

+
typedef struct _NMSettingGeneric NMSettingGeneric;
+
@@ -691,6 +695,11 @@ nm_setting_gsm_get_password_flags (#define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id" +
+
+

NMSettingGsm

+
typedef struct _NMSettingGsm NMSettingGsm;
+

Property Details

diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html index 79eb39d2..162a186c 100644 --- a/docs/libnm/html/NMSettingIP4Config.html +++ b/docs/libnm/html/NMSettingIP4Config.html @@ -130,6 +130,10 @@ #define NM_SETTING_IP4_CONFIG_METHOD_DISABLED + +  +NMSettingIP4Config +
@@ -294,6 +298,11 @@ through that interface to the default network.

This connection does not use or require IPv4 address and it should be disabled.

+
+
+

NMSettingIP4Config

+
typedef struct _NMSettingIP4Config NMSettingIP4Config;
+

Property Details

diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html index 8d733c14..0fa2bb56 100644 --- a/docs/libnm/html/NMSettingIP6Config.html +++ b/docs/libnm/html/NMSettingIP6Config.html @@ -142,12 +142,16 @@ enum NMSettingIP6ConfigAddrGenMode + +  +NMSettingIP6Config +

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingIP6ConfigAddrGenMode
     ╰── NMSettingIP6ConfigPrivacy
     GObject
@@ -401,6 +405,11 @@ specified by RFC7217.

Since: 1.2

+
+
+

NMSettingIP6Config

+
typedef struct _NMSettingIP6Config NMSettingIP6Config;
+

Property Details

@@ -409,7 +418,7 @@ specified by RFC7217.

  “addr-gen-mode”            gint

Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", -"stable-privacy" or unset.

+or "stable-privacy".

If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible @@ -421,8 +430,10 @@ identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced.

-

Leaving this unset causes a default that could be subject to change -in future versions to be used.

+

On D-Bus, the absence of an addr-gen-mode setting equals enabling +"stable-privacy". For keyfile plugin, the absence of the setting +on disk means "eui64" so that the property doesn't change on upgrade +from older versions.

Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.

diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html index f2a9fafc..61034747 100644 --- a/docs/libnm/html/NMSettingIPConfig.html +++ b/docs/libnm/html/NMSettingIPConfig.html @@ -917,12 +917,16 @@ #define NM_SETTING_DNS_OPTION_USE_VC + +  +NMSettingIPConfig +

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ├── NMIPAddress
     ╰── NMIPRoute
     GObject
@@ -3728,6 +3732,11 @@ the particular kind of device.

#define NM_SETTING_DNS_OPTION_USE_VC                    "use-vc"
 
+
+
+

NMSettingIPConfig

+
typedef struct _NMSettingIPConfig NMSettingIPConfig;
+

Property Details

diff --git a/docs/libnm/html/NMSettingIPTunnel.html b/docs/libnm/html/NMSettingIPTunnel.html index 795afe74..d3147dda 100644 --- a/docs/libnm/html/NMSettingIPTunnel.html +++ b/docs/libnm/html/NMSettingIPTunnel.html @@ -280,6 +280,10 @@ #define NM_SETTING_IP_TUNNEL_MTU + +  +NMSettingIPTunnel +
@@ -713,6 +717,11 @@ nm_setting_ip_tunnel_get_mtu (#define NM_SETTING_IP_TUNNEL_MTU "mtu" +
+
+

NMSettingIPTunnel

+
typedef struct _NMSettingIPTunnel NMSettingIPTunnel;
+

Property Details

diff --git a/docs/libnm/html/NMSettingInfiniband.html b/docs/libnm/html/NMSettingInfiniband.html index 985657f0..5aa72bd5 100644 --- a/docs/libnm/html/NMSettingInfiniband.html +++ b/docs/libnm/html/NMSettingInfiniband.html @@ -168,6 +168,10 @@ #define NM_SETTING_INFINIBAND_PARENT + +  +NMSettingInfiniband +
@@ -395,6 +399,11 @@ return NULL.)

#define NM_SETTING_INFINIBAND_PARENT         "parent"
 
+
+
+

NMSettingInfiniband

+
typedef struct _NMSettingInfiniband NMSettingInfiniband;
+

Property Details

diff --git a/docs/libnm/html/NMSettingMacvlan.html b/docs/libnm/html/NMSettingMacvlan.html index c96ffbb4..d5d1a207 100644 --- a/docs/libnm/html/NMSettingMacvlan.html +++ b/docs/libnm/html/NMSettingMacvlan.html @@ -145,6 +145,10 @@ NM_SETTING_MACVLAN_TAP +  +NMSettingMacvlan + + enum NMSettingMacvlanMode @@ -153,7 +157,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingMacvlanMode
     GObject
     ╰── NMSetting
@@ -317,9 +321,14 @@ nm_setting_macvlan_get_tap (
+

NMSettingMacvlan

+
typedef struct _NMSettingMacvlan NMSettingMacvlan;
+
+
+

enum NMSettingMacvlanMode

-

Members

+

Members

diff --git a/docs/libnm/html/NMSettingOlpcMesh.html b/docs/libnm/html/NMSettingOlpcMesh.html index 8b6e59fb..900ed774 100644 --- a/docs/libnm/html/NMSettingOlpcMesh.html +++ b/docs/libnm/html/NMSettingOlpcMesh.html @@ -128,6 +128,10 @@ + + + +
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
 NMSettingOlpcMesh
@@ -220,6 +224,11 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 
+
+
+

NMSettingOlpcMesh

+
typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;
+

Property Details

diff --git a/docs/libnm/html/NMSettingPpp.html b/docs/libnm/html/NMSettingPpp.html index a9eb83f6..78e3148f 100644 --- a/docs/libnm/html/NMSettingPpp.html +++ b/docs/libnm/html/NMSettingPpp.html @@ -383,6 +383,10 @@ that require PPP to deliver IP capability

#define NM_SETTING_PPP_LCP_ECHO_INTERVAL + +  +NMSettingPpp +
@@ -978,6 +982,11 @@ nm_setting_ppp_get_lcp_echo_interval (#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval" +
+
+

NMSettingPpp

+
typedef struct _NMSettingPpp NMSettingPpp;
+

Property Details

diff --git a/docs/libnm/html/NMSettingPppoe.html b/docs/libnm/html/NMSettingPppoe.html index 232cb5b4..571c7f95 100644 --- a/docs/libnm/html/NMSettingPppoe.html +++ b/docs/libnm/html/NMSettingPppoe.html @@ -144,6 +144,10 @@ #define NM_SETTING_PPPOE_PASSWORD_FLAGS + +  +NMSettingPppoe +
@@ -305,6 +309,11 @@ nm_setting_pppoe_get_password_flags (#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags" +
+
+

NMSettingPppoe

+
typedef struct _NMSettingPppoe NMSettingPppoe;
+

Property Details

diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html index 41240d6b..07f82316 100644 --- a/docs/libnm/html/NMSettingSerial.html +++ b/docs/libnm/html/NMSettingSerial.html @@ -166,12 +166,16 @@ serial communications

#define NM_SETTING_SERIAL_SEND_DELAY + +  +NMSettingSerial +

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingSerialParity
     GObject
     ╰── NMSetting
@@ -398,6 +402,11 @@ nm_setting_serial_get_send_delay (#define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 
+
+
+

NMSettingSerial

+
typedef struct _NMSettingSerial NMSettingSerial;
+

Property Details

diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html index 56fd8330..c1a62a83 100644 --- a/docs/libnm/html/NMSettingTeam.html +++ b/docs/libnm/html/NMSettingTeam.html @@ -91,6 +91,10 @@ #define NM_SETTING_TEAM_CONFIG + +  +NMSettingTeam +
@@ -158,6 +162,11 @@ nm_setting_team_get_config (#define NM_SETTING_TEAM_CONFIG "config" +
+
+

NMSettingTeam

+
typedef struct _NMSettingTeam NMSettingTeam;
+

Property Details

diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html index 77e59635..5bc4544a 100644 --- a/docs/libnm/html/NMSettingTeamPort.html +++ b/docs/libnm/html/NMSettingTeamPort.html @@ -91,6 +91,10 @@ #define NM_SETTING_TEAM_PORT_CONFIG + +  +NMSettingTeamPort +
@@ -158,6 +162,11 @@ nm_setting_team_port_get_config (#define NM_SETTING_TEAM_PORT_CONFIG "config" +
+
+

NMSettingTeamPort

+
typedef struct _NMSettingTeamPort NMSettingTeamPort;
+

Property Details

diff --git a/docs/libnm/html/NMSettingTun.html b/docs/libnm/html/NMSettingTun.html index b6be30d1..9a7a9fc5 100644 --- a/docs/libnm/html/NMSettingTun.html +++ b/docs/libnm/html/NMSettingTun.html @@ -182,12 +182,16 @@ enum NMSettingTunMode + +  +NMSettingTun +

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingTunMode
     GObject
     ╰── NMSetting
@@ -451,6 +455,11 @@ nm_setting_tun_get_multi_queue (
+
+
+

NMSettingTun

+
typedef struct _NMSettingTun NMSettingTun;
+

Property Details

diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html index ed4cd4f7..61e4bf45 100644 --- a/docs/libnm/html/NMSettingVlan.html +++ b/docs/libnm/html/NMSettingVlan.html @@ -214,6 +214,10 @@ NM_SETTING_VLAN_EGRESS_PRIORITY_MAP +  +NMSettingVlan + + enum NMVlanPriorityMap @@ -226,9 +230,9 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMVlanPriorityMap
-    GFlags
+    GFlags
     ╰── NMVlanFlags
     GObject
     ╰── NMSetting
@@ -738,11 +742,16 @@ overwrote the old value, FALSE if error


+

NMSettingVlan

+
typedef struct _NMSettingVlan NMSettingVlan;
+
+
+

enum NMVlanPriorityMap

A selector for traffic priority maps; these map Linux SKB priorities to 802.1p priorities used in VLANs.

-

Members

+

Members

@@ -773,7 +782,7 @@ to 802.1p priorities used in VLANs.

enum NMVlanFlags

NMVlanFlags values control the behavior of the VLAN interface.

-

Members

+

Members

diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html index a3413677..047769d6 100644 --- a/docs/libnm/html/NMSettingVpn.html +++ b/docs/libnm/html/NMSettingVpn.html @@ -250,6 +250,10 @@ + + + +
#define NM_SETTING_VPN_TIMEOUT
 NMSettingVpn
@@ -823,6 +827,11 @@ nm_setting_vpn_get_timeout (#define NM_SETTING_VPN_TIMEOUT "timeout"
+
+
+

NMSettingVpn

+
typedef struct _NMSettingVpn NMSettingVpn;
+

Property Details

diff --git a/docs/libnm/html/NMSettingVxlan.html b/docs/libnm/html/NMSettingVxlan.html index c22da680..c3189428 100644 --- a/docs/libnm/html/NMSettingVxlan.html +++ b/docs/libnm/html/NMSettingVxlan.html @@ -348,6 +348,10 @@ #define NM_SETTING_VXLAN_L3_MISS + +  +NMSettingVxlan +
@@ -897,6 +901,11 @@ nm_setting_vxlan_get_l3_miss (#define NM_SETTING_VXLAN_L3_MISS "l3-miss" +
+
+

NMSettingVxlan

+
typedef struct _NMSettingVxlan NMSettingVxlan;
+

Property Details

diff --git a/docs/libnm/html/NMSettingWimax.html b/docs/libnm/html/NMSettingWimax.html index d1ea1056..132a0428 100644 --- a/docs/libnm/html/NMSettingWimax.html +++ b/docs/libnm/html/NMSettingWimax.html @@ -110,6 +110,10 @@ #define NM_SETTING_WIMAX_MAC_ADDRESS + +  +NMSettingWimax +
@@ -226,6 +230,11 @@ to.

#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
 
+
+
+

NMSettingWimax

+
typedef struct _NMSettingWimax NMSettingWimax;
+

Property Details

diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html index ea814585..cdb857f4 100644 --- a/docs/libnm/html/NMSettingWired.html +++ b/docs/libnm/html/NMSettingWired.html @@ -385,12 +385,16 @@ #define NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD + +  +NMSettingWired +

Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMSettingWiredWakeOnLan
     GObject
     ╰── NMSetting
@@ -1343,6 +1347,11 @@ are supported by all devices.

#define NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD "wake-on-lan-password"
 
+
+
+

NMSettingWired

+
typedef struct _NMSettingWired NMSettingWired;
+

Property Details

diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html index c75e3666..b9cb002e 100644 --- a/docs/libnm/html/NMSettingWireless.html +++ b/docs/libnm/html/NMSettingWireless.html @@ -417,12 +417,16 @@ enum NMSettingWirelessPowersave + +  +NMSettingWireless +

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWirelessPowersave
     GObject
     ╰── NMSetting
@@ -1335,6 +1339,11 @@ for this connection.

+
+
+

NMSettingWireless

+
typedef struct _NMSettingWireless NMSettingWireless;
+

Property Details

diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html index 82446ce5..9e5098f2 100644 --- a/docs/libnm/html/NMSettingWirelessSecurity.html +++ b/docs/libnm/html/NMSettingWirelessSecurity.html @@ -474,12 +474,16 @@ use WEP, LEAP, WPA or WPA2/RSN security

#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS + +  +NMSettingWirelessSecurity +

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMWepKeyType
     GObject
     ╰── NMSetting
@@ -1600,6 +1604,11 @@ the actual WEP key using the MD5 hash algorithm.

#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 
+
+
+

NMSettingWirelessSecurity

+
typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;
+

Property Details

diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html index d6bf39e4..b96c0029 100644 --- a/docs/libnm/html/NMSimpleConnection.html +++ b/docs/libnm/html/NMSimpleConnection.html @@ -6,7 +6,7 @@ - + @@ -16,11 +16,12 @@ Top  |  Description  |  - Object Hierarchy + Object Hierarchy  |  + Implemented Interfaces Home Up -Prev +Prev Next
@@ -42,7 +43,7 @@ -NMConnection * +NMConnection * nm_simple_connection_new () @@ -50,7 +51,7 @@ -NMConnection * +NMConnection * nm_simple_connection_new_from_dbus () @@ -58,7 +59,7 @@ -NMConnection * +NMConnection * nm_simple_connection_new_clone () @@ -68,40 +69,59 @@
+

Types and Values

+
++++ + + + + +
 NMSimpleConnection
+
+

Object Hierarchy

    GObject
     ╰── NMSimpleConnection
 
+

Implemented Interfaces

+

+NMSimpleConnection implements + NMConnection.

+
+

Description

Functions

nm_simple_connection_new ()

-
NMConnection *
+
NMConnection *
 nm_simple_connection_new (void);

Creates a new NMSimpleConnection object with no NMSetting objects. An NMSimpleConnection does not directly represent a D-Bus-exported connection, but might be used in the process of creating a new one.

-

Returns

-

the new empty NMConnection object.

+

Returns

+

the new empty NMConnection object.

[transfer full]


nm_simple_connection_new_from_dbus ()

-
NMConnection *
+
NMConnection *
 nm_simple_connection_new_from_dbus (GVariant *dict,
                                     GError **error);

Creates a new NMSimpleConnection from a hash table describing the -connection and normalize the connection. See nm_connection_to_dbus() for a +connection and normalize the connection. See nm_connection_to_dbus() for a description of the expected hash table.

-

Parameters

+

Parameters

@@ -123,7 +143,7 @@ description of the expected hash table.

-

Returns

+

Returns

the new NMSimpleConnection object, populated with settings created from the values in the hash table, or NULL if the connection failed to normalize.

@@ -133,11 +153,11 @@ connection failed to normalize.


nm_simple_connection_new_clone ()

-
NMConnection *
-nm_simple_connection_new_clone (NMConnection *connection);
-

Clones an NMConnection as an NMSimpleConnection.

+
NMConnection *
+nm_simple_connection_new_clone (NMConnection *connection);
+

Clones an NMConnection as an NMSimpleConnection.

-

Parameters

+

Parameters

@@ -146,21 +166,25 @@ nm_simple_connection_new_clone (

connection

-
+

the NMConnection to clone

the NMConnection to clone

 
-

Returns

-

a new NMConnection containing the same settings -and properties as the source NMConnection.

+

Returns

+

a new NMConnection containing the same settings +and properties as the source NMConnection.

[transfer full]

Types and Values

+
+

NMSimpleConnection

+
typedef struct _NMSimpleConnection NMSimpleConnection;
+
@@ -126,6 +131,12 @@
+

Implemented Interfaces

+

+NMVpnConnection implements + GInitable and GAsyncInitable.

+
+

Description

@@ -136,7 +147,7 @@ nm_vpn_connection_get_vpn_state (NMVpnConnection *vpn);

Gets the current NMVpnConnection state.

-

Parameters

+

Parameters

@@ -151,7 +162,7 @@ nm_vpn_connection_get_vpn_state (
-

Returns

+

Returns

the VPN state of the active VPN connection.

@@ -162,7 +173,7 @@ nm_vpn_connection_get_vpn_state (NMVpnConnection *vpn);

Gets the VPN login banner of the active NMVpnConnection.

-

Parameters

+

Parameters

@@ -177,7 +188,7 @@ nm_vpn_connection_get_banner ( -

Returns

+

Returns

the VPN login banner of the VPN connection. This is the internal string used by the connection, and must not be modified.

@@ -196,6 +207,11 @@ string used by the connection, and must not be modified.

#define NM_VPN_CONNECTION_BANNER "banner"
 
+
+
+

NMVpnConnection

+
typedef struct _NMVpnConnection NMVpnConnection;
+

Property Details

diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html index ad04d23d..1e807951 100644 --- a/docs/libnm/html/NMVpnEditorPlugin.html +++ b/docs/libnm/html/NMVpnEditorPlugin.html @@ -77,7 +77,7 @@
- + @@ -270,7 +270,7 @@ nm_vpn_editor_plugin_get_capabilities (

nm_vpn_editor_plugin_import ()

-
NMConnection *
+
NMConnection *
 nm_vpn_editor_plugin_import (NMVpnEditorPlugin *plugin,
                              const char *path,
                              GError **error);
@@ -290,7 +290,7 @@ nm_vpn_editor_plugin_import (

path

-
+ @@ -303,7 +303,7 @@ nm_vpn_editor_plugin_import (

Returns

-

a new NMConnection imported from path +

a new NMConnection imported from path , or NULL on error or if the file at path was not recognized by this plugin.

@@ -316,7 +316,7 @@ was not recognized by this plugin.

gboolean
 nm_vpn_editor_plugin_export (NMVpnEditorPlugin *plugin,
                              const char *path,
-                             NMConnection *connection,
+                             NMConnection *connection,
                              GError **error);

@@ -325,7 +325,7 @@ nm_vpn_editor_plugin_export (char * nm_vpn_editor_plugin_get_suggested_filename (NMVpnEditorPlugin *plugin, - NMConnection *connection); + NMConnection *connection);
@@ -522,7 +522,7 @@ if non-NULL.

@@ -131,6 +132,10 @@ + + + +
-NMConnection * +NMConnection * nm_vpn_editor_plugin_import () @@ -192,9 +192,9 @@

Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMVpnEditorPluginCapability
-    GInterface
+    GInterface
     ├── NMVpnEditor
     ╰── NMVpnEditorPlugin
 
@@ -226,7 +226,7 @@ nm_vpn_editor_plugin_factory (GEr

nm_vpn_editor_plugin_get_editor ()

NMVpnEditor *
 nm_vpn_editor_plugin_get_editor (NMVpnEditorPlugin *plugin,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  GError **error);

Parameters

@@ -244,7 +244,7 @@ nm_vpn_editor_plugin_get_editor (

connection

the NMConnection to be edited

the NMConnection to be edited

 

full path to the file to attempt to read into a new NMConnection

full path to the file to attempt to read into a new NMConnection

 

import_from_file ()

Try to import a connection from the specified path. On -success, return a partial NMConnection object. On error, return NULL and +success, return a partial NMConnection object. On error, return NULL and set error with additional information. Note that error can be NULL, in diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html index 6e343d65..980be14e 100644 --- a/docs/libnm/html/NMWimaxNsp.html +++ b/docs/libnm/html/NMWimaxNsp.html @@ -16,7 +16,8 @@

Top  |  Description  |  - Object Hierarchy  |  + Object Hierarchy  |  + Implemented Interfaces  |  Properties Home#define NM_WIMAX_NSP_NETWORK_TYPE
 NMWimaxNsp
@@ -142,6 +147,12 @@
+

Implemented Interfaces

+

+NMWimaxNsp implements + GInitable and GAsyncInitable.

+
+

Description

@@ -152,7 +163,7 @@ nm_wimax_nsp_get_name (NMWimaxNsp *nsp);

Gets the name of the wimax NSP

-

Parameters

+

Parameters

@@ -167,7 +178,7 @@ nm_wimax_nsp_get_name ( -

Returns

+

Returns

the name

@@ -178,7 +189,7 @@ nm_wimax_nsp_get_name (NMWimaxNsp *nsp);

Gets the WPA signal quality of the wimax NSP.

-

Parameters

+

Parameters

@@ -193,7 +204,7 @@ nm_wimax_nsp_get_signal_quality (
-

Returns

+

Returns

the signal quality

@@ -204,7 +215,7 @@ nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp);

Gets the network type of the wimax NSP.

-

Parameters

+

Parameters

@@ -219,7 +230,7 @@ nm_wimax_nsp_get_network_type (
-

Returns

+

Returns

the network type

@@ -234,7 +245,7 @@ return connections which may be activated with the NSP. Any returned connections will match the nsp 's network name and other attributes.

-

Parameters

+

Parameters

@@ -249,7 +260,7 @@ connections will match the nsp - @@ -257,9 +268,9 @@ filter.

connections

an array of NMConnections to +

an array of NMConnections to filter.

[element-type NMConnection]
-

Returns

+

Returns

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

[transfer container][element-type NMConnection]

@@ -270,13 +281,13 @@ be freed with g_ptr_array_unref() when it is no lo

nm_wimax_nsp_connection_valid ()

gboolean
 nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp,
-                               NMConnection *connection);
+ NMConnection *connection);

Validates a given connection against a given WiMAX NSP to ensure that the connection may be activated with that NSP. The connection must match the nsp 's network name and other attributes.

-

Parameters

+

Parameters

@@ -292,7 +303,7 @@ against

- @@ -300,7 +311,7 @@ against

connection

an NMConnection to validate against nsp +

an NMConnection to validate against nsp

 
-

Returns

+

Returns

TRUE if the connection may be activated with this WiMAX NSP, FALSE if it cannot be.

@@ -325,6 +336,11 @@ against

#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 
+
+
+

NMWimaxNsp

+
typedef struct _NMWimaxNsp NMWimaxNsp;
+

Property Details

diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html index 8e4f01ca..277b9132 100644 --- a/docs/libnm/html/api-index-full.html +++ b/docs/libnm/html/api-index-full.html @@ -63,47 +63,51 @@

A

-NMAccessPoint:bssid, object property in NMAccessPoint +NMAccessPoint, struct in nm-types
-NMAccessPoint:flags, object property in NMAccessPoint +NMAccessPoint:bssid, object property in nm-types
-NMAccessPoint:frequency, object property in NMAccessPoint +NMAccessPoint:flags, object property in nm-types
-NMAccessPoint:hw-address, object property in NMAccessPoint +NMAccessPoint:frequency, object property in nm-types
-NMAccessPoint:last-seen, object property in NMAccessPoint +NMAccessPoint:hw-address, object property in nm-types
-NMAccessPoint:max-bitrate, object property in NMAccessPoint +NMAccessPoint:last-seen, object property in nm-types
-NMAccessPoint:mode, object property in NMAccessPoint +NMAccessPoint:max-bitrate, object property in nm-types
-NMAccessPoint:rsn-flags, object property in NMAccessPoint +NMAccessPoint:mode, object property in nm-types
-NMAccessPoint:ssid, object property in NMAccessPoint +NMAccessPoint:rsn-flags, object property in nm-types
-NMAccessPoint:strength, object property in NMAccessPoint +NMAccessPoint:ssid, object property in nm-types
-NMAccessPoint:wpa-flags, object property in NMAccessPoint +NMAccessPoint:strength, object property in nm-types +
+
+
+NMAccessPoint:wpa-flags, object property in nm-types
@@ -199,63 +203,67 @@
-NMActiveConnection:connection, object property in NMActiveConnection +NMActiveConnection, struct in nm-types +
+
+
+NMActiveConnection:connection, object property in nm-types
-NMActiveConnection:default, object property in NMActiveConnection +NMActiveConnection:default, object property in nm-types
-NMActiveConnection:default6, object property in NMActiveConnection +NMActiveConnection:default6, object property in nm-types
-NMActiveConnection:devices, object property in NMActiveConnection +NMActiveConnection:devices, object property in nm-types
-NMActiveConnection:dhcp4-config, object property in NMActiveConnection +NMActiveConnection:dhcp4-config, object property in nm-types
-NMActiveConnection:dhcp6-config, object property in NMActiveConnection +NMActiveConnection:dhcp6-config, object property in nm-types
-NMActiveConnection:id, object property in NMActiveConnection +NMActiveConnection:id, object property in nm-types
-NMActiveConnection:ip4-config, object property in NMActiveConnection +NMActiveConnection:ip4-config, object property in nm-types
-NMActiveConnection:ip6-config, object property in NMActiveConnection +NMActiveConnection:ip6-config, object property in nm-types
-NMActiveConnection:master, object property in NMActiveConnection +NMActiveConnection:master, object property in nm-types
-NMActiveConnection:specific-object-path, object property in NMActiveConnection +NMActiveConnection:specific-object-path, object property in nm-types
-NMActiveConnection:state, object property in NMActiveConnection +NMActiveConnection:state, object property in nm-types
-NMActiveConnection:type, object property in NMActiveConnection +NMActiveConnection:type, object property in nm-types
-NMActiveConnection:uuid, object property in NMActiveConnection +NMActiveConnection:uuid, object property in nm-types
-NMActiveConnection:vpn, object property in NMActiveConnection +NMActiveConnection:vpn, object property in nm-types
@@ -417,115 +425,119 @@

C

-NMClient::any-device-added, object signal in NMClient +NMClient, struct in nm-types
-NMClient::any-device-removed, object signal in NMClient +NMClient::any-device-added, object signal in nm-types
-NMClient::connection-added, object signal in NMClient +NMClient::any-device-removed, object signal in nm-types
-NMClient::connection-removed, object signal in NMClient +NMClient::connection-added, object signal in nm-types
-NMClient::device-added, object signal in NMClient +NMClient::connection-removed, object signal in nm-types
-NMClient::device-removed, object signal in NMClient +NMClient::device-added, object signal in nm-types
-NMClient::permission-changed, object signal in NMClient +NMClient::device-removed, object signal in nm-types
-NMClient:activating-connection, object property in NMClient +NMClient::permission-changed, object signal in nm-types
-NMClient:active-connections, object property in NMClient +NMClient:activating-connection, object property in nm-types
-NMClient:all-devices, object property in NMClient +NMClient:active-connections, object property in nm-types
-NMClient:can-modify, object property in NMClient +NMClient:all-devices, object property in nm-types
-NMClient:connections, object property in NMClient +NMClient:can-modify, object property in nm-types
-NMClient:connectivity, object property in NMClient +NMClient:connections, object property in nm-types
-NMClient:devices, object property in NMClient +NMClient:connectivity, object property in nm-types
-NMClient:hostname, object property in NMClient +NMClient:devices, object property in nm-types
-NMClient:metered, object property in NMClient +NMClient:hostname, object property in nm-types
-NMClient:networking-enabled, object property in NMClient +NMClient:metered, object property in nm-types
-NMClient:nm-running, object property in NMClient +NMClient:networking-enabled, object property in nm-types
-NMClient:primary-connection, object property in NMClient +NMClient:nm-running, object property in nm-types
-NMClient:startup, object property in NMClient +NMClient:primary-connection, object property in nm-types
-NMClient:state, object property in NMClient +NMClient:startup, object property in nm-types
-NMClient:version, object property in NMClient +NMClient:state, object property in nm-types
-NMClient:wimax-enabled, object property in NMClient +NMClient:version, object property in nm-types
-NMClient:wimax-hardware-enabled, object property in NMClient +NMClient:wimax-enabled, object property in nm-types
-NMClient:wireless-enabled, object property in NMClient +NMClient:wimax-hardware-enabled, object property in nm-types
-NMClient:wireless-hardware-enabled, object property in NMClient +NMClient:wireless-enabled, object property in nm-types
-NMClient:wwan-enabled, object property in NMClient +NMClient:wireless-hardware-enabled, object property in nm-types
-NMClient:wwan-hardware-enabled, object property in NMClient +NMClient:wwan-enabled, object property in nm-types +
+
+
+NMClient:wwan-hardware-enabled, object property in nm-types
@@ -877,47 +889,63 @@
+NMConnection, struct in nm-core-types +
+
+
+NMConnection::changed, object signal in nm-core-types +
+
+
+NMConnection::secrets-cleared, object signal in nm-core-types +
+
+
+NMConnection::secrets-updated, object signal in nm-core-types +
+
+
NMConnectionError, enum in nm-errors
-NMConnectionInterface, struct in NMConnection +NMConnectionInterface, struct in NMConnection
-NMConnectionSerializationFlags, enum in NMConnection +NMConnectionSerializationFlags, enum in NMConnection
-nm_connection_add_setting, function in NMConnection +nm_connection_add_setting, function in NMConnection
-NM_CONNECTION_CHANGED, macro in NMConnection +NM_CONNECTION_CHANGED, macro in NMConnection
-nm_connection_clear_secrets, function in NMConnection +nm_connection_clear_secrets, function in NMConnection
-nm_connection_clear_secrets_with_flags, function in NMConnection +nm_connection_clear_secrets_with_flags, function in NMConnection
-nm_connection_clear_settings, function in NMConnection +nm_connection_clear_settings, function in NMConnection
-nm_connection_compare, function in NMConnection +nm_connection_compare, function in NMConnection
-nm_connection_diff, function in NMConnection +nm_connection_diff, function in NMConnection
-nm_connection_dump, function in NMConnection +nm_connection_dump, function in NMConnection
@@ -929,219 +957,219 @@
-nm_connection_for_each_setting_value, function in NMConnection +nm_connection_for_each_setting_value, function in NMConnection
-nm_connection_get_connection_type, function in NMConnection +nm_connection_get_connection_type, function in NMConnection
-nm_connection_get_id, function in NMConnection +nm_connection_get_id, function in NMConnection
-nm_connection_get_interface_name, function in NMConnection +nm_connection_get_interface_name, function in NMConnection
-nm_connection_get_path, function in NMConnection +nm_connection_get_path, function in NMConnection
-nm_connection_get_setting, function in NMConnection +nm_connection_get_setting, function in NMConnection
-nm_connection_get_setting_802_1x, function in NMConnection +nm_connection_get_setting_802_1x, function in NMConnection
-nm_connection_get_setting_adsl, function in NMConnection +nm_connection_get_setting_adsl, function in NMConnection
-nm_connection_get_setting_bluetooth, function in NMConnection +nm_connection_get_setting_bluetooth, function in NMConnection
-nm_connection_get_setting_bond, function in NMConnection +nm_connection_get_setting_bond, function in NMConnection
-nm_connection_get_setting_bridge, function in NMConnection +nm_connection_get_setting_bridge, function in NMConnection
-nm_connection_get_setting_bridge_port, function in NMConnection +nm_connection_get_setting_bridge_port, function in NMConnection
-nm_connection_get_setting_by_name, function in NMConnection +nm_connection_get_setting_by_name, function in NMConnection
-nm_connection_get_setting_cdma, function in NMConnection +nm_connection_get_setting_cdma, function in NMConnection
-nm_connection_get_setting_connection, function in NMConnection +nm_connection_get_setting_connection, function in NMConnection
-nm_connection_get_setting_dcb, function in NMConnection +nm_connection_get_setting_dcb, function in NMConnection
-nm_connection_get_setting_generic, function in NMConnection +nm_connection_get_setting_generic, function in NMConnection
-nm_connection_get_setting_gsm, function in NMConnection +nm_connection_get_setting_gsm, function in NMConnection
-nm_connection_get_setting_infiniband, function in NMConnection +nm_connection_get_setting_infiniband, function in NMConnection
-nm_connection_get_setting_ip4_config, function in NMConnection +nm_connection_get_setting_ip4_config, function in NMConnection
-nm_connection_get_setting_ip6_config, function in NMConnection +nm_connection_get_setting_ip6_config, function in NMConnection
-nm_connection_get_setting_ip_tunnel, function in NMConnection +nm_connection_get_setting_ip_tunnel, function in NMConnection
-nm_connection_get_setting_macvlan, function in NMConnection +nm_connection_get_setting_macvlan, function in NMConnection
-nm_connection_get_setting_olpc_mesh, function in NMConnection +nm_connection_get_setting_olpc_mesh, function in NMConnection
-nm_connection_get_setting_ppp, function in NMConnection +nm_connection_get_setting_ppp, function in NMConnection
-nm_connection_get_setting_pppoe, function in NMConnection +nm_connection_get_setting_pppoe, function in NMConnection
-nm_connection_get_setting_serial, function in NMConnection +nm_connection_get_setting_serial, function in NMConnection
-nm_connection_get_setting_team, function in NMConnection +nm_connection_get_setting_team, function in NMConnection
-nm_connection_get_setting_team_port, function in NMConnection +nm_connection_get_setting_team_port, function in NMConnection
-nm_connection_get_setting_tun, function in NMConnection +nm_connection_get_setting_tun, function in NMConnection
-nm_connection_get_setting_vlan, function in NMConnection +nm_connection_get_setting_vlan, function in NMConnection
-nm_connection_get_setting_vpn, function in NMConnection +nm_connection_get_setting_vpn, function in NMConnection
-nm_connection_get_setting_vxlan, function in NMConnection +nm_connection_get_setting_vxlan, function in NMConnection
-nm_connection_get_setting_wimax, function in NMConnection +nm_connection_get_setting_wimax, function in NMConnection
-nm_connection_get_setting_wired, function in NMConnection +nm_connection_get_setting_wired, function in NMConnection
-nm_connection_get_setting_wireless, function in NMConnection +nm_connection_get_setting_wireless, function in NMConnection
-nm_connection_get_setting_wireless_security, function in NMConnection +nm_connection_get_setting_wireless_security, function in NMConnection
-nm_connection_get_uuid, function in NMConnection +nm_connection_get_uuid, function in NMConnection
-nm_connection_get_virtual_device_description, function in NMConnection +nm_connection_get_virtual_device_description, function in NMConnection
-nm_connection_is_type, function in NMConnection +nm_connection_is_type, function in NMConnection
-nm_connection_is_virtual, function in NMConnection +nm_connection_is_virtual, function in NMConnection
-nm_connection_need_secrets, function in NMConnection +nm_connection_need_secrets, function in NMConnection
-nm_connection_normalize, function in NMConnection +nm_connection_normalize, function in NMConnection
-NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD, macro in NMConnection +NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD, macro in NMConnection
-nm_connection_remove_setting, function in NMConnection +nm_connection_remove_setting, function in NMConnection
-nm_connection_replace_settings, function in NMConnection +nm_connection_replace_settings, function in NMConnection
-nm_connection_replace_settings_from_connection, function in NMConnection +nm_connection_replace_settings_from_connection, function in NMConnection
-NM_CONNECTION_SECRETS_CLEARED, macro in NMConnection +NM_CONNECTION_SECRETS_CLEARED, macro in NMConnection
-NM_CONNECTION_SECRETS_UPDATED, macro in NMConnection +NM_CONNECTION_SECRETS_UPDATED, macro in NMConnection
-nm_connection_set_path, function in NMConnection +nm_connection_set_path, function in NMConnection
-nm_connection_to_dbus, function in NMConnection +nm_connection_to_dbus, function in NMConnection
-nm_connection_update_secrets, function in NMConnection +nm_connection_update_secrets, function in NMConnection
-nm_connection_verify, function in NMConnection +nm_connection_verify, function in NMConnection
-nm_connection_verify_secrets, function in NMConnection +nm_connection_verify_secrets, function in NMConnection
@@ -1450,155 +1478,175 @@
-NMDevice::state-changed, object signal in NMDevice +NMDevice, struct in nm-types +
+
+
+NMDevice::state-changed, object signal in nm-types
-NMDevice:active-connection, object property in NMDevice +NMDevice:active-connection, object property in nm-types
-NMDevice:autoconnect, object property in NMDevice +NMDevice:autoconnect, object property in nm-types
-NMDevice:available-connections, object property in NMDevice +NMDevice:available-connections, object property in nm-types
-NMDevice:capabilities, object property in NMDevice +NMDevice:capabilities, object property in nm-types
-NMDevice:device-type, object property in NMDevice +NMDevice:device-type, object property in nm-types
-NMDevice:dhcp4-config, object property in NMDevice +NMDevice:dhcp4-config, object property in nm-types
-NMDevice:dhcp6-config, object property in NMDevice +NMDevice:dhcp6-config, object property in nm-types
-NMDevice:driver, object property in NMDevice +NMDevice:driver, object property in nm-types
-NMDevice:driver-version, object property in NMDevice +NMDevice:driver-version, object property in nm-types
-NMDevice:firmware-missing, object property in NMDevice +NMDevice:firmware-missing, object property in nm-types
-NMDevice:firmware-version, object property in NMDevice +NMDevice:firmware-version, object property in nm-types
-NMDevice:interface, object property in NMDevice +NMDevice:interface, object property in nm-types
-NMDevice:ip-interface, object property in NMDevice +NMDevice:ip-interface, object property in nm-types
-NMDevice:ip4-config, object property in NMDevice +NMDevice:ip4-config, object property in nm-types
-NMDevice:ip6-config, object property in NMDevice +NMDevice:ip6-config, object property in nm-types
-NMDevice:lldp-neighbors, object property in NMDevice +NMDevice:lldp-neighbors, object property in nm-types
-NMDevice:managed, object property in NMDevice +NMDevice:managed, object property in nm-types
-NMDevice:metered, object property in NMDevice +NMDevice:metered, object property in nm-types
-NMDevice:mtu, object property in NMDevice +NMDevice:mtu, object property in nm-types
-NMDevice:nm-plugin-missing, object property in NMDevice +NMDevice:nm-plugin-missing, object property in nm-types
-NMDevice:physical-port-id, object property in NMDevice +NMDevice:physical-port-id, object property in nm-types
-NMDevice:product, object property in NMDevice +NMDevice:product, object property in nm-types
-NMDevice:real, object property in NMDevice +NMDevice:real, object property in nm-types
-NMDevice:state, object property in NMDevice +NMDevice:state, object property in nm-types
-NMDevice:state-reason, object property in NMDevice +NMDevice:state-reason, object property in nm-types
-NMDevice:udi, object property in NMDevice +NMDevice:udi, object property in nm-types
-NMDevice:vendor, object property in NMDevice +NMDevice:vendor, object property in nm-types
-NMDeviceAdsl:carrier, object property in NMDeviceAdsl +NMDeviceAdsl, struct in nm-types
-NMDeviceBond:carrier, object property in NMDeviceBond +NMDeviceAdsl:carrier, object property in nm-types
-NMDeviceBond:hw-address, object property in NMDeviceBond +NMDeviceBond, struct in nm-types
-NMDeviceBond:slaves, object property in NMDeviceBond +NMDeviceBond:carrier, object property in nm-types
-NMDeviceBridge:carrier, object property in NMDeviceBridge +NMDeviceBond:hw-address, object property in nm-types
-NMDeviceBridge:hw-address, object property in NMDeviceBridge +NMDeviceBond:slaves, object property in nm-types
-NMDeviceBridge:slaves, object property in NMDeviceBridge +NMDeviceBridge, struct in nm-types
-NMDeviceBt:bt-capabilities, object property in NMDeviceBt +NMDeviceBridge:carrier, object property in nm-types
-NMDeviceBt:hw-address, object property in NMDeviceBt +NMDeviceBridge:hw-address, object property in nm-types
-NMDeviceBt:name, object property in NMDeviceBt +NMDeviceBridge:slaves, object property in nm-types +
+
+
+NMDeviceBt, struct in nm-types +
+
+
+NMDeviceBt:bt-capabilities, object property in nm-types +
+
+
+NMDeviceBt:hw-address, object property in nm-types +
+
+
+NMDeviceBt:name, object property in nm-types
@@ -1610,111 +1658,135 @@
-NMDeviceEthernet:carrier, object property in NMDeviceEthernet +NMDeviceEthernet, struct in nm-types +
+
+
+NMDeviceEthernet:carrier, object property in nm-types +
+
+
+NMDeviceEthernet:hw-address, object property in nm-types +
+
+
+NMDeviceEthernet:perm-hw-address, object property in nm-types +
+
+
+NMDeviceEthernet:s390-subchannels, object property in nm-types
-NMDeviceEthernet:hw-address, object property in NMDeviceEthernet +NMDeviceEthernet:speed, object property in nm-types
-NMDeviceEthernet:perm-hw-address, object property in NMDeviceEthernet +NMDeviceGeneric, struct in nm-types
-NMDeviceEthernet:s390-subchannels, object property in NMDeviceEthernet +NMDeviceGeneric:hw-address, object property in nm-types
-NMDeviceEthernet:speed, object property in NMDeviceEthernet +NMDeviceGeneric:type-description, object property in nm-types
-NMDeviceGeneric:hw-address, object property in NMDeviceGeneric +NMDeviceInfiniband, struct in nm-types
-NMDeviceGeneric:type-description, object property in NMDeviceGeneric +NMDeviceInfiniband:carrier, object property in nm-types
-NMDeviceInfiniband:carrier, object property in NMDeviceInfiniband +NMDeviceInfiniband:hw-address, object property in nm-types
-NMDeviceInfiniband:hw-address, object property in NMDeviceInfiniband +NMDeviceIPTunnel, struct in nm-types
-NMDeviceIPTunnel:encapsulation-limit, object property in NMDeviceIPTunnel +NMDeviceIPTunnel:encapsulation-limit, object property in nm-types
-NMDeviceIPTunnel:flow-label, object property in NMDeviceIPTunnel +NMDeviceIPTunnel:flow-label, object property in nm-types
-NMDeviceIPTunnel:input-key, object property in NMDeviceIPTunnel +NMDeviceIPTunnel:input-key, object property in nm-types
-NMDeviceIPTunnel:local, object property in NMDeviceIPTunnel +NMDeviceIPTunnel:local, object property in nm-types
-NMDeviceIPTunnel:mode, object property in NMDeviceIPTunnel +NMDeviceIPTunnel:mode, object property in nm-types
-NMDeviceIPTunnel:output-key, object property in NMDeviceIPTunnel +NMDeviceIPTunnel:output-key, object property in nm-types
-NMDeviceIPTunnel:parent, object property in NMDeviceIPTunnel +NMDeviceIPTunnel:parent, object property in nm-types
-NMDeviceIPTunnel:path-mtu-discovery, object property in NMDeviceIPTunnel +NMDeviceIPTunnel:path-mtu-discovery, object property in nm-types
-NMDeviceIPTunnel:remote, object property in NMDeviceIPTunnel +NMDeviceIPTunnel:remote, object property in nm-types
-NMDeviceIPTunnel:tos, object property in NMDeviceIPTunnel +NMDeviceIPTunnel:tos, object property in nm-types
-NMDeviceIPTunnel:ttl, object property in NMDeviceIPTunnel +NMDeviceIPTunnel:ttl, object property in nm-types
-NMDeviceMacvlan:hw-address, object property in NMDeviceMacvlan +NMDeviceMacvlan, struct in nm-types
-NMDeviceMacvlan:mode, object property in NMDeviceMacvlan +NMDeviceMacvlan:hw-address, object property in nm-types
-NMDeviceMacvlan:no-promisc, object property in NMDeviceMacvlan +NMDeviceMacvlan:mode, object property in nm-types
-NMDeviceMacvlan:parent, object property in NMDeviceMacvlan +NMDeviceMacvlan:no-promisc, object property in nm-types
-NMDeviceMacvlan:tap, object property in NMDeviceMacvlan +NMDeviceMacvlan:parent, object property in nm-types
-NMDeviceModem:current-capabilities, object property in NMDeviceModem +NMDeviceMacvlan:tap, object property in nm-types
-NMDeviceModem:modem-capabilities, object property in NMDeviceModem +NMDeviceModem, struct in nm-types +
+
+
+NMDeviceModem:current-capabilities, object property in nm-types +
+
+
+NMDeviceModem:modem-capabilities, object property in nm-types
@@ -1722,15 +1794,19 @@
-NMDeviceOlpcMesh:active-channel, object property in NMDeviceOlpcMesh +NMDeviceOlpcMesh, struct in nm-types
-NMDeviceOlpcMesh:companion, object property in NMDeviceOlpcMesh +NMDeviceOlpcMesh:active-channel, object property in nm-types
-NMDeviceOlpcMesh:hw-address, object property in NMDeviceOlpcMesh +NMDeviceOlpcMesh:companion, object property in nm-types +
+
+
+NMDeviceOlpcMesh:hw-address, object property in nm-types
@@ -1742,43 +1818,51 @@
-NMDeviceTeam:carrier, object property in NMDeviceTeam +NMDeviceTeam, struct in nm-types +
+
+
+NMDeviceTeam:carrier, object property in nm-types
-NMDeviceTeam:hw-address, object property in NMDeviceTeam +NMDeviceTeam:hw-address, object property in nm-types
-NMDeviceTeam:slaves, object property in NMDeviceTeam +NMDeviceTeam:slaves, object property in nm-types
-NMDeviceTun:group, object property in NMDeviceTun +NMDeviceTun, struct in nm-types
-NMDeviceTun:hw-address, object property in NMDeviceTun +NMDeviceTun:group, object property in nm-types
-NMDeviceTun:mode, object property in NMDeviceTun +NMDeviceTun:hw-address, object property in nm-types
-NMDeviceTun:multi-queue, object property in NMDeviceTun +NMDeviceTun:mode, object property in nm-types
-NMDeviceTun:no-pi, object property in NMDeviceTun +NMDeviceTun:multi-queue, object property in nm-types
-NMDeviceTun:owner, object property in NMDeviceTun +NMDeviceTun:no-pi, object property in nm-types
-NMDeviceTun:vnet-hdr, object property in NMDeviceTun +NMDeviceTun:owner, object property in nm-types +
+
+
+NMDeviceTun:vnet-hdr, object property in nm-types
@@ -1786,127 +1870,139 @@
-NMDeviceVlan:carrier, object property in NMDeviceVlan +NMDeviceVlan, struct in nm-types +
+
+
+NMDeviceVlan:carrier, object property in nm-types +
+
+
+NMDeviceVlan:hw-address, object property in nm-types +
+
+
+NMDeviceVlan:parent, object property in nm-types
-NMDeviceVlan:hw-address, object property in NMDeviceVlan +NMDeviceVlan:vlan-id, object property in nm-types
-NMDeviceVlan:parent, object property in NMDeviceVlan +NMDeviceVxlan, struct in nm-types
-NMDeviceVlan:vlan-id, object property in NMDeviceVlan +NMDeviceVxlan:ageing, object property in nm-types
-NMDeviceVxlan:ageing, object property in NMDeviceVxlan +NMDeviceVxlan:carrier, object property in nm-types
-NMDeviceVxlan:carrier, object property in NMDeviceVxlan +NMDeviceVxlan:dst-port, object property in nm-types
-NMDeviceVxlan:dst-port, object property in NMDeviceVxlan +NMDeviceVxlan:group, object property in nm-types
-NMDeviceVxlan:group, object property in NMDeviceVxlan +NMDeviceVxlan:hw-address, object property in nm-types
-NMDeviceVxlan:hw-address, object property in NMDeviceVxlan +NMDeviceVxlan:id, object property in nm-types
-NMDeviceVxlan:id, object property in NMDeviceVxlan +NMDeviceVxlan:l2miss, object property in nm-types
-NMDeviceVxlan:l2miss, object property in NMDeviceVxlan +NMDeviceVxlan:l3miss, object property in nm-types
-NMDeviceVxlan:l3miss, object property in NMDeviceVxlan +NMDeviceVxlan:learning, object property in nm-types
-NMDeviceVxlan:learning, object property in NMDeviceVxlan +NMDeviceVxlan:limit, object property in nm-types
-NMDeviceVxlan:limit, object property in NMDeviceVxlan +NMDeviceVxlan:local, object property in nm-types
-NMDeviceVxlan:local, object property in NMDeviceVxlan +NMDeviceVxlan:parent, object property in nm-types
-NMDeviceVxlan:parent, object property in NMDeviceVxlan +NMDeviceVxlan:proxy, object property in nm-types
-NMDeviceVxlan:proxy, object property in NMDeviceVxlan +NMDeviceVxlan:rsc, object property in nm-types
-NMDeviceVxlan:rsc, object property in NMDeviceVxlan +NMDeviceVxlan:src-port-max, object property in nm-types
-NMDeviceVxlan:src-port-max, object property in NMDeviceVxlan +NMDeviceVxlan:src-port-min, object property in nm-types
-NMDeviceVxlan:src-port-min, object property in NMDeviceVxlan +NMDeviceVxlan:tos, object property in nm-types
-NMDeviceVxlan:tos, object property in NMDeviceVxlan +NMDeviceVxlan:ttl, object property in nm-types
-NMDeviceVxlan:ttl, object property in NMDeviceVxlan +NMDeviceWifi, struct in nm-types
-NMDeviceWifi::access-point-added, object signal in NMDeviceWifi +NMDeviceWifi::access-point-added, object signal in nm-types
-NMDeviceWifi::access-point-removed, object signal in NMDeviceWifi +NMDeviceWifi::access-point-removed, object signal in nm-types
-NMDeviceWifi:access-points, object property in NMDeviceWifi +NMDeviceWifi:access-points, object property in nm-types
-NMDeviceWifi:active-access-point, object property in NMDeviceWifi +NMDeviceWifi:active-access-point, object property in nm-types
-NMDeviceWifi:bitrate, object property in NMDeviceWifi +NMDeviceWifi:bitrate, object property in nm-types
-NMDeviceWifi:hw-address, object property in NMDeviceWifi +NMDeviceWifi:hw-address, object property in nm-types
-NMDeviceWifi:mode, object property in NMDeviceWifi +NMDeviceWifi:mode, object property in nm-types
-NMDeviceWifi:perm-hw-address, object property in NMDeviceWifi +NMDeviceWifi:perm-hw-address, object property in nm-types
-NMDeviceWifi:wireless-capabilities, object property in NMDeviceWifi +NMDeviceWifi:wireless-capabilities, object property in nm-types
@@ -1914,43 +2010,47 @@
-NMDeviceWimax::nsp-added, object signal in NMDeviceWimax +NMDeviceWimax, struct in nm-types
-NMDeviceWimax::nsp-removed, object signal in NMDeviceWimax +NMDeviceWimax::nsp-added, object signal in nm-types
-NMDeviceWimax:active-nsp, object property in NMDeviceWimax +NMDeviceWimax::nsp-removed, object signal in nm-types
-NMDeviceWimax:bsid, object property in NMDeviceWimax +NMDeviceWimax:active-nsp, object property in nm-types
-NMDeviceWimax:center-frequency, object property in NMDeviceWimax +NMDeviceWimax:bsid, object property in nm-types
-NMDeviceWimax:cinr, object property in NMDeviceWimax +NMDeviceWimax:center-frequency, object property in nm-types
-NMDeviceWimax:hw-address, object property in NMDeviceWimax +NMDeviceWimax:cinr, object property in nm-types
-NMDeviceWimax:nsps, object property in NMDeviceWimax +NMDeviceWimax:hw-address, object property in nm-types
-NMDeviceWimax:rssi, object property in NMDeviceWimax +NMDeviceWimax:nsps, object property in nm-types
-NMDeviceWimax:tx-power, object property in NMDeviceWimax +NMDeviceWimax:rssi, object property in nm-types +
+
+
+NMDeviceWimax:tx-power, object property in nm-types
@@ -2990,11 +3090,15 @@
-NMDhcpConfig:family, object property in NMDhcpConfig +NMDhcpConfig, struct in nm-types +
+
+
+NMDhcpConfig:family, object property in nm-types
-NMDhcpConfig:options, object property in NMDhcpConfig +NMDhcpConfig:options, object property in nm-types
@@ -3019,35 +3123,39 @@

I

-NMIPConfig:addresses, object property in NMIPConfig +NMIPConfig, struct in nm-types
-NMIPConfig:domains, object property in NMIPConfig +NMIPConfig:addresses, object property in nm-types
-NMIPConfig:family, object property in NMIPConfig +NMIPConfig:domains, object property in nm-types
-NMIPConfig:gateway, object property in NMIPConfig +NMIPConfig:family, object property in nm-types
-NMIPConfig:nameservers, object property in NMIPConfig +NMIPConfig:gateway, object property in nm-types
-NMIPConfig:routes, object property in NMIPConfig +NMIPConfig:nameservers, object property in nm-types
-NMIPConfig:searches, object property in NMIPConfig +NMIPConfig:routes, object property in nm-types
-NMIPConfig:wins-servers, object property in NMIPConfig +NMIPConfig:searches, object property in nm-types +
+
+
+NMIPConfig:wins-servers, object property in nm-types
@@ -3386,15 +3494,19 @@

O

-NMObject:dbus-connection, object property in NMObject +NMObject, struct in nm-types +
+
+
+NMObject:dbus-connection, object property in nm-types
-NMObject:nm-running-internal, object property in NMObject +NMObject:nm-running-internal, object property in nm-types
-NMObject:path, object property in NMObject +NMObject:path, object property in nm-types
@@ -3411,11 +3523,15 @@

R

-NMRemoteConnection:unsaved, object property in NMRemoteConnection +NMRemoteConnection, struct in nm-types
-NMRemoteConnection:visible, object property in NMRemoteConnection +NMRemoteConnection:unsaved, object property in nm-types +
+
+
+NMRemoteConnection:visible, object property in nm-types
@@ -3504,6 +3620,10 @@
+NMSecretAgentOld, struct in NMSecretAgentOld +
+
+
NMSecretAgentOld:auto-register, object property in NMSecretAgentOld
@@ -3596,7 +3716,11 @@
-NMSetting, struct in NMSetting +NMSetting, struct in NMSetting +
+
+
+NMSetting8021x, struct in NMSetting8021x
@@ -3748,6 +3872,10 @@
+NMSettingAdsl, struct in NMSettingAdsl +
+
+
NMSettingAdsl:encapsulation, object property in NMSettingAdsl
@@ -3776,6 +3904,10 @@
+NMSettingBluetooth, struct in NMSettingBluetooth +
+
+
NMSettingBluetooth:bdaddr, object property in NMSettingBluetooth
@@ -3784,10 +3916,18 @@
+NMSettingBond, struct in NMSettingBond +
+
+
NMSettingBond:options, object property in NMSettingBond
+NMSettingBridge, struct in NMSettingBridge +
+
+
NMSettingBridge:ageing-time, object property in NMSettingBridge
@@ -3820,6 +3960,10 @@
+NMSettingBridgePort, struct in NMSettingBridgePort +
+
+
NMSettingBridgePort:hairpin-mode, object property in NMSettingBridgePort
@@ -3832,6 +3976,10 @@
+NMSettingCdma, struct in NMSettingCdma +
+
+
NMSettingCdma:number, object property in NMSettingCdma
@@ -3856,7 +4004,7 @@
-NMSettingConnection, struct in NMSettingConnection +NMSettingConnection, struct in NMSettingConnection
@@ -3936,6 +4084,10 @@
+NMSettingDcb, struct in NMSettingDcb +
+
+
NMSettingDcb:app-fcoe-flags, object property in NMSettingDcb
@@ -4004,6 +4156,14 @@
+NMSettingGeneric, struct in NMSettingGeneric +
+
+
+NMSettingGsm, struct in NMSettingGsm +
+
+
NMSettingGsm:apn, object property in NMSettingGsm
@@ -4052,6 +4212,10 @@
+NMSettingInfiniband, struct in NMSettingInfiniband +
+
+
NMSettingInfiniband:mac-address, object property in NMSettingInfiniband
@@ -4072,6 +4236,10 @@
+NMSettingIP4Config, struct in NMSettingIP4Config +
+
+
NMSettingIP4Config:dhcp-client-id, object property in NMSettingIP4Config
@@ -4080,6 +4248,10 @@
+NMSettingIP6Config, struct in NMSettingIP6Config +
+
+
NMSettingIP6Config:addr-gen-mode, object property in NMSettingIP6Config
@@ -4096,6 +4268,10 @@
+NMSettingIPConfig, struct in NMSettingIPConfig +
+
+
NMSettingIPConfig:addresses, object property in NMSettingIPConfig
@@ -4160,6 +4336,10 @@
+NMSettingIPTunnel, struct in NMSettingIPTunnel +
+
+
NMSettingIPTunnel:encapsulation-limit, object property in NMSettingIPTunnel
@@ -4212,6 +4392,10 @@
+NMSettingMacvlan, struct in NMSettingMacvlan +
+
+
NMSettingMacvlan:mode, object property in NMSettingMacvlan
@@ -4232,6 +4416,10 @@
+NMSettingOlpcMesh, struct in NMSettingOlpcMesh +
+
+
NMSettingOlpcMesh:channel, object property in NMSettingOlpcMesh
@@ -4244,6 +4432,10 @@
+NMSettingPpp, struct in NMSettingPpp +
+
+
NMSettingPpp:baud, object property in NMSettingPpp
@@ -4316,6 +4508,10 @@
+NMSettingPppoe, struct in NMSettingPppoe +
+
+
NMSettingPppoe:password, object property in NMSettingPppoe
@@ -4336,6 +4532,10 @@
+NMSettingSerial, struct in NMSettingSerial +
+
+
NMSettingSerial:baud, object property in NMSettingSerial
@@ -4372,14 +4572,26 @@
+NMSettingTeam, struct in NMSettingTeam +
+
+
NMSettingTeam:config, object property in NMSettingTeam
+NMSettingTeamPort, struct in NMSettingTeamPort +
+
+
NMSettingTeamPort:config, object property in NMSettingTeamPort
+NMSettingTun, struct in NMSettingTun +
+
+
NMSettingTun:group, object property in NMSettingTun
@@ -4412,6 +4624,10 @@
+NMSettingVlan, struct in NMSettingVlan +
+
+
NMSettingVlan:egress-priority-map, object property in NMSettingVlan
@@ -4432,6 +4648,10 @@
+NMSettingVpn, struct in NMSettingVpn +
+
+
NMSettingVpn:data, object property in NMSettingVpn
@@ -4456,6 +4676,10 @@
+NMSettingVxlan, struct in NMSettingVxlan +
+
+
NMSettingVxlan:ageing, object property in NMSettingVxlan
@@ -4520,6 +4744,10 @@
+NMSettingWimax, struct in NMSettingWimax +
+
+
NMSettingWimax:mac-address, object property in NMSettingWimax
@@ -4528,6 +4756,10 @@
+NMSettingWired, struct in NMSettingWired +
+
+
NMSettingWired:auto-negotiate, object property in NMSettingWired
@@ -4584,6 +4816,10 @@
+NMSettingWireless, struct in NMSettingWireless +
+
+
NMSettingWireless:band, object property in NMSettingWireless
@@ -4648,6 +4884,10 @@
+NMSettingWirelessSecurity, struct in NMSettingWirelessSecurity +
+
+
NMSettingWirelessSecurity:auth-alg, object property in NMSettingWirelessSecurity
@@ -7884,6 +8124,10 @@
+NMSimpleConnection, struct in NMSimpleConnection +
+
+
nm_simple_connection_new, function in NMSimpleConnection
@@ -8162,7 +8406,7 @@

V

-NM_VARIANT_TYPE_SETTING, macro in NMConnection +NM_VARIANT_TYPE_SETTING, macro in NMConnection
@@ -8186,6 +8430,10 @@
+NMVpnConnection, struct in NMVpnConnection +
+
+
NMVpnConnection::vpn-state-changed, object signal in NMVpnConnection
@@ -8254,6 +8502,10 @@
+NMVpnPluginInfo, struct in nm-vpn-plugin-info +
+
+
NMVpnServiceState, enum in nm-vpn-dbus-interface
@@ -8519,6 +8771,10 @@ NM_VPN_SERVICE_PLUGIN_STATE, macro in nm-vpn-service-plugin
+NMWimaxNsp, struct in NMWimaxNsp +
+
+
NMWimaxNsp:name, object property in NMWimaxNsp
diff --git a/docs/libnm/html/ch03.html b/docs/libnm/html/ch03.html index 2bd5219f..79fcec44 100644 --- a/docs/libnm/html/ch03.html +++ b/docs/libnm/html/ch03.html @@ -7,7 +7,7 @@ - + @@ -17,14 +17,14 @@ Home Prev -Next +Next

Connection and Setting API Reference

-NMConnection — Describes a connection to specific network or provider +NMConnection — Describes a connection to specific network or provider
NMSimpleConnection diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index eec37428..eea02301 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -15,7 +15,7 @@

- for libnm 1.2.0 + for libnm 1.2.2 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm/stable/. @@ -69,7 +69,7 @@

Connection and Setting API Reference
-NMConnection — Describes a connection to specific network or provider +NMConnection — Describes a connection to specific network or provider
NMSimpleConnection diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml index 9aa08657..e2a6f09d 100644 --- a/docs/libnm/html/index.sgml +++ b/docs/libnm/html/index.sgml @@ -4,6 +4,7 @@ + @@ -114,6 +115,7 @@ + @@ -149,6 +151,7 @@ + @@ -169,6 +172,7 @@ + @@ -179,12 +183,14 @@ + + @@ -551,90 +557,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -897,6 +906,7 @@ + @@ -961,6 +971,7 @@ + @@ -985,6 +996,7 @@ + @@ -1034,6 +1046,7 @@ + @@ -1062,6 +1075,7 @@ + @@ -1087,6 +1101,7 @@ + @@ -1109,6 +1124,7 @@ + @@ -1167,6 +1183,7 @@ + @@ -1192,6 +1209,7 @@ + @@ -1226,6 +1244,7 @@ + @@ -1260,6 +1279,7 @@ + @@ -1285,6 +1305,7 @@ + @@ -1316,6 +1337,7 @@ + @@ -1443,6 +1465,7 @@ + @@ -1495,6 +1518,7 @@ + @@ -1526,6 +1550,7 @@ + @@ -1556,6 +1581,7 @@ + @@ -1606,6 +1632,7 @@ + @@ -1643,6 +1670,7 @@ + @@ -1672,6 +1700,7 @@ + @@ -1690,6 +1719,7 @@ + @@ -1704,6 +1734,7 @@ + @@ -1732,6 +1763,7 @@ + @@ -1766,6 +1798,7 @@ + @@ -1811,6 +1844,7 @@ + @@ -1860,6 +1894,7 @@ + @@ -1891,6 +1926,7 @@ + @@ -1954,6 +1990,7 @@ + @@ -2027,6 +2064,7 @@ + @@ -2105,6 +2143,7 @@ + @@ -2130,6 +2169,7 @@ + @@ -2217,6 +2257,7 @@ + @@ -2252,11 +2293,13 @@ + + @@ -2264,6 +2307,7 @@ + @@ -2273,6 +2317,7 @@ + @@ -2282,6 +2327,7 @@ + @@ -2291,6 +2337,7 @@ + @@ -2300,6 +2347,7 @@ + @@ -2309,6 +2357,7 @@ + @@ -2318,6 +2367,7 @@ + @@ -2331,6 +2381,7 @@ + @@ -2342,12 +2393,14 @@ + + @@ -2356,6 +2409,7 @@ + @@ -2363,6 +2417,7 @@ + @@ -2371,6 +2426,7 @@ + @@ -2396,6 +2452,7 @@ + @@ -2413,6 +2470,7 @@ + @@ -2426,6 +2484,7 @@ + @@ -2437,6 +2496,7 @@ + @@ -2444,6 +2504,7 @@ + @@ -2452,6 +2513,7 @@ + @@ -2461,6 +2523,7 @@ + @@ -2470,6 +2533,7 @@ + @@ -2479,6 +2543,7 @@ + @@ -2488,6 +2553,7 @@ + @@ -2505,6 +2571,7 @@ + @@ -2518,6 +2585,7 @@ + @@ -2529,6 +2597,7 @@ + @@ -2539,6 +2608,7 @@ + @@ -2578,6 +2648,7 @@ + @@ -2603,6 +2674,7 @@ + @@ -2626,6 +2698,7 @@ + @@ -2643,6 +2716,7 @@ + @@ -2663,6 +2737,7 @@ + @@ -2680,6 +2755,7 @@ + @@ -2713,6 +2789,7 @@ + @@ -2735,6 +2812,7 @@ + @@ -2742,6 +2820,7 @@ + @@ -2752,6 +2831,7 @@ + @@ -2773,6 +2853,7 @@ + @@ -2781,6 +2862,7 @@ + @@ -2807,6 +2889,7 @@ + @@ -2824,6 +2907,7 @@ + @@ -2835,6 +2919,7 @@ + @@ -2844,6 +2929,7 @@ + @@ -2855,6 +2941,7 @@ + @@ -2877,12 +2964,14 @@ + + diff --git a/docs/libnm/html/libnm-NMConnection.html b/docs/libnm/html/libnm-NMConnection.html deleted file mode 100644 index 5166dcf6..00000000 --- a/docs/libnm/html/libnm-NMConnection.html +++ /dev/null @@ -1,2519 +0,0 @@ - - - - -NMConnection: libnm Reference Manual - - - - - - - - - - - - - - - - -
-
-
- - -
-

NMConnection

-

NMConnection — Describes a connection to specific network or provider

-
-
-

Functions

-
---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void - -nm_connection_add_setting () -
-void - -nm_connection_remove_setting () -
-NMSetting * - -nm_connection_get_setting () -
-NMSetting * - -nm_connection_get_setting_by_name () -
-GVariant * - -nm_connection_to_dbus () -
-gboolean - -nm_connection_replace_settings () -
-void - -nm_connection_replace_settings_from_connection () -
-void - -nm_connection_clear_settings () -
-gboolean - -nm_connection_compare () -
-gboolean - -nm_connection_diff () -
-gboolean - -nm_connection_verify () -
-gboolean - -nm_connection_verify_secrets () -
-gboolean - -nm_connection_normalize () -
const char * - -nm_connection_need_secrets () -
-void - -nm_connection_clear_secrets () -
-void - -nm_connection_clear_secrets_with_flags () -
-gboolean - -nm_connection_update_secrets () -
-void - -nm_connection_set_path () -
const char * - -nm_connection_get_path () -
const char * - -nm_connection_get_interface_name () -
-gboolean - -nm_connection_is_type () -
-void - -nm_connection_for_each_setting_value () -
-void - -nm_connection_dump () -
const char * - -nm_connection_get_uuid () -
const char * - -nm_connection_get_id () -
const char * - -nm_connection_get_connection_type () -
-gboolean - -nm_connection_is_virtual () -
-char * - -nm_connection_get_virtual_device_description () -
-NMSetting8021x * - -nm_connection_get_setting_802_1x () -
-NMSettingBluetooth * - -nm_connection_get_setting_bluetooth () -
-NMSettingBond * - -nm_connection_get_setting_bond () -
-NMSettingTeam * - -nm_connection_get_setting_team () -
-NMSettingTeamPort * - -nm_connection_get_setting_team_port () -
-NMSettingBridge * - -nm_connection_get_setting_bridge () -
-NMSettingBridgePort * - -nm_connection_get_setting_bridge_port () -
-NMSettingCdma * - -nm_connection_get_setting_cdma () -
-NMSettingConnection * - -nm_connection_get_setting_connection () -
-NMSettingDcb * - -nm_connection_get_setting_dcb () -
-NMSettingGeneric * - -nm_connection_get_setting_generic () -
-NMSettingGsm * - -nm_connection_get_setting_gsm () -
-NMSettingInfiniband * - -nm_connection_get_setting_infiniband () -
-NMSettingIPTunnel * - -nm_connection_get_setting_ip_tunnel () -
-NMSettingIPConfig * - -nm_connection_get_setting_ip4_config () -
-NMSettingIPConfig * - -nm_connection_get_setting_ip6_config () -
-NMSettingMacvlan * - -nm_connection_get_setting_macvlan () -
-NMSettingOlpcMesh * - -nm_connection_get_setting_olpc_mesh () -
-NMSettingPpp * - -nm_connection_get_setting_ppp () -
-NMSettingPppoe * - -nm_connection_get_setting_pppoe () -
-NMSettingSerial * - -nm_connection_get_setting_serial () -
-NMSettingTun * - -nm_connection_get_setting_tun () -
-NMSettingVpn * - -nm_connection_get_setting_vpn () -
-NMSettingWimax * - -nm_connection_get_setting_wimax () -
-NMSettingAdsl * - -nm_connection_get_setting_adsl () -
-NMSettingWired * - -nm_connection_get_setting_wired () -
-NMSettingWireless * - -nm_connection_get_setting_wireless () -
-NMSettingWirelessSecurity * - -nm_connection_get_setting_wireless_security () -
-NMSettingVlan * - -nm_connection_get_setting_vlan () -
-NMSettingVxlan * - -nm_connection_get_setting_vxlan () -
-
- -
-

Object Hierarchy

-
    GFlags
-    ╰── NMConnectionSerializationFlags
-
-
-
-

Description

-

An NMConnection describes all the settings and configuration values that -are necessary to configure network devices for operation on a specific -network. Connections are the fundamental operating object for -NetworkManager; no device is connected without a NMConnection, or -disconnected without having been connected with a NMConnection.

-

Each NMConnection contains a list of NMSetting objects usually referenced -by name (using nm_connection_get_setting_by_name()) or by type (with -nm_connection_get_setting()). The settings describe the actual parameters -with which the network devices are configured, including device-specific -parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters -(addresses, routes, addressing methods, etc).

-
-
-

Functions

-
-

nm_connection_add_setting ()

-
void
-nm_connection_add_setting (NMConnection *connection,
-                           NMSetting *setting);
-

Adds a NMSetting to the connection, replacing any previous NMSetting of the -same name which has previously been added to the NMConnection. The -connection takes ownership of the NMSetting object and does not increase -the setting object's reference count.

-
-

Parameters

-
----- - - - - - - - - - - - - -

connection

a NMConnection

 

setting

the NMSetting to add to the connection object.

[transfer full]
-
-
-
-
-

nm_connection_remove_setting ()

-
void
-nm_connection_remove_setting (NMConnection *connection,
-                              GType setting_type);
-

Removes the NMSetting with the given GType from the NMConnection. This -operation dereferences the NMSetting object.

-
-

Parameters

-
----- - - - - - - - - - - - - -

connection

a NMConnection

 

setting_type

the GType of the setting object to remove

 
-
-
-
-
-

nm_connection_get_setting ()

-
NMSetting *
-nm_connection_get_setting (NMConnection *connection,
-                           GType setting_type);
-

Gets the NMSetting with the given GType, if one has been previously added -to the NMConnection.

-
-

Parameters

-
----- - - - - - - - - - - - - -

connection

a NMConnection

 

setting_type

the GType of the setting object to return

 
-
-
-

Returns

-

the NMSetting, or NULL if no setting of that type was previously -added to the NMConnection.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_by_name ()

-
NMSetting *
-nm_connection_get_setting_by_name (NMConnection *connection,
-                                   const char *name);
-

Gets the NMSetting with the given name, if one has been previously added -the NMConnection.

-
-

Parameters

-
----- - - - - - - - - - - - - -

connection

a NMConnection

 

name

a setting name

 
-
-
-

Returns

-

the NMSetting, or NULL if no setting with that name was previously -added to the NMConnection.

-

[transfer none]

-
-
-
-
-

nm_connection_to_dbus ()

-
GVariant *
-nm_connection_to_dbus (NMConnection *connection,
-                       NMConnectionSerializationFlags flags);
-

Converts the NMConnection into a GVariant of type -NM_VARIANT_TYPE_CONNECTION describing the connection, suitable for -marshalling over D-Bus or otherwise serializing.

-
-

Parameters

-
----- - - - - - - - - - - - - -

connection

the NMConnection

 

flags

serialization flags, e.g. NM_CONNECTION_SERIALIZE_ALL

 
-
-
-

Returns

-

a new floating GVariant describing the connection, -its settings, and each setting's properties.

-

[transfer none]

-
-
-
-
-

nm_connection_replace_settings ()

-
gboolean
-nm_connection_replace_settings (NMConnection *connection,
-                                GVariant *new_settings,
-                                GError **error);
-

Replaces connection -'s settings with new_settings - (which must be -syntactically valid, and describe a known type of connection, but does not -need to result in a connection that passes nm_connection_verify()).

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - -

connection

a NMConnection

 

new_settings

a GVariant of type NM_VARIANT_TYPE_CONNECTION, with the new settings

 

error

location to store error, or NULL

 
-
-
-

Returns

-

TRUE if connection was updated, FALSE if new_settings -could not -be deserialized (in which case connection -will be unchanged).

-
-
-
-
-

nm_connection_replace_settings_from_connection ()

-
void
-nm_connection_replace_settings_from_connection
-                               (NMConnection *connection,
-                                NMConnection *new_connection);
-

Deep-copies the settings of new_connection - and replaces the settings of connection - -with the copied settings.

-
-

Parameters

-
----- - - - - - - - - - - - - -

connection

a NMConnection

 

new_connection

a NMConnection to replace the settings of connection -with

 
-
-
-
-
-

nm_connection_clear_settings ()

-
void
-nm_connection_clear_settings (NMConnection *connection);
-

Deletes all of connection -'s settings.

-
-

Parameters

-
----- - - - - - -

connection

a NMConnection

 
-
-
-
-
-

nm_connection_compare ()

-
gboolean
-nm_connection_compare (NMConnection *a,
-                       NMConnection *b,
-                       NMSettingCompareFlags flags);
-

Compares two NMConnection objects for similarity, with comparison behavior -modified by a set of flags. See nm_setting_compare() for a description of -each flag's behavior.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - -

a

a NMConnection

 

b

a second NMConnection to compare with the first

 

flags

compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT

 
-
-
-

Returns

-

TRUE if the comparison succeeds, FALSE if it does not

-
-
-
-
-

nm_connection_diff ()

-
gboolean
-nm_connection_diff (NMConnection *a,
-                    NMConnection *b,
-                    NMSettingCompareFlags flags,
-                    GHashTable **out_settings);
-

Compares two NMConnection objects for similarity, with comparison behavior -modified by a set of flags. See nm_setting_compare() for a description of -each flag's behavior. If the connections differ, settings and keys within -each setting that differ are added to the returned out_settings - hash table. -No values are returned, only key names.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - - - - - - -

a

a NMConnection

 

b

a second NMConnection to compare with the first

 

flags

compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT

 

out_settings

if the -connections differ, on return a hash table mapping setting names to -second-level GHashTable (utf8 to guint32), which contains the key names that -differ mapped to one or more of NMSettingDiffResult as a bitfield.

[element-type utf8 GLib.HashTable]
-
-
-

Returns

-

TRUE if the connections contain the same values, FALSE if they do -not

-
-
-
-
-

nm_connection_verify ()

-
gboolean
-nm_connection_verify (NMConnection *connection,
-                      GError **error);
-

Validates the connection and all its settings. Each setting's properties -have allowed values, and some values are dependent on other values. For -example, if a Wi-Fi connection is security enabled, the NMSettingWireless -setting object's 'security' property must contain the setting name of the -NMSettingWirelessSecurity object, which must also be present in the -connection for the connection to be valid. As another example, the -NMSettingWired object's 'mac-address' property must be a validly formatted -MAC address. The returned GError contains information about which -setting and which property failed validation, and how it failed validation.

-
-

Parameters

-
----- - - - - - - - - - - - - -

connection

the NMConnection to verify

 

error

location to store error, or NULL

 
-
-
-

Returns

-

TRUE if the connection is valid, FALSE if it is not

-
-
-
-
-

nm_connection_verify_secrets ()

-
gboolean
-nm_connection_verify_secrets (NMConnection *connection,
-                              GError **error);
-

Verifies the secrets in the connection.

-
-

Parameters

-
----- - - - - - - - - - - - - -

connection

the NMConnection to verify in

 

error

location to store error, or NULL

 
-
-
-

Returns

-

TRUE if the secrets are valid, FALSE if they are not

-
-

Since: 1.2

-
-
-
-

nm_connection_normalize ()

-
gboolean
-nm_connection_normalize (NMConnection *connection,
-                         GHashTable *parameters,
-                         gboolean *modified,
-                         GError **error);
-

Does some basic normalization and fixup of well known inconsistencies -and deprecated fields. If the connection was modified in any way, -the output parameter modified - is set TRUE.

-

Finally the connection will be verified and TRUE returns if the connection -is valid. As this function only performs some specific normalization steps -it cannot repair all connections. If the connection has errors that -cannot be normalized, the connection will not be modified.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - - - - - - -

connection

the NMConnection to normalize

 

parameters

a GHashTable with -normalization parameters to allow customization of the normalization by providing -specific arguments. Unknown arguments will be ignored and the default will be -used. The keys must be strings, hashed by g_str_hash() and g_str_equal() functions. -The values are opaque and depend on the parameter name.

[allow-none][element-type utf8 gpointer]

modified

outputs whether any settings were modified.

[out][allow-none]

error

location to store error, or NULL. Contains the reason, -why the connection is invalid, if the function returns an error.

 
-
-
-

Returns

-

TRUE if the connection is valid, FALSE if it is not

-
-
-
-
-

nm_connection_need_secrets ()

-
const char *
-nm_connection_need_secrets (NMConnection *connection,
-                            GPtrArray **hints);
-

Returns the name of the first setting object in the connection which would -need secrets to make a successful connection. The returned hints are only -intended as a guide to what secrets may be required, because in some -circumstances, there is no way to conclusively determine exactly which -secrets are needed.

-
-

Parameters

-
----- - - - - - - - - - - - - -

connection

the NMConnection

 

hints

the address of a pointer to a GPtrArray, initialized to NULL, which on -return points to an allocated GPtrArray containing the property names of -secrets of the NMSetting which may be required; the caller owns the array -and must free the array itself with g_ptr_array_free(), but not free its -elements.

[out][element-type utf8][allow-none][transfer container]
-
-
-

Returns

-

the setting name of the NMSetting object which has invalid or -missing secrets

-
-
-
-
-

nm_connection_clear_secrets ()

-
void
-nm_connection_clear_secrets (NMConnection *connection);
-

Clears and frees any secrets that may be stored in the connection, to avoid -keeping secret data in memory when not needed.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-
-
-

nm_connection_clear_secrets_with_flags ()

-
void
-nm_connection_clear_secrets_with_flags
-                               (NMConnection *connection,
-                                NMSettingClearSecretsWithFlagsFn func,
-                                gpointer user_data);
-

Clears and frees secrets determined by func -.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - -

connection

the NMConnection

 

func

function to be called to determine whether a -specific secret should be cleared or not.

[scope call]

user_data

caller-supplied data passed to func -

 
-
-
-
-
-

nm_connection_update_secrets ()

-
gboolean
-nm_connection_update_secrets (NMConnection *connection,
-                              const char *setting_name,
-                              GVariant *secrets,
-                              GError **error);
-

Update the specified setting's secrets, given a dictionary of secrets -intended for that setting (deserialized from D-Bus for example). Will also -extract the given setting's secrets hash if given a connection dictionary. -If setting_name - is NULL, expects a fully serialized NMConnection as -returned by nm_connection_to_dbus() and will update all secrets from all -settings contained in secrets -.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - - - - - - -

connection

the NMConnection

 

setting_name

the setting object name to which the secrets apply

 

secrets

a GVariant of secrets, of type NM_VARIANT_TYPE_CONNECTION -or NM_VARIANT_TYPE_SETTING

 

error

location to store error, or NULL

 
-
-
-

Returns

-

TRUE if the secrets were successfully updated, FALSE if the update -failed (tried to update secrets for a setting that doesn't exist, etc)

-
-
-
-
-

nm_connection_set_path ()

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

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

-
-

Parameters

-
----- - - - - - - - - - - - - -

connection

the NMConnection

 

path

the D-Bus path of the connection as given by the settings service -which provides the connection

 
-
-
-
-
-

nm_connection_get_path ()

-
const char *
-nm_connection_get_path (NMConnection *connection);
-

Returns the connection's D-Bus path.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

the D-Bus path of the connection, previously set by a call to -nm_connection_set_path().

-
-
-
-
-

nm_connection_get_interface_name ()

-
const char *
-nm_connection_get_interface_name (NMConnection *connection);
-

Returns the interface name as stored in NMSettingConnection:interface_name. -If the connection contains no NMSettingConnection, it will return NULL.

-

For hardware devices and software devices created outside of NetworkManager, -this name is used to match the device. for software devices created by -NetworkManager, this is the name of the created interface.

-
-

Parameters

-
----- - - - - - -

connection

The NMConnection

 
-
-
-

Returns

-

Name of the kernel interface or NULL

-
-
-
-
-

nm_connection_is_type ()

-
gboolean
-nm_connection_is_type (NMConnection *connection,
-                       const char *type);
-

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

-
-

Parameters

-
----- - - - - - - - - - - - - -

connection

the NMConnection

 

type

a setting name to check the connection's type against (like -NM_SETTING_WIRELESS_SETTING_NAME or NM_SETTING_WIRED_SETTING_NAME)

 
-
-
-

Returns

-

TRUE if the connection is of the given type -, FALSE if not

-
-
-
-
-

nm_connection_for_each_setting_value ()

-
void
-nm_connection_for_each_setting_value (NMConnection *connection,
-                                      NMSettingValueIterFn func,
-                                      gpointer user_data);
-

Iterates over the properties of each NMSetting object in the NMConnection, -calling the supplied user function for each property.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - -

connection

the NMConnection

 

func

user-supplied function called for each setting's property.

[scope call]

user_data

user data passed to func -at each invocation

 
-
-
-
-
-

nm_connection_dump ()

-
void
-nm_connection_dump (NMConnection *connection);
-

Print the connection to stdout. For debugging purposes ONLY, should NOT -be used for serialization of the connection or machine-parsed in any way. The -output format is not guaranteed to be stable and may change at any time.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-
-
-

nm_connection_get_uuid ()

-
const char *
-nm_connection_get_uuid (NMConnection *connection);
-

A shortcut to return the UUID from the connection's NMSettingConnection.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

the UUID from the connection's 'connection' setting

-
-
-
-
-

nm_connection_get_id ()

-
const char *
-nm_connection_get_id (NMConnection *connection);
-

A shortcut to return the ID from the connection's NMSettingConnection.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

the ID from the connection's 'connection' setting

-
-
-
-
-

nm_connection_get_connection_type ()

-
const char *
-nm_connection_get_connection_type (NMConnection *connection);
-

A shortcut to return the type from the connection's NMSettingConnection.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

the type from the connection's 'connection' setting

-
-
-
-
-

nm_connection_is_virtual ()

-
gboolean
-nm_connection_is_virtual (NMConnection *connection);
-

Checks if connection - refers to a virtual device (and thus can potentially be -activated even if the device it refers to doesn't exist).

-
-

Parameters

-
----- - - - - - -

connection

an NMConnection

 
-
-
-

Returns

-

whether connection -refers to a virtual device

-
-
-
-
-

nm_connection_get_virtual_device_description ()

-
char *
-nm_connection_get_virtual_device_description
-                               (NMConnection *connection);
-

Returns the name that nm_device_disambiguate_names() would -return for the virtual device that would be created for connection -. -Eg, "VLAN (eth1.1)".

-
-

Parameters

-
----- - - - - - -

connection

an NMConnection for a virtual device type

 
-
-
-

Returns

-

the name of connection -'s device, -or NULL if connection -is not a virtual connection type.

-

[transfer full]

-
-
-
-
-

nm_connection_get_setting_802_1x ()

-
NMSetting8021x *
-nm_connection_get_setting_802_1x (NMConnection *connection);
-

A shortcut to return any NMSetting8021x the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSetting8021x if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_bluetooth ()

-
NMSettingBluetooth *
-nm_connection_get_setting_bluetooth (NMConnection *connection);
-

A shortcut to return any NMSettingBluetooth the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingBluetooth if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_bond ()

-
NMSettingBond *
-nm_connection_get_setting_bond (NMConnection *connection);
-

A shortcut to return any NMSettingBond the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingBond if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_team ()

-
NMSettingTeam *
-nm_connection_get_setting_team (NMConnection *connection);
-

A shortcut to return any NMSettingTeam the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingTeam if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_team_port ()

-
NMSettingTeamPort *
-nm_connection_get_setting_team_port (NMConnection *connection);
-

A shortcut to return any NMSettingTeamPort the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingTeamPort if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_bridge ()

-
NMSettingBridge *
-nm_connection_get_setting_bridge (NMConnection *connection);
-

A shortcut to return any NMSettingBridge the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingBridge if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_bridge_port ()

-
NMSettingBridgePort *
-nm_connection_get_setting_bridge_port (NMConnection *connection);
-

A shortcut to return any NMSettingBridgePort the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingBridgePort if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_cdma ()

-
NMSettingCdma *
-nm_connection_get_setting_cdma (NMConnection *connection);
-

A shortcut to return any NMSettingCdma the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingCdma if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_connection ()

-
NMSettingConnection *
-nm_connection_get_setting_connection (NMConnection *connection);
-

A shortcut to return any NMSettingConnection the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingConnection if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_dcb ()

-
NMSettingDcb *
-nm_connection_get_setting_dcb (NMConnection *connection);
-

A shortcut to return any NMSettingDcb the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingDcb if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_generic ()

-
NMSettingGeneric *
-nm_connection_get_setting_generic (NMConnection *connection);
-

A shortcut to return any NMSettingGeneric the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingGeneric if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_gsm ()

-
NMSettingGsm *
-nm_connection_get_setting_gsm (NMConnection *connection);
-

A shortcut to return any NMSettingGsm the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingGsm if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_infiniband ()

-
NMSettingInfiniband *
-nm_connection_get_setting_infiniband (NMConnection *connection);
-

A shortcut to return any NMSettingInfiniband the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingInfiniband if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_ip_tunnel ()

-
NMSettingIPTunnel *
-nm_connection_get_setting_ip_tunnel (NMConnection *connection);
-

A shortcut to return any NMSettingIPTunnel the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingIPTunnel if the connection contains one, otherwise NULL.

-

[transfer none]

-
-

Since: 1.2

-
-
-
-

nm_connection_get_setting_ip4_config ()

-
NMSettingIPConfig *
-nm_connection_get_setting_ip4_config (NMConnection *connection);
-

A shortcut to return any NMSettingIP4Config the connection might contain.

-

Note that it returns the value as type NMSettingIPConfig, since the vast -majority of IPv4-setting-related methods are on that type, not -NMSettingIP4Config.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingIP4Config if the -connection contains one, otherwise NULL.

-

[type NMSettingIP4Config][transfer none]

-
-
-
-
-

nm_connection_get_setting_ip6_config ()

-
NMSettingIPConfig *
-nm_connection_get_setting_ip6_config (NMConnection *connection);
-

A shortcut to return any NMSettingIP6Config the connection might contain.

-

Note that it returns the value as type NMSettingIPConfig, since the vast -majority of IPv6-setting-related methods are on that type, not -NMSettingIP6Config.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingIP6Config if the -connection contains one, otherwise NULL.

-

[type NMSettingIP6Config][transfer none]

-
-
-
-
-

nm_connection_get_setting_macvlan ()

-
NMSettingMacvlan *
-nm_connection_get_setting_macvlan (NMConnection *connection);
-

A shortcut to return any NMSettingMacvlan the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingMacvlan if the connection contains one, otherwise NULL.

-

[transfer none]

-
-

Since: 1.2

-
-
-
-

nm_connection_get_setting_olpc_mesh ()

-
NMSettingOlpcMesh *
-nm_connection_get_setting_olpc_mesh (NMConnection *connection);
-

A shortcut to return any NMSettingOlpcMesh the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingOlpcMesh if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_ppp ()

-
NMSettingPpp *
-nm_connection_get_setting_ppp (NMConnection *connection);
-

A shortcut to return any NMSettingPpp the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingPpp if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_pppoe ()

-
NMSettingPppoe *
-nm_connection_get_setting_pppoe (NMConnection *connection);
-

A shortcut to return any NMSettingPppoe the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingPppoe if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_serial ()

-
NMSettingSerial *
-nm_connection_get_setting_serial (NMConnection *connection);
-

A shortcut to return any NMSettingSerial the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingSerial if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_tun ()

-
NMSettingTun *
-nm_connection_get_setting_tun (NMConnection *connection);
-

A shortcut to return any NMSettingTun the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingTun if the connection contains one, otherwise NULL.

-

[transfer none]

-
-

Since: 1.2

-
-
-
-

nm_connection_get_setting_vpn ()

-
NMSettingVpn *
-nm_connection_get_setting_vpn (NMConnection *connection);
-

A shortcut to return any NMSettingVpn the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingVpn if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_wimax ()

-
NMSettingWimax *
-nm_connection_get_setting_wimax (NMConnection *connection);
-

A shortcut to return any NMSettingWimax the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingWimax if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_adsl ()

-
NMSettingAdsl *
-nm_connection_get_setting_adsl (NMConnection *connection);
-

A shortcut to return any NMSettingAdsl the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingAdsl if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_wired ()

-
NMSettingWired *
-nm_connection_get_setting_wired (NMConnection *connection);
-

A shortcut to return any NMSettingWired the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingWired if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_wireless ()

-
NMSettingWireless *
-nm_connection_get_setting_wireless (NMConnection *connection);
-

A shortcut to return any NMSettingWireless the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingWireless if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_wireless_security ()

-
NMSettingWirelessSecurity *
-nm_connection_get_setting_wireless_security
-                               (NMConnection *connection);
-

A shortcut to return any NMSettingWirelessSecurity the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingWirelessSecurity if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_vlan ()

-
NMSettingVlan *
-nm_connection_get_setting_vlan (NMConnection *connection);
-

A shortcut to return any NMSettingVlan the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingVlan if the connection contains one, otherwise NULL.

-

[transfer none]

-
-
-
-
-

nm_connection_get_setting_vxlan ()

-
NMSettingVxlan *
-nm_connection_get_setting_vxlan (NMConnection *connection);
-

A shortcut to return any NMSettingVxlan the connection might contain.

-
-

Parameters

-
----- - - - - - -

connection

the NMConnection

 
-
-
-

Returns

-

an NMSettingVxlan if the connection contains one, otherwise NULL.

-

[transfer none]

-
-

Since: 1.2

-
-
-
-

Types and Values

-
-

NM_CONNECTION_SECRETS_UPDATED

-
#define NM_CONNECTION_SECRETS_UPDATED "secrets-updated"
-
-
-
-
-

NM_CONNECTION_SECRETS_CLEARED

-
#define NM_CONNECTION_SECRETS_CLEARED "secrets-cleared"
-
-
-
-
-

NM_CONNECTION_CHANGED

-
#define NM_CONNECTION_CHANGED         "changed"
-
-
-
-
-

NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD

-
#define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD "ip6-config-method"
-
-
-
-
-

NMConnectionInterface

-
typedef struct {
-	GTypeInterface parent;
-
-	/* Signals */
-	void (*secrets_updated) (NMConnection *connection,
-	                         const char   *setting);
-	void (*secrets_cleared) (NMConnection *connection);
-	void (*changed)         (NMConnection *connection);
-} NMConnectionInterface;
-
-
-

Members

-
----- - - - - - - - - - - - - - - - - - - - - - - -

GTypeInterface parent;

the parent interace struct

 

secrets_updated ()

emitted when the connection's secrets are updated

 

secrets_cleared ()

emitted when the connection's secrets are cleared

 

changed ()

emitted when any change to the connection's settings occurs

 
-
-
-
-
-

NM_VARIANT_TYPE_SETTING

-
#define NM_VARIANT_TYPE_SETTING G_VARIANT_TYPE_VARDICT
-
-

GVariantType for a dictionary mapping from property names to values. This is -an alias for G_VARIANT_TYPE_VARDICT, and is the type of each element of -an NM_VARIANT_TYPE_CONNECTION dictionary.

-
-
-
-

enum NMConnectionSerializationFlags

-

These flags determine which properties are serialized when calling when -calling nm_connection_to_dbus().

-
-

Members

-
----- - - - - - - - - - - - - - - - - - -

NM_CONNECTION_SERIALIZE_ALL

-

serialize all properties (including secrets)

-
 

NM_CONNECTION_SERIALIZE_NO_SECRETS

-

do not include secrets

-
 

NM_CONNECTION_SERIALIZE_ONLY_SECRETS

-

only serialize secrets

-
 
-
-
-
-
- - - \ No newline at end of file diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html index 0dae564f..2dcd7309 100644 --- a/docs/libnm/html/libnm-nm-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-dbus-interface.html @@ -353,7 +353,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NM80211Mode
     ├── NMActiveConnectionState
     ├── NMConnectivityState
@@ -364,7 +364,7 @@
     ├── NMMetered
     ├── NMState
     ╰── NMWimaxNspNetworkType
-    GFlags
+    GFlags
     ├── NM80211ApFlags
     ├── NM80211ApSecurityFlags
     ├── NMBluetoothCapabilities
@@ -764,8 +764,8 @@
 

enum NMDeviceType

-

NMDeviceType values indicate the type of hardware represented by -an NMDevice.

+

NMDeviceType values indicate the type of hardware represented by a +device object.

Members

diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html index eee7968d..f2720bfe 100644 --- a/docs/libnm/html/libnm-nm-errors.html +++ b/docs/libnm/html/libnm-nm-errors.html @@ -184,7 +184,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMAgentManagerError
     ├── NMConnectionError
     ├── NMCryptoError
@@ -349,9 +349,9 @@ errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.


enum NMConnectionError

-

Describes errors that may result from operations involving a NMConnection +

Describes errors that may result from operations involving a NMConnection or its NMSettings.

-

These errors may be returned directly from NMConnection and NMSetting +

These errors may be returned directly from NMConnection and NMSetting methods, or may be returned from D-Bus operations (eg on NMClient or NMDevice), where they correspond to errors in the "org.freedesktop.NetworkManager.Settings.Connection" namespace.

@@ -374,7 +374,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_SETTING_NOT_FOUND

@@ -382,7 +382,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_PROPERTY_NOT_FOUND

@@ -398,7 +398,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_MISSING_SETTING

+ + NM_STATE_UNKNOWN + = 0 + networking state is unknown + + + NM_STATE_ASLEEP + = 10 + networking is not enabled + + + NM_STATE_DISCONNECTED + = 20 + there is no active network connection + + + NM_STATE_DISCONNECTING + = 30 + network connections are being cleaned up + + + NM_STATE_CONNECTING + = 40 + a network connection is being started + + + NM_STATE_CONNECTED_LOCAL + = 50 + there is only local IPv4 and/or IPv6 connectivity + + + NM_STATE_CONNECTED_SITE + = 60 + there is only site-wide IPv4 and/or IPv6 connectivity + + + NM_STATE_CONNECTED_GLOBAL + = 70 + there is global IPv4 and/or IPv6 Internet connectivity + + + + + + + + + enum NMConnectivityState + + NMConnectivityState + + + + Values + + + + + + + + NM_CONNECTIVITY_UNKNOWN + = 1 + Network connectivity is unknown. + + + NM_CONNECTIVITY_NONE + = 2 + The host is not connected to any network. + + + NM_CONNECTIVITY_PORTAL + = 3 + The host is behind a captive portal and cannot reach the full Internet. + + + NM_CONNECTIVITY_LIMITED + = 4 + The host is connected to a network, but does not appear to be able to reach the full Internet. + + + NM_CONNECTIVITY_FULL + = 5 + The host is connected to a network, and appears to be able to reach the full Internet. + + + + + + + + + enum NMDeviceType + + NMDeviceType + + NMDeviceType values indicate the type of hardware represented by a device object. + + Values + + + + + + + + NM_DEVICE_TYPE_UNKNOWN + = 0 + unknown device + + + NM_DEVICE_TYPE_GENERIC + = 14 + generic support for unrecognized device types + + + NM_DEVICE_TYPE_ETHERNET + = 1 + a wired ethernet device + + + NM_DEVICE_TYPE_WIFI + = 2 + an 802.11 WiFi device + + + NM_DEVICE_TYPE_UNUSED1 + = 3 + not used + + + NM_DEVICE_TYPE_UNUSED2 + = 4 + not used + + + NM_DEVICE_TYPE_BT + = 5 + a Bluetooth device supporting PAN or DUN access protocols + + + NM_DEVICE_TYPE_OLPC_MESH + = 6 + an OLPC XO mesh networking device + + + NM_DEVICE_TYPE_WIMAX + = 7 + an 802.16e Mobile WiMAX broadband device + + + NM_DEVICE_TYPE_MODEM + = 8 + a modem supporting analog telephone, CDMA/EVDO, GSM/UMTS, or LTE network access protocols + + + NM_DEVICE_TYPE_INFINIBAND + = 9 + an IP-over-InfiniBand device + + + NM_DEVICE_TYPE_BOND + = 10 + a bond master interface + + + NM_DEVICE_TYPE_VLAN + = 11 + an 802.1Q VLAN interface + + + NM_DEVICE_TYPE_ADSL + = 12 + ADSL modem + + + NM_DEVICE_TYPE_BRIDGE + = 13 + a bridge master interface + + + NM_DEVICE_TYPE_TEAM + = 15 + a team master interface + + + NM_DEVICE_TYPE_TUN + = 16 + a TUN or TAP interface + + + NM_DEVICE_TYPE_IP_TUNNEL + = 17 + a IP tunnel interface + + + NM_DEVICE_TYPE_MACVLAN + = 18 + a MACVLAN interface + + + NM_DEVICE_TYPE_VXLAN + = 19 + a VXLAN interface + + + NM_DEVICE_TYPE_VETH + = 20 + a VETH interface + + + + + + + + + enum NMDeviceCapabilities + + NMDeviceCapabilities + + General device capability flags. + + Values + + + + + + + + NM_DEVICE_CAP_NONE + = 0x00000000 + device has no special capabilities + + + NM_DEVICE_CAP_NM_SUPPORTED + = 0x00000001 + NetworkManager supports this device + + + NM_DEVICE_CAP_CARRIER_DETECT + = 0x00000002 + this device can indicate carrier status + + + NM_DEVICE_CAP_IS_SOFTWARE + = 0x00000004 + this device is a software device + + + + + + + + + enum NMDeviceWifiCapabilities + + NMDeviceWifiCapabilities + + 802.11 specific device encryption and authentication capabilities. + + Values + + + + + + + + NM_WIFI_DEVICE_CAP_NONE + = 0x00000000 + device has no encryption/authentication capabilities + + + NM_WIFI_DEVICE_CAP_CIPHER_WEP40 + = 0x00000001 + device supports 40/64-bit WEP encryption + + + NM_WIFI_DEVICE_CAP_CIPHER_WEP104 + = 0x00000002 + device supports 104/128-bit WEP encryption + + + NM_WIFI_DEVICE_CAP_CIPHER_TKIP + = 0x00000004 + device supports TKIP encryption + + + NM_WIFI_DEVICE_CAP_CIPHER_CCMP + = 0x00000008 + device supports AES/CCMP encryption + + + NM_WIFI_DEVICE_CAP_WPA + = 0x00000010 + device supports WPA1 authentication + + + NM_WIFI_DEVICE_CAP_RSN + = 0x00000020 + device supports WPA2/RSN authentication + + + NM_WIFI_DEVICE_CAP_AP + = 0x00000040 + device supports Access Point mode + + + NM_WIFI_DEVICE_CAP_ADHOC + = 0x00000080 + device supports Ad-Hoc mode + + + NM_WIFI_DEVICE_CAP_FREQ_VALID + = 0x00000100 + device reports frequency capabilities + + + NM_WIFI_DEVICE_CAP_FREQ_2GHZ + = 0x00000200 + device supports 2.4GHz frequencies + + + NM_WIFI_DEVICE_CAP_FREQ_5GHZ + = 0x00000400 + device supports 5GHz frequencies + + + + + + + + + enum NM80211ApFlags + + NM80211ApFlags + + 802.11 access point flags. + + Values + + + + + + + + NM_802_11_AP_FLAGS_NONE + = 0x00000000 + access point has no special capabilities + + + NM_802_11_AP_FLAGS_PRIVACY + = 0x00000001 + access point requires authentication and encryption (usually means WEP) + + + + + + + + + enum NM80211ApSecurityFlags + + NM80211ApSecurityFlags + + 802.11 access point security and authentication flags. These flags describe the current security requirements of an access point as determined from the access point's beacon. + + Values + + + + + + + + NM_802_11_AP_SEC_NONE + = 0x00000000 + the access point has no special security requirements + + + NM_802_11_AP_SEC_PAIR_WEP40 + = 0x00000001 + 40/64-bit WEP is supported for pairwise/unicast encryption + + + NM_802_11_AP_SEC_PAIR_WEP104 + = 0x00000002 + 104/128-bit WEP is supported for pairwise/unicast encryption + + + NM_802_11_AP_SEC_PAIR_TKIP + = 0x00000004 + TKIP is supported for pairwise/unicast encryption + + + NM_802_11_AP_SEC_PAIR_CCMP + = 0x00000008 + AES/CCMP is supported for pairwise/unicast encryption + + + NM_802_11_AP_SEC_GROUP_WEP40 + = 0x00000010 + 40/64-bit WEP is supported for group/broadcast encryption + + + NM_802_11_AP_SEC_GROUP_WEP104 + = 0x00000020 + 104/128-bit WEP is supported for group/broadcast encryption + + + NM_802_11_AP_SEC_GROUP_TKIP + = 0x00000040 + TKIP is supported for group/broadcast encryption + + + NM_802_11_AP_SEC_GROUP_CCMP + = 0x00000080 + AES/CCMP is supported for group/broadcast encryption + + + NM_802_11_AP_SEC_KEY_MGMT_PSK + = 0x00000100 + WPA/RSN Pre-Shared Key encryption is supported + + + NM_802_11_AP_SEC_KEY_MGMT_802_1X + = 0x00000200 + 802.1x authentication and key management is supported + + + + + + + + + enum NM80211Mode + + NM80211Mode + + Indicates the 802.11 mode an access point or device is currently in. + + Values + + + + + + + + NM_802_11_MODE_UNKNOWN + = 0 + the device or access point mode is unknown + + + NM_802_11_MODE_ADHOC + = 1 + for both devices and access point objects, indicates the object is part of an Ad-Hoc 802.11 network without a central coordinating access point. + + + NM_802_11_MODE_INFRA + = 2 + the device or access point is in infrastructure mode. For devices, this indicates the device is an 802.11 client/station. For access point objects, this indicates the object is an access point that provides connectivity to clients. + + + NM_802_11_MODE_AP + = 3 + the device is an access point/hotspot. Not valid for access point objects; used only for hotspot mode on the local machine. + + + + + + + + + enum NMBluetoothCapabilities + + NMBluetoothCapabilities + + NMBluetoothCapabilities values indicate the usable capabilities of a Bluetooth device. + + Values + + + + + + + + NM_BT_CAPABILITY_NONE + = 0x00000000 + device has no usable capabilities + + + NM_BT_CAPABILITY_DUN + = 0x00000001 + device provides Dial-Up Networking capability + + + NM_BT_CAPABILITY_NAP + = 0x00000002 + device provides Network Access Point capability + + + + + + + + + enum NMDeviceModemCapabilities + + NMDeviceModemCapabilities + + NMDeviceModemCapabilities values indicate the generic radio access technology families a modem device supports. For more information on the specific access technologies the device supports use the ModemManager D-Bus API. + + Values + + + + + + + + NM_DEVICE_MODEM_CAPABILITY_NONE + = 0x00000000 + modem has no usable capabilities + + + NM_DEVICE_MODEM_CAPABILITY_POTS + = 0x00000001 + modem uses the analog wired telephone network and is not a wireless/cellular device + + + NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO + = 0x00000002 + modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO revision A, or EVDO revision B + + + NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS + = 0x00000004 + modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability + + + NM_DEVICE_MODEM_CAPABILITY_LTE + = 0x00000008 + modem has LTE data capability + + + + + + + + + enum NMWimaxNspNetworkType + + NMWimaxNspNetworkType + + WiMAX network type. + + Values + + + + + + + + NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN + = 0 + unknown network type + + + NM_WIMAX_NSP_NETWORK_TYPE_HOME + = 1 + home network + + + NM_WIMAX_NSP_NETWORK_TYPE_PARTNER + = 2 + partner network + + + NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER + = 3 + roaming partner network + + + + + + + + + enum NMDeviceState + + NMDeviceState + + + + Values + + + + + + + + NM_DEVICE_STATE_UNKNOWN + = 0 + the device's state is unknown + + + NM_DEVICE_STATE_UNMANAGED + = 10 + the device is recognized, but not managed by NetworkManager + + + NM_DEVICE_STATE_UNAVAILABLE + = 20 + the device is managed by NetworkManager, but is not available for use. Reasons may include the wireless switched off, missing firmware, no ethernet carrier, missing supplicant or modem manager, etc. + + + NM_DEVICE_STATE_DISCONNECTED + = 30 + the device can be activated, but is currently idle and not connected to a network. + + + NM_DEVICE_STATE_PREPARE + = 40 + the device is preparing the connection to the network. This may include operations like changing the MAC address, setting physical link properties, and anything else required to connect to the requested network. + + + NM_DEVICE_STATE_CONFIG + = 50 + the device is connecting to the requested network. This may include operations like associating with the WiFi AP, dialing the modem, connecting to the remote Bluetooth device, etc. + + + NM_DEVICE_STATE_NEED_AUTH + = 60 + the device requires more information to continue connecting to the requested network. This includes secrets like WiFi passphrases, login passwords, PIN codes, etc. + + + NM_DEVICE_STATE_IP_CONFIG + = 70 + the device is requesting IPv4 and/or IPv6 addresses and routing information from the network. + + + NM_DEVICE_STATE_IP_CHECK + = 80 + the device is checking whether further action is required for the requested network connection. This may include checking whether only local network access is available, whether a captive portal is blocking access to the Internet, etc. + + + NM_DEVICE_STATE_SECONDARIES + = 90 + the device is waiting for a secondary connection (like a VPN) which must activated before the device can be activated + + + NM_DEVICE_STATE_ACTIVATED + = 100 + the device has a network connection, either local or global. + + + NM_DEVICE_STATE_DEACTIVATING + = 110 + a disconnection from the current network connection was requested, and the device is cleaning up resources used for that connection. The network connection may still be valid. + + + NM_DEVICE_STATE_FAILED + = 120 + the device failed to connect to the requested network and is cleaning up the connection request + + + + + + + + + enum NMDeviceStateReason + + NMDeviceStateReason + + Device state change reason codes + + Values + + + + + + + + NM_DEVICE_STATE_REASON_NONE + = 0 + No reason given + + + NM_DEVICE_STATE_REASON_UNKNOWN + = 1 + Unknown error + + + NM_DEVICE_STATE_REASON_NOW_MANAGED + = 2 + Device is now managed + + + NM_DEVICE_STATE_REASON_NOW_UNMANAGED + = 3 + Device is now unmanaged + + + NM_DEVICE_STATE_REASON_CONFIG_FAILED + = 4 + The device could not be readied for configuration + + + NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE + = 5 + IP configuration could not be reserved (no available address, timeout, etc) + + + NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED + = 6 + The IP config is no longer valid + + + NM_DEVICE_STATE_REASON_NO_SECRETS + = 7 + Secrets were required, but not provided + + + NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT + = 8 + 802.1x supplicant disconnected + + + NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED + = 9 + 802.1x supplicant configuration failed + + + NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED + = 10 + 802.1x supplicant failed + + + NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT + = 11 + 802.1x supplicant took too long to authenticate + + + NM_DEVICE_STATE_REASON_PPP_START_FAILED + = 12 + PPP service failed to start + + + NM_DEVICE_STATE_REASON_PPP_DISCONNECT + = 13 + PPP service disconnected + + + NM_DEVICE_STATE_REASON_PPP_FAILED + = 14 + PPP failed + + + NM_DEVICE_STATE_REASON_DHCP_START_FAILED + = 15 + DHCP client failed to start + + + NM_DEVICE_STATE_REASON_DHCP_ERROR + = 16 + DHCP client error + + + NM_DEVICE_STATE_REASON_DHCP_FAILED + = 17 + DHCP client failed + + + NM_DEVICE_STATE_REASON_SHARED_START_FAILED + = 18 + Shared connection service failed to start + + + NM_DEVICE_STATE_REASON_SHARED_FAILED + = 19 + Shared connection service failed + + + NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED + = 20 + AutoIP service failed to start + + + NM_DEVICE_STATE_REASON_AUTOIP_ERROR + = 21 + AutoIP service error + + + NM_DEVICE_STATE_REASON_AUTOIP_FAILED + = 22 + AutoIP service failed + + + NM_DEVICE_STATE_REASON_MODEM_BUSY + = 23 + The line is busy + + + NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE + = 24 + No dial tone + + + NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER + = 25 + No carrier could be established + + + NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT + = 26 + The dialing request timed out + + + NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED + = 27 + The dialing attempt failed + + + NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED + = 28 + Modem initialization failed + + + NM_DEVICE_STATE_REASON_GSM_APN_FAILED + = 29 + Failed to select the specified APN + + + NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING + = 30 + Not searching for networks + + + NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED + = 31 + Network registration denied + + + NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT + = 32 + Network registration timed out + + + NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED + = 33 + Failed to register with the requested network + + + NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED + = 34 + PIN check failed + + + NM_DEVICE_STATE_REASON_FIRMWARE_MISSING + = 35 + Necessary firmware for the device may be missing + + + NM_DEVICE_STATE_REASON_REMOVED + = 36 + The device was removed + + + NM_DEVICE_STATE_REASON_SLEEPING + = 37 + NetworkManager went to sleep + + + NM_DEVICE_STATE_REASON_CONNECTION_REMOVED + = 38 + The device's active connection disappeared + + + NM_DEVICE_STATE_REASON_USER_REQUESTED + = 39 + Device disconnected by user or client + + + NM_DEVICE_STATE_REASON_CARRIER + = 40 + Carrier/link changed + + + NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED + = 41 + The device's existing connection was assumed + + + NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE + = 42 + The supplicant is now available + + + NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND + = 43 + The modem could not be found + + + NM_DEVICE_STATE_REASON_BT_FAILED + = 44 + The Bluetooth connection failed or timed out + + + NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED + = 45 + GSM Modem's SIM Card not inserted + + + NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED + = 46 + GSM Modem's SIM Pin required + + + NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED + = 47 + GSM Modem's SIM Puk required + + + NM_DEVICE_STATE_REASON_GSM_SIM_WRONG + = 48 + GSM Modem's SIM wrong + + + NM_DEVICE_STATE_REASON_INFINIBAND_MODE + = 49 + InfiniBand device does not support connected mode + + + NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED + = 50 + A dependency of the connection failed + + + NM_DEVICE_STATE_REASON_BR2684_FAILED + = 51 + Problem with the RFC 2684 Ethernet over ADSL bridge + + + NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE + = 52 + ModemManager not running + + + NM_DEVICE_STATE_REASON_SSID_NOT_FOUND + = 53 + The WiFi network could not be found + + + NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED + = 54 + A secondary connection of the base connection failed + + + NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED + = 55 + DCB or FCoE setup failed + + + NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED + = 56 + teamd control failed + + + NM_DEVICE_STATE_REASON_MODEM_FAILED + = 57 + Modem failed or no longer available + + + NM_DEVICE_STATE_REASON_MODEM_AVAILABLE + = 58 + Modem now ready and available + + + NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT + = 59 + SIM PIN was incorrect + + + NM_DEVICE_STATE_REASON_NEW_ACTIVATION + = 60 + New connection activation was enqueued + + + NM_DEVICE_STATE_REASON_PARENT_CHANGED + = 61 + the device's parent changed + + + NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED + = 62 + the device parent's management changed + + + + + + + + + enum NMMetered + + NMMetered + + Since: 1.2 + + Values + + + + + + + + NM_METERED_UNKNOWN + = 0 + The metered status is unknown + + + NM_METERED_YES + = 1 + Metered, the value was statically set + + + NM_METERED_NO + = 2 + Not metered, the value was statically set + + + NM_METERED_GUESS_YES + = 3 + Metered, the value was guessed + + + NM_METERED_GUESS_NO + = 4 + Not metered, the value was guessed + + + + + + + + + enum NMActiveConnectionState + + NMActiveConnectionState + + NMActiveConnectionState values indicate the state of a connection to a specific network while it is starting, connected, or disconnecting from that network. + + Values + + + + + + + + NM_ACTIVE_CONNECTION_STATE_UNKNOWN + = 0 + the state of the connection is unknown + + + NM_ACTIVE_CONNECTION_STATE_ACTIVATING + = 1 + a network connection is being prepared + + + NM_ACTIVE_CONNECTION_STATE_ACTIVATED + = 2 + there is a connection to the network + + + NM_ACTIVE_CONNECTION_STATE_DEACTIVATING + = 3 + the network connection is being torn down and cleaned up + + + NM_ACTIVE_CONNECTION_STATE_DEACTIVATED + = 4 + the network connection is disconnected and will be removed + + + + + + + + + enum NMSecretAgentGetSecretsFlags + + NMSecretAgentGetSecretsFlags + + NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request. + + Values + + + + + + + + NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE + = 0x0 + no special behavior; by default no user interaction is allowed and requests for secrets are fulfilled from persistent storage, or if no secrets are available an error is returned. + + + NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION + = 0x1 + allows the request to interact with the user, possibly prompting via UI for secrets if any are required, or if none are found in persistent storage. + + + NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW + = 0x2 + explicitly prompt for new secrets from the user. This flag signals that NetworkManager thinks any existing secrets are invalid or wrong. This flag implies that interaction is allowed. + + + NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED + = 0x4 + set if the request was initiated by user-requested action via the D-Bus interface, as opposed to automatically initiated by NetworkManager in response to (for example) scan results or carrier changes. + + + NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM + = 0x80000000 + Internal flag, not part of the D-Bus API. + + + NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS + = 0x40000000 + Internal flag, not part of the D-Bus API. + + + + + + + + + enum NMSecretAgentCapabilities + + NMSecretAgentCapabilities + + NMSecretAgentCapabilities indicate various capabilities of the agent. + + Values + + + + + + + + NM_SECRET_AGENT_CAPABILITY_NONE + = 0x0 + the agent supports no special capabilities + + + NM_SECRET_AGENT_CAPABILITY_VPN_HINTS + = 0x1 + the agent supports passing hints to VPN plugin authentication dialogs. + + + + + + + + + enum NMIPTunnelMode + + NMIPTunnelMode + + The tunneling mode.Since: 1.2 + + Values + + + + + + + + NM_IP_TUNNEL_MODE_UNKNOWN + = 0 + Unknown/unset tunnel mode + + + NM_IP_TUNNEL_MODE_IPIP + = 1 + IP in IP tunnel + + + NM_IP_TUNNEL_MODE_GRE + = 2 + GRE tunnel + + + NM_IP_TUNNEL_MODE_SIT + = 3 + SIT tunnel + + + NM_IP_TUNNEL_MODE_ISATAP + = 4 + ISATAP tunnel + + + NM_IP_TUNNEL_MODE_VTI + = 5 + VTI tunnel + + + NM_IP_TUNNEL_MODE_IP6IP6 + = 6 + IPv6 in IPv6 tunnel + + + NM_IP_TUNNEL_MODE_IPIP6 + = 7 + IPv4 in IPv6 tunnel + + + NM_IP_TUNNEL_MODE_IP6GRE + = 8 + IPv6 GRE tunnel + + + NM_IP_TUNNEL_MODE_VTI6 + = 9 + IPv6 VTI tunnel + + + + + + + + diff --git a/libnm-core/nm-setting-8021x.h b/libnm-core/nm-setting-8021x.h index d8867b92..5cdcb3d5 100644 --- a/libnm-core/nm-setting-8021x.h +++ b/libnm-core/nm-setting-8021x.h @@ -136,6 +136,9 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/ * properties to the paths to their respective objects. */ +/** + * NMSetting8021x: + */ struct _NMSetting8021x { NMSetting parent; }; diff --git a/libnm-core/nm-setting-adsl.h b/libnm-core/nm-setting-adsl.h index 2b44d686..5afbe5bf 100644 --- a/libnm-core/nm-setting-adsl.h +++ b/libnm-core/nm-setting-adsl.h @@ -54,6 +54,9 @@ G_BEGIN_DECLS #define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux" #define NM_SETTING_ADSL_ENCAPSULATION_LLC "llc" +/** + * NMSettingAdsl: + */ struct _NMSettingAdsl { NMSetting parent; }; diff --git a/libnm-core/nm-setting-bluetooth.h b/libnm-core/nm-setting-bluetooth.h index 6bb5ce80..6746782e 100644 --- a/libnm-core/nm-setting-bluetooth.h +++ b/libnm-core/nm-setting-bluetooth.h @@ -59,6 +59,9 @@ G_BEGIN_DECLS */ #define NM_SETTING_BLUETOOTH_TYPE_PANU "panu" +/** + * NMSettingBluetooth: + */ struct _NMSettingBluetooth { NMSetting parent; }; diff --git a/libnm-core/nm-setting-bond.h b/libnm-core/nm-setting-bond.h index 98fcc6d0..8ee31888 100644 --- a/libnm-core/nm-setting-bond.h +++ b/libnm-core/nm-setting-bond.h @@ -70,6 +70,9 @@ G_BEGIN_DECLS #define NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB "tlb_dynamic_lb" #define NM_SETTING_BOND_OPTION_LP_INTERVAL "lp_interval" +/** + * NMSettingBond: + */ struct _NMSettingBond { NMSetting parent; }; diff --git a/libnm-core/nm-setting-bridge-port.h b/libnm-core/nm-setting-bridge-port.h index 49ca38b3..b43f6366 100644 --- a/libnm-core/nm-setting-bridge-port.h +++ b/libnm-core/nm-setting-bridge-port.h @@ -43,6 +43,9 @@ G_BEGIN_DECLS #define NM_SETTING_BRIDGE_PORT_PATH_COST "path-cost" #define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode" +/** + * NMSettingBridgePort: + */ struct _NMSettingBridgePort { NMSetting parent; }; diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h index 020d6db6..844c06ad 100644 --- a/libnm-core/nm-setting-bridge.h +++ b/libnm-core/nm-setting-bridge.h @@ -48,6 +48,9 @@ G_BEGIN_DECLS #define NM_SETTING_BRIDGE_AGEING_TIME "ageing-time" #define NM_SETTING_BRIDGE_MULTICAST_SNOOPING "multicast-snooping" +/** + * NMSettingBridge: + */ struct _NMSettingBridge { NMSetting parent; }; diff --git a/libnm-core/nm-setting-cdma.h b/libnm-core/nm-setting-cdma.h index 6e333dcc..091c530e 100644 --- a/libnm-core/nm-setting-cdma.h +++ b/libnm-core/nm-setting-cdma.h @@ -45,6 +45,9 @@ G_BEGIN_DECLS #define NM_SETTING_CDMA_PASSWORD "password" #define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags" +/** + * NMSettingCdma: + */ struct _NMSettingCdma { NMSetting parent; }; diff --git a/libnm-core/nm-setting-dcb.h b/libnm-core/nm-setting-dcb.h index e5bc4bcf..6cc2ce41 100644 --- a/libnm-core/nm-setting-dcb.h +++ b/libnm-core/nm-setting-dcb.h @@ -92,7 +92,9 @@ typedef enum { /*< flags >*/ #define NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH "priority-strict-bandwidth" #define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS "priority-traffic-class" - +/** + * NMSettingDcb: + */ struct _NMSettingDcb { NMSetting parent; }; diff --git a/libnm-core/nm-setting-generic.h b/libnm-core/nm-setting-generic.h index 7a209da2..0ce3b160 100644 --- a/libnm-core/nm-setting-generic.h +++ b/libnm-core/nm-setting-generic.h @@ -39,6 +39,9 @@ G_BEGIN_DECLS #define NM_SETTING_GENERIC_SETTING_NAME "generic" +/** + * NMSettingGeneric: + */ struct _NMSettingGeneric { NMSetting parent; }; diff --git a/libnm-core/nm-setting-gsm.h b/libnm-core/nm-setting-gsm.h index 2dfe73fa..7f97d386 100644 --- a/libnm-core/nm-setting-gsm.h +++ b/libnm-core/nm-setting-gsm.h @@ -53,6 +53,9 @@ G_BEGIN_DECLS #define NM_SETTING_GSM_SIM_ID "sim-id" #define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id" +/** + * NMSettingGsm: + */ struct _NMSettingGsm { NMSetting parent; }; diff --git a/libnm-core/nm-setting-infiniband.h b/libnm-core/nm-setting-infiniband.h index c5ad418b..f19983b4 100644 --- a/libnm-core/nm-setting-infiniband.h +++ b/libnm-core/nm-setting-infiniband.h @@ -45,6 +45,9 @@ G_BEGIN_DECLS #define NM_SETTING_INFINIBAND_P_KEY "p-key" #define NM_SETTING_INFINIBAND_PARENT "parent" +/** + * NMSettingInfiniband: + */ struct _NMSettingInfiniband { NMSetting parent; }; diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h index 39e4c9f0..79c7e639 100644 --- a/libnm-core/nm-setting-ip-config.h +++ b/libnm-core/nm-setting-ip-config.h @@ -165,6 +165,9 @@ void nm_ip_route_set_attribute (NMIPRoute *route, #define NM_SETTING_DNS_OPTION_NO_TLD_QUERY "no-tld-query" #define NM_SETTING_DNS_OPTION_USE_VC "use-vc" +/** + * NMSettingIPConfig: + */ struct _NMSettingIPConfig { NMSetting parent; }; diff --git a/libnm-core/nm-setting-ip-tunnel.h b/libnm-core/nm-setting-ip-tunnel.h index 09814f35..3ee4aafe 100644 --- a/libnm-core/nm-setting-ip-tunnel.h +++ b/libnm-core/nm-setting-ip-tunnel.h @@ -51,6 +51,9 @@ G_BEGIN_DECLS #define NM_SETTING_IP_TUNNEL_FLOW_LABEL "flow-label" #define NM_SETTING_IP_TUNNEL_MTU "mtu" +/** + * NMSettingIPTunnel: + */ struct _NMSettingIPTunnel { NMSetting parent; }; diff --git a/libnm-core/nm-setting-ip4-config.h b/libnm-core/nm-setting-ip4-config.h index 8e6524cb..adef3754 100644 --- a/libnm-core/nm-setting-ip4-config.h +++ b/libnm-core/nm-setting-ip4-config.h @@ -87,6 +87,9 @@ G_BEGIN_DECLS */ #define NM_SETTING_IP4_CONFIG_METHOD_DISABLED "disabled" +/** + * NMSettingIP4Config: + */ struct _NMSettingIP4Config { NMSettingIPConfig parent; }; diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index bab8c535..1f0b11fc 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -601,7 +601,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class) * * Configure method for creating the address for use with RFC4862 IPv6 * Stateless Address Autoconfiguration. The permitted values are: "eui64", - * "stable-privacy" or unset. + * or "stable-privacy". * * If the property is set to "eui64", the addresses will be generated * using the interface tokens derived from hardware address. This makes @@ -616,8 +616,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class) * and makes the address stable when the network interface hardware is * replaced. * - * Leaving this unset causes a default that could be subject to change - * in future versions to be used. + * On D-Bus, the absence of an addr-gen-mode setting equals enabling + * "stable-privacy". For keyfile plugin, the absence of the setting + * on disk means "eui64" so that the property doesn't change on upgrade + * from older versions. * * Note that this setting is distinct from the Privacy Extensions as * configured by "ip6-privacy" property and it does not affect the diff --git a/libnm-core/nm-setting-ip6-config.h b/libnm-core/nm-setting-ip6-config.h index f8923d19..2966e558 100644 --- a/libnm-core/nm-setting-ip6-config.h +++ b/libnm-core/nm-setting-ip6-config.h @@ -135,6 +135,9 @@ typedef enum { NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY = 1, } NMSettingIP6ConfigAddrGenMode; +/** + * NMSettingIP6Config: + */ struct _NMSettingIP6Config { NMSettingIPConfig parent; }; diff --git a/libnm-core/nm-setting-macvlan.h b/libnm-core/nm-setting-macvlan.h index 3922cd93..33860aac 100644 --- a/libnm-core/nm-setting-macvlan.h +++ b/libnm-core/nm-setting-macvlan.h @@ -44,6 +44,9 @@ G_BEGIN_DECLS #define NM_SETTING_MACVLAN_PROMISCUOUS "promiscuous" #define NM_SETTING_MACVLAN_TAP "tap" +/** + * NMSettingMacvlan: + */ struct _NMSettingMacvlan { NMSetting parent; }; diff --git a/libnm-core/nm-setting-olpc-mesh.h b/libnm-core/nm-setting-olpc-mesh.h index 6a165651..2506cec9 100644 --- a/libnm-core/nm-setting-olpc-mesh.h +++ b/libnm-core/nm-setting-olpc-mesh.h @@ -44,6 +44,9 @@ G_BEGIN_DECLS #define NM_SETTING_OLPC_MESH_CHANNEL "channel" #define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address" +/** + * NMSettingOlpcMesh: + */ struct _NMSettingOlpcMesh { NMSetting parent; }; diff --git a/libnm-core/nm-setting-ppp.h b/libnm-core/nm-setting-ppp.h index 2e0162cc..a835ef8a 100644 --- a/libnm-core/nm-setting-ppp.h +++ b/libnm-core/nm-setting-ppp.h @@ -59,6 +59,9 @@ G_BEGIN_DECLS #define NM_SETTING_PPP_LCP_ECHO_FAILURE "lcp-echo-failure" #define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval" +/** + * NMSettingPpp: + */ struct _NMSettingPpp { NMSetting parent; }; diff --git a/libnm-core/nm-setting-pppoe.h b/libnm-core/nm-setting-pppoe.h index b1e0d92f..1f5b6ed9 100644 --- a/libnm-core/nm-setting-pppoe.h +++ b/libnm-core/nm-setting-pppoe.h @@ -45,6 +45,9 @@ G_BEGIN_DECLS #define NM_SETTING_PPPOE_PASSWORD "password" #define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags" +/** + * NMSettingPppoe: + */ struct _NMSettingPppoe { NMSetting parent; }; diff --git a/libnm-core/nm-setting-serial.h b/libnm-core/nm-setting-serial.h index 58289227..182efc61 100644 --- a/libnm-core/nm-setting-serial.h +++ b/libnm-core/nm-setting-serial.h @@ -60,6 +60,9 @@ typedef enum { #define NM_SETTING_SERIAL_STOPBITS "stopbits" #define NM_SETTING_SERIAL_SEND_DELAY "send-delay" +/** + * NMSettingSerial: + */ struct _NMSettingSerial { NMSetting parent; }; diff --git a/libnm-core/nm-setting-team-port.h b/libnm-core/nm-setting-team-port.h index 86efb97c..546cc69a 100644 --- a/libnm-core/nm-setting-team-port.h +++ b/libnm-core/nm-setting-team-port.h @@ -40,6 +40,9 @@ G_BEGIN_DECLS #define NM_SETTING_TEAM_PORT_CONFIG "config" +/** + * NMSettingTeamPort: + */ struct _NMSettingTeamPort { NMSetting parent; }; diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h index d66eb685..726f8420 100644 --- a/libnm-core/nm-setting-team.h +++ b/libnm-core/nm-setting-team.h @@ -40,6 +40,9 @@ G_BEGIN_DECLS #define NM_SETTING_TEAM_CONFIG "config" +/** + * NMSettingTeam: + */ struct _NMSettingTeam { NMSetting parent; }; diff --git a/libnm-core/nm-setting-tun.h b/libnm-core/nm-setting-tun.h index 2b368a69..63c0cbd8 100644 --- a/libnm-core/nm-setting-tun.h +++ b/libnm-core/nm-setting-tun.h @@ -60,6 +60,9 @@ typedef enum { NM_SETTING_TUN_MODE_TAP = 2, } NMSettingTunMode; +/** + * NMSettingTun: + */ struct _NMSettingTun { NMSetting parent; }; diff --git a/libnm-core/nm-setting-vlan.h b/libnm-core/nm-setting-vlan.h index cf41ba17..b147a185 100644 --- a/libnm-core/nm-setting-vlan.h +++ b/libnm-core/nm-setting-vlan.h @@ -46,6 +46,9 @@ G_BEGIN_DECLS #define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map" #define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP "egress-priority-map" +/** + * NMSettingVlan: + */ struct _NMSettingVlan { NMSetting parent; }; diff --git a/libnm-core/nm-setting-vpn.h b/libnm-core/nm-setting-vpn.h index 31f3c7b8..539656f8 100644 --- a/libnm-core/nm-setting-vpn.h +++ b/libnm-core/nm-setting-vpn.h @@ -47,6 +47,9 @@ G_BEGIN_DECLS #define NM_SETTING_VPN_SECRETS "secrets" #define NM_SETTING_VPN_TIMEOUT "timeout" +/** + * NMSettingVpn: + */ struct _NMSettingVpn { NMSetting parent; }; diff --git a/libnm-core/nm-setting-vxlan.h b/libnm-core/nm-setting-vxlan.h index c410338e..fab2d820 100644 --- a/libnm-core/nm-setting-vxlan.h +++ b/libnm-core/nm-setting-vxlan.h @@ -56,6 +56,9 @@ G_BEGIN_DECLS #define NM_SETTING_VXLAN_L2_MISS "l2-miss" #define NM_SETTING_VXLAN_L3_MISS "l3-miss" +/** + * NMSettingVxlan: + */ struct _NMSettingVxlan { NMSetting parent; }; diff --git a/libnm-core/nm-setting-wimax.h b/libnm-core/nm-setting-wimax.h index 0a98fbb5..3f0767e9 100644 --- a/libnm-core/nm-setting-wimax.h +++ b/libnm-core/nm-setting-wimax.h @@ -42,6 +42,9 @@ G_BEGIN_DECLS #define NM_SETTING_WIMAX_NETWORK_NAME "network-name" #define NM_SETTING_WIMAX_MAC_ADDRESS "mac-address" +/** + * NMSettingWimax: + */ struct _NMSettingWimax { NMSetting parent; }; diff --git a/libnm-core/nm-setting-wired.h b/libnm-core/nm-setting-wired.h index 7eb53d30..6bc66782 100644 --- a/libnm-core/nm-setting-wired.h +++ b/libnm-core/nm-setting-wired.h @@ -93,6 +93,9 @@ typedef enum { /*< flags >*/ #define NM_SETTING_WIRED_WAKE_ON_LAN "wake-on-lan" #define NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD "wake-on-lan-password" +/** + * NMSettingWired: + */ struct _NMSettingWired { NMSetting parent; }; diff --git a/libnm-core/nm-setting-wireless-security.h b/libnm-core/nm-setting-wireless-security.h index 8c4e1f03..093cb386 100644 --- a/libnm-core/nm-setting-wireless-security.h +++ b/libnm-core/nm-setting-wireless-security.h @@ -89,6 +89,9 @@ typedef enum { #define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password" #define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags" +/** + * NMSettingWirelessSecurity: + */ struct _NMSettingWirelessSecurity { NMSetting parent; }; diff --git a/libnm-core/nm-setting-wireless.h b/libnm-core/nm-setting-wireless.h index 606733fa..574cee54 100644 --- a/libnm-core/nm-setting-wireless.h +++ b/libnm-core/nm-setting-wireless.h @@ -98,7 +98,9 @@ typedef enum { NM_SETTING_WIRELESS_POWERSAVE_LAST = _NM_SETTING_WIRELESS_POWERSAVE_NUM - 1, /*< skip >*/ } NMSettingWirelessPowersave; - +/** + * NMSettingWireless: + */ struct _NMSettingWireless { NMSetting parent; }; diff --git a/libnm-core/nm-simple-connection.h b/libnm-core/nm-simple-connection.h index da6030a8..d6a60447 100644 --- a/libnm-core/nm-simple-connection.h +++ b/libnm-core/nm-simple-connection.h @@ -36,6 +36,9 @@ G_BEGIN_DECLS #define NM_IS_SIMPLE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SIMPLE_CONNECTION)) #define NM_SIMPLE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SIMPLE_CONNECTION, NMSimpleConnectionClass)) +/** + * NMSimpleConnection: + */ struct _NMSimpleConnection { GObject parent; }; diff --git a/libnm-core/nm-vpn-dbus-types.xml b/libnm-core/nm-vpn-dbus-types.xml new file mode 100644 index 00000000..6e10060c --- /dev/null +++ b/libnm-core/nm-vpn-dbus-types.xml @@ -0,0 +1,246 @@ + + + + + + + VPN Plugin D-Bus API Types + 3 + VPN Plugin D-Bus API Types + + + VPN Plugin D-Bus API Types + + + + + enum NMVpnServiceState + + NMVpnServiceState + + VPN daemon states + + Values + + + + + + + + NM_VPN_SERVICE_STATE_UNKNOWN + = 0 + The state of the VPN plugin is unknown. + + + NM_VPN_SERVICE_STATE_INIT + = 1 + The VPN plugin is initialized. + + + NM_VPN_SERVICE_STATE_SHUTDOWN + = 2 + Not used. + + + NM_VPN_SERVICE_STATE_STARTING + = 3 + The plugin is attempting to connect to a VPN server. + + + NM_VPN_SERVICE_STATE_STARTED + = 4 + The plugin has connected to a VPN server. + + + NM_VPN_SERVICE_STATE_STOPPING + = 5 + The plugin is disconnecting from the VPN server. + + + NM_VPN_SERVICE_STATE_STOPPED + = 6 + The plugin has disconnected from the VPN server. + + + + + + + + + enum NMVpnConnectionState + + NMVpnConnectionState + + VPN connection states + + Values + + + + + + + + NM_VPN_CONNECTION_STATE_UNKNOWN + = 0 + The state of the VPN connection is unknown. + + + NM_VPN_CONNECTION_STATE_PREPARE + = 1 + The VPN connection is preparing to connect. + + + NM_VPN_CONNECTION_STATE_NEED_AUTH + = 2 + The VPN connection needs authorization credentials. + + + NM_VPN_CONNECTION_STATE_CONNECT + = 3 + The VPN connection is being established. + + + NM_VPN_CONNECTION_STATE_IP_CONFIG_GET + = 4 + The VPN connection is getting an IP address. + + + NM_VPN_CONNECTION_STATE_ACTIVATED + = 5 + The VPN connection is active. + + + NM_VPN_CONNECTION_STATE_FAILED + = 6 + The VPN connection failed. + + + NM_VPN_CONNECTION_STATE_DISCONNECTED + = 7 + The VPN connection is disconnected. + + + + + + + + + enum NMVpnConnectionStateReason + + NMVpnConnectionStateReason + + VPN connection state reasons + + Values + + + + + + + + NM_VPN_CONNECTION_STATE_REASON_UNKNOWN + = 0 + The reason for the VPN connection state change is unknown. + + + NM_VPN_CONNECTION_STATE_REASON_NONE + = 1 + No reason was given for the VPN connection state change. + + + NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED + = 2 + The VPN connection changed state because the user disconnected it. + + + NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED + = 3 + The VPN connection changed state because the device it was using was disconnected. + + + NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED + = 4 + The service providing the VPN connection was stopped. + + + NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID + = 5 + The IP config of the VPN connection was invalid. + + + NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT + = 6 + The connection attempt to the VPN service timed out. + + + NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT + = 7 + A timeout occurred while starting the service providing the VPN connection. + + + NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED + = 8 + Starting the service starting the service providing the VPN connection failed. + + + NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS + = 9 + Necessary secrets for the VPN connection were not provided. + + + NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED + = 10 + Authentication to the VPN server failed. + + + NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED + = 11 + The connection was deleted from settings. + + + + + + + + + enum NMVpnPluginFailure + + NMVpnPluginFailure + + VPN plugin failure reasons + + Values + + + + + + + + NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED + = 1 + Login failed. + + + NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED + = 2 + Connect failed. + + + NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG + = 3 + Invalid IP configuration returned from the VPN plugin. + + + + + + + + diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c index a49c3957..c4db3788 100644 --- a/libnm-core/nm-vpn-editor-plugin.c +++ b/libnm-core/nm-vpn-editor-plugin.c @@ -24,6 +24,8 @@ #include "nm-vpn-editor-plugin.h" +#include + #include "nm-core-internal.h" static void nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface); @@ -80,11 +82,15 @@ _nm_vpn_editor_plugin_load (const char *plugin_name, gpointer user_data, GError **error) { - GModule *module = NULL; + void *dl_module = NULL; + gboolean loaded_before; NMVpnEditorPluginFactory factory = NULL; - NMVpnEditorPlugin *editor_plugin = NULL; + gs_unref_object NMVpnEditorPlugin *editor_plugin = NULL; gs_free char *plugin_filename_free = NULL; const char *plugin_filename; + gs_free_error GError *factory_error = NULL; + gs_free char *plug_name = NULL; + gs_free char *plug_service = NULL; g_return_val_if_fail (plugin_name && *plugin_name, NULL); @@ -105,8 +111,14 @@ _nm_vpn_editor_plugin_load (const char *plugin_name, plugin_filename_free = g_module_build_path (NMPLUGINDIR, plugin_name); plugin_filename = plugin_filename_free; } + } - /* _nm_utils_check_module_file() fails with ENOENT if the plugin file + dl_module = dlopen (plugin_filename, RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD); + if ( !dl_module + && do_file_checks) { + /* If the module is already loaded, we skip the file checks. + * + * _nm_utils_check_module_file() fails with ENOENT if the plugin file * does not exist. That is relevant, because nm-applet checks for that. */ if (!_nm_utils_check_module_file (plugin_filename, check_owner, @@ -116,79 +128,85 @@ _nm_vpn_editor_plugin_load (const char *plugin_name, return NULL; } - module = g_module_open (plugin_filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - if (!module) { + if (dl_module) { + loaded_before = TRUE; + } else { + loaded_before = FALSE; + dl_module = dlopen (plugin_filename, RTLD_LAZY | RTLD_LOCAL); + } + + if (!dl_module) { + g_set_error (error, + NM_VPN_PLUGIN_ERROR, + NM_VPN_PLUGIN_ERROR_FAILED, + _("cannot load plugin \"%s\": %s"), + plugin_name, + dlerror () ?: "unknown reason"); + return NULL; + } + + factory = dlsym (dl_module, "nm_vpn_editor_plugin_factory"); + if (!factory) { g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_FAILED, - _("cannot load plugin %s"), plugin_name); + _("failed to load nm_vpn_editor_plugin_factory() from %s (%s)"), + plugin_name, dlerror ()); + dlclose (dl_module); return NULL; } - if (g_module_symbol (module, "nm_vpn_editor_plugin_factory", (gpointer) &factory)) { - gs_free_error GError *factory_error = NULL; - gboolean success = FALSE; - - editor_plugin = factory (&factory_error); - - g_assert (!editor_plugin || G_IS_OBJECT (editor_plugin)); - - if (editor_plugin) { - gs_free char *plug_name = NULL, *plug_service = NULL; - - /* Validate plugin properties */ - - g_object_get (G_OBJECT (editor_plugin), - NM_VPN_EDITOR_PLUGIN_NAME, &plug_name, - NM_VPN_EDITOR_PLUGIN_SERVICE, &plug_service, - NULL); - - if (!plug_name || !*plug_name) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_FAILED, - _("cannot load VPN plugin in '%s': missing plugin name"), - g_module_name (module)); - } else if ( check_service - && g_strcmp0 (plug_service, check_service) != 0) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_FAILED, - _("cannot load VPN plugin in '%s': invalid service name"), - g_module_name (module)); - } else { - /* Success! */ - g_object_set_data_full (G_OBJECT (editor_plugin), "gmodule", module, - (GDestroyNotify) g_module_close); - success = TRUE; - } + editor_plugin = factory (&factory_error); + + if (loaded_before) { + /* we want to leak the library, because the factory will register glib + * types, which cannot be unregistered. + * + * However, if the library was already loaded before, we want to return + * our part of the reference count. */ + dlclose (dl_module); + } + + if (!editor_plugin) { + if (factory_error) { + g_propagate_error (error, factory_error); + factory_error = NULL; } else { - if (factory_error) { - g_propagate_error (error, factory_error); - factory_error = NULL; - } else { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_FAILED, - _("unknown error initializing plugin %s"), plugin_name); - } + g_set_error (error, + NM_VPN_PLUGIN_ERROR, + NM_VPN_PLUGIN_ERROR_FAILED, + _("unknown error initializing plugin %s"), plugin_name); } + return NULL; + } - if (!success) { - g_module_close (module); - editor_plugin = NULL; - } - } else { + g_return_val_if_fail (G_IS_OBJECT (editor_plugin), NULL); + + /* Validate plugin properties */ + g_object_get (G_OBJECT (editor_plugin), + NM_VPN_EDITOR_PLUGIN_NAME, &plug_name, + NM_VPN_EDITOR_PLUGIN_SERVICE, &plug_service, + NULL); + + if (!plug_name || !*plug_name) { g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_FAILED, - _("failed to load nm_vpn_editor_plugin_factory() from %s (%s)"), - g_module_name (module), g_module_error ()); - g_module_close (module); - editor_plugin = NULL; + _("cannot load VPN plugin in '%s': missing plugin name"), + plugin_name); + return NULL; + } + if ( check_service + && g_strcmp0 (plug_service, check_service) != 0) { + g_set_error (error, + NM_VPN_PLUGIN_ERROR, + NM_VPN_PLUGIN_ERROR_FAILED, + _("cannot load VPN plugin in '%s': invalid service name"), + plugin_name); + return NULL; } - return editor_plugin; + return nm_unauto (&editor_plugin); } /** diff --git a/libnm-core/nm-vpn-plugin-info.h b/libnm-core/nm-vpn-plugin-info.h index 667a4fe2..c7fef857 100644 --- a/libnm-core/nm-vpn-plugin-info.h +++ b/libnm-core/nm-vpn-plugin-info.h @@ -44,6 +44,9 @@ G_BEGIN_DECLS #define NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM "libnm" #define NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME "GNOME" +/** + * NMVpnPluginInfo: + */ typedef struct { NM_AVAILABLE_IN_1_2 GObject parent; diff --git a/libnm/nm-access-point.h b/libnm/nm-access-point.h index f1e26548..142ab295 100644 --- a/libnm/nm-access-point.h +++ b/libnm/nm-access-point.h @@ -51,7 +51,9 @@ G_BEGIN_DECLS /* DEPRECATED */ #define NM_ACCESS_POINT_HW_ADDRESS "hw-address" - +/** + * NMAccessPoint: + */ struct _NMAccessPoint { NMObject parent; }; diff --git a/libnm/nm-active-connection.h b/libnm/nm-active-connection.h index 4bc84148..13e50a06 100644 --- a/libnm/nm-active-connection.h +++ b/libnm/nm-active-connection.h @@ -53,6 +53,9 @@ G_BEGIN_DECLS #define NM_ACTIVE_CONNECTION_VPN "vpn" #define NM_ACTIVE_CONNECTION_MASTER "master" +/** + * NMActiveConnection: + */ struct _NMActiveConnection { NMObject parent; }; diff --git a/libnm/nm-client.h b/libnm/nm-client.h index 54d6deee..66ec9ea5 100644 --- a/libnm/nm-client.h +++ b/libnm/nm-client.h @@ -157,6 +157,9 @@ typedef enum { #define NM_CLIENT_ERROR nm_client_error_quark () GQuark nm_client_error_quark (void); +/** + * NMClient: + */ struct _NMClient { GObject parent; }; diff --git a/libnm/nm-device-adsl.h b/libnm/nm-device-adsl.h index d0174514..113d25b1 100644 --- a/libnm/nm-device-adsl.h +++ b/libnm/nm-device-adsl.h @@ -38,6 +38,9 @@ G_BEGIN_DECLS #define NM_DEVICE_ADSL_CARRIER "carrier" +/** + * NMDeviceAdsl: + */ struct _NMDeviceAdsl { NMDevice parent; }; diff --git a/libnm/nm-device-bond.h b/libnm/nm-device-bond.h index b7a0b113..67f64280 100644 --- a/libnm/nm-device-bond.h +++ b/libnm/nm-device-bond.h @@ -40,6 +40,9 @@ G_BEGIN_DECLS #define NM_DEVICE_BOND_CARRIER "carrier" #define NM_DEVICE_BOND_SLAVES "slaves" +/** + * NMDeviceBond: + */ struct _NMDeviceBond { NMDevice parent; }; diff --git a/libnm/nm-device-bridge.h b/libnm/nm-device-bridge.h index 42a0b3a5..df0cb303 100644 --- a/libnm/nm-device-bridge.h +++ b/libnm/nm-device-bridge.h @@ -40,6 +40,9 @@ G_BEGIN_DECLS #define NM_DEVICE_BRIDGE_CARRIER "carrier" #define NM_DEVICE_BRIDGE_SLAVES "slaves" +/** + * NMDeviceBridge: + */ struct _NMDeviceBridge { NMDevice parent; }; diff --git a/libnm/nm-device-bt.h b/libnm/nm-device-bt.h index e066cbcd..773cb148 100644 --- a/libnm/nm-device-bt.h +++ b/libnm/nm-device-bt.h @@ -41,6 +41,9 @@ G_BEGIN_DECLS #define NM_DEVICE_BT_NAME "name" #define NM_DEVICE_BT_CAPABILITIES "bt-capabilities" +/** + * NMDeviceBt: + */ struct _NMDeviceBt { NMDevice parent; }; diff --git a/libnm/nm-device-ethernet.h b/libnm/nm-device-ethernet.h index 07cf4c4d..76f4fde1 100644 --- a/libnm/nm-device-ethernet.h +++ b/libnm/nm-device-ethernet.h @@ -43,6 +43,9 @@ G_BEGIN_DECLS #define NM_DEVICE_ETHERNET_CARRIER "carrier" #define NM_DEVICE_ETHERNET_S390_SUBCHANNELS "s390-subchannels" +/** + * NMDeviceEthernet: + */ struct _NMDeviceEthernet { NMDevice parent; }; diff --git a/libnm/nm-device-generic.h b/libnm/nm-device-generic.h index 457a8840..2a4a1160 100644 --- a/libnm/nm-device-generic.h +++ b/libnm/nm-device-generic.h @@ -39,6 +39,9 @@ G_BEGIN_DECLS #define NM_DEVICE_GENERIC_HW_ADDRESS "hw-address" #define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description" +/** + * NMDeviceGeneric: + */ struct _NMDeviceGeneric { NMDevice parent; }; diff --git a/libnm/nm-device-infiniband.h b/libnm/nm-device-infiniband.h index c1f9be07..1f4ea217 100644 --- a/libnm/nm-device-infiniband.h +++ b/libnm/nm-device-infiniband.h @@ -39,6 +39,9 @@ G_BEGIN_DECLS #define NM_DEVICE_INFINIBAND_HW_ADDRESS "hw-address" #define NM_DEVICE_INFINIBAND_CARRIER "carrier" +/** + * NMDeviceInfiniband: + */ struct _NMDeviceInfiniband { NMDevice parent; }; diff --git a/libnm/nm-device-ip-tunnel.h b/libnm/nm-device-ip-tunnel.h index 820eab16..14251849 100644 --- a/libnm/nm-device-ip-tunnel.h +++ b/libnm/nm-device-ip-tunnel.h @@ -48,6 +48,9 @@ G_BEGIN_DECLS #define NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT "encapsulation-limit" #define NM_DEVICE_IP_TUNNEL_FLOW_LABEL "flow-label" +/** + * NMDeviceIPTunnel: + */ struct _NMDeviceIPTunnel { NMDevice parent; }; diff --git a/libnm/nm-device-macvlan.h b/libnm/nm-device-macvlan.h index 7ffb80c1..aec280bd 100644 --- a/libnm/nm-device-macvlan.h +++ b/libnm/nm-device-macvlan.h @@ -42,6 +42,9 @@ G_BEGIN_DECLS #define NM_DEVICE_MACVLAN_TAP "tap" #define NM_DEVICE_MACVLAN_HW_ADDRESS "hw-address" +/** + * NMDeviceMacvlan: + */ struct _NMDeviceMacvlan { NMDevice parent; }; diff --git a/libnm/nm-device-modem.h b/libnm/nm-device-modem.h index 38a4ddbb..fdf5c41f 100644 --- a/libnm/nm-device-modem.h +++ b/libnm/nm-device-modem.h @@ -40,6 +40,9 @@ G_BEGIN_DECLS #define NM_DEVICE_MODEM_MODEM_CAPABILITIES "modem-capabilities" #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities" +/** + * NMDeviceModem: + */ struct _NMDeviceModem { NMDevice parent; }; diff --git a/libnm/nm-device-olpc-mesh.h b/libnm/nm-device-olpc-mesh.h index b5899445..fc88beb9 100644 --- a/libnm/nm-device-olpc-mesh.h +++ b/libnm/nm-device-olpc-mesh.h @@ -40,6 +40,9 @@ G_BEGIN_DECLS #define NM_DEVICE_OLPC_MESH_COMPANION "companion" #define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel" +/** + * NMDeviceOlpcMesh: + */ struct _NMDeviceOlpcMesh { NMDevice parent; }; diff --git a/libnm/nm-device-team.h b/libnm/nm-device-team.h index a7185795..a9b71c6a 100644 --- a/libnm/nm-device-team.h +++ b/libnm/nm-device-team.h @@ -40,6 +40,9 @@ G_BEGIN_DECLS #define NM_DEVICE_TEAM_CARRIER "carrier" #define NM_DEVICE_TEAM_SLAVES "slaves" +/** + * NMDeviceTeam: + */ struct _NMDeviceTeam { NMDevice parent; }; diff --git a/libnm/nm-device-tun.h b/libnm/nm-device-tun.h index b83e2b3f..71649f8f 100644 --- a/libnm/nm-device-tun.h +++ b/libnm/nm-device-tun.h @@ -44,6 +44,9 @@ G_BEGIN_DECLS #define NM_DEVICE_TUN_VNET_HDR "vnet-hdr" #define NM_DEVICE_TUN_MULTI_QUEUE "multi-queue" +/** + * NMDeviceTun: + */ struct _NMDeviceTun { NMDevice parent; }; diff --git a/libnm/nm-device-vlan.h b/libnm/nm-device-vlan.h index 6ab24202..1ee03bd5 100644 --- a/libnm/nm-device-vlan.h +++ b/libnm/nm-device-vlan.h @@ -41,6 +41,9 @@ G_BEGIN_DECLS #define NM_DEVICE_VLAN_PARENT "parent" #define NM_DEVICE_VLAN_VLAN_ID "vlan-id" +/** + * NMDeviceVlan: + */ struct _NMDeviceVlan { NMDevice parent; }; diff --git a/libnm/nm-device-vxlan.h b/libnm/nm-device-vxlan.h index 1fb63597..70c7ed51 100644 --- a/libnm/nm-device-vxlan.h +++ b/libnm/nm-device-vxlan.h @@ -55,6 +55,9 @@ G_BEGIN_DECLS #define NM_DEVICE_VXLAN_L3MISS "l3miss" #define NM_DEVICE_VXLAN_DST_PORT "dst-port" +/** + * NMDeviceVxlan: + */ struct _NMDeviceVxlan { NMDevice parent; }; diff --git a/libnm/nm-device-wifi.h b/libnm/nm-device-wifi.h index b5974ba2..ee0238df 100644 --- a/libnm/nm-device-wifi.h +++ b/libnm/nm-device-wifi.h @@ -45,6 +45,9 @@ G_BEGIN_DECLS #define NM_DEVICE_WIFI_CAPABILITIES "wireless-capabilities" #define NM_DEVICE_WIFI_ACCESS_POINTS "access-points" +/** + * NMDeviceWifi: + */ struct _NMDeviceWifi { NMDevice parent; }; diff --git a/libnm/nm-device-wimax.h b/libnm/nm-device-wimax.h index cdd6ba56..424779bd 100644 --- a/libnm/nm-device-wimax.h +++ b/libnm/nm-device-wimax.h @@ -46,6 +46,9 @@ G_BEGIN_DECLS #define NM_DEVICE_WIMAX_BSID "bsid" #define NM_DEVICE_WIMAX_NSPS "nsps" +/** + * NMDeviceWimax: + */ struct _NMDeviceWimax { NMDevice parent; }; diff --git a/libnm/nm-device.h b/libnm/nm-device.h index c16ead9e..5ffeb42e 100644 --- a/libnm/nm-device.h +++ b/libnm/nm-device.h @@ -65,6 +65,9 @@ G_BEGIN_DECLS #define NM_DEVICE_METERED "metered" #define NM_DEVICE_LLDP_NEIGHBORS "lldp-neighbors" +/** + * NMDevice: + */ struct _NMDevice { NMObject parent; }; diff --git a/libnm/nm-dhcp-config.h b/libnm/nm-dhcp-config.h index 85aa3bd2..be32992f 100644 --- a/libnm/nm-dhcp-config.h +++ b/libnm/nm-dhcp-config.h @@ -36,6 +36,9 @@ G_BEGIN_DECLS #define NM_IS_DHCP_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_CONFIG)) #define NM_IS_DHCP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_CONFIG)) +/** + * NMDhcpConfig: + */ struct _NMDhcpConfig { NMObject parent; }; diff --git a/libnm/nm-dhcp4-config.h b/libnm/nm-dhcp4-config.h index 3423740d..4978f848 100644 --- a/libnm/nm-dhcp4-config.h +++ b/libnm/nm-dhcp4-config.h @@ -31,6 +31,9 @@ G_BEGIN_DECLS #define NM_IS_DHCP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP4_CONFIG)) #define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP4_CONFIG)) +/** + * NMDhcp4Config: + */ typedef struct { NMDhcpConfig parent; } NMDhcp4Config; diff --git a/libnm/nm-dhcp6-config.h b/libnm/nm-dhcp6-config.h index abb24adf..b7c7c822 100644 --- a/libnm/nm-dhcp6-config.h +++ b/libnm/nm-dhcp6-config.h @@ -31,6 +31,9 @@ G_BEGIN_DECLS #define NM_IS_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP6_CONFIG)) #define NM_IS_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP6_CONFIG)) +/** + * NMDhcp6Config: + */ typedef struct { NMDhcpConfig parent; } NMDhcp6Config; diff --git a/libnm/nm-ip-config.h b/libnm/nm-ip-config.h index 815135a0..38d5b454 100644 --- a/libnm/nm-ip-config.h +++ b/libnm/nm-ip-config.h @@ -37,6 +37,9 @@ G_BEGIN_DECLS #define NM_IS_IP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP_CONFIG)) #define NM_IP_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP_CONFIG, NMIPConfigClass)) +/** + * NMIPConfig: + */ struct _NMIPConfig { NMObject parent; }; diff --git a/libnm/nm-ip4-config.h b/libnm/nm-ip4-config.h index e2a18e0f..196fe09a 100644 --- a/libnm/nm-ip4-config.h +++ b/libnm/nm-ip4-config.h @@ -33,6 +33,9 @@ G_BEGIN_DECLS #define NM_IS_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP4_CONFIG)) #define NM_IP4_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP4_CONFIG, NMIP4ConfigClass)) +/** + * NMIP4Config: + */ typedef struct { NMIPConfig parent; } NMIP4Config; diff --git a/libnm/nm-ip6-config.h b/libnm/nm-ip6-config.h index 1953476d..fa67517c 100644 --- a/libnm/nm-ip6-config.h +++ b/libnm/nm-ip6-config.h @@ -33,6 +33,9 @@ G_BEGIN_DECLS #define NM_IS_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP6_CONFIG)) #define NM_IP6_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP6_CONFIG, NMIP6ConfigClass)) +/** + * NMIP6Config: + */ typedef struct { NMIPConfig parent; } NMIP6Config; diff --git a/libnm/nm-manager.h b/libnm/nm-manager.h index f9e4cd0e..7b6dd675 100644 --- a/libnm/nm-manager.h +++ b/libnm/nm-manager.h @@ -53,6 +53,9 @@ G_BEGIN_DECLS #define NM_MANAGER_METERED "metered" #define NM_MANAGER_ALL_DEVICES "all-devices" +/** + * NMManager: + */ typedef struct { NMObject parent; } NMManager; diff --git a/libnm/nm-object.h b/libnm/nm-object.h index b42f160d..fcfc718c 100644 --- a/libnm/nm-object.h +++ b/libnm/nm-object.h @@ -40,6 +40,9 @@ G_BEGIN_DECLS #define NM_OBJECT_PATH "path" #define NM_OBJECT_DBUS_CONNECTION "dbus-connection" +/** + * NMObject: + */ struct _NMObject { GObject parent; }; diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml index c4a6685e..f75e233d 100644 --- a/libnm/nm-property-docs.xml +++ b/libnm/nm-property-docs.xml @@ -169,7 +169,7 @@ - + diff --git a/libnm/nm-remote-connection.h b/libnm/nm-remote-connection.h index 3ea8037f..a7235755 100644 --- a/libnm/nm-remote-connection.h +++ b/libnm/nm-remote-connection.h @@ -44,6 +44,9 @@ G_BEGIN_DECLS #define NM_REMOTE_CONNECTION_UNSAVED "unsaved" #define NM_REMOTE_CONNECTION_VISIBLE "visible" +/** + * NMRemoteConnection: + */ struct _NMRemoteConnection { NMObject parent; }; diff --git a/libnm/nm-remote-settings.h b/libnm/nm-remote-settings.h index 1ffc0bf2..f8eddc5b 100644 --- a/libnm/nm-remote-settings.h +++ b/libnm/nm-remote-settings.h @@ -43,6 +43,9 @@ G_BEGIN_DECLS typedef struct _NMRemoteSettings NMRemoteSettings; typedef struct _NMRemoteSettingsClass NMRemoteSettingsClass; +/** + * NMRemoteSettings: + */ struct _NMRemoteSettings { NMObject parent; }; diff --git a/libnm/nm-secret-agent-old.h b/libnm/nm-secret-agent-old.h index 6198e2c0..476cc2a2 100644 --- a/libnm/nm-secret-agent-old.h +++ b/libnm/nm-secret-agent-old.h @@ -37,6 +37,9 @@ G_BEGIN_DECLS #define NM_SECRET_AGENT_OLD_REGISTERED "registered" #define NM_SECRET_AGENT_OLD_CAPABILITIES "capabilities" +/** + * NMSecretAgentOld: + */ typedef struct { GObject parent; } NMSecretAgentOld; diff --git a/libnm/nm-setting-docs.xml b/libnm/nm-setting-docs.xml index 323709b0..d3ede916 100644 --- a/libnm/nm-setting-docs.xml +++ b/libnm/nm-setting-docs.xml @@ -173,7 +173,7 @@ - + diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h index 349de41e..79ec90a0 100644 --- a/libnm/nm-vpn-connection.h +++ b/libnm/nm-vpn-connection.h @@ -41,6 +41,9 @@ G_BEGIN_DECLS #define NM_VPN_CONNECTION_VPN_STATE "vpn-state" #define NM_VPN_CONNECTION_BANNER "banner" +/** + * NMVpnConnection: + */ struct _NMVpnConnection { NMActiveConnection parent; }; diff --git a/libnm/nm-vpn-plugin-old.h b/libnm/nm-vpn-plugin-old.h index 59cf4600..50e34450 100644 --- a/libnm/nm-vpn-plugin-old.h +++ b/libnm/nm-vpn-plugin-old.h @@ -38,6 +38,9 @@ G_BEGIN_DECLS #define NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME "service-name" #define NM_VPN_PLUGIN_OLD_STATE "state" +/** + * NMVpnPluginOld: + */ typedef struct { NM_DEPRECATED_IN_1_2 GObject parent; diff --git a/libnm/nm-vpn-service-plugin.h b/libnm/nm-vpn-service-plugin.h index 29319189..0b655296 100644 --- a/libnm/nm-vpn-service-plugin.h +++ b/libnm/nm-vpn-service-plugin.h @@ -43,6 +43,9 @@ G_BEGIN_DECLS #define NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER "watch-peer" #define NM_VPN_SERVICE_PLUGIN_STATE "state" +/** + * NMVpnServicePlugin: + */ typedef struct { NM_AVAILABLE_IN_1_2 GObject parent; diff --git a/libnm/nm-wimax-nsp.h b/libnm/nm-wimax-nsp.h index 5dd982ef..e1f63400 100644 --- a/libnm/nm-wimax-nsp.h +++ b/libnm/nm-wimax-nsp.h @@ -41,6 +41,9 @@ G_BEGIN_DECLS #define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality" #define NM_WIMAX_NSP_NETWORK_TYPE "network-type" +/** + * NMWimaxNsp: + */ struct _NMWimaxNsp { NMObject parent; }; diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index 6fc58362..48d2a8c5 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,12 +2,12 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/20/2016 +.\" Date: 05/11/2016 .\" Manual: Network management daemons -.\" Source: NetworkManager 1.2.0 +.\" Source: NetworkManager 1.2.2 .\" Language: English .\" -.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.2\&.0" "Network management daemons" +.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.2\&.2" "Network management daemons" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index b058e562..74496d5a 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,12 +2,12 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/20/2016 +.\" Date: 05/11/2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.2.0 +.\" Source: NetworkManager 1.2.2 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CON" "5" "" "NetworkManager 1\&.2\&.0" "Configuration" +.TH "NETWORKMANAGER\&.CON" "5" "" "NetworkManager 1\&.2\&.2" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -254,7 +254,7 @@ This key is deprecated and has no effect since the hostname is now stored in /et .PP \fIpath\fR .RS 4 -The location where keyfiles are read and stored\&. This defaults to "${prefix}/etc/NetworkManager/conf\&.d"\&. +The location where keyfiles are read and stored\&. This defaults to "/etc/NetworkManager/conf\&.d"\&. .RE .PP \fIunmanaged\-devices\fR diff --git a/man/nm-online.1 b/man/nm-online.1 index 601433e9..77269f2f 100644 --- a/man/nm-online.1 +++ b/man/nm-online.1 @@ -2,12 +2,12 @@ .\" Title: nm-online .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/20/2016 +.\" Date: 05/11/2016 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.2.0 +.\" Source: NetworkManager 1.2.2 .\" Language: English .\" -.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.2\&.0" "General Commands Manual" +.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.2\&.2" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index fddbc118..720861a7 100644 --- a/man/nm-settings-ifcfg-rh.5 +++ b/man/nm-settings-ifcfg-rh.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-ifcfg-rh .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/20/2016 +.\" Date: 05/11/2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.2.0 +.\" Source: NetworkManager 1.2.2 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.2\&.0" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.2\&.2" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index 23ed0018..05eee22c 100644 --- a/man/nm-settings-ifcfg-rh.xml +++ b/man/nm-settings-ifcfg-rh.xml @@ -1,6 +1,6 @@ -nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.2.0nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription +nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.2.2nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index 80b89d0d..15cf4d47 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/20/2016 +.\" Date: 05/11/2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.2.0 +.\" Source: NetworkManager 1.2.2 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.2\&.0" "Configuration" +.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.2\&.2" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index 0af413a3..accde2c3 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ -nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.2.0nm-settings-keyfileDescription of keyfile settings pluginDescription +nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.2.2nm-settings-keyfileDescription of keyfile settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings.5 b/man/nm-settings.5 index 746a428c..050e373a 100644 --- a/man/nm-settings.5 +++ b/man/nm-settings.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/20/2016 +.\" Date: 05/11/2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.2.0 +.\" Source: NetworkManager 1.2.2 .\" Language: English .\" -.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.2\&.0" "Configuration" +.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.2\&.2" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1808,7 +1808,7 @@ int32 T}:T{ 1 T}:T{ -Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration\&. The permitted values are: "eui64", "stable\-privacy" or unset\&. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address\&. This makes the host part of the address to stay constant, making it possible to track host\*(Aqs presence when it changes networks\&. The address changes when the interface hardware is replaced\&. The value of "stable\-privacy" enables use of cryptographically secure hash of a secret host\-specific key along with the connection identification and the network address as specified by RFC7217\&. This makes it impossible to use the address track host\*(Aqs presence, and makes the address stable when the network interface hardware is replaced\&. Leaving this unset causes a default that could be subject to change in future versions to be used\&. Note that this setting is distinct from the Privacy Extensions as configured by "ip6\-privacy" property and it does not affect the temporary addresses configured with this option\&. +Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration\&. The permitted values are: "eui64", or "stable\-privacy"\&. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address\&. This makes the host part of the address to stay constant, making it possible to track host\*(Aqs presence when it changes networks\&. The address changes when the interface hardware is replaced\&. The value of "stable\-privacy" enables use of cryptographically secure hash of a secret host\-specific key along with the connection identification and the network address as specified by RFC7217\&. This makes it impossible to use the address track host\*(Aqs presence, and makes the address stable when the network interface hardware is replaced\&. On D\-Bus, the absence of an addr\-gen\-mode setting equals enabling "stable\-privacy"\&. For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn\*(Aqt change on upgrade from older versions\&. Note that this setting is distinct from the Privacy Extensions as configured by "ip6\-privacy" property and it does not affect the temporary addresses configured with this option\&. T} T{ address\-data diff --git a/man/nm-settings.xml b/man/nm-settings.xml index d97c36fc..27de363b 100644 --- a/man/nm-settings.xml +++ b/man/nm-settings.xml @@ -1,6 +1,6 @@ -nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.2.0nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription +nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.2.2nm-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 @@ -203,7 +203,7 @@ routesarray of array of uint32[]Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'. Array of IPv4 route structures. Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. If the metric is 0, NM will choose an appropriate default metric for the device. (There is no way to explicitly specify an actual metric of 0 with this property.)
-

the NMConnection object +

the NMConnection object did not contain the specified NMSetting object

  -

the NMConnection did not contain the +

the NMConnection did not contain the requested NMSetting property

  -

the NMConnection object is missing an +

the NMConnection object is missing an NMSetting which is required for its configuration. The error message will always be prefixed with "<setting-name>: ", where "<setting-name>" is the name of the setting that is missing.

@@ -408,7 +408,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_INVALID_SETTING

-

the NMConnection object contains an +

the NMConnection object contains an invalid or inappropriate NMSetting. The error message will always be prefixed with "<setting-name>: ", where "<setting-name>" is the name of the setting that is invalid.

@@ -418,7 +418,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_MISSING_PROPERTY

-

the NMConnection object is invalid +

the NMConnection object is invalid because it is missing a required property. The error message will always be prefixed with "<setting-name>.<property-name>: ", where "<setting-name>" is the name of the setting with the missing property, and "<property-name>" is @@ -429,7 +429,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_INVALID_PROPERTY

-

the NMConnection object is invalid +

the NMConnection object is invalid because a property has an invalid value. The error message will always be prefixed with "<setting-name>.<property-name>: ", where "<setting-name>" is the name of the setting with the invalid property, and "<property-name>" is diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html index 1ae50f34..65300023 100644 --- a/docs/libnm/html/libnm-nm-utils.html +++ b/docs/libnm/html/libnm-nm-utils.html @@ -551,7 +551,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMUtilsSecurityType
 
diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html index 299f1d09..d5be4bee 100644 --- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html @@ -293,7 +293,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMVpnConnectionState
     ├── NMVpnConnectionStateReason
     ├── NMVpnPluginFailure
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index 6dd470c9..e4b37f3c 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -10,7 +10,7 @@
       
     
     
-      
+      
       
       
       
@@ -172,6 +172,7 @@
     
     
     
+    
     
     
     
@@ -217,6 +218,7 @@
     
     
     
+    
     
     
     
@@ -224,6 +226,7 @@
     
     
     
+    
     
     
     
@@ -328,74 +331,75 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
+    
     
     
     
@@ -417,7 +421,7 @@
     
     
     
-    
+    
     
     
     
@@ -471,7 +475,7 @@
     
     
     
-    
+    
     
     
     
@@ -598,6 +602,7 @@
     
     
     
+    
     
     
     
@@ -653,6 +658,7 @@
     
     
     
+    
     
     
     
@@ -668,6 +674,7 @@
     
     
     
+    
     
     
     
@@ -708,6 +715,7 @@
     
     
     
+    
     
     
     
@@ -727,6 +735,7 @@
     
     
     
+    
     
     
     
@@ -743,6 +752,7 @@
     
     
     
+    
     
     
     
@@ -756,6 +766,7 @@
     
     
     
+    
     
     
     
@@ -801,6 +812,7 @@
     
     
     
+    
     
     
     
@@ -818,6 +830,7 @@
     
     
     
+    
     
     
     
@@ -844,6 +857,7 @@
     
     
     
+    
     
     
     
@@ -869,6 +883,7 @@
     
     
     
+    
     
     
     
@@ -885,6 +900,7 @@
     
     
     
+    
     
     
     
@@ -901,6 +917,7 @@
     
     
     
+    
     
     
     
@@ -1016,6 +1033,7 @@
     
     
     
+    
     
     
     
@@ -1058,6 +1076,7 @@
     
     
     
+    
     
     
     
@@ -1080,6 +1099,7 @@
     
     
     
+    
     
     
     
@@ -1093,6 +1113,7 @@
     
     
     
+    
     
     
     
@@ -1134,6 +1155,7 @@
     
     
     
+    
     
     
     
@@ -1162,6 +1184,7 @@
     
     
     
+    
     
     
     
@@ -1179,6 +1202,7 @@
     
     
     
+    
     
     
     
@@ -1188,11 +1212,13 @@
     
     
     
+    
     
     
     
     
     
+    
     
     
     
@@ -1209,6 +1235,7 @@
     
     
     
+    
     
     
     
@@ -1234,6 +1261,7 @@
     
     
     
+    
     
     
     
@@ -1264,6 +1292,7 @@
     
     
     
+    
     
     
     
@@ -1304,6 +1333,7 @@
     
     
     
+    
     
     
     
@@ -1326,6 +1356,7 @@
     
     
     
+    
     
     
     
@@ -1368,6 +1399,7 @@
     
     
     
+    
     
     
     
@@ -1426,6 +1458,7 @@
     
     
     
+    
     
     
     
@@ -1491,6 +1524,7 @@
     
     
     
+    
     
     
     
@@ -1592,6 +1626,7 @@
     
     
     
+    
     
     
     
@@ -1622,6 +1657,7 @@
     
     
     
+    
     
     
     
@@ -1629,6 +1665,7 @@
     
     
     
+    
     
     
     
@@ -1638,6 +1675,7 @@
     
     
     
+    
     
     
     
@@ -1647,6 +1685,7 @@
     
     
     
+    
     
     
     
@@ -1660,6 +1699,7 @@
     
     
     
+    
     
     
     
@@ -1668,12 +1708,14 @@
     
     
     
+    
     
     
     
     
     
     
+    
     
     
     
@@ -1698,6 +1740,7 @@
     
     
     
+    
     
     
     
@@ -1719,6 +1762,7 @@
     
     
     
+    
     
     
     
@@ -1728,6 +1772,7 @@
     
     
     
+    
     
     
     
@@ -1736,6 +1781,7 @@
     
     
     
+    
     
     
     
@@ -1745,6 +1791,7 @@
     
     
     
+    
     
     
     
@@ -1762,6 +1809,7 @@
     
     
     
+    
     
     
     
@@ -1777,6 +1825,7 @@
     
     
     
+    
     
     
     
@@ -1817,6 +1866,7 @@
     
     
     
+    
     
     
     
@@ -1855,6 +1905,7 @@
     
     
     
+    
     
     
     
@@ -1881,6 +1932,7 @@
     
     
     
+    
     
     
     
@@ -1921,6 +1973,7 @@
     
     
     
+    
     
     
     
@@ -1940,6 +1993,7 @@
     
     
     
+    
     
     
     
@@ -1961,6 +2015,7 @@
     
     
     
+    
     
     
     
@@ -1986,6 +2041,7 @@
     
     
     
+    
     
     
     
@@ -2005,6 +2061,7 @@
     
     
     
+    
     
     
     
@@ -2016,6 +2073,7 @@
     
     
     
+    
     
     
     
@@ -2035,6 +2093,7 @@
     
     
     
+    
     
     
     
@@ -2466,9 +2525,9 @@
     
     
     
-    
-    
-    
+    
+    
+    
     
     
     
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index 66f19502..ea853287 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -85,14 +85,15 @@
     ├── NMClient
     ├── NMSecretAgentOld
     ╰── NMSimpleConnection
-    GInterface
+    GInterface
+    ├── NMConnection
     ├── NMVpnEditor
     ╰── NMVpnEditorPlugin
-    GFlags
+    GFlags
     ├── NM80211ApFlags
     ├── NM80211ApSecurityFlags
     ├── NMBluetoothCapabilities
-    ├── NMConnectionSerializationFlags
+    ├── NMConnectionSerializationFlags
     ├── NMDeviceCapabilities
     ├── NMDeviceModemCapabilities
     ├── NMDeviceWifiCapabilities
@@ -103,7 +104,7 @@
     ├── NMSettingWiredWakeOnLan
     ├── NMVlanFlags
     ╰── NMVpnEditorPluginCapability
-    GEnum
+    GEnum
     ├── NMAgentManagerError
     ├── NMConnectionError
     ├── NMDeviceError
@@ -145,7 +146,7 @@
     ├── NMVpnServiceState
     ├── NMWepKeyType
     ╰── NMWimaxNspNetworkType
-    GBoxed
+    GBoxed
     ├── NMIPAddress
     ├── NMIPRoute
     ╰── NMLldpNeighbor
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index fe4240b5..4d7b5f25 100644
--- a/docs/libnm/libnm-sections.txt
+++ b/docs/libnm/libnm-sections.txt
@@ -12,6 +12,7 @@ NM_ACCESS_POINT_MAX_BITRATE
 NM_ACCESS_POINT_STRENGTH
 NM_ACCESS_POINT_LAST_SEEN
 NM_ACCESS_POINT_HW_ADDRESS
+NMAccessPoint
 nm_access_point_get_flags
 nm_access_point_get_wpa_flags
 nm_access_point_get_rsn_flags
@@ -25,7 +26,6 @@ nm_access_point_get_last_seen
 nm_access_point_filter_connections
 nm_access_point_connection_valid
 
-NMAccessPoint
 NMAccessPointClass
 NM_ACCESS_POINT
 NM_ACCESS_POINT_CLASS
@@ -54,6 +54,7 @@ NM_ACTIVE_CONNECTION_IP6_CONFIG
 NM_ACTIVE_CONNECTION_DHCP6_CONFIG
 NM_ACTIVE_CONNECTION_VPN
 NM_ACTIVE_CONNECTION_MASTER
+NMActiveConnection
 nm_active_connection_get_connection
 nm_active_connection_get_id
 nm_active_connection_get_uuid
@@ -70,7 +71,6 @@ nm_active_connection_get_ip6_config
 nm_active_connection_get_dhcp6_config
 nm_active_connection_get_vpn
 
-NMActiveConnection
 NMActiveConnectionClass
 NM_ACTIVE_CONNECTION
 NM_ACTIVE_CONNECTION_CLASS
@@ -117,6 +117,7 @@ NMClientPermissionResult
 NMClientError
 NM_CLIENT_ERROR
 nm_client_error_quark
+NMClient
 nm_client_new
 nm_client_new_async
 nm_client_new_finish
@@ -172,7 +173,6 @@ nm_client_reload_connections
 nm_client_reload_connections_async
 nm_client_reload_connections_finish
 
-NMClient
 NMClientClass
 NM_CLIENT
 NM_CLIENT_CLASS
@@ -369,6 +369,44 @@ nm_wep_key_type_get_type
 nm_wimax_nsp_network_type_get_type
 
 
+
+nm-core-types +NMConnection +NMSetting +NMSetting8021x +NMSettingAdsl +NMSettingBluetooth +NMSettingBond +NMSettingBridge +NMSettingBridgePort +NMSettingCdma +NMSettingConnection +NMSettingDcb +NMSettingGeneric +NMSettingGsm +NMSettingIP4Config +NMSettingIP6Config +NMSettingIPConfig +NMSettingIPTunnel +NMSettingInfiniband +NMSettingMacvlan +NMSettingOlpcMesh +NMSettingPpp +NMSettingPppoe +NMSettingSerial +NMSettingTeam +NMSettingTeamPort +NMSettingTun +NMSettingVlan +NMSettingVpn +NMSettingVxlan +NMSettingWimax +NMSettingWired +NMSettingWireless +NMSettingWirelessSecurity +NMSimpleConnection +
+
nm-dbus-interface NM_AVAILABLE_IN_1_2 @@ -480,6 +518,7 @@ NM_DEVICE_PHYSICAL_PORT_ID NM_DEVICE_MTU NM_DEVICE_METERED NM_DEVICE_LLDP_NEIGHBORS +NMDevice nm_device_get_iface nm_device_get_ip_iface nm_device_get_device_type @@ -538,7 +577,6 @@ nm_lldp_neighbor_get_attr_string_value nm_lldp_neighbor_get_attr_uint_value nm_lldp_neighbor_get_attr_type -NMDevice NMDeviceClass NMLldpNeighbor NM_DEVICE @@ -555,9 +593,9 @@ nm_lldp_neighbor_get_type nm-device-adsl NMDeviceAdsl NM_DEVICE_ADSL_CARRIER +NMDeviceAdsl nm_device_adsl_get_carrier -NMDeviceAdsl NMDeviceAdslClass NM_DEVICE_ADSL NM_DEVICE_ADSL_CLASS @@ -574,11 +612,11 @@ nm_device_adsl_get_type NM_DEVICE_BOND_HW_ADDRESS NM_DEVICE_BOND_CARRIER NM_DEVICE_BOND_SLAVES +NMDeviceBond nm_device_bond_get_hw_address nm_device_bond_get_carrier nm_device_bond_get_slaves -NMDeviceBond NMDeviceBondClass NM_DEVICE_BOND NM_DEVICE_BOND_CLASS @@ -595,11 +633,11 @@ nm_device_bond_get_type NM_DEVICE_BRIDGE_HW_ADDRESS NM_DEVICE_BRIDGE_CARRIER NM_DEVICE_BRIDGE_SLAVES +NMDeviceBridge nm_device_bridge_get_hw_address nm_device_bridge_get_carrier nm_device_bridge_get_slaves -NMDeviceBridge NMDeviceBridgeClass NM_DEVICE_BRIDGE NM_DEVICE_BRIDGE_CLASS @@ -616,11 +654,11 @@ nm_device_bridge_get_type NM_DEVICE_BT_HW_ADDRESS NM_DEVICE_BT_NAME NM_DEVICE_BT_CAPABILITIES +NMDeviceBt nm_device_bt_get_hw_address nm_device_bt_get_name nm_device_bt_get_capabilities -NMDeviceBt NMDeviceBtClass NM_DEVICE_BT NM_DEVICE_BT_CLASS @@ -639,13 +677,13 @@ NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS NM_DEVICE_ETHERNET_SPEED NM_DEVICE_ETHERNET_CARRIER NM_DEVICE_ETHERNET_S390_SUBCHANNELS +NMDeviceEthernet nm_device_ethernet_get_hw_address nm_device_ethernet_get_permanent_hw_address nm_device_ethernet_get_speed nm_device_ethernet_get_carrier nm_device_ethernet_get_s390_subchannels -NMDeviceEthernet NMDeviceEthernetClass NM_DEVICE_ETHERNET NM_DEVICE_ETHERNET_CLASS @@ -661,9 +699,9 @@ nm_device_ethernet_get_type NMDeviceGeneric NM_DEVICE_GENERIC_HW_ADDRESS NM_DEVICE_GENERIC_TYPE_DESCRIPTION +NMDeviceGeneric nm_device_generic_get_hw_address -NMDeviceGeneric NMDeviceGenericClass NM_DEVICE_GENERIC NM_DEVICE_GENERIC_CLASS @@ -679,10 +717,10 @@ nm_device_generic_get_type NMDeviceInfiniband NM_DEVICE_INFINIBAND_HW_ADDRESS NM_DEVICE_INFINIBAND_CARRIER +NMDeviceInfiniband nm_device_infiniband_get_hw_address nm_device_infiniband_get_carrier -NMDeviceInfiniband NMDeviceInfinibandClass NM_DEVICE_INFINIBAND NM_DEVICE_INFINIBAND_CLASS @@ -707,6 +745,7 @@ NM_DEVICE_IP_TUNNEL_INPUT_KEY NM_DEVICE_IP_TUNNEL_OUTPUT_KEY NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT NM_DEVICE_IP_TUNNEL_FLOW_LABEL +NMDeviceIPTunnel nm_device_ip_tunnel_get_parent nm_device_ip_tunnel_get_mode nm_device_ip_tunnel_get_local @@ -719,7 +758,6 @@ nm_device_ip_tunnel_get_output_key nm_device_ip_tunnel_get_encapsulation_limit nm_device_ip_tunnel_get_flow_label -NMDeviceIPTunnel NMDeviceIPTunnelClass NM_DEVICE_IP_TUNNEL NM_DEVICE_IP_TUNNEL_CLASS @@ -738,13 +776,13 @@ NM_DEVICE_MACVLAN_MODE NM_DEVICE_MACVLAN_NO_PROMISC NM_DEVICE_MACVLAN_TAP NM_DEVICE_MACVLAN_HW_ADDRESS +NMDeviceMacvlan nm_device_macvlan_get_parent nm_device_macvlan_get_mode nm_device_macvlan_get_no_promisc nm_device_macvlan_get_tap nm_device_macvlan_get_hw_address -NMDeviceMacvlan NMDeviceMacvlanClass NM_DEVICE_MACVLAN NM_DEVICE_MACVLAN_CLASS @@ -760,10 +798,10 @@ nm_device_macvlan_get_type NMDeviceModem NM_DEVICE_MODEM_MODEM_CAPABILITIES NM_DEVICE_MODEM_CURRENT_CAPABILITIES +NMDeviceModem nm_device_modem_get_modem_capabilities nm_device_modem_get_current_capabilities -NMDeviceModem NMDeviceModemClass NM_DEVICE_MODEM NM_DEVICE_MODEM_CLASS @@ -780,11 +818,11 @@ nm_device_modem_get_type NM_DEVICE_OLPC_MESH_HW_ADDRESS NM_DEVICE_OLPC_MESH_COMPANION NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL +NMDeviceOlpcMesh nm_device_olpc_mesh_get_hw_address nm_device_olpc_mesh_get_companion nm_device_olpc_mesh_get_active_channel -NMDeviceOlpcMesh NMDeviceOlpcMeshClass NM_DEVICE_OLPC_MESH NM_DEVICE_OLPC_MESH_CLASS @@ -801,11 +839,11 @@ nm_device_olpc_mesh_get_type NM_DEVICE_TEAM_HW_ADDRESS NM_DEVICE_TEAM_CARRIER NM_DEVICE_TEAM_SLAVES +NMDeviceTeam nm_device_team_get_hw_address nm_device_team_get_carrier nm_device_team_get_slaves -NMDeviceTeam NMDeviceTeamClass NM_DEVICE_TEAM NM_DEVICE_TEAM_CLASS @@ -826,6 +864,7 @@ NM_DEVICE_TUN_MODE NM_DEVICE_TUN_NO_PI NM_DEVICE_TUN_VNET_HDR NM_DEVICE_TUN_MULTI_QUEUE +NMDeviceTun nm_device_tun_get_hw_address nm_device_tun_get_mode nm_device_tun_get_owner @@ -834,7 +873,6 @@ nm_device_tun_get_no_pi nm_device_tun_get_vnet_hdr nm_device_tun_get_multi_queue -NMDeviceTun NMDeviceTunClass NM_DEVICE_TUN NM_DEVICE_TUN_CLASS @@ -852,12 +890,12 @@ NM_DEVICE_VLAN_HW_ADDRESS NM_DEVICE_VLAN_CARRIER NM_DEVICE_VLAN_PARENT NM_DEVICE_VLAN_VLAN_ID +NMDeviceVlan nm_device_vlan_get_hw_address nm_device_vlan_get_carrier nm_device_vlan_get_parent nm_device_vlan_get_vlan_id -NMDeviceVlan NMDeviceVlanClass NM_DEVICE_VLAN NM_DEVICE_VLAN_CLASS @@ -889,6 +927,7 @@ NM_DEVICE_VXLAN_RSC NM_DEVICE_VXLAN_L2MISS NM_DEVICE_VXLAN_L3MISS NM_DEVICE_VXLAN_DST_PORT +NMDeviceVxlan nm_device_vxlan_get_hw_address nm_device_vxlan_get_carrier nm_device_vxlan_get_parent @@ -908,7 +947,6 @@ nm_device_vxlan_get_rsc nm_device_vxlan_get_l2miss nm_device_vxlan_get_l3miss -NMDeviceVxlan NMDeviceVxlanClass NM_DEVICE_VXLAN NM_DEVICE_VXLAN_CLASS @@ -929,6 +967,7 @@ NM_DEVICE_WIFI_BITRATE NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT NM_DEVICE_WIFI_CAPABILITIES NM_DEVICE_WIFI_ACCESS_POINTS +NMDeviceWifi nm_device_wifi_get_hw_address nm_device_wifi_get_permanent_hw_address nm_device_wifi_get_mode @@ -943,7 +982,6 @@ nm_device_wifi_request_scan_async nm_device_wifi_request_scan_options_async nm_device_wifi_request_scan_finish -NMDeviceWifi NMDeviceWifiClass NM_DEVICE_WIFI NM_DEVICE_WIFI_CLASS @@ -965,6 +1003,7 @@ NM_DEVICE_WIMAX_CINR NM_DEVICE_WIMAX_TX_POWER NM_DEVICE_WIMAX_BSID NM_DEVICE_WIMAX_NSPS +NMDeviceWimax nm_device_wimax_get_hw_address nm_device_wimax_get_active_nsp nm_device_wimax_get_nsp_by_path @@ -975,7 +1014,6 @@ nm_device_wimax_get_cinr nm_device_wimax_get_tx_power nm_device_wimax_get_bsid -NMDeviceWimax NMDeviceWimaxClass NM_DEVICE_WIMAX NM_DEVICE_WIMAX_CLASS @@ -989,13 +1027,13 @@ nm_device_wimax_get_type
nm-dhcp-config NMDhcpConfig +NMDhcpConfig NM_DHCP_CONFIG_FAMILY NM_DHCP_CONFIG_OPTIONS nm_dhcp_config_get_family nm_dhcp_config_get_options nm_dhcp_config_get_one_option -NMDhcpConfig NMDhcpConfigClass NM_DHCP_CONFIG NM_DHCP_CONFIG_CLASS @@ -1047,6 +1085,7 @@ nm_vpn_plugin_error_quark
nm-ip-config NMIPConfig +NMIPConfig NM_IP_CONFIG_FAMILY NM_IP_CONFIG_GATEWAY NM_IP_CONFIG_ADDRESSES @@ -1064,7 +1103,6 @@ nm_ip_config_get_domains nm_ip_config_get_searches nm_ip_config_get_wins_servers -NMIPConfig NMIPConfigClass NM_IP_CONFIG NM_IP_CONFIG_CLASS @@ -1080,9 +1118,9 @@ nm_ip_config_get_type NMObject NM_OBJECT_PATH NM_OBJECT_DBUS_CONNECTION +NMObject nm_object_get_path -NMObject NMObjectClass NM_IS_OBJECT NM_IS_OBJECT_CLASS @@ -1100,6 +1138,7 @@ NM_REMOTE_CONNECTION_DBUS_CONNECTION NM_REMOTE_CONNECTION_PATH NM_REMOTE_CONNECTION_UNSAVED NM_REMOTE_CONNECTION_VISIBLE +NMRemoteConnection nm_remote_connection_commit_changes nm_remote_connection_commit_changes_async nm_remote_connection_commit_changes_finish @@ -1115,7 +1154,6 @@ nm_remote_connection_get_secrets_finish nm_remote_connection_get_unsaved nm_remote_connection_get_visible -NMRemoteConnection NMRemoteConnectionClass NM_IS_REMOTE_CONNECTION NM_IS_REMOTE_CONNECTION_CLASS @@ -1133,6 +1171,7 @@ NM_SECRET_AGENT_OLD_IDENTIFIER NM_SECRET_AGENT_OLD_AUTO_REGISTER NM_SECRET_AGENT_OLD_REGISTERED NM_SECRET_AGENT_OLD_CAPABILITIES +NMSecretAgentOld NMSecretAgentOldGetSecretsFunc NMSecretAgentOldSaveSecretsFunc NMSecretAgentOldDeleteSecretsFunc @@ -1147,7 +1186,6 @@ nm_secret_agent_old_get_secrets nm_secret_agent_old_save_secrets nm_secret_agent_old_delete_secrets -NMSecretAgentOld NMSecretAgentOldClass NM_IS_SECRET_AGENT_OLD NM_IS_SECRET_AGENT_OLD_CLASS @@ -1236,6 +1274,7 @@ NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS NM_SETTING_802_1X_PIN NM_SETTING_802_1X_PIN_FLAGS NM_SETTING_802_1X_SYSTEM_CA_CERTS +NMSetting8021x nm_setting_802_1x_new nm_setting_802_1x_check_cert_scheme nm_setting_802_1x_get_num_eap_methods @@ -1308,7 +1347,6 @@ nm_setting_802_1x_get_phase2_private_key_password nm_setting_802_1x_get_phase2_private_key_password_flags nm_setting_802_1x_get_phase2_private_key_format -NMSetting8021x NMSetting8021xClass NM_IS_SETTING_802_1X NM_IS_SETTING_802_1X_CLASS @@ -1335,6 +1373,7 @@ NM_SETTING_ADSL_PROTOCOL_PPPOE NM_SETTING_ADSL_PROTOCOL_IPOATM NM_SETTING_ADSL_ENCAPSULATION_VCMUX NM_SETTING_ADSL_ENCAPSULATION_LLC +NMSettingAdsl nm_setting_adsl_new nm_setting_adsl_get_username nm_setting_adsl_get_password @@ -1344,7 +1383,6 @@ nm_setting_adsl_get_vpi nm_setting_adsl_get_vci nm_setting_adsl_get_password_flags -NMSettingAdsl NMSettingAdslClass NM_IS_SETTING_ADSL NM_IS_SETTING_ADSL_CLASS @@ -1363,11 +1401,11 @@ NM_SETTING_BLUETOOTH_BDADDR NM_SETTING_BLUETOOTH_TYPE NM_SETTING_BLUETOOTH_TYPE_DUN NM_SETTING_BLUETOOTH_TYPE_PANU +NMSettingBluetooth nm_setting_bluetooth_new nm_setting_bluetooth_get_bdaddr nm_setting_bluetooth_get_connection_type -NMSettingBluetooth NMSettingBluetoothClass NM_IS_SETTING_BLUETOOTH NM_IS_SETTING_BLUETOOTH_CLASS @@ -1410,6 +1448,7 @@ 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 +NMSettingBond nm_setting_bond_new nm_setting_bond_get_num_options nm_setting_bond_get_option @@ -1420,7 +1459,6 @@ nm_setting_bond_validate_option nm_setting_bond_get_valid_options nm_setting_bond_get_option_default -NMSettingBond NMSettingBondClass NM_IS_SETTING_BOND NM_IS_SETTING_BOND_CLASS @@ -1443,6 +1481,7 @@ NM_SETTING_BRIDGE_HELLO_TIME NM_SETTING_BRIDGE_MAX_AGE NM_SETTING_BRIDGE_AGEING_TIME NM_SETTING_BRIDGE_MULTICAST_SNOOPING +NMSettingBridge nm_setting_bridge_new nm_setting_bridge_get_mac_address nm_setting_bridge_get_stp @@ -1453,7 +1492,6 @@ nm_setting_bridge_get_max_age nm_setting_bridge_get_ageing_time nm_setting_bridge_get_multicast_snooping -NMSettingBridge NMSettingBridgeClass NM_IS_SETTING_BRIDGE NM_IS_SETTING_BRIDGE_CLASS @@ -1471,12 +1509,12 @@ NM_SETTING_BRIDGE_PORT_SETTING_NAME NM_SETTING_BRIDGE_PORT_PRIORITY NM_SETTING_BRIDGE_PORT_PATH_COST NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE +NMSettingBridgePort nm_setting_bridge_port_new nm_setting_bridge_port_get_priority nm_setting_bridge_port_get_path_cost nm_setting_bridge_port_get_hairpin_mode -NMSettingBridgePort NMSettingBridgePortClass NM_IS_SETTING_BRIDGE_PORT NM_IS_SETTING_BRIDGE_PORT_CLASS @@ -1495,13 +1533,13 @@ NM_SETTING_CDMA_NUMBER NM_SETTING_CDMA_USERNAME NM_SETTING_CDMA_PASSWORD NM_SETTING_CDMA_PASSWORD_FLAGS +NMSettingCdma nm_setting_cdma_new nm_setting_cdma_get_number nm_setting_cdma_get_username nm_setting_cdma_get_password nm_setting_cdma_get_password_flags -NMSettingCdma NMSettingCdmaClass NM_IS_SETTING_CDMA NM_IS_SETTING_CDMA_CLASS @@ -1600,6 +1638,7 @@ NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH NM_SETTING_DCB_PRIORITY_BANDWIDTH NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS +NMSettingDcb nm_setting_dcb_new nm_setting_dcb_get_app_fcoe_flags nm_setting_dcb_get_app_fcoe_priority @@ -1623,7 +1662,6 @@ nm_setting_dcb_set_priority_strict_bandwidth nm_setting_dcb_get_priority_traffic_class nm_setting_dcb_set_priority_traffic_class -NMSettingDcb NMSettingDcbClass NM_IS_SETTING_DCB NM_IS_SETTING_DCB_CLASS @@ -1638,9 +1676,9 @@ nm_setting_dcb_get_type nm-setting-generic NMSettingGeneric NM_SETTING_GENERIC_SETTING_NAME +NMSettingGeneric nm_setting_generic_new -NMSettingGeneric NMSettingGenericClass NM_IS_SETTING_GENERIC NM_IS_SETTING_GENERIC_CLASS @@ -1667,6 +1705,7 @@ NM_SETTING_GSM_HOME_ONLY NM_SETTING_GSM_DEVICE_ID NM_SETTING_GSM_SIM_ID NM_SETTING_GSM_SIM_OPERATOR_ID +NMSettingGsm nm_setting_gsm_new nm_setting_gsm_get_number nm_setting_gsm_get_username @@ -1681,7 +1720,6 @@ nm_setting_gsm_get_sim_operator_id nm_setting_gsm_get_pin_flags nm_setting_gsm_get_password_flags -NMSettingGsm NMSettingGsmClass NM_IS_SETTING_GSM NM_IS_SETTING_GSM_CLASS @@ -1701,6 +1739,7 @@ NM_SETTING_INFINIBAND_MTU NM_SETTING_INFINIBAND_TRANSPORT_MODE NM_SETTING_INFINIBAND_P_KEY NM_SETTING_INFINIBAND_PARENT +NMSettingInfiniband nm_setting_infiniband_new nm_setting_infiniband_get_mac_address nm_setting_infiniband_get_mtu @@ -1709,7 +1748,6 @@ nm_setting_infiniband_get_p_key nm_setting_infiniband_get_parent nm_setting_infiniband_get_virtual_interface_name -NMSettingInfiniband NMSettingInfinibandClass NM_IS_SETTING_INFINIBAND NM_IS_SETTING_INFINIBAND_CLASS @@ -1793,6 +1831,7 @@ 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 +NMSettingIPConfig nm_setting_ip_config_get_method nm_setting_ip_config_get_num_dns nm_setting_ip_config_get_dns @@ -1839,7 +1878,6 @@ nm_setting_ip_config_get_dhcp_timeout NMIPAddress NMIPRoute -NMSettingIPConfig NMSettingIPConfigClass NM_IS_SETTING_IP_CONFIG NM_IS_SETTING_IP_CONFIG_CLASS @@ -1868,6 +1906,7 @@ NM_SETTING_IP_TUNNEL_OUTPUT_KEY NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT NM_SETTING_IP_TUNNEL_FLOW_LABEL NM_SETTING_IP_TUNNEL_MTU +NMSettingIPTunnel nm_setting_ip_tunnel_new nm_setting_ip_tunnel_get_parent nm_setting_ip_tunnel_get_mode @@ -1882,7 +1921,6 @@ nm_setting_ip_tunnel_get_encapsulation_limit nm_setting_ip_tunnel_get_flow_label nm_setting_ip_tunnel_get_mtu -NMSettingIPTunnel NMSettingIPTunnelClass NM_IS_SETTING_IP_TUNNEL NM_IS_SETTING_IP_TUNNEL_CLASS @@ -1904,11 +1942,11 @@ NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL NM_SETTING_IP4_CONFIG_METHOD_MANUAL NM_SETTING_IP4_CONFIG_METHOD_SHARED NM_SETTING_IP4_CONFIG_METHOD_DISABLED +NMSettingIP4Config nm_setting_ip4_config_new nm_setting_ip4_config_get_dhcp_client_id nm_setting_ip4_config_get_dhcp_fqdn -NMSettingIP4Config NMSettingIP4ConfigClass NM_IS_SETTING_IP4_CONFIG NM_IS_SETTING_IP4_CONFIG_CLASS @@ -1933,11 +1971,11 @@ NM_SETTING_IP6_CONFIG_METHOD_MANUAL NM_SETTING_IP6_CONFIG_METHOD_SHARED NMSettingIP6ConfigPrivacy NMSettingIP6ConfigAddrGenMode +NMSettingIP6Config nm_setting_ip6_config_new nm_setting_ip6_config_get_ip6_privacy nm_setting_ip6_config_get_addr_gen_mode -NMSettingIP6Config NMSettingIP6ConfigClass NM_IS_SETTING_IP6_CONFIG NM_IS_SETTING_IP6_CONFIG_CLASS @@ -1956,6 +1994,7 @@ NM_SETTING_MACVLAN_PARENT NM_SETTING_MACVLAN_MODE NM_SETTING_MACVLAN_PROMISCUOUS NM_SETTING_MACVLAN_TAP +NMSettingMacvlan NMSettingMacvlanMode nm_setting_macvlan_new nm_setting_macvlan_get_parent @@ -1963,7 +2002,6 @@ nm_setting_macvlan_get_mode nm_setting_macvlan_get_promiscuous nm_setting_macvlan_get_tap -NMSettingMacvlan NMSettingMacvlanClass NM_IS_SETTING_MACVLAN NM_IS_SETTING_MACVLAN_CLASS @@ -1981,12 +2019,12 @@ NM_SETTING_OLPC_MESH_SETTING_NAME NM_SETTING_OLPC_MESH_SSID NM_SETTING_OLPC_MESH_CHANNEL NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS +NMSettingOlpcMesh nm_setting_olpc_mesh_new nm_setting_olpc_mesh_get_ssid nm_setting_olpc_mesh_get_channel nm_setting_olpc_mesh_get_dhcp_anycast_address -NMSettingOlpcMesh NMSettingOlpcMeshClass NM_IS_SETTING_OLPC_MESH NM_IS_SETTING_OLPC_MESH_CLASS @@ -2019,6 +2057,7 @@ NM_SETTING_PPP_MRU NM_SETTING_PPP_MTU NM_SETTING_PPP_LCP_ECHO_FAILURE NM_SETTING_PPP_LCP_ECHO_INTERVAL +NMSettingPpp nm_setting_ppp_new nm_setting_ppp_get_noauth nm_setting_ppp_get_refuse_eap @@ -2039,7 +2078,6 @@ nm_setting_ppp_get_mtu nm_setting_ppp_get_lcp_echo_failure nm_setting_ppp_get_lcp_echo_interval -NMSettingPpp NMSettingPppClass NM_IS_SETTING_PPP NM_IS_SETTING_PPP_CLASS @@ -2058,13 +2096,13 @@ NM_SETTING_PPPOE_SERVICE NM_SETTING_PPPOE_USERNAME NM_SETTING_PPPOE_PASSWORD NM_SETTING_PPPOE_PASSWORD_FLAGS +NMSettingPppoe nm_setting_pppoe_new nm_setting_pppoe_get_service nm_setting_pppoe_get_username nm_setting_pppoe_get_password nm_setting_pppoe_get_password_flags -NMSettingPppoe NMSettingPppoeClass NM_IS_SETTING_PPPOE NM_IS_SETTING_PPPOE_CLASS @@ -2085,6 +2123,7 @@ NM_SETTING_SERIAL_BITS NM_SETTING_SERIAL_PARITY NM_SETTING_SERIAL_STOPBITS NM_SETTING_SERIAL_SEND_DELAY +NMSettingSerial nm_setting_serial_new nm_setting_serial_get_baud nm_setting_serial_get_bits @@ -2092,7 +2131,6 @@ nm_setting_serial_get_parity nm_setting_serial_get_stopbits nm_setting_serial_get_send_delay -NMSettingSerial NMSettingSerialClass NM_IS_SETTING_SERIAL NM_IS_SETTING_SERIAL_CLASS @@ -2108,10 +2146,10 @@ nm_setting_serial_get_type NMSettingTeam NM_SETTING_TEAM_SETTING_NAME NM_SETTING_TEAM_CONFIG +NMSettingTeam nm_setting_team_new nm_setting_team_get_config -NMSettingTeam NMSettingTeamClass NM_IS_SETTING_TEAM NM_IS_SETTING_TEAM_CLASS @@ -2127,10 +2165,10 @@ nm_setting_team_get_type NMSettingTeamPort NM_SETTING_TEAM_PORT_SETTING_NAME NM_SETTING_TEAM_PORT_CONFIG +NMSettingTeamPort nm_setting_team_port_new nm_setting_team_port_get_config -NMSettingTeamPort NMSettingTeamPortClass NM_IS_SETTING_TEAM_PORT NM_IS_SETTING_TEAM_PORT_CLASS @@ -2152,6 +2190,7 @@ NM_SETTING_TUN_PI NM_SETTING_TUN_VNET_HDR NM_SETTING_TUN_MULTI_QUEUE NMSettingTunMode +NMSettingTun nm_setting_tun_new nm_setting_tun_get_mode nm_setting_tun_get_owner @@ -2160,7 +2199,6 @@ nm_setting_tun_get_pi nm_setting_tun_get_vnet_hdr nm_setting_tun_get_multi_queue -NMSettingTun NMSettingTunClass NM_IS_SETTING_TUN NM_IS_SETTING_TUN_CLASS @@ -2180,6 +2218,7 @@ NM_SETTING_VLAN_ID NM_SETTING_VLAN_FLAGS NM_SETTING_VLAN_INGRESS_PRIORITY_MAP NM_SETTING_VLAN_EGRESS_PRIORITY_MAP +NMSettingVlan NMVlanPriorityMap NMVlanFlags NM_VLAN_FLAGS_ALL @@ -2196,7 +2235,6 @@ nm_setting_vlan_remove_priority_str_by_value nm_setting_vlan_clear_priorities nm_setting_vlan_add_priority_str -NMSettingVlan NMSettingVlanClass NM_IS_SETTING_VLAN NM_IS_SETTING_VLAN_CLASS @@ -2217,6 +2255,7 @@ NM_SETTING_VPN_PERSISTENT NM_SETTING_VPN_DATA NM_SETTING_VPN_SECRETS NM_SETTING_VPN_TIMEOUT +NMSettingVpn NMVpnIterFunc nm_setting_vpn_new nm_setting_vpn_get_service_type @@ -2234,7 +2273,6 @@ nm_setting_vpn_remove_secret nm_setting_vpn_foreach_secret nm_setting_vpn_get_timeout -NMSettingVpn NMSettingVpnClass NM_IS_SETTING_VPN NM_IS_SETTING_VPN_CLASS @@ -2265,6 +2303,7 @@ NM_SETTING_VXLAN_LEARNING NM_SETTING_VXLAN_RSC NM_SETTING_VXLAN_L2_MISS NM_SETTING_VXLAN_L3_MISS +NMSettingVxlan nm_setting_vxlan_new nm_setting_vxlan_get_parent nm_setting_vxlan_get_id @@ -2283,7 +2322,6 @@ nm_setting_vxlan_get_rsc nm_setting_vxlan_get_l2_miss nm_setting_vxlan_get_l3_miss -NMSettingVxlan NMSettingVxlanClass NM_IS_SETTING_VXLAN NM_IS_SETTING_VXLAN_CLASS @@ -2300,11 +2338,11 @@ nm_setting_vxlan_get_type NM_SETTING_WIMAX_SETTING_NAME NM_SETTING_WIMAX_NETWORK_NAME NM_SETTING_WIMAX_MAC_ADDRESS +NMSettingWimax nm_setting_wimax_new nm_setting_wimax_get_network_name nm_setting_wimax_get_mac_address -NMSettingWimax NMSettingWimaxClass NM_IS_SETTING_WIMAX NM_IS_SETTING_WIMAX_CLASS @@ -2333,6 +2371,7 @@ NM_SETTING_WIRED_S390_NETTYPE NM_SETTING_WIRED_S390_OPTIONS NM_SETTING_WIRED_WAKE_ON_LAN NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD +NMSettingWired nm_setting_wired_new nm_setting_wired_get_port nm_setting_wired_get_speed @@ -2359,7 +2398,6 @@ nm_setting_wired_get_valid_s390_options nm_setting_wired_get_wake_on_lan nm_setting_wired_get_wake_on_lan_password -NMSettingWired NMSettingWiredClass NM_IS_SETTING_WIRED NM_IS_SETTING_WIRED_CLASS @@ -2393,6 +2431,7 @@ NM_SETTING_WIRELESS_MODE_ADHOC NM_SETTING_WIRELESS_MODE_AP NM_SETTING_WIRELESS_MODE_INFRA NMSettingWirelessPowersave +NMSettingWireless nm_setting_wireless_new nm_setting_wireless_get_ssid nm_setting_wireless_get_mode @@ -2419,7 +2458,6 @@ nm_setting_wireless_get_num_seen_bssids nm_setting_wireless_get_seen_bssid nm_setting_wireless_ap_security_compatible -NMSettingWireless NMSettingWirelessClass NM_IS_SETTING_WIRELESS NM_IS_SETTING_WIRELESS_CLASS @@ -2452,6 +2490,7 @@ NM_SETTING_WIRELESS_SECURITY_PSK NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS +NMSettingWirelessSecurity nm_setting_wireless_security_new nm_setting_wireless_security_get_key_mgmt nm_setting_wireless_security_get_num_protos @@ -2484,7 +2523,6 @@ nm_setting_wireless_security_get_auth_alg nm_setting_wireless_security_get_wep_key_flags nm_setting_wireless_security_get_wep_key_type -NMSettingWirelessSecurity NMSettingWirelessSecurityClass NM_IS_SETTING_WIRELESS_SECURITY NM_IS_SETTING_WIRELESS_SECURITY_CLASS @@ -2498,11 +2536,11 @@ nm_setting_wireless_security_get_type
nm-simple-connection NMSimpleConnection +NMSimpleConnection nm_simple_connection_new nm_simple_connection_new_from_dbus nm_simple_connection_new_clone -NMSimpleConnection NMSimpleConnectionClass NM_IS_SIMPLE_CONNECTION NM_IS_SIMPLE_CONNECTION_CLASS @@ -2513,6 +2551,37 @@ NM_TYPE_SIMPLE_CONNECTION nm_simple_connection_get_type
+
+nm-types +NMAccessPoint +NMActiveConnection +NMClient +NMDevice +NMDeviceAdsl +NMDeviceBond +NMDeviceBridge +NMDeviceBt +NMDeviceEthernet +NMDeviceGeneric +NMDeviceIPTunnel +NMDeviceInfiniband +NMDeviceMacvlan +NMDeviceModem +NMDeviceOlpcMesh +NMDeviceTeam +NMDeviceTun +NMDeviceVlan +NMDeviceVxlan +NMDeviceWifi +NMDeviceWimax +NMDhcpConfig +NMIPConfig +NMObject +NMRemoteConnection +NMVpnConnection +NMWimaxNsp +
+
nm-utils nm_utils_is_empty_ssid @@ -2605,10 +2674,10 @@ NM_AVAILABLE_IN_1_4 NMVpnConnection NM_VPN_CONNECTION_VPN_STATE NM_VPN_CONNECTION_BANNER +NMVpnConnection nm_vpn_connection_get_vpn_state nm_vpn_connection_get_banner -NMVpnConnection NMVpnConnectionClass NM_IS_VPN_CONNECTION NM_IS_VPN_CONNECTION_CLASS @@ -2733,8 +2802,8 @@ NM_VPN_PLUGIN_INFO_KEYFILE NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME - NMVpnPluginInfo + NM_IS_VPN_PLUGIN_INFO NM_IS_VPN_PLUGIN_INFO_CLASS NM_TYPE_VPN_PLUGIN_INFO @@ -2776,13 +2845,13 @@ NM_VPN_SERVICE_PLUGIN_GET_CLASS NM_WIMAX_NSP_NAME NM_WIMAX_NSP_SIGNAL_QUALITY NM_WIMAX_NSP_NETWORK_TYPE +NMWimaxNsp nm_wimax_nsp_get_name nm_wimax_nsp_get_signal_quality nm_wimax_nsp_get_network_type nm_wimax_nsp_filter_connections nm_wimax_nsp_connection_valid -NMWimaxNsp NMWimaxNspClass NM_IS_WIMAX_NSP NM_IS_WIMAX_NSP_CLASS diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml index 26aaba0e..23aa8390 100644 --- a/docs/libnm/version.xml +++ b/docs/libnm/version.xml @@ -1 +1 @@ -1.2.0 +1.2.2 diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am index 58dc204b..3335720a 100644 --- a/libnm-core/Makefile.am +++ b/libnm-core/Makefile.am @@ -53,5 +53,11 @@ libnm_core_la_SOURCES += crypto_nss.c libnm_core_la_LIBADD += $(NSS_LIBS) endif -BUILT_SOURCES = $(GLIB_GENERATED) +nm-vpn-dbus-types.xml: nm-vpn-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl + $(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $^ >$@ + +nm-dbus-types.xml: nm-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl + $(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $^ >$@ + +BUILT_SOURCES = $(GLIB_GENERATED) nm-vpn-dbus-types.xml nm-dbus-types.xml CLEANFILES = $(BUILT_SOURCES) diff --git a/libnm-core/Makefile.in b/libnm-core/Makefile.in index bd66c069..2bedf38b 100644 --- a/libnm-core/Makefile.in +++ b/libnm-core/Makefile.in @@ -721,7 +721,7 @@ libnm_core_la_LIBADD = $(GLIB_LIBS) $(UUID_LIBS) $(am__append_3) \ libnm_core_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) -BUILT_SOURCES = $(GLIB_GENERATED) +BUILT_SOURCES = $(GLIB_GENERATED) nm-vpn-dbus-types.xml nm-dbus-types.xml CLEANFILES = $(BUILT_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1490,6 +1490,12 @@ include $(GLIB_MAKEFILE) @GNOME_CODE_COVERAGE_RULES@ +nm-vpn-dbus-types.xml: nm-vpn-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl + $(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $^ >$@ + +nm-dbus-types.xml: nm-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl + $(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $^ >$@ + # 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-connection.c b/libnm-core/nm-connection.c index c03e6265..7a0e1f6b 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -2240,13 +2240,19 @@ nm_connection_private_free (NMConnectionPrivate *priv) static NMConnectionPrivate * nm_connection_get_private (NMConnection *connection) { + static GQuark key = 0; NMConnectionPrivate *priv; - priv = g_object_get_data (G_OBJECT (connection), "NMConnectionPrivate"); + nm_assert (NM_IS_CONNECTION (connection)); + + if (G_UNLIKELY (key == 0)) + key = g_quark_from_static_string ("NMConnectionPrivate"); + + priv = g_object_get_qdata ((GObject *) connection, key); if (!priv) { priv = g_slice_new0 (NMConnectionPrivate); - g_object_set_data_full (G_OBJECT (connection), "NMConnectionPrivate", - priv, (GDestroyNotify) nm_connection_private_free); + g_object_set_qdata_full ((GObject *) connection, key, + priv, (GDestroyNotify) nm_connection_private_free); priv->self = connection; priv->settings = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref); diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index 84e080af..1e0fbe68 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -150,8 +150,8 @@ typedef enum { * @NM_DEVICE_TYPE_VXLAN: a VXLAN interface * @NM_DEVICE_TYPE_VETH: a VETH interface * - * #NMDeviceType values indicate the type of hardware represented by - * an #NMDevice. + * #NMDeviceType values indicate the type of hardware represented by a + * device object. **/ typedef enum { NM_DEVICE_TYPE_UNKNOWN = 0, diff --git a/libnm-core/nm-dbus-types.xml b/libnm-core/nm-dbus-types.xml new file mode 100644 index 00000000..6d5d01bb --- /dev/null +++ b/libnm-core/nm-dbus-types.xml @@ -0,0 +1,1291 @@ + + + + + + + NetworkManager D-Bus API Types + 3 + NetworkManager D-Bus API Types + + + NetworkManager D-Bus API Types + + + + + enum NMState + + NMState + + NMState values indicate the current overall networking state. + + Values + + + + + +
ipv6 settingKey NameValue TypeDefault ValueValue Description - addr-gen-modeint321Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", "stable-privacy" or unset. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option. + addr-gen-modeint321Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.address-dataarray of vardictArray of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.addressesarray of legacy IPv6 address struct (a(ayuay))[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'. Array of IPv6 address structures. Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.dad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds). A value greater than zero is a timeout in milliseconds. diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7 index ae3c8c0b..456b201b 100644 --- a/man/nmcli-examples.7 +++ b/man/nmcli-examples.7 @@ -2,12 +2,12 @@ .\" Title: nmcli-examples .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/20/2016 +.\" Date: 05/11/2016 .\" Manual: Examples -.\" Source: NetworkManager 1.2.0 +.\" Source: NetworkManager 1.2.2 .\" Language: English .\" -.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.2\&.0" "Examples" +.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.2\&.2" "Examples" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmcli.1 b/man/nmcli.1 index ffeb3e9a..0ffe898e 100644 --- a/man/nmcli.1 +++ b/man/nmcli.1 @@ -2,12 +2,12 @@ .\" Title: nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/20/2016 +.\" Date: 05/11/2016 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.2.0 +.\" Source: NetworkManager 1.2.2 .\" Language: English .\" -.TH "NMCLI" "1" "" "NetworkManager 1\&.2\&.0" "General Commands Manual" +.TH "NMCLI" "1" "" "NetworkManager 1\&.2\&.2" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -173,17 +173,6 @@ If omitted, default is yes\&. .RE .PP -\fB\-n\fR | \fB\-\-nocheck\fR -.RS 4 -This option can be used to force -\fBnmcli\fR -to skip checking -\fBnmcli\fR -and -\fBNetworkManager\fR -version compatibility\&. Use it with care, because using incompatible versions may produce incorrect results\&. -.RE -.PP \fB\-a\fR | \fB\-\-ask\fR .RS 4 When using this option @@ -1699,14 +1688,6 @@ Connection deletion failed\&. NetworkManager is not running\&. .RE .PP -\fB9\fR -.RS 4 -\fBnmcli\fR -and -\fBNetworkManager\fR -versions mismatch\&. -.RE -.PP \fB10\fR .RS 4 Connection, device, or access point does not exist\&. diff --git a/man/nmcli.xml b/man/nmcli.xml index 62e10254..ee5a4495 100644 --- a/man/nmcli.xml +++ b/man/nmcli.xml @@ -230,20 +230,6 @@ - - - - - - - - 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. - - - @@ -2806,14 +2792,6 @@ - - 9 - - nmcli and NetworkManager - versions mismatch. - - - 10 diff --git a/man/nmtui.1 b/man/nmtui.1 index 2b825dfe..b56113e1 100644 --- a/man/nmtui.1 +++ b/man/nmtui.1 @@ -2,12 +2,12 @@ .\" Title: nmtui .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/20/2016 +.\" Date: 05/11/2016 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.2.0 +.\" Source: NetworkManager 1.2.2 .\" Language: English .\" -.TH "NMTUI" "1" "" "NetworkManager 1\&.2\&.0" "General Commands Manual" +.TH "NMTUI" "1" "" "NetworkManager 1\&.2\&.2" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/po/ar.po b/po/ar.po index 751a7164..37cb6ab5 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4783,8 +4783,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5759,20 +5757,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/as.po b/po/as.po index d18ae8f8..001a375b 100644 --- a/po/as.po +++ b/po/as.po @@ -5406,8 +5406,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5434,8 +5432,6 @@ msgstr "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -w[ait] set timeout waiting for " "finishing operations\n" @@ -6519,24 +6515,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" "বিকল্প '--terse' ৰ বিশেষ '--fields' বিকল্প মানসমূহ ধাৰ্য্য কৰাৰ প্ৰয়োজন, '%s' নহয়" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"সতৰ্কবাৰ্তা: nmcli (%s) আৰু NetworkManager (%s) সংস্কৰণসমূহ মিল নাখায়। সতৰ্কবাৰ্তা " -"দবাবলে --nocheck ব্যৱহাৰ কৰক।\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"ত্ৰুটি: nmcli (%s) আৰু NetworkManager (%s) সংস্কৰণসমূহ মিল নাখায়। --nocheck " -"ব্যৱহাৰ কৰি এক্সিকিউচন বলৱৎ কৰক, কিন্তু ফলাফলসমূহৰ আগজাননী দিব নোৱাৰি।" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/be@latin.po b/po/be@latin.po index f5b91c40..9153b650 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -4757,8 +4757,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5732,20 +5730,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/bg.po b/po/bg.po index 689c1cf8..31b27d74 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4875,8 +4875,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5876,20 +5874,6 @@ msgstr "Опцията „--terse“ изисква указването на msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "Опцията „--terse“ изисква конкретни стойности за „--fields“, а не „%s“" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/bn_IN.po b/po/bn_IN.po index f0b10ef4..8f318e06 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -5408,8 +5408,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5436,8 +5434,6 @@ msgstr "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -w[ait] set timeout waiting for " "finishing operations\n" @@ -6518,24 +6514,6 @@ msgstr "" "'--terse' বিকল্পের ক্ষেত্রে '--fields' বিকল্পের সুনির্দিষ্ট মান উল্লেখ করা আবশ্যক, " "'%s' ব্যবহার করা যাবে না" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"সতর্কবার্তা: nmcli (%s) ও NetworkManager-র (%s) সংস্করণে গরমিল। সতর্কবার্তা আড়াল " -"করার জন্য --nocheck ব্যবহার করুন।\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"ত্রুটি: nmcli (%s) ও NetworkManager-র (%s) সংস্করণে গরমিল। বাধ্যতামূলক ভাবে " -"সঞ্চালন করার জন্য --nocheck ব্যবহার করুন, কিন্তু অপ্রত্যাশিত ফলাফল সৃষ্টি হতে পারে।" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/bs.po b/po/bs.po index fc50dde3..5edba306 100644 --- a/po/bs.po +++ b/po/bs.po @@ -4770,8 +4770,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5745,20 +5743,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/ca.po b/po/ca.po index 3f3ed6c0..22449da5 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5563,8 +5563,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5594,8 +5592,6 @@ msgstr "" "sortida\n" " -e[scape] yes|no separadors de columnes " "d'escapament als valors\n" -" -n[ocheck] no comprovis les versions de " -"nmcli i de NetworkManager\n" " -a[sk] demana els paràmetres que " "faltin\n" " -s[how-secrets] permet que es mostrin les " @@ -6730,24 +6726,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" "L'opció «--terse» requereix valors específics de l'opció «--fields» i no «%s»" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Advertiment: les versions del nmcli (%s) i del NetworkManager (%s) no " -"concorden. Useu --nocheck per suprimir l'advertiment.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Error: les versions del nmcli (%s) i del NetworkManager (%s) no concorden. " -"Forceu l'execució usant --nocheck, però els resultats no són predicibles." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "Ja està en marxa una sessió d'autenticació." diff --git a/po/cs.po b/po/cs.po index 2f88c91f..0d2a9e13 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4848,8 +4848,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -4875,8 +4873,6 @@ msgstr "" " -m[ode] tabular|multiline režim výstupu\n" " -f[ields] |all|common specifikace polí výstupu\n" " -e[scape] yes|no oddělovače sloupců v hodnotách\n" -" -n[ocheck] nekontrolovat verze programů " -"nmcli a NetworkManager\n" " -v[ersion] zobrazit verzi programu\n" " -h[elp] zobrazit tuto nápovědu\n" "\n" @@ -5847,24 +5843,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" "Přepínač „--terse“ vyžaduje určité hodnoty přepínače „--fields“, ne „%s“" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Varování: verze programů nmcli (%s) a NetworkManager (%s) si neodpovídají. " -"Pro potlačení varování použijte --nocheck.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Varování: verze programů nmcli (%s) a NetworkManager (%s) si neodpovídají. " -"Pro spuštění použijte --nocheck, ale může dojít k nepředvídatelnému chování." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/da.po b/po/da.po index 5cb386e6..8c186461 100644 --- a/po/da.po +++ b/po/da.po @@ -4866,8 +4866,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5864,20 +5862,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" "Tilvalg '--terse' kræver specifikke tilvalgsværdier for '--fields', ikke '%s'" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/de.po b/po/de.po index 73d673b3..38e84491 100644 --- a/po/de.po +++ b/po/de.po @@ -5609,8 +5609,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5638,8 +5636,6 @@ msgstr "" " -f[ields] |all|common Ausgabefelder angeben\n" " -e[scape] yes|no Escape-Spaltenseparator in " "Werten\n" -" -n[ocheck] Nicht die Versionen von nmcli " -"und NetworkManager prüfen\n" " -a[sk] Nach fehlenden Parametern " "fragen\n" " -s[how-secrets] Passwörter anzeigen\n" @@ -6761,25 +6757,6 @@ msgstr "Option »--terse« benötigt die Angabe von »--fields«" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "Option »--terse« benötigt bestimmte »--fields«-Werte, nicht »%s«" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Warnung: Die Versionen von nmcli (%s) und NetworkManager (%s) stimmen nicht " -"überein. Verwenden Sie »--nocheck«, um diese Warnung zu unterdrücken.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Fehler: Die Versionen von nmcli (%s) und NetworkManager (%s) stimmen nicht " -"überein. Eine Ausführung kann mit »--nocheck« erzwungen werden, aber die " -"Resultate sind unvorhersehbar." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/dz.po b/po/dz.po index 9f38b2eb..45bf19ce 100644 --- a/po/dz.po +++ b/po/dz.po @@ -4779,8 +4779,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5755,20 +5753,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/el.po b/po/el.po index 647c03e8..1223feba 100644 --- a/po/el.po +++ b/po/el.po @@ -5495,8 +5495,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5523,8 +5521,6 @@ msgstr "" " -f[ields] |all|common ορισμός πεδίων εξόδου\n" " -e[scape] yes|no διαφυγή διαχωριστικών στηλών σε " "τιμές\n" -" -n[ocheck] να μην ελέγχονται οι εκδόσεις " -"nmcli και NetworkManager\n" " -a[sk] ερώτηση για ελλείπουσες " "παραμέτρους\n" " -w[ait] ορισμός χρόνου λήξης αναμονής " @@ -6627,26 +6623,6 @@ msgstr "" "Η επιλογή '--terse' απαιτεί να καθορισθούν συγκεκριμένες τιμές της επιλογής " "'--fields', όχι '%s'" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Προειδοποίηση: δεν ταιριάζουν οι εκδόσεις του nmcli (%s) και του " -"NetworkManager (%s) . Χρησιμοποιείστε --nocheck για να εξαφανίσετε την " -"προειδοποίηση.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Σφάλμα: δεν ταιριάζουν οι εκδόσεις του nmcli (%s) και του NetworkManager " -"(%s) . Κάντε εξαναγκασμένη εκτέλεση χρησιμοποιώντας --nocheck, αλλά τα " -"αποτελέσματα είναι απρόβλεπτα." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/en_CA.po b/po/en_CA.po index 4080fc13..1be22278 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -4805,8 +4805,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5781,20 +5779,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index c86bb58f..9982b4eb 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4852,8 +4852,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -4880,8 +4878,6 @@ msgstr "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -v[ersion] show program version\n" " -h[elp] print this help\n" "\n" @@ -5852,24 +5848,6 @@ msgstr "Option '--terse' requires specifying '--fields'" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "Option '--terse' requires specific '--fields' option values , not '%s'" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/eo.po b/po/eo.po index d50fcbb9..584640f2 100644 --- a/po/eo.po +++ b/po/eo.po @@ -4828,8 +4828,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5827,20 +5825,6 @@ msgstr "" "Opcio '--terse' postulas specifajn elektindajn valorojn de '--fields', ne " "'%s'" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/es.po b/po/es.po index cc67a75a..b804504a 100644 --- a/po/es.po +++ b/po/es.po @@ -5465,8 +5465,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5493,8 +5491,6 @@ msgstr "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -w[ait] set timeout waiting for " "finishing operations\n" @@ -6565,25 +6561,6 @@ msgstr "Opción «--terse» requiere especificar «--fields»" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "Opción «--terse» requiere valores de «--fields» específicos, no «%s»" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Advertencia: las versiones de nmcli (%s) y de NetworkManager (%s) no " -"coinciden. Use «--nocheck» para evitar el aviso.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Error: las versiones de nmcli (%s) y de NetworkManager (%s) no coinciden. " -"Fuerce la ejecución usando «--nocheck», pero los resultados son " -"impredecibles." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/et.po b/po/et.po index 556bd7d2..a24995a3 100644 --- a/po/et.po +++ b/po/et.po @@ -4764,8 +4764,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5739,20 +5737,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/eu.po b/po/eu.po index 8ca589ec..d36a90f6 100644 --- a/po/eu.po +++ b/po/eu.po @@ -4846,8 +4846,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5827,20 +5825,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/fi.po b/po/fi.po index 40ee94c2..4cf36286 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4825,8 +4825,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5802,20 +5800,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/fr.po b/po/fr.po index 4041c462..b07e873c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5502,8 +5502,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5530,8 +5528,6 @@ msgstr "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -w[ait] set timeout waiting for " "finishing operations\n" @@ -6618,25 +6614,6 @@ msgstr "" "L'option « --terse » requiert des valeurs d'options « --fields » " "spécifiques, pas « %s »" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Avertissement : les versions de nmcli (%s) et de NetworkManager (%s) ne " -"correspondent pas. Utilisez --nocheck pour supprimer cet avertissement.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Erreur : les versions de nmcli (%s) et de NetworkManager (%s) ne " -"correspondent pas. L'exécution peut être forcée avec --nocheck, mais les " -"résultats sont imprévisibles." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/gd.po b/po/gd.po index 1af7ba30..96b0137d 100644 --- a/po/gd.po +++ b/po/gd.po @@ -4935,8 +4935,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5918,20 +5916,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/gl.po b/po/gl.po index b999f4c8..1e4bed65 100644 --- a/po/gl.po +++ b/po/gl.po @@ -4863,8 +4863,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -4892,8 +4890,6 @@ msgstr "" "mostrar\n" " -e[scape] yes|no escapar os separadores de " "columnas nos valores\n" -" -n[ocheck] non comprobar versións de nmcli " -"e NetworkManager\n" " -v[ersion] mostrar a versión do programa\n" " -h[elp] mostrar esta axuda\n" "\n" @@ -5862,24 +5858,6 @@ msgstr "" "A opción «--terse» require que especifique os valores da opción «--fields», " "non «%s»" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Advertencia: as versións de nmcli (%s) e de NetworkManager (%s) non " -"coinciden. Use «--nocheck» para evitar o aviso.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Erro: as versións de nmcli (%s) e de NetworkManager (%s) non coinciden. " -"Force a execución usando «--nocheck», pero os resultados son impredecíbeis." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/gu.po b/po/gu.po index 909d9104..10ea91c9 100644 --- a/po/gu.po +++ b/po/gu.po @@ -5360,8 +5360,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5387,8 +5385,6 @@ msgstr "" " -m[ode] tabular|multiline આઉટપુટ સ્થિતિ\n" " -f[ields] |all|common આઉટપુટમાં ક્ષેત્રોને સ્પષ્ટ કરો\n" " -e[scape] yes|no કિંમતોમાં સ્તંભ વિભાજકને છોડો\n" -" -n[ocheck] nmcli અને NetworkManager આવૃત્તિને " -"ચકાસો નહિં\n" " -a[sk] ગેરહાજર પરિમાણો વિશે પૂછો\n" " -w[ait] ક્રિયાઓ સમાપ્ત કરવાની રાહ જોવા સમય " "સમાપ્તિને સુયોજિક કરો \n" @@ -6450,24 +6446,6 @@ msgstr "વિકલ્પ '--terse' ને '--fields' ની જરૂર છ msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "વિકલ્પ '--terse' ને ચોક્કસ '--fields' વિકલ્પ કિંમતોની જરૂર છે, '%s' ની નહિં" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"ચેતવણી: nmcli (%s) અને NetworkManager (%s) આવૃત્તિઓ બંધબેસતી નથી. ચેતવણીઓ પર પ્રતિબંધ " -"મૂકવા માટે --nocheck વાપરો.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"ભૂલ: nmcli (%s) અને NetworkManager (%s) આવૃત્તિઓ બંધબેસતી નથી. --nocheck મદદથી " -"ચલાવવા પર દબાણ કરો, પરંતુ પરિણામો ધારી શકાય તેમ નથી." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/he.po b/po/he.po index 791070c5..35938328 100644 --- a/po/he.po +++ b/po/he.po @@ -4756,8 +4756,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5731,20 +5729,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/hi.po b/po/hi.po index 6b28ba8c..72e2ec97 100644 --- a/po/hi.po +++ b/po/hi.po @@ -5402,8 +5402,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5430,8 +5428,6 @@ msgstr "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -w[ait] set timeout waiting for " "finishing operations\n" @@ -6506,24 +6502,6 @@ msgstr "विकल्प '--terse' के लिए '--fields' निर्द msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "विकल्प '--terse' के लिए '--fields' विकल्प मान की जरूरत है, न कि '%s'" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"चेतावनी: nmcli(%s) और नेटवर्कप्रबंधक संस्करण (%s) से मेल नहीं खाती है. प्रयोग करें -चेतावनी " -"को दबाने के लिए nocheck करें.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"त्रुटि: nmcli(%s) और नेटवर्कप्रबंधक संस्करण (%s) से मेल नहीं खाती है.बल क्रियान्वयन का " -"उपयोग करें - nocheck, लेकिन परिणाम अप्रत्याशित हैं." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/hr.po b/po/hr.po index 3b5fc06c..1bbe238c 100644 --- a/po/hr.po +++ b/po/hr.po @@ -4857,8 +4857,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -4886,8 +4884,6 @@ msgstr "" "ispisati\n" " -e[scape] yes|no izbacuje razdjelnike stupaca u " "vrijednostima\n" -" -n[ocheck] bez provjere verzija nmcli i " -"NetworkManagera\n" " -v[ersion] prikazuje verziju programa\n" " -h[elp] ispisuje ovu pomoć\n" "\n" @@ -5858,26 +5854,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" "Opcija '--terse' zahtijeva označene vrijednosti opcije '--fields', a ne '%s'" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Upozorenje: verzije nmcli (%s) i NetworkManager (%s) se ne podudaraju. " -"Korištenje --nocheck zanemaruje ovo upozorenje.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Greška: verzije nmcli (%s) i NetworkManager (%s) se ne podudaraju. " -"Korištenje --nocheck prisiljava izvršavanje, uz moguće neočekivane " -"rezultate.\n" -"." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/hu.po b/po/hu.po index d185f112..2e12fbfe 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4887,8 +4887,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -4916,8 +4914,6 @@ msgstr "" " -e[scape] yes|no oszlopelválasztók escape-lése " "az\n" " értékekben\n" -" -n[ocheck] ne ellenőrizze az nmcli és a\n" -" Hálózatkezelő verzióit\n" " -a[sk] ask for missing parameters\n" " -v[ersion] programverzió kiírása\n" " -h[elp] ezen súgó kiírása\n" @@ -5892,25 +5888,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" "A „--terse” adott „--fields” kapcsolóértékeket követel meg, nem ezt: „%s”." -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Figyelmeztetés: az nmcli (%s) és a Hálózatkezelő (%s) verziói nem egyeznek. " -"A figyelmeztetés kikapcsolásához használja a --nocheck kapcsolót.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Figyelmeztetés: az nmcli (%s) és a Hálózatkezelő (%s) verziói nem egyeznek. " -"A végrehajtás kikényszerítve a --nocheck kapcsolóval, de az eredmények " -"kiszámíthatatlanok." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/id.po b/po/id.po index 5b554b99..d1e3edf2 100644 --- a/po/id.po +++ b/po/id.po @@ -4843,8 +4843,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -4870,8 +4868,6 @@ msgstr "" " -m[ode] tabular|multiline mode keluaran\n" " -f[ields] |all|common nyatakan ruas yang ditampilkan\n" " -e[scape] yes|no pemisah kolom escape di nilai\n" -" -n[ocheck] jangan periksa versi nmcli dan " -"NetworkManager\n" " -v[ersion] tampilkan versi program\n" " -h[elp] cetak bantuan ini\n" "\n" @@ -5841,24 +5837,6 @@ msgstr "Opsi '--terse' memerlukan penyataan '--fields'" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "Opsi '--terse' memerlukan nilai opsi '--fields' spesifik, bukan '%s'" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Peringatan: Versi nmcli (%s) dan NetworkManager (%s) tak cocok. Gunakan --" -"nocheck untuk meredam peringatan.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Galat: Versi nmcli (%s) dan NetworkManager (%s) tak cocok. Paksakan eksekusi " -"memakai --nocheck, tapi hasilnya tak dapat ditebak." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/it.po b/po/it.po index c5e7744a..f91fbf26 100644 --- a/po/it.po +++ b/po/it.po @@ -5464,8 +5464,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5492,9 +5490,6 @@ msgstr "" " -f[ields] |all|common Specifica i campi da mostrare\n" " -e[scape] yes|no Esegue l'escape dei separatori\n" " delle colonne nei valori\n" -" -n[ocheck] Non verifica le versioni di " -"nmcli e\n" -" NetworkManager\n" " -a[sk] Chiede i parametri mancanti\n" " -w[ait] Imposta il timeout di attesa " "per il\n" @@ -6610,25 +6605,6 @@ msgstr "" "L'opzione «--terse» richiede valori specifici dell'opzione «--fields», non " "«%s»" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Attenzione: le versioni di nmcli (%s) e NetworkManager (%s) non " -"corrispondono. Usare --nocheck per disabilitare questo avviso.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Errore: le versioni di nmcli (%s) e NetworkManager (%s) non corrispondono. È " -"possibile forzare l'esecuzione utilizzando --nocheck, ma i risultati non " -"sono prevedibili." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "Una sessione di autenticazione è già in corso." diff --git a/po/ja.po b/po/ja.po index d75db2c5..27ad0b01 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5367,8 +5367,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5395,8 +5393,6 @@ msgstr "" " -f[ields] |all|common 出力フィールドの指定\n" " -e[scape] yes|no 値内のコラムセパレーターをエス" "ケープ\n" -" -n[ocheck] nmcli および NetworkManager の" -"バージョンをチェックしない\n" " -a[sk] 足りないパラメーターを問い合わせ" "る\n" " -w[ait] 動作の完了を待機するタイムアウト" @@ -6465,25 +6461,6 @@ msgstr "" "オプション'--terse' には特定の '--fields' オプションの値が必要で、 '%s' では" "ありません" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"警告: nmcli (%s) と NetworkManager (%s) のバージョンが一致しません。警告を回" -"避する場合は --nocheck を使用します。\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"エラー: nmcli (%s) と NetworkManager (%s) のバージョンが一致しません。--" -"nocheck を使用すると強制的に実行することはできますが、予測できない結果となり" -"ます。" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/ka.po b/po/ka.po index 1b906524..56f4b33f 100644 --- a/po/ka.po +++ b/po/ka.po @@ -4805,8 +4805,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5782,20 +5780,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/kn.po b/po/kn.po index 988fd09b..a8bd6ebd 100644 --- a/po/kn.po +++ b/po/kn.po @@ -5452,8 +5452,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -6563,26 +6561,6 @@ msgstr "" "'--terse' ಎಂಬ ಆಯ್ಕೆಗೆ ನಿಶ್ಚಿತವಾದ '--fields' ಆಯ್ಕೆಯ ಮೌಲ್ಯದ ಅಗತ್ಯವಿರುತ್ತದೆಯೆ ಹೊರತು, " "'%s' ಎಂಬುದಲ್ಲ" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"ಎಚ್ಚರಿಕೆ: nmcli (%s) ಮತ್ತು NetworkManager (%s) ಆವೃತ್ತಿಗಳು ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ. " -"ಎಚ್ಚರಿಕೆಯನ್ನು ಮರೆಮಾಚಲು --nocheck ಬಳಸು.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"ಎಚ್ಚರಿಕೆ: nmcli (%s) ಮತ್ತು NetworkManager (%s) ಆವೃತ್ತಿಗಳು ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ. --" -"nocheck ಅನ್ನು ಬಳಸಿಕೊಂಡು ಕಾರ್ಯಗತಗೊಳಿಸಲು ಒತ್ತಾಯಪಡಿಸು, ಆದರೆ ಫಲಿತಾಂಶಗಳು " -"ಅನಿರೀಕ್ಷಿತವಾಗಿರುತ್ತವೆ.\n" -"." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/ko.po b/po/ko.po index 6a7e5593..29a9961c 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5362,8 +5362,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5390,8 +5388,6 @@ msgstr "" " -f[ields] |all|common 출력할 필드 지정\n" " -e[scape] yes|no 값으로된 칼럼 분리기에서 나가" "기 \n" -" -n[ocheck] nmcli and NetworkManager 버전을 " -"확인하지 않음\n" " -a[sk] 누락된 매개 변수 요청 \n" " -w[ait] 동작 완료의 대기 시간을 설정\n" " -v[ersion] 프로그램 버전 표시\n" @@ -6456,24 +6452,6 @@ msgstr "옵션 '--terse'는 '--fields' 설정을 요구합니다" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "옵션 '--terse'는 '%s'이(가) 아닌 구체적인 '--fields' 값을 요구합니다" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"경고: nmcli (%s) 및 네트워크 관리 (%s) 버전이 맞지 않습니다. 이 경고를 무시하" -"려면 --nocheck 옵션을 사용하십시오.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"경고: nmcli (%s) 및 네트워크 관리 (%s) 버전이 맞지 않습니다. --nocheck 옵션" -"을 사용했으므로 계속하지만, 예상치 못한 결과가 나타날 수 있습니다." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/ku.po b/po/ku.po index a289d2ec..8e86de67 100644 --- a/po/ku.po +++ b/po/ku.po @@ -4788,8 +4788,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5763,20 +5761,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/lt.po b/po/lt.po index d25f162f..fe939a53 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5071,8 +5071,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5099,8 +5097,6 @@ msgstr "" " -f[ields] |all|common nurodyti išvedamus laukus\n" " -e[scape] yes|no keisti stulpelių skirtukus " "vertėse\n" -" -n[ocheck] netikrinti nmcli ir " -"NetworkManager versijų\n" " -a[sk] prašyti trūkstamų parametrų\n" " -w[ait] nustatyti laiko ribą veiksmų " "užbaigimui\n" @@ -6162,24 +6158,6 @@ msgstr "" "Parinktis „--terse“ reikalauja konkrečių parinkties „--fields“ reikšmių, ne " "„%s“" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"Įspėjimas: nmcli (%s) ir NetworkManager (%s) versijos neatitinka. Naudokite " -"--nocheck įspėjimui nerodyti.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"Klaida: nmcli (%s) ir NetworkManager (%s) versijos neatitinka. Priverskite " -"vykdymą naudodami --nocheck, bet rezultatai yra nenuspėjami." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/lv.po b/po/lv.po index 7a097697..28adfaa1 100644 --- a/po/lv.po +++ b/po/lv.po @@ -4809,8 +4809,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5786,20 +5784,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/mk.po b/po/mk.po index d74f8805..a3f20999 100644 --- a/po/mk.po +++ b/po/mk.po @@ -4764,8 +4764,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5739,20 +5737,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/ml.po b/po/ml.po index 15736441..18d99e5c 100644 --- a/po/ml.po +++ b/po/ml.po @@ -5350,8 +5350,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5378,8 +5376,6 @@ msgstr "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -w[ait] set timeout waiting for " "finishing operations\n" @@ -6441,24 +6437,6 @@ msgstr "'--terse' ഐച്ഛികത്തിനു് '--fields' നല് msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "'--terse' എന്ന ഐച്ഛികത്തിനു് പ്രത്യേക '--fields' ഐച്ഛികം ആവശ്യമുണ്ടു്, '%s' അല്ല" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"മുന്നറിയിപ്പു്: nmcli (%s), NetworkManager (%s) പതിപ്പുകള്‍ തമ്മില്‍ ചേരുന്നില്ല. മുന്നറിയിപ്പു് " -"ഇല്ലാതാക്കുന്നതിനായി --nocheck ഉപയോഗിയ്ക്കുക.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"പിശക്: nmcli (%s), NetworkManager (%s) പതിപ്പുകള്‍ തമ്മില്‍ ചേരുന്നില്ല. നിര്‍ബന്ധമായി " -"പ്രവര്‍ത്തിപ്പിയ്ക്കുന്നതിനു് --nocheck ഉപയോഗിയ്ക്കുക." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/mr.po b/po/mr.po index ee74ce71..03b76b51 100644 --- a/po/mr.po +++ b/po/mr.po @@ -5401,8 +5401,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5429,8 +5427,6 @@ msgstr "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -w[ait] set timeout waiting for " "finishing operations\n" @@ -6508,24 +6504,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" "पर्याय '--terse' यांस '--fields' पर्याय मूल्ये निर्देशीत करणे आवश्यक आहे , '%s' नाही" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"सावधानता: nmcli (%s) व NetworkManager (%s) आवृत्ती जुळत नाही. सावधानता " -"दडपण्यासाठी --nocheck याचा वापर करा.\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"त्रुटी: nmcli (%s) व NetworkManager (%s) आवृत्ती जुळत नाही. जबरनरित्या चालवण्यासाठी " -"--nocheck याचा वापर करा, परंतु परिणाम वर्तवणेजोगी नाही." - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/nb.po b/po/nb.po index 0d89a56c..cf39c70d 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4759,8 +4759,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5734,20 +5732,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/ne.po b/po/ne.po index dcabab11..bf9a2601 100644 --- a/po/ne.po +++ b/po/ne.po @@ -4780,8 +4780,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5756,20 +5754,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/nl.po b/po/nl.po index 2e4f9908..809f71a6 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4767,8 +4767,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5742,20 +5740,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/oc.po b/po/oc.po index df0bbdc2..0a3d29ee 100644 --- a/po/oc.po +++ b/po/oc.po @@ -4771,8 +4771,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5747,20 +5745,6 @@ msgstr "" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/or.po b/po/or.po index 6bd80c39..dcedfaa0 100644 --- a/po/or.po +++ b/po/or.po @@ -5355,8 +5355,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5383,8 +5381,6 @@ msgstr "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -w[ait] set timeout waiting for " "finishing operations\n" @@ -6446,24 +6442,6 @@ msgstr "ବିକଳ୍ପ '--terse' '--fields' କୁ ଉଲ୍ଲେଖ କର msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "ବିକଳ୍ପ '--terse' ନିର୍ଦ୍ଦିଷ୍ଟ '--fields' ବିକଳ୍ପ ମୂଲ୍ୟଗୁଡ଼ିକୁ ଆବଶ୍ୟକ କରିଥାଏ , '%s' କୁ ନୁହଁ" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"ଚେତାବନୀ: nmcli (%s) ଏବଂ NetworkManager (%s) ସଂସ୍କରଣ ମେଳ ଖାଇନଥାଏ। ଚେତାବନୀକୁ " -"ଏଡ଼ାଇବା ପାଇଁ --nocheck କୁ ବ୍ୟବହାର କରନ୍ତୁ।\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"ତ୍ରୁଟି: nmcli (%s) ଏବଂ NetworkManager (%s) ସଂସ୍କରଣ ମେଳ ଖାଇନଥାଏ। --nocheck ବ୍ୟବହାର " -"କରି ନିଷ୍ପାଦନ କ୍ରିୟାକୁ ଚଲାନ୍ତୁ, କିନ୍ତୁ ଫଳାଫଳ ଜଣା ନାହିଁ।" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/pa.po b/po/pa.po index 5b650122..c6b2f621 100644 --- a/po/pa.po +++ b/po/pa.po @@ -5392,8 +5392,6 @@ msgid "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -s[how-secrets] allow displaying passwords\n" " -w[ait] set timeout waiting for " @@ -5420,8 +5418,6 @@ msgstr "" " -f[ields] |all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" -" -n[ocheck] don't check nmcli and " -"NetworkManager versions\n" " -a[sk] ask for missing parameters\n" " -w[ait] set timeout waiting for " "finishing operations\n" @@ -6482,24 +6478,6 @@ msgstr "Option '--terse' requires specifying '--fields'" msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "Option '--terse' requires specific '--fields' option values , not '%s'" -#: ../clients/cli/utils.c:1390 -#, c-format -msgid "" -"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" -"nocheck to suppress the warning.\n" -msgstr "" -"ਸਾਵਧਾਨ: nmcli (%s) ਅਤੇ ਨੈੱਟਵਰਕਮੈਨੇਜਰ (NetworkManager) (%s) ਸੰਸਕਰਣ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ ਹੈ। " -"ਚੇਤਾਵਨੀਆਂ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਨ ਲਈ --nocheck ਵਰਤੋਂ\n" - -#: ../clients/cli/utils.c:1399 -#, c-format -msgid "" -"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " -"execution using --nocheck, but the results are unpredictable." -msgstr "" -"ਗਲਤੀ: nmcli (%s) ਅਤੇ ਨੈੱਟਵਰਕਮੈਨੇਜਰ (NetworkManager) (%s) ਸੰਸਕਰਣ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ ਹੈ। --" -"nocheck ਦੀ ਵਰਤੋਂ ਨਾਲ ਚੱਲਣ ਲਈ ਮਨਜ਼ੂਰ ਕਰੋ, ਪਰ ਨਤੀਜੇ ਅਣਕਿਆਸੇ ਹੋ ਸਕਦੇ ਹਨ।" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" diff --git a/po/pl.po b/po/pl.po index 32c35837..73bf059e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-12 15:49+0200\n" -"PO-Revision-Date: 2016-04-12 15:50+0200\n" +"POT-Creation-Date: 2016-05-07 14:44+0200\n" +"PO-Revision-Date: 2016-05-07 14:45+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -111,14 +111,14 @@ msgstr "Błąd: zainicjowanie agenta polkit się nie powiodło: %s" msgid "nmcli successfully registered as a polkit agent.\n" msgstr "Pomyślnie zarejestrowano program nmcli jako agenta polkit.\n" -#: ../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 +#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11054 +#: ../clients/cli/devices.c:3644 ../clients/cli/general.c:343 +#: ../clients/cli/general.c:481 #, c-format msgid "Error: NetworkManager is not running." msgstr "Błąd: usługa NetworkManager nie jest uruchomiona." -#: ../clients/cli/agent.c:242 +#: ../clients/cli/agent.c:239 #, c-format msgid "Error: 'agent' command '%s' is not valid." msgstr "Błąd: polecenie „agent” „%s” jest nieprawidłowe." @@ -238,7 +238,7 @@ msgstr "łączenie (uruchamianie drugorzędnych połączeń)" msgid "connected" msgstr "połączono" -#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648 +#: ../clients/cli/common.c:514 ../clients/cli/connections.c:645 msgid "deactivating" msgstr "dezaktywowanie" @@ -247,25 +247,25 @@ msgid "connection failed" msgstr "połączenie się nie powiodło" #: ../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/connections.c:650 ../clients/cli/connections.c:673 +#: ../clients/cli/connections.c:1946 ../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/general.c:429 ../clients/cli/general.c:445 #: ../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 +#: ../clients/cli/settings.c:3198 #, c-format msgid "unknown" msgstr "nieznane" #. "CAPABILITIES" -#: ../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/common.c:527 ../clients/cli/connections.c:930 +#: ../clients/cli/connections.c:932 ../clients/cli/connections.c:934 +#: ../clients/cli/connections.c:968 ../clients/cli/connections.c:1037 +#: ../clients/cli/connections.c:1038 ../clients/cli/connections.c:1040 +#: ../clients/cli/connections.c:3454 ../clients/cli/connections.c:8567 +#: ../clients/cli/connections.c:8568 ../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 @@ -274,15 +274,15 @@ msgstr "nieznane" #: ../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 +#: ../clients/cli/general.c:439 ../clients/cli/settings.c:3193 msgid "yes" msgstr "tak" -#: ../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/common.c:529 ../clients/cli/connections.c:930 +#: ../clients/cli/connections.c:932 ../clients/cli/connections.c:934 +#: ../clients/cli/connections.c:1037 ../clients/cli/connections.c:1038 +#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:3455 +#: ../clients/cli/connections.c:8567 ../clients/cli/connections.c:8568 #: ../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 @@ -291,8 +291,8 @@ msgstr "tak" #: ../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 +#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:441 +#: ../clients/cli/settings.c:3195 msgid "no" msgstr "nie" @@ -309,7 +309,7 @@ msgid "No reason given" msgstr "Nie podano przyczyny" #. We should not really come here -#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976 +#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2980 #, c-format msgid "Unknown error" msgstr "Nieznany błąd" @@ -780,7 +780,7 @@ msgstr "KONKRETNY-OBIEKT" #. 4 #. Ask for optional 'vpn' arguments. #: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238 -#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233 +#: ../clients/cli/connections.c:4173 ../clients/tui/nm-editor-utils.c:233 #: ../clients/tui/nmt-connect-connection-list.c:405 msgid "VPN" msgstr "VPN" @@ -851,7 +851,7 @@ msgstr "IP6" msgid "DHCP6" msgstr "DHCP6" -#: ../clients/cli/connections.c:272 +#: ../clients/cli/connections.c:269 #, c-format msgid "" "Usage: nmcli connection { COMMAND | help }\n" @@ -927,7 +927,7 @@ msgstr "" " export [id | uuid | path] []\n" "\n" -#: ../clients/cli/connections.c:294 +#: ../clients/cli/connections.c:291 #, c-format msgid "" "Usage: nmcli connection show { ARGUMENTS | help }\n" @@ -972,7 +972,7 @@ msgstr "" "więcej informacji. Podanie opcji „--active” spowoduje uwzględnienie tylko\n" "aktywnych profili. Opcja „--show-secrets” ujawni także powiązane hasła.\n" -#: ../clients/cli/connections.c:315 +#: ../clients/cli/connections.c:312 #, c-format msgid "" "Usage: nmcli connection up { ARGUMENTS | help }\n" @@ -1017,7 +1017,7 @@ msgstr "" "passwd-file — plik z hasłami wymaganymi do aktywowania połączenia\n" "\n" -#: ../clients/cli/connections.c:336 +#: ../clients/cli/connections.c:333 #, c-format msgid "" "Usage: nmcli connection down { ARGUMENTS | help }\n" @@ -1039,7 +1039,7 @@ msgstr "" "identyfikowany po swojej nazwie, UUID lub ścieżce D-Bus.\n" "\n" -#: ../clients/cli/connections.c:348 +#: ../clients/cli/connections.c:345 #, c-format msgid "" "Usage: nmcli connection add { ARGUMENTS | help }\n" @@ -1326,7 +1326,7 @@ msgstr "" " [ip4 ] [gw4 ]\n" " [ip6 ] [gw6 ]\n" -#: ../clients/cli/connections.c:460 +#: ../clients/cli/connections.c:457 #, c-format msgid "" "Usage: nmcli connection modify { ARGUMENTS | help }\n" @@ -1373,7 +1373,7 @@ msgstr "" "nmcli con mod bond0 -bond.options downdelay\n" "\n" -#: ../clients/cli/connections.c:483 +#: ../clients/cli/connections.c:480 #, c-format msgid "" "Usage: nmcli connection clone { ARGUMENTS | help }\n" @@ -1395,7 +1395,7 @@ msgstr "" "utworzona) oraz „id” (podana jako parametr ).\n" "\n" -#: ../clients/cli/connections.c:495 +#: ../clients/cli/connections.c:492 #, c-format msgid "" "Usage: nmcli connection edit { ARGUMENTS | help }\n" @@ -1423,7 +1423,7 @@ msgstr "" "Dodaje nowy profil połączenia w interaktywnym edytorze.\n" "\n" -#: ../clients/cli/connections.c:510 +#: ../clients/cli/connections.c:507 #, c-format msgid "" "Usage: nmcli connection delete { ARGUMENTS | help }\n" @@ -1442,7 +1442,7 @@ msgstr "" "Profil jest identyfikowany po swojej nazwie, UUID lub ścieżce D-Bus.\n" "\n" -#: ../clients/cli/connections.c:521 +#: ../clients/cli/connections.c:518 #, c-format msgid "" "Usage: nmcli connection monitor { ARGUMENTS | help }\n" @@ -1463,7 +1463,7 @@ msgstr "" "Monitoruje wszystkie profile połączeń, jeśli żaden nie zostanie podany.\n" "\n" -#: ../clients/cli/connections.c:533 +#: ../clients/cli/connections.c:530 #, c-format msgid "" "Usage: nmcli connection reload { help }\n" @@ -1476,7 +1476,7 @@ msgstr "" "Wczytuje ponownie wszystkie pliki połączeń z dysku.\n" "\n" -#: ../clients/cli/connections.c:541 +#: ../clients/cli/connections.c:538 #, c-format msgid "" "Usage: nmcli connection load { ARGUMENTS | help }\n" @@ -1498,7 +1498,7 @@ msgstr "" "usługa NetworkManager zna jego najnowszy stan.\n" "\n" -#: ../clients/cli/connections.c:553 +#: ../clients/cli/connections.c:550 #, c-format msgid "" "Usage: nmcli connection import { ARGUMENTS | help }\n" @@ -1523,7 +1523,7 @@ msgstr "" "importowana przez wtyczki VPN usługi NetworkManager.\n" "\n" -#: ../clients/cli/connections.c:566 +#: ../clients/cli/connections.c:563 #, c-format msgid "" "Usage: nmcli connection export { ARGUMENTS | help }\n" @@ -1543,197 +1543,197 @@ msgstr "" "nazwę.\n" "\n" -#: ../clients/cli/connections.c:644 +#: ../clients/cli/connections.c:641 msgid "activating" msgstr "aktywowanie" -#: ../clients/cli/connections.c:646 +#: ../clients/cli/connections.c:643 msgid "activated" msgstr "aktywowano" -#: ../clients/cli/connections.c:650 +#: ../clients/cli/connections.c:647 msgid "deactivated" msgstr "dezaktywowano" -#: ../clients/cli/connections.c:662 +#: ../clients/cli/connections.c:659 msgid "VPN connecting (prepare)" msgstr "Łączenie z VPN (przygotowanie)" -#: ../clients/cli/connections.c:664 +#: ../clients/cli/connections.c:661 msgid "VPN connecting (need authentication)" msgstr "Łączenie z VPN (wymaga uwierzytelnienia)" -#: ../clients/cli/connections.c:666 +#: ../clients/cli/connections.c:663 msgid "VPN connecting" msgstr "Łączenie z VPN" -#: ../clients/cli/connections.c:668 +#: ../clients/cli/connections.c:665 msgid "VPN connecting (getting IP configuration)" msgstr "Łączenie z VPN (pobieranie konfiguracji adresu IP)" -#: ../clients/cli/connections.c:670 +#: ../clients/cli/connections.c:667 msgid "VPN connected" msgstr "Połączono z VPN" -#: ../clients/cli/connections.c:672 +#: ../clients/cli/connections.c:669 msgid "VPN connection failed" msgstr "Połączenie z VPN się nie powiodło" -#: ../clients/cli/connections.c:674 +#: ../clients/cli/connections.c:671 msgid "VPN disconnected" msgstr "Rozłączono z VPN" -#: ../clients/cli/connections.c:744 +#: ../clients/cli/connections.c:741 #, c-format msgid "Error updating secrets for %s: %s\n" msgstr "Błąd podczas aktualizowania haseł dla %s: %s\n" -#: ../clients/cli/connections.c:764 +#: ../clients/cli/connections.c:761 msgid "Connection profile details" msgstr "Szczegóły profilu połączenia" -#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169 +#: ../clients/cli/connections.c:773 ../clients/cli/connections.c:1166 #, c-format msgid "Error: 'connection show': %s" msgstr "Błąd: „connection show”: %s" -#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897 +#: ../clients/cli/connections.c:929 ../clients/cli/settings.c:1897 msgid "never" msgstr "nigdy" -#: ../clients/cli/connections.c:1157 +#: ../clients/cli/connections.c:1154 msgid "Activate connection details" msgstr "Szczegóły aktywowania połączenia" -#: ../clients/cli/connections.c:1393 +#: ../clients/cli/connections.c:1390 #, c-format msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s" msgstr "nieprawidłowe pole „%s”; dozwolone pola: %s i %s, albo %s,%s" -#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416 +#: ../clients/cli/connections.c:1405 ../clients/cli/connections.c:1413 #, c-format msgid "'%s' has to be alone" msgstr "„%s” musi być same" #. Add headers -#: ../clients/cli/connections.c:1634 +#: ../clients/cli/connections.c:1631 msgid "NetworkManager active profiles" msgstr "Aktywne profile usługi NetworkManager" -#: ../clients/cli/connections.c:1635 +#: ../clients/cli/connections.c:1632 msgid "NetworkManager connection profiles" msgstr "Profile połączeń usługi NetworkManager" -#: ../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 +#: ../clients/cli/connections.c:1678 ../clients/cli/connections.c:2393 +#: ../clients/cli/connections.c:2415 ../clients/cli/connections.c:2424 +#: ../clients/cli/connections.c:2433 ../clients/cli/connections.c:2592 +#: ../clients/cli/connections.c:10160 ../clients/cli/connections.c:10277 +#: ../clients/cli/connections.c:10409 ../clients/cli/connections.c:10542 +#: ../clients/cli/connections.c:10652 ../clients/cli/connections.c:10663 +#: ../clients/cli/connections.c:10762 ../clients/cli/devices.c:2322 +#: ../clients/cli/devices.c:2330 ../clients/cli/devices.c:2653 +#: ../clients/cli/devices.c:2660 ../clients/cli/devices.c:2674 +#: ../clients/cli/devices.c:2681 ../clients/cli/devices.c:2698 +#: ../clients/cli/devices.c:2706 ../clients/cli/devices.c:2719 +#: ../clients/cli/devices.c:3083 ../clients/cli/devices.c:3090 +#: ../clients/cli/devices.c:3097 ../clients/cli/devices.c:3109 +#: ../clients/cli/devices.c:3122 ../clients/cli/devices.c:3129 +#: ../clients/cli/devices.c:3301 ../clients/cli/devices.c:3308 +#: ../clients/cli/devices.c:3481 #, c-format msgid "Error: %s argument is missing." msgstr "Błąd: brak parametru %s." -#: ../clients/cli/connections.c:1696 +#: ../clients/cli/connections.c:1693 #, c-format msgid "Error: %s - no such connection profile." msgstr "Błąd: %s — nie ma takiego profilu połączenia." -#: ../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 +#: ../clients/cli/connections.c:1752 ../clients/cli/connections.c:2456 +#: ../clients/cli/connections.c:11163 ../clients/cli/devices.c:3270 +#: ../clients/cli/devices.c:3751 ../clients/cli/general.c:536 +#: ../clients/cli/general.c:585 ../clients/cli/general.c:602 +#: ../clients/cli/general.c:641 ../clients/cli/general.c:655 +#: ../clients/cli/general.c:773 ../clients/cli/general.c:820 +#: ../clients/cli/general.c:840 #, c-format msgid "Error: %s." msgstr "Błąd: %s." -#: ../clients/cli/connections.c:1851 +#: ../clients/cli/connections.c:1848 #, c-format msgid "no active connection on device '%s'" msgstr "brak aktywnych połączeń na urządzeniu „%s”" -#: ../clients/cli/connections.c:1859 +#: ../clients/cli/connections.c:1856 msgid "no active connection or device" msgstr "brak aktywnych połączeń na urządzeń" -#: ../clients/cli/connections.c:1910 +#: ../clients/cli/connections.c:1907 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "urządzenie „%s” nie jest zgodne z połączeniem „%s”" -#: ../clients/cli/connections.c:1913 +#: ../clients/cli/connections.c:1910 #, c-format msgid "no device found for connection '%s'" msgstr "nie odnaleziono urządzenia dla połączenia „%s”" -#: ../clients/cli/connections.c:1925 +#: ../clients/cli/connections.c:1922 msgid "unknown reason" msgstr "nieznany powód" -#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277 +#: ../clients/cli/connections.c:1924 ../clients/cli/general.c:277 msgid "none" msgstr "brak" -#: ../clients/cli/connections.c:1929 +#: ../clients/cli/connections.c:1926 msgid "the user was disconnected" msgstr "rozłączono użytkownika" -#: ../clients/cli/connections.c:1931 +#: ../clients/cli/connections.c:1928 msgid "the base network connection was interrupted" msgstr "przerwano podstawowe połączenie sieciowe" -#: ../clients/cli/connections.c:1933 +#: ../clients/cli/connections.c:1930 msgid "the VPN service stopped unexpectedly" msgstr "usługa VPN została nieoczekiwanie zatrzymana" -#: ../clients/cli/connections.c:1935 +#: ../clients/cli/connections.c:1932 msgid "the VPN service returned invalid configuration" msgstr "usługa VPN zwróciła nieprawidłową konfigurację" -#: ../clients/cli/connections.c:1937 +#: ../clients/cli/connections.c:1934 msgid "the connection attempt timed out" msgstr "próba połączenia przekroczyła czas oczekiwania" -#: ../clients/cli/connections.c:1939 +#: ../clients/cli/connections.c:1936 msgid "the VPN service did not start in time" msgstr "usługa VPN nie została uruchomiona w czasie" -#: ../clients/cli/connections.c:1941 +#: ../clients/cli/connections.c:1938 msgid "the VPN service failed to start" msgstr "uruchomienie usługi VPN się nie powiodło" -#: ../clients/cli/connections.c:1943 +#: ../clients/cli/connections.c:1940 msgid "no valid VPN secrets" msgstr "brak prawidłowych haseł VPN" -#: ../clients/cli/connections.c:1945 +#: ../clients/cli/connections.c:1942 msgid "invalid VPN secrets" msgstr "nieprawidłowe hasła VPN" -#: ../clients/cli/connections.c:1947 +#: ../clients/cli/connections.c:1944 msgid "the connection was removed" msgstr "usunięto połączenie" -#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997 -#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454 +#: ../clients/cli/connections.c:1966 ../clients/cli/connections.c:2001 +#: ../clients/cli/connections.c:2162 ../clients/cli/connections.c:8458 #, c-format msgid "Connection successfully activated (D-Bus active path: %s)\n" msgstr "Pomyślnie aktywowano połączenie (ścieżka aktywacji D-Bus: %s)\n" -#: ../clients/cli/connections.c:1976 +#: ../clients/cli/connections.c:1974 #, c-format msgid "" "Connection successfully activated (master waiting for slaves) (D-Bus active " @@ -1742,198 +1742,199 @@ msgstr "" "Pomyślnie aktywowano połączenie (główne oczekujące na podrzędne) (ścieżka " "aktywacji D-Bus: %s)\n" -#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002 +#: ../clients/cli/connections.c:1981 ../clients/cli/connections.c:1984 +#: ../clients/cli/connections.c:2006 #, c-format msgid "Error: Connection activation failed." msgstr "Błąd: aktywacja połączenia się nie powiodła." -#: ../clients/cli/connections.c:2053 +#: ../clients/cli/connections.c:2057 #, c-format msgid "VPN connection successfully activated (D-Bus active path: %s)\n" msgstr "Pomyślnie aktywowano połączenie VPN (ścieżka aktywacji D-Bus: %s)\n" -#: ../clients/cli/connections.c:2061 +#: ../clients/cli/connections.c:2065 #, c-format msgid "Error: Connection activation failed: %s." msgstr "Błąd: aktywacja połączenia się nie powiodła: %s." -#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426 +#: ../clients/cli/connections.c:2084 ../clients/cli/devices.c:1426 #, c-format msgid "Error: Timeout %d sec expired." msgstr "Błąd: przekroczono czas oczekiwania o %d sekund." -#: ../clients/cli/connections.c:2140 +#: ../clients/cli/connections.c:2144 #, c-format msgid "Error: Connection activation failed: %s" msgstr "Błąd: aktywacja połączenia się nie powiodła: %s" -#: ../clients/cli/connections.c:2225 +#: ../clients/cli/connections.c:2229 #, c-format msgid "failed to read passwd-file '%s': %s" msgstr "odczytanie passwd-file „%s” się nie powiodło: %s" -#: ../clients/cli/connections.c:2237 +#: ../clients/cli/connections.c:2241 #, c-format msgid "missing colon in 'password' entry '%s'" msgstr "brak dwukropka we wpisie „password” „%s”" -#: ../clients/cli/connections.c:2245 +#: ../clients/cli/connections.c:2249 #, c-format msgid "missing dot in 'password' entry '%s'" msgstr "brak kropki we wpisie „password” „%s”" -#: ../clients/cli/connections.c:2258 +#: ../clients/cli/connections.c:2262 #, c-format msgid "invalid setting name in 'password' entry '%s'" msgstr "nieprawidłowa nazwa ustawienia we wpisie „password” „%s”" -#: ../clients/cli/connections.c:2314 +#: ../clients/cli/connections.c:2318 #, c-format msgid "unknown device '%s'." msgstr "nieznane urządzenie „%s”." -#: ../clients/cli/connections.c:2319 +#: ../clients/cli/connections.c:2323 msgid "neither a valid connection nor device given" msgstr "nie podano prawidłowego połączenia ani urządzenia" -#: ../clients/cli/connections.c:2402 +#: ../clients/cli/connections.c:2406 #, c-format msgid "Error: Connection '%s' does not exist." msgstr "Błąd: połączenie „%s” nie istnieje." -#: ../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 +#: ../clients/cli/connections.c:2441 ../clients/cli/devices.c:1325 +#: ../clients/cli/devices.c:2336 ../clients/cli/devices.c:2730 +#: ../clients/cli/devices.c:3314 #, c-format msgid "Unknown parameter: %s\n" msgstr "Nieznany parametr: %s\n" -#: ../clients/cli/connections.c:2462 +#: ../clients/cli/connections.c:2466 msgid "preparing" msgstr "przygotowywanie" -#: ../clients/cli/connections.c:2483 +#: ../clients/cli/connections.c:2487 #, c-format msgid "Connection '%s' (%s) successfully deleted.\n" msgstr "Pomyślnie usunięto połączenie „%s” (%s).\n" -#: ../clients/cli/connections.c:2499 +#: ../clients/cli/connections.c:2503 #, c-format msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n" msgstr "" "Pomyślnie dezaktywowano połączenie „%s” (ścieżka aktywacji D-Bus: %s)\n" -#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391 -#: ../clients/cli/connections.c:10590 +#: ../clients/cli/connections.c:2574 ../clients/cli/connections.c:10395 +#: ../clients/cli/connections.c:10594 #, c-format msgid "Error: No connection specified." msgstr "Błąd: nie podano połączenia." -#: ../clients/cli/connections.c:2602 +#: ../clients/cli/connections.c:2606 #, c-format msgid "Error: '%s' is not an active connection.\n" msgstr "Błąd: „%s” nie jest aktywnym połączeniem.\n" -#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420 +#: ../clients/cli/connections.c:2607 ../clients/cli/connections.c:10424 #, c-format msgid "Error: not all active connections found." msgstr "Błąd: nie odnaleziono wszystkich aktywnych połączeń." -#: ../clients/cli/connections.c:2612 +#: ../clients/cli/connections.c:2616 #, c-format msgid "Error: no active connection provided." msgstr "Błąd: nie podano aktywnego połączenia." -#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702 +#: ../clients/cli/connections.c:2959 ../clients/cli/utils.c:648 #, c-format msgid "'%s' not among [%s]" msgstr "„%s” nie jest w [%s]" -#: ../clients/cli/connections.c:3032 +#: ../clients/cli/connections.c:3036 #, c-format msgid "Error: '%s': '%s' is not a valid %s MAC address." msgstr "Błąd: „%s”: „%s” nie jest prawidłowym adresem MAC %s." #. Ask for optional arguments -#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565 +#: ../clients/cli/connections.c:3037 ../clients/cli/connections.c:3569 #: ../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 "InfiniBand" -#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146 +#: ../clients/cli/connections.c:3037 ../clients/tui/nm-editor-utils.c:146 #: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800 msgid "Ethernet" msgstr "Ethernet" -#: ../clients/cli/connections.c:3053 +#: ../clients/cli/connections.c:3057 #, c-format msgid "Error: 'mtu': '%s' is not a valid MTU." msgstr "Błąd: „mtu”: „%s” nie jest prawidłowym MTU." -#: ../clients/cli/connections.c:3069 +#: ../clients/cli/connections.c:3073 #, c-format msgid "Error: 'parent': '%s' is not a valid interface name." msgstr "Błąd: „parent”: „%s” nie jest prawidłową nazwą interfejsu." -#: ../clients/cli/connections.c:3090 +#: ../clients/cli/connections.c:3094 #, c-format msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY." msgstr "Błąd: „p-key”: „%s” nie jest prawidłowym P_KEY InfiniBand." -#: ../clients/cli/connections.c:3105 +#: ../clients/cli/connections.c:3109 #, c-format msgid "Error: '%s' is not a valid UID/GID." msgstr "Błąd: „%s” nie jest prawidłowym UID/GID." -#: ../clients/cli/connections.c:3149 +#: ../clients/cli/connections.c:3153 #, c-format msgid "Error: '%s': '%s' is not a valid %s %s." msgstr "Błąd: „%s”: „%s” nie jest prawidłowym %s %s." -#: ../clients/cli/connections.c:3162 +#: ../clients/cli/connections.c:3166 msgid "Wi-Fi mode" msgstr "Tryb Wi-Fi" -#: ../clients/cli/connections.c:3171 +#: ../clients/cli/connections.c:3175 msgid "InfiniBand transport mode" msgstr "Tryb przesyłania InfiniBand" -#: ../clients/cli/connections.c:3183 +#: ../clients/cli/connections.c:3187 msgid "ADSL protocol" msgstr "Protokół ADSL" -#: ../clients/cli/connections.c:3194 +#: ../clients/cli/connections.c:3198 msgid "ADSL encapsulation" msgstr "Kapsułkowanie ADSL" -#: ../clients/cli/connections.c:3203 +#: ../clients/cli/connections.c:3207 msgid "TUN device mode" msgstr "Tryb urządzenia TUN" -#: ../clients/cli/connections.c:3216 +#: ../clients/cli/connections.c:3220 #, c-format msgid "Error: 'flags': '%s' is not valid; use <0-7>." msgstr "Błąd: „flags”: „%s” jest nieprawidłowe; należy użyć <0-7>." -#: ../clients/cli/connections.c:3238 +#: ../clients/cli/connections.c:3242 #, c-format msgid "Error: '%s': '%s' is not valid; %s " msgstr "Błąd: „%s”: „%s” jest nieprawidłowe; %s " -#: ../clients/cli/connections.c:3416 +#: ../clients/cli/connections.c:3420 #, c-format msgid "Warning: master='%s' doesn't refer to any existing profile.\n" msgstr "" "Ostrzeżenie: master=„%s” nie odnosi się do żadnego istniejącego profilu.\n" -#: ../clients/cli/connections.c:3441 +#: ../clients/cli/connections.c:3445 #, c-format msgid "Error: '%s': '%s' is not valid; use <%u-%u>." msgstr "Błąd: „%s”: „%s” jest nieprawidłowe; należy użyć <%u-%u>." #. Ask for optional arguments. -#: ../clients/cli/connections.c:3497 +#: ../clients/cli/connections.c:3501 #, 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" @@ -1941,7 +1942,7 @@ msgstr[0] "Istnieje %d opcjonalny parametr dla typu połączenia „%s”.\n" msgstr[1] "Istnieją %d opcjonalne parametry dla typu połączenia „%s”.\n" msgstr[2] "Istnieje %d opcjonalnych parametrów dla typu połączenia „%s”.\n" -#: ../clients/cli/connections.c:3500 +#: ../clients/cli/connections.c:3504 #, c-format msgid "Do you want to provide it? %s" msgid_plural "Do you want to provide them? %s" @@ -1950,552 +1951,552 @@ msgstr[1] "Podać je? %s" msgstr[2] "Podać je? %s" #. Ask for optional arguments -#: ../clients/cli/connections.c:3517 +#: ../clients/cli/connections.c:3521 msgid "ethernet" msgstr "ethernet" -#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570 -#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783 +#: ../clients/cli/connections.c:3526 ../clients/cli/connections.c:3574 +#: ../clients/cli/connections.c:3708 ../clients/cli/connections.c:3787 msgid "MTU [auto]: " msgstr "MTU [auto]: " -#: ../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 +#: ../clients/cli/connections.c:3537 ../clients/cli/connections.c:3585 +#: ../clients/cli/connections.c:3680 ../clients/cli/connections.c:3719 +#: ../clients/cli/connections.c:4105 msgid "MAC [none]: " msgstr "MAC [none]: " -#: ../clients/cli/connections.c:3544 +#: ../clients/cli/connections.c:3548 msgid "Cloned MAC [none]: " msgstr "Sklonowany MAC [none]: " -#: ../clients/cli/connections.c:3592 +#: ../clients/cli/connections.c:3596 #, c-format msgid "Transport mode %s" msgstr "Tryb przesyłania %s" -#: ../clients/cli/connections.c:3605 +#: ../clients/cli/connections.c:3609 msgid "Parent interface [none]: " msgstr "Interfejs nadrzędny [none]: " -#: ../clients/cli/connections.c:3616 +#: ../clients/cli/connections.c:3620 msgid "P_KEY [none]: " msgstr "P_KEY [none]: " -#: ../clients/cli/connections.c:3626 +#: ../clients/cli/connections.c:3630 #, c-format msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n" msgstr "Błąd: „p-key” jest wymagane, kiedy podano „parent”.\n" #. Ask for optional arguments -#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154 +#: ../clients/cli/connections.c:3647 ../clients/tui/nm-editor-utils.c:154 #: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802 msgid "Wi-Fi" msgstr "Wi-Fi" -#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199 +#: ../clients/cli/connections.c:3655 ../clients/cli/connections.c:6203 #, c-format msgid "Mode %s" msgstr "Tryb %s" #. Ask for optional 'wimax' arguments. -#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857 +#: ../clients/cli/connections.c:3675 ../libnm-glib/nm-device.c:1857 #: ../libnm/nm-device.c:1808 msgid "WiMAX" msgstr "WiMAX" #. Ask for optional 'pppoe' arguments. -#: ../clients/cli/connections.c:3694 +#: ../clients/cli/connections.c:3698 msgid "PPPoE" msgstr "PPPoE" -#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736 -#: ../clients/cli/connections.c:4223 +#: ../clients/cli/connections.c:3702 ../clients/cli/connections.c:3740 +#: ../clients/cli/connections.c:4227 msgid "Password [none]: " msgstr "Hasło [none]: " -#: ../clients/cli/connections.c:3700 +#: ../clients/cli/connections.c:3704 msgid "Service [none]: " msgstr "Usługa [none]: " #. Ask for optional 'gsm' or 'cdma' arguments. -#: ../clients/cli/connections.c:3730 +#: ../clients/cli/connections.c:3734 msgid "mobile broadband" msgstr "komórkowe" -#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173 +#: ../clients/cli/connections.c:3738 ../clients/cli/connections.c:4177 msgid "Username [none]: " msgstr "Nazwa użytkownika [none]: " #. Ask for optional 'bluetooth' arguments. -#: ../clients/cli/connections.c:3749 +#: ../clients/cli/connections.c:3753 msgid "bluetooth" msgstr "bluetooth" -#: ../clients/cli/connections.c:3756 +#: ../clients/cli/connections.c:3760 #, c-format msgid "Bluetooth type %s" msgstr "Typ Bluetooth %s" -#: ../clients/cli/connections.c:3762 +#: ../clients/cli/connections.c:3766 #, c-format msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n" msgstr "Błąd: „bt-type”: „%s” nie jest prawidłowym typem Bluetooth.\n" #. Ask for optional 'vlan' arguments. #. 13 -#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239 +#: ../clients/cli/connections.c:3782 ../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 "VLAN" -#: ../clients/cli/connections.c:3794 +#: ../clients/cli/connections.c:3798 msgid "VLAN flags (<0-7>) [none]: " msgstr "Flagi VLAN= (<0-7>) [none]: " -#: ../clients/cli/connections.c:3805 +#: ../clients/cli/connections.c:3809 msgid "Ingress priority maps [none]: " msgstr "Wejściowe mapy priorytetów [none]: " -#: ../clients/cli/connections.c:3816 +#: ../clients/cli/connections.c:3820 msgid "Egress priority maps [none]: " msgstr "Wyjściowe mapy priorytetów [none]: " -#: ../clients/cli/connections.c:3827 +#: ../clients/cli/connections.c:3831 msgid "Bonding mode [balance-rr]: " msgstr "Tryb wiązania [balance-rr]: " #. Ask for optional 'bond' arguments. -#: ../clients/cli/connections.c:3843 +#: ../clients/cli/connections.c:3847 msgid "bond" msgstr "wiązanie" -#: ../clients/cli/connections.c:3865 +#: ../clients/cli/connections.c:3869 msgid "Bonding primary interface [none]: " msgstr "Główny interfejs wiązania [none]: " -#: ../clients/cli/connections.c:3868 +#: ../clients/cli/connections.c:3872 #, c-format msgid "Error: 'primary': '%s' is not a valid interface name.\n" msgstr "Błąd: „primary”: „%s” nie jest prawidłową nazwą interfejsu.\n" -#: ../clients/cli/connections.c:3876 +#: ../clients/cli/connections.c:3880 #, c-format msgid "Bonding monitoring mode %s" msgstr "Tryb monitorowania wiązania %s" -#: ../clients/cli/connections.c:3882 +#: ../clients/cli/connections.c:3886 #, c-format msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n" msgstr "" "Błąd: „%s” nie jest prawidłowym trybem monitorowania; należy użyć „%s” lub " "„%s”.\n" -#: ../clients/cli/connections.c:3891 +#: ../clients/cli/connections.c:3895 msgid "Bonding miimon [100]: " msgstr "„miimon” wiązania [100]: " -#: ../clients/cli/connections.c:3894 +#: ../clients/cli/connections.c:3898 #, c-format msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n" msgstr "Błąd: „miimon”: „%s” nie jest prawidłową liczbą <0-%u>.\n" -#: ../clients/cli/connections.c:3902 +#: ../clients/cli/connections.c:3906 msgid "Bonding downdelay [0]: " msgstr "„downdelay” wiązania [0]: " -#: ../clients/cli/connections.c:3905 +#: ../clients/cli/connections.c:3909 #, c-format msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n" msgstr "Błąd: „downdelay”: „%s” nie jest prawidłową liczbą <0-%u>.\n" -#: ../clients/cli/connections.c:3913 +#: ../clients/cli/connections.c:3917 msgid "Bonding updelay [0]: " msgstr "„updelay” wiązania [0]: " -#: ../clients/cli/connections.c:3916 +#: ../clients/cli/connections.c:3920 #, c-format msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n" msgstr "Błąd: „updelay”: „%s” nie jest prawidłową liczbą <0-%u>.\n" -#: ../clients/cli/connections.c:3925 +#: ../clients/cli/connections.c:3929 msgid "Bonding arp-interval [0]: " msgstr "„arp-interval” wiązania [0]: " -#: ../clients/cli/connections.c:3928 +#: ../clients/cli/connections.c:3932 #, c-format msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n" msgstr "Błąd: „arp-interval”: „%s” nie jest prawidłową liczbą <0-%u>.\n" #. FIXME: verify the string -#: ../clients/cli/connections.c:3936 +#: ../clients/cli/connections.c:3940 msgid "Bonding arp-ip-target [none]: " msgstr "„arp-ip-target” wiązania [none]: " -#: ../clients/cli/connections.c:3943 +#: ../clients/cli/connections.c:3947 msgid "LACP rate ('slow' or 'fast') [slow]: " msgstr "Prędkość LACP („slow” lub „fast”) [slow]: " -#: ../clients/cli/connections.c:3949 +#: ../clients/cli/connections.c:3953 #, c-format msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n" msgstr "Błąd: „lacp_rate”: „%s” jest nieprawidłowe („slow” lub „fast”).\n" -#: ../clients/cli/connections.c:3972 +#: ../clients/cli/connections.c:3976 msgid "Team JSON configuration [none]: " msgstr "Konfiguracja JSON zespołu [none]: " -#: ../clients/cli/connections.c:3989 +#: ../clients/cli/connections.c:3993 msgid "team" msgstr "zespół" -#: ../clients/cli/connections.c:3995 +#: ../clients/cli/connections.c:3999 msgid "team-slave" msgstr "podrzędny-zespołu" #. Ask for optional 'bridge' arguments. -#: ../clients/cli/connections.c:4007 +#: ../clients/cli/connections.c:4011 msgid "bridge" msgstr "mostek" -#: ../clients/cli/connections.c:4013 +#: ../clients/cli/connections.c:4017 #, c-format msgid "Enable STP %s" msgstr "Włączenie STP %s" -#: ../clients/cli/connections.c:4018 +#: ../clients/cli/connections.c:4022 #, c-format msgid "Error: 'stp': %s.\n" msgstr "Błąd: „stp”: %s.\n" -#: ../clients/cli/connections.c:4026 +#: ../clients/cli/connections.c:4030 msgid "STP priority [32768]: " msgstr "Priorytet STP [32768]: " -#: ../clients/cli/connections.c:4030 +#: ../clients/cli/connections.c:4034 #, c-format msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n" msgstr "Błąd: „priority”: „%s” nie jest prawidłową liczbą <0-%d>.\n" -#: ../clients/cli/connections.c:4038 +#: ../clients/cli/connections.c:4042 msgid "Forward delay [15]: " msgstr "Forward-delay [15]: " -#: ../clients/cli/connections.c:4042 +#: ../clients/cli/connections.c:4046 #, c-format msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n" msgstr "Błąd: „forward-delay”: „%s” nie jest prawidłową liczbą <2-30>.\n" -#: ../clients/cli/connections.c:4051 +#: ../clients/cli/connections.c:4055 msgid "Hello time [2]: " msgstr "Hello-time [2]: " -#: ../clients/cli/connections.c:4055 +#: ../clients/cli/connections.c:4059 #, c-format msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n" msgstr "Błąd: „hello-time”: „%s” nie jest prawidłową liczbą <1-10>.\n" -#: ../clients/cli/connections.c:4063 +#: ../clients/cli/connections.c:4067 msgid "Max age [20]: " msgstr "Max-age [20]: " -#: ../clients/cli/connections.c:4067 +#: ../clients/cli/connections.c:4071 #, c-format msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n" msgstr "Błąd: „max-age”: „%s” nie jest prawidłową liczbą <6-40>.\n" -#: ../clients/cli/connections.c:4075 +#: ../clients/cli/connections.c:4079 msgid "MAC address ageing time [300]: " msgstr "Czas starzenia adresu MAC [300]: " -#: ../clients/cli/connections.c:4079 +#: ../clients/cli/connections.c:4083 #, c-format msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n" msgstr "Błąd: „ageing-time”: „%s” nie jest prawidłową liczbą <0-1000000>.\n" -#: ../clients/cli/connections.c:4088 +#: ../clients/cli/connections.c:4092 #, c-format msgid "Enable IGMP snooping %s" msgstr "Włączenie węszenia IGMP %s" -#: ../clients/cli/connections.c:4093 +#: ../clients/cli/connections.c:4097 #, c-format msgid "Error: 'multicast-snooping': %s.\n" msgstr "Błąd: „multicast-snooping”: %s.\n" #. Ask for optional 'bridge-slave' arguments. -#: ../clients/cli/connections.c:4120 +#: ../clients/cli/connections.c:4124 msgid "bridge-slave" msgstr "podrzędny-mostku" -#: ../clients/cli/connections.c:4125 +#: ../clients/cli/connections.c:4129 msgid "Bridge port priority [32]: " msgstr "Priorytet portu mostku [32]: " -#: ../clients/cli/connections.c:4138 +#: ../clients/cli/connections.c:4142 msgid "Bridge port STP path cost [100]: " msgstr "Koszt ścieżki STP portu mostku [100]: " -#: ../clients/cli/connections.c:4152 +#: ../clients/cli/connections.c:4156 #, c-format msgid "Hairpin %s" msgstr "Hairpin %s" -#: ../clients/cli/connections.c:4157 +#: ../clients/cli/connections.c:4161 #, c-format msgid "Error: 'hairpin': %s.\n" msgstr "Błąd: „hairpin”: %s.\n" #. Ask for optional 'olpc' arguments. -#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855 +#: ../clients/cli/connections.c:4188 ../libnm-glib/nm-device.c:1855 #: ../libnm/nm-device.c:1806 msgid "OLPC Mesh" msgstr "Kratowe OLPC" -#: ../clients/cli/connections.c:4189 +#: ../clients/cli/connections.c:4193 msgid "OLPC Mesh channel [1]: " msgstr "Kanał sieci kratowej OLPC [1]: " -#: ../clients/cli/connections.c:4192 +#: ../clients/cli/connections.c:4196 #, c-format msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n" msgstr "Błąd: „channel”: „%s” nie jest prawidłową liczbą <1-13>.\n" -#: ../clients/cli/connections.c:4200 +#: ../clients/cli/connections.c:4204 msgid "DHCP anycast MAC address [none]: " msgstr "Adres MAC „anycast” DHCP [none]: " #. Ask for optional 'adsl' arguments. -#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871 +#: ../clients/cli/connections.c:4223 ../libnm-glib/nm-device.c:1871 #: ../libnm/nm-device.c:1822 msgid "ADSL" msgstr "ADSL" -#: ../clients/cli/connections.c:4227 +#: ../clients/cli/connections.c:4231 #, c-format msgid "ADSL encapsulation %s" msgstr "Kapsułkowanie ADSL %s" #. Ask for optional 'macvlan' arguments. -#: ../clients/cli/connections.c:4245 +#: ../clients/cli/connections.c:4249 msgid "macvlan" msgstr "macvlan" -#: ../clients/cli/connections.c:4251 +#: ../clients/cli/connections.c:4255 #, c-format msgid "Tap %s" msgstr "Tap %s" -#: ../clients/cli/connections.c:4256 +#: ../clients/cli/connections.c:4260 #, c-format msgid "Error: 'tap': %s.\n" msgstr "Błąd: „tap”: %s.\n" #. Ask for optional 'vxlan' arguments. -#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875 +#: ../clients/cli/connections.c:4276 ../libnm-glib/nm-device.c:1875 #: ../libnm/nm-device.c:1826 msgid "VXLAN" msgstr "VXLAN" -#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601 +#: ../clients/cli/connections.c:4281 ../clients/cli/connections.c:4605 msgid "Parent device [none]: " msgstr "Urządzenie nadrzędne [none]: " -#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606 +#: ../clients/cli/connections.c:4286 ../clients/cli/connections.c:4610 #, c-format msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n" msgstr "Błąd: „dev”: „%s” nie jest UUID ani nazwą interfejsu.\n" -#: ../clients/cli/connections.c:4291 +#: ../clients/cli/connections.c:4295 msgid "Local address [none]: " msgstr "Lokalny adres [none]: " -#: ../clients/cli/connections.c:4296 +#: ../clients/cli/connections.c:4300 #, c-format msgid "Error: 'local': '%s' is not a valid IP address.\n" msgstr "Błąd: „local”: „%s” nie jest prawidłowym adresem IP.\n" -#: ../clients/cli/connections.c:4305 +#: ../clients/cli/connections.c:4309 msgid "Minimum source port [0]: " msgstr "Minimalny port źródłowy [0]: " -#: ../clients/cli/connections.c:4309 +#: ../clients/cli/connections.c:4313 #, c-format msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n" msgstr "Błąd: „source-port-min”: „%s” nie jest prawidłową liczbą <0-65535>.\n" -#: ../clients/cli/connections.c:4318 +#: ../clients/cli/connections.c:4322 msgid "Maximum source port [0]: " msgstr "Maksymalny port źródłowy [0]: " -#: ../clients/cli/connections.c:4322 +#: ../clients/cli/connections.c:4326 #, c-format msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n" msgstr "Błąd: „source-port-max”: „%s” nie jest prawidłową liczbą <0-65535>.\n" -#: ../clients/cli/connections.c:4331 +#: ../clients/cli/connections.c:4335 msgid "Destination port [8472]: " msgstr "Port docelowy [8472]: " -#: ../clients/cli/connections.c:4335 +#: ../clients/cli/connections.c:4339 #, c-format msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n" msgstr "Błąd: „destination-port”: „%s” nie jest prawidłową liczbą <0-65535>.\n" -#: ../clients/cli/connections.c:4374 +#: ../clients/cli/connections.c:4378 msgid "IPv4 address (IP[/plen]) [none]: " msgstr "Adres IPv4 (IP[/plen]) [none]: " -#: ../clients/cli/connections.c:4376 +#: ../clients/cli/connections.c:4380 msgid "IPv6 address (IP[/plen]) [none]: " msgstr "Adres IPv6 (IP[/plen]) [none]: " -#: ../clients/cli/connections.c:4390 +#: ../clients/cli/connections.c:4394 #, c-format msgid " Address successfully added: %s\n" msgstr " Pomyślnie dodano adres: %s\n" -#: ../clients/cli/connections.c:4392 +#: ../clients/cli/connections.c:4396 #, c-format msgid " Warning: address already present: %s\n" msgstr " Ostrzeżenie: adres jest już obecny: %s\n" -#: ../clients/cli/connections.c:4394 +#: ../clients/cli/connections.c:4398 #, c-format msgid " Warning: ignoring garbage at the end: '%s'\n" msgstr " Ostrzeżenie: ignorowanie śmieci na końcu: „%s”\n" -#: ../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 +#: ../clients/cli/connections.c:4400 ../clients/cli/connections.c:5609 +#: ../clients/cli/connections.c:5656 ../clients/cli/connections.c:6573 +#: ../clients/cli/connections.c:6606 msgid "Error: " msgstr "Błąd: " -#: ../clients/cli/connections.c:4416 +#: ../clients/cli/connections.c:4420 msgid "IPv4 gateway [none]: " msgstr "Brama IPv4 [none]: " -#: ../clients/cli/connections.c:4419 +#: ../clients/cli/connections.c:4423 msgid "IPv6 gateway [none]: " msgstr "Brama IPv6 [none]: " -#: ../clients/cli/connections.c:4439 +#: ../clients/cli/connections.c:4443 #, c-format msgid "Error: invalid gateway address '%s'\n" msgstr "Błąd: nieprawidłowy adres bramy „%s”\n" #. Ask for IP addresses -#: ../clients/cli/connections.c:4452 +#: ../clients/cli/connections.c:4456 #, c-format msgid "Do you want to add IP addresses? %s" msgstr "Dodać adresy IP? %s" -#: ../clients/cli/connections.c:4460 +#: ../clients/cli/connections.c:4464 #, c-format msgid "Press to finish adding addresses.\n" msgstr "Naciśnięcie klawisza zakończy dodawanie adresów.\n" #. Ask for optional 'tun' arguments. -#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879 +#: ../clients/cli/connections.c:4508 ../libnm-glib/nm-device.c:1879 #: ../libnm/nm-device.c:1830 msgid "Tun" msgstr "TUN" -#: ../clients/cli/connections.c:4509 +#: ../clients/cli/connections.c:4513 msgid "User ID [none]: " msgstr "Identyfikator użytkownika [none]: " -#: ../clients/cli/connections.c:4522 +#: ../clients/cli/connections.c:4526 msgid "Group ID [none]: " msgstr "Identyfikator grupy [none]: " -#: ../clients/cli/connections.c:4536 +#: ../clients/cli/connections.c:4540 #, c-format msgid "Enable PI %s" msgstr "Włączenie PI %s" -#: ../clients/cli/connections.c:4541 +#: ../clients/cli/connections.c:4545 #, c-format msgid "Error: 'pi': %s.\n" msgstr "Błąd: „pi”: %s.\n" -#: ../clients/cli/connections.c:4549 +#: ../clients/cli/connections.c:4553 #, c-format msgid "Enable VNET header %s" msgstr "Włączenie nagłówka VNET %s" -#: ../clients/cli/connections.c:4554 +#: ../clients/cli/connections.c:4558 #, c-format msgid "Error: 'vnet-hdr': %s.\n" msgstr "Błąd: „vnet-hdr”: %s.\n" -#: ../clients/cli/connections.c:4562 +#: ../clients/cli/connections.c:4566 #, c-format msgid "Enable multi queue %s" msgstr "Włączenie wielokrotnej kolejki %s" -#: ../clients/cli/connections.c:4567 +#: ../clients/cli/connections.c:4571 #, c-format msgid "Error: 'multi-queue': %s.\n" msgstr "Błąd: „multi-queue”: %s.\n" #. Ask for optional 'ip-tunnel' arguments. -#: ../clients/cli/connections.c:4581 +#: ../clients/cli/connections.c:4585 msgid "IP Tunnel" msgstr "Tunel IP" -#: ../clients/cli/connections.c:4586 +#: ../clients/cli/connections.c:4590 msgid "Local endpoint [none]: " msgstr "Lokalny punkt końcowy [none]: " -#: ../clients/cli/connections.c:4592 +#: ../clients/cli/connections.c:4596 #, c-format msgid "Error: 'local': '%s' is not valid; must be an IP address\n" msgstr "Błąd: „local”: „%s” nie jest prawidłowe; musi być adresem IP\n" -#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184 +#: ../clients/cli/connections.c:4662 ../clients/cli/connections.c:10188 #, c-format msgid "Error: . argument is missing." msgstr "Błąd: brak parametru .." -#: ../clients/cli/connections.c:4663 +#: ../clients/cli/connections.c:4667 #, c-format msgid "Error: value for '%s' is missing." msgstr "Błąd: brak wartości dla „%s”." -#: ../clients/cli/connections.c:4681 +#: ../clients/cli/connections.c:4685 #, c-format msgid "Error: invalid . '%s'." msgstr "Błąd: nieprawidłowe . „%s”." -#: ../clients/cli/connections.c:4689 +#: ../clients/cli/connections.c:4693 #, c-format msgid "Error: invalid or not allowed setting '%s': %s." msgstr "Błąd: nieprawidłowe lub niedozwolone ustawienie „%s”: %s." -#: ../clients/cli/connections.c:4700 +#: ../clients/cli/connections.c:4704 #, c-format msgid "Error: don't know how to create '%s' setting." msgstr "Błąd: nie wiadomo, jak utworzyć ustawienie „%s”." -#: ../clients/cli/connections.c:4710 +#: ../clients/cli/connections.c:4714 #, c-format msgid "Error: invalid property '%s': %s." msgstr "Błąd: nieprawidłowa właściwość „%s”: %s." -#: ../clients/cli/connections.c:4722 +#: ../clients/cli/connections.c:4726 #, c-format msgid "Error: failed to modify %s.%s: %s." msgstr "Błąd: zmodyfikowanie %s.%s się nie powiodło: %s." -#: ../clients/cli/connections.c:4741 +#: ../clients/cli/connections.c:4745 #, c-format msgid "Error: failed to remove a value from %s.%s: %s." msgstr "Błąd: usunięcie wartości z %s.%s się nie powiodło: %s." -#: ../clients/cli/connections.c:4775 +#: ../clients/cli/connections.c:4779 #, c-format msgid "" "Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead." @@ -2503,330 +2504,330 @@ msgstr "" "Ostrzeżenie: „type” jest ignorowane. Należy użyć polecenia „nmcli connection " "add \"%s\" …” zamiast tego." -#: ../clients/cli/connections.c:4783 +#: ../clients/cli/connections.c:4787 msgid "Error: redundant 'master' option." msgstr "Błąd: nadmiarowa opcja „master”." -#: ../clients/cli/connections.c:4796 +#: ../clients/cli/connections.c:4800 msgid "Error: 'master' is required." msgstr "Błąd: opcja „master” jest wymagana." -#: ../clients/cli/connections.c:4950 +#: ../clients/cli/connections.c:4954 #, c-format msgid "Error: 'parent': not valid without 'p-key'." msgstr "Błąd: „parent”: nieprawidłowe bez „p-key”." -#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967 +#: ../clients/cli/connections.c:5009 ../clients/cli/connections.c:5971 msgid "SSID: " msgstr "SSID: " -#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970 +#: ../clients/cli/connections.c:5012 ../clients/cli/connections.c:5974 msgid "Error: 'ssid' is required." msgstr "Błąd: „ssid” jest wymagane." -#: ../clients/cli/connections.c:5072 +#: ../clients/cli/connections.c:5076 msgid "WiMAX NSP name: " msgstr "Nazwa NSP sieci WiMAX: " -#: ../clients/cli/connections.c:5075 +#: ../clients/cli/connections.c:5079 msgid "Error: 'nsp' is required." msgstr "Błąd: „nsp” jest wymagane." -#: ../clients/cli/connections.c:5127 +#: ../clients/cli/connections.c:5131 msgid "PPPoE username: " msgstr "Nazwa użytkownika PPPoE: " -#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037 +#: ../clients/cli/connections.c:5134 ../clients/cli/connections.c:6041 msgid "Error: 'username' is required." msgstr "Błąd: „username” jest wymagane." -#: ../clients/cli/connections.c:5199 +#: ../clients/cli/connections.c:5203 msgid "APN: " msgstr "APN: " -#: ../clients/cli/connections.c:5202 +#: ../clients/cli/connections.c:5206 msgid "Error: 'apn' is required." msgstr "Błąd: „apn” jest wymagane." -#: ../clients/cli/connections.c:5260 +#: ../clients/cli/connections.c:5264 msgid "Bluetooth device address: " msgstr "Adres urządzenia Bluetooth: " -#: ../clients/cli/connections.c:5263 +#: ../clients/cli/connections.c:5267 msgid "Error: 'addr' is required." msgstr "Błąd: „addr” jest wymagane." -#: ../clients/cli/connections.c:5304 +#: ../clients/cli/connections.c:5308 #, c-format msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]." msgstr "" "Błąd: „bt-type”: „%s” jest nieprawidłowe; należy użyć [%s, %s (%s), %s]." -#: ../clients/cli/connections.c:5348 +#: ../clients/cli/connections.c:5352 msgid "VLAN parent device or connection UUID: " msgstr "Urządzenie nadrzędne VLAN lub UUID połączenia: " -#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108 +#: ../clients/cli/connections.c:5355 ../clients/cli/connections.c:6112 msgid "Error: 'dev' is required." msgstr "Błąd: „dev” jest wymagane." -#: ../clients/cli/connections.c:5355 +#: ../clients/cli/connections.c:5359 msgid "VLAN ID <0-4094>: " msgstr "Identyfikator VLAN <0-4094>: " -#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424 +#: ../clients/cli/connections.c:5362 ../clients/cli/connections.c:6428 msgid "Error: 'id' is required." msgstr "Błąd: „id” jest wymagane." -#: ../clients/cli/connections.c:5364 +#: ../clients/cli/connections.c:5368 #, c-format msgid "Error: 'id': '%s' is not valid; use <0-4094>." msgstr "Błąd: „id”: „%s” jest nieprawidłowe; należy użyć <0-4094>." -#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116 +#: ../clients/cli/connections.c:5378 ../clients/cli/connections.c:6120 #, c-format msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC." msgstr "Błąd: „dev”: „%s” nie jest UUID, nazwą interfejsu ani MAC." -#: ../clients/cli/connections.c:5506 +#: ../clients/cli/connections.c:5510 #, c-format msgid "Error: 'mode': %s." msgstr "Błąd: „mode”: %s." -#: ../clients/cli/connections.c:5515 +#: ../clients/cli/connections.c:5519 #, c-format msgid "Error: 'primary': '%s' is not a valid interface name." msgstr "Błąd: „primary”: „%s” nie jest prawidłową nazwą interfejsu." -#: ../clients/cli/connections.c:5738 +#: ../clients/cli/connections.c:5742 #, c-format msgid "Error: 'stp': %s." msgstr "Błąd: „stp”: %s." -#: ../clients/cli/connections.c:5747 +#: ../clients/cli/connections.c:5751 #, c-format msgid "Error: 'multicast-snooping': %s." msgstr "Błąd: „multicast-snooping”: %s." -#: ../clients/cli/connections.c:5866 +#: ../clients/cli/connections.c:5870 #, c-format msgid "Error: 'hairpin': %s." msgstr "Błąd: „hairpin”: %s." -#: ../clients/cli/connections.c:5915 +#: ../clients/cli/connections.c:5919 msgid "Error: 'vpn-type' is required." msgstr "Błąd: „vpn-type” jest wymagane." -#: ../clients/cli/connections.c:5922 +#: ../clients/cli/connections.c:5926 #, c-format msgid "Warning: 'vpn-type': %s not known.\n" msgstr "Błąd: „vpn-type”: nieznane %s.\n" -#: ../clients/cli/connections.c:5983 +#: ../clients/cli/connections.c:5987 #, c-format msgid "Error: 'channel': '%s' is not valid; use <1-13>." msgstr "Błąd: „channel”: „%s” jest nieprawidłowe; należy użyć <1-13>." -#: ../clients/cli/connections.c:6034 +#: ../clients/cli/connections.c:6038 msgid "Username: " msgstr "Nazwa użytkownika: " -#: ../clients/cli/connections.c:6043 +#: ../clients/cli/connections.c:6047 #, c-format msgid "Protocol %s" msgstr "Protokół %s" -#: ../clients/cli/connections.c:6046 +#: ../clients/cli/connections.c:6050 msgid "Error: 'protocol' is required." msgstr "Błąd: „protocol” jest wymagane." -#: ../clients/cli/connections.c:6105 +#: ../clients/cli/connections.c:6109 msgid "MACVLAN parent device or connection UUID: " msgstr "Urządzenie nadrzędne MACVLAN lub UUID połączenia: " -#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205 -#: ../clients/cli/connections.c:6307 +#: ../clients/cli/connections.c:6129 ../clients/cli/connections.c:6209 +#: ../clients/cli/connections.c:6311 msgid "Error: 'mode' is required." msgstr "Błąd: „mode” jest wymagane." -#: ../clients/cli/connections.c:6131 +#: ../clients/cli/connections.c:6135 msgid "Error: 'mode' is not valid." msgstr "Błąd: „mode” jest nieprawidłowe." -#: ../clients/cli/connections.c:6144 +#: ../clients/cli/connections.c:6148 #, c-format msgid "Error: 'tap': %s." msgstr "Błąd: „tap”: %s." -#: ../clients/cli/connections.c:6230 +#: ../clients/cli/connections.c:6234 #, c-format msgid "Error: 'pi': %s." msgstr "Błąd: „pi”: %s." -#: ../clients/cli/connections.c:6241 +#: ../clients/cli/connections.c:6245 #, c-format msgid "Error: 'vnet-hdr': %s." msgstr "Błąd: „vnet-hdr”: %s." -#: ../clients/cli/connections.c:6252 +#: ../clients/cli/connections.c:6256 #, c-format msgid "Error: 'multi-queue': %s." msgstr "Błąd: „multi-queue”: %s." -#: ../clients/cli/connections.c:6321 +#: ../clients/cli/connections.c:6325 #, c-format msgid "Error: 'mode': '%s' is not valid, use one of %s" msgstr "Błąd: „mode”: „%s” jest nieprawidłowe, należy użyć jednego z %s" -#: ../clients/cli/connections.c:6327 +#: ../clients/cli/connections.c:6331 msgid "Remote endpoint: " msgstr "Zdalny punkt końcowy: " -#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432 +#: ../clients/cli/connections.c:6334 ../clients/cli/connections.c:6436 msgid "Error: 'remote' is required." msgstr "Błąd: „remote” jest wymagane." -#: ../clients/cli/connections.c:6337 +#: ../clients/cli/connections.c:6341 #, c-format msgid "Error: 'remote': '%s' is not valid; must be an IP address" msgstr "Błąd: „remote”: „%s” jest nieprawidłowe; musi być adresem IP" -#: ../clients/cli/connections.c:6351 +#: ../clients/cli/connections.c:6355 #, c-format msgid "Error: 'local': '%s' is not valid; must be an IP address" msgstr "Błąd: „local”: „%s” jest nieprawidłowe; musi być adresem IP" -#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455 +#: ../clients/cli/connections.c:6364 ../clients/cli/connections.c:6459 #, c-format msgid "Error: 'dev': '%s' is neither UUID nor interface name." msgstr "Błąd: „dev”: „%s” nie jest UUID ani nazwą interfejsu." -#: ../clients/cli/connections.c:6421 +#: ../clients/cli/connections.c:6425 msgid "VXLAN ID: " msgstr "Identyfikator VXLAN: " -#: ../clients/cli/connections.c:6429 +#: ../clients/cli/connections.c:6433 msgid "Remote: " msgstr "Zdalne: " -#: ../clients/cli/connections.c:6438 +#: ../clients/cli/connections.c:6442 #, c-format msgid "Error: 'id': '%s' is not valid; use <0-16777215>." msgstr "Błąd: „id”: „%s” jest nieprawidłowe; należy użyć <0-16777215>." -#: ../clients/cli/connections.c:6464 +#: ../clients/cli/connections.c:6468 #, c-format msgid "Error: 'remote': '%s' is not a valid IP address" msgstr "Błąd: „remote”: „%s” nie jest prawidłowym adresem IP" -#: ../clients/cli/connections.c:6473 +#: ../clients/cli/connections.c:6477 #, c-format msgid "Error: 'local': '%s' is not a valid IP address" msgstr "Błąd: „local”: „%s” nie jest prawidłowym adresem IP" -#: ../clients/cli/connections.c:6482 +#: ../clients/cli/connections.c:6486 #, c-format msgid "Error: 'source-port-min': %s is not valid; use <0-65535>." msgstr "" "Błąd: „source-port-min”: „%s” jest nieprawidłowe; należy użyć <0-65535>." -#: ../clients/cli/connections.c:6491 +#: ../clients/cli/connections.c:6495 #, c-format msgid "Error: 'source-port-max': %s is not valid; use <0-65535>." msgstr "" "Błąd: „source-port-max”: „%s” jest nieprawidłowe; należy użyć <0-65535>." -#: ../clients/cli/connections.c:6500 +#: ../clients/cli/connections.c:6504 #, c-format msgid "Error: 'destination-port': %s is not valid; use <0-65535>." msgstr "" "Błąd: „destination-port”: „%s” jest nieprawidłowe; należy użyć <0-65535>." -#: ../clients/cli/connections.c:6540 +#: ../clients/cli/connections.c:6544 #, c-format msgid "Error: '%s' is not a valid connection type." msgstr "Błąd: „%s” nie jest prawidłowym typem połączenia." -#: ../clients/cli/connections.c:6581 +#: ../clients/cli/connections.c:6585 #, c-format msgid "Error: IPv4 gateway specified without IPv4 addresses" msgstr "Błąd: podano bramę IPv4 bez adresów IPv4" -#: ../clients/cli/connections.c:6585 +#: ../clients/cli/connections.c:6589 #, c-format msgid "Error: multiple IPv4 gateways specified" msgstr "Błąd: podano wiele bram IPv4" -#: ../clients/cli/connections.c:6589 +#: ../clients/cli/connections.c:6593 #, c-format msgid "Error: Invalid IPv4 gateway '%s'" msgstr "Błąd: nieprawidłowa brama IPv4 „%s”" -#: ../clients/cli/connections.c:6614 +#: ../clients/cli/connections.c:6618 #, c-format msgid "Error: IPv6 gateway specified without IPv6 addresses" msgstr "Błąd: podano bramę IPv6 bez adresów IPv6" -#: ../clients/cli/connections.c:6618 +#: ../clients/cli/connections.c:6622 #, c-format msgid "Error: multiple IPv6 gateways specified" msgstr "Błąd: podano wiele bram IPv6" -#: ../clients/cli/connections.c:6622 +#: ../clients/cli/connections.c:6626 #, c-format msgid "Error: Invalid IPv6 gateway '%s'" msgstr "Błąd: nieprawidłowa brama IPv6 „%s”" -#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223 +#: ../clients/cli/connections.c:6674 ../clients/cli/connections.c:10227 #, c-format msgid "Error: Failed to add '%s' connection: %s" msgstr "Błąd: dodanie połączenia „%s” się nie powiodło: %s" -#: ../clients/cli/connections.c:6675 +#: ../clients/cli/connections.c:6679 #, c-format msgid "Connection '%s' (%s) successfully added.\n" msgstr "Pomyślnie dodano połączenie „%s” (%s).\n" -#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678 +#: ../clients/cli/connections.c:6955 ../clients/cli/connections.c:10682 #, c-format msgid "Error: 'type' argument is required." msgstr "Błąd: parametr „type” jest wymagany." -#: ../clients/cli/connections.c:6959 +#: ../clients/cli/connections.c:6963 #, c-format msgid "Error: invalid connection type; %s." msgstr "Błąd: nieznany typ połączenia; %s." -#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164 +#: ../clients/cli/connections.c:6972 ../clients/cli/devices.c:2142 #, c-format msgid "Error: 'autoconnect': %s." msgstr "Błąd: „autoconnect”: %s." -#: ../clients/cli/connections.c:6978 +#: ../clients/cli/connections.c:6982 #, c-format msgid "Error: 'save': %s." msgstr "Błąd: „save”: %s." -#: ../clients/cli/connections.c:6995 +#: ../clients/cli/connections.c:6999 msgid "Interface name [*]: " msgstr "Nazwa interfejsu [*]: " -#: ../clients/cli/connections.c:7000 +#: ../clients/cli/connections.c:7004 #, c-format msgid "Error: 'ifname' argument is required." msgstr "Błąd: parametr „ifname” jest wymagany." -#: ../clients/cli/connections.c:7002 +#: ../clients/cli/connections.c:7006 #, c-format msgid "Error: mandatory 'ifname' not seen before '%s'." msgstr "Błąd: wymagane „ifname” nie występuje przed „%s”." -#: ../clients/cli/connections.c:7011 +#: ../clients/cli/connections.c:7015 #, c-format msgid "Error: 'ifname': '%s' is not a valid interface nor '*'." msgstr "Błąd: „ifname”: „%s” nie jest prawidłowym interfejsem ani „*”." -#: ../clients/cli/connections.c:8035 +#: ../clients/cli/connections.c:8039 #, c-format msgid "['%s' setting values]\n" msgstr "[wartości ustawienia „%s”]\n" @@ -2834,7 +2835,7 @@ msgstr "[wartości ustawienia „%s”]\n" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:8117 +#: ../clients/cli/connections.c:8121 #, c-format msgid "" "---[ Main menu ]---\n" @@ -2871,7 +2872,7 @@ msgstr "" "nmcli :: konfiguracja nmcli\n" "quit :: kończy działanie nmcli\n" -#: ../clients/cli/connections.c:8144 +#: ../clients/cli/connections.c:8148 #, c-format msgid "" "goto [.] | :: enter setting/property for editing\n" @@ -2892,7 +2893,7 @@ msgstr "" " nmcli connection> goto secondaries\n" " nmcli> goto ipv4.addresses\n" -#: ../clients/cli/connections.c:8151 +#: ../clients/cli/connections.c:8155 #, c-format msgid "" "remove [.] :: remove setting or reset property value\n" @@ -2913,7 +2914,7 @@ msgstr "" "Przykłady: nmcli> remove wifi-sec\n" " nmcli> remove eth.mtu\n" -#: ../clients/cli/connections.c:8158 +#: ../clients/cli/connections.c:8162 #, c-format msgid "" "set [. ] :: set property value\n" @@ -2928,7 +2929,7 @@ msgstr "" "\n" "Przykład: nmcli> set con.id Moje połączenie\n" -#: ../clients/cli/connections.c:8163 +#: ../clients/cli/connections.c:8167 #, c-format msgid "" "describe [.] :: describe property\n" @@ -2941,7 +2942,7 @@ msgstr "" "Wyświetla opis właściwości. Wszystkie ustawienia i właściwości usługi NM\n" "można znaleźć na stronie podręcznika nm-settings(5).\n" -#: ../clients/cli/connections.c:8168 +#: ../clients/cli/connections.c:8172 #, c-format msgid "" "print [all] :: print setting or connection values\n" @@ -2956,7 +2957,7 @@ msgstr "" "\n" "Przykład: nmcli ipv4> print all\n" -#: ../clients/cli/connections.c:8173 +#: ../clients/cli/connections.c:8177 #, c-format msgid "" "verify [all | fix] :: verify setting or connection validity\n" @@ -2980,7 +2981,7 @@ msgstr "" " nmcli> verify fix\n" " nmcli bond> verify\n" -#: ../clients/cli/connections.c:8182 +#: ../clients/cli/connections.c:8186 #, c-format msgid "" "save [persistent|temporary] :: save the connection\n" @@ -3006,7 +3007,7 @@ msgstr "" "między ponownymi uruchomieniami. Aby w pełni usunąć trwałe połączenie,\n" "należy usunąć profil połączenia.\n" -#: ../clients/cli/connections.c:8193 +#: ../clients/cli/connections.c:8197 #, c-format msgid "" "activate [] [/|] :: activate the connection\n" @@ -3028,7 +3029,7 @@ msgstr "" " poprzedzić znakiem /, kiedy nie podano\n" " )\n" -#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359 +#: ../clients/cli/connections.c:8204 ../clients/cli/connections.c:8363 #, c-format msgid "" "back :: go to upper menu level\n" @@ -3037,7 +3038,7 @@ msgstr "" "back :: przechodzi do menu wyższego poziomu\n" "\n" -#: ../clients/cli/connections.c:8203 +#: ../clients/cli/connections.c:8207 #, c-format msgid "" "help/? [] :: help for the nmcli commands\n" @@ -3046,7 +3047,7 @@ msgstr "" "help/? [] :: pomoc dla poleceń nmcli\n" "\n" -#: ../clients/cli/connections.c:8206 +#: ../clients/cli/connections.c:8210 #, c-format msgid "" "nmcli [ ] :: nmcli configuration\n" @@ -3073,7 +3074,7 @@ msgstr "" " nmcli> nmcli save-confirmation no\n" " nmcli> nmcli prompt-color 3\n" -#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365 +#: ../clients/cli/connections.c:8232 ../clients/cli/connections.c:8369 #, c-format msgid "" "quit :: exit nmcli\n" @@ -3086,8 +3087,8 @@ msgstr "" "To polecenie kończy działanie nmcli. Jeśli modyfikowane połączenie nie jest " "zapisane, użytkownik zostanie poproszony o potwierdzenie działania.\n" -#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370 -#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742 +#: ../clients/cli/connections.c:8237 ../clients/cli/connections.c:8374 +#: ../clients/cli/connections.c:8798 ../clients/cli/connections.c:9746 #, c-format msgid "Unknown command: '%s'\n" msgstr "Nieznane polecenie: „%s”\n" @@ -3095,7 +3096,7 @@ msgstr "Nieznane polecenie: „%s”\n" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:8299 +#: ../clients/cli/connections.c:8303 #, c-format msgid "" "---[ Property menu ]---\n" @@ -3122,7 +3123,7 @@ msgstr "" "help/? [] :: wyświetla tę pomoc lub opis polecenia\n" "quit :: kończy działanie nmcli\n" -#: ../clients/cli/connections.c:8324 +#: ../clients/cli/connections.c:8328 #, c-format msgid "" "set [] :: set new value\n" @@ -3133,7 +3134,7 @@ msgstr "" "\n" "To polecenie ustawia podaną tej właściwości\n" -#: ../clients/cli/connections.c:8328 +#: ../clients/cli/connections.c:8332 #, c-format msgid "" "add [] :: append new value to the property\n" @@ -3148,7 +3149,7 @@ msgstr "" "jest typu kontener. W przypadku właściwości zawierających jedną wartość " "zastępuje tę wartość (podobnie jak „set”).\n" -#: ../clients/cli/connections.c:8334 +#: ../clients/cli/connections.c:8338 #, c-format msgid "" "change :: change current value\n" @@ -3159,7 +3160,7 @@ msgstr "" "\n" "Wyświetla bieżącą wartość i umożliwia jej modyfikację.\n" -#: ../clients/cli/connections.c:8338 +#: ../clients/cli/connections.c:8342 #, c-format msgid "" "remove [|| +END + foreach (@choices) { + my ($name, $desc, $val) = map { fmt $_ } @$_; + print < + $name + $val + $desc + +END + print < + + + + + +END + + $name = undef; + $desc = undef; + $choice = undef; + $val = undef; + @choices = (); +} else { + # Only care about other lines if we're parsing an enum + next unless $val; + s/\/\*.*\*\///g; + die "Unexpected input '$_' while parsing enum" unless /^\s*$/; +} + +END { +print < +END +} -- cgit 1.3.0-6-gf8a5