From 8d275584fc94f398f0a7c990dcd057533d9a5856 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Feb 2013 23:06:45 +0100 Subject: Imported Upstream version 0.9.8.0 --- NEWS | 9 + cli/Makefile.am | 2 +- cli/Makefile.in | 2 +- cli/completion/Makefile.am | 2 + cli/completion/Makefile.in | 575 +++++ cli/completion/nmcli | 197 ++ cli/src/connections.c | 2 + cli/src/devices.c | 77 +- configure | 27 +- configure.ac | 5 +- docs/api/Makefile.am | 3 + docs/api/Makefile.in | 3 + docs/api/html/NetworkManager.devhelp2 | 28 +- docs/api/html/index.html | 32 +- docs/api/html/ix01.html | 2 +- docs/api/html/ref-migrating.html | 58 +- docs/api/html/ref-settings.html | 48 +- docs/api/html/spec.html | 6 +- docs/api/spec.html | 6 +- docs/api/version.xml | 2 +- docs/libnm-glib/html/NMClient.html | 2 + docs/libnm-glib/html/NMDevice.html | 47 + docs/libnm-glib/html/NMDeviceBond.html | 1 + docs/libnm-glib/html/NMDeviceBridge.html | 9 + docs/libnm-glib/html/NMDeviceWifi.html | 1 + docs/libnm-glib/html/NMRemoteConnection.html | 15 + docs/libnm-glib/html/NMSecretAgent.html | 2 +- docs/libnm-glib/html/NMWimaxNsp.html | 23 + docs/libnm-glib/html/api-index-full.html | 20 + docs/libnm-glib/html/ch02.html | 2 +- docs/libnm-glib/html/index.html | 4 +- docs/libnm-glib/html/index.sgml | 5 + docs/libnm-glib/html/libnm-glib.devhelp2 | 23 +- docs/libnm-glib/libnm-glib-sections.txt | 2 + docs/libnm-glib/tmpl/nm-device.sgml | 21 + docs/libnm-glib/tmpl/nm-remote-connection.sgml | 10 + docs/libnm-glib/version.xml | 2 +- docs/libnm-util/html/NMSettingBridge.html | 17 + docs/libnm-util/html/NMSettingBridgePort.html | 9 + docs/libnm-util/html/NMSettingConnection.html | 5 + docs/libnm-util/html/NMSettingIP6Config.html | 2 + docs/libnm-util/html/NMSettingWireless.html | 1 + docs/libnm-util/html/ch01.html | 2 +- docs/libnm-util/html/index.html | 4 +- docs/libnm-util/html/libnm-util-nm-utils.html | 5 + docs/libnm-util/html/libnm-util.devhelp2 | 50 +- docs/libnm-util/tmpl/nm-connection.sgml | 2 + docs/libnm-util/tmpl/nm-setting-8021x.sgml | 2 + docs/libnm-util/tmpl/nm-setting-adsl.sgml | 2 + docs/libnm-util/tmpl/nm-setting-bluetooth.sgml | 2 + docs/libnm-util/tmpl/nm-setting-bond.sgml | 2 + docs/libnm-util/tmpl/nm-setting-bridge-port.sgml | 2 + docs/libnm-util/tmpl/nm-setting-bridge.sgml | 2 + docs/libnm-util/tmpl/nm-setting-cdma.sgml | 2 + docs/libnm-util/tmpl/nm-setting-connection.sgml | 2 + docs/libnm-util/tmpl/nm-setting-gsm.sgml | 2 + docs/libnm-util/tmpl/nm-setting-infiniband.sgml | 2 + docs/libnm-util/tmpl/nm-setting-ip4-config.sgml | 2 + docs/libnm-util/tmpl/nm-setting-ip6-config.sgml | 2 + docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml | 2 + docs/libnm-util/tmpl/nm-setting-ppp.sgml | 2 + docs/libnm-util/tmpl/nm-setting-pppoe.sgml | 2 + docs/libnm-util/tmpl/nm-setting-private.sgml | 2 + docs/libnm-util/tmpl/nm-setting-serial.sgml | 2 + docs/libnm-util/tmpl/nm-setting-vlan.sgml | 2 + docs/libnm-util/tmpl/nm-setting-vpn.sgml | 2 + docs/libnm-util/tmpl/nm-setting-wimax.sgml | 2 + docs/libnm-util/tmpl/nm-setting-wired.sgml | 2 + .../tmpl/nm-setting-wireless-security.sgml | 2 + docs/libnm-util/tmpl/nm-setting-wireless.sgml | 2 + docs/libnm-util/tmpl/nm-setting.sgml | 2 + docs/libnm-util/tmpl/nm-utils-enum-types.sgml | 2 + docs/libnm-util/tmpl/nm-utils.sgml | 2 + docs/libnm-util/version.xml | 2 +- include/NetworkManager.h | 7 +- include/nm-version.h | 2 +- introspection/nm-device-wifi.xml | 3 + libnm-glib/Makefile.am | 4 +- libnm-glib/Makefile.in | 14 +- libnm-glib/libnm-glib.ver | 1 + libnm-glib/nm-client.c | 4 + libnm-glib/nm-device-bond.c | 2 + libnm-glib/nm-device-bridge.c | 16 + libnm-glib/nm-device-bridge.h | 2 + libnm-glib/nm-device-wifi.c | 1 + libnm-glib/nm-device.c | 54 + libnm-glib/nm-device.h | 2 + libnm-glib/nm-remote-connection.c | 76 +- libnm-glib/nm-wimax-nsp.c | 2 +- libnm-util/Makefile.am | 2 +- libnm-util/Makefile.in | 2 +- libnm-util/nm-setting-bridge-port.c | 18 + libnm-util/nm-setting-bridge-port.h | 2 + libnm-util/nm-setting-bridge.c | 34 + libnm-util/nm-setting-bridge.h | 2 + libnm-util/nm-setting-connection.c | 10 + libnm-util/nm-setting-ip6-config.c | 4 + libnm-util/nm-setting-wireless.h | 2 + libnm-util/nm-utils.c | 10 + man/Makefile.am | 28 +- man/Makefile.in | 95 +- man/NetworkManager.8 | 155 -- man/NetworkManager.8.in | 4 +- man/NetworkManager.conf.5 | 266 -- man/nm-online.1 | 63 - man/nm-settings.5 | 2669 -------------------- man/nm-settings.xml | 1687 ------------- man/nm-system-settings.conf.5 | 26 - man/nm-tool.1 | 17 - man/nm-tool.1.in | 2 + man/nmcli.1 | 533 ---- man/nmcli.1.in | 4 +- po/pt_BR.po | 2025 ++++++++------- po/uk.po | 1088 ++++---- src/Makefile.am | 3 - src/Makefile.in | 56 +- src/dhcp-manager/nm-dhcp-client.c | 74 +- src/dhcp-manager/nm-dhcp-dhclient.c | 17 +- src/dns-manager/nm-dns-manager.c | 27 +- src/dns-manager/nm-dns-manager.h | 5 +- src/gdb-cmd | 3 - src/generated/nm-enum-types.c | 219 +- src/generated/nm-enum-types.h | 28 +- src/main.c | 5 - src/modem-manager/nm-modem.c | 17 +- src/nm-activation-request.c | 8 + src/nm-active-connection.c | 10 + src/nm-device-bt.c | 9 +- src/nm-device-wifi.c | 22 +- src/nm-device-wifi.h | 1 + src/nm-device.c | 2 +- src/nm-netlink-monitor.c | 5 +- src/nm-policy.c | 110 +- src/nm-system.c | 2 +- src/settings/nm-settings-connection.c | 5 - src/settings/nm-settings.c | 12 +- src/settings/plugins/keyfile/tests/test-keyfile.c | 12 +- src/wifi/wifi-utils-nl80211.c | 29 +- src/wifi/wifi-utils-wext.c | 6 + 139 files changed, 3681 insertions(+), 7370 deletions(-) create mode 100644 cli/completion/Makefile.am create mode 100644 cli/completion/Makefile.in create mode 100644 cli/completion/nmcli delete mode 100644 man/NetworkManager.8 delete mode 100644 man/NetworkManager.conf.5 delete mode 100644 man/nm-online.1 delete mode 100644 man/nm-settings.5 delete mode 100644 man/nm-settings.xml delete mode 100644 man/nm-system-settings.conf.5 delete mode 100644 man/nm-tool.1 delete mode 100644 man/nmcli.1 delete mode 100644 src/gdb-cmd diff --git a/NEWS b/NEWS index fde767de0..01ab10fd9 100644 --- a/NEWS +++ b/NEWS @@ -35,9 +35,18 @@ This is a new stable release of NetworkManager. Notable changes include: * libnl 3.2.7 or later is required * The internal crashdump handling has been removed * A DHCPv6 DUID is now generated from /etc/machine-id and sent to the DHCPv6 server + if not overridden by an administrator-defined DUID * Bond interfaces now wait for a ready slave before starting automatic IP configuration * The kernel WiFi rfkill state is now synced to the user-requested WirelessEnabled state at startup +* Fix issue with duplicate ActiveConnection objects if a connection was reactivated + on a device +* Fix race when looking up hostname and concurrently updating DNS +* Always load the 'keyfile' settings plugin, even if no plugins are specified +* Add a new WiFi device ADHOC capability; not all devices/drivers support IBSS mode +* Fix an issue with quick wpa_supplicant restarts not being noticed +* Expose the AvailableConnections property through libnm-glib +* Fix usage of libnm-glib's NMRemoteConnection from GObject Introspection bindings ============================================== diff --git a/cli/Makefile.am b/cli/Makefile.am index f26892443..f436d46da 100644 --- a/cli/Makefile.am +++ b/cli/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = src +SUBDIRS = src completion diff --git a/cli/Makefile.in b/cli/Makefile.in index 1eada990b..37b7a595d 100644 --- a/cli/Makefile.in +++ b/cli/Makefile.in @@ -362,7 +362,7 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ -SUBDIRS = src +SUBDIRS = src completion all: all-recursive .SUFFIXES: diff --git a/cli/completion/Makefile.am b/cli/completion/Makefile.am new file mode 100644 index 000000000..9a250f070 --- /dev/null +++ b/cli/completion/Makefile.am @@ -0,0 +1,2 @@ +completiondir = $(datadir)/bash-completion/completions +dist_completion_DATA = nmcli diff --git a/cli/completion/Makefile.in b/cli/completion/Makefile.in new file mode 100644 index 000000000..49c71e120 --- /dev/null +++ b/cli/completion/Makefile.in @@ -0,0 +1,575 @@ +# Makefile.in generated by automake 1.11.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = cli/completion +DIST_COMMON = $(dist_completion_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ + $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gnome-code-coverage.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(completiondir)" +DATA = $(dist_completion_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CKDB_PATH = @CKDB_PATH@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DBUS_SYS_DIR = @DBUS_SYS_DIR@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DHCLIENT_PATH = @DHCLIENT_PATH@ +DHCPCD_PATH = @DHCPCD_PATH@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GENHTML = @GENHTML@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MAKEFILE = @GLIB_MAKEFILE@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ +GNUTLS_LIBS = @GNUTLS_LIBS@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +GUDEV_CFLAGS = @GUDEV_CFLAGS@ +GUDEV_LIBS = @GUDEV_LIBS@ +HTML_DIR = @HTML_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +IPTABLES_PATH = @IPTABLES_PATH@ +IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ +IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ +KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ +LCOV = @LCOV@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBDL = @LIBDL@ +LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ +LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ +LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBM = @LIBM@ +LIBNL_CFLAGS = @LIBNL_CFLAGS@ +LIBNL_LIBS = @LIBNL_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@ +MM_GLIB_LIBS = @MM_GLIB_LIBS@ +MOC = @MOC@ +MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ +NM_MICRO_VERSION = @NM_MICRO_VERSION@ +NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@ +NM_VERSION = @NM_VERSION@ +NSS_CFLAGS = @NSS_CFLAGS@ +NSS_LIBS = @NSS_LIBS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_PATH = @PKGCONFIG_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POLKIT_CFLAGS = @POLKIT_CFLAGS@ +POLKIT_LIBS = @POLKIT_LIBS@ +POSUB = @POSUB@ +PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ +QT_CFLAGS = @QT_CFLAGS@ +QT_LIBS = @QT_LIBS@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ +SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ +SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ +SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@ +SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ +UDEV_BASE_DIR = @UDEV_BASE_DIR@ +USE_NLS = @USE_NLS@ +UUID_CFLAGS = @UUID_CFLAGS@ +UUID_LIBS = @UUID_LIBS@ +VAPIGEN = @VAPIGEN@ +VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@ +VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +nmbinary = @nmbinary@ +nmconfdir = @nmconfdir@ +nmdatadir = @nmdatadir@ +nmrundir = @nmrundir@ +nmstatedir = @nmstatedir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +with_dhclient = @with_dhclient@ +with_dhcpcd = @with_dhcpcd@ +with_netconfig = @with_netconfig@ +with_resolvconf = @with_resolvconf@ +completiondir = $(datadir)/bash-completion/completions +dist_completion_DATA = nmcli +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cli/completion/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu cli/completion/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_completionDATA: $(dist_completion_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_completion_DATA)'; test -n "$(completiondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(completiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(completiondir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(completiondir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(completiondir)" || exit $$?; \ + done + +uninstall-dist_completionDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_completion_DATA)'; test -n "$(completiondir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(completiondir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(completiondir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_completionDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_completionDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dist_completionDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-dist_completionDATA + + +# 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/cli/completion/nmcli b/cli/completion/nmcli new file mode 100644 index 000000000..7bd9431a3 --- /dev/null +++ b/cli/completion/nmcli @@ -0,0 +1,197 @@ +# nmcli completion -*- shell-script -*- +# Based on +# https://github.com/GArik/bash-completion/blob/master/completions/nmcli + +_nmcli_list() +{ + COMPREPLY=( $( compgen -W '$1' -- $cur ) ) +} + +_nmcli_con_id() +{ + local IFS=$'\n' + COMPREPLY=( $( compgen -W "$(nmcli -t -f NAME con list 2>/dev/null )" -- $cur ) ) +} + +_nmcli_con_uuid() +{ + COMPREPLY=( $( compgen -W "$(nmcli -t -f UUID con list 2>/dev/null )" -- $cur ) ) +} + +_nmcli_ap_ssid() +{ + local IFS=$'\n' + COMPREPLY=( $( compgen -W "$(nmcli -t -f SSID dev wifi list 2>/dev/null )" -- $cur ) ) +} + +_nmcli_ab_bssid() +{ + COMPREPLY=( $( compgen -W "$(nmcli -t -f BSSID dev wifi list 2>/dev/null )" -- $cur ) ) +} + +_nmcli() +{ + local cur prev words cword + _init_completion || return + + case $prev in + -m|--mode) + COMPREPLY=( $( compgen -W 'tabular multiline' -- $cur ) ) + return 0 + ;; + -f|--fields) + COMPREPLY=( $( compgen -W 'all common' -- $cur ) ) + return 0 + ;; + -e|--escape) + _nmcli_list "yes no" + return 0 + ;; + id) + _nmcli_con_id + return 0 + ;; + uuid) + _nmcli_con_uuid + return 0 + ;; + iface) + _available_interfaces + return 0 + ;; + bssid) + _nmcli_ab_bssid + return 0 + ;; + wep-key-type) + _nmcli_list "key phrase" + return 0 + ;; + esac + + if [[ $cword -eq 1 ]] ; then + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W '--terse --pretty --mode --fields \ + --escape --version --help' -- $cur ) ) + else + COMPREPLY=( $( compgen -W "nm con dev" -- $cur ) ) + fi + else + local object=${words[1]} + local command=${words[2]} + + case $object in + nm) + case $command in + enable) + _nmcli_list "true false" + return 0 + ;; + sleep) + _nmcli_list "true false" + return 0 + ;; + wifi) + _nmcli_list "on off" + return 0 + ;; + wwan) + _nmcli_list "on off" + return 0 + ;; + wimax) + _nmcli_list "on off" + return 0 + ;; + esac + + COMPREPLY=( $( compgen -W 'status permissions enable sleep \ + wifi wwan wimax' -- $cur ) ) + ;; + con) + case $command in + list) + COMPREPLY=( $( compgen -W 'id uuid' -- $cur ) ) + return 0 + ;; + up) + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W '--nowait --timeout' \ + -- $cur ) ) + else + COMPREPLY=( $( compgen -W 'id uuid iface ap nsp' \ + -- $cur ) ) + fi + return 0 + ;; + down) + COMPREPLY=( $( compgen -W 'id uuid' -- $cur ) ) + return 0 + ;; + delete) + COMPREPLY=( $( compgen -W 'id uuid' -- $cur ) ) + return 0 + ;; + esac + + COMPREPLY=( $( compgen -W 'list status up down delete' \ + -- $cur ) ) + ;; + dev) + case $command in + list) + COMPREPLY=( $( compgen -W 'iface' -- $cur ) ) + return 0 + ;; + disconnect) + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W '--nowait --timeout' \ + -- $cur ) ) + else + COMPREPLY=( $( compgen -W 'iface' -- $cur ) ) + fi + return 0 + ;; + wifi) + local subcommand=${words[3]} + + case $subcommand in + list) + COMPREPLY=( $( compgen -W 'iface bssid' \ + -- $cur ) ) + return 0 + ;; + connect) + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W '--private \ + --nowait --timeout' -- $cur ) ) + else + if [[ "$prev" == "connect" ]]; then + _nmcli_ap_ssid + else + COMPREPLY=( $( compgen -W 'password \ + wep-key-type iface bssid name' \ + -- $cur ) ) + fi + fi + return 0 + ;; + esac + + COMPREPLY=( $( compgen -W 'list connect' -- $cur ) ) + return 0 + ;; + esac + + COMPREPLY=( $( compgen -W 'status list disconnect wifi' \ + -- $cur ) ) + ;; + esac + + fi + + return 0 +} && +complete -F _nmcli nmcli + +# ex: ts=4 sw=4 et filetype=sh diff --git a/cli/src/connections.c b/cli/src/connections.c index d509ce047..b39b447ea 100644 --- a/cli/src/connections.c +++ b/cli/src/connections.c @@ -464,6 +464,8 @@ active_connection_state_to_string (NMActiveConnectionState state) return _("activated"); case NM_ACTIVE_CONNECTION_STATE_DEACTIVATING: return _("deactivating"); + case NM_ACTIVE_CONNECTION_STATE_DEACTIVATED: + return _("deactivated"); case NM_ACTIVE_CONNECTION_STATE_UNKNOWN: default: return _("unknown"); diff --git a/cli/src/devices.c b/cli/src/devices.c index 52c8c8557..0cea01880 100644 --- a/cli/src/devices.c +++ b/cli/src/devices.c @@ -93,14 +93,15 @@ static NmcOutputField nmc_fields_dev_list_sections[] = { {"DHCP6", N_("DHCP6"), 0, NULL, 0}, /* 10 */ {"BOND", N_("BOND"), 0, NULL, 0}, /* 11 */ {"VLAN", N_("VLAN"), 0, NULL, 0}, /* 12 */ + {"CONNECTIONS", N_("CONNECTIONS"), 0, NULL, 0}, /* 13 */ {NULL, NULL, 0, NULL, 0} }; #if WITH_WIMAX -#define NMC_FIELDS_DEV_LIST_SECTIONS_ALL "GENERAL,CAPABILITIES,BOND,VLAN,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6" -#define NMC_FIELDS_DEV_LIST_SECTIONS_COMMON "GENERAL,CAPABILITIES,BOND,VLAN,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6" +#define NMC_FIELDS_DEV_LIST_SECTIONS_ALL "GENERAL,CAPABILITIES,BOND,VLAN,CONNECTIONS,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6" +#define NMC_FIELDS_DEV_LIST_SECTIONS_COMMON "GENERAL,CAPABILITIES,BOND,VLAN,CONNECTIONS,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6" #else -#define NMC_FIELDS_DEV_LIST_SECTIONS_ALL "GENERAL,CAPABILITIES,BOND,VLAN,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,IP4,DHCP4,IP6,DHCP6" -#define NMC_FIELDS_DEV_LIST_SECTIONS_COMMON "GENERAL,CAPABILITIES,BOND,VLAN,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,IP4,DHCP4,IP6,DHCP6" +#define NMC_FIELDS_DEV_LIST_SECTIONS_ALL "GENERAL,CAPABILITIES,BOND,VLAN,CONNECTIONS,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,IP4,DHCP4,IP6,DHCP6" +#define NMC_FIELDS_DEV_LIST_SECTIONS_COMMON "GENERAL,CAPABILITIES,BOND,VLAN,CONNECTIONS,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,IP4,DHCP4,IP6,DHCP6" #endif /* Available fields for 'dev list' - GENERAL part */ @@ -124,9 +125,20 @@ static NmcOutputField nmc_fields_dev_list_general[] = { {"CONNECTION", N_("CONNECTION"), 51, NULL, 0}, /* 16 */ {NULL, NULL, 0, NULL, 0} }; -#define NMC_FIELDS_DEV_LIST_GENERAL_ALL "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,DRIVER-VERSION,FIRMWARE-VERSION,HWADDR,STATE,REASON,UDI,IP-IFACE,NM-MANAGED,AUTOCONNECT,FIRMWARE-MISSING,CONNECTION" +#define NMC_FIELDS_DEV_LIST_GENERAL_ALL "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,DRIVER-VERSION,FIRMWARE-VERSION,HWADDR,STATE,REASON,UDI,IP-IFACE,"\ + "NM-MANAGED,AUTOCONNECT,FIRMWARE-MISSING,CONNECTION" #define NMC_FIELDS_DEV_LIST_GENERAL_COMMON "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,HWADDR,STATE" +/* Available fields for 'dev list' - CONNECTIONS part */ +static NmcOutputField nmc_fields_dev_list_connections[] = { + {"NAME", N_("NAME"), 10, NULL, 0}, /* 0 */ + {"AVAILABLE-CONNECTION-PATHS", N_("AVAILABLE-CONNECTION-PATHS"), 80, NULL, 0}, /* 1 */ + {"AVAILABLE-CONNECTIONS", N_("AVAILABLE-CONNECTIONS"), 80, NULL, 0}, /* 2 */ + {NULL, NULL, 0, NULL, 0} +}; +#define NMC_FIELDS_DEV_LIST_CONNECTIONS_ALL "AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS" +#define NMC_FIELDS_DEV_LIST_CONNECTIONS_COMMON "AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS" + /* Available fields for 'dev list' - CAPABILITIES part */ static NmcOutputField nmc_fields_dev_list_cap[] = { {"NAME", N_("NAME"), 13, NULL, 0}, /* 0 */ @@ -155,10 +167,12 @@ static NmcOutputField nmc_fields_dev_list_wifi_prop[] = { {"WPA2", N_("WPA2"), 6, NULL, 0}, /* 3 */ {"TKIP", N_("TKIP"), 6, NULL, 0}, /* 4 */ {"CCMP", N_("CCMP"), 6, NULL, 0}, /* 5 */ + {"AP", N_("AP"), 6, NULL, 0}, /* 6 */ + {"ADHOC", N_("ADHOC"), 6, NULL, 0}, /* 7 */ {NULL, NULL, 0, NULL, 0} }; -#define NMC_FIELDS_DEV_LIST_WIFI_PROP_ALL "NAME,WEP,WPA,WPA2,TKIP,CCMP" -#define NMC_FIELDS_DEV_LIST_WIFI_PROP_COMMON "NAME,WEP,WPA,WPA2,TKIP,CCMP" +#define NMC_FIELDS_DEV_LIST_WIFI_PROP_ALL "NAME,WEP,WPA,WPA2,TKIP,CCMP,AP,ADHOC" +#define NMC_FIELDS_DEV_LIST_WIFI_PROP_COMMON "NAME,WEP,WPA,WPA2,TKIP,CCMP,AP,ADHOC" #if WITH_WIMAX /* Available fields for 'dev list' - wimax properties part */ @@ -678,6 +692,8 @@ show_device_info (gpointer data, gpointer user_data) nmc->allowed_fields[3].value = (wcaps & NM_WIFI_DEVICE_CAP_RSN) ? _("yes") : _("no"); nmc->allowed_fields[4].value = (wcaps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP) ? _("yes") : _("no"); nmc->allowed_fields[5].value = (wcaps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP) ? _("yes") : _("no"); + nmc->allowed_fields[6].value = (wcaps & NM_WIFI_DEVICE_CAP_AP) ? _("yes") : _("no"); + nmc->allowed_fields[7].value = (wcaps & NM_WIFI_DEVICE_CAP_ADHOC) ? _("yes") : _("no"); nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ @@ -878,6 +894,53 @@ show_device_info (gpointer data, gpointer user_data) } } + /* section CONNECTIONS */ + if (!strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[13].name)) { + const GPtrArray *avail_cons; + GString *ac_paths_str; + char **ac_arr = NULL; + int i; + + nmc->allowed_fields = nmc_fields_dev_list_connections; + nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; + nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_LIST_CONNECTIONS_ALL, nmc->allowed_fields, NULL); + print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ + + /* available-connections */ + avail_cons = nm_device_get_available_connections (device); + ac_paths_str = g_string_new (NULL); + if (avail_cons->len) { + ac_arr = g_new (char *, avail_cons->len + 1); + ac_arr[avail_cons->len] = NULL; + } + for (i = 0; avail_cons && (i < avail_cons->len); i++) { + NMRemoteConnection *avail_con = g_ptr_array_index (avail_cons, i); + const char *ac_path = nm_connection_get_path (NM_CONNECTION (avail_con)); + const char *ac_id = nm_connection_get_id (NM_CONNECTION (avail_con)); + const char *ac_uuid = nm_connection_get_uuid (NM_CONNECTION (avail_con)); + + ac_arr[i] = g_strdup_printf ("%s | %s", ac_uuid, ac_id); + + if (i == 0) + g_string_printf (ac_paths_str, "%s/{", NM_DBUS_PATH_SETTINGS); + else + g_string_append_c (ac_paths_str, ','); + g_string_append (ac_paths_str, strrchr (ac_path, '/') + 1); + } + if (ac_paths_str->len > 0) + g_string_append_c (ac_paths_str, '}'); + + set_val_str (nmc->allowed_fields, 0, nmc_fields_dev_list_sections[13].name); /* "CONNECTIONS" */ + set_val_str (nmc->allowed_fields, 1, ac_paths_str->str); + set_val_arr (nmc->allowed_fields, 2, (const char **) ac_arr); + + nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; + print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ + + g_string_free (ac_paths_str, TRUE); + g_strfreev (ac_arr); + was_output = TRUE; + } } if (sections_array) diff --git a/configure b/configure index 0ef7b0018..575f96919 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.68 for NetworkManager 0.9.7.997. +# Generated by GNU Autoconf 2.68 for NetworkManager 0.9.8.0. # # Report bugs to . # @@ -571,8 +571,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='0.9.7.997' -PACKAGE_STRING='NetworkManager 0.9.7.997' +PACKAGE_VERSION='0.9.8.0' +PACKAGE_STRING='NetworkManager 0.9.8.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1579,7 +1579,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 0.9.7.997 to adapt to many kinds of systems. +\`configure' configures NetworkManager 0.9.8.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1649,7 +1649,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 0.9.7.997:";; + short | recursive ) echo "Configuration of NetworkManager 0.9.8.0:";; esac cat <<\_ACEOF @@ -1873,7 +1873,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 0.9.7.997 +NetworkManager configure 0.9.8.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2417,7 +2417,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 0.9.7.997, which was +It was created by NetworkManager $as_me 0.9.8.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3238,7 +3238,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='0.9.7.997' + VERSION='0.9.8.0' cat >>confdefs.h <<_ACEOF @@ -16440,8 +16440,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=0 NM_MINOR_VERSION=9 -NM_MICRO_VERSION=7 -NM_VERSION=0.9.7.997 +NM_MICRO_VERSION=8 +NM_VERSION=0.9.8.0 @@ -23299,7 +23299,7 @@ fi -ac_config_files="$ac_config_files Makefile include/Makefile include/nm-version.h src/Makefile src/tests/Makefile src/generated/Makefile src/logging/Makefile src/posix-signals/Makefile src/dns-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/ip6-manager/Makefile src/supplicant-manager/Makefile src/supplicant-manager/tests/Makefile src/ppp-manager/Makefile src/dnsmasq-manager/Makefile src/modem-manager/Makefile src/bluez-manager/Makefile src/wifi/Makefile src/firewall-manager/Makefile src/settings/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ifcfg-suse/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/wimax/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-util/tests/certs/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile cli/Makefile cli/src/Makefile test/Makefile initscript/RedHat/NetworkManager initscript/Debian/NetworkManager initscript/Slackware/rc.networkmanager initscript/SUSE/networkmanager initscript/Arch/networkmanager initscript/paldo/NetworkManager initscript/Mandriva/networkmanager initscript/linexa/networkmanager introspection/Makefile introspection/all.xml man/Makefile man/NetworkManager.8 man/NetworkManager.conf.5 man/nm-system-settings.conf.5 man/nm-tool.1 man/nm-online.1 man/nmcli.1 po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile" +ac_config_files="$ac_config_files Makefile include/Makefile include/nm-version.h src/Makefile src/tests/Makefile src/generated/Makefile src/logging/Makefile src/posix-signals/Makefile src/dns-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/ip6-manager/Makefile src/supplicant-manager/Makefile src/supplicant-manager/tests/Makefile src/ppp-manager/Makefile src/dnsmasq-manager/Makefile src/modem-manager/Makefile src/bluez-manager/Makefile src/wifi/Makefile src/firewall-manager/Makefile src/settings/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ifcfg-suse/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/wimax/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-util/tests/certs/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile cli/Makefile cli/src/Makefile cli/completion/Makefile test/Makefile initscript/RedHat/NetworkManager initscript/Debian/NetworkManager initscript/Slackware/rc.networkmanager initscript/SUSE/networkmanager initscript/Arch/networkmanager initscript/paldo/NetworkManager initscript/Mandriva/networkmanager initscript/linexa/networkmanager introspection/Makefile introspection/all.xml man/Makefile man/NetworkManager.8 man/NetworkManager.conf.5 man/nm-system-settings.conf.5 man/nm-tool.1 man/nm-online.1 man/nmcli.1 po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -23968,7 +23968,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 0.9.7.997, which was +This file was extended by NetworkManager $as_me 0.9.8.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24034,7 +24034,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 0.9.7.997 +NetworkManager config.status 0.9.8.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -24599,6 +24599,7 @@ do "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "cli/Makefile") CONFIG_FILES="$CONFIG_FILES cli/Makefile" ;; "cli/src/Makefile") CONFIG_FILES="$CONFIG_FILES cli/src/Makefile" ;; + "cli/completion/Makefile") CONFIG_FILES="$CONFIG_FILES cli/completion/Makefile" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "initscript/RedHat/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/RedHat/NetworkManager" ;; "initscript/Debian/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/Debian/NetworkManager" ;; diff --git a/configure.ac b/configure.ac index d90da2f71..cc66e9bcc 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ AC_PREREQ([2.63]) dnl The NM version number m4_define([nm_major_version], [0]) m4_define([nm_minor_version], [9]) -m4_define([nm_micro_version], [7]) -m4_define([nm_nano_version], [997]) +m4_define([nm_micro_version], [8]) +m4_define([nm_nano_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version]) @@ -669,6 +669,7 @@ callouts/tests/Makefile tools/Makefile cli/Makefile cli/src/Makefile +cli/completion/Makefile test/Makefile initscript/RedHat/NetworkManager initscript/Debian/NetworkManager diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index d98dc786a..98dd3de75 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -25,6 +25,9 @@ spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la $(top_builddir)/tools/generate-settings-spec book $@ +# Top-level SGML file includes (depends on) settings-spec.xml +$(DOC_MAIN_SGML_FILE): settings-spec.xml + all: $(GENERATED_FILES) #################################### diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index d2123e446..caa59cfd7 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -633,6 +633,9 @@ uninstall-am: uninstall-local @ENABLE_DOC_TRUE@settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la @ENABLE_DOC_TRUE@ $(top_builddir)/tools/generate-settings-spec book $@ +# Top-level SGML file includes (depends on) settings-spec.xml +@ENABLE_DOC_TRUE@$(DOC_MAIN_SGML_FILE): settings-spec.xml + @ENABLE_DOC_TRUE@all: $(GENERATED_FILES) @ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index fd669a49c..1b7a72cf8 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -4,23 +4,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 6557dbc8e..d9d82eb4a 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -14,11 +14,11 @@
-

Version 0.9.7.997 +

Version 0.9.8.0

Copyright © 2012 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later @@ -46,25 +46,25 @@

D-Bus API Reference
Network Configuration Setting Specification
-
Configuration Settings
+
Configuration Settings
Secret flag types
Migrating from NetworkManager 0.8 to NetworkManager 0.9
-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed
Index
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 72dc9c03f..00ffafd6c 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -21,7 +21,7 @@

-Index

+Index
diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index bfc66efb8..c6805204a 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -23,20 +23,20 @@

Migrating from NetworkManager 0.8 to NetworkManager 0.9

-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed

@@ -50,14 +50,14 @@

-Architecture and D-Bus API Changes in 0.9

+Architecture and D-Bus API Changes in 0.9

This section details the architectural and D-Bus API changes in NetworkManager 0.9.

-Elimination of the User Settings Service

+Elimination of the User Settings Service

Previously there were two "settings services", or D-Bus services that provided and saved network configuration information. NetworkManager @@ -103,7 +103,7 @@

-User Secret Agents

+User Secret Agents

Even with the elimination of the user settings service, in some cases it is still desirable to store secrets in the user's session and not in @@ -152,7 +152,7 @@

-Settings Service Interface Changes

+Settings Service Interface Changes

With the elimination of the user settings service, the old org.freedesktop.NetworkManagerUserSettings and @@ -190,7 +190,7 @@

-Connection Object Interface Changes

+Connection Object Interface Changes

Consistent with the interface changes to the Settings object, the Connection object's D-Bus interface has changed to @@ -224,7 +224,7 @@

-Permissions Methods Consolidation

+Permissions Methods Consolidation

Previously there were two D-Bus method calls to retrieve the list of operations that a user client could perform, and two signals notifying @@ -256,7 +256,7 @@ are now string-based permissions. The mapping is as follows:

-

Table 23. 

+

Table 23. 

@@ -307,7 +307,7 @@

-AddConnection Returns Object Path of New Connection

+AddConnection Returns Object Path of New Connection

The org.freedesktop.NetworkManager.Settings.AddConnection @@ -325,7 +325,7 @@

-Support for WiMAX Devices

+Support for WiMAX Devices

NetworkManager now supports Intel WiMAX mobile broadband devices. A corresponding device type (NM_DEVICE_TYPE_WIMAX) and @@ -348,7 +348,7 @@

-New Device States

+New Device States

A few new device states have been added, and all device states have been renumbered for flexibility. @@ -363,7 +363,7 @@

-New Active Connection State

+New Active Connection State

Along with the new device states, an additional @@ -379,7 +379,7 @@

-Consolidated Modem Devices

+Consolidated Modem Devices

Many new mobile broadband devices support multiple access families, like Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE @@ -415,7 +415,7 @@

-Secret Property Flags

+Secret Property Flags

In the Connection object's configuration properties, each setting's secret properties (like WiFi passphrases, or public key passwords, etc) now has @@ -424,7 +424,7 @@ following values:

-

Table 24. 

+

Table 24. 

@@ -486,7 +486,7 @@

-Deprecated Methods Removed

+Deprecated Methods Removed

A few methods and signals of the org.freedesktop.NetworkManager interface deprecated in version 0.7 have been removed. All the @@ -496,7 +496,7 @@ their replacements:

-

Table 25. 

+

Table 25. 

diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index bbf0f4391..a70f8150b 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -23,7 +23,7 @@

Network Configuration Setting Specification

-
Configuration Settings
+
Configuration Settings
Secret flag types

@@ -35,11 +35,11 @@

-Configuration Settings

+Configuration Settings

-

Table 1. 802-1x setting

+

Table 1. 802-1x setting

@@ -246,7 +246,7 @@


-

Table 2. adsl setting

+

Table 2. adsl setting

@@ -315,7 +315,7 @@


-

Table 3. bluetooth setting

+

Table 3. bluetooth setting

@@ -354,7 +354,7 @@


-

Table 4. bond setting

+

Table 4. bond setting

@@ -393,7 +393,7 @@


-

Table 5. bridge setting

+

Table 5. bridge setting

@@ -462,7 +462,7 @@


-

Table 6. bridge-port setting

+

Table 6. bridge-port setting

@@ -507,7 +507,7 @@


-

Table 7. cdma setting

+

Table 7. cdma setting

@@ -558,7 +558,7 @@


-

Table 8. connection setting

+

Table 8. connection setting

@@ -651,7 +651,7 @@


-

Table 9. gsm setting

+

Table 9. gsm setting

@@ -744,7 +744,7 @@


-

Table 10. infiniband setting

+

Table 10. infiniband setting

@@ -789,7 +789,7 @@


-

Table 11. ipv4 setting

+

Table 11. ipv4 setting

@@ -888,7 +888,7 @@


-

Table 12. ipv6 setting

+

Table 12. ipv6 setting

@@ -981,7 +981,7 @@


-

Table 13. 802-11-olpc-mesh setting

+

Table 13. 802-11-olpc-mesh setting

@@ -1026,7 +1026,7 @@


-

Table 14. ppp setting

+

Table 14. ppp setting

@@ -1161,7 +1161,7 @@


-

Table 15. pppoe setting

+

Table 15. pppoe setting

@@ -1212,7 +1212,7 @@


-

Table 16. serial setting

+

Table 16. serial setting

@@ -1269,7 +1269,7 @@


-

Table 17. vlan setting

+

Table 17. vlan setting

@@ -1332,7 +1332,7 @@


-

Table 18. vpn setting

+

Table 18. vpn setting

@@ -1383,7 +1383,7 @@


-

Table 19. wimax setting

+

Table 19. wimax setting

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


-

Table 20. 802-3-ethernet setting

+

Table 20. 802-3-ethernet setting

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


-

Table 21. 802-11-wireless setting

+

Table 21. 802-11-wireless setting

@@ -1626,7 +1626,7 @@


-

Table 22. 802-11-wireless-security setting

+

Table 22. 802-11-wireless-security setting

diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html index c31bfc0bc..5e3559daf 100644 --- a/docs/api/html/spec.html +++ b/docs/api/html/spec.html @@ -1,5 +1,5 @@ -NetworkManager D-Bus Interface Specification version 0.9.7.997

NetworkManager D-Bus Interface Specification

Version 0.9.7.997

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.
+

NetworkManager D-Bus Interface Specification

Version 0.9.8.0

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -827,7 +827,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

Sets of flags:

NM_802_11_DEVICE_CAP

Flags describing the capabilities of a wireless device. -
NM_802_11_DEVICE_CAP_NONE = 0x0
Null capability - syntactic sugar for no capabilities supported. Do not AND this with other capabilities!
NM_802_11_DEVICE_CAP_CIPHER_WEP40 = 0x1
The device supports the 40-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_WEP104 = 0x2
The device supports the 104-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_TKIP = 0x4
The device supports the TKIP cipher.
NM_802_11_DEVICE_CAP_CIPHER_CCMP = 0x8
The device supports the CCMP cipher.
NM_802_11_DEVICE_CAP_WPA = 0x10
The device supports the WPA encryption/authentication protocol.
NM_802_11_DEVICE_CAP_RSN = 0x20
The device supports the RSN encryption/authentication protocol.
NM_802_11_DEVICE_CAP_AP = 0x40
The device supports Access Point mode.
+
NM_802_11_DEVICE_CAP_NONE = 0x0
Null capability - syntactic sugar for no capabilities supported. Do not AND this with other capabilities!
NM_802_11_DEVICE_CAP_CIPHER_WEP40 = 0x1
The device supports the 40-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_WEP104 = 0x2
The device supports the 104-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_TKIP = 0x4
The device supports the TKIP cipher.
NM_802_11_DEVICE_CAP_CIPHER_CCMP = 0x8
The device supports the CCMP cipher.
NM_802_11_DEVICE_CAP_WPA = 0x10
The device supports the WPA encryption/authentication protocol.
NM_802_11_DEVICE_CAP_RSN = 0x20
The device supports the RSN encryption/authentication protocol.
NM_802_11_DEVICE_CAP_AP = 0x40
The device supports Access Point mode.
NM_802_11_DEVICE_CAP_ADHOC = 0x80
The device supports Ad-Hoc mode.

org.freedesktop.NetworkManager.Device.Modem

Interface has no methods.

Signals:

PropertiesChanged ( a{sv}: properties diff --git a/docs/api/spec.html b/docs/api/spec.html index c31bfc0bc..5e3559daf 100644 --- a/docs/api/spec.html +++ b/docs/api/spec.html @@ -1,5 +1,5 @@ -NetworkManager D-Bus Interface Specification version 0.9.7.997

NetworkManager D-Bus Interface Specification

Version 0.9.7.997

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.
+

NetworkManager D-Bus Interface Specification

Version 0.9.8.0

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -827,7 +827,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

Sets of flags:

NM_802_11_DEVICE_CAP

Flags describing the capabilities of a wireless device. -
NM_802_11_DEVICE_CAP_NONE = 0x0
Null capability - syntactic sugar for no capabilities supported. Do not AND this with other capabilities!
NM_802_11_DEVICE_CAP_CIPHER_WEP40 = 0x1
The device supports the 40-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_WEP104 = 0x2
The device supports the 104-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_TKIP = 0x4
The device supports the TKIP cipher.
NM_802_11_DEVICE_CAP_CIPHER_CCMP = 0x8
The device supports the CCMP cipher.
NM_802_11_DEVICE_CAP_WPA = 0x10
The device supports the WPA encryption/authentication protocol.
NM_802_11_DEVICE_CAP_RSN = 0x20
The device supports the RSN encryption/authentication protocol.
NM_802_11_DEVICE_CAP_AP = 0x40
The device supports Access Point mode.
+
NM_802_11_DEVICE_CAP_NONE = 0x0
Null capability - syntactic sugar for no capabilities supported. Do not AND this with other capabilities!
NM_802_11_DEVICE_CAP_CIPHER_WEP40 = 0x1
The device supports the 40-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_WEP104 = 0x2
The device supports the 104-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_TKIP = 0x4
The device supports the TKIP cipher.
NM_802_11_DEVICE_CAP_CIPHER_CCMP = 0x8
The device supports the CCMP cipher.
NM_802_11_DEVICE_CAP_WPA = 0x10
The device supports the WPA encryption/authentication protocol.
NM_802_11_DEVICE_CAP_RSN = 0x20
The device supports the RSN encryption/authentication protocol.
NM_802_11_DEVICE_CAP_AP = 0x40
The device supports Access Point mode.
NM_802_11_DEVICE_CAP_ADHOC = 0x80
The device supports Ad-Hoc mode.

org.freedesktop.NetworkManager.Device.Modem

Interface has no methods.

Signals:

PropertiesChanged ( a{sv}: properties diff --git a/docs/api/version.xml b/docs/api/version.xml index 1517c7856..68f4aad34 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -0.9.7.997 +0.9.8.0 diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html index 1cc0d3d71..83d7fdefe 100644 --- a/docs/libnm-glib/html/NMClient.html +++ b/docs/libnm-glib/html/NMClient.html @@ -757,6 +757,7 @@ a list of domains separated by ",". [Since 0.9.8

@@ -1037,6 +1038,7 @@ domains separated by ",". (Since 0.9.8

diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index 86536c2ce..e0f5f25a2 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -52,6 +52,7 @@ gpointer user_data); #define NM_DEVICE_ACTIVE_CONNECTION #define NM_DEVICE_AUTOCONNECT +#define NM_DEVICE_AVAILABLE_CONNECTIONS #define NM_DEVICE_CAPABILITIES #define NM_DEVICE_DEVICE_TYPE #define NM_DEVICE_DHCP4_CONFIG @@ -82,6 +83,7 @@ const GSList *connections); NMActiveConnection * nm_device_get_active_connection (NMDevice *device); gboolean nm_device_get_autoconnect (NMDevice *device); +const GPtrArray * nm_device_get_available_connections (NMDevice *device); NMDeviceCapabilities nm_device_get_capabilities (NMDevice *device); NMDeviceType nm_device_get_device_type (NMDevice *device); NMDHCP4Config * nm_device_get_dhcp4_config (NMDevice *device); @@ -137,6 +139,7 @@ NMDevice implements 
   "active-connection"        NMActiveConnection*   : Read
   "autoconnect"              gboolean              : Read / Write
+  "available-connections"    NMObjectArray*        : Read
   "capabilities"             guint                 : Read
   "device-type"              guint                 : Read
   "dhcp4-config"             NMDHCP4Config*        : Read
@@ -231,6 +234,14 @@ NMDevice implements
+

NM_DEVICE_AVAILABLE_CONNECTIONS

+
#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections"
+
+

+

+
+
+

NM_DEVICE_CAPABILITIES

#define NM_DEVICE_CAPABILITIES "capabilities"
@@ -575,6 +586,33 @@ Whether the +

nm_device_get_available_connections ()

+
const GPtrArray *   nm_device_get_available_connections (NMDevice *device);
+

+Gets the NMRemoteConnections currently known to the daemon that could +be activated on device. +

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

device :

a NMDevice +

Returns :

the GPtrArray +containing NMRemoteConnections. This is the internal copy used by +the connection, and must not be modified. [element-type NMClient.RemoteConnection] +
+

Since 0.9.8

+
+
+

nm_device_get_capabilities ()

NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);

@@ -1069,6 +1107,15 @@ Whether the device can auto-activate a connection.

+

The "available-connections" property

+
  "available-connections"    NMObjectArray*        : Read
+

+The available connections (NMRemoteConnection) of the device +

+

Since 0.9.8

+
+
+

The "capabilities" property

  "capabilities"             guint                 : Read

diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html index 9f08c4158..04c6f0a74 100644 --- a/docs/libnm-glib/html/NMDeviceBond.html +++ b/docs/libnm-glib/html/NMDeviceBond.html @@ -322,6 +322,7 @@ The hardware (MAC) address of the device.

The devices (NMDevice) slaved to the bond device.

+

Since 0.9.8

diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html index 4a9b431fd..a1514f453 100644 --- a/docs/libnm-glib/html/NMDeviceBridge.html +++ b/docs/libnm-glib/html/NMDeviceBridge.html @@ -147,6 +147,7 @@ NMDeviceBridge implements +

Since 0.9.8

@@ -194,6 +195,7 @@ Registers an error quark for NMDeviceBridge errors.
+

Since 0.9.8

@@ -217,6 +219,7 @@ Whether the device has carrier.
+

Since 0.9.8

@@ -240,6 +243,7 @@ device, and must not be modified.
+

Since 0.9.8

@@ -265,6 +269,7 @@ copy used by the device, and must not be modified. [
+

Since 0.9.8

@@ -293,6 +298,7 @@ Creates a new
+

Since 0.9.8

@@ -304,6 +310,7 @@ Creates a new Whether the device has carrier.

Default value: FALSE

+

Since 0.9.8

@@ -313,6 +320,7 @@ Whether the device has carrier. The hardware (MAC) address of the device.

Default value: NULL

+

Since 0.9.8

@@ -321,6 +329,7 @@ The hardware (MAC) address of the device.

The devices (NMDevice) slaved to the bridge device.

+

Since 0.9.8

diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html index 75e35bc67..963d2ca4e 100644 --- a/docs/libnm-glib/html/NMDeviceWifi.html +++ b/docs/libnm-glib/html/NMDeviceWifi.html @@ -534,6 +534,7 @@ to get available access points. +

Since 0.9.8

diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html index eefc87b4c..a1c923ddf 100644 --- a/docs/libnm-glib/html/NMRemoteConnection.html +++ b/docs/libnm-glib/html/NMRemoteConnection.html @@ -91,6 +91,8 @@ NMRemoteConnection implements

Properties

   "bus"                      DBusGConnection*      : Write / Construct Only
+  "dbus-connection"          DBusGConnection*      : Write / Construct Only
+  "dbus-path"                gchar*                : Write / Construct Only
@@ -381,6 +383,19 @@ Creates a new object representing the remote connection. 
  "bus"                      DBusGConnection*      : Write / Construct Only

DBusGConnection.

+
+
+

The "dbus-connection" property

+
  "dbus-connection"          DBusGConnection*      : Write / Construct Only
+

DBusGConnection.

+
+
+
+

The "dbus-path" property

+
  "dbus-path"                gchar*                : Write / Construct Only
+

DBus Object Path.

+

Default value: NULL

+

Signal Details

diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html index 1e08bf501..b5b050f76 100644 --- a/docs/libnm-glib/html/NMSecretAgent.html +++ b/docs/libnm-glib/html/NMSecretAgent.html @@ -356,7 +356,7 @@ To easily create the hash table to return the WiFi PSK, you could do something like this:

-

Example 1. Creating a secrets hash

+

Example 1. Creating a secrets hash

diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html index d6782d7fc..9a233d354 100644 --- a/docs/libnm-glib/html/NMWimaxNsp.html +++ b/docs/libnm-glib/html/NMWimaxNsp.html @@ -156,7 +156,30 @@ NMWimaxNsp implements 
gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
                                                          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.

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

nsp :

an NMWimaxNsp to validate connection against

connection :

an NMConnection to validate against nsp +

Returns :

 +TRUE if the connection may be activated with this WiMAX NSP, +FALSE if it cannot be.
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html index 812b76654..bd62549a4 100644 --- a/docs/libnm-glib/html/api-index-full.html +++ b/docs/libnm-glib/html/api-index-full.html @@ -547,6 +547,10 @@
+NMDevice:available-connections, object property in NMDevice +
+
+
NMDevice:capabilities, object property in NMDevice
@@ -955,6 +959,10 @@
+NM_DEVICE_AVAILABLE_CONNECTIONS, macro in NMDevice +
+
+
NM_DEVICE_BOND_CARRIER, macro in NMDeviceBond
@@ -1163,6 +1171,10 @@
+nm_device_get_available_connections, function in NMDevice +
+
+
nm_device_get_capabilities, function in NMDevice
@@ -1814,6 +1826,14 @@
+NMRemoteConnection:dbus-connection, object property in NMRemoteConnection +
+
+
+NMRemoteConnection:dbus-path, object property in NMRemoteConnection +
+
+
NMRemoteConnectionClass, struct in NMRemoteConnection
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html index 7a81d599b..a739d3431 100644 --- a/docs/libnm-glib/html/ch02.html +++ b/docs/libnm-glib/html/ch02.html @@ -21,7 +21,7 @@

-libnm-glib API Reference

+libnm-glib API Reference
NMClient diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index baaf92bf4..aec8180aa 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -15,14 +15,14 @@

- for libnm-glib 0.9.7.997 + for libnm-glib 0.9.8.0 The latest version of this documentation can be found on-line at http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/.

Copyright © 2012 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml index b7aee356e..a839322bc 100644 --- a/docs/libnm-glib/html/index.sgml +++ b/docs/libnm-glib/html/index.sgml @@ -133,6 +133,7 @@ + @@ -157,6 +158,7 @@ + @@ -180,6 +182,7 @@ + @@ -719,6 +722,8 @@ + + diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2 index 2358599b1..c372ebeeb 100644 --- a/docs/libnm-glib/html/libnm-glib.devhelp2 +++ b/docs/libnm-glib/html/libnm-glib.devhelp2 @@ -63,7 +63,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -130,6 +130,7 @@ + @@ -154,6 +155,7 @@ + @@ -176,6 +178,7 @@ + @@ -234,7 +237,7 @@ - + @@ -326,16 +329,16 @@ - + - - - - - + + + + + @@ -502,6 +505,8 @@ + + diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt index edd05f0e3..a8216584a 100644 --- a/docs/libnm-glib/libnm-glib-sections.txt +++ b/docs/libnm-glib/libnm-glib-sections.txt @@ -139,6 +139,7 @@ NMDeviceClass NMDeviceDeactivateFn NM_DEVICE_ACTIVE_CONNECTION NM_DEVICE_AUTOCONNECT +NM_DEVICE_AVAILABLE_CONNECTIONS NM_DEVICE_CAPABILITIES NM_DEVICE_DEVICE_TYPE NM_DEVICE_DHCP4_CONFIG @@ -163,6 +164,7 @@ nm_device_disconnect nm_device_filter_connections nm_device_get_active_connection nm_device_get_autoconnect +nm_device_get_available_connections nm_device_get_capabilities nm_device_get_device_type nm_device_get_dhcp4_config diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml index 90be4054f..d61ff3559 100644 --- a/docs/libnm-glib/tmpl/nm-device.sgml +++ b/docs/libnm-glib/tmpl/nm-device.sgml @@ -48,6 +48,11 @@ NMDevice + + + + + @@ -177,6 +182,13 @@ NMDevice + + + + + + + @@ -362,6 +374,15 @@ NMDevice @Returns: + + + + + +@device: +@Returns: + + diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml index 628000c88..298d7b917 100644 --- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml +++ b/docs/libnm-glib/tmpl/nm-remote-connection.sgml @@ -55,6 +55,16 @@ NMRemoteConnection + + + + + + + + + + diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml index 1517c7856..68f4aad34 100644 --- a/docs/libnm-glib/version.xml +++ b/docs/libnm-glib/version.xml @@ -1 +1 @@ -0.9.7.997 +0.9.8.0 diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html index 4e52f8ed8..e7d071be9 100644 --- a/docs/libnm-util/html/NMSettingBridge.html +++ b/docs/libnm-util/html/NMSettingBridge.html @@ -153,6 +153,7 @@ required

+

Since 0.9.8

@@ -240,6 +241,7 @@ Registers an error quark for NMSettingBridge errors.
+

Since 0.9.8

@@ -259,6 +261,7 @@ Registers an error quark for Since 0.9.8

@@ -278,6 +281,7 @@ Registers an error quark for Since 0.9.8

@@ -297,6 +301,7 @@ Registers an error quark for Since 0.9.8

@@ -317,6 +322,7 @@ Registers an error quark for Since 0.9.8

@@ -336,6 +342,7 @@ Registers an error quark for Since 0.9.8

@@ -355,6 +362,7 @@ Registers an error quark for Since 0.9.8

@@ -374,6 +382,7 @@ Registers an error quark for Since 0.9.8

@@ -390,6 +399,7 @@ Creates a new Since 0.9.8

@@ -402,6 +412,7 @@ The ethernet MAC address aging time, in seconds.

Allowed values: <= 1000000

Default value: 300

+

Since 0.9.8

@@ -412,6 +423,7 @@ The Spanning Tree Protocol (STP) forwarding delay, in seconds.

Allowed values: <= 30

Default value: 15

+

Since 0.9.8

@@ -422,6 +434,7 @@ The Spanning Tree Protocol (STP) hello time, in seconds.

Allowed values: <= 10

Default value: 2

+

Since 0.9.8

@@ -431,6 +444,7 @@ The Spanning Tree Protocol (STP) hello time, in seconds. The name of the virtual in-kernel briding network interface

Default value: NULL

+

Since 0.9.8

@@ -441,6 +455,7 @@ The Spanning Tree Protocol (STP) maximum message age, in seconds.

Allowed values: <= 40

Default value: 20

+

Since 0.9.8

@@ -453,6 +468,7 @@ bridge.

Allowed values: <= 65535

Default value: 128

+

Since 0.9.8

@@ -462,6 +478,7 @@ bridge. Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.

Default value: TRUE

+

Since 0.9.8

diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html index e5ce3b47d..c4dca4960 100644 --- a/docs/libnm-util/html/NMSettingBridgePort.html +++ b/docs/libnm-util/html/NMSettingBridgePort.html @@ -142,6 +142,7 @@ is required +

Since 0.9.8

@@ -197,6 +198,7 @@ Registers an error quark for the error quark used for NMSettingBridgePort errors.
+

Since 0.9.8

@@ -217,6 +219,7 @@ Registers an error quark for
+

Since 0.9.8

@@ -237,6 +240,7 @@ Registers an error quark for
+

Since 0.9.8

@@ -256,6 +260,7 @@ Registers an error quark for
+

Since 0.9.8

@@ -272,6 +277,7 @@ Creates a new Since 0.9.8

@@ -284,6 +290,7 @@ Enables or disabled 'hairpin mode' for the port, which allows frames to be sent back out through the port the frame was received on.

Default value: FALSE

+

Since 0.9.8

@@ -294,6 +301,7 @@ The Spanning Tree Protocol (STP) port cost for destinations via this port.

Allowed values: <= 65535

Default value: 100

+

Since 0.9.8

@@ -304,6 +312,7 @@ The Spanning Tree Protocol (STP) priority of this bridge port.

Allowed values: <= 63

Default value: 32

+

Since 0.9.8

diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html index bb1014e51..2fd64bf5f 100644 --- a/docs/libnm-util/html/NMSettingConnection.html +++ b/docs/libnm-util/html/NMSettingConnection.html @@ -396,6 +396,7 @@ was already present +

Since 0.9.8

@@ -546,6 +547,7 @@ property of this setting.
+

Since 0.9.8

@@ -640,6 +642,7 @@ Returns the Since 0.9.8

@@ -848,6 +851,7 @@ Removes the secondary coonnection UUID at index idx<
+

Since 0.9.8

@@ -923,6 +927,7 @@ if the connection is read-only and cannot be modified. List of connection UUIDs that should be activated when the base connection itself is activated.

+

Since 0.9.8

diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html index b467336f4..cca1efa85 100644 --- a/docs/libnm-util/html/NMSettingIP6Config.html +++ b/docs/libnm-util/html/NMSettingIP6Config.html @@ -1260,6 +1260,7 @@ property.
+

Since 0.9.8

@@ -1699,6 +1700,7 @@ assigned an address with these methods. The specified name will be sent to the DHCP server when acquiring a lease.

Default value: NULL

+

Since 0.9.8

diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html index e3d964a4a..3a1442701 100644 --- a/docs/libnm-util/html/NMSettingWireless.html +++ b/docs/libnm-util/html/NMSettingWireless.html @@ -295,6 +295,7 @@ Indicates Ad-Hoc mode where no access point is expected to be present. Indicates AP/master mode where the wireless device is started as an access point/hotspot.

+

Since 0.9.8

diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html index 5d0f3520c..5223862ed 100644 --- a/docs/libnm-util/html/ch01.html +++ b/docs/libnm-util/html/ch01.html @@ -21,7 +21,7 @@

-libnm-util API Reference

+libnm-util API Reference
NMConnection — Describes a connection to specific network or provider diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html index 9c0b5194a..667c695cc 100644 --- a/docs/libnm-util/html/index.html +++ b/docs/libnm-util/html/index.html @@ -15,14 +15,14 @@

- for libnm-util 0.9.7.997 + for libnm-util 0.9.8.0 The latest version of this documentation can be found on-line at http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.

Copyright © 2012 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html index a70bc7446..b7ff71eca 100644 --- a/docs/libnm-util/html/libnm-util-nm-utils.html +++ b/docs/libnm-util/html/libnm-util-nm-utils.html @@ -246,6 +246,7 @@ e.g.

+

Since 0.9.8

@@ -493,6 +494,7 @@ function in net/core/dev.c.
+

Since 0.9.8

@@ -902,6 +904,7 @@ Checks if str is a UUID
+

Since 0.9.8

@@ -1181,6 +1184,7 @@ Checks if key is a valid WEP key
+

Since 0.9.8

@@ -1309,6 +1313,7 @@ Checks if psk is a valid WPA PSK
+

Since 0.9.8

diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2 index ead35c076..9f00e53af 100644 --- a/docs/libnm-util/html/libnm-util.devhelp2 +++ b/docs/libnm-util/html/libnm-util.devhelp2 @@ -142,17 +142,17 @@ - + - + - + @@ -161,7 +161,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -489,15 +489,15 @@ - - - - - - - - - + + + + + + + + + @@ -513,11 +513,11 @@ - - - - - + + + + + @@ -901,7 +901,7 @@ - + @@ -1041,7 +1041,7 @@ - + @@ -1051,7 +1051,7 @@ - + @@ -1067,7 +1067,7 @@ - + @@ -1075,12 +1075,12 @@ - + - + diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml index 89fd38c45..f6a97532e 100644 --- a/docs/libnm-util/tmpl/nm-connection.sgml +++ b/docs/libnm-util/tmpl/nm-connection.sgml @@ -9,11 +9,13 @@ NMConnection + + diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml index 107752243..f8ab2c77b 100644 --- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml +++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml @@ -9,11 +9,13 @@ NMSetting8021x + + diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml index d81ae07f5..0e209bc26 100644 --- a/docs/libnm-util/tmpl/nm-setting-adsl.sgml +++ b/docs/libnm-util/tmpl/nm-setting-adsl.sgml @@ -9,11 +9,13 @@ NMSettingAdsl + + diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml index 9ab1b4b2d..cc64b574f 100644 --- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml +++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml @@ -9,11 +9,13 @@ NMSettingBluetooth + + diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml index 8f7dbfc1c..caa8b37a5 100644 --- a/docs/libnm-util/tmpl/nm-setting-bond.sgml +++ b/docs/libnm-util/tmpl/nm-setting-bond.sgml @@ -9,11 +9,13 @@ NMSettingBond + + diff --git a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml index c86142ee0..6e1b473b0 100644 --- a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml +++ b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml @@ -9,11 +9,13 @@ NMSettingBridgePort + + diff --git a/docs/libnm-util/tmpl/nm-setting-bridge.sgml b/docs/libnm-util/tmpl/nm-setting-bridge.sgml index 690205379..7e2cb5a4c 100644 --- a/docs/libnm-util/tmpl/nm-setting-bridge.sgml +++ b/docs/libnm-util/tmpl/nm-setting-bridge.sgml @@ -9,11 +9,13 @@ NMSettingBridge + + diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml index 7837016d3..5d065170a 100644 --- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml +++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml @@ -9,11 +9,13 @@ NMSettingCdma + + diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml index 13cd70551..81d6801cd 100644 --- a/docs/libnm-util/tmpl/nm-setting-connection.sgml +++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml @@ -9,11 +9,13 @@ NMSettingConnection + + diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml index 96327a4a0..0d29a11ab 100644 --- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml +++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml @@ -9,11 +9,13 @@ NMSettingGsm + + diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml index ba7117c01..02a59881c 100644 --- a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml +++ b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml @@ -9,11 +9,13 @@ NMSettingInfiniband + + diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml index fbc1b4ccb..4b915f2b1 100644 --- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml +++ b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml @@ -9,11 +9,13 @@ NMSettingIP4Config + + diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml index 275827a71..3e5af03a8 100644 --- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml +++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml @@ -9,11 +9,13 @@ NMSettingIP6Config + + diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml index 744c87e30..9a1e720ef 100644 --- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml +++ b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml @@ -9,11 +9,13 @@ NMSettingOlpcMesh + + diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml index f26d56fa4..90815380f 100644 --- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml +++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml @@ -9,11 +9,13 @@ NMSettingPPP + + diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml index 942b5a049..3c0221699 100644 --- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml +++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml @@ -9,11 +9,13 @@ NMSettingPPPOE + + diff --git a/docs/libnm-util/tmpl/nm-setting-private.sgml b/docs/libnm-util/tmpl/nm-setting-private.sgml index fdafc21b3..8c990ffc2 100644 --- a/docs/libnm-util/tmpl/nm-setting-private.sgml +++ b/docs/libnm-util/tmpl/nm-setting-private.sgml @@ -9,11 +9,13 @@ nm-setting-private + + diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml index 542b9fbcf..f0313441e 100644 --- a/docs/libnm-util/tmpl/nm-setting-serial.sgml +++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml @@ -9,11 +9,13 @@ NMSettingSerial + + diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml index ff8bea014..f7d67364a 100644 --- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml +++ b/docs/libnm-util/tmpl/nm-setting-vlan.sgml @@ -9,11 +9,13 @@ NMSettingVlan + + diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml index e29dfff99..567776c1c 100644 --- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml +++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml @@ -9,11 +9,13 @@ NMSettingVPN + + diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml index 9225504a5..0b96fa9f6 100644 --- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml +++ b/docs/libnm-util/tmpl/nm-setting-wimax.sgml @@ -9,11 +9,13 @@ NMSettingWimax + + diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml index cff79594b..09fb963ac 100644 --- a/docs/libnm-util/tmpl/nm-setting-wired.sgml +++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml @@ -9,11 +9,13 @@ NMSettingWired + + diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml index d653c6825..01b16ce92 100644 --- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml +++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml @@ -9,11 +9,13 @@ NMSettingWirelessSecurity + + diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml index 039f57874..a74c82efa 100644 --- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml +++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml @@ -9,11 +9,13 @@ NMSettingWireless + + diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml index a5198c104..2067408af 100644 --- a/docs/libnm-util/tmpl/nm-setting.sgml +++ b/docs/libnm-util/tmpl/nm-setting.sgml @@ -9,11 +9,13 @@ NMSetting + + diff --git a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml index 5171db340..820258228 100644 --- a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml +++ b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml @@ -9,11 +9,13 @@ nm-utils-enum-types + + diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml index c2bf6f995..acb59fe93 100644 --- a/docs/libnm-util/tmpl/nm-utils.sgml +++ b/docs/libnm-util/tmpl/nm-utils.sgml @@ -9,11 +9,13 @@ nm-utils + + diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml index 1517c7856..68f4aad34 100644 --- a/docs/libnm-util/version.xml +++ b/docs/libnm-util/version.xml @@ -1 +1 @@ -0.9.7.997 +0.9.8.0 diff --git a/include/NetworkManager.h b/include/NetworkManager.h index 74b2d87f6..d45ad07b3 100644 --- a/include/NetworkManager.h +++ b/include/NetworkManager.h @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2004 - 2012 Red Hat, Inc. + * (C) Copyright 2004 - 2013 Red Hat, Inc. */ #ifndef NETWORK_MANAGER_H @@ -111,6 +111,7 @@ typedef enum { * @NM_DEVICE_TYPE_BOND: a bond master interface * @NM_DEVICE_TYPE_VLAN: an 802.1Q VLAN interface * @NM_DEVICE_TYPE_ADSL: ADSL modem + * @NM_DEVICE_TYPE_BRIDGE: a bridge master interface * * #NMDeviceType values indicate the type of hardware represented by * an #NMDevice. @@ -157,6 +158,7 @@ typedef enum { * @NM_WIFI_DEVICE_CAP_WPA: device supports WPA1 authentication * @NM_WIFI_DEVICE_CAP_RSN: device supports WPA2/RSN authentication * @NM_WIFI_DEVICE_CAP_AP: device supports Access Point mode + * @NM_WIFI_DEVICE_CAP_ADHOC: device supports Ad-Hoc mode * * 802.11 specific device encryption and authentication capabilities. **/ @@ -168,7 +170,8 @@ typedef enum { NM_WIFI_DEVICE_CAP_CIPHER_CCMP = 0x00000008, NM_WIFI_DEVICE_CAP_WPA = 0x00000010, NM_WIFI_DEVICE_CAP_RSN = 0x00000020, - NM_WIFI_DEVICE_CAP_AP = 0x00000040 + NM_WIFI_DEVICE_CAP_AP = 0x00000040, + NM_WIFI_DEVICE_CAP_ADHOC = 0x00000080 } NMDeviceWifiCapabilities; diff --git a/include/nm-version.h b/include/nm-version.h index 0e5bfbcbf..d03b02993 100644 --- a/include/nm-version.h +++ b/include/nm-version.h @@ -43,7 +43,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (7) +#define NM_MICRO_VERSION (8) /** * NM_CHECK_VERSION: diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml index f8eddd703..dcfa20ccb 100644 --- a/introspection/nm-device-wifi.xml +++ b/introspection/nm-device-wifi.xml @@ -122,6 +122,9 @@ The device supports Access Point mode. + + The device supports Ad-Hoc mode. + diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 372f0311e..b8eee4720 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -148,7 +148,7 @@ libnm_glib_la_LIBADD = \ SYMBOL_VIS_FILE=$(srcdir)/libnm-glib.ver libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ - -version-info "8:0:4" + -version-info "9:0:5" noinst_PROGRAMS = libnm-glib-test @@ -182,7 +182,7 @@ libnm_glib_test_la_CFLAGS = \ -DLIBNM_GLIB_TEST libnm_glib_test_la_SOURCES = \ - $(libnminclude_HEADERS) \ + $(li0bnminclude_HEADERS) \ $(libnm_glib_la_SOURCES) libnm_glib_test_la_LIBADD = \ diff --git a/libnm-glib/Makefile.in b/libnm-glib/Makefile.in index 12e33dda4..df3e843bf 100644 --- a/libnm-glib/Makefile.in +++ b/libnm-glib/Makefile.in @@ -126,8 +126,7 @@ am__v_lt_0 = --silent libnm_glib_test_la_DEPENDENCIES = \ $(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am__objects_1 = -am__objects_2 = libnm_glib_test_la-nm-object.lo \ +am__objects_1 = libnm_glib_test_la-nm-object.lo \ libnm_glib_test_la-nm-client.lo \ libnm_glib_test_la-nm-device.lo \ libnm_glib_test_la-nm-device-ethernet.lo \ @@ -156,8 +155,9 @@ am__objects_2 = libnm_glib_test_la-nm-object.lo \ libnm_glib_test_la-nm-wimax-nsp.lo \ libnm_glib_test_la-nm-glib-enum-types.lo \ libnm_glib_test_la-nm-glib-marshal.lo -am__objects_3 = $(am__objects_2) $(am__objects_1) -am_libnm_glib_test_la_OBJECTS = $(am__objects_1) $(am__objects_3) +am__objects_2 = +am__objects_3 = $(am__objects_1) $(am__objects_2) +am_libnm_glib_test_la_OBJECTS = $(am__objects_3) libnm_glib_test_la_OBJECTS = $(am_libnm_glib_test_la_OBJECTS) libnm_glib_test_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -202,7 +202,7 @@ am__objects_4 = libnm_glib_la-nm-object.lo libnm_glib_la-nm-client.lo \ libnm_glib_la-nm-device-wimax.lo libnm_glib_la-nm-wimax-nsp.lo \ libnm_glib_la-nm-glib-enum-types.lo \ libnm_glib_la-nm-glib-marshal.lo -am_libnm_glib_la_OBJECTS = $(am__objects_4) $(am__objects_1) +am_libnm_glib_la_OBJECTS = $(am__objects_4) $(am__objects_2) libnm_glib_la_OBJECTS = $(am_libnm_glib_la_OBJECTS) libnm_glib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libnm_glib_la_CFLAGS) \ @@ -675,7 +675,7 @@ libnm_glib_la_LIBADD = \ SYMBOL_VIS_FILE = $(srcdir)/libnm-glib.ver libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ - -version-info "8:0:4" + -version-info "9:0:5" libnm_glib_test_SOURCES = libnm-glib-test.c libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) @@ -703,7 +703,7 @@ libnm_glib_test_la_CFLAGS = \ -DLIBNM_GLIB_TEST libnm_glib_test_la_SOURCES = \ - $(libnminclude_HEADERS) \ + $(li0bnminclude_HEADERS) \ $(libnm_glib_la_SOURCES) libnm_glib_test_la_LIBADD = \ diff --git a/libnm-glib/libnm-glib.ver b/libnm-glib/libnm-glib.ver index 9fb956afc..571bc7d25 100644 --- a/libnm-glib/libnm-glib.ver +++ b/libnm-glib/libnm-glib.ver @@ -100,6 +100,7 @@ global: nm_device_filter_connections; nm_device_get_active_connection; nm_device_get_autoconnect; + nm_device_get_available_connections; nm_device_get_capabilities; nm_device_get_device_type; nm_device_get_dhcp4_config; diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index 62e5f835a..3ffa7b9ee 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -1056,6 +1056,8 @@ nm_client_get_permission_result (NMClient *client, NMClientPermission permission * Gets NetworkManager current logging level and domains. * * Returns: %TRUE on success, %FALSE otherwise + * + * Since: 0.9.8 **/ gboolean nm_client_get_logging (NMClient *client, char **level, char **domains, GError **error) @@ -1095,6 +1097,8 @@ nm_client_get_logging (NMClient *client, char **level, char **domains, GError ** * Sets NetworkManager logging level and/or domains. * * Returns: %TRUE on success, %FALSE otherwise + * + * Since: 0.9.8 **/ gboolean nm_client_set_logging (NMClient *client, const char *level, const char *domains, GError **error) diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c index 1d163c5e4..6261db912 100644 --- a/libnm-glib/nm-device-bond.c +++ b/libnm-glib/nm-device-bond.c @@ -337,6 +337,8 @@ nm_device_bond_class_init (NMDeviceBondClass *eth_class) * NMDeviceBond:slaves: * * The devices (#NMDevice) slaved to the bond device. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_SLAVES, diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c index 34e02d6d9..9327a9319 100644 --- a/libnm-glib/nm-device-bridge.c +++ b/libnm-glib/nm-device-bridge.c @@ -66,6 +66,8 @@ enum { * Registers an error quark for #NMDeviceBridge if necessary. * * Returns: the error quark used for #NMDeviceBridge errors. + * + * Since: 0.9.8 **/ GQuark nm_device_bridge_error_quark (void) @@ -85,6 +87,8 @@ nm_device_bridge_error_quark (void) * Creates a new #NMDeviceBridge. * * Returns: (transfer full): a new device + * + * Since: 0.9.8 **/ GObject * nm_device_bridge_new (DBusGConnection *connection, const char *path) @@ -110,6 +114,8 @@ nm_device_bridge_new (DBusGConnection *connection, const char *path) * * Returns: the hardware address. This is the internal string used by the * device, and must not be modified. + * + * Since: 0.9.8 **/ const char * nm_device_bridge_get_hw_address (NMDeviceBridge *device) @@ -127,6 +133,8 @@ nm_device_bridge_get_hw_address (NMDeviceBridge *device) * Whether the device has carrier. * * Returns: %TRUE if the device has carrier + * + * Since: 0.9.8 **/ gboolean nm_device_bridge_get_carrier (NMDeviceBridge *device) @@ -146,6 +154,8 @@ nm_device_bridge_get_carrier (NMDeviceBridge *device) * Returns: (element-type NMClient.Device): the #GPtrArray containing * #NMDevices that are slaves of @device. This is the internal * copy used by the device, and must not be modified. + * + * Since: 0.9.8 **/ const GPtrArray * nm_device_bridge_get_slaves (NMDeviceBridge *device) @@ -309,6 +319,8 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class) * NMDeviceBridge:hw-address: * * The hardware (MAC) address of the device. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_HW_ADDRESS, @@ -322,6 +334,8 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class) * NMDeviceBridge:carrier: * * Whether the device has carrier. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_CARRIER, @@ -335,6 +349,8 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class) * NMDeviceBridge:slaves: * * The devices (#NMDevice) slaved to the bridge device. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_SLAVES, diff --git a/libnm-glib/nm-device-bridge.h b/libnm-glib/nm-device-bridge.h index 3462063d2..67e08df71 100644 --- a/libnm-glib/nm-device-bridge.h +++ b/libnm-glib/nm-device-bridge.h @@ -40,6 +40,8 @@ G_BEGIN_DECLS * @NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION: the connection was not of bridge type * @NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION: the bridge connection was invalid * @NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH: the interfaces of the connection and the device mismatched + * + * Since: 0.9.8 */ typedef enum { NM_DEVICE_BRIDGE_ERROR_UNKNOWN = 0, /*< nick=UnknownError >*/ diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c index e61554dfc..47594a50d 100644 --- a/libnm-glib/nm-device-wifi.c +++ b/libnm-glib/nm-device-wifi.c @@ -356,6 +356,7 @@ request_scan_cb (DBusGProxy *proxy, * instructs NM to perform scanning. Use nm_device_wifi_get_access_points() * to get available access points. * + * Since: 0.9.8 **/ void nm_device_wifi_request_scan_simple (NMDeviceWifi *device, diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 22e2844cf..5f492e2ca 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -41,6 +41,8 @@ #include "nm-device-private.h" #include "nm-object-private.h" #include "nm-object-cache.h" +#include "nm-remote-connection.h" +#include "nm-types.h" #include "nm-glib-marshal.h" #include "nm-dbus-glib-types.h" #include "nm-glib-compat.h" @@ -84,6 +86,7 @@ typedef struct { NMDeviceStateReason reason; NMActiveConnection *active_connection; + GPtrArray *available_connections; GUdevClient *client; char *product; @@ -112,6 +115,7 @@ enum { PROP_IP_INTERFACE, PROP_DEVICE_TYPE, PROP_ACTIVE_CONNECTION, + PROP_AVAILABLE_CONNECTIONS, LAST_PROP }; @@ -173,6 +177,7 @@ register_properties (NMDevice *device) { NM_DEVICE_STATE, &priv->state }, { NM_DEVICE_STATE_REASON, &priv->state, demarshal_state_reason }, { NM_DEVICE_ACTIVE_CONNECTION, &priv->active_connection, NULL, NM_TYPE_ACTIVE_CONNECTION }, + { NM_DEVICE_AVAILABLE_CONNECTIONS, &priv->available_connections, NULL, NM_TYPE_REMOTE_CONNECTION }, /* Properties that exist in D-Bus but that we don't track */ { "ip4-address", NULL }, @@ -332,6 +337,15 @@ dispose (GObject *object) g_clear_object (&priv->client); g_clear_object (&priv->active_connection); + if (priv->available_connections) { + int i; + + for (i = 0; i < priv->available_connections->len; i++) + g_object_unref (priv->available_connections->pdata[i]); + g_ptr_array_free (priv->available_connections, TRUE); + priv->available_connections = NULL; + } + G_OBJECT_CLASS (nm_device_parent_class)->dispose (object); } @@ -423,6 +437,9 @@ get_property (GObject *object, case PROP_ACTIVE_CONNECTION: g_value_set_object (value, nm_device_get_active_connection (device)); break; + case PROP_AVAILABLE_CONNECTIONS: + g_value_set_boxed (value, nm_device_get_available_connections (device)); + break; case PROP_PRODUCT: g_value_set_string (value, nm_device_get_product (device)); break; @@ -717,6 +734,21 @@ nm_device_class_init (NMDeviceClass *device_class) NM_TYPE_ACTIVE_CONNECTION, G_PARAM_READABLE)); + /** + * NMDevice:available-connections: + * + * The available connections (#NMRemoteConnection) of the device + * + * Since: 0.9.8 + **/ + g_object_class_install_property + (object_class, PROP_AVAILABLE_CONNECTIONS, + g_param_spec_boxed (NM_DEVICE_AVAILABLE_CONNECTIONS, + "AvailableConnections", + "Available Connections", + NM_TYPE_OBJECT_ARRAY, + G_PARAM_READABLE)); + /** * NMDevice:vendor: * @@ -1256,6 +1288,28 @@ nm_device_get_active_connection (NMDevice *device) return NM_DEVICE_GET_PRIVATE (device)->active_connection; } +/** + * nm_device_get_available_connections: + * @device: a #NMDevice + * + * Gets the #NMRemoteConnections currently known to the daemon that could + * be activated on @device. + * + * Returns: (element-type NMClient.RemoteConnection): the #GPtrArray + * containing #NMRemoteConnections. This is the internal copy used by + * the connection, and must not be modified. + * + * Since: 0.9.8 + **/ +const GPtrArray * +nm_device_get_available_connections (NMDevice *device) +{ + g_return_val_if_fail (NM_IS_DEVICE (device), NULL); + + _nm_object_ensure_inited (NM_OBJECT (device)); + return handle_ptr_array_return (NM_DEVICE_GET_PRIVATE (device)->available_connections); +} + /* From hostap, Copyright (c) 2002-2005, Jouni Malinen */ static int hex2num (char c) diff --git a/libnm-glib/nm-device.h b/libnm-glib/nm-device.h index 1726862fd..c49675bcc 100644 --- a/libnm-glib/nm-device.h +++ b/libnm-glib/nm-device.h @@ -63,6 +63,7 @@ G_BEGIN_DECLS #define NM_DEVICE_STATE "state" #define NM_DEVICE_STATE_REASON "state-reason" #define NM_DEVICE_ACTIVE_CONNECTION "active-connection" +#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections" #define NM_DEVICE_VENDOR "vendor" #define NM_DEVICE_PRODUCT "product" @@ -115,6 +116,7 @@ NMDHCP6Config * nm_device_get_dhcp6_config (NMDevice *device); NMDeviceState nm_device_get_state (NMDevice *device); NMDeviceState nm_device_get_state_reason (NMDevice *device, NMDeviceStateReason *reason); NMActiveConnection * nm_device_get_active_connection(NMDevice *device); +const GPtrArray * nm_device_get_available_connections(NMDevice *device); const char * nm_device_get_product (NMDevice *device); const char * nm_device_get_vendor (NMDevice *device); diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index 64df586e7..ebb6a7b64 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -33,6 +33,8 @@ #include "nm-glib-compat.h" #define NM_REMOTE_CONNECTION_BUS "bus" +#define NM_REMOTE_CONNECTION_DBUS_CONNECTION "dbus-connection" +#define NM_REMOTE_CONNECTION_DBUS_PATH "dbus-path" static void nm_remote_connection_initable_iface_init (GInitableIface *iface); static void nm_remote_connection_async_initable_iface_init (GAsyncInitableIface *iface); @@ -45,6 +47,8 @@ G_DEFINE_TYPE_WITH_CODE (NMRemoteConnection, nm_remote_connection, NM_TYPE_CONNE enum { PROP_0, PROP_BUS, + PROP_DBUS_CONNECTION, + PROP_DBUS_PATH, LAST_PROP }; @@ -385,9 +389,8 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) GHashTable *settings; if (!dbus_g_proxy_call (priv->proxy, "GetSettings", error, - G_TYPE_STRING, NM_DBUS_IFACE_SETTINGS, G_TYPE_INVALID, - DBUS_TYPE_G_MAP_OF_VARIANT, &settings, + DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, &settings, G_TYPE_INVALID)) return FALSE; @@ -464,6 +467,43 @@ nm_remote_connection_init (NMRemoteConnection *self) { } +static GObject * +constructor (GType type, guint n_construct_properties, + GObjectConstructParam *construct_properties) +{ + static GParamSpec *nm_connection_path = NULL; + static GParamSpec *nm_remote_connection_dbus_path = NULL; + int i, path_index = -1, dbus_path_index = -1; + + if (!nm_connection_path) { + nm_connection_path = + g_object_class_find_property (g_type_class_peek (NM_TYPE_CONNECTION), + NM_CONNECTION_PATH); + nm_remote_connection_dbus_path = + g_object_class_find_property (g_type_class_peek (NM_TYPE_REMOTE_CONNECTION), + NM_REMOTE_CONNECTION_DBUS_PATH); + } + + /* Find the two properties */ + for (i = 0; i < n_construct_properties; i++) { + if (construct_properties[i].pspec == nm_connection_path) + path_index = i; + else if (construct_properties[i].pspec == nm_remote_connection_dbus_path) + dbus_path_index = i; + } + g_assert (path_index != -1 && dbus_path_index != -1); + + /* If NMRemoteConnection:dbus-path is set, and NMConnection:path + * is not, then copy the value of the former to the latter. + */ + if (g_value_get_string (construct_properties[dbus_path_index].value) && + !g_value_get_string (construct_properties[path_index].value)) + construct_properties[path_index].value = construct_properties[dbus_path_index].value; + + return G_OBJECT_CLASS (nm_remote_connection_parent_class)-> + constructor (type, n_construct_properties, construct_properties); +} + static void set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) @@ -472,8 +512,13 @@ set_property (GObject *object, guint prop_id, switch (prop_id) { case PROP_BUS: + case PROP_DBUS_CONNECTION: /* Construct only */ - priv->bus = dbus_g_connection_ref ((DBusGConnection *) g_value_get_boxed (value)); + if (g_value_get_boxed (value)) + priv->bus = dbus_g_connection_ref ((DBusGConnection *) g_value_get_boxed (value)); + break; + case PROP_DBUS_PATH: + /* Don't need to do anything; see constructor(). */ break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -508,6 +553,7 @@ nm_remote_connection_class_init (NMRemoteConnectionClass *remote_class) g_type_class_add_private (object_class, sizeof (NMRemoteConnectionPrivate)); /* virtual methods */ + object_class->constructor = constructor; object_class->set_property = set_property; object_class->dispose = dispose; object_class->constructed = constructed; @@ -516,10 +562,26 @@ nm_remote_connection_class_init (NMRemoteConnectionClass *remote_class) g_object_class_install_property (object_class, PROP_BUS, g_param_spec_boxed (NM_REMOTE_CONNECTION_BUS, - "DBusGConnection", - "DBusGConnection", - DBUS_TYPE_G_CONNECTION, - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + "DBusGConnection", + "DBusGConnection", + DBUS_TYPE_G_CONNECTION, + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + + /* These are needed so _nm_object_create() can create NMRemoteConnections */ + g_object_class_install_property + (object_class, PROP_DBUS_CONNECTION, + g_param_spec_boxed (NM_REMOTE_CONNECTION_DBUS_CONNECTION, + "DBusGConnection", + "DBusGConnection", + DBUS_TYPE_G_CONNECTION, + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property + (object_class, PROP_DBUS_PATH, + g_param_spec_string (NM_REMOTE_CONNECTION_DBUS_PATH, + "Object Path", + "DBus Object Path", + NULL, + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); /* Signals */ /** diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c index ce1048be7..baa4b3e16 100644 --- a/libnm-glib/nm-wimax-nsp.c +++ b/libnm-glib/nm-wimax-nsp.c @@ -132,7 +132,7 @@ nm_wimax_nsp_get_network_type (NMWimaxNsp *nsp) } /** - * nm_wimax_nsp_filter_connections: + * nm_wimax_nsp_connection_valid: * @nsp: an #NMWimaxNsp to validate @connection against * @connection: an #NMConnection to validate against @nsp * diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index bd1b3fc0b..2222ec2b2 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -90,7 +90,7 @@ libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) SYMBOL_VIS_FILE=$(srcdir)/libnm-util.ver libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ - -version-info "5:0:3" + -version-info "6:0:4" if WITH_GNUTLS libnm_util_la_SOURCES += crypto_gnutls.c diff --git a/libnm-util/Makefile.in b/libnm-util/Makefile.in index d74cba158..3652377a3 100644 --- a/libnm-util/Makefile.in +++ b/libnm-util/Makefile.in @@ -581,7 +581,7 @@ libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) \ $(am__append_3) $(am__append_6) SYMBOL_VIS_FILE = $(srcdir)/libnm-util.ver libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ - -version-info "5:0:3" + -version-info "6:0:4" libnm_util_includedir = $(includedir)/NetworkManager diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c index d7f3dd59d..c1abf9c80 100644 --- a/libnm-util/nm-setting-bridge-port.c +++ b/libnm-util/nm-setting-bridge-port.c @@ -38,6 +38,8 @@ * * The #NMSettingBridgePort object is a #NMSetting subclass that describes * optional properties that apply to bridge ports. + * + * Since: 0.9.8 **/ /** @@ -46,6 +48,8 @@ * Registers an error quark for #NMSettingBridgePort if necessary. * * Returns: the error quark used for #NMSettingBridgePort errors. + * + * Since: 0.9.8 **/ GQuark nm_setting_bridge_port_error_quark (void) @@ -87,6 +91,8 @@ enum { * @setting: the #NMSettingBridgePort * * Returns: the #NMSettingBridgePort:priority property of the setting + * + * Since: 0.9.8 **/ guint16 nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting) @@ -101,6 +107,8 @@ nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting) * @setting: the #NMSettingBridgePort * * Returns: the #NMSettingBridgePort:path-cost property of the setting + * + * Since: 0.9.8 **/ guint16 nm_setting_bridge_port_get_path_cost (NMSettingBridgePort *setting) @@ -115,6 +123,8 @@ nm_setting_bridge_port_get_path_cost (NMSettingBridgePort *setting) * @setting: the #NMSettingBridgePort * * Returns: the #NMSettingBridgePort:hairpin-mode property of the setting + * + * Since: 0.9.8 **/ gboolean nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *setting) @@ -164,6 +174,8 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) * Creates a new #NMSettingBridgePort object with default values. * * Returns: (transfer full): the new empty #NMSettingBridgePort object + * + * Since: 0.9.8 **/ NMSetting * nm_setting_bridge_port_new (void) @@ -239,6 +251,8 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) * NMSettingBridgePort:priority: * * The Spanning Tree Protocol (STP) priority of this bridge port. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_PRIORITY, @@ -252,6 +266,8 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) * NMSettingBridgePort:path-cost: * * The Spanning Tree Protocol (STP) port cost for destinations via this port. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_PATH_COST, @@ -267,6 +283,8 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) * * Enables or disabled 'hairpin mode' for the port, which allows frames to * be sent back out through the port the frame was received on. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_HAIRPIN_MODE, diff --git a/libnm-util/nm-setting-bridge-port.h b/libnm-util/nm-setting-bridge-port.h index 5123f0a71..7848b75ff 100644 --- a/libnm-util/nm-setting-bridge-port.h +++ b/libnm-util/nm-setting-bridge-port.h @@ -43,6 +43,8 @@ G_BEGIN_DECLS * @NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY: the property was invalid * @NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY: the property was missing and * is required + * + * Since: 0.9.8 */ typedef enum { NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN = 0, /*< nick=UnknownError >*/ diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c index 3363ffd47..c6b3f2995 100644 --- a/libnm-util/nm-setting-bridge.c +++ b/libnm-util/nm-setting-bridge.c @@ -40,6 +40,8 @@ * * The #NMSettingBridge object is a #NMSetting subclass that describes properties * necessary for bridging connections. + * + * Since: 0.9.8 **/ /** @@ -48,6 +50,8 @@ * Registers an error quark for #NMSettingBridge if necessary. * * Returns: the error quark used for #NMSettingBridge errors. + * + * Since: 0.9.8 **/ GQuark nm_setting_bridge_error_quark (void) @@ -97,6 +101,8 @@ enum { * Creates a new #NMSettingBridge object with default values. * * Returns: (transfer full): the new empty #NMSettingBridge object + * + * Since: 0.9.8 **/ NMSetting * nm_setting_bridge_new (void) @@ -109,6 +115,8 @@ nm_setting_bridge_new (void) * @setting: the #NMSettingBridge * * Returns: the #NMSettingBridge:interface-name property of the setting + * + * Since: 0.9.8 **/ const char * nm_setting_bridge_get_interface_name (NMSettingBridge *setting) @@ -123,6 +131,8 @@ nm_setting_bridge_get_interface_name (NMSettingBridge *setting) * @setting: the #NMSettingBridge * * Returns: the #NMSettingBridge:stp property of the setting + * + * Since: 0.9.8 **/ gboolean nm_setting_bridge_get_stp (NMSettingBridge *setting) @@ -137,6 +147,8 @@ nm_setting_bridge_get_stp (NMSettingBridge *setting) * @setting: the #NMSettingBridge * * Returns: the #NMSettingBridge:priority property of the setting + * + * Since: 0.9.8 **/ guint16 nm_setting_bridge_get_priority (NMSettingBridge *setting) @@ -151,6 +163,8 @@ nm_setting_bridge_get_priority (NMSettingBridge *setting) * @setting: the #NMSettingBridge * * Returns: the #NMSettingBridge:forward-delay property of the setting + * + * Since: 0.9.8 **/ guint16 nm_setting_bridge_get_forward_delay (NMSettingBridge *setting) @@ -165,6 +179,8 @@ nm_setting_bridge_get_forward_delay (NMSettingBridge *setting) * @setting: the #NMSettingBridge * * Returns: the #NMSettingBridge:hello-time property of the setting + * + * Since: 0.9.8 **/ guint16 nm_setting_bridge_get_hello_time (NMSettingBridge *setting) @@ -179,6 +195,8 @@ nm_setting_bridge_get_hello_time (NMSettingBridge *setting) * @setting: the #NMSettingBridge * * Returns: the #NMSettingBridge:max-age property of the setting + * + * Since: 0.9.8 **/ guint16 nm_setting_bridge_get_max_age (NMSettingBridge *setting) @@ -193,6 +211,8 @@ nm_setting_bridge_get_max_age (NMSettingBridge *setting) * @setting: the #NMSettingBridge * * Returns: the #NMSettingBridge:ageing-time property of the setting + * + * Since: 0.9.8 **/ guint nm_setting_bridge_get_ageing_time (NMSettingBridge *setting) @@ -399,6 +419,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * NMSettingBridge:interface-name: * * The name of the virtual in-kernel briding network interface + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_INTERFACE_NAME, @@ -412,6 +434,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * NMSettingBridge:stp: * * Controls whether Spanning Tree Protocol (STP) is enabled for this bridge. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_STP, @@ -428,6 +452,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower * values are "better"; the lowest priority bridge will be elected the root * bridge. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_PRIORITY, @@ -444,6 +470,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * NMSettingBridge:forward-delay: * * The Spanning Tree Protocol (STP) forwarding delay, in seconds. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_FORWARD_DELAY, @@ -458,6 +486,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * NMSettingBridge:hello-time: * * The Spanning Tree Protocol (STP) hello time, in seconds. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_HELLO_TIME, @@ -472,6 +502,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * NMSettingBridge:max-age: * * The Spanning Tree Protocol (STP) maximum message age, in seconds. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_MAX_AGE, @@ -486,6 +518,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * NMSettingBridge:ageing-time: * * The ethernet MAC address aging time, in seconds. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_AGEING_TIME, diff --git a/libnm-util/nm-setting-bridge.h b/libnm-util/nm-setting-bridge.h index 7b9f92be9..b0b53fd5f 100644 --- a/libnm-util/nm-setting-bridge.h +++ b/libnm-util/nm-setting-bridge.h @@ -43,6 +43,8 @@ G_BEGIN_DECLS * @NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: the property was invalid * @NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: the property was missing and is * required + * + * Since: 0.9.8 */ typedef enum { NM_SETTING_BRIDGE_ERROR_UNKNOWN = 0, /*< nick=UnknownError >*/ diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index 1222f9763..d4de1253d 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -541,6 +541,8 @@ nm_setting_connection_is_slave_type (NMSettingConnection *setting, * @setting: the #NMSettingConnection * * Returns: the number of configured secondary connection UUIDs + * + * Since: 0.9.8 **/ guint32 nm_setting_connection_get_num_secondaries (NMSettingConnection *setting) @@ -556,6 +558,8 @@ nm_setting_connection_get_num_secondaries (NMSettingConnection *setting) * @idx: the zero-based index of the secondary connection UUID entry * * Returns: the secondary connection UUID at index @idx + * + * Since: 0.9.8 **/ const char * nm_setting_connection_get_secondary (NMSettingConnection *setting, guint32 idx) @@ -579,6 +583,8 @@ nm_setting_connection_get_secondary (NMSettingConnection *setting, guint32 idx) * * Returns: %TRUE if the secondary connection UUID was added; %FALSE if the UUID * was already present + * + * Since: 0.9.8 **/ gboolean nm_setting_connection_add_secondary (NMSettingConnection *setting, @@ -607,6 +613,8 @@ nm_setting_connection_add_secondary (NMSettingConnection *setting, * @idx: index number of the secondary connection UUID * * Removes the secondary coonnection UUID at index @idx. + * + * Since: 0.9.8 **/ void nm_setting_connection_remove_secondary (NMSettingConnection *setting, guint32 idx) @@ -1134,6 +1142,8 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * * List of connection UUIDs that should be activated when the base connection * itself is activated. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_SECONDARIES, diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 00e27aeab..818571344 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -137,6 +137,8 @@ nm_setting_ip6_config_get_method (NMSettingIP6Config *setting) * property. * * Returns: the configured hostname to send to the DHCP server + * + * Since: 0.9.8 **/ const char * nm_setting_ip6_config_get_dhcp_hostname (NMSettingIP6Config *setting) @@ -903,6 +905,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) * NMSettingIP6Config:dhcp-hostname: * * The specified name will be sent to the DHCP server when acquiring a lease. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_DHCP_HOSTNAME, diff --git a/libnm-util/nm-setting-wireless.h b/libnm-util/nm-setting-wireless.h index 6e9c4d68f..e75bb1518 100644 --- a/libnm-util/nm-setting-wireless.h +++ b/libnm-util/nm-setting-wireless.h @@ -90,6 +90,8 @@ GQuark nm_setting_wireless_error_quark (void); * * Indicates AP/master mode where the wireless device is started as an access * point/hotspot. + * + * Since: 0.9.8 */ #define NM_SETTING_WIRELESS_MODE_AP "ap" diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 9d85ec9f4..f955afbfc 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -1215,6 +1215,8 @@ device_supports_ap_ciphers (guint32 dev_caps, * * Returns: TRUE if the device capabilities are compatible with the desired * @type, FALSE if they are not. + * + * Since: 0.9.8 **/ gboolean nm_utils_ap_mode_security_valid (NMUtilsSecurityType type, @@ -1418,6 +1420,8 @@ nm_utils_security_valid (NMUtilsSecurityType type, * Checks if @key is a valid WEP key * * Returns: %TRUE if @key is a WEP key, %FALSE if not + * + * Since: 0.9.8 */ gboolean nm_utils_wep_key_valid (const char *key, NMWepKeyType wep_type) @@ -1459,6 +1463,8 @@ nm_utils_wep_key_valid (const char *key, NMWepKeyType wep_type) * Checks if @psk is a valid WPA PSK * * Returns: %TRUE if @psk is a WPA PSK, %FALSE if not + * + * Since: 0.9.8 */ gboolean nm_utils_wpa_psk_valid (const char *psk) @@ -2702,6 +2708,8 @@ nm_utils_hwaddr_ntoa (gconstpointer addr, int type) * function in net/core/dev.c. * * Returns: %TRUE if interface name is valid, otherwise %FALSE is returned. + * + * Since: 0.9.8 */ gboolean nm_utils_iface_valid_name (const char *name) @@ -2733,6 +2741,8 @@ nm_utils_iface_valid_name (const char *name) * Checks if @str is a UUID * * Returns: %TRUE if @str is a UUID, %FALSE if not + * + * Since: 0.9.8 */ gboolean nm_utils_is_uuid (const char *str) diff --git a/man/Makefile.am b/man/Makefile.am index a2d11ee00..d35120768 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,40 +1,26 @@ +man_MANS = +CLEANFILES = if ENABLE_DOC XSLTPROC = xsltproc --xinclude --nonet -GENERATED_FILES = nm-settings.xml nm-settings.5 - nm-settings.5: nm-settings.xml $(XSLTPROC) $(top_srcdir)/tools/manpages-docbook.xsl $(builddir)/nm-settings.xml +CLEANFILES += nm-settings.5 nm-settings.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la rm -f $(builddir)/$@ $(top_builddir)/tools/generate-settings-spec refentry $(builddir)/$@ +CLEANFILES += nm-settings.xml -else - -GENERATED_FILES = - -endif - -man_MANS = \ +man_MANS += \ NetworkManager.8 \ NetworkManager.conf.5 \ nm-system-settings.conf.5 \ nm-tool.1 \ nm-online.1 \ nmcli.1 \ - $(GENERATED_FILES) - -EXTRA_DIST = \ - $(man_MANS) \ - NetworkManager.8.in \ - NetworkManager.conf.5.in \ - nm-system-settings.conf.5.in \ - nm-tool.1.in \ - nm-online.1.in \ - nmcli.1.in - -CLEANFILES = $(man_MANS) $(GENERATED_FILES) + nm-settings.5 +endif diff --git a/man/Makefile.in b/man/Makefile.in index 982763f8b..3dacf44b2 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -50,6 +50,16 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_DOC_TRUE@am__append_1 = nm-settings.5 nm-settings.xml +@ENABLE_DOC_TRUE@am__append_2 = \ +@ENABLE_DOC_TRUE@ NetworkManager.8 \ +@ENABLE_DOC_TRUE@ NetworkManager.conf.5 \ +@ENABLE_DOC_TRUE@ nm-system-settings.conf.5 \ +@ENABLE_DOC_TRUE@ nm-tool.1 \ +@ENABLE_DOC_TRUE@ nm-online.1 \ +@ENABLE_DOC_TRUE@ nmcli.1 \ +@ENABLE_DOC_TRUE@ nm-settings.5 + subdir = man DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/NetworkManager.8.in \ @@ -118,10 +128,9 @@ am__uninstall_files_from_dir = { \ } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(manxdir)" + "$(DESTDIR)$(man8dir)" man5dir = $(mandir)/man5 man8dir = $(mandir)/man8 -manxdir = $(mandir)/manx NROFF = nroff MANS = $(man_MANS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -362,28 +371,9 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ +man_MANS = $(am__append_2) +CLEANFILES = $(am__append_1) @ENABLE_DOC_TRUE@XSLTPROC = xsltproc --xinclude --nonet -@ENABLE_DOC_FALSE@GENERATED_FILES = -@ENABLE_DOC_TRUE@GENERATED_FILES = nm-settings.xml nm-settings.5 -man_MANS = \ - NetworkManager.8 \ - NetworkManager.conf.5 \ - nm-system-settings.conf.5 \ - nm-tool.1 \ - nm-online.1 \ - nmcli.1 \ - $(GENERATED_FILES) - -EXTRA_DIST = \ - $(man_MANS) \ - NetworkManager.8.in \ - NetworkManager.conf.5.in \ - nm-system-settings.conf.5.in \ - nm-tool.1.in \ - nm-online.1.in \ - nmcli.1.in - -CLEANFILES = $(man_MANS) $(GENERATED_FILES) all: all-am .SUFFIXES: @@ -564,49 +554,6 @@ uninstall-man8: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) -install-manx: $(man_MANS) - @$(NORMAL_INSTALL) - @list1=''; \ - list2='$(man_MANS)'; \ - test -n "$(manxdir)" \ - && test -n "`echo $$list1$$list2`" \ - || exit 0; \ - echo " $(MKDIR_P) '$(DESTDIR)$(manxdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(manxdir)" || exit 1; \ - { for i in $$list1; do echo "$$i"; done; \ - if test -n "$$list2"; then \ - for i in $$list2; do echo "$$i"; done \ - | sed -n '/\.x[a-z]*$$/p'; \ - fi; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ - done | \ - sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^x][0-9a-z]*$$,x,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ - sed 'N;N;s,\n, ,g' | { \ - list=; while read file base inst; do \ - if test "$$base" = "$$inst"; then list="$$list $$file"; else \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(manxdir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(manxdir)/$$inst" || exit $$?; \ - fi; \ - done; \ - for i in $$list; do echo "$$i"; done | $(am__base_list) | \ - while read files; do \ - test -z "$$files" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(manxdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(manxdir)" || exit $$?; }; \ - done; } - -uninstall-manx: - @$(NORMAL_UNINSTALL) - @list=''; test -n "$(manxdir)" || exit 0; \ - files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.x[a-z]*$$/p'; \ - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^x][0-9a-z]*$$,x,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - dir='$(DESTDIR)$(manxdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -661,7 +608,7 @@ check-am: all-am check: check-am all-am: Makefile $(MANS) installdirs: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(manxdir)"; do \ + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -731,7 +678,7 @@ install-info: install-info-am install-info-am: -install-man: install-man1 install-man5 install-man8 install-manx +install-man: install-man1 install-man5 install-man8 install-pdf: install-pdf-am @@ -761,8 +708,7 @@ ps-am: uninstall-am: uninstall-man -uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 \ - uninstall-manx +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 .MAKE: install-am install-strip @@ -772,13 +718,12 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-man1 \ - install-man5 install-man8 install-manx install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + install-man5 install-man8 install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 \ - uninstall-manx + uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 @ENABLE_DOC_TRUE@nm-settings.5: nm-settings.xml diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 deleted file mode 100644 index 87b5d69f9..000000000 --- a/man/NetworkManager.8 +++ /dev/null @@ -1,155 +0,0 @@ -.\" NetworkManager(8) manual page -.\" -.\" Copyright (C) 2005 - 2013 Red Hat, Inc. -.\" Copyright (C) 2005 - 2009 Novell, Inc. -.\" Copyright (C) 2005 Robert Love -.\" -.TH NETWORKMANAGER "8" "17 January 2012" -.SH NAME -NetworkManager \- network management daemon -.SH SYNOPSIS -.B NetworkManager [\-\-version] | [\-\-help] -.PP -.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=] [\-\-state\-file=] [\-\-config=] [\-\-plugins=,plugin2>,...] [\-\-log\-level=] [\-\-log\-domains=,,...] [\-\-connectivity\-uri=] [\-\-connectivity\-interval=] [\-\-connectivity\-response=] -.SH DESCRIPTION -The \fINetworkManager\fP daemon attempts to make networking configuration and -operation as painless and automatic as possible by managing the primary network -connection and other network interfaces, like Ethernet, WiFi, and Mobile -Broadband devices. NetworkManager will connect any network device when a -connection for that device becomes available, unless that behavior is disabled. -Information about networking is exported via a D-Bus interface to any interested -application, providing a rich API with which to inspect and control network -settings and operation. -.P -NetworkManager will execute scripts in the /etc/NetworkManager/dispatcher.d -directory in alphabetical order in response to network events. Each script -should be: -.IP "(a)" 4 -a regular file -.IP "(b)" 4 -owned by root -.IP "(c)" 4 -not writable by group or other -.IP "(d)" 4 -not set-uid -.IP "(e)" 4 -and executable by the owner -.PP -Each script receives two arguments, the first being the interface name of the -device just activated, and second an action. -.PP -Actions: -.TP -.I "up" -The interface has been activated. The environment contains more information -about the interface; CONNECTION_UUID contains the UUID of the connection. Other -variables are IP4_ADDRESS_N where N is a number from 0 to (# IPv4 addresses \- 1), -in the format "address/prefix gateway". IP4_NUM_ADDRESSES contains the number -addresses the script may expect. IP4_NAMESERVERS contains a space-separated -list of the DNS servers, and IP4_DOMAINS contains a space-separated list of the -search domains. Routes use the format IP4_ROUTE_N where N is a number from 0 -to (# IPv4 routes \- 1), in the format "address/prefix next-hop metric", and -IP4_NUM_ROUTES contains the number of routes to expect. If the connection used -DHCP for address configuration, the received DHCP configuration is passed in the -environment using standard DHCP option names, prefixed with "DHCP4_", like -"DHCP4_HOST_NAME=foobar". -.TP -.I "down" -The interface has been deactivated. -.TP -.I "vpn\-up" -A VPN connection has been activated. The environment contains the connection -UUID in the variable CONNECTION_UUID. -.TP -.I "vpn\-down" -A VPN connection has been deactivated. -.TP -.I "hostname" -The system hostname has been updated. Use gethostname(2) to retrieve it. -.TP -.I "dhcp4\-change" -The DHCPv4 lease has changed (renewed, rebound, etc). -.TP -.I "dhcp6\-change" -The DHCPv6 lease has changed (renewed, rebound, etc). -.SH OPTIONS -The following options are supported: -.TP -.I "\-\-version" -Print the NetworkManager software version and exit. -.TP -.I "\-\-help" -Print NetworkManager's available options and exit. -.TP -.I "\-\-no\-daemon" -Do not daemonize. This is useful for debugging, and directs log output to the -controlling terminal in addition to syslog. -.TP -.I "\-\-pid\-file=" -Specify location of a PID file. The PID file is used for storing PID of the -running proccess and prevents running multiple instances. -.TP -.I "\-\-state\-file=" -Specify file for storing state of the NetworkManager persistently. If not specified, -the default value of '/lib/NetworkManager/NetworkManager.state' is -used; where is dependent on your distribution (usually it's /var). -.TP -.I "\-\-config=" -Specify configuration file to set up various settings for NetworkManager. If not -specified, the default value of '/NetworkManager/NetworkManager.conf' -is used with a fallback to the older 'nm\-system\-settings.conf' if located in -the same directory; where is dependent on your distribution (usually -it's /etc). See \fBNetworkManager.conf\fP(5) for more information on configuration -file. -.TP -.I "\-\-plugins=,, ... -List plugins used to manage system-wide connection settings. This list has -preference over plugins specified in the configuration file. Currently supported -plugins are: keyfile, ifcfg\-rh, ifcfg\-suse, ifupdown. -See \fBNetworkManager.conf\fP(5) for more information on the plugins. -.TP -.I "\-\-log\-level= -Sets how much information NetworkManager sends to the log destination (usually -syslog's "daemon" facility). By default, only informational, warning, and error -messages are logged. See \fBNetworkManager.conf\fP(5) for more information on -log levels and domains. -.TP -.I "\-\-log\-domains=,, ... -Sets which operations are logged to the log destination (usually syslog). By -default, most domains are logging-enabled. See \fBNetworkManager.conf\fP(5) for -more information on log levels and domains. -.TP -.I "\-\-connectivity\-uri= -Sets the URI of a web page that will be used for connectivity checking. By -default connectivity checking is disabled. See \fBNetworkManager.conf\fP(5) -[connectivity] section for more information on connectivity checking feature. -.TP -.I "\-\-connectivity\-interval= -Sets the interval (in seconds) in which connection checks for the URI are done. -0 means no checks. The default value is 300 seconds. See -\fBNetworkManager.conf\fP(5) [connectivity] section for more information on -connectivity checking feature. -.TP -.I "\-\-connectivity\-response= -If set, it controls what body content NetworkManager checks for when requesting -the URI for connectivity checking. If missing, defaults to "NetworkManager is online". -See \fBNetworkManager.conf\fP(5) [connectivity] section for more information on -connectivity checking feature. - -.SH DEBUGGING -The following environment variables are supported to help debugging. When used -in conjunction with the "\-\-no\-daemon" option (thus echoing PPP and DHCP helper -output to stdout) these can quickly help pinpoint the source of connection -issues. Also see the \-\-log\-level and \-\-log\-domains to enable debug logging inside -NetworkManager itself. -.TP -.I "NM_PPP_DEBUG" -When set to anything, causes NetworkManager to turn on PPP debugging in pppd, -which logs all PPP and PPTP frames and client/server exchanges. -.SH SEE ALSO -.BR nm\-tool (1), -.BR nm\-online (1), -.BR nmcli (1), -.BR NetworkManager.conf (5), -.BR nm\-settings (5). - diff --git a/man/NetworkManager.8.in b/man/NetworkManager.8.in index 87b5d69f9..d550079a9 100644 --- a/man/NetworkManager.8.in +++ b/man/NetworkManager.8.in @@ -151,5 +151,7 @@ which logs all PPP and PPTP frames and client/server exchanges. .BR nm\-online (1), .BR nmcli (1), .BR NetworkManager.conf (5), -.BR nm\-settings (5). +.BR nm\-settings (5), +.BR nm\-applet (1), +.BR nm\-connection\-editor (1). diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 deleted file mode 100644 index e595076a2..000000000 --- a/man/NetworkManager.conf.5 +++ /dev/null @@ -1,266 +0,0 @@ -.\" NetworkManager.conf(5) manual page -.\" -.\" Copyright (C) 2010 - 2013 Red Hat, Inc. -.\" -.TH "NetworkManager.conf" "5" "17 January 2013" "" -.SH NAME -NetworkManager.conf \- NetworkManager configuration file -.SH SYNOPSIS -/etc/NetworkManager/NetworkManager.conf -.br -or -.br -\fI\fP/NetworkManager/NetworkManager.conf -.br -where depends on your distribution or build. -.SH DESCRIPTION -.P -.I NetworkManager.conf -is a configuration file for NetworkManager. It is used to set up various -aspects of NetworkManager's behavior. The location of -the file may be changed through use of the "\-\-config=" argument for -\fBNetworkManager\fP (8). -.SH "FILE FORMAT" -.P -The configuration file format is so-called key file (sort of ini-style format). -It consists of sections (groups) of key-value pairs. Lines beginning with a '#' and blank -lines are considered comments. Sections are started by a header line containing -the section enclosed in '[' and ']', and ended implicitly by the start of -the next section or the end of the file. Each key-value pair must be contained -in a section. -.br -Minimal system settings configuration file looks like this: -.P -.nf -[main] -plugins=keyfile -.fi -.P -Description of sections and available keys follows: -.SS [main] -This section is the only mandatory section of the configuration file. -.TP -.B plugins=\fIplugin1\fP,\fIplugin2\fP, ... -List system settings plugin names separated by ','. These plugins are used to -read/write system-wide connection. When more plugins are specified, the -connections are read from all listed plugins. When writing connections, the -plugins will be asked to save the connection in the order listed here. If the -first plugin cannot write out that connection type, or can't write out any -connections, the next plugin is tried. If none of the plugins can save the -connection, the error is returned to the user. -.P -.RS -.B "Available plugins:" -.br -.TP -.I keyfile -plugin is the generic plugin that supports all the connection types and -capabilities that NetworkManager has. It writes files out in a .ini-style format in -/etc/NetworkManager/system-connections. For security, it will ignore files -that are readable or writeable by any user or group other than -.I root -since private keys and passphrases may be stored in plaintext inside the file. -.TP -.I ifcfg\-rh -plugin is used on the Fedora and Red Hat Enterprise Linux distributions -to read and write configuration from the standard /etc/sysconfig/network-scripts/ifcfg-* files. -It currently supports reading wired, WiFi, and 802.1x connections, but does not yet support reading -or writing mobile broadband, PPPoE, or VPN connections. To allow reading and writing of these -add \fIkeyfile\fP plugin to your configuration as well. -.TP -.I ifupdown -plugin is used on the Debian and Ubuntu distributions, and reads connections from -/etc/network/interfaces. Since it cannot write connections out (that support isn't planned), -it is usually paired with the \fIkeyfile\fP plugin to enable saving and editing of new connections. -The \fIifupdown\fP plugin supports basic wired and WiFi connections, including WPA-PSK. -.TP -.I ifcfg\-suse -plugin is only provided for simple backward compatibility with SUSE and OpenSUSE configuration. -Most setups should be using the \fIkeyfile\fP plugin instead. The \fIifcfg\-suse\fP plugin supports -reading wired and WiFi connections, but does not support saving any connection types. -.RE -.TP -.B dhcp=\fIdhclient\fP | \fIdhcpcd\fP -This key sets up what DHCP client NetworkManager will use. Presently -\fIdhclient\fP and \fIdhcpcd\fP are supported. The client configured here should -be available on your system too. If this key is missing, available DHCP clients -are looked for in this order: dhclient, dhcpcd. -.TP -.B no-auto-default=\fI\fP,\fI\fP,... | \fI*\fP -Set devices for which NetworkManager shouldn't create default wired connection -(Auto eth0). NetworkManager creates a default wired connection for any wired -device that is managed and doesn't have a connection configured. List a device -in this option to inhibit creating the default connection for the device. -.br -When the default wired connection is deleted or saved to a new persistent connection -by a plugin, the MAC address of the wired device is automatically added to this list -to prevent creating the default connection for that device again. -Devices are specified by their MAC addresses, in lowercase. Multiple -entries are separated by commas. You can use the glob character \fI*\fP instead -of listing addresses to specify all devices. -.br -Examples: -.nf -no-auto-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee -no-auto-default=* -.fi -.TP -.B dns=\fIplugin1\fP,\fIplugin2\fP, ... -List DNS plugin names separated by ','. DNS plugins are used to provide local -caching nameserver functionality (which speeds up DNS queries) and to push -DNS data to applications that use it. -.P -.RS -.B "Available plugins:" -.br -.TP -.I dnsmasq -this plugin uses dnsmasq to provide local caching nameserver functionality. -.RE -.SS [keyfile] -This section contains keyfile-specific options and thus only has effect when using \fIkeyfile\fP plugin. -.TP -.B hostname=\fI\fP -Set a persistent hostname when using the \fIkeyfile\fP plugin. -.TP -.B unmanaged-devices=\fImac:\fP;\fImac:\fP;... -Set devices that should be ignored by NetworkManager when using the \fIkeyfile\fP -plugin. Devices are specified in the following format: "mac:", where - is MAC address of the device to be ignored, in hex-digits-and-colons notation. -Multiple entries are separated by a semicolon. No spaces are allowed in the value. -.br -Example: -.nf -unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4 -.fi -.SS [ifupdown] -This section contains ifupdown-specific options and thus only has effect when using \fIifupdown\fP plugin. -.TP -.B managed=\fIfalse\fP | \fItrue\fP -Controls whether interfaces listed in the 'interfaces' file are managed by NetworkManager. -If set to \fItrue\fP, then interfaces listed in /etc/network/interfaces are managed by NetworkManager. -If set to \fIfalse\fP, then any interface listed in /etc/network/interfaces will be -ignored by NetworkManager. Remember that NetworkManager controls the default route, -so because the interface is ignored, NetworkManager may assign the default route to -some other interface. -When the option is missing, \fIfalse\fP value is taken as default. -.SS [logging] -This section controls NetworkManager's logging. Any settings here are -overridden by the \-\-log\-level and \-\-log\-domains command-line options. -.TP -.B level=\fI\fP -One of [ERR, WARN, INFO, DEBUG]. The ERR level logs only critical errors. WARN -logs warnings that may reflect operation. INFO logs various informational -messages that are useful for tracking state and operations. DEBUG enables -verbose logging for debugging purposes. Subsequent levels also log all messages -from earlier levels; thus setting the log level to INFO also logs error and -warning messages. -.TP -.B domains=\fI,, ...\fP -The following log domains are available: [HW, RFKILL, ETHER, WIFI, BT, MB, DHCP4, -DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, -SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, -VLAN, BRIDGE]. -.br -In addition to them, these special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. -.PP -.RS -NONE = when given by itself, logging is disabled -.br -ALL = all log domains will be switched on -.br -DEFAULT = default log domains -.br -DHCP = a shortcut for "DHCP4, DHCP6" -.br -IP = a shortcut for "IP4, IP6" -.br -.PP -HW = Hardware related operations -.br -RFKILL = RFKill subsystem operations -.br -ETHER = Ethernet device operations -.br -WIFI = Wi-Fi device operations -.br -BT = Bluetooth -.br -MB = Mobile Broadband -.br -DHCP4 = DHCP for IPv4 -.br -DHCP6 = DHCP for IPv6 -.br -PPP = Point-to-point protocol operations -.br -WIFI_SCAN = Wi-Fi scanning operations -.br -IP4 = Domain for IPv4 logging -.br -IP6 = Domain for IPv6 logging -.br -AUTOIP4 = AutoIP (avahi) operations -.br -DNS = Domain Name System related operations -.br -VPN = Virtual Private Network connections and operaions -.br -SHARING = Connection sharing -.br -SUPPLICANT = WPA supplicant related operations -.br -AGENTS = Secret agents operations and communication -.br -SETTINGS = Settings/config service operations -.br -SUSPEND = Suspend/resume -.br -CORE = Core daemon operations -.br -DEVICE = Activation and general interface operations -.br -OLPC = OLPC Mesh device operations -.br -WIMAX = Wimax device operations -.br -INFINIBAND = InfiniBand device operations -.br -FIREWALL = FirewallD related operations -.br -ADSL = ADSL device operations -.br -BOND = Bonding device operations -.br -VLAN = VLAN device operations -.br -BRIDGE = Bridging device operations -.br -.SS [connectivity] -This section controls NetworkManager's optional connectivity checking -functionality. This allows NetworkManager to detect whether or not the system -can actually access the internet or whether it is behind a captive portal. -.TP -.B uri=\fI\fP -The URI of a web page to periodically request when connectivity is being checked. -This page should return the header "X-NetworkManager-Status" with a value of -"online". Alternatively, it's body content should be set to "NetworkManager -is online". The body content check can be controlled by the \fIresponse\fP -option. If this option is blank or missing, connectivity checking is disabled. -.TP -.B interval=\fI\fP -Controls how often connectivity is checked when a network connection exists. If -set to 0 connectivity checking is disabled. If missing, the default is 300 -seconds. -.TP -.B response=\fI\fP -If set controls what body content NetworkManager checks for when requesting the -URI for connectivity checking. If missing, defaults to "NetworkManager is online" -.SH "SEE ALSO" -.BR http://live.gnome.org/NetworkManager/SystemSettings -.sp -.BR NetworkManager (8), -.BR nmcli (1), -.BR nm\-tool (1), -.BR nm\-online (1), -.BR nm\-settings (5). diff --git a/man/nm-online.1 b/man/nm-online.1 deleted file mode 100644 index 4859ba903..000000000 --- a/man/nm-online.1 +++ /dev/null @@ -1,63 +0,0 @@ -.\" nm-online (1) manual page -.\" -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public Licence along -.\" with this manual; if not, write to the Free Software Foundation, Inc., -.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -.\" -.\" Copyright (C) 2010 Red Hat, Inc. -.\" -.TH NM-ONLINE "1" "6 August 2010" - -.SH NAME -nm-online \- ask NetworkManager whether the network is connected -.SH SYNOPSIS -.B nm-online -.RI " [ " OPTIONS " ] - -.SH DESCRIPTION -.B nm-online -is a utility to find out whether we are online. It is done by asking -NetworkManager about its status. When run, \fInm\-online\fP waits until -NetworkManager reports an active connection, or specified timeout expires. On -exit, the returned status code should be checked (see the return codes bellow). - -.SH OPTIONS -.TP -.B \-t, \-\-timeout -Time to wait for a connection, in seconds. If not specified, the default is 30 -seconds. -.TP -.B \-x, \-\-exit -Exit immediately if NetworkManager is not running or connecting. -.TP -.B \-q, \-\-quiet -Don't print anything. - -.SH EXIT STATUS - -.IP "0" 4 -Success - already online or connection established within given timeout -.IP "1" 4 -Offline or not online within given timeout -.IP "2" 4 -Unspecified error - -.SH SEE ALSO -.BR nm\-tool (1), -.BR nmcli (1), -.BR NetworkManager(8). diff --git a/man/nm-settings.5 b/man/nm-settings.5 deleted file mode 100644 index 86e8cd522..000000000 --- a/man/nm-settings.5 +++ /dev/null @@ -1,2669 +0,0 @@ -'\" t -.\" Title: nm-settings -.\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 08 February 2013 -.\" Manual: Configuration -.\" Source: NetworkManager 0.9.7.997 -.\" Language: English -.\" -.TH "NM\-SETTINGS" "5" "08 February 2013" "NetworkManager 0\&.9\&.7\&.997" "Configuration" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -nm-settings \- Description of settings and parameters of NetworkManager connections\&. -.SH "DESCRIPTION" -.PP -NetworkManager is based on a concept of connections\&. These connections are then applied to a device to make an active network connection\&. Users can create as many connections as they see fit\&. The connections are handled by NetworkManager via -\fIsettings service\fR -and are exported on D\-Bus (\fI/org/freedesktop/NetworkManager/Settings/\fR -objects)\&. The conceptual objects can be described as follows: -.PP -Connection -.RS 4 -A specific, encapsulated, independent group of settings describing all the configuration required to connect to a specific network\&. It is referred to by a unique identifier called the UUID\&. A connection is tied to a one specific device type, but not necessarily a specific hardware device\&. It is composed of one or more -\fISettings\fR -objects\&. -.RE -.PP -Setting -.RS 4 -A group of related key/value pairs describing a specific piece of a -\fIConnection\fR\&. Settings keys and allowed values are described in the tables below\&. Developers can find the settings objects in the libnm\-util sources\&. Look for the -\fBclass_init\fR -functions near the bottoms of each setting source file\&. -.RE -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&1.\ \&802-1x setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -802\-1x -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -eap -T}:T{ -array of string -T}:T{ -[] -T}:T{ -The allowed EAP method to be used when authenticating to the network with 802\&.1x\&. Valid methods are: \*(Aqleap\*(Aq, \*(Aqmd5\*(Aq, \*(Aqtls\*(Aq, \*(Aqpeap\*(Aq, \*(Aqttls\*(Aq, and \*(Aqfast\*(Aq\&. Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations\&. -T} -T{ -identity -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Identity string for EAP authentication methods\&. Often the user\*(Aqs user or login name\&. -T} -T{ -anonymous\-identity -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Anonymous identity string for EAP authentication methods\&. Used as the unencrypted identity with EAP types that support different tunneled identity like EAP\-TTLS\&. -T} -T{ -pac\-file -T}:T{ -string -T}:T{ -\ \& -T}:T{ -UTF\-8 encoded file path containing PAC for EAP\-FAST\&. -T} -T{ -ca\-cert -T}:T{ -byte array -T}:T{ -[] -T}:T{ -Contains the CA certificate if used by the EAP method specified in the \*(Aqeap\*(Aq property\&. Certificate data is specified using a \*(Aqscheme\*(Aq; two are currently supported: blob and path\&. When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&. When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string \*(Aqfile://\*(Aq and ending with a terminating NULL byte\&. This property can be unset even if the EAP method supports CA certificates, but this allows man\-in\-the\-middle attacks and is NOT recommended\&. -T} -T{ -ca\-path -T}:T{ -string -T}:T{ -\ \& -T}:T{ -UTF\-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the \*(Aqca\-cert\*(Aq property\&. -T} -T{ -subject\-match -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Substring to be matched against the subject of the certificate presented by the authentication server\&. When unset, no verification of the authentication server certificate\*(Aqs subject is performed\&. -T} -T{ -altsubject\-matches -T}:T{ -array of string -T}:T{ -[] -T}:T{ -List of strings to be matched against the altSubjectName of the certificate presented by the authentication server\&. If the list is empty, no verification of the server certificate\*(Aqs altSubjectName is performed\&. -T} -T{ -client\-cert -T}:T{ -byte array -T}:T{ -[] -T}:T{ -Contains the client certificate if used by the EAP method specified in the \*(Aqeap\*(Aq property\&. Certificate data is specified using a \*(Aqscheme\*(Aq; two are currently supported: blob and path\&. When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&. When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string \*(Aqfile://\*(Aq and ending with a terminating NULL byte\&. -T} -T{ -phase1\-peapver -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Forces which PEAP version is used when PEAP is set as the EAP method in \*(Aqeap\*(Aq property\&. When unset, the version reported by the server will be used\&. Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version\&. To do so, this property may be set to \*(Aq0\*(Aq or \*(Aq1\*(Aq to force that specific PEAP version\&. -T} -T{ -phase1\-peaplabel -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Forces use of the new PEAP label during key derivation\&. Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1\&. Set to \*(Aq1\*(Aq to force use of the new PEAP label\&. See the wpa_supplicant documentation for more details\&. -T} -T{ -phase1\-fast\-provisioning -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Enables or disables in\-line provisioning of EAP\-FAST credentials when FAST is specified as the EAP method in the #NMSetting8021x:eap property\&. Allowed values are \*(Aq0\*(Aq (disabled), \*(Aq1\*(Aq (allow unauthenticated provisioning), \*(Aq2\*(Aq (allow authenticated provisioning), and \*(Aq3\*(Aq (allow both authenticated and unauthenticated provisioning)\&. See the wpa_supplicant documentation for more details\&. -T} -T{ -phase2\-auth -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Specifies the allowed \*(Aqphase 2\*(Aq inner non\-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the \*(Aqeap\*(Aq property\&. Recognized non\-EAP phase2 methods are \*(Aqpap\*(Aq, \*(Aqchap\*(Aq, \*(Aqmschap\*(Aq, \*(Aqmschapv2\*(Aq, \*(Aqgtc\*(Aq, \*(Aqotp\*(Aq, \*(Aqmd5\*(Aq, and \*(Aqtls\*(Aq\&. Each \*(Aqphase 2\*(Aq inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details\&. -T} -T{ -phase2\-autheap -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Specifies the allowed \*(Aqphase 2\*(Aq inner EAP\-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the \*(Aqeap\*(Aq property\&. Recognized EAP\-based \*(Aqphase 2\*(Aq methods are \*(Aqmd5\*(Aq, \*(Aqmschapv2\*(Aq, \*(Aqotp\*(Aq, \*(Aqgtc\*(Aq, and \*(Aqtls\*(Aq\&. Each \*(Aqphase 2\*(Aq inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details\&. -T} -T{ -phase2\-ca\-cert -T}:T{ -byte array -T}:T{ -[] -T}:T{ -Contains the \*(Aqphase 2\*(Aq CA certificate if used by the EAP method specified in the \*(Aqphase2\-auth\*(Aq or \*(Aqphase2\-autheap\*(Aq properties\&. Certificate data is specified using a \*(Aqscheme\*(Aq; two are currentlysupported: blob and path\&. When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&. When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string \*(Aqfile://\*(Aq and ending with a terminating NULL byte\&. This property can be unset even if the EAP method supports CA certificates, but this allows man\-in\-the\-middle attacks and is NOT recommended\&. -T} -T{ -phase2\-ca\-path -T}:T{ -string -T}:T{ -\ \& -T}:T{ -UTF\-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the \*(Aqphase2\-ca\-cert\*(Aq property\&. -T} -T{ -phase2\-subject\-match -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Substring to be matched against the subject of the certificate presented by the authentication server during the inner \*(Aqphase2\*(Aq authentication\&. When unset, no verification of the authentication server certificate\*(Aqs subject is performed\&. -T} -T{ -phase2\-altsubject\-matches -T}:T{ -array of string -T}:T{ -[] -T}:T{ -List of strings to be matched against List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner \*(Aqphase 2\*(Aq authentication\&. If the list is empty, no verification of the server certificate\*(Aqs altSubjectName is performed\&. -T} -T{ -phase2\-client\-cert -T}:T{ -byte array -T}:T{ -[] -T}:T{ -Contains the \*(Aqphase 2\*(Aq client certificate if used by the EAP method specified in the \*(Aqphase2\-auth\*(Aq or \*(Aqphase2\-autheap\*(Aq properties\&. Certificate data is specified using a \*(Aqscheme\*(Aq; two are currently supported: blob and path\&. When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&. When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string \*(Aqfile://\*(Aq and ending with a terminating NULL byte\&. -T} -T{ -password -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Password used for EAP authentication methods\&. -T} -T{ -password\-flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Flags indicating how to handle the 802\&.1x password\&. (see the section called \(lqSecret flag types:\(rq for flag values) -T} -T{ -password\-raw -T}:T{ -byte array -T}:T{ -[] -T}:T{ -Password used for EAP authentication methods as a byte array -T} -T{ -password\-raw\-flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Flags indicating how to handle the 802\&.1x password byte array\&. (see the section called \(lqSecret flag types:\(rq for flag values) -T} -T{ -private\-key -T}:T{ -byte array -T}:T{ -[] -T}:T{ -Contains the private key when the \*(Aqeap\*(Aq property is set to \*(Aqtls\*(Aq\&. Key data is specified using a \*(Aqscheme\*(Aq; two are currently supported: blob and path\&. When using the blob scheme and private keys, this property should be set to the key\*(Aqs encrypted PEM encoded data\&. When using private keys with the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string \*(Aqfile://\*(Aq and ending with a terminating NULL byte\&. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the \*(Aqprivate\-key\-password\*(Aq property must be set to password used to decrypt the PKCS#12 certificate and key\&. When using PKCS#12 files and the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string \*(Aqfile://\*(Aq and and ending with a terminating NULL byte, and as with the blob scheme the \*(Aqprivate\-key\-password\*(Aq property must be set to the password used to decode the PKCS#12 private key and certificate\&. -T} -T{ -private\-key\-password -T}:T{ -string -T}:T{ -\ \& -T}:T{ -The password used to decrypt the private key specified in the \*(Aqprivate\-key\*(Aq property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key\&. -T} -T{ -private\-key\-password\-flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Flags indicating how to handle the 802\&.1x private key password\&. (see the section called \(lqSecret flag types:\(rq for flag values) -T} -T{ -phase2\-private\-key -T}:T{ -byte array -T}:T{ -[] -T}:T{ -Contains the \*(Aqphase 2\*(Aq inner private key when the \*(Aqphase2\-auth\*(Aq or \*(Aqphase2\-autheap\*(Aq property is set to \*(Aqtls\*(Aq\&. Key data is specified using a \*(Aqscheme\*(Aq; two are currently supported: blob and path\&. When using the blob scheme and private keys, this property should be set to the key\*(Aqs encrypted PEM encoded data\&. When using private keys with the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string \*(Aqfile://\*(Aq and ending with a terminating NULL byte\&. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the \*(Aqphase2\-private\-key\-password\*(Aq property must be set to password used to decrypt the PKCS#12 certificate and key\&. When using PKCS#12 files and the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string \*(Aqfile://\*(Aq and and ending with a terminating NULL byte, and as with the blob scheme the \*(Aqphase2\-private\-key\-password\*(Aq property must be set to the password used to decode the PKCS#12 private key and certificate\&. -T} -T{ -phase2\-private\-key\-password -T}:T{ -string -T}:T{ -\ \& -T}:T{ -The password used to decrypt the \*(Aqphase 2\*(Aq private key specified in the \*(Aqprivate\-key\*(Aq property when the phase2 private key either uses the path scheme, or if the phase2 private key is a PKCS#12 format key\&. -T} -T{ -phase2\-private\-key\-password\-flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Flags indicating how to handle the 802\&.1x phase2 private key password\&. (see the section called \(lqSecret flag types:\(rq for flag values) -T} -T{ -system\-ca\-certs -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -When TRUE, overrides \*(Aqca\-path\*(Aq and \*(Aqphase2\-ca\-path\*(Aq properties using the system CA directory specified at configure time with the \-\-system\-ca\-path switch\&. The certificates in this directory are added to the verification chain in addition to any certificates specified by the \*(Aqca\-cert\*(Aq and \*(Aqphase2\-ca\-cert\*(Aq properties\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&2.\ \&adsl setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -adsl -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -username -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Username used to authenticate with the pppoa service\&. -T} -T{ -password -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Password used to authenticate with the pppoa service\&. -T} -T{ -password\-flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Flags indicating how to handle the ADSL password\&. (see the section called \(lqSecret flag types:\(rq for flag values) -T} -T{ -protocol -T}:T{ -string -T}:T{ -\ \& -T}:T{ -ADSL connection protocol\&. -T} -T{ -encapsulation -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Encapsulation of ADSL connection -T} -T{ -vpi -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -VPI of ADSL connection -T} -T{ -vci -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -VCI of ADSL connection -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&3.\ \&bluetooth setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -bluetooth -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -bdaddr -T}:T{ -byte array -T}:T{ -[] -T}:T{ -The Bluetooth address of the device -T} -T{ -type -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Either \*(Aqdun\*(Aq for Dial\-Up Networking connections or \*(Aqpanu\*(Aq for Personal Area Networking connections\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&4.\ \&bond setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -bond -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -interface\-name -T}:T{ -string -T}:T{ -\ \& -T}:T{ -The name of the virtual in\-kernel bonding network interface -T} -T{ -options -T}:T{ -dict of (string::string) -T}:T{ -[ ] -T}:T{ -Dictionary of key/value pairs of bonding options\&. Both keys and values must be strings\&. Option names must contain only alphanumeric characters (ie, [a\-zA\-Z0\-9])\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&5.\ \&bridge setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -bridge -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -interface\-name -T}:T{ -string -T}:T{ -\ \& -T}:T{ -The name of the virtual in\-kernel bridging network interface -T} -T{ -stp -T}:T{ -boolean -T}:T{ -TRUE -T}:T{ -Controls whether Spanning Tree Protocol (STP) is enabled for this bridge\&. -T} -T{ -priority -T}:T{ -uint32 -T}:T{ -128 -T}:T{ -Sets the Spanning Tree Protocol (STP) priority for this bridge\&. Lower values are \*(Aqbetter\*(Aq; the lowest priority bridge will be elected the root bridge\&. -T} -T{ -forward\-delay -T}:T{ -uint32 -T}:T{ -15 -T}:T{ -The Spanning Tree Protocol (STP) forwarding delay, in seconds\&. -T} -T{ -hello\-time -T}:T{ -uint32 -T}:T{ -2 -T}:T{ -The Spanning Tree Protocol (STP) hello time, in seconds\&. -T} -T{ -max\-age -T}:T{ -uint32 -T}:T{ -20 -T}:T{ -The Spanning Tree Protocol (STP) maximum message age, in seconds\&. -T} -T{ -ageing\-time -T}:T{ -uint32 -T}:T{ -300 -T}:T{ -The ethernet MAC address aging time, in seconds\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&6.\ \&bridge-port setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -bridge\-port -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -priority -T}:T{ -uint32 -T}:T{ -32 -T}:T{ -The Spanning Tree Protocol (STP) priority of this bridge port -T} -T{ -path\-cost -T}:T{ -uint32 -T}:T{ -100 -T}:T{ -The Spanning Tree Protocol (STP) port cost for destinations via this port\&. -T} -T{ -hairpin\-mode -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -Enables or disabled \*(Aqhairpin mode\*(Aq for the port, which allows frames to be sent back out through the port the frame was received on\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&7.\ \&cdma setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -cdma -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -number -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Number to dial when establishing a PPP data session with the CDMA\-based mobile broadband network\&. If not specified, the default number (#777) is used when required\&. -T} -T{ -username -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Username used to authenticate with the network, if required\&. Note that many providers do not require a username or accept any username\&. -T} -T{ -password -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Password used to authenticate with the network, if required\&. Note that many providers do not require a password or accept any password\&. -T} -T{ -password\-flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Flags indicating how to handle the CDMA password\&. (see the section called \(lqSecret flag types:\(rq for flag values) -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&8.\ \&connection setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -connection -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -id -T}:T{ -string -T}:T{ -\ \& -T}:T{ -User\-readable connection identifier/name\&. Must be one or more characters and may change over the lifetime of the connection if the user decides to rename it\&. -T} -T{ -uuid -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Universally unique connection identifier\&. Must be in the format \*(Aq2815492f\-7e56\-435e\-b2e9\-246bd7cdc664\*(Aq (ie, contains only hexadecimal characters and \*(Aq\-\*(Aq)\&. The UUID should be assigned when the connection is created and never changed as long as the connection still applies to the same network\&. For example, it should not be changed when the user changes the connection\*(Aqs \*(Aqid\*(Aq, but should be recreated when the WiFi SSID, mobile broadband network provider, or the connection type changes\&. -T} -T{ -type -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Base type of the connection\&. For hardware\-dependent connections, should contain the setting name of the hardware\-type specific setting (ie, \*(Aq802\-3\-ethernet\*(Aq or \*(Aq802\-11\-wireless\*(Aq or \*(Aqbluetooth\*(Aq, etc), and for non\-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \*(Aqvpn\*(Aq or \*(Aqbridge\*(Aq, etc)\&. -T} -T{ -permissions -T}:T{ -array of string -T}:T{ -[] -T}:T{ -An array of strings defining what access a given user has to this connection\&. If this is NULL or empty, all users are allowed to access this connection\&. Otherwise a user is allowed to access this connection if and only if they are in this array\&. Each entry is of the form "[type]:[id]:[reserved]", for example: "user:dcbw:blah" At this time only the \*(Aquser\*(Aq [type] is allowed\&. Any other values are ignored and reserved for future use\&. [id] is the username that this permission refers to, which may not contain the \*(Aq:\*(Aq character\&. Any [reserved] information (if present) must be ignored and is reserved for future use\&. All of [type], [id], and [reserved] must be valid UTF\-8\&. -T} -T{ -autoconnect -T}:T{ -boolean -T}:T{ -TRUE -T}:T{ -If TRUE, NetworkManager will activate this connection when its network resources are available\&. If FALSE, the connection must be manually activated by the user or some other mechanism\&. -T} -T{ -timestamp -T}:T{ -uint64 -T}:T{ -0 -T}:T{ -Timestamp (in seconds since the Unix Epoch) that the connection was last successfully activated\&. Settings services should update the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp\&. -T} -T{ -read\-only -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, the connection is read\-only and cannot be changed by the user or any other mechanism\&. This is normally set for system connections whose plugin cannot yet write updated connections back out\&. -T} -T{ -zone -T}:T{ -string -T}:T{ -\ \& -T}:T{ -The trust level of a the connection\&.Free form case\-insensitive string (for example "Home", "Work", "Public")\&. NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall\&. -T} -T{ -master -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Interface name of the master device or UUID of the master connection -T} -T{ -slave\-type -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Setting name describing the type of slave this connection is (ie, \*(Aqbond\*(Aq) or NULL if this connection is not a slave\&. -T} -T{ -secondaries -T}:T{ -array of string -T}:T{ -[] -T}:T{ -List of connection UUIDs that should be activated when the base connection itself is activated\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&9.\ \&gsm setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -gsm -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -number -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Number to dial when establishing a PPP data session with the GSM\-based mobile broadband network\&. Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically\&. -T} -T{ -username -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Username used to authenticate with the network, if required\&. Note that many providers do not require a username or accept any username\&. -T} -T{ -password -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Password used to authenticate with the network, if required\&. Note that many providers do not require a password or accept any password\&. -T} -T{ -password\-flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Flags indicating how to handle the GSM password\&. (see the section called \(lqSecret flag types:\(rq for flag values) -T} -T{ -apn -T}:T{ -string -T}:T{ -\ \& -T}:T{ -The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM\-based network\&. The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider\-specific walled\-garden, so it is important to use the correct APN for the user\*(Aqs mobile broadband plan\&. The APN may only be composed of the characters a\-z, 0\-9, \&., and \- per GSM 03\&.60 Section 14\&.9\&. -T} -T{ -network\-id -T}:T{ -string -T}:T{ -\ \& -T}:T{ -The Network ID (GSM LAI format, ie MCC\-MNC) to force specific network registration\&. If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network\&. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible\&. -T} -T{ -network\-type -T}:T{ -int32 -T}:T{ -\-1 -T}:T{ -Network preference to force the device to only use specific network technologies\&. The permitted values are: \-1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only\&. Note that not all devices allow network preference control\&. -T} -T{ -pin -T}:T{ -string -T}:T{ -\ \& -T}:T{ -If the SIM is locked with a PIN it must be unlocked before any other operations are requested\&. Specify the PIN here to allow operation of the device\&. -T} -T{ -pin\-flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Flags indicating how to handle the GSM SIM PIN\&. (see the section called \(lqSecret flag types:\(rq for flag values) -T} -T{ -allowed\-bands -T}:T{ -uint32 -T}:T{ -1 -T}:T{ -Bitfield of allowed frequency bands\&. Note that not all devices allow frequency band control\&. -T} -T{ -home\-only -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -When TRUE, only connections to the home network will be allowed\&. Connections to roaming networks will not be made\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&10.\ \&infiniband setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -infiniband -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -mac\-address -T}:T{ -byte array -T}:T{ -[] -T}:T{ -If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches\&. This property does not change the MAC address of the device (i\&.e\&. MAC spoofing)\&. -T} -T{ -mtu -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -If non\-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames\&. -T} -T{ -transport\-mode -T}:T{ -string -T}:T{ -\ \& -T}:T{ -The IPoIB transport mode\&. Either \*(Aqdatagram\*(Aq or \*(Aqconnected\*(Aq\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&11.\ \&ipv4 setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -ipv4 -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -method -T}:T{ -string -T}:T{ -\ \& -T}:T{ -IPv4 configuration method\&. If \*(Aqauto\*(Aq is specified then the appropriate automatic method (DHCP, PPP, etc) is used for the interface and most other properties can be left unset\&. If \*(Aqlink\-local\*(Aq is specified, then a link\-local address in the 169\&.254/16 range will be assigned to the interface\&. If \*(Aqmanual\*(Aq is specified, static IP addressing is used and at least one IP address must be given in the \*(Aqaddresses\*(Aq property\&. If \*(Aqshared\*(Aq is specified (indicating that this connection will provide network access to other computers) then the interface is assigned an address in the 10\&.42\&.x\&.1/24 range and a DHCP and forwarding DNS server are started, and the interface is NAT\-ed to the current default network connection\&. \*(Aqdisabled\*(Aq means IPv4 will not be used on this connection\&. This property must be set\&. -T} -T{ -dns -T}:T{ -array of uint32 -T}:T{ -[] -T}:T{ -List of DNS servers (network byte order)\&. For the \*(Aqauto\*(Aq method, these DNS servers are appended to those (if any) returned by automatic configuration\&. DNS servers cannot be used with the \*(Aqshared\*(Aq, \*(Aqlink\-local\*(Aq, or \*(Aqdisabled\*(Aq methods as there is no upstream network\&. In all other methods, these DNS servers are used as the only DNS servers for this connection\&. -T} -T{ -dns\-search -T}:T{ -array of string -T}:T{ -[] -T}:T{ -List of DNS search domains\&. For the \*(Aqauto\*(Aq method, these search domains are appended to those returned by automatic configuration\&. Search domains cannot be used with the \*(Aqshared\*(Aq, \*(Aqlink\-local\*(Aq, or \*(Aqdisabled\*(Aq methods as there is no upstream network\&. In all other methods, these search domains are used as the only search domains for this connection\&. -T} -T{ -addresses -T}:T{ -array of array of uint32 -T}:T{ -[] -T}:T{ -Array of IPv4 address structures\&. Each IPv4 address structure is composed of 3 32\-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 \- 32), and last the IPv4 gateway (network byte order)\&. The gateway may be left as 0 if no gateway exists for that subnet\&. For the \*(Aqauto\*(Aq method, given IP addresses are appended to those returned by automatic configuration\&. Addresses cannot be used with the \*(Aqshared\*(Aq, \*(Aqlink\-local\*(Aq, or \*(Aqdisabled\*(Aq methods as addressing is either automatic or disabled with these methods\&. -T} -T{ -routes -T}:T{ -array of array of uint32 -T}:T{ -[] -T}:T{ -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\&. For the \*(Aqauto\*(Aq method, given IP routes are appended to those returned by automatic configuration\&. Routes cannot be used with the \*(Aqshared\*(Aq, \*(Aqlink\-local\*(Aq, or \*(Aqdisabled\*(Aq, methods as there is no upstream network\&. -T} -T{ -ignore\-auto\-routes -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -When the method is set to \*(Aqauto\*(Aq and this property to TRUE, automatically configured routes are ignored and only routes specified in the \*(Aqroutes\*(Aq property, if any, are used\&. -T} -T{ -ignore\-auto\-dns -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -When the method is set to \*(Aqauto\*(Aq and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \*(Aqdns\*(Aq and \*(Aqdns\-search\*(Aq properties, if any, are used\&. -T} -T{ -dhcp\-client\-id -T}:T{ -string -T}:T{ -\ \& -T}:T{ -A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options\&. -T} -T{ -dhcp\-send\-hostname -T}:T{ -boolean -T}:T{ -TRUE -T}:T{ -If TRUE, a hostname is sent to the DHCP server when acquiring a lease\&. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer\&. If the \*(Aqdhcp\-hostname\*(Aq property is empty and this property is TRUE, the current persistent hostname of the computer is sent\&. -T} -T{ -dhcp\-hostname -T}:T{ -string -T}:T{ -\ \& -T}:T{ -If the \*(Aqdhcp\-send\-hostname\*(Aq property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease\&. -T} -T{ -never\-default -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, this connection will never be the default IPv4 connection, meaning it will never be assigned the default route by NetworkManager\&. -T} -T{ -may\-fail -T}:T{ -boolean -T}:T{ -TRUE -T}:T{ -If TRUE, allow overall network configuration to proceed even if IPv4 configuration times out\&. Note that at least one IP configuration must succeed or overall network configuration will still fail\&. For example, in IPv6\-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&12.\ \&ipv6 setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -ipv6 -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -method -T}:T{ -string -T}:T{ -\ \& -T}:T{ -IPv6 configuration method\&. If \*(Aqauto\*(Aq is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset\&. To force the use of DHCP only, specify \*(Aqdhcp\*(Aq; this method is only valid for ethernet\-based hardware\&. If \*(Aqlink\-local\*(Aq is specified, then an IPv6 link\-local address will be assigned to the interface\&. If \*(Aqmanual\*(Aq is specified, static IP addressing is used and at least one IP address must be given in the \*(Aqaddresses\*(Aq property\&. If \*(Aqignored\*(Aq is specified, IPv6 configuration is not done\&. This property must be set\&. NOTE: the \*(Aqshared\*(Aq methodis not yet supported\&. -T} -T{ -dhcp\-hostname -T}:T{ -string -T}:T{ -\ \& -T}:T{ -The specified name will be sent to the DHCP server when acquiring a lease\&. -T} -T{ -dns -T}:T{ -array of byte array -T}:T{ -[] -T}:T{ -Array of DNS servers, where each member of the array is a byte array containing the IPv6 address of the DNS server (in network byte order)\&. For the \*(Aqauto\*(Aq method, these DNS servers are appended to those (if any) returned by automatic configuration\&. DNS servers cannot be used with the \*(Aqshared\*(Aq or \*(Aqlink\-local\*(Aq methods as there is no usptream network\&. In all other methods, these DNS servers are used as the only DNS servers for this connection\&. -T} -T{ -dns\-search -T}:T{ -array of string -T}:T{ -[] -T}:T{ -List of DNS search domains\&. For the \*(Aqauto\*(Aq method, these search domains are appended to those returned by automatic configuration\&. Search domains cannot be used with the \*(Aqshared\*(Aq or \*(Aqlink\-local\*(Aq methods as there is no upstream network\&. In all other methods, these search domains are used as the only search domains for this connection\&. -T} -T{ -addresses -T}:T{ -array of (byte array, uint32, byte array) -T}:T{ -[] -T}:T{ -Array of IPv6 address structures\&. Each IPv6 address structure is composed of 3 members, the first being a byte array containing the IPv6 address (network byte order), the second a 32\-bit integer containing the IPv6 address prefix, and the third a byte array containing the IPv6 address (network byte order) of the gateway associated with this address, if any\&. If no gateway is given, the third element should be given as all zeros\&. For the \*(Aqauto\*(Aq method, given IP addresses are appended to those returned by automatic configuration\&. Addresses cannot be used with the \*(Aqshared\*(Aq or \*(Aqlink\-local\*(Aq methods as the interface is automatically assigned an address with these methods\&. -T} -T{ -routes -T}:T{ -array of (byte array, uint32, byte array, uint32) -T}:T{ -[] -T}:T{ -Array of IPv6 route structures\&. Each IPv6 route structure is composed of 4 members; the first being the destination IPv6 network or address (network byte order) as a byte array, the second the destination network or address IPv6 prefix, the third being the next\-hop IPv6 address (network byte order) if any, and the fourth being the route metric\&. For the \*(Aqauto\*(Aq method, given IP routes are appended to those returned by automatic configuration\&. Routes cannot be used with the \*(Aqshared\*(Aq or \*(Aqlink\-local\*(Aq methods because there is no upstream network\&. -T} -T{ -ignore\-auto\-routes -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -When the method is set to \*(Aqauto\*(Aq or \*(Aqdhcp\*(Aq and this property is set to TRUE, automatically configured routes are ignored and only routes specified in the \*(Aqroutes\*(Aq property, if any, are used\&. -T} -T{ -ignore\-auto\-dns -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -When the method is set to \*(Aqauto\*(Aq or \*(Aqdhcp\*(Aq and this property is set to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \*(Aqdns\*(Aq and \*(Aqdns\-search\*(Aq properties, if any, are used\&. -T} -T{ -never\-default -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, this connection will never be the default IPv6 connection, meaning it will never be assigned the default IPv6 route by NetworkManager\&. -T} -T{ -may\-fail -T}:T{ -boolean -T}:T{ -TRUE -T}:T{ -If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out\&. Note that at least one IP configuration must succeed or overall network configuration will still fail\&. For example, in IPv4\-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully\&. -T} -T{ -ip6\-privacy -T}:T{ -int32 -T}:T{ -\-1 -T}:T{ -Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941\&. If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI\-64\&. This enhances privacy, but could cause problems in some applications, on the other hand\&. The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses)\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&13.\ \&802-11-olpc-mesh setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -802\-11\-olpc\-mesh -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -ssid -T}:T{ -byte array -T}:T{ -[] -T}:T{ -SSID of the mesh network to join\&. -T} -T{ -channel -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Channel on which the mesh network to join is located\&. -T} -T{ -dhcp\-anycast\-address -T}:T{ -byte array -T}:T{ -[] -T}:T{ -Anycast DHCP MAC address used when requesting an IP address via DHCP\&. The specific anycast address used determines which DHCP server class answers the the request\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&14.\ \&ppp setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -ppp -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -noauth -T}:T{ -boolean -T}:T{ -TRUE -T}:T{ -If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client\&. If FALSE, require authentication from the remote side\&. In almost all cases, this should be TRUE\&. -T} -T{ -refuse\-eap -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, the EAP authentication method will not be used\&. -T} -T{ -refuse\-pap -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, the PAP authentication method will not be used\&. -T} -T{ -refuse\-chap -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, the CHAP authentication method will not be used\&. -T} -T{ -refuse\-mschap -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, the MSCHAP authentication method will not be used\&. -T} -T{ -refuse\-mschapv2 -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, the MSCHAPv2 authentication method will not be used\&. -T} -T{ -nobsdcomp -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, BSD compression will not be requested\&. -T} -T{ -nodeflate -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, \*(Aqdeflate\*(Aq compression will not be requested\&. -T} -T{ -no\-vj\-comp -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, Van Jacobsen TCP header compression will not be requested\&. -T} -T{ -require\-mppe -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, MPPE (Microsoft Point\-to\-Point Encrpytion) will be required for the PPP session\&. If either 64\-bit or 128\-bit MPPE is not available the session will fail\&. Note that MPPE is not used on mobile broadband connections\&. -T} -T{ -require\-mppe\-128 -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, 128\-bit MPPE (Microsoft Point\-to\-Point Encrpytion) will be required for the PPP session, and the \*(Aqrequire\-mppe\*(Aq property must also be set to TRUE\&. If 128\-bit MPPE is not available the session will fail\&. -T} -T{ -mppe\-stateful -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, stateful MPPE is used\&. See pppd documentation for more information on stateful MPPE\&. -T} -T{ -crtscts -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals\&. This value should normally be set to FALSE\&. -T} -T{ -baud -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -If non\-zero, instruct pppd to set the serial port to the specified baudrate\&. This value should normally be left as 0 to automatically choose the speed\&. -T} -T{ -mru -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -If non\-zero, instruct pppd to request that the peer send packets no larger than the specified size\&. If non\-zero, the MRU should be between 128 and 16384\&. -T} -T{ -mtu -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -If non\-zero, instruct pppd to send packets no larger than the specified size\&. -T} -T{ -lcp\-echo\-failure -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -If non\-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo\-requests go unanswered by the peer\&. The \*(Aqlcp\-echo\-interval\*(Aq property must also be set to a non\-zero value if this property is used\&. -T} -T{ -lcp\-echo\-interval -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -If non\-zero, instruct pppd to send an LCP echo\-request frame to the peer every n seconds (where n is the specified value)\&. Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&15.\ \&pppoe setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -pppoe -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -service -T}:T{ -string -T}:T{ -\ \& -T}:T{ -If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified serivce\&. For most providers, this should be left blank\&. It is only required if there are multiple access concentrators or a specific service is known to be required\&. -T} -T{ -username -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Username used to authenticate with the PPPoE service\&. -T} -T{ -password -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Password used to authenticate with the PPPoE service\&. -T} -T{ -password\-flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Flags indicating how to handle the PPPoE password\&. (see the section called \(lqSecret flag types:\(rq for flag values) -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&16.\ \&serial setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -serial -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -baud -T}:T{ -uint32 -T}:T{ -57600 -T}:T{ -Speed to use for communication over the serial port\&. Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed\&. -T} -T{ -bits -T}:T{ -uint32 -T}:T{ -8 -T}:T{ -Byte\-width of the serial communication\&. The 8 in \*(Aq8n1\*(Aq for example\&. -T} -T{ -parity -T}:T{ -gchar -T}:T{ -110 -T}:T{ -Parity setting of the serial port\&. Either \*(AqE\*(Aq for even parity, \*(Aqo\*(Aq for odd parity, or \*(Aqn\*(Aq for no parity\&. -T} -T{ -stopbits -T}:T{ -uint32 -T}:T{ -1 -T}:T{ -Number of stop bits for communication on the serial port\&. Either 1 or 2\&. The 1 in \*(Aq8n1\*(Aq for example\&. -T} -T{ -send\-delay -T}:T{ -uint64 -T}:T{ -0 -T}:T{ -Time to delay between each byte sent to the modem, in microseconds\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&17.\ \&vlan setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -vlan -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -interface\-name -T}:T{ -string -T}:T{ -\ \& -T}:T{ -If given, specifies the kernel name of the VLAN interface\&. If not given, a default name will be constructed from the interface described by the parent interface and the \*(Aqid\*(Aq property, ex \*(Aqeth2\&.1\*(Aq\&. The parent interface may be given by the \*(Aqparent\*(Aq property or by a hardware address property, eg the \*(Aqwired\*(Aq settings\*(Aq \*(Aqmac\-address\*(Aq property\&. -T} -T{ -parent -T}:T{ -string -T}:T{ -\ \& -T}:T{ -If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created\&. If this property is not specified, the connection must contain a hardware address in a hardware\-specific setting, like the \*(Aqwired\*(Aq settings\*(Aq \*(Aqmac\-address\*(Aq property\&. -T} -T{ -id -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -The VLAN indentifier the interface created by this connection should be assigned\&. -T} -T{ -flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -One or more flags which control the behavior and features of the VLAN interface\&. Flags include reordering of output packet headers (0x01), use of the GVRP protocol (0x02), and loose binding of the interface to its master device\*(Aqs operating state (0x04)\&. -T} -T{ -ingress\-priority\-map -T}:T{ -array of string -T}:T{ -[] -T}:T{ -For incoming packets, a list of mappings from 802\&.1p priorities to Linux SKB priorities\&. The mapping is given in the format \*(Aqfrom:to\*(Aq where both \*(Aqfrom\*(Aq and \*(Aqto\*(Aq are unsigned integers, ie \*(Aq7:3\*(Aq\&. -T} -T{ -egress\-priority\-map -T}:T{ -array of string -T}:T{ -[] -T}:T{ -For outgoing packets, a list of mappings from Linux SKB priorities to 802\&.1p priorities\&. The mapping is given in the format \*(Aqfrom:to\*(Aq where both \*(Aqfrom\*(Aq and \*(Aqto\*(Aq are unsigned integers, ie \*(Aq7:3\*(Aq\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&18.\ \&vpn setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -vpn -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -service\-type -T}:T{ -string -T}:T{ -\ \& -T}:T{ -D\-Bus service name of the VPN plugin that this setting uses to connect to its network\&. i\&.e\&. org\&.freedesktop\&.NetworkManager\&.vpnc for the vpnc plugin\&. -T} -T{ -user\-name -T}:T{ -string -T}:T{ -\ \& -T}:T{ -If the VPN connection requires a user name for authentication, that name should be provided here\&. If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty\&. If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection\&. -T} -T{ -data -T}:T{ -dict of (string::string) -T}:T{ -[ ] -T}:T{ -Dictionary of key/value pairs of VPN plugin specific data\&. Both keys and values must be strings\&. -T} -T{ -secrets -T}:T{ -dict of (string::string) -T}:T{ -[ ] -T}:T{ -Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys\&. Both keys and values must be strings\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&19.\ \&wimax setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -wimax -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -network\-name -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Network Service Provider (NSP) name of the WiMAX network this connection should use\&. -T} -T{ -mac\-address -T}:T{ -byte array -T}:T{ -[] -T}:T{ -If specified, this connection will only apply to the WiMAX device whose MAC address matches\&. This property does not change the MAC address of the device (known as MAC spoofing)\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&20.\ \&802-3-ethernet setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -802\-3\-ethernet -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -port -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Specific port type to use if multiple the device supports multiple attachment methods\&. One of \*(Aqtp\*(Aq (Twisted Pair), \*(Aqaui\*(Aq (Attachment Unit Interface), \*(Aqbnc\*(Aq (Thin Ethernet) or \*(Aqmii\*(Aq (Media Independent Interface\&. If the device supports only one port type, this setting is ignored\&. -T} -T{ -speed -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -If non\-zero, request that the device use only the specified speed\&. In Mbit/s, ie 100 == 100Mbit/s\&. -T} -T{ -duplex -T}:T{ -string -T}:T{ -\ \& -T}:T{ -If specified, request that the device only use the specified duplex mode\&. Either \*(Aqhalf\*(Aq or \*(Aqfull\*(Aq\&. -T} -T{ -auto\-negotiate -T}:T{ -boolean -T}:T{ -TRUE -T}:T{ -If TRUE, allow auto\-negotiation of port speed and duplex mode\&. If FALSE, do not allow auto\-negotiation,in which case the \*(Aqspeed\*(Aq and \*(Aqduplex\*(Aq properties should be set\&. -T} -T{ -mac\-address -T}:T{ -byte array -T}:T{ -[] -T}:T{ -If specified, this connection will only apply to the ethernet device whose permanent MAC address matches\&. This property does not change the MAC address of the device (i\&.e\&. MAC spoofing)\&. -T} -T{ -cloned\-mac\-address -T}:T{ -byte array -T}:T{ -[] -T}:T{ -If specified, request that the device use this MAC address instead of its permanent MAC address\&. This is known as MAC cloning or spoofing\&. -T} -T{ -mac\-address\-blacklist -T}:T{ -array of string -T}:T{ -[] -T}:T{ -If specified, this connection will never apply to the ethernet device whose permanent MAC address matches an address in the list\&. Each MAC address is in the standard hex\-digits\-and\-colons notation (00:11:22:33:44:55)\&. -T} -T{ -mtu -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -If non\-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames\&. -T} -T{ -s390\-subchannels -T}:T{ -array of string -T}:T{ -[] -T}:T{ -Identifies specific subchannels that this network device uses for communcation with z/VM or s390 host\&. Like the \*(Aqmac\-address\*(Aq property for non\-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels\&. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (\&.) character\&. -T} -T{ -s390\-nettype -T}:T{ -string -T}:T{ -\ \& -T}:T{ -s390 network device type; one of \*(Aqqeth\*(Aq, \*(Aqlcs\*(Aq, or \*(Aqctc\*(Aq, representing the different types of virtual network devices available on s390 systems\&. -T} -T{ -s390\-options -T}:T{ -dict of (string::string) -T}:T{ -[ ] -T}:T{ -Dictionary of key/value pairs of s390\-specific device options\&. Both keys and values must be strings\&. Allowed keys include \*(Aqportno\*(Aq, \*(Aqlayer2\*(Aq, \*(Aqportname\*(Aq, \*(Aqprotocol\*(Aq, among others\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&21.\ \&802-11-wireless setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -802\-11\-wireless -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -ssid -T}:T{ -byte array -T}:T{ -[] -T}:T{ -SSID of the WiFi network\&. Must be specified\&. -T} -T{ -mode -T}:T{ -string -T}:T{ -\ \& -T}:T{ -WiFi network mode; one of \*(Aqinfrastructure\*(Aq, \*(Aqadhoc\*(Aq or \*(Aqap\*(Aq\&. If blank, infrastructure is assumed\&. -T} -T{ -band -T}:T{ -string -T}:T{ -\ \& -T}:T{ -802\&.11 frequency band of the network\&. One of \*(Aqa\*(Aq for 5GHz 802\&.11a or \*(Aqbg\*(Aq for 2\&.4GHz 802\&.11\&. This will lock associations to the WiFi network to the specific band, i\&.e\&. if \*(Aqa\*(Aq is specified, the device will not associate with the same network in the 2\&.4GHz band even if the network\*(Aqs settings are compatible\&. This setting depends on specific driver capability and may not work with all drivers\&. -T} -T{ -channel -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Wireless channel to use for the WiFi connection\&. The device will only join (or create for Ad\-Hoc networks) a WiFi network on the specified channel\&. Because channel numbers overlap between bands, this property also requires the \*(Aqband\*(Aq property to be set\&. -T} -T{ -bssid -T}:T{ -byte array -T}:T{ -[] -T}:T{ -If specified, directs the device to only associate with the given access point\&. This capability is highly driver dependent and not supported by all devices\&. Note: this property does not control the BSSID used when creating an Ad\-Hoc network and is unlikely to in the future\&. -T} -T{ -rate -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -If non\-zero, directs the device to only use the specified bitrate for communication with the access point\&. Units are in Kb/s, ie 5500 = 5\&.5 Mbit/s\&. This property is highly driver dependent and not all devices support setting a static bitrate\&. -T} -T{ -tx\-power -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -If non\-zero, directs the device to use the specified transmit power\&. Units are dBm\&. This property is highly driver dependent and not all devices support setting a static transmit power\&. -T} -T{ -mac\-address -T}:T{ -byte array -T}:T{ -[] -T}:T{ -If specified, this connection will only apply to the WiFi device whose permanent MAC address matches\&. This property does not change the MAC address of the device (i\&.e\&. MAC spoofing)\&. -T} -T{ -cloned\-mac\-address -T}:T{ -byte array -T}:T{ -[] -T}:T{ -If specified, request that the WiFi device use this MAC address instead of its permanent MAC address\&. This is known as MAC cloning or spoofing\&. -T} -T{ -mac\-address\-blacklist -T}:T{ -array of string -T}:T{ -[] -T}:T{ -If specified, this connection will never apply to the WiFi device whose permanent MAC address matches an address in the list\&. Each MAC address is in the standard hex\-digits\-and\-colons notation (00:11:22:33:44:55)\&. -T} -T{ -mtu -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -If non\-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames\&. -T} -T{ -seen\-bssids -T}:T{ -array of string -T}:T{ -[] -T}:T{ -A list of BSSIDs (each BSSID formatted as a MAC address like 00:11:22:33:44:55\*(Aq) that have been detected as part of the WiFI network\&. NetworkManager internally tracks previously seen BSSIDs\&. The property is only meant for reading and reflects the BBSID list of NetworkManager\&. The changes you make to this property will not be preserved\&. -T} -T{ -security -T}:T{ -string -T}:T{ -\ \& -T}:T{ -If the wireless connection has any security restrictions, like 802\&.1x, WEP, or WPA, set this property to \*(Aq802\-11\-wireless\-security\*(Aq and ensure the connection contains a valid 802\-11\-wireless\-security setting\&. -T} -T{ -hidden -T}:T{ -boolean -T}:T{ -FALSE -T}:T{ -If TRUE, indicates this network is a non\-broadcasting network that hides its SSID\&. In this case various workarounds may take place, such as probe\-scanning the SSID for more reliable network discovery\&. However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution\&. -T} -.TE -.sp 1 -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.B Table\ \&22.\ \&802-11-wireless-security setting -.TS -allbox tab(:); -lB lB lB lB. -T{ -Key Name -T}:T{ -Value Type -T}:T{ -Default Value -T}:T{ -Value Description -T} -.T& -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l -l l l l. -T{ -name -T}:T{ -string -T}:T{ -802\-11\-wireless\-security -T}:T{ -The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&. Each setting class has a name, and all objects of that class share the same name\&. -T} -T{ -key\-mgmt -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Key management used for the connection\&. One of \*(Aqnone\*(Aq (WEP), \*(Aqieee8021x\*(Aq (Dynamic WEP), \*(Aqwpa\-none\*(Aq (WPA\-PSK Ad\-Hoc), \*(Aqwpa\-psk\*(Aq (infrastructure WPA\-PSK), or \*(Aqwpa\-eap\*(Aq (WPA\-Enterprise)\&. This property must be set for any WiFi connection that uses security\&. -T} -T{ -wep\-tx\-keyidx -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -When static WEP is used (ie, key\-mgmt = \*(Aqnone\*(Aq) and a non\-default WEP key index is used by the AP, put that WEP key index here\&. Valid values are 0 (default key) through 3\&. Note that some consumer access points (like the Linksys WRT54G) number the keys 1 \- 4\&. -T} -T{ -auth\-alg -T}:T{ -string -T}:T{ -\ \& -T}:T{ -When WEP is used (ie, key\-mgmt = \*(Aqnone\*(Aq or \*(Aqieee8021x\*(Aq) indicate the 802\&.11 authentication algorithm required by the AP here\&. One of \*(Aqopen\*(Aq for Open System, \*(Aqshared\*(Aq for Shared Key, or \*(Aqleap\*(Aq for Cisco LEAP\&. When using Cisco LEAP (ie, key\-mgmt = \*(Aqieee8021x\*(Aq and auth\-alg = \*(Aqleap\*(Aq) the \*(Aqleap\-username\*(Aq and \*(Aqleap\-password\*(Aq properties must be specified\&. -T} -T{ -proto -T}:T{ -array of string -T}:T{ -[] -T}:T{ -List of strings specifying the allowed WPA protocol versions to use\&. Each element may be one \*(Aqwpa\*(Aq (allow WPA) or \*(Aqrsn\*(Aq (allow WPA2/RSN)\&. If not specified, both WPA and RSN connections are allowed\&. -T} -T{ -pairwise -T}:T{ -array of string -T}:T{ -[] -T}:T{ -If specified, will only connect to WPA networks that provide the specified pairwise encryption capabilities\&. Each element may be one of \*(Aqwep40\*(Aq, \*(Aqwep104\*(Aq, \*(Aqtkip\*(Aq, or \*(Aqccmp\*(Aq\&. -T} -T{ -group -T}:T{ -array of string -T}:T{ -[] -T}:T{ -If specified, will only connect to WPA networks that provide the specified group/multicast encryption capabilities\&. Each element may be one of \*(Aqwep40\*(Aq, \*(Aqwep104\*(Aq, \*(Aqtkip\*(Aq, or \*(Aqccmp\*(Aq\&. -T} -T{ -leap\-username -T}:T{ -string -T}:T{ -\ \& -T}:T{ -The login username for legacy LEAP connections (ie, key\-mgmt = \*(Aqieee8021x\*(Aq and auth\-alg = \*(Aqleap\*(Aq)\&. -T} -T{ -wep\-key0 -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Index 0 WEP key\&. This is the WEP key used in most networks\&. See the \*(Aqwep\-key\-type\*(Aq property for a description of how this key is interpreted\&. -T} -T{ -wep\-key1 -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Index 1 WEP key\&. This WEP index is not used by most networks\&. See the \*(Aqwep\-key\-type\*(Aq property for a description of how this key is interpreted\&. -T} -T{ -wep\-key2 -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Index 2 WEP key\&. This WEP index is not used by most networks\&. See the \*(Aqwep\-key\-type\*(Aq property for a description of how this key is interpreted\&. -T} -T{ -wep\-key3 -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Index 3 WEP key\&. This WEP index is not used by most networks\&. See the \*(Aqwep\-key\-type\*(Aq property for a description of how this key is interpreted\&. -T} -T{ -wep\-key\-flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Flags indicating how to handle the WEP keys\&. (see the section called \(lqSecret flag types:\(rq for flag values) -T} -T{ -wep\-key\-type -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Controls the interpretation of WEP keys\&. Allowed values are 1 (interpret WEP keys as hexadecimal or ASCII keys) or 2 (interpret WEP keys as WEP Passphrases)\&. If set to 1 and the keys are hexadecimal, they must be either 10 or 26 characters in length\&. If set to 1 and the keys are ASCII keys, they must be either 5 or 13 characters in length\&. If set to 2, the passphrase is hashed using the de\-facto MD5 method to derive the actual WEP key\&. -T} -T{ -psk -T}:T{ -string -T}:T{ -\ \& -T}:T{ -Pre\-Shared\-Key for WPA networks\&. If the key is 64\-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key\&. Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802\&.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA\-PSK used when connecting to the WiFi network\&. -T} -T{ -psk\-flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Flags indicating how to handle the WPA PSK key\&. (see the section called \(lqSecret flag types:\(rq for flag values) -T} -T{ -leap\-password -T}:T{ -string -T}:T{ -\ \& -T}:T{ -The login password for legacy LEAP connections (ie, key\-mgmt = \*(Aqieee8021x\*(Aq and auth\-alg = \*(Aqleap\*(Aq)\&. -T} -T{ -leap\-password\-flags -T}:T{ -uint32 -T}:T{ -0 -T}:T{ -Flags indicating how to handle the LEAP password\&. (see the section called \(lqSecret flag types:\(rq for flag values) -T} -.TE -.sp 1 -.SS "Secret flag types:" -.PP -Each secret property in a setting has an associated -\fIflags\fR -property that describes how to handle that secret\&. The -\fIflags\fR -property is a bitfield that contains zero or more of the following values logically OR\-ed together\&. -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -0x0 (none) \- the system is responsible for providing and storing this secret\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -0x1 (agent\-owned) \- a user\-session secret agent is responsible for providing and storing this secret; when it is required, agents will be asked to provide it\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -0x2 (not\-saved) \- this secret should not be saved but should be requested from the user each time it is required\&. This flag should be used for One\-Time\-Pad secrets, PIN codes from hardware tokens, or if the user simply does not want to save the secret\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -0x4 (not\-required) \- in some situations it cannot be automatically determined that a secret is required or not\&. This flag hints that the secret is not required and should not be requested from the user\&. -.RE -.SH "AUTHOR" -.PP - -NetworkManager developers -.SH "FILES" -.PP -/etc/NetworkManager/system\-connections -.PP -or distro plugin\-specific location -.SH "SEE ALSO" -.PP -https://live\&.gnome\&.org/NetworkManagerConfiguration -.PP -NetworkManager(8), nmcli(1), NetworkManager\&.conf(5) diff --git a/man/nm-settings.xml b/man/nm-settings.xml deleted file mode 100644 index 14f7a0f7d..000000000 --- a/man/nm-settings.xml +++ /dev/null @@ -1,1687 +0,0 @@ - -]> - - 08 February 2013 - - - nm-settings - 5 - NetworkManager - Configuration - 0.9.7.997 - - - nm-settings - Description of settings and parameters of NetworkManager connections. - - - DESCRIPTION - - NetworkManager is based on a concept of connections. These connections are - then applied to a device to make an active network connection. Users can create - as many connections as they see fit. The connections are handled by NetworkManager - via settings service and are exported on D-Bus - (/org/freedesktop/NetworkManager/Settings/<num> objects). - The conceptual objects can be described as follows: - - - Connection - - - A specific, encapsulated, independent group of settings describing - all the configuration required to connect to a specific network. - It is referred to by a unique identifier called the UUID. A connection - is tied to a one specific device type, but not necessarily a specific - hardware device. It is composed of one or more Settings - objects. - - - - - - - Setting - - - A group of related key/value pairs describing a specific piece of a - Connection. Settings keys and allowed values are - described in the tables below. Developers can find the settings - objects in the libnm-util sources. Look for the class_init - functions near the bottoms of each setting source file. - - - - - - 802-1x setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - 802-1x - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - eap - array of string - [] - The allowed EAP method to be used when authenticating to the network with 802.1x. Valid methods are: 'leap', 'md5', 'tls', 'peap', 'ttls', and 'fast'. Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations. - - - identity - string - - Identity string for EAP authentication methods. Often the user's user or login name. - - - anonymous-identity - string - - Anonymous identity string for EAP authentication methods. Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS. - - - pac-file - string - - UTF-8 encoded file path containing PAC for EAP-FAST. - - - ca-cert - byte array - [] - Contains the CA certificate if used by the EAP method specified in the 'eap' property. Certificate data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended. - - - ca-path - string - - UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'ca-cert' property. - - - subject-match - string - - Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed. - - - altsubject-matches - array of string - [] - List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed. - - - client-cert - byte array - [] - Contains the client certificate if used by the EAP method specified in the 'eap' property. Certificate data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte. - - - phase1-peapver - string - - Forces which PEAP version is used when PEAP is set as the EAP method in 'eap' property. When unset, the version reported by the server will be used. Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version. To do so, this property may be set to '0' or '1' to force that specific PEAP version. - - - phase1-peaplabel - string - - Forces use of the new PEAP label during key derivation. Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1. Set to '1' to force use of the new PEAP label. See the wpa_supplicant documentation for more details. - - - phase1-fast-provisioning - string - - Enables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the #NMSetting8021x:eap property. Allowed values are '0' (disabled), '1' (allow unauthenticated provisioning), '2' (allow authenticated provisioning), and '3' (allow both authenticated and unauthenticated provisioning). See the wpa_supplicant documentation for more details. - - - phase2-auth - string - - Specifies the allowed 'phase 2' inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized non-EAP phase2 methods are 'pap', 'chap', 'mschap', 'mschapv2', 'gtc', 'otp', 'md5', and 'tls'. Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details. - - - phase2-autheap - string - - Specifies the allowed 'phase 2' inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized EAP-based 'phase 2' methods are 'md5', 'mschapv2', 'otp', 'gtc', and 'tls'. Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details. - - - phase2-ca-cert - byte array - [] - Contains the 'phase 2' CA certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties. Certificate data is specified using a 'scheme'; two are currentlysupported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended. - - - phase2-ca-path - string - - UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'phase2-ca-cert' property. - - - phase2-subject-match - string - - Substring to be matched against the subject of the certificate presented by the authentication server during the inner 'phase2' authentication. When unset, no verification of the authentication server certificate's subject is performed. - - - phase2-altsubject-matches - array of string - [] - List of strings to be matched against List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner 'phase 2' authentication. If the list is empty, no verification of the server certificate's altSubjectName is performed. - - - phase2-client-cert - byte array - [] - Contains the 'phase 2' client certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties. Certificate data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte. - - - password - string - - Password used for EAP authentication methods. - - - password-flags - uint32 - 0 - Flags indicating how to handle the 802.1x password. (see for flag values) - - - password-raw - byte array - [] - Password used for EAP authentication methods as a byte array - - - password-raw-flags - uint32 - 0 - Flags indicating how to handle the 802.1x password byte array. (see for flag values) - - - private-key - byte array - [] - Contains the private key when the 'eap' property is set to 'tls'. Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate. - - - private-key-password - string - - The password used to decrypt the private key specified in the 'private-key' property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key. - - - private-key-password-flags - uint32 - 0 - Flags indicating how to handle the 802.1x private key password. (see for flag values) - - - phase2-private-key - byte array - [] - Contains the 'phase 2' inner private key when the 'phase2-auth' or 'phase2-autheap' property is set to 'tls'. Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte. When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'phase2-private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'phase2-private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate. - - - phase2-private-key-password - string - - The password used to decrypt the 'phase 2' private key specified in the 'private-key' property when the phase2 private key either uses the path scheme, or if the phase2 private key is a PKCS#12 format key. - - - phase2-private-key-password-flags - uint32 - 0 - Flags indicating how to handle the 802.1x phase2 private key password. (see for flag values) - - - system-ca-certs - boolean - FALSE - When TRUE, overrides 'ca-path' and 'phase2-ca-path' properties using the system CA directory specified at configure time with the --system-ca-path switch. The certificates in this directory are added to the verification chain in addition to any certificates specified by the 'ca-cert' and 'phase2-ca-cert' properties. - - - -
- - adsl setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - adsl - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - username - string - - Username used to authenticate with the pppoa service. - - - password - string - - Password used to authenticate with the pppoa service. - - - password-flags - uint32 - 0 - Flags indicating how to handle the ADSL password. (see for flag values) - - - protocol - string - - ADSL connection protocol. - - - encapsulation - string - - Encapsulation of ADSL connection - - - vpi - uint32 - 0 - VPI of ADSL connection - - - vci - uint32 - 0 - VCI of ADSL connection - - - -
- - bluetooth setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - bluetooth - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - bdaddr - byte array - [] - The Bluetooth address of the device - - - type - string - - Either 'dun' for Dial-Up Networking connections or 'panu' for Personal Area Networking connections. - - - -
- - bond setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - bond - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - interface-name - string - - The name of the virtual in-kernel bonding network interface - - - options - dict of (string::string) - [ ] - Dictionary of key/value pairs of bonding options. Both keys and values must be strings. Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]). - - - -
- - bridge setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - bridge - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - interface-name - string - - The name of the virtual in-kernel bridging network interface - - - stp - boolean - TRUE - Controls whether Spanning Tree Protocol (STP) is enabled for this bridge. - - - priority - uint32 - 128 - Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower values are 'better'; the lowest priority bridge will be elected the root bridge. - - - forward-delay - uint32 - 15 - The Spanning Tree Protocol (STP) forwarding delay, in seconds. - - - hello-time - uint32 - 2 - The Spanning Tree Protocol (STP) hello time, in seconds. - - - max-age - uint32 - 20 - The Spanning Tree Protocol (STP) maximum message age, in seconds. - - - ageing-time - uint32 - 300 - The ethernet MAC address aging time, in seconds. - - - -
- - bridge-port setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - bridge-port - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - priority - uint32 - 32 - The Spanning Tree Protocol (STP) priority of this bridge port - - - path-cost - uint32 - 100 - The Spanning Tree Protocol (STP) port cost for destinations via this port. - - - hairpin-mode - boolean - FALSE - Enables or disabled 'hairpin mode' for the port, which allows frames to be sent back out through the port the frame was received on. - - - -
- - cdma setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - cdma - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - number - string - - Number to dial when establishing a PPP data session with the CDMA-based mobile broadband network. If not specified, the default number (#777) is used when required. - - - username - string - - Username used to authenticate with the network, if required. Note that many providers do not require a username or accept any username. - - - password - string - - Password used to authenticate with the network, if required. Note that many providers do not require a password or accept any password. - - - password-flags - uint32 - 0 - Flags indicating how to handle the CDMA password. (see for flag values) - - - -
- - connection setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - connection - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - id - string - - User-readable connection identifier/name. Must be one or more characters and may change over the lifetime of the connection if the user decides to rename it. - - - uuid - string - - Universally unique connection identifier. Must be in the format '2815492f-7e56-435e-b2e9-246bd7cdc664' (ie, contains only hexadecimal characters and '-'). The UUID should be assigned when the connection is created and never changed as long as the connection still applies to the same network. For example, it should not be changed when the user changes the connection's 'id', but should be recreated when the WiFi SSID, mobile broadband network provider, or the connection type changes. - - - type - string - - Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, '802-3-ethernet' or '802-11-wireless' or 'bluetooth', etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, 'vpn' or 'bridge', etc). - - - permissions - array of string - [] - An array of strings defining what access a given user has to this connection. If this is NULL or empty, all users are allowed to access this connection. Otherwise a user is allowed to access this connection if and only if they are in this array. Each entry is of the form "[type]:[id]:[reserved]", for example: "user:dcbw:blah" At this time only the 'user' [type] is allowed. Any other values are ignored and reserved for future use. [id] is the username that this permission refers to, which may not contain the ':' character. Any [reserved] information (if present) must be ignored and is reserved for future use. All of [type], [id], and [reserved] must be valid UTF-8. - - - autoconnect - boolean - TRUE - If TRUE, NetworkManager will activate this connection when its network resources are available. If FALSE, the connection must be manually activated by the user or some other mechanism. - - - timestamp - uint64 - 0 - Timestamp (in seconds since the Unix Epoch) that the connection was last successfully activated. Settings services should update the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. - - - read-only - boolean - FALSE - If TRUE, the connection is read-only and cannot be changed by the user or any other mechanism. This is normally set for system connections whose plugin cannot yet write updated connections back out. - - - zone - string - - The trust level of a the connection.Free form case-insensitive string (for example "Home", "Work", "Public"). NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. - - - master - string - - Interface name of the master device or UUID of the master connection - - - slave-type - string - - Setting name describing the type of slave this connection is (ie, 'bond') or NULL if this connection is not a slave. - - - secondaries - array of string - [] - List of connection UUIDs that should be activated when the base connection itself is activated. - - - -
- - gsm setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - gsm - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - number - string - - Number to dial when establishing a PPP data session with the GSM-based mobile broadband network. Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically. - - - username - string - - Username used to authenticate with the network, if required. Note that many providers do not require a username or accept any username. - - - password - string - - Password used to authenticate with the network, if required. Note that many providers do not require a password or accept any password. - - - password-flags - uint32 - 0 - Flags indicating how to handle the GSM password. (see for flag values) - - - apn - string - - The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network. The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan. The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9. - - - network-id - string - - The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration. If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible. - - - network-type - int32 - -1 - Network preference to force the device to only use specific network technologies. The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only. Note that not all devices allow network preference control. - - - pin - string - - If the SIM is locked with a PIN it must be unlocked before any other operations are requested. Specify the PIN here to allow operation of the device. - - - pin-flags - uint32 - 0 - Flags indicating how to handle the GSM SIM PIN. (see for flag values) - - - allowed-bands - uint32 - 1 - Bitfield of allowed frequency bands. Note that not all devices allow frequency band control. - - - home-only - boolean - FALSE - When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made. - - - -
- - infiniband setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - infiniband - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - mac-address - byte array - [] - If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing). - - - mtu - uint32 - 0 - If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames. - - - transport-mode - string - - The IPoIB transport mode. Either 'datagram' or 'connected'. - - - -
- - ipv4 setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - ipv4 - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - method - string - - IPv4 configuration method. If 'auto' is specified then the appropriate automatic method (DHCP, PPP, etc) is used for the interface and most other properties can be left unset. If 'link-local' is specified, then a link-local address in the 169.254/16 range will be assigned to the interface. If 'manual' is specified, static IP addressing is used and at least one IP address must be given in the 'addresses' property. If 'shared' is specified (indicating that this connection will provide network access to other computers) then the interface is assigned an address in the 10.42.x.1/24 range and a DHCP and forwarding DNS server are started, and the interface is NAT-ed to the current default network connection. 'disabled' means IPv4 will not be used on this connection. This property must be set. - - - dns - array of uint32 - [] - List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration. DNS servers cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network. In all other methods, these DNS servers are used as the only DNS servers for this connection. - - - dns-search - array of string - [] - List of DNS search domains. For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network. In all other methods, these search domains are used as the only search domains for this connection. - - - addresses - array of array of uint32 - [] - Array of IPv4 address structures. Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet. For the 'auto' method, given IP addresses are appended to those returned by automatic configuration. Addresses cannot be used with the 'shared', 'link-local', or 'disabled' methods as addressing is either automatic or disabled with these methods. - - - routes - array of array of uint32 - [] - 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. For the 'auto' method, given IP routes are appended to those returned by automatic configuration. Routes cannot be used with the 'shared', 'link-local', or 'disabled', methods as there is no upstream network. - - - ignore-auto-routes - boolean - FALSE - When the method is set to 'auto' and this property to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used. - - - ignore-auto-dns - boolean - FALSE - When the method is set to 'auto' and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used. - - - dhcp-client-id - string - - A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. - - - dhcp-send-hostname - boolean - TRUE - If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the 'dhcp-hostname' property is empty and this property is TRUE, the current persistent hostname of the computer is sent. - - - dhcp-hostname - string - - If the 'dhcp-send-hostname' property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. - - - never-default - boolean - FALSE - If TRUE, this connection will never be the default IPv4 connection, meaning it will never be assigned the default route by NetworkManager. - - - may-fail - boolean - TRUE - If TRUE, allow overall network configuration to proceed even if IPv4 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail. For example, in IPv6-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully. - - - -
- - ipv6 setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - ipv6 - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - method - string - - IPv6 configuration method. If 'auto' is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset. To force the use of DHCP only, specify 'dhcp'; this method is only valid for ethernet-based hardware. If 'link-local' is specified, then an IPv6 link-local address will be assigned to the interface. If 'manual' is specified, static IP addressing is used and at least one IP address must be given in the 'addresses' property. If 'ignored' is specified, IPv6 configuration is not done. This property must be set. NOTE: the 'shared' methodis not yet supported. - - - dhcp-hostname - string - - The specified name will be sent to the DHCP server when acquiring a lease. - - - dns - array of byte array - [] - Array of DNS servers, where each member of the array is a byte array containing the IPv6 address of the DNS server (in network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration. DNS servers cannot be used with the 'shared' or 'link-local' methods as there is no usptream network. In all other methods, these DNS servers are used as the only DNS servers for this connection. - - - dns-search - array of string - [] - List of DNS search domains. For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared' or 'link-local' methods as there is no upstream network. In all other methods, these search domains are used as the only search domains for this connection. - - - addresses - array of (byte array, uint32, byte array) - [] - Array of IPv6 address structures. Each IPv6 address structure is composed of 3 members, the first being a byte array containing the IPv6 address (network byte order), the second a 32-bit integer containing the IPv6 address prefix, and the third a byte array containing the IPv6 address (network byte order) of the gateway associated with this address, if any. If no gateway is given, the third element should be given as all zeros. For the 'auto' method, given IP addresses are appended to those returned by automatic configuration. Addresses cannot be used with the 'shared' or 'link-local' methods as the interface is automatically assigned an address with these methods. - - - routes - array of (byte array, uint32, byte array, uint32) - [] - Array of IPv6 route structures. Each IPv6 route structure is composed of 4 members; the first being the destination IPv6 network or address (network byte order) as a byte array, the second the destination network or address IPv6 prefix, the third being the next-hop IPv6 address (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration. Routes cannot be used with the 'shared' or 'link-local' methods because there is no upstream network. - - - ignore-auto-routes - boolean - FALSE - When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used. - - - ignore-auto-dns - boolean - FALSE - When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used. - - - never-default - boolean - FALSE - If TRUE, this connection will never be the default IPv6 connection, meaning it will never be assigned the default IPv6 route by NetworkManager. - - - may-fail - boolean - TRUE - If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail. For example, in IPv4-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully. - - - ip6-privacy - int32 - -1 - Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64. This enhances privacy, but could cause problems in some applications, on the other hand. The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). - - - -
- - 802-11-olpc-mesh setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - 802-11-olpc-mesh - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - ssid - byte array - [] - SSID of the mesh network to join. - - - channel - uint32 - 0 - Channel on which the mesh network to join is located. - - - dhcp-anycast-address - byte array - [] - Anycast DHCP MAC address used when requesting an IP address via DHCP. The specific anycast address used determines which DHCP server class answers the the request. - - - -
- - ppp setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - ppp - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - noauth - boolean - TRUE - If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client. If FALSE, require authentication from the remote side. In almost all cases, this should be TRUE. - - - refuse-eap - boolean - FALSE - If TRUE, the EAP authentication method will not be used. - - - refuse-pap - boolean - FALSE - If TRUE, the PAP authentication method will not be used. - - - refuse-chap - boolean - FALSE - If TRUE, the CHAP authentication method will not be used. - - - refuse-mschap - boolean - FALSE - If TRUE, the MSCHAP authentication method will not be used. - - - refuse-mschapv2 - boolean - FALSE - If TRUE, the MSCHAPv2 authentication method will not be used. - - - nobsdcomp - boolean - FALSE - If TRUE, BSD compression will not be requested. - - - nodeflate - boolean - FALSE - If TRUE, 'deflate' compression will not be requested. - - - no-vj-comp - boolean - FALSE - If TRUE, Van Jacobsen TCP header compression will not be requested. - - - require-mppe - boolean - FALSE - If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session. If either 64-bit or 128-bit MPPE is not available the session will fail. Note that MPPE is not used on mobile broadband connections. - - - require-mppe-128 - boolean - FALSE - If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the 'require-mppe' property must also be set to TRUE. If 128-bit MPPE is not available the session will fail. - - - mppe-stateful - boolean - FALSE - If TRUE, stateful MPPE is used. See pppd documentation for more information on stateful MPPE. - - - crtscts - boolean - FALSE - If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals. This value should normally be set to FALSE. - - - baud - uint32 - 0 - If non-zero, instruct pppd to set the serial port to the specified baudrate. This value should normally be left as 0 to automatically choose the speed. - - - mru - uint32 - 0 - If non-zero, instruct pppd to request that the peer send packets no larger than the specified size. If non-zero, the MRU should be between 128 and 16384. - - - mtu - uint32 - 0 - If non-zero, instruct pppd to send packets no larger than the specified size. - - - lcp-echo-failure - uint32 - 0 - If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer. The 'lcp-echo-interval' property must also be set to a non-zero value if this property is used. - - - lcp-echo-interval - uint32 - 0 - If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value). Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this. - - - -
- - pppoe setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - pppoe - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - service - string - - If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified serivce. For most providers, this should be left blank. It is only required if there are multiple access concentrators or a specific service is known to be required. - - - username - string - - Username used to authenticate with the PPPoE service. - - - password - string - - Password used to authenticate with the PPPoE service. - - - password-flags - uint32 - 0 - Flags indicating how to handle the PPPoE password. (see for flag values) - - - -
- - serial setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - serial - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - baud - uint32 - 57600 - Speed to use for communication over the serial port. Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed. - - - bits - uint32 - 8 - Byte-width of the serial communication. The 8 in '8n1' for example. - - - parity - gchar - 110 - Parity setting of the serial port. Either 'E' for even parity, 'o' for odd parity, or 'n' for no parity. - - - stopbits - uint32 - 1 - Number of stop bits for communication on the serial port. Either 1 or 2. The 1 in '8n1' for example. - - - send-delay - uint64 - 0 - Time to delay between each byte sent to the modem, in microseconds. - - - -
- - vlan setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - vlan - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - interface-name - string - - If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' settings' 'mac-address' property. - - - parent - string - - If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created. If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' settings' 'mac-address' property. - - - id - uint32 - 0 - The VLAN indentifier the interface created by this connection should be assigned. - - - flags - uint32 - 0 - One or more flags which control the behavior and features of the VLAN interface. Flags include reordering of output packet headers (0x01), use of the GVRP protocol (0x02), and loose binding of the interface to its master device's operating state (0x04). - - - ingress-priority-map - array of string - [] - For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities. The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'. - - - egress-priority-map - array of string - [] - For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities. The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'. - - - -
- - vpn setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - vpn - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - service-type - string - - D-Bus service name of the VPN plugin that this setting uses to connect to its network. i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin. - - - user-name - string - - If the VPN connection requires a user name for authentication, that name should be provided here. If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty. If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection. - - - data - dict of (string::string) - [ ] - Dictionary of key/value pairs of VPN plugin specific data. Both keys and values must be strings. - - - secrets - dict of (string::string) - [ ] - Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys. Both keys and values must be strings. - - - -
- - wimax setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - wimax - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - network-name - string - - Network Service Provider (NSP) name of the WiMAX network this connection should use. - - - mac-address - byte array - [] - If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). - - - -
- - 802-3-ethernet setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - 802-3-ethernet - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - port - string - - Specific port type to use if multiple the device supports multiple attachment methods. One of 'tp' (Twisted Pair), 'aui' (Attachment Unit Interface), 'bnc' (Thin Ethernet) or 'mii' (Media Independent Interface. If the device supports only one port type, this setting is ignored. - - - speed - uint32 - 0 - If non-zero, request that the device use only the specified speed. In Mbit/s, ie 100 == 100Mbit/s. - - - duplex - string - - If specified, request that the device only use the specified duplex mode. Either 'half' or 'full'. - - - auto-negotiate - boolean - TRUE - If TRUE, allow auto-negotiation of port speed and duplex mode. If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set. - - - mac-address - byte array - [] - If specified, this connection will only apply to the ethernet device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing). - - - cloned-mac-address - byte array - [] - If specified, request that the device use this MAC address instead of its permanent MAC address. This is known as MAC cloning or spoofing. - - - mac-address-blacklist - array of string - [] - If specified, this connection will never apply to the ethernet device whose permanent MAC address matches an address in the list. Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55). - - - mtu - uint32 - 0 - If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames. - - - s390-subchannels - array of string - [] - Identifies specific subchannels that this network device uses for communcation with z/VM or s390 host. Like the 'mac-address' property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character. - - - s390-nettype - string - - s390 network device type; one of 'qeth', 'lcs', or 'ctc', representing the different types of virtual network devices available on s390 systems. - - - s390-options - dict of (string::string) - [ ] - Dictionary of key/value pairs of s390-specific device options. Both keys and values must be strings. Allowed keys include 'portno', 'layer2', 'portname', 'protocol', among others. - - - -
- - 802-11-wireless setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - 802-11-wireless - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - ssid - byte array - [] - SSID of the WiFi network. Must be specified. - - - mode - string - - WiFi network mode; one of 'infrastructure', 'adhoc' or 'ap'. If blank, infrastructure is assumed. - - - band - string - - 802.11 frequency band of the network. One of 'a' for 5GHz 802.11a or 'bg' for 2.4GHz 802.11. This will lock associations to the WiFi network to the specific band, i.e. if 'a' is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible. This setting depends on specific driver capability and may not work with all drivers. - - - channel - uint32 - 0 - Wireless channel to use for the WiFi connection. The device will only join (or create for Ad-Hoc networks) a WiFi network on the specified channel. Because channel numbers overlap between bands, this property also requires the 'band' property to be set. - - - bssid - byte array - [] - If specified, directs the device to only associate with the given access point. This capability is highly driver dependent and not supported by all devices. Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future. - - - rate - uint32 - 0 - If non-zero, directs the device to only use the specified bitrate for communication with the access point. Units are in Kb/s, ie 5500 = 5.5 Mbit/s. This property is highly driver dependent and not all devices support setting a static bitrate. - - - tx-power - uint32 - 0 - If non-zero, directs the device to use the specified transmit power. Units are dBm. This property is highly driver dependent and not all devices support setting a static transmit power. - - - mac-address - byte array - [] - If specified, this connection will only apply to the WiFi device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing). - - - cloned-mac-address - byte array - [] - If specified, request that the WiFi device use this MAC address instead of its permanent MAC address. This is known as MAC cloning or spoofing. - - - mac-address-blacklist - array of string - [] - If specified, this connection will never apply to the WiFi device whose permanent MAC address matches an address in the list. Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55). - - - mtu - uint32 - 0 - If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames. - - - seen-bssids - array of string - [] - A list of BSSIDs (each BSSID formatted as a MAC address like 00:11:22:33:44:55') that have been detected as part of the WiFI network. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BBSID list of NetworkManager. The changes you make to this property will not be preserved. - - - security - string - - If the wireless connection has any security restrictions, like 802.1x, WEP, or WPA, set this property to '802-11-wireless-security' and ensure the connection contains a valid 802-11-wireless-security setting. - - - hidden - boolean - FALSE - If TRUE, indicates this network is a non-broadcasting network that hides its SSID. In this case various workarounds may take place, such as probe-scanning the SSID for more reliable network discovery. However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution. - - - -
- - 802-11-wireless-security setting - - - - Key Name - Value Type - Default Value - Value Description - - - - - name - string - 802-11-wireless-security - The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name. - - - key-mgmt - string - - Key management used for the connection. One of 'none' (WEP), 'ieee8021x' (Dynamic WEP), 'wpa-none' (WPA-PSK Ad-Hoc), 'wpa-psk' (infrastructure WPA-PSK), or 'wpa-eap' (WPA-Enterprise). This property must be set for any WiFi connection that uses security. - - - wep-tx-keyidx - uint32 - 0 - When static WEP is used (ie, key-mgmt = 'none') and a non-default WEP key index is used by the AP, put that WEP key index here. Valid values are 0 (default key) through 3. Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4. - - - auth-alg - string - - When WEP is used (ie, key-mgmt = 'none' or 'ieee8021x') indicate the 802.11 authentication algorithm required by the AP here. One of 'open' for Open System, 'shared' for Shared Key, or 'leap' for Cisco LEAP. When using Cisco LEAP (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap') the 'leap-username' and 'leap-password' properties must be specified. - - - proto - array of string - [] - List of strings specifying the allowed WPA protocol versions to use. Each element may be one 'wpa' (allow WPA) or 'rsn' (allow WPA2/RSN). If not specified, both WPA and RSN connections are allowed. - - - pairwise - array of string - [] - If specified, will only connect to WPA networks that provide the specified pairwise encryption capabilities. Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'. - - - group - array of string - [] - If specified, will only connect to WPA networks that provide the specified group/multicast encryption capabilities. Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'. - - - leap-username - string - - The login username for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap'). - - - wep-key0 - string - - Index 0 WEP key. This is the WEP key used in most networks. See the 'wep-key-type' property for a description of how this key is interpreted. - - - wep-key1 - string - - Index 1 WEP key. This WEP index is not used by most networks. See the 'wep-key-type' property for a description of how this key is interpreted. - - - wep-key2 - string - - Index 2 WEP key. This WEP index is not used by most networks. See the 'wep-key-type' property for a description of how this key is interpreted. - - - wep-key3 - string - - Index 3 WEP key. This WEP index is not used by most networks. See the 'wep-key-type' property for a description of how this key is interpreted. - - - wep-key-flags - uint32 - 0 - Flags indicating how to handle the WEP keys. (see for flag values) - - - wep-key-type - uint32 - 0 - Controls the interpretation of WEP keys. Allowed values are 1 (interpret WEP keys as hexadecimal or ASCII keys) or 2 (interpret WEP keys as WEP Passphrases). If set to 1 and the keys are hexadecimal, they must be either 10 or 26 characters in length. If set to 1 and the keys are ASCII keys, they must be either 5 or 13 characters in length. If set to 2, the passphrase is hashed using the de-facto MD5 method to derive the actual WEP key. - - - psk - string - - Pre-Shared-Key for WPA networks. If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key. Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the WiFi network. - - - psk-flags - uint32 - 0 - Flags indicating how to handle the WPA PSK key. (see for flag values) - - - leap-password - string - - The login password for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap'). - - - leap-password-flags - uint32 - 0 - Flags indicating how to handle the LEAP password. (see for flag values) - - - -
- - - Secret flag types: - - Each secret property in a setting has an associated flags property - that describes how to handle that secret. The flags property is a bitfield - that contains zero or more of the following values logically OR-ed together. - - - - 0x0 (none) - the system is responsible for providing and storing this secret. - - - 0x1 (agent-owned) - a user-session secret agent is responsible for providing and storing - this secret; when it is required, agents will be asked to provide it. - - - 0x2 (not-saved) - this secret should not be saved but should be requested from the user - each time it is required. This flag should be used for One-Time-Pad secrets, PIN codes from hardware tokens, - or if the user simply does not want to save the secret. - - - 0x4 (not-required) - in some situations it cannot be automatically determined that a secret - is required or not. This flag hints that the secret is not required and should not be requested from the user. - - - - - - AUTHOR - - - NetworkManager developers - - - - - FILES - /etc/NetworkManager/system-connections - or distro plugin-specific location - - - SEE ALSO - https://live.gnome.org/NetworkManagerConfiguration - NetworkManager(8), nmcli(1), NetworkManager.conf(5) - - diff --git a/man/nm-system-settings.conf.5 b/man/nm-system-settings.conf.5 deleted file mode 100644 index e48d0c8e6..000000000 --- a/man/nm-system-settings.conf.5 +++ /dev/null @@ -1,26 +0,0 @@ -.\" nm-system-settings.conf(5) manual page -.\" -.\" Copyright (C) 2010 Red Hat, Inc. -.\" -.TH "nm-system-settings.conf" "5" "1 February 2010" "" -.SH NAME -nm\-system\-settings.conf \- Deprecated NetworkManager configuration file -.SH SYNOPSIS -/etc/NetworkManager/nm\-system\-settings.conf -.br -or -.br -\fI\fP/NetworkManager/nm\-system\-settings.conf -.br -where depends on your distribution or build. -.SH DESCRIPTION -.P -.I nm\-system\-settings.conf -is a deprecated configuration file for \fBNetworkManager\fP (5). While this -file can still be used, NetworkManager now defaults to reading the config -file \fP/NetworkManager/NetworkManager.conf\fP instead, falling back -to nm\-system\-settings.conf if NetworkManager.conf does not exist. -.SH "SEE ALSO" -.BR NetworkManager (8), -.BR NetworkManager.conf (5), -.BR nm\-tool (1). diff --git a/man/nm-tool.1 b/man/nm-tool.1 deleted file mode 100644 index 168a5dc5d..000000000 --- a/man/nm-tool.1 +++ /dev/null @@ -1,17 +0,0 @@ -.\" nm-tool(1) manual page -.\" -.\" Copyright (C) 2005 - 2009 Red Hat, Inc. -.\" Copyright (C) 2005 - 2009 Novell, Inc. -.\" Copyright (C) 2005 Robert Love -.\" -.TH NM-TOOL "1" -.SH NAME -nm-tool \- utility to report NetworkManager state and devices -.SH SYNOPSIS -.B nm-tool -.SH DESCRIPTION -The \fInm-tool\fP utility provides information about NetworkManager, device, -and wireless networks. -.SH SEE ALSO -.BR NetworkManager (8), - diff --git a/man/nm-tool.1.in b/man/nm-tool.1.in index 168a5dc5d..0db23a20f 100644 --- a/man/nm-tool.1.in +++ b/man/nm-tool.1.in @@ -14,4 +14,6 @@ The \fInm-tool\fP utility provides information about NetworkManager, device, and wireless networks. .SH SEE ALSO .BR NetworkManager (8), +.BR nm\-applet (1), +.BR nm\-connection\-editor (1). diff --git a/man/nmcli.1 b/man/nmcli.1 deleted file mode 100644 index d1f3a0caa..000000000 --- a/man/nmcli.1 +++ /dev/null @@ -1,533 +0,0 @@ -.\" nmcli (1) manual page -.\" -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public Licence along -.\" with this manual; if not, write to the Free Software Foundation, Inc., -.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -.\" -.\" Copyright (C) 2010 - 2013 Red Hat, Inc. -.\" -.TH NMCLI "1" "17 January 2013" - -.SH NAME -nmcli \(en command\(hyline tool for controlling NetworkManager -.SH SYNOPSIS -.ad l -.B nmcli -.RI " [ " OPTIONS " ] " OBJECT " { " COMMAND " | " -.BR help " } " -.sp - -.IR OBJECT " := { " -.BR nm " | " con " | " dev " } " -.sp - -.IR OPTIONS " := { " -.br -\fB\-t\fR[\fIerse\fR] -.br -\fB\-p\fR[\fIretty\fR] -.br -\fB\-m\fR[\fImode\fR] tabular | multiline -.br -\fB\-f\fR[\fIields\fR] | all | common -.br -\fB\-e\fR[\fIscape\fR] yes | no -.br -\fB\-v\fR[\fIersion\fR] -.br -\fB\-h\fR[\fIelp\fR] -.br -.RI "}" - -.SH DESCRIPTION -.B nmcli -is a command\(hyline tool for controlling NetworkManager and reporting on its status. -It is not meant as a full replacement for \fInm\(hyapplet\fP or other similar clients -but as a complementary utility to those programs. -The main usage for \fInmcli\fP is on servers, headless machines or for power users -who prefer the command line. -.P -Typical applications include: -.IP \(em 4 -Initscripts: ifup/ifdown can utilize NetworkManager via \fInmcli\fP instead of -having to manage connections itself and possibly interfere with NetworkManager. -.IP \(em 4 -Servers, headless machines: No GUI is available; then \fInmcli\fP can be used -to activate/deactivate connections. However, if a connection requires a secret -in order to activate and if that secret is not stored at the system level, -\fInmcli\fP will not be able to activate it; it is currently unable to supply -the secrets to NetworkManager. -.IP \(em 4 -User sessions: \fInmcli\fP can be used to activate/deactivate connections from -the command line, but a client with a secret agent (like \fInm\(hyapplet\fP) is needed -for supplying secrets not stored at the system level. Keyring dialogs and -password prompts may appear if this happens. -.SS \fIOPTIONS\fP -.TP -.B \-t, \-\-terse -Output is terse. This mode is designed and suitable for computer (script) -processing. -.TP -.B \-p, \-\-pretty -Output is pretty. This causes \fInmcli\fP to produce easily readable outputs -for humans, i.e. values are aligned, headers are printed, etc. -.TP -.B \-m, \-\-mode tabular | multiline -Switch between \fItabular\fP and \fImultiline\fP output. -If omitted, default is \fItabular\fP for most commands. For the commands -producing more structured information, that cannot be displayed on a single -line, default is \fImultiline\fP. Currenly, they are: -.br -.nf - 'nmcli con list id|uuid ' - 'nmcli dev list' -.fi -\fItabular\fP \(en Output is a table where each line describes a single entry. -Columns define particular properties of the entry. -.br -\fImultiline\fP \(en Each entry comprises multiple lines, each property on its own -line. The values are prefixed with the property name. -.TP -.B \-f, \-\-fields | all | common -This option is used to specify what fields (column names) should be printed. -Valid field names differ for specific commands. List available fields by -providing an invalid value to the \fI\-\-fields\fP option. -.br -\fIall\fP is used to print all valid field values of the command. -\fIcommon\fP is used to print common field values of the command. -If omitted, default is \fIcommon\fP. -The option is mandatory when \fI\-\-terse\fP is used. In this case, generic -values \fIall\fP and \fIcommon\fP cannot be used. (This is to maintain -compatibility when new fields are added in the future). -.TP -.B \-e, \-\-escape yes | no -Whether to escape ':' and '\\' characters in terse tabular mode. The escape -character is '\\'. -If omitted, default is \fIyes\fP. -.TP -.B \-v, \-\-version -Show \fInmcli\fP version. -.TP -.B \-h, \-\-help -Print help information. -.SS \fIOBJECT\fP -.TP -.B nm -NetworkManager -.br -Use this object to inquire and change state of NetworkManager. -.TP -.SS \fICOMMAND\fP := { status | permissions | enable | sleep | wifi | wwan | wimax } -.sp -.RS -.TP -.B status -.br -Show overall status of NetworkManager. This is the default action, when no -command is provided to \fInm\fP object. -.br -.nf -\fBReference to D\(hyBus:\fP -No simple reference. -.fi -.TP -.B permissions -.br -Show the permissions a caller has for various authenticated operations that -NetworkManager provides, like enable/disable networking, changing Wi\(hyFi, WWAN, -and WiMAX state, modifying connections, etc. -.br -.nf -\fBReference to D\(hyBus:\fP -interface: org.freedesktop.NetworkManager -method: GetPermissions -arguments: none -.fi -.TP -.B enable [true|false] -.br -Get networking\(hyenabled status or enable/disable networking by NetworkManager. -All interfaces managed by NetworkManager are deactivated when networking has -been disabled. -.br -.nf -\fBReference to D\(hyBus:\fP -interface: org.freedesktop.NetworkManager -method: Enable -arguments: TRUE or FALSE -.fi -.TP -.B sleep [true|false] -.br -Get sleep status or put to sleep/awake NetworkManager. All interfaces managed -by NetworkManager are deactivated when it falls asleep. This command is not -meant for user to enable/disable networking, use \fIenable\fP for that. D\(hyBus -\fISleep\fP method is designed to put NetworkManager to sleep or awake for -suspending/resuming the computer. -.br -.nf -\fBReference to D\(hyBus:\fP -interface: org.freedesktop.NetworkManager -method: Sleep -arguments: TRUE or FALSE -.fi -.TP -.B wifi [on|off] -.br -Inquire or set status of Wi\(hyFi in NetworkManager. If no arguments are supplied, -Wi\(hyFi status is printed; \fIon\fP enables Wi\(hyFi; \fIoff\fP disables Wi\(hyFi. -.br -.nf -\fBReference to D\(hyBus:\fP -No simple reference. -.fi -.TP -.B wwan [on|off] -.br -Inquire or set status of WWAN in NetworkManager. If no arguments are supplied, -WWAN status is printed; \fIon\fP enables WWAN; \fIoff\fP disables WWAN. -.br -.nf -\fBReference to D\(hyBus:\fP -No simple reference. -.fi -.TP -.B wimax [on|off] -.br -Inquire or set status of WiMAX in NetworkManager. If no arguments are supplied, -WiMAX status is printed; \fIon\fP enables WiMAX; \fIoff\fP disables WiMAX. -.br -Note: WiMAX support is a compile\(hytime decision, so it may be unavailable on some -installations. -.nf -\fBReference to D\(hyBus:\fP -No simple reference. -.fi -.RE - -.TP -.B con -Connections -.br -Get information about NetworkManager's connections. -.TP -.SS \fICOMMAND\fP := { list | status | up | down | delete } -.sp -.RS -.TP -.B list [id | uuid ] -.br -List configured connections. Without a parameter, all connections -are listed. In order to get connection details, \fIid\fP with connection's -name or \fIuuid\fP with connection's UUID shall be specified. When no command -is given to the \fIcon\fP object, the default action is 'nmcli con list'. -.br -.nf -\fBReference to D\(hyBus:\fP -No simple reference. -.fi -.TP -.B status -.br -Print status of active connections. -.br -.nf -\fBReference to D\(hyBus:\fP -No simple reference. -.fi -.TP -.B up id | uuid [iface ] [ap ] [nsp ] [\-\-nowait] [\-\-timeout ] -.br -Activate a connection. The connection is identified by its name using \fIid\fP -or UUID using \fIuuid\fP. When requiring a particular device to activate the -connection on, the \fIiface\fP option with interface name should be given. In -case of a VPN connection, the \fIiface\fP option specify the device of the base -connection. The \fIap\fP option specify what particular AP should be used in case -of a Wi\(hyFi connection. -.RS -.PP -Available options are: -.IP \fIiface\fP 13 -\(en interface that will be used for activation -.IP \fIap\fP 13 -\(en BSSID of the AP which the command should connect to (for Wi\(hyFi connections) -.IP \fInsp\fP 13 -\(en NSP (Network Service Provider) which the command should connect to (for WiMAX connections) -.IP \fI\-\-nowait\fP 13 -\(en exit immediately without waiting for command completion -.IP \fI\-\-timeout\fP 13 -\(en how long to wait for command completion (default is 90 s) -.PP -.br -.nf -\fBReference to D\(hyBus:\fP -interface: org.freedesktop.NetworkManager -method: ActivateConnection -arguments: according to arguments -.fi -.RE - -.TP -.B down id | uuid -.br -Deactivate a connection. -The connection is identified by its name using \fIid\fP -or UUID using \fIuuid\fP. -.br -.nf -\fBReference to D\(hyBus:\fP -interface: org.freedesktop.NetworkManager -method: DeactivateConnection -arguments: according to arguments -.fi -.TP -.B delete id | uuid -.br -Delete a configured connection. The connection to delete is specified with -\fIid\fP (connection name) or \fIuuid\fP (connection UUID). -.br -.nf -\fBReference to D\(hyBus:\fP -interface: org.freedesktop.NetworkManager.Settings.Connection -method: Delete -arguments: none -.fi -.RE - -.TP -.B dev -Devices -.br -Get information about devices. -.TP -.SS \fICOMMAND\fP := { status | list | disconnect | wifi } -.sp -.RS -.TP -.B status -.br -Print status of devices. This is the default action, when no command -is specified to \fIdev\fP object. -.br -.nf -\fBReference to D\(hyBus:\fP -No simple reference. -.fi -.TP -.B list [iface ] -.br -Get detailed information about devices. Without an argument, all devices are -examined. To get information for a specific device, the \fIiface\fP argument -with the interface name should be provided. -.br -.nf -\fBReference to D\(hyBus:\fP -No simple reference. -.fi -.TP -.B disconnect iface [\-\-nowait] [\-\-timeout ] -.br -Disconnect a device and prevent the device from automatically activating further -connections without user/manual intervention. -.RS -.PP -Available options are: -.IP \fI\-\-nowait\fP 13 -\(en exit immediately without waiting for command completion -.IP \fI\-\-timeout\fP 13 -\(en how long to wait for command completion (default is 10 s) -.PP -.br -.nf -\fBReference to D\(hyBus:\fP -interface: org.freedesktop.NetworkManager.Device -method: Disconnect -arguments: none -.fi -.RE -.TP -.B wifi [list [iface ] [bssid ]] -.br -List available Wi\(hyFi access points. The \fIiface\fP and \fIbssid\fP options -can be used to list APs for a particular interface or with a specific BSSID, -respectively. -.br -.nf -\fBReference to D\(hyBus:\fP -No simple reference. -.fi -.TP -.B wifi connect <(B)SSID> [password ] [wep\-key\-type key|phrase] [iface ] [bssid ] [name ] [\-\-private] [\-\-nowait] [\-\-timeout ] -.br -Connect to a Wi\(hyFi network specified by SSID or BSSID. The command creates a new -connection and then activates it on a device. This is a command\(hyline counterpart -of clicking an SSID in a GUI client. The command always creates a new connection -and thus it is mainly useful for connecting to new Wi\(hyFi networks. If a connection -for the network already exists, it's better to connect through it using -\fInmcli con up id \fP. Note that only open, WEP and WPA\(hyPSK networks are -supported at the moment. It is also supposed that IP configuration is obtained via -DHCP. -.RS -.PP -Available options are: -.IP \fIpassword\fP 13 -\(en password for secured networks (WEP or WPA) -.IP \fIwep\-key\-type\fP 13 -\(en type of WEP secret, either \fIkey\fP for ASCII/HEX key or \fIphrase\fP for passphrase -.IP \fIiface\fP 13 -\(en interface that will be used for activation -.IP \fIbssid\fP 13 -\(en if specified, the created connection will be restricted just for the BSSID -.IP \fIname\fP 13 -\(en if specified, the connection will use the name (else NM creates a name itself) -.IP \fI\-\-private\fP 13 -\(en the connection will only be visible to the user who created it (else the connection is system\(hywide) -.IP \fI\-\-nowait\fP 13 -\(en exit immediately without waiting for command completion -.IP \fI\-\-timeout\fP 13 -\(en how long to wait for command completion (default is 90 s) -.PP -.br -.nf -\fBReference to D\(hyBus:\fP -interface: org.freedesktop.NetworkManager -method: AddAndActivateConnection -arguments: according to arguments -.fi -.RE - -.SH ENVIRONMENT VARIABLES -\fInmcli\fP's behavior is affected by the following environment variables. -.IP "LC_ALL" 13 -If set to a non\(hyempty string value, it overrides the values of all the other -internationalization variables. -.IP "LC_MESSAGES" 13 -Determines the locale to be used for internationalized messages. -.IP "LANG" 13 -Provides a default value for the internationalization variables that are unset -or null. - -.RE -Internationalization notes: -.br -Be aware that \fInmcli\fP is localized and that's why the output depends on -your environment. This is important to realize especially when you parse the -output. -.br -Call \fInmcli\fP as \fBLC_ALL=C nmcli\fP to be sure the locale is -set to "C" while executing in a script. - -\fBLC_ALL\fP, \fBLC_MESSAGES\fP, \fBLANG\fP variables specify the LC_MESSAGES -locale category (in that order), which determines the language that \fInmcli\fP -uses for messages. The "C" locale is used if none of these variables are set, -and this locale uses English messages. - -.SH EXIT STATUS -\fInmcli\fP exits with status 0 if it succeeds, a value greater than 0 is -returned if an error occurs. -.IP "0" 4 -Success \(en indicates the operation succeeded -.IP "1" 4 -Unknown or unspecified error -.IP "2" 4 -Invalid user input, wrong \fInmcli\fP invocation -.IP "3" 4 -Timeout expired (see commands with \fI\-\-timeout\fP option) -.IP "4" 4 -Connection activation failed -.IP "5" 4 -Connection deactivation failed -.IP "6" 4 -Disconnecting device failed -.IP "7" 4 -Connection deletion failed -.IP "8" 4 -NetworkManager is not running -.IP "9" 4 -\fInmcli\fP and \fINetworkManager\fP versions mismatch - -.SH EXAMPLES -.IP "\fB\f(CWnmcli \-t \-f RUNNING nm\fP\fP" -.IP -tells you whether NetworkManager is running or not. - -.IP "\fB\f(CWnmcli \-t \-f STATE nm\fP\fP" -.IP -shows the overall status of NetworkManager. - -.IP "\fB\f(CWnmcli nm wifi off\fP\fP" -.IP -switches Wi\(hyFi off. - -.IP "\fB\f(CWnmcli \-p con list\fP\fP" -.IP -lists all connections NetworkManager has. - -.IP "\fB\f(CWnmcli \-f name,autoconnect con list\fP\fP" -.IP -lists all connections' names and their autoconnect settings. - -.IP "\fB\f(CWnmcli con list id \(dq\&My wired connection\(dq\&\fP\fP" -.IP -lists all details of the connection with "My wired connection" name. - -.IP "\fB\f(CWnmcli \-p con up id \(dq\&My wired connection\(dq\& iface eth0\fP\fP" -.IP -activates the connection with name "My wired connection" on interface eth0. -The \-p option makes nmcli show progress of the activation. - -.IP "\fB\f(CWnmcli con up uuid 6b028a27\-6dc9\-4411\-9886\-e9ad1dd43761 ap 00:3A:98:7C:42:D3\fP\fP" -.IP -connects the Wi\(hyFi connection with UUID 6b028a27\-6dc9\-4411\-9886\-e9ad1dd43761 to the AP -with BSSID 00:3A:98:7C:42:D3. - -.IP "\fB\f(CWnmcli dev status\fP\fP" -.IP -shows the status for all devices. - -.IP "\fB\f(CWnmcli dev disconnect iface em2\fP\fP" -.IP -disconnects a connection on interface em2 and marks the device as unavailable for -auto\(hyconnecting. That's why no connection will automatically be activated on the -device until the device's "autoconnect" is set to TRUE or user manually activates -a connection. - -.IP "\fB\f(CWnmcli \-f GENERAL,WIFI\-PROPERTIES dev list iface wlan0\fP\fP" -.IP -lists details for wlan0 interface; only GENERAL and WIFI\-PROPERTIES sections will be shown. - -.IP "\fB\f(CWnmcli dev wifi\fP\fP" -.IP -lists available Wi\(hyFi access points known to NetworkManager. - -.IP "\fB\f(CWnmcli dev wifi con \(dq\&Cafe Hotspot 1\(dq\& password caffeine name \(dq\&My cafe\(dq\&\fP\fP" -.IP -creates a new connection named "My cafe" and then connects it to "Cafe Hotspot 1" SSID -using "caffeine" password. This is mainly useful when connecting to "Cafe Hotspot 1" for -the first time. Next time, it is better to use 'nmcli con up id "My cafe"' so that the -existing connection profile can be used and no additional is created. - -.SH BUGS -There are probably some bugs. If you find a bug, please report it to -https://bugzilla.gnome.org/ \(em product \fINetworkManager\fP. - -.SH SEE ALSO -.BR nm\-tool (1), -.BR nm\-online (1), -.BR NetworkManager (8), -.BR nm\-settings (5). diff --git a/man/nmcli.1.in b/man/nmcli.1.in index d1f3a0caa..d7a7a9fdd 100644 --- a/man/nmcli.1.in +++ b/man/nmcli.1.in @@ -530,4 +530,6 @@ https://bugzilla.gnome.org/ \(em product \fINetworkManager\fP. .BR nm\-tool (1), .BR nm\-online (1), .BR NetworkManager (8), -.BR nm\-settings (5). +.BR nm\-settings (5), +.BR nm\applet (1), +.BR nm\-connection\-editor (1). diff --git a/po/pt_BR.po b/po/pt_BR.po index 06339b0c3..cfb50d243 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,30 +1,32 @@ # Brazilian Portuguese translation of NetworkManager. -# Copyright (C) 2004-2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # This file is distributed under the same license as the NetworkManager package. -# Raphael Higino , 2004-2007 +# Raphael Higino , 2004-2007 # Luiz Armesto , 2007. # Henrique P. Machado , 2008, 2010, 2012. # Og Maciel , 2008. # Fabrício Godoy , 2008. +# Enrico Nicoletto , 2013. # msgid "" msgstr "" "Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=NetworkManager&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-02-17 03:24+0000\n" -"PO-Revision-Date: 2012-02-23 01:50-0200\n" -"Last-Translator: Henrique P. Machado \n" -"Language-Team: Brazilian Portuguese \n" +"POT-Creation-Date: 2013-02-10 15:25+0000\n" +"PO-Revision-Date: 2013-02-10 17:03-0300\n" +"Last-Translator: Enrico Nicoletto \n" +"Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Poedit 1.5.4\n" #: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52 -#: ../cli/src/common.c:63 ../cli/src/connections.c:119 -#: ../cli/src/connections.c:153 +#: ../cli/src/common.c:63 ../cli/src/connections.c:133 +#: ../cli/src/connections.c:167 msgid "GROUP" msgstr "GRUPO" @@ -58,18 +60,307 @@ msgstr "WINS" msgid "OPTION" msgstr "OPÇÃO" +#: ../cli/src/common.c:366 +msgid "unmanaged" +msgstr "não gerenciável" + +#: ../cli/src/common.c:368 +msgid "unavailable" +msgstr "não disponível" + +#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120 +msgid "disconnected" +msgstr "desconectado" + +#: ../cli/src/common.c:372 +msgid "connecting (prepare)" +msgstr "conectando (preparando)" + +#: ../cli/src/common.c:374 +msgid "connecting (configuring)" +msgstr "conectando (configurando)" + +#: ../cli/src/common.c:376 +msgid "connecting (need authentication)" +msgstr "conectando (precisa de autenticação)" + +#: ../cli/src/common.c:378 +msgid "connecting (getting IP configuration)" +msgstr "conectando (obtendo configuração de IP)" + +#: ../cli/src/common.c:380 +msgid "connecting (checking IP connectivity)" +msgstr "conectando (verificando conectividade de IP)" + +#: ../cli/src/common.c:382 +msgid "connecting (starting secondary connections)" +msgstr "conectando (iniciando conexões secundárias)" + +#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116 +msgid "connected" +msgstr "conectado" + +#: ../cli/src/common.c:386 ../cli/src/connections.c:466 +msgid "deactivating" +msgstr "desativando" + +#: ../cli/src/common.c:388 +msgid "connection failed" +msgstr "falha na conexão" + +#: ../cli/src/common.c:390 ../cli/src/connections.c:469 +#: ../cli/src/connections.c:492 ../cli/src/connections.c:1187 +#: ../cli/src/devices.c:650 ../cli/src/network-manager.c:123 +#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188 +#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257 +#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431 +#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524 +#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:661 +#: ../cli/src/settings.c:689 ../cli/src/settings.c:751 ../cli/src/utils.c:533 +#: ../src/main.c:434 ../src/main.c:453 +msgid "unknown" +msgstr "desconhecido" + +#: ../cli/src/common.c:399 +msgid "No reason given" +msgstr "Nenhuma razão fornecida" + +#: ../cli/src/common.c:402 +msgid "Unknown error" +msgstr "Erro desconhecido" + +#: ../cli/src/common.c:405 +msgid "Device is now managed" +msgstr "Agora o dispositivo é gerenciável" + +#: ../cli/src/common.c:408 +msgid "Device is now unmanaged" +msgstr "Agora o dispositivo não é gerenciável" + +#: ../cli/src/common.c:411 +msgid "The device could not be readied for configuration" +msgstr "O dispositivo pode não estar pronto para configuração" + +#: ../cli/src/common.c:414 +msgid "" +"IP configuration could not be reserved (no available address, timeout, etc.)" +msgstr "" +"A configuração IP não pode estar reservada (nenhum endereço disponível, " +"timeout, etc)" + +#: ../cli/src/common.c:417 +msgid "The IP configuration is no longer valid" +msgstr "A configuração IP não é mais válida" + +#: ../cli/src/common.c:420 +msgid "Secrets were required, but not provided" +msgstr "Segredos foram requisitados, mas não fornecidos" + +#: ../cli/src/common.c:423 +msgid "802.1X supplicant disconnected" +msgstr "802.1X suplicante - desconectado" + +#: ../cli/src/common.c:426 +msgid "802.1X supplicant configuration failed" +msgstr "802.1X suplicante - falha de configuração" + +#: ../cli/src/common.c:429 +msgid "802.1X supplicant failed" +msgstr "802.1X suplicante - falhou" + +#: ../cli/src/common.c:432 +msgid "802.1X supplicant took too long to authenticate" +msgstr "802.1X suplicante - demorou muito para autenticar" + +#: ../cli/src/common.c:435 +msgid "PPP service failed to start" +msgstr "O serviço PPP falhou ao iniciar" + +#: ../cli/src/common.c:438 +msgid "PPP service disconnected" +msgstr "Serviço PPP desconectado" + +#: ../cli/src/common.c:441 +msgid "PPP failed" +msgstr "O PPP falhou" + +#: ../cli/src/common.c:444 +msgid "DHCP client failed to start" +msgstr "O cliente DHCP falhou ao iniciar" + +#: ../cli/src/common.c:447 +msgid "DHCP client error" +msgstr "Erro no cliente DHCP" + +#: ../cli/src/common.c:450 +msgid "DHCP client failed" +msgstr "O cliente DHCP falhou" + +#: ../cli/src/common.c:453 +msgid "Shared connection service failed to start" +msgstr "O serviço de conexão compartilhada falhou ao iniciar" + +#: ../cli/src/common.c:456 +msgid "Shared connection service failed" +msgstr "falha no serviço de conexão compartilhada" + +#: ../cli/src/common.c:459 +msgid "AutoIP service failed to start" +msgstr "O serviço AutoIP falhou ao iniciar" + +#: ../cli/src/common.c:462 +msgid "AutoIP service error" +msgstr "Erro no serviço AutoIP" + +#: ../cli/src/common.c:465 +msgid "AutoIP service failed" +msgstr "O serviço AutoIP falhou" + +#: ../cli/src/common.c:468 +msgid "The line is busy" +msgstr "A linha está ocupada" + +#: ../cli/src/common.c:471 +msgid "No dial tone" +msgstr "Sem tom de discagem" + +#: ../cli/src/common.c:474 +msgid "No carrier could be established" +msgstr "Nenhum serviço de comunicação pôde ser estabelecido" + +#: ../cli/src/common.c:477 +msgid "The dialing request timed out" +msgstr "Tempo excedido durante a requisição de discagem" + +#: ../cli/src/common.c:480 +msgid "The dialing attempt failed" +msgstr "A tentativa de discagem falhou" + +#: ../cli/src/common.c:483 +msgid "Modem initialization failed" +msgstr "Falha na inicialização do modem" + +#: ../cli/src/common.c:486 +msgid "Failed to select the specified APN" +msgstr "Falha ao selecionar a APN especificada" + +#: ../cli/src/common.c:489 +msgid "Not searching for networks" +msgstr "Não procurando redes" + +#: ../cli/src/common.c:492 +msgid "Network registration denied" +msgstr "Registro na rede negado" + +#: ../cli/src/common.c:495 +msgid "Network registration timed out" +msgstr "Tempo excedido ao registrar na rede" + +#: ../cli/src/common.c:498 +msgid "Failed to register with the requested network" +msgstr "Falha ao registrar com a rede requisitada" + +#: ../cli/src/common.c:501 +msgid "PIN check failed" +msgstr "Verificação de PIN falhou" + +#: ../cli/src/common.c:504 +msgid "Necessary firmware for the device may be missing" +msgstr "O firmware necessário para o dispositivo pode estar faltando" + +#: ../cli/src/common.c:507 +msgid "The device was removed" +msgstr "O dispositivo foi removido" + +#: ../cli/src/common.c:510 +msgid "NetworkManager went to sleep" +msgstr "NetworkManager posto para dormir" + +#: ../cli/src/common.c:513 +msgid "The device's active connection disappeared" +msgstr "A conexão do dispositivo ativo desapareceu" + +#: ../cli/src/common.c:516 +msgid "Device disconnected by user or client" +msgstr "Dispositivo desconectado pelo usuário ou cliente" + +#: ../cli/src/common.c:519 +msgid "Carrier/link changed" +msgstr "Comunicador/link alterado" + +#: ../cli/src/common.c:522 +msgid "The device's existing connection was assumed" +msgstr "A conexão do dispositivo existente foi assumida" + +#: ../cli/src/common.c:525 +msgid "The supplicant is now available" +msgstr "O supplicant agora está disponível" + +#: ../cli/src/common.c:528 +msgid "The modem could not be found" +msgstr "O modem não pôde ser encontrado." + +#: ../cli/src/common.c:531 +msgid "The Bluetooth connection failed or timed out" +msgstr "A conexão Bluetooth falhou ou teve seu tempo excedido" + +#: ../cli/src/common.c:534 +msgid "GSM Modem's SIM card not inserted" +msgstr "Cartão SIM do modem GSM não inserido" + +#: ../cli/src/common.c:537 +msgid "GSM Modem's SIM PIN required" +msgstr "PIN do modem GSM necessário" + +#: ../cli/src/common.c:540 +msgid "GSM Modem's SIM PUK required" +msgstr "PUK do modem GSM necessário" + +#: ../cli/src/common.c:543 +msgid "GSM Modem's SIM wrong" +msgstr "SIM do modem GSM errado" + +#: ../cli/src/common.c:546 +msgid "InfiniBand device does not support connected mode" +msgstr "Dispositivo InfiniBand não oferece suporte ao modo conectado" + +#: ../cli/src/common.c:549 +msgid "A dependency of the connection failed" +msgstr "Uma dependência da conexão falhou" + +#: ../cli/src/common.c:552 +msgid "A problem with the RFC 2684 Ethernet over ADSL bridge" +msgstr "Um problema com a RFC 2684 Ethernet sobre ponte ADSL" + +#: ../cli/src/common.c:555 +msgid "ModemManager is unavailable" +msgstr "ModemManager não está disponível" + +#: ../cli/src/common.c:558 +msgid "The Wi-Fi network could not be found" +msgstr "A rede Wi-Fi não pôde ser encontrada" + +#: ../cli/src/common.c:561 +msgid "A secondary connection of the base connection failed" +msgstr "Uma conexão secundária à conexão base falhou" + +#: ../cli/src/common.c:564 ../cli/src/devices.c:296 ../cli/src/devices.c:314 +#: ../cli/src/devices.c:436 ../cli/src/devices.c:480 +msgid "Unknown" +msgstr "Desconhecido" + #. 0 #. used only for 'GENERAL' group listing -#: ../cli/src/connections.c:56 ../cli/src/connections.c:120 -#: ../cli/src/devices.c:100 ../cli/src/devices.c:121 ../cli/src/devices.c:131 -#: ../cli/src/devices.c:141 ../cli/src/devices.c:155 ../cli/src/devices.c:169 -#: ../cli/src/devices.c:191 +#: ../cli/src/connections.c:60 ../cli/src/connections.c:134 +#: ../cli/src/devices.c:108 ../cli/src/devices.c:132 ../cli/src/devices.c:142 +#: ../cli/src/devices.c:152 ../cli/src/devices.c:166 ../cli/src/devices.c:180 +#: ../cli/src/devices.c:202 ../cli/src/devices.c:218 ../cli/src/devices.c:227 msgid "NAME" msgstr "NOME" #. 0 #. 1 -#: ../cli/src/connections.c:57 ../cli/src/connections.c:121 +#: ../cli/src/connections.c:61 ../cli/src/connections.c:135 msgid "UUID" msgstr "UUID" @@ -77,28 +368,29 @@ msgstr "UUID" #. 0 #. 1 #. 2 -#: ../cli/src/connections.c:58 ../cli/src/connections.c:154 -#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:194 +#: ../cli/src/connections.c:62 ../cli/src/connections.c:168 +#: ../cli/src/devices.c:72 ../cli/src/devices.c:110 ../cli/src/devices.c:205 msgid "TYPE" msgstr "TIPO" #. 2 -#: ../cli/src/connections.c:59 +#: ../cli/src/connections.c:63 msgid "TIMESTAMP" msgstr "HORÁRIO" #. 3 -#: ../cli/src/connections.c:60 +#: ../cli/src/connections.c:64 msgid "TIMESTAMP-REAL" msgstr "HORÁRIO-REAL" #. 4 -#: ../cli/src/connections.c:61 +#. 13 +#: ../cli/src/connections.c:65 ../cli/src/devices.c:122 msgid "AUTOCONNECT" msgstr "AUTOCONECTAR" #. 5 -#: ../cli/src/connections.c:62 +#: ../cli/src/connections.c:66 msgid "READONLY" msgstr "SOMENTE-LEITURA" @@ -107,99 +399,99 @@ msgstr "SOMENTE-LEITURA" #. 2 #. 11 #. 5 -#: ../cli/src/connections.c:63 ../cli/src/connections.c:128 -#: ../cli/src/devices.c:68 ../cli/src/devices.c:181 ../cli/src/devices.c:197 +#: ../cli/src/connections.c:67 ../cli/src/connections.c:142 +#: ../cli/src/devices.c:74 ../cli/src/devices.c:192 ../cli/src/devices.c:208 msgid "DBUS-PATH" msgstr "CAMINHO DBUS" #. 2 -#: ../cli/src/connections.c:122 +#: ../cli/src/connections.c:136 msgid "DEVICES" msgstr "DISPOSITIVOS" #. 3 #. 1 -#. 6 +#. 8 #. 1 -#: ../cli/src/connections.c:123 ../cli/src/devices.c:67 -#: ../cli/src/devices.c:107 ../cli/src/network-manager.c:39 +#: ../cli/src/connections.c:137 ../cli/src/devices.c:73 +#: ../cli/src/devices.c:117 ../cli/src/network-manager.c:39 msgid "STATE" msgstr "ESTADO" #. 4 -#: ../cli/src/connections.c:124 +#: ../cli/src/connections.c:138 msgid "DEFAULT" msgstr "PADRÃO" #. 5 -#: ../cli/src/connections.c:125 +#: ../cli/src/connections.c:139 msgid "DEFAULT6" msgstr "PADRÃO6" #. 6 -#: ../cli/src/connections.c:126 +#: ../cli/src/connections.c:140 msgid "SPEC-OBJECT" msgstr "OBJETO-ESPEC." #. 7 #. 1 -#: ../cli/src/connections.c:127 ../cli/src/connections.c:141 +#: ../cli/src/connections.c:141 ../cli/src/connections.c:155 msgid "VPN" msgstr "VPN" #. 9 -#: ../cli/src/connections.c:129 +#: ../cli/src/connections.c:143 msgid "CON-PATH" msgstr "CAMINHO CON" #. 10 -#: ../cli/src/connections.c:130 +#: ../cli/src/connections.c:144 msgid "ZONE" msgstr "ZONA" #. 11 -#: ../cli/src/connections.c:131 +#: ../cli/src/connections.c:145 msgid "MASTER-PATH" msgstr "CAMINHO PRINCIPAL" -#: ../cli/src/connections.c:139 ../cli/src/devices.c:77 +#: ../cli/src/connections.c:153 ../cli/src/devices.c:83 msgid "GENERAL" msgstr "GERAL" #. 0 -#: ../cli/src/connections.c:140 +#: ../cli/src/connections.c:154 msgid "IP" msgstr "IP" #. 1 -#: ../cli/src/connections.c:155 +#: ../cli/src/connections.c:169 msgid "USERNAME" msgstr "NOME DE USUÁRIO" #. 2 -#: ../cli/src/connections.c:156 +#: ../cli/src/connections.c:170 msgid "GATEWAY" msgstr "MÁQUINA" #. 3 -#: ../cli/src/connections.c:157 +#: ../cli/src/connections.c:171 msgid "BANNER" msgstr "BANNER" #. 4 -#: ../cli/src/connections.c:158 +#: ../cli/src/connections.c:172 msgid "VPN-STATE" msgstr "ESTADO VPN" #. 5 -#: ../cli/src/connections.c:159 +#: ../cli/src/connections.c:173 msgid "CFG" msgstr "CFG" -#: ../cli/src/connections.c:180 +#: ../cli/src/connections.c:195 #, c-format msgid "" -"Usage: nmcli con { COMMAND | help }\n" +"Usage: nmcli connection { COMMAND | help }\n" " COMMAND := { list | status | up | down | delete }\n" "\n" " list [id | uuid ]\n" @@ -210,390 +502,377 @@ msgid "" "]\n" " down id | uuid \n" " delete id | uuid \n" +"\n" msgstr "" -"Uso: nmcli con { COMANDO | help }\n" +"Utilização: nmcli connection { COMANDO | help }\n" " COMANDO := { list | status | up | down | delete }\n" "\n" " list [id | uuid ]\n" " status [id | uuid | path ]\n" " up id | uuid [iface ] [ap ] [nsp ] [--" -"nowait] [--timeout ]\n" +"nowait] [--timeout ]\n" " up id | uuid [iface ] [ap ] [--nowait] [--timeout " -"]\n" +"]\n" " down id | uuid \n" " delete id | uuid \n" +"\n" -#: ../cli/src/connections.c:234 ../cli/src/connections.c:567 +#: ../cli/src/connections.c:256 ../cli/src/connections.c:442 #, c-format msgid "Error: 'con list': %s" msgstr "Erro: \"con list\": %s" -#: ../cli/src/connections.c:236 ../cli/src/connections.c:569 +#: ../cli/src/connections.c:258 ../cli/src/connections.c:444 #, c-format msgid "Error: 'con list': %s; allowed fields: %s" msgstr "Erro: \"con list\": %s; campos permitidos: %s" -#: ../cli/src/connections.c:244 +#: ../cli/src/connections.c:266 msgid "Connection details" msgstr "Detalhes da conexão" -#: ../cli/src/connections.c:442 +#: ../cli/src/connections.c:317 msgid "never" msgstr "nunca" #. "CAPABILITIES" #. Print header #. "WIFI-PROPERTIES" -#: ../cli/src/connections.c:443 ../cli/src/connections.c:444 -#: ../cli/src/connections.c:681 ../cli/src/connections.c:682 -#: ../cli/src/connections.c:684 ../cli/src/devices.c:586 -#: ../cli/src/devices.c:639 ../cli/src/devices.c:750 ../cli/src/devices.c:751 -#: ../cli/src/devices.c:783 ../cli/src/devices.c:809 ../cli/src/devices.c:810 -#: ../cli/src/devices.c:811 ../cli/src/devices.c:812 ../cli/src/devices.c:813 -#: ../cli/src/settings.c:576 ../cli/src/settings.c:646 -#: ../cli/src/settings.c:766 ../cli/src/settings.c:1048 -#: ../cli/src/settings.c:1049 ../cli/src/settings.c:1051 -#: ../cli/src/settings.c:1053 ../cli/src/settings.c:1054 -#: ../cli/src/settings.c:1182 ../cli/src/settings.c:1183 -#: ../cli/src/settings.c:1184 ../cli/src/settings.c:1185 -#: ../cli/src/settings.c:1260 ../cli/src/settings.c:1261 -#: ../cli/src/settings.c:1262 ../cli/src/settings.c:1263 -#: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265 -#: ../cli/src/settings.c:1266 ../cli/src/settings.c:1267 -#: ../cli/src/settings.c:1268 ../cli/src/settings.c:1269 -#: ../cli/src/settings.c:1270 ../cli/src/settings.c:1271 -#: ../cli/src/settings.c:1272 ../cli/src/settings.c:1343 +#: ../cli/src/connections.c:318 ../cli/src/connections.c:319 +#: ../cli/src/connections.c:550 ../cli/src/connections.c:551 +#: ../cli/src/connections.c:553 ../cli/src/devices.c:444 +#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616 +#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676 +#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679 +#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:267 +#: ../cli/src/settings.c:866 ../cli/src/settings.c:941 +#: ../cli/src/settings.c:1076 ../cli/src/settings.c:1166 +#: ../cli/src/settings.c:1376 ../cli/src/settings.c:1377 +#: ../cli/src/settings.c:1379 ../cli/src/settings.c:1381 +#: ../cli/src/settings.c:1382 ../cli/src/settings.c:1513 +#: ../cli/src/settings.c:1514 ../cli/src/settings.c:1515 +#: ../cli/src/settings.c:1516 ../cli/src/settings.c:1594 +#: ../cli/src/settings.c:1595 ../cli/src/settings.c:1596 +#: ../cli/src/settings.c:1597 ../cli/src/settings.c:1598 +#: ../cli/src/settings.c:1599 ../cli/src/settings.c:1600 +#: ../cli/src/settings.c:1601 ../cli/src/settings.c:1602 +#: ../cli/src/settings.c:1603 ../cli/src/settings.c:1604 +#: ../cli/src/settings.c:1605 ../cli/src/settings.c:1606 +#: ../cli/src/settings.c:1688 ../cli/src/settings.c:2044 +#: ../cli/src/settings.c:2081 msgid "yes" msgstr "sim" -#: ../cli/src/connections.c:443 ../cli/src/connections.c:444 -#: ../cli/src/connections.c:681 ../cli/src/connections.c:682 -#: ../cli/src/connections.c:684 ../cli/src/devices.c:586 -#: ../cli/src/devices.c:639 ../cli/src/devices.c:750 ../cli/src/devices.c:751 -#: ../cli/src/devices.c:783 ../cli/src/devices.c:809 ../cli/src/devices.c:810 -#: ../cli/src/devices.c:811 ../cli/src/devices.c:812 ../cli/src/devices.c:813 -#: ../cli/src/settings.c:576 ../cli/src/settings.c:578 -#: ../cli/src/settings.c:646 ../cli/src/settings.c:766 -#: ../cli/src/settings.c:1048 ../cli/src/settings.c:1049 -#: ../cli/src/settings.c:1051 ../cli/src/settings.c:1053 -#: ../cli/src/settings.c:1054 ../cli/src/settings.c:1182 -#: ../cli/src/settings.c:1183 ../cli/src/settings.c:1184 -#: ../cli/src/settings.c:1185 ../cli/src/settings.c:1260 -#: ../cli/src/settings.c:1261 ../cli/src/settings.c:1262 -#: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264 -#: ../cli/src/settings.c:1265 ../cli/src/settings.c:1266 -#: ../cli/src/settings.c:1267 ../cli/src/settings.c:1268 -#: ../cli/src/settings.c:1269 ../cli/src/settings.c:1270 -#: ../cli/src/settings.c:1271 ../cli/src/settings.c:1272 -#: ../cli/src/settings.c:1343 +#: ../cli/src/connections.c:318 ../cli/src/connections.c:319 +#: ../cli/src/connections.c:550 ../cli/src/connections.c:551 +#: ../cli/src/connections.c:553 ../cli/src/devices.c:444 +#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616 +#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676 +#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679 +#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:269 +#: ../cli/src/settings.c:866 ../cli/src/settings.c:868 +#: ../cli/src/settings.c:941 ../cli/src/settings.c:1076 +#: ../cli/src/settings.c:1166 ../cli/src/settings.c:1376 +#: ../cli/src/settings.c:1377 ../cli/src/settings.c:1379 +#: ../cli/src/settings.c:1381 ../cli/src/settings.c:1382 +#: ../cli/src/settings.c:1513 ../cli/src/settings.c:1514 +#: ../cli/src/settings.c:1515 ../cli/src/settings.c:1516 +#: ../cli/src/settings.c:1594 ../cli/src/settings.c:1595 +#: ../cli/src/settings.c:1596 ../cli/src/settings.c:1597 +#: ../cli/src/settings.c:1598 ../cli/src/settings.c:1599 +#: ../cli/src/settings.c:1600 ../cli/src/settings.c:1601 +#: ../cli/src/settings.c:1602 ../cli/src/settings.c:1603 +#: ../cli/src/settings.c:1604 ../cli/src/settings.c:1605 +#: ../cli/src/settings.c:1606 ../cli/src/settings.c:1688 +#: ../cli/src/settings.c:2044 ../cli/src/settings.c:2081 msgid "no" msgstr "não" -#: ../cli/src/connections.c:518 +#: ../cli/src/connections.c:393 msgid "Connection list" msgstr "Lista de conexões" -#: ../cli/src/connections.c:531 ../cli/src/connections.c:1064 -#: ../cli/src/connections.c:1808 ../cli/src/connections.c:1823 -#: ../cli/src/connections.c:1832 ../cli/src/connections.c:1842 -#: ../cli/src/connections.c:1854 ../cli/src/connections.c:1949 -#: ../cli/src/connections.c:2051 ../cli/src/devices.c:1190 -#: ../cli/src/devices.c:1200 ../cli/src/devices.c:1314 -#: ../cli/src/devices.c:1322 ../cli/src/devices.c:1535 -#: ../cli/src/devices.c:1542 +#: ../cli/src/connections.c:406 ../cli/src/connections.c:946 +#: ../cli/src/connections.c:1484 ../cli/src/connections.c:1499 +#: ../cli/src/connections.c:1508 ../cli/src/connections.c:1518 +#: ../cli/src/connections.c:1530 ../cli/src/connections.c:1639 +#: ../cli/src/connections.c:1741 ../cli/src/devices.c:1129 +#: ../cli/src/devices.c:1139 ../cli/src/devices.c:1257 +#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1629 +#: ../cli/src/devices.c:1636 ../cli/src/devices.c:1650 +#: ../cli/src/devices.c:1657 ../cli/src/devices.c:1674 +#: ../cli/src/devices.c:1685 ../cli/src/devices.c:1906 +#: ../cli/src/devices.c:1913 #, c-format msgid "Error: %s argument is missing." -msgstr "Erro: faltando argumento %s." +msgstr "Erro: está faltando o argumento %s." -#: ../cli/src/connections.c:544 +#: ../cli/src/connections.c:419 #, c-format msgid "Error: %s - no such connection." msgstr "Erro: %s - não existe esta conexão." -#: ../cli/src/connections.c:550 ../cli/src/connections.c:1867 -#: ../cli/src/connections.c:1966 ../cli/src/connections.c:2058 -#: ../cli/src/devices.c:987 ../cli/src/devices.c:1067 -#: ../cli/src/devices.c:1214 ../cli/src/devices.c:1328 -#: ../cli/src/devices.c:1548 +#: ../cli/src/connections.c:425 ../cli/src/connections.c:1543 +#: ../cli/src/connections.c:1656 ../cli/src/connections.c:1748 +#: ../cli/src/devices.c:913 ../cli/src/devices.c:993 ../cli/src/devices.c:1153 +#: ../cli/src/devices.c:1271 ../cli/src/devices.c:1698 +#: ../cli/src/devices.c:1919 #, c-format msgid "Unknown parameter: %s\n" msgstr "Parâmetro desconhecido: %s\n" -#: ../cli/src/connections.c:559 +#: ../cli/src/connections.c:434 #, c-format msgid "Error: no valid parameter specified." msgstr "Erro: nenhum parâmetro válido especificado." -#: ../cli/src/connections.c:574 ../cli/src/connections.c:2151 -#: ../cli/src/devices.c:1756 ../cli/src/network-manager.c:456 +#: ../cli/src/connections.c:449 ../cli/src/connections.c:1844 +#: ../cli/src/devices.c:2130 ../cli/src/network-manager.c:599 #, c-format msgid "Error: %s." msgstr "Erro: %s." -#: ../cli/src/connections.c:587 +#: ../cli/src/connections.c:462 msgid "activating" msgstr "ativando" -#: ../cli/src/connections.c:589 +#: ../cli/src/connections.c:464 msgid "activated" msgstr "ativado" -#: ../cli/src/connections.c:591 ../cli/src/devices.c:261 -msgid "deactivating" -msgstr "desativando" - -#: ../cli/src/connections.c:594 ../cli/src/connections.c:617 -#: ../cli/src/connections.c:1680 ../cli/src/devices.c:265 -#: ../cli/src/devices.c:784 ../cli/src/network-manager.c:111 -#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:176 -#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:291 -#: ../cli/src/network-manager.c:346 ../cli/src/network-manager.c:384 -#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:531 -#: ../cli/src/utils.c:499 ../src/main.c:443 ../src/main.c:462 -msgid "unknown" -msgstr "desconhecido" - -#: ../cli/src/connections.c:603 +#: ../cli/src/connections.c:478 msgid "VPN connecting (prepare)" msgstr "Conexão VPN (preparando)" -#: ../cli/src/connections.c:605 +#: ../cli/src/connections.c:480 msgid "VPN connecting (need authentication)" msgstr "Conexão VPN (precisa de autenticação)" -#: ../cli/src/connections.c:607 +#: ../cli/src/connections.c:482 msgid "VPN connecting" msgstr "Conexão VPN" -#: ../cli/src/connections.c:609 +#: ../cli/src/connections.c:484 msgid "VPN connecting (getting IP configuration)" msgstr "Conexão VPN (obtendo configuração de IP)" -#: ../cli/src/connections.c:611 +#: ../cli/src/connections.c:486 msgid "VPN connected" msgstr "VPN conectada" -#: ../cli/src/connections.c:613 +#: ../cli/src/connections.c:488 msgid "VPN connection failed" msgstr "Conexão VPN falhou" -#: ../cli/src/connections.c:615 +#: ../cli/src/connections.c:490 msgid "VPN disconnected" msgstr "VPN desconectada" -#: ../cli/src/connections.c:868 ../cli/src/connections.c:1092 +#: ../cli/src/connections.c:546 ../cli/src/connections.c:556 +msgid "N/A" +msgstr "N/A" + +#: ../cli/src/connections.c:750 ../cli/src/connections.c:974 #, c-format msgid "Error: 'con status': %s" msgstr "Erro: \"con status\": %s" -#: ../cli/src/connections.c:870 ../cli/src/connections.c:1094 +#: ../cli/src/connections.c:752 ../cli/src/connections.c:976 #, c-format msgid "Error: 'con status': %s; allowed fields: %s" msgstr "Erro: \"con status\": %s; campos permitidos: %s" -#: ../cli/src/connections.c:878 +#: ../cli/src/connections.c:760 msgid "Active connection details" msgstr "Detalhe das conexões ativas" -#: ../cli/src/connections.c:1014 ../cli/src/connections.c:1882 -#: ../cli/src/connections.c:1981 ../cli/src/connections.c:2072 -#: ../cli/src/devices.c:1014 ../cli/src/devices.c:1076 -#: ../cli/src/devices.c:1229 ../cli/src/devices.c:1358 -#: ../cli/src/devices.c:1577 +#: ../cli/src/connections.c:896 ../cli/src/connections.c:1558 +#: ../cli/src/connections.c:1671 ../cli/src/connections.c:1762 +#: ../cli/src/devices.c:940 ../cli/src/devices.c:1002 +#: ../cli/src/devices.c:1168 ../cli/src/devices.c:1301 +#: ../cli/src/devices.c:1720 ../cli/src/devices.c:1948 +#: ../cli/src/network-manager.c:311 #, c-format msgid "Error: Can't find out if NetworkManager is running: %s." msgstr "" "Erro: não foi possível descobrir se o NetworkManager está em execução: %s." -#: ../cli/src/connections.c:1018 ../cli/src/connections.c:1886 -#: ../cli/src/connections.c:1985 ../cli/src/connections.c:2076 -#: ../cli/src/devices.c:1018 ../cli/src/devices.c:1080 -#: ../cli/src/devices.c:1233 ../cli/src/devices.c:1362 -#: ../cli/src/devices.c:1581 +#: ../cli/src/connections.c:900 ../cli/src/connections.c:1562 +#: ../cli/src/connections.c:1675 ../cli/src/connections.c:1766 +#: ../cli/src/devices.c:944 ../cli/src/devices.c:1006 +#: ../cli/src/devices.c:1172 ../cli/src/devices.c:1305 +#: ../cli/src/devices.c:1724 ../cli/src/devices.c:1952 +#: ../cli/src/network-manager.c:315 #, c-format msgid "Error: NetworkManager is not running." msgstr "Erro: O NetworkManager não está em execução." -#: ../cli/src/connections.c:1050 +#: ../cli/src/connections.c:932 msgid "Active connections" msgstr "Conexões ativas" -#: ../cli/src/connections.c:1075 +#: ../cli/src/connections.c:957 #, c-format msgid "Error: '%s' is not an active connection." msgstr "Erro: \"%s\" - não é uma conexão ativa." -#: ../cli/src/connections.c:1080 +#: ../cli/src/connections.c:962 #, c-format msgid "Error: unknown parameter: %s" msgstr "Erro: Parâmetro desconhecido: %s" -#: ../cli/src/connections.c:1564 +#: ../cli/src/connections.c:1069 #, c-format msgid "no active connection on device '%s'" msgstr "nenhuma conexão ativa no dispositivo \"%s\"" -#: ../cli/src/connections.c:1572 -#, c-format +#: ../cli/src/connections.c:1077 msgid "no active connection or device" msgstr "nenhuma conexão ou dispositivo ativo" -#: ../cli/src/connections.c:1643 +#: ../cli/src/connections.c:1148 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "dispositivo \"%s\" não é compatível com a conexão \"%s\"" -#: ../cli/src/connections.c:1645 +#: ../cli/src/connections.c:1151 #, c-format msgid "no device found for connection '%s'" msgstr "nenhum dispositivo encontrado para a conexão \"%s\"" -#: ../cli/src/connections.c:1656 +#: ../cli/src/connections.c:1163 msgid "unknown reason" msgstr "razão desconhecida" -#: ../cli/src/connections.c:1658 +#: ../cli/src/connections.c:1165 msgid "none" msgstr "nenhum(a)" -#: ../cli/src/connections.c:1660 +#: ../cli/src/connections.c:1167 msgid "the user was disconnected" msgstr "o usuário foi desconectado" -#: ../cli/src/connections.c:1662 +#: ../cli/src/connections.c:1169 msgid "the base network connection was interrupted" -msgstr "a conexão de rede base foi interrompida" +msgstr "a conexão base de rede foi interrompida" -#: ../cli/src/connections.c:1664 +#: ../cli/src/connections.c:1171 msgid "the VPN service stopped unexpectedly" msgstr "o serviço VPN parou inesperadamente" -#: ../cli/src/connections.c:1666 +#: ../cli/src/connections.c:1173 msgid "the VPN service returned invalid configuration" msgstr "o serviço VPN retornou uma configuração inválida" -#: ../cli/src/connections.c:1668 +#: ../cli/src/connections.c:1175 msgid "the connection attempt timed out" msgstr "tentativa de conexão esgotada" -#: ../cli/src/connections.c:1670 +#: ../cli/src/connections.c:1177 msgid "the VPN service did not start in time" msgstr "o serviço VPN não iniciou a tempo" -#: ../cli/src/connections.c:1672 +#: ../cli/src/connections.c:1179 msgid "the VPN service failed to start" msgstr "o serviço VPN falhou ao iniciar" -#: ../cli/src/connections.c:1674 +#: ../cli/src/connections.c:1181 msgid "no valid VPN secrets" msgstr "sem segredos VPN válidos" -#: ../cli/src/connections.c:1676 +#: ../cli/src/connections.c:1183 msgid "invalid VPN secrets" msgstr "segredos VPN inválidos" -#: ../cli/src/connections.c:1678 +#: ../cli/src/connections.c:1185 msgid "the connection was removed" msgstr "a conexão foi removida" -#: ../cli/src/connections.c:1692 +#: ../cli/src/connections.c:1202 ../cli/src/connections.c:1407 #, c-format -msgid "state: %s\n" -msgstr "estado: %s\n" +msgid "Connection successfully activated (D-Bus active path: %s)\n" +msgstr "Conexão ativada com sucesso (caminho ativo D-Bus: %s)\n" -#: ../cli/src/connections.c:1695 ../cli/src/connections.c:1721 -#, c-format -msgid "Connection activated\n" -msgstr "Conexão ativada\n" - -#: ../cli/src/connections.c:1698 +#. Active connection failed and dissapeared, quit. +#: ../cli/src/connections.c:1207 ../cli/src/connections.c:1308 #, c-format msgid "Error: Connection activation failed." msgstr "Erro: a ativação da conexão falhou." -#: ../cli/src/connections.c:1717 +#: ../cli/src/connections.c:1232 #, c-format -msgid "state: %s (%d)\n" -msgstr "estado: %s (%d)\n" +msgid "VPN connection successfully activated (D-Bus active path: %s)\n" +msgstr "Conexão VPN ativada com sucesso (caminho ativo D-Bus: %s)\n" -#: ../cli/src/connections.c:1727 +#: ../cli/src/connections.c:1240 #, c-format msgid "Error: Connection activation failed: %s." msgstr "Erro: a ativação da conexão falhou: %s." -#: ../cli/src/connections.c:1744 ../cli/src/devices.c:1136 +#: ../cli/src/connections.c:1337 ../cli/src/devices.c:1062 #, c-format msgid "Error: Timeout %d sec expired." msgstr "Erro: tempo expirado - %d seg." -#: ../cli/src/connections.c:1757 +#: ../cli/src/connections.c:1398 #, c-format msgid "Error: Connection activation failed: %s" msgstr "Erro: a ativação da conexão falhou: %s" -#: ../cli/src/connections.c:1763 -#, c-format -msgid "Active connection state: %s\n" -msgstr "Estado da conexão ativa: %s\n" - -#: ../cli/src/connections.c:1764 -#, c-format -msgid "Active connection path: %s\n" -msgstr "Caminho da conexão ativa: %s\n" - -#: ../cli/src/connections.c:1816 ../cli/src/connections.c:1957 -#: ../cli/src/connections.c:2085 +#: ../cli/src/connections.c:1492 ../cli/src/connections.c:1647 +#: ../cli/src/connections.c:1775 #, c-format msgid "Error: Unknown connection: %s." msgstr "Erro: conexão desconhecida: %s." -#: ../cli/src/connections.c:1862 ../cli/src/devices.c:1208 +#: ../cli/src/connections.c:1538 ../cli/src/devices.c:1147 +#: ../cli/src/devices.c:1693 #, c-format msgid "Error: timeout value '%s' is not valid." msgstr "Erro: valor do tempo de expiração \"%s\" não é válido." -#: ../cli/src/connections.c:1875 ../cli/src/connections.c:1974 -#: ../cli/src/connections.c:2065 +#: ../cli/src/connections.c:1551 ../cli/src/connections.c:1664 +#: ../cli/src/connections.c:1755 #, c-format msgid "Error: id or uuid has to be specified." -msgstr "Erro: id ou uuid tem que ser especificada." +msgstr "Erro: id ou uuid tem que ser especificado." -#: ../cli/src/connections.c:1903 +#: ../cli/src/connections.c:1584 #, c-format msgid "Error: No suitable device found: %s." msgstr "Erro: nenhum dispositivo adequado encontrado: %s." -#: ../cli/src/connections.c:1905 +#: ../cli/src/connections.c:1586 #, c-format msgid "Error: No suitable device found." msgstr "Erro: nenhum dispositivo adequado encontrado." -#: ../cli/src/connections.c:2010 +#: ../cli/src/connections.c:1700 #, c-format msgid "Warning: Connection not active\n" msgstr "Aviso: conexão inativa\n" -#: ../cli/src/connections.c:2024 +#: ../cli/src/connections.c:1714 #, c-format msgid "Error: Connection deletion failed: %s" msgstr "Erro: a exclusão da conexão falhou: %s" -#: ../cli/src/connections.c:2142 +#: ../cli/src/connections.c:1835 #, c-format msgid "Error: 'con' command '%s' is not valid." msgstr "Erro: comando \"con\" \"%s\" não é válido." -#: ../cli/src/connections.c:2207 +#: ../cli/src/connections.c:1903 #, c-format msgid "Error: could not connect to D-Bus." msgstr "Erro: não foi possível conectar ao D-Bus." -#: ../cli/src/connections.c:2215 +#: ../cli/src/connections.c:1911 #, c-format msgid "Error: Could not get system settings." -msgstr "Erro: não foi possível obter as configurações do sistema." +msgstr "Erro: Não foi possível obter as configurações do sistema." -#: ../cli/src/connections.c:2225 +#: ../cli/src/connections.c:1921 #, c-format msgid "Error: Can't obtain connections: settings service is not running." msgstr "" @@ -603,711 +882,564 @@ msgstr "" #. 0 #. 9 #. 3 -#: ../cli/src/devices.c:65 ../cli/src/devices.c:101 ../cli/src/devices.c:179 -#: ../cli/src/devices.c:195 +#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:190 +#: ../cli/src/devices.c:206 msgid "DEVICE" msgstr "DISPOSITIVO" #. 0 -#: ../cli/src/devices.c:78 +#: ../cli/src/devices.c:84 msgid "CAPABILITIES" msgstr "CAPACIDADES" #. 1 -#: ../cli/src/devices.c:79 +#: ../cli/src/devices.c:85 msgid "WIFI-PROPERTIES" msgstr "PROPRIEDADES (WI-FI)" #. 2 -#: ../cli/src/devices.c:80 +#: ../cli/src/devices.c:86 msgid "AP" msgstr "AP" #. 3 -#: ../cli/src/devices.c:81 +#: ../cli/src/devices.c:87 msgid "WIRED-PROPERTIES" msgstr "PROPRIEDADES (CABO)" #. 4 -#: ../cli/src/devices.c:82 +#: ../cli/src/devices.c:88 msgid "WIMAX-PROPERTIES" msgstr "PROPRIEDADES (WIMAX)" #. 5 #. 0 -#: ../cli/src/devices.c:83 ../cli/src/devices.c:192 +#: ../cli/src/devices.c:89 ../cli/src/devices.c:203 msgid "NSP" msgstr "NSP" #. 6 -#: ../cli/src/devices.c:84 +#: ../cli/src/devices.c:90 msgid "IP4" msgstr "IP4" #. 7 -#: ../cli/src/devices.c:85 +#: ../cli/src/devices.c:91 msgid "DHCP4" msgstr "DHCP4" #. 8 -#: ../cli/src/devices.c:86 +#: ../cli/src/devices.c:92 msgid "IP6" msgstr "IP6" #. 9 -#: ../cli/src/devices.c:87 +#: ../cli/src/devices.c:93 msgid "DHCP6" msgstr "DHCP6" +#. 10 +#: ../cli/src/devices.c:94 +msgid "BOND" +msgstr "VÍNCULO" + +#. 11 +#: ../cli/src/devices.c:95 +msgid "VLAN" +msgstr "VLAN" + #. 2 -#: ../cli/src/devices.c:103 +#: ../cli/src/devices.c:111 msgid "VENDOR" msgstr "FABRICANTE" #. 3 -#: ../cli/src/devices.c:104 +#: ../cli/src/devices.c:112 msgid "PRODUCT" msgstr "PRODUTO" #. 4 -#: ../cli/src/devices.c:105 +#: ../cli/src/devices.c:113 msgid "DRIVER" msgstr "CONTROLADOR" #. 5 -#: ../cli/src/devices.c:106 -msgid "HWADDR" -msgstr "HWADDR" +#: ../cli/src/devices.c:114 +msgid "DRIVER-VERSION" +msgstr "VERSÃO-CONTROLADOR" + +#. 6 +#: ../cli/src/devices.c:115 +msgid "FIRMWARE-VERSION" +msgstr "VERSÃO-FIRMWARE" #. 7 -#: ../cli/src/devices.c:108 +#: ../cli/src/devices.c:116 +msgid "HWADDR" +msgstr "ENDEREÇO-HW" + +#. 9 +#: ../cli/src/devices.c:118 msgid "REASON" msgstr "RAZÃO" -#. 8 -#: ../cli/src/devices.c:109 +#. 10 +#: ../cli/src/devices.c:119 msgid "UDI" msgstr "UDI" -#. 9 -#: ../cli/src/devices.c:110 +#. 11 +#: ../cli/src/devices.c:120 msgid "IP-IFACE" msgstr "IP (IFACE)" -#. 10 -#: ../cli/src/devices.c:111 -msgid "NM-MANAGED" -msgstr "GERENCIADO (NM)" - -#. 11 -#: ../cli/src/devices.c:112 -msgid "FIRMWARE-MISSING" -msgstr "FALTANDO FIRMWARE" - -#. 12 -#: ../cli/src/devices.c:113 -msgid "CONNECTION" -msgstr "CONEXÃO" - -#. 0 -#: ../cli/src/devices.c:122 -msgid "CARRIER-DETECT" -msgstr "CARRIER-DETECT" - -#. 1 -#: ../cli/src/devices.c:123 -msgid "SPEED" -msgstr "VELOCIDADE" - -#. 0 -#: ../cli/src/devices.c:132 -msgid "CARRIER" -msgstr "PROVEDOR" - -#. 0 -#: ../cli/src/devices.c:142 -msgid "WEP" -msgstr "WEP" - -#. 1 -#: ../cli/src/devices.c:143 -msgid "WPA" -msgstr "WPA" - -#. 2 -#: ../cli/src/devices.c:144 -msgid "WPA2" -msgstr "WPA2" - -#. 3 -#: ../cli/src/devices.c:145 -msgid "TKIP" -msgstr "TKIP" - -#. 4 -#: ../cli/src/devices.c:146 -msgid "CCMP" -msgstr "CCMP" - -#. 0 -#: ../cli/src/devices.c:156 -msgid "CTR-FREQ" -msgstr "CTR FREQ" - -#. 1 -#: ../cli/src/devices.c:157 -msgid "RSSI" -msgstr "RSSI" - -#. 2 -#: ../cli/src/devices.c:158 -msgid "CINR" -msgstr "CINR" - -#. 3 -#: ../cli/src/devices.c:159 -msgid "TX-POW" -msgstr "TX-POW" - -#. 4 -#: ../cli/src/devices.c:160 -msgid "BSID" -msgstr "BSID" - -#. 0 -#: ../cli/src/devices.c:170 -msgid "SSID" -msgstr "SSID" - -#. 1 -#: ../cli/src/devices.c:171 -msgid "BSSID" -msgstr "BSSID" - -#. 2 -#: ../cli/src/devices.c:172 -msgid "MODE" -msgstr "MODO" - -#. 3 -#: ../cli/src/devices.c:173 -msgid "FREQ" -msgstr "FREQ" - -#. 4 -#: ../cli/src/devices.c:174 -msgid "RATE" -msgstr "TAXA" - -#. 5 -#. 1 -#: ../cli/src/devices.c:175 ../cli/src/devices.c:193 -msgid "SIGNAL" -msgstr "SINAL" - -#. 6 -#: ../cli/src/devices.c:176 -msgid "SECURITY" -msgstr "SEGURANÇA" - -#. 7 -#: ../cli/src/devices.c:177 -msgid "WPA-FLAGS" -msgstr "FLAGS WPA" - -#. 8 -#: ../cli/src/devices.c:178 -msgid "RSN-FLAGS" -msgstr "FLAGS RSN" - -#. 10 -#. 4 -#: ../cli/src/devices.c:180 ../cli/src/devices.c:196 -msgid "ACTIVE" -msgstr "ATIVO" - -#: ../cli/src/devices.c:213 -#, c-format -msgid "" -"Usage: nmcli dev { COMMAND | help }\n" -"\n" -" COMMAND := { status | list | disconnect | wifi | wimax }\n" -"\n" -" COMMAND := { status | list | disconnect | wifi }\n" -"\n" -" status\n" -" list [iface ]\n" -" disconnect iface [--nowait] [--timeout ]\n" -" wifi [list [iface ] [bssid ]]\n" -" wimax [list [iface ] [nsp ]]\n" -"\n" -msgstr "" -"Uso: nmcli dev { COMANDO | help }\n" -"\n" -" COMANDO := { status | list | disconnect | wifi | wimax }\n" -"\n" -" COMANDO := { status | list | disconnect | wifi }\n" -"\n" -" status\n" -" list [iface ]\n" -" disconnect iface [--nowait] [--timeout ]\n" -" wifi [list [iface ] [bssid ]]\n" -" wimax [list [iface ] [nsp ]]\n" -"\n" - -#: ../cli/src/devices.c:241 -msgid "unmanaged" -msgstr "não gerenciável" - -#: ../cli/src/devices.c:243 -msgid "unavailable" -msgstr "não disponível" - -#: ../cli/src/devices.c:245 ../cli/src/network-manager.c:108 -msgid "disconnected" -msgstr "desconectado" - -#: ../cli/src/devices.c:247 -msgid "connecting (prepare)" -msgstr "conectando (preparando)" - -#: ../cli/src/devices.c:249 -msgid "connecting (configuring)" -msgstr "conectando (configurando)" - -#: ../cli/src/devices.c:251 -msgid "connecting (need authentication)" -msgstr "conectando (precisa de autenticação)" - -#: ../cli/src/devices.c:253 -msgid "connecting (getting IP configuration)" -msgstr "conectando (obtendo configuração de IP)" - -#: ../cli/src/devices.c:255 -msgid "connecting (checking IP connectivity)" -msgstr "conectando (verificando conectividade de IP)" - -#: ../cli/src/devices.c:257 -msgid "connecting (starting secondary connections)" -msgstr "conectando (iniciando conexões secundárias)" - -#: ../cli/src/devices.c:259 ../cli/src/network-manager.c:104 -msgid "connected" -msgstr "conectado" - -#: ../cli/src/devices.c:263 -msgid "connection failed" -msgstr "falha na conexão" - -#: ../cli/src/devices.c:274 -msgid "No reason given" -msgstr "Nenhuma razão fornecida" - -#: ../cli/src/devices.c:277 -msgid "Unknown error" -msgstr "Erro desconhecido" - -#: ../cli/src/devices.c:280 -msgid "Device is now managed" -msgstr "Dispositivo agora é gerenciável" - -#: ../cli/src/devices.c:283 -msgid "Device is now unmanaged" -msgstr "Dispositivo agora não é gerenciável" - -#: ../cli/src/devices.c:286 -msgid "The device could not be readied for configuration" -msgstr "O dispositivo pode não estar pronto para configuração" - -#: ../cli/src/devices.c:289 -msgid "" -"IP configuration could not be reserved (no available address, timeout, etc)" -msgstr "" -"A configuração IP pode não estar reservada (nenhum endereço disponível, " -"timeout, etc)" - -#: ../cli/src/devices.c:292 -msgid "The IP configuration is no longer valid" -msgstr "A configuração IP não é mais válida" - -#: ../cli/src/devices.c:295 -msgid "Secrets were required, but not provided" -msgstr "Segredos foram requisitados, mas não fornecidos" - -#: ../cli/src/devices.c:298 -msgid "802.1X supplicant disconnected" -msgstr "802.1X supplicant - desconectado" - -#: ../cli/src/devices.c:301 -msgid "802.1X supplicant configuration failed" -msgstr "802.1X supplicant - falha de configuração" - -#: ../cli/src/devices.c:304 -msgid "802.1X supplicant failed" -msgstr "802.1X supplicant - falhou" - -#: ../cli/src/devices.c:307 -msgid "802.1X supplicant took too long to authenticate" -msgstr "802.1X supplicant - demorou muito para autenticar" - -#: ../cli/src/devices.c:310 -msgid "PPP service failed to start" -msgstr "O serviço PPP falhou ao iniciar" - -#: ../cli/src/devices.c:313 -msgid "PPP service disconnected" -msgstr "Serviço PPP desconectado" - -#: ../cli/src/devices.c:316 -msgid "PPP failed" -msgstr "O PPP falhou" - -#: ../cli/src/devices.c:319 -msgid "DHCP client failed to start" -msgstr "O cliente DHCP falhou ao iniciar" - -#: ../cli/src/devices.c:322 -msgid "DHCP client error" -msgstr "Erro no cliente DHCP" - -#: ../cli/src/devices.c:325 -msgid "DHCP client failed" -msgstr "O cliente DHCP falhou" - -#: ../cli/src/devices.c:328 -msgid "Shared connection service failed to start" -msgstr "O serviço de conexão compartilhada falhou ao iniciar" - -#: ../cli/src/devices.c:331 -msgid "Shared connection service failed" -msgstr "falha no serviço de conexão compartilhada" - -#: ../cli/src/devices.c:334 -msgid "AutoIP service failed to start" -msgstr "O serviço AutoIP falhou ao iniciar" - -#: ../cli/src/devices.c:337 -msgid "AutoIP service error" -msgstr "Erro no serviço AutoIP" - -#: ../cli/src/devices.c:340 -msgid "AutoIP service failed" -msgstr "O serviço AutoIP falhou" +#. 12 +#: ../cli/src/devices.c:121 +msgid "NM-MANAGED" +msgstr "GERENCIADO (NM)" -#: ../cli/src/devices.c:343 -msgid "The line is busy" -msgstr "A linha está ocupada" +#. 14 +#: ../cli/src/devices.c:123 +msgid "FIRMWARE-MISSING" +msgstr "FALTANDO FIRMWARE" -#: ../cli/src/devices.c:346 -msgid "No dial tone" -msgstr "Sem tom de discagem" +#. 15 +#: ../cli/src/devices.c:124 +msgid "CONNECTION" +msgstr "CONEXÃO" -#: ../cli/src/devices.c:349 -msgid "No carrier could be established" -msgstr "Nenhum serviço de comunicação pôde ser estabelecido" +#. 0 +#: ../cli/src/devices.c:133 +msgid "CARRIER-DETECT" +msgstr "PORTADORA-DETECTADA" -#: ../cli/src/devices.c:352 -msgid "The dialing request timed out" -msgstr "Tempo excedido durante a requisição de discagem" +#. 1 +#: ../cli/src/devices.c:134 +msgid "SPEED" +msgstr "VELOCIDADE" -#: ../cli/src/devices.c:355 -msgid "The dialing attempt failed" -msgstr "A tentativa de discagem falhou" +#. 0 +#: ../cli/src/devices.c:143 +msgid "CARRIER" +msgstr "PROVEDOR" -#: ../cli/src/devices.c:358 -msgid "Modem initialization failed" -msgstr "Falha na inicialização do modem" +#. 0 +#: ../cli/src/devices.c:153 +msgid "WEP" +msgstr "WEP" -#: ../cli/src/devices.c:361 -msgid "Failed to select the specified APN" -msgstr "Falha ao selecionar a APN especificada" +#. 1 +#: ../cli/src/devices.c:154 +msgid "WPA" +msgstr "WPA" -#: ../cli/src/devices.c:364 -msgid "Not searching for networks" -msgstr "Não procurando redes" +#. 2 +#: ../cli/src/devices.c:155 +msgid "WPA2" +msgstr "WPA2" -#: ../cli/src/devices.c:367 -msgid "Network registration denied" -msgstr "Registro na rede negado" +#. 3 +#: ../cli/src/devices.c:156 +msgid "TKIP" +msgstr "TKIP" -#: ../cli/src/devices.c:370 -msgid "Network registration timed out" -msgstr "Tempo excedido ao registrar na rede" +#. 4 +#: ../cli/src/devices.c:157 +msgid "CCMP" +msgstr "CCMP" -#: ../cli/src/devices.c:373 -msgid "Failed to register with the requested network" -msgstr "Falha ao registrar com a rede requisitada" +#. 0 +#: ../cli/src/devices.c:167 +msgid "CTR-FREQ" +msgstr "CTR FREQ" -#: ../cli/src/devices.c:376 -msgid "PIN check failed" -msgstr "Verificação de PIN falhou" +#. 1 +#: ../cli/src/devices.c:168 +msgid "RSSI" +msgstr "RSSI" -#: ../cli/src/devices.c:379 -msgid "Necessary firmware for the device may be missing" -msgstr "O firmware necessário para o dispositivo pode estar faltando" +#. 2 +#: ../cli/src/devices.c:169 +msgid "CINR" +msgstr "CINR" -#: ../cli/src/devices.c:382 -msgid "The device was removed" -msgstr "O dispositivo foi removido" +#. 3 +#: ../cli/src/devices.c:170 +msgid "TX-POW" +msgstr "TX-POW" -#: ../cli/src/devices.c:385 -msgid "NetworkManager went to sleep" -msgstr "NetworkManager posto para dormir" +#. 4 +#: ../cli/src/devices.c:171 +msgid "BSID" +msgstr "BSID" -#: ../cli/src/devices.c:388 -msgid "The device's active connection disappeared" -msgstr "A conexão do dispositivo ativo desapareceu" +#. 0 +#: ../cli/src/devices.c:181 +msgid "SSID" +msgstr "SSID" -#: ../cli/src/devices.c:391 -msgid "Device disconnected by user or client" -msgstr "Dispositivo desconectado pelo usuário ou cliente" +#. 1 +#: ../cli/src/devices.c:182 +msgid "BSSID" +msgstr "BSSID" -#: ../cli/src/devices.c:394 -msgid "Carrier/link changed" -msgstr "Comunicador/link alterado" +#. 2 +#: ../cli/src/devices.c:183 +msgid "MODE" +msgstr "MODO" -#: ../cli/src/devices.c:397 -msgid "The device's existing connection was assumed" -msgstr "A conexão do dispositivo existente foi assumida" +#. 3 +#: ../cli/src/devices.c:184 +msgid "FREQ" +msgstr "FREQ" -#: ../cli/src/devices.c:400 -msgid "The supplicant is now available" -msgstr "O supplicant agora está disponível" +#. 4 +#: ../cli/src/devices.c:185 +msgid "RATE" +msgstr "TAXA" -#: ../cli/src/devices.c:403 -msgid "The modem could not be found" -msgstr "O modem não pôde ser encontrado." +#. 5 +#. 1 +#: ../cli/src/devices.c:186 ../cli/src/devices.c:204 +msgid "SIGNAL" +msgstr "SINAL" -#: ../cli/src/devices.c:406 -msgid "The Bluetooth connection failed or timed out" -msgstr "A conexão Bluetooth falhou ou teve seu tempo excedido" +#. 6 +#: ../cli/src/devices.c:187 +msgid "SECURITY" +msgstr "SEGURANÇA" -#: ../cli/src/devices.c:409 -msgid "GSM Modem's SIM card not inserted" -msgstr "Cartão SIM do modem GSM não inserido" +#. 7 +#: ../cli/src/devices.c:188 +msgid "WPA-FLAGS" +msgstr "FLAGS WPA" -#: ../cli/src/devices.c:412 -msgid "GSM Modem's SIM PIN required" -msgstr "PIN do modem GSM necessário" +#. 8 +#: ../cli/src/devices.c:189 +msgid "RSN-FLAGS" +msgstr "FLAGS RSN" -#: ../cli/src/devices.c:415 -msgid "GSM Modem's SIM PUK required" -msgstr "PUK do modem GSM necessário" +#. 10 +#. 4 +#: ../cli/src/devices.c:191 ../cli/src/devices.c:207 +msgid "ACTIVE" +msgstr "ATIVO" -#: ../cli/src/devices.c:418 -msgid "GSM Modem's SIM wrong" -msgstr "SIM do modem GSM errado" +#. 0 +#: ../cli/src/devices.c:219 +msgid "SLAVES" +msgstr "ESCRAVOS" -#: ../cli/src/devices.c:421 -msgid "InfiniBand device does not support connected mode" -msgstr "Dispositivo InfiniBand não oferece suporte ao modo conectado" +#. 0 +#: ../cli/src/devices.c:228 +msgid "ID" +msgstr "ID" -#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458 -#: ../cli/src/devices.c:578 ../cli/src/devices.c:622 -msgid "Unknown" -msgstr "Desconhecido" +#: ../cli/src/devices.c:244 +#, c-format +msgid "" +"Usage: nmcli device { COMMAND | help }\n" +"\n" +" COMMAND := { status | list | disconnect | wifi | wimax }\n" +"\n" +" COMMAND := { status | list | disconnect | wifi }\n" +"\n" +" status\n" +" list [iface ]\n" +" disconnect iface [--nowait] [--timeout ]\n" +" wifi [list [iface ] [bssid ]]\n" +" wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] " +"[iface ] [bssid ] [name ]\n" +" [--private] [--nowait] [--timeout ]\n" +" wimax [list [iface ] [nsp ]]\n" +"\n" +msgstr "" +"Utilização: nmcli device { COMANDO | help }\n" +"\n" +" COMANDO := { status | list | disconnect | wifi | wimax }\n" +"\n" +" COMANDO := { status | list | disconnect | wifi }\n" +"\n" +" status\n" +" list [iface ]\n" +" disconnect iface [--nowait] [--timeout ]\n" +" wifi [list [iface ] [bssid ]]\n" +" wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] [iface " +"] [bssid ] [name ]\n" +" [--private] [--nowait] [--timeout ]\n" +" wimax [list [iface ] [nsp ]]\n" +"\n" -#: ../cli/src/devices.c:491 +#: ../cli/src/devices.c:347 msgid "(none)" msgstr "(nenhum(a))" -#: ../cli/src/devices.c:547 +#: ../cli/src/devices.c:403 #, c-format msgid "%u MHz" msgstr "%u MHz" -#: ../cli/src/devices.c:548 +#: ../cli/src/devices.c:404 #, c-format msgid "%u MB/s" msgstr "%u MB/s" -#: ../cli/src/devices.c:557 +#: ../cli/src/devices.c:413 msgid "Encrypted: " msgstr "Criptografada:" -#: ../cli/src/devices.c:562 +#: ../cli/src/devices.c:418 msgid "WEP " msgstr "WEP " -#: ../cli/src/devices.c:564 +#: ../cli/src/devices.c:420 msgid "WPA " msgstr "WPA " -#: ../cli/src/devices.c:566 +#: ../cli/src/devices.c:422 msgid "WPA2 " msgstr "WPA2 " -#: ../cli/src/devices.c:569 +#: ../cli/src/devices.c:425 msgid "Enterprise " -msgstr "Enterprise " +msgstr "Empresarial" -#: ../cli/src/devices.c:578 +#: ../cli/src/devices.c:434 msgid "Ad-Hoc" msgstr "Ad-Hoc" -#: ../cli/src/devices.c:578 +#: ../cli/src/devices.c:435 msgid "Infrastructure" msgstr "Infraestrutura" -#: ../cli/src/devices.c:613 +#: ../cli/src/devices.c:471 msgid "Home" -msgstr "Home" +msgstr "Residencial" -#: ../cli/src/devices.c:616 +#: ../cli/src/devices.c:474 msgid "Partner" msgstr "Parceiro" -#: ../cli/src/devices.c:619 +#: ../cli/src/devices.c:477 msgid "Roaming" msgstr "Roaming" -#: ../cli/src/devices.c:691 +#: ../cli/src/devices.c:549 #, c-format msgid "Error: 'dev list': %s" msgstr "Erro: \"dev list\": %s" -#: ../cli/src/devices.c:693 +#: ../cli/src/devices.c:551 #, c-format msgid "Error: 'dev list': %s; allowed fields: %s" msgstr "Erro: \"dev list\": %s; campos permitidos: %s" -#: ../cli/src/devices.c:702 +#: ../cli/src/devices.c:560 msgid "Device details" msgstr "Detalhes do dispositivo" -#: ../cli/src/devices.c:744 ../cli/src/devices.c:745 ../cli/src/devices.c:1152 -#: ../cli/src/utils.c:445 +#: ../cli/src/devices.c:607 ../cli/src/devices.c:610 ../cli/src/devices.c:1088 +#: ../cli/src/utils.c:479 msgid "(unknown)" msgstr "(desconhecido)" -#: ../cli/src/devices.c:753 +#: ../cli/src/devices.c:619 msgid "not connected" msgstr "não conectado" -#: ../cli/src/devices.c:780 +#: ../cli/src/devices.c:646 #, c-format msgid "%u Mb/s" msgstr "%u Mb/s" #. Print header #. "WIRED-PROPERTIES" -#: ../cli/src/devices.c:853 +#: ../cli/src/devices.c:720 msgid "on" msgstr "ligado" -#: ../cli/src/devices.c:853 +#: ../cli/src/devices.c:720 msgid "off" msgstr "desligado" -#: ../cli/src/devices.c:1004 +#: ../cli/src/devices.c:930 #, c-format msgid "Error: 'dev status': %s" msgstr "Erro: \"dev status\": %s" -#: ../cli/src/devices.c:1006 +#: ../cli/src/devices.c:932 #, c-format msgid "Error: 'dev status': %s; allowed fields: %s" msgstr "Erro: \"dev status\": %s; campos permitidos: %s" -#: ../cli/src/devices.c:1029 +#: ../cli/src/devices.c:955 msgid "Status of devices" msgstr "Status dos dispositivos" -#: ../cli/src/devices.c:1060 +#: ../cli/src/devices.c:986 #, c-format msgid "Error: '%s' argument is missing." msgstr "Erro: argumento \"%s\" está faltando." -#: ../cli/src/devices.c:1101 ../cli/src/devices.c:1253 -#: ../cli/src/devices.c:1390 ../cli/src/devices.c:1609 +#: ../cli/src/devices.c:1027 ../cli/src/devices.c:1192 +#: ../cli/src/devices.c:1333 ../cli/src/devices.c:1980 #, c-format msgid "Error: Device '%s' not found." msgstr "Erro: dispositivo \"%s\" não encontrado." -#: ../cli/src/devices.c:1124 +#: ../cli/src/devices.c:1050 #, c-format msgid "Success: Device '%s' successfully disconnected." msgstr "Sucesso: dispositivo \"%s\" desconectado com sucesso." -#: ../cli/src/devices.c:1149 +#: ../cli/src/devices.c:1085 #, c-format msgid "Error: Device '%s' (%s) disconnecting failed: %s" msgstr "Erro: desconexão do dispositivo \"%s\" (%s) falhou: %s" -#: ../cli/src/devices.c:1157 +#: ../cli/src/devices.c:1098 #, c-format -msgid "Device state: %d (%s)\n" -msgstr "Estado do dispositivo: %d (%s)\n" +msgid "Device '%s' has been disconnected.\n" +msgstr "O dispositivo \"%s\" foi desconectado.\n" -#: ../cli/src/devices.c:1222 +#: ../cli/src/devices.c:1161 #, c-format msgid "Error: iface has to be specified." msgstr "Erro: iface tem que ser especificada." -#: ../cli/src/devices.c:1348 +#: ../cli/src/devices.c:1291 #, c-format msgid "Error: 'dev wifi': %s" msgstr "Erro: \"dev wifi\": %s" -#: ../cli/src/devices.c:1350 +#: ../cli/src/devices.c:1293 #, c-format msgid "Error: 'dev wifi': %s; allowed fields: %s" msgstr "Erro: \"dev wifi\": %s; campos permitidos: %s" -#: ../cli/src/devices.c:1373 +#: ../cli/src/devices.c:1316 msgid "WiFi scan list" msgstr "Lista de varredura de redes sem fio" -#: ../cli/src/devices.c:1410 ../cli/src/devices.c:1464 +#: ../cli/src/devices.c:1353 ../cli/src/devices.c:1407 #, c-format msgid "Error: Access point with bssid '%s' not found." msgstr "Erro: Ponto de acesso com bssid \"%s\" não encontrado." -#: ../cli/src/devices.c:1427 +#: ../cli/src/devices.c:1370 #, c-format msgid "Error: Device '%s' is not a WiFi device." msgstr "Erro: dispositivo \"%s\" não é um dispositivo sem fio." -#: ../cli/src/devices.c:1491 +#: ../cli/src/devices.c:1438 ../cli/src/devices.c:1484 +#, c-format +msgid "Connection with UUID '%s' created and activated on device '%s'\n" +msgstr "Conexão com UUID '%s' foi criada e ativada no dispositivo '%s'\n" + +#: ../cli/src/devices.c:1443 +#, c-format +msgid "Error: Connection activation failed: (%d) %s." +msgstr "Erro: Falha na ativação da conexão: (%d) %s." + +#: ../cli/src/devices.c:1468 +#, c-format +msgid "Error: Failed to add/activate new connection: (%d) %s" +msgstr "Erro: Falha ao adicionar/ativar nova conexão: (%d) %s" + +#: ../cli/src/devices.c:1476 +#, c-format +msgid "Error: Failed to add/activate new connection: Unknown error" +msgstr "" +"Erro: Ocorreu falha ao adicionar/ativar nova conexão: Erro desconhecido" + +#: ../cli/src/devices.c:1620 +#, c-format +msgid "Error: SSID or BSSID are missing." +msgstr "Erro: SSID ou BSSID estão faltando." + +#: ../cli/src/devices.c:1643 +#, c-format +msgid "Error: bssid argument value '%s' is not a valid BSSID." +msgstr "Erro: o valor do argumento bssid '%s' não é um BSSID válido." + +#: ../cli/src/devices.c:1667 +#, c-format +msgid "" +"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'." +msgstr "" +"Erro: o valor do argumento wep-key-type '%s' é inválido, utilize 'key' ou " +"'phrase'." + +#: ../cli/src/devices.c:1707 +#, c-format +msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)." +msgstr "Erro: BSSID para conectar-se a (%s) é diferente do argumento (%s)." + +#: ../cli/src/devices.c:1713 +#, c-format +msgid "Error: Parameter '%s' is neither SSID nor BSSID." +msgstr "Erro: o parâmetro '%s' não é SSID nem BSSID." + +#: ../cli/src/devices.c:1742 +#, c-format +msgid "Error: Device '%s' is not a Wi-Fi device." +msgstr "Erro: o dispositivo \"%s\" não é um dispositivo Wi-Fi." + +#: ../cli/src/devices.c:1744 +#, c-format +msgid "Error: No Wi-Fi device found." +msgstr "Erro: nenhum dispositivo Wi-Fi encontrado." + +#: ../cli/src/devices.c:1762 +#, c-format +msgid "Error: No network with SSID '%s' found." +msgstr "Erro: nenhuma rede com SSID '%s' foi encontrada." + +#: ../cli/src/devices.c:1764 +#, c-format +msgid "Error: No access point with BSSID '%s' found." +msgstr "Erro: nenhum ponto de acesso com BSSID '%s' encontrado." + +#: ../cli/src/devices.c:1862 #, c-format msgid "Error: 'dev wifi' command '%s' is not valid." msgstr "Erro: comando \"dev wifi %s\" é inválido." -#: ../cli/src/devices.c:1567 +#: ../cli/src/devices.c:1938 #, c-format msgid "Error: 'dev wimax': %s" msgstr "Erro: \"dev wimax\": %s" -#: ../cli/src/devices.c:1569 +#: ../cli/src/devices.c:1940 #, c-format msgid "Error: 'dev wimax': %s; allowed fields: %s" msgstr "Erro: \"dev wimax\": %s; campos permitidos: %s" -#: ../cli/src/devices.c:1592 +#: ../cli/src/devices.c:1963 msgid "WiMAX NSP list" msgstr "lista WiMAX NSP" -#: ../cli/src/devices.c:1629 +#: ../cli/src/devices.c:2000 #, c-format msgid "Error: NSP with name '%s' not found." msgstr "Erro: NSP chamado \"%s\" não encontrado." -#: ../cli/src/devices.c:1640 +#: ../cli/src/devices.c:2011 #, c-format msgid "Error: Device '%s' is not a WiMAX device." msgstr "Erro: dispositivo \"%s\" não é um dispositivo WiMAX." -#: ../cli/src/devices.c:1671 +#: ../cli/src/devices.c:2042 #, c-format msgid "Error: Access point with nsp '%s' not found." msgstr "Erro: Ponto de acesso com nsp \"%s\" não encontrado." -#: ../cli/src/devices.c:1698 +#: ../cli/src/devices.c:2069 #, c-format msgid "Error: 'dev wimax' command '%s' is not valid." msgstr "Erro: comando \"dev wimax %s\" é inválido." -#: ../cli/src/devices.c:1748 +#: ../cli/src/devices.c:2122 #, c-format msgid "Error: 'dev' command '%s' is not valid." msgstr "Erro: comando \"dev %s\" é inválido." @@ -1356,16 +1488,27 @@ msgstr "HARDWARE WIMAX" msgid "WIMAX" msgstr "WIMAX" -#: ../cli/src/network-manager.c:67 +#: ../cli/src/network-manager.c:62 +msgid "PERMISSION" +msgstr "PERMISSÃO" + +#. 0 +#: ../cli/src/network-manager.c:63 +msgid "VALUE" +msgstr "VALOR" + +#: ../cli/src/network-manager.c:77 #, c-format msgid "" "Usage: nmcli nm { COMMAND | help }\n" "\n" -" COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n" +" COMMAND := { status | permissions | enable | sleep | wifi | wwan | " +"wimax }\n" "\n" -" COMMAND := { status | enable | sleep | wifi | wwan }\n" +" COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n" "\n" " status\n" +" permissions\n" " enable [true|false]\n" " sleep [true|false]\n" " wifi [on|off]\n" @@ -1373,13 +1516,15 @@ msgid "" " wimax [on|off]\n" "\n" msgstr "" -"Uso: nmcli nm { COMANDO | help }\n" +"Utilização: nmcli nm { COMANDO | help }\n" "\n" -" COMANDO := { status | enable | sleep | wifi | wwan | wimax }\n" +" COMANDO := { status | permissions | enable | sleep | wifi | wwan | " +"wimax }\n" "\n" -" COMANDO := { status | enable | sleep | wifi | wwan }\n" +" COMANDO := { status | permissions | enable | sleep | wifi | wwan }\n" "\n" " status\n" +" permissions\n" " enable [true|false]\n" " sleep [true|false]\n" " wifi [on|off]\n" @@ -1387,142 +1532,160 @@ msgstr "" " wimax [on|off]\n" "\n" -#: ../cli/src/network-manager.c:96 +#: ../cli/src/network-manager.c:108 msgid "asleep" msgstr "adormecido" -#: ../cli/src/network-manager.c:98 +#: ../cli/src/network-manager.c:110 msgid "connecting" msgstr "conectando" -#: ../cli/src/network-manager.c:100 +#: ../cli/src/network-manager.c:112 msgid "connected (local only)" msgstr "conectado (somente local)" -#: ../cli/src/network-manager.c:102 +#: ../cli/src/network-manager.c:114 msgid "connected (site only)" msgstr "conectado (somente site)" -#: ../cli/src/network-manager.c:106 +#: ../cli/src/network-manager.c:118 msgid "disconnecting" msgstr "desconectando" -#: ../cli/src/network-manager.c:146 +#: ../cli/src/network-manager.c:158 #, c-format msgid "Error: 'nm status': %s" msgstr "Erro: \"nm status\": %s" -#: ../cli/src/network-manager.c:148 +#: ../cli/src/network-manager.c:160 #, c-format msgid "Error: 'nm status': %s; allowed fields: %s" msgstr "Erro: \"nm status\": %s; campos permitidos: %s" #. create NMClient -#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162 -#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164 -#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167 -#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289 -#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382 -#: ../cli/src/network-manager.c:421 +#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174 +#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176 +#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179 +#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429 +#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522 +#: ../cli/src/network-manager.c:561 msgid "enabled" msgstr "habilitado" -#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162 -#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164 -#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167 -#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289 -#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382 -#: ../cli/src/network-manager.c:421 +#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174 +#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176 +#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179 +#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429 +#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522 +#: ../cli/src/network-manager.c:561 msgid "disabled" msgstr "desabilitado" -#: ../cli/src/network-manager.c:181 +#: ../cli/src/network-manager.c:193 msgid "NetworkManager status" msgstr "Status do NetworkManager" #. Print header -#: ../cli/src/network-manager.c:184 +#: ../cli/src/network-manager.c:196 msgid "running" msgstr "executando" -#: ../cli/src/network-manager.c:184 +#: ../cli/src/network-manager.c:196 msgid "not running" msgstr "não executando" -#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:425 +#: ../cli/src/network-manager.c:271 +msgid "auth" +msgstr "auth" + +#: ../cli/src/network-manager.c:301 +#, c-format +msgid "Error: 'nm permissions': %s" +msgstr "Erro: \"permissões do nm\": %s" + +#: ../cli/src/network-manager.c:303 +#, c-format +msgid "Error: 'nm permissions': %s; allowed fields: %s" +msgstr "Erro: \"permissões do nm\": %s; campos permitidos: %s" + +#: ../cli/src/network-manager.c:324 +msgid "NetworkManager permissions" +msgstr "Permissões do NetworkManager" + +#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:459 #, c-format msgid "Error: Couldn't connect to system bus: %s" msgstr "Erro: não foi possível conectar bus do sistema: %s" -#: ../cli/src/network-manager.c:226 +#: ../cli/src/network-manager.c:361 #, c-format msgid "Error: Couldn't create D-Bus object proxy." msgstr "Erro: não foi possível criar um objeto proxy D-Bus." -#: ../cli/src/network-manager.c:232 +#: ../cli/src/network-manager.c:367 #, c-format msgid "Error in sleep: %s" msgstr "Erro ao dormir: %s" -#: ../cli/src/network-manager.c:276 ../cli/src/network-manager.c:331 -#: ../cli/src/network-manager.c:369 ../cli/src/network-manager.c:408 +#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471 +#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548 #, c-format msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s" msgstr "Erro: valor \"--fields %s\" não é válido aqui; campos permitidos: %s" -#: ../cli/src/network-manager.c:284 +#: ../cli/src/network-manager.c:424 msgid "Networking enabled" msgstr "Comunicação em redes habilitada" -#: ../cli/src/network-manager.c:300 +#: ../cli/src/network-manager.c:440 #, c-format msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'." msgstr "" "Erro: parâmetro \"enable\" inválido: \"%s\"; use \"true\" ou \"false\"." -#: ../cli/src/network-manager.c:310 +#: ../cli/src/network-manager.c:450 #, c-format msgid "Error: Sleeping status is not exported by NetworkManager." msgstr "Erro: Status de \"dormência\" não é exportado pelo NetworkManager." -#: ../cli/src/network-manager.c:318 +#: ../cli/src/network-manager.c:458 #, c-format msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'." msgstr "Erro: parâmetro \"sleep\" inválido: \"%s\"; use \"true\" ou \"false\"." -#: ../cli/src/network-manager.c:339 +#: ../cli/src/network-manager.c:479 msgid "WiFi enabled" msgstr "WiFi habilitado" -#: ../cli/src/network-manager.c:355 +#: ../cli/src/network-manager.c:495 #, c-format msgid "Error: invalid 'wifi' parameter: '%s'." msgstr "Erro: parâmetro \"wifi\" inválido: \"%s\"" -#: ../cli/src/network-manager.c:377 +#: ../cli/src/network-manager.c:517 msgid "WWAN enabled" msgstr "WWAN habilitado" -#: ../cli/src/network-manager.c:393 +#: ../cli/src/network-manager.c:533 #, c-format msgid "Error: invalid 'wwan' parameter: '%s'." msgstr "Erro: parâmetro \"wwan\" inválido: \"%s\"" -#: ../cli/src/network-manager.c:416 +#: ../cli/src/network-manager.c:556 msgid "WiMAX enabled" msgstr "WiMAX habilitado" -#: ../cli/src/network-manager.c:432 +#: ../cli/src/network-manager.c:572 #, c-format msgid "Error: invalid 'wimax' parameter: '%s'." msgstr "Erro: parâmetro \"wimax\" inválido: \"%s\"." -#: ../cli/src/network-manager.c:445 +#: ../cli/src/network-manager.c:588 #, c-format msgid "Error: 'nm' command '%s' is not valid." msgstr "Erro: comando \"nm %s\" é inválido." -#: ../cli/src/nmcli.c:64 +#: ../cli/src/nmcli.c:76 #, c-format msgid "" "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" @@ -1540,222 +1703,263 @@ msgid "" " -h[elp] print this help\n" "\n" "OBJECT\n" -" nm NetworkManager status\n" -" con NetworkManager connections\n" -" dev devices managed by NetworkManager\n" +" nm NetworkManager's status\n" +" c[onnection] NetworkManager's connections\n" +" d[evice] devices managed by NetworkManager\n" "\n" msgstr "" -"Uso: %s [OPÇÕES] OBJETO { COMANDO | help }\n" +"Utilização: %s [OPÇÕES] OBJETO { COMANDO | help }\n" "\n" "OPÇÕES\n" " -t[erse] saída precisa\n" -" -p[retty] saída elegante\n" -" -m[ode] tabular|multiline modo de visão\n" +" -p[retty] saída elegante\n" +" -m[ode] tabular|multiline modo de visão da saída\n" " -f[ields] |all|common especifica os campos para " "saída\n" -" -e[scape] yes|no escapa separadores de coluunas " +" -e[scape] yes|no descarta separadores de colunas " "em valores\n" -" -n[ocheck] não verifica versões do nmcli e " -"do NetworkManager\n" +" -n[ocheck] não verifica as versões do " +"nmcli e do NetworkManager\n" " -v[ersion] mostra a versão do programa\n" -" -h[elp] imprime esta ajuda\n" +" -h[elp] exibe esta ajuda\n" "\n" "OBJETO\n" -" nm Status do NetworkManager\n" -" con Conexões do NetworkManager\n" -" dev dispositivos gerenciados pelo NetworkManager\n" +" nm Status do NetworkManager\n" +" c[onnection] Conexões do NetworkManager\n" +" d[evice] dispositivos gerenciados pelo NetworkManager\n" "\n" -#: ../cli/src/nmcli.c:109 +#: ../cli/src/nmcli.c:124 #, c-format msgid "Error: Object '%s' is unknown, try 'nmcli help'." msgstr "Erro: Objeto \"%s\" é desconhecido, tente \"nmcli help\"." -#: ../cli/src/nmcli.c:139 +#: ../cli/src/nmcli.c:154 #, c-format msgid "Error: Option '--terse' is specified the second time." msgstr "Erro: Opção \"--terse\" especificada pela segunda vez." -#: ../cli/src/nmcli.c:144 +#: ../cli/src/nmcli.c:159 #, c-format msgid "Error: Option '--terse' is mutually exclusive with '--pretty'." msgstr "Erro: Opção \"--terse\" é mutualmente exclusiva com \"--pretty\"." -#: ../cli/src/nmcli.c:152 +#: ../cli/src/nmcli.c:167 #, c-format msgid "Error: Option '--pretty' is specified the second time." msgstr "Erro: Opção \"--pretty\" especificada pela segunda vez." -#: ../cli/src/nmcli.c:157 +#: ../cli/src/nmcli.c:172 #, c-format msgid "Error: Option '--pretty' is mutually exclusive with '--terse'." msgstr "Erro: Opção \"--pretty\" é mutualmente exclusiva com \"--terse\"." -#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183 +#: ../cli/src/nmcli.c:182 ../cli/src/nmcli.c:198 #, c-format msgid "Error: missing argument for '%s' option." msgstr "Erro: faltando argumento para a opção \"%s\"." -#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192 +#: ../cli/src/nmcli.c:191 ../cli/src/nmcli.c:207 #, c-format msgid "Error: '%s' is not valid argument for '%s' option." msgstr "Erro: argumento \"%s\" não é válido para a opção \"%s\"." -#: ../cli/src/nmcli.c:199 +#: ../cli/src/nmcli.c:214 #, c-format msgid "Error: fields for '%s' options are missing." msgstr "Erro: faltando campos para as opções \"%s\"." -#: ../cli/src/nmcli.c:207 +#: ../cli/src/nmcli.c:222 #, c-format msgid "nmcli tool, version %s\n" msgstr "ferramenta nmcli, versão %s\n" -#: ../cli/src/nmcli.c:213 +#: ../cli/src/nmcli.c:228 #, c-format msgid "Error: Option '%s' is unknown, try 'nmcli -help'." msgstr "Erro: Opção \"%s\" é desconhecida, tente \"nmcli -help\"." -#: ../cli/src/nmcli.c:232 +#: ../cli/src/nmcli.c:247 #, c-format msgid "Caught signal %d, shutting down..." msgstr "Sinal capturado %d, desligando..." -#: ../cli/src/nmcli.c:257 +#: ../cli/src/nmcli.c:272 msgid "Error: Could not create NMClient object." msgstr "Erro: não foi possível criar objeto NMClient." -#: ../cli/src/nmcli.c:273 +#: ../cli/src/nmcli.c:288 msgid "Success" msgstr "Sucesso" -#: ../cli/src/settings.c:465 +#: ../cli/src/settings.c:595 #, c-format msgid "%d (hex-ascii-key)" msgstr "%d (chave-ascii-hex)" -#: ../cli/src/settings.c:467 +#: ../cli/src/settings.c:597 #, c-format msgid "%d (104/128-bit passphrase)" msgstr "%d (palavra-chave de 104/128-bit)" -#: ../cli/src/settings.c:470 +#: ../cli/src/settings.c:600 ../cli/src/settings.c:728 #, c-format msgid "%d (unknown)" msgstr "%d (desconhecido)" -#: ../cli/src/settings.c:496 +#: ../cli/src/settings.c:626 msgid "0 (unknown)" msgstr "0 (desconhecido)" -#: ../cli/src/settings.c:502 +#: ../cli/src/settings.c:632 msgid "any, " msgstr "qualquer, " -#: ../cli/src/settings.c:504 +#: ../cli/src/settings.c:634 msgid "900 MHz, " msgstr "900 MHz, " -#: ../cli/src/settings.c:506 +#: ../cli/src/settings.c:636 msgid "1800 MHz, " msgstr "1800 MHz, " -#: ../cli/src/settings.c:508 +#: ../cli/src/settings.c:638 msgid "1900 MHz, " msgstr "1900 MHz, " -#: ../cli/src/settings.c:510 +#: ../cli/src/settings.c:640 msgid "850 MHz, " msgstr "850 MHz, " -#: ../cli/src/settings.c:512 +#: ../cli/src/settings.c:642 msgid "WCDMA 3GPP UMTS 2100 MHz, " msgstr "WCDMA 3GPP UMTS 2100 MHz, " -#: ../cli/src/settings.c:514 +#: ../cli/src/settings.c:644 msgid "WCDMA 3GPP UMTS 1800 MHz, " msgstr "WCDMA 3GPP UMTS 1800 MHz, " -#: ../cli/src/settings.c:516 +#: ../cli/src/settings.c:646 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, " msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, " -#: ../cli/src/settings.c:518 +#: ../cli/src/settings.c:648 msgid "WCDMA 3GPP UMTS 800 MHz, " msgstr "WCDMA 3GPP UMTS 800 MHz, " -#: ../cli/src/settings.c:520 +#: ../cli/src/settings.c:650 msgid "WCDMA 3GPP UMTS 850 MHz, " msgstr "WCDMA 3GPP UMTS 850 MHz, " -#: ../cli/src/settings.c:522 +#: ../cli/src/settings.c:652 msgid "WCDMA 3GPP UMTS 900 MHz, " msgstr "WCDMA 3GPP UMTS 900 MHz, " -#: ../cli/src/settings.c:524 +#: ../cli/src/settings.c:654 msgid "WCDMA 3GPP UMTS 1700 MHz, " msgstr "WCDMA 3GPP UMTS 1700 MHz, " -#: ../cli/src/settings.c:526 +#: ../cli/src/settings.c:656 msgid "WCDMA 3GPP UMTS 1900 MHz, " msgstr "WCDMA 3GPP UMTS 1900 MHz, " -#: ../cli/src/settings.c:528 +#: ../cli/src/settings.c:658 msgid "WCDMA 3GPP UMTS 2600 MHz, " msgstr "WCDMA 3GPP UMTS 2600 MHz, " -#: ../cli/src/settings.c:650 ../cli/src/settings.c:846 -#: ../cli/src/settings.c:1550 +#: ../cli/src/settings.c:676 +msgid "0 (NONE)" +msgstr "0 (NENHUM(A))" + +#: ../cli/src/settings.c:682 +msgid "REORDER_HEADERS, " +msgstr "REORDENAR_CABEÇALHOS, " + +#: ../cli/src/settings.c:684 +msgid "GVRP, " +msgstr "GVRP, " + +#: ../cli/src/settings.c:686 +msgid "LOOSE_BINDING, " +msgstr "PERDA_VÍNCULO, " + +#: ../cli/src/settings.c:722 +#, c-format +msgid "%d (disabled)" +msgstr "%d (desabilitada)" + +#: ../cli/src/settings.c:724 +#, c-format +msgid "%d (enabled, prefer public IP)" +msgstr "%d (ativada, prefere IP público)" + +#: ../cli/src/settings.c:726 +#, c-format +msgid "%d (enabled, prefer temporary IP)" +msgstr "%d (ativada, prefere IP temporário)" + +#: ../cli/src/settings.c:738 +msgid "0 (none)" +msgstr "0 (nenhum(a))" + +#: ../cli/src/settings.c:744 +msgid "agent-owned, " +msgstr "pertence-ao-agente, " + +#: ../cli/src/settings.c:746 +msgid "not saved, " +msgstr "não foi salvo, " + +#: ../cli/src/settings.c:748 +msgid "not required, " +msgstr "não requisitado, " + +#: ../cli/src/settings.c:945 ../cli/src/settings.c:1163 +#: ../cli/src/settings.c:1904 msgid "auto" msgstr "auto" -#: ../cli/src/settings.c:840 ../cli/src/settings.c:843 -#: ../cli/src/settings.c:844 ../cli/src/utils.c:247 -msgid "not set" -msgstr "não configurado" - -#: ../cli/src/utils.c:103 +#: ../cli/src/utils.c:105 #, c-format msgid "Error converting IP4 address '0x%X' to text form" msgstr "Erro ao converter endereço IP4 \"0x%X\" para o formato texto" -#: ../cli/src/utils.c:131 +#: ../cli/src/utils.c:133 #, c-format msgid "Error converting IP6 address '%s' to text form" msgstr "Erro ao converter endereço IP6 \"%s\" para o formato texto" -#: ../cli/src/utils.c:200 +#: ../cli/src/utils.c:234 #, c-format msgid "field '%s' has to be alone" msgstr "campo \"%s\" tem que ser um só" -#: ../cli/src/utils.c:203 +#: ../cli/src/utils.c:237 #, c-format msgid "invalid field '%s'" msgstr "campo \"%s\" é inválido" -#: ../cli/src/utils.c:222 -#, c-format +#: ../cli/src/utils.c:256 msgid "Option '--terse' requires specifying '--fields'" msgstr "Opção \"--terse\" requer especificação de \"--fields\"" -#: ../cli/src/utils.c:226 +#: ../cli/src/utils.c:260 #, c-format msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "Opção \"--terse\" requer valores da opção \"--fields\", não \"%s\"" -#: ../cli/src/utils.c:436 +#: ../cli/src/utils.c:470 #, c-format msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus" msgstr "" "Erro: Não foi possível criar objeto proxy D-Bus para org.freedesktop.DBus" -#: ../cli/src/utils.c:444 +#: ../cli/src/utils.c:478 #, c-format msgid "Error: NameHasOwner request failed: %s" msgstr "Erro: Requisição NameHasOwner falhou: %s" -#: ../cli/src/utils.c:489 +#: ../cli/src/utils.c:523 #, c-format msgid "" "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" @@ -1764,7 +1968,7 @@ msgstr "" "Aviso: As versões do nmcli (%s) e do NetworkManager (%s) não correspondem. " "Use --nocheck para omitir este aviso.\n" -#: ../cli/src/utils.c:498 +#: ../cli/src/utils.c:532 #, c-format msgid "" "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " @@ -2120,43 +2324,43 @@ msgstr "Não foi possível verificar o arquivo PKCS#12: %d" msgid "Could not generate random data." msgstr "Não foi possível gerar dados aleatórios." -#: ../libnm-util/nm-utils.c:2034 +#: ../libnm-util/nm-utils.c:2151 #, c-format msgid "Not enough memory to make encryption key." msgstr "Memória insuficiente para criar a chave de criptografia." -#: ../libnm-util/nm-utils.c:2144 +#: ../libnm-util/nm-utils.c:2261 msgid "Could not allocate memory for PEM file creation." msgstr "Não foi possível alocar memória para criação do arquivo PEM." -#: ../libnm-util/nm-utils.c:2156 +#: ../libnm-util/nm-utils.c:2273 #, c-format msgid "Could not allocate memory for writing IV to PEM file." msgstr "Não foi possível alocar memória para gravar IV no arquivo PEM." -#: ../libnm-util/nm-utils.c:2168 +#: ../libnm-util/nm-utils.c:2285 #, c-format msgid "Could not allocate memory for writing encrypted key to PEM file." msgstr "" "Não foi possível alocar memória para gravar a chave criptografada no arquivo " "PEM." -#: ../libnm-util/nm-utils.c:2187 +#: ../libnm-util/nm-utils.c:2304 #, c-format msgid "Could not allocate memory for PEM file data." msgstr "Não foi possível alocar memória para os dados do arquivo PEM." -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1 msgid "Enable or disable system networking" msgstr "Habilita ou desabilita o sistema de redes" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2 msgid "System policy prevents enabling or disabling system networking" msgstr "" "Políticas de sistema previnem habilitação ou desabilitação do sistema de " "redes" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3 msgid "" "Put NetworkManager to sleep or wake it up (should only be used by system " "power management)" @@ -2164,200 +2368,221 @@ msgstr "" "Põe o NetworkManager para dormir ou acordar (deve ser usado somente pelo " "sistema de gerenciamento de energia" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4 msgid "System policy prevents putting NetworkManager to sleep or waking it up" msgstr "" "Políticas de sistema previnem que se coloque o NetworkManager para dormir ou " "acordar" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5 msgid "Enable or disable WiFi devices" msgstr "Habilita ou desabilita dispositivos WiFi" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6 msgid "System policy prevents enabling or disabling WiFi devices" msgstr "" "Políticas de sistema previnem a habilitação ou desabilitação de dispositivos " "WiFi" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7 msgid "Enable or disable mobile broadband devices" msgstr "Habilita ou desabilita dispositivos móveis de banda larga" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8 msgid "System policy prevents enabling or disabling mobile broadband devices" msgstr "" "Políticas de sistema previnem a habilitação ou desabilitação de dispositivos " "móveis de banda larga" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9 msgid "Enable or disable WiMAX mobile broadband devices" msgstr "Habilita ou desabilita dispositivos móveis WiMAX" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10 msgid "" "System policy prevents enabling or disabling WiMAX mobile broadband devices" msgstr "" "Políticas de sistema previnem a habilitação ou desabilitação de dispositivos " "móveis de banda larga WiMAX" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11 msgid "Allow control of network connections" msgstr "Permite o controle de conexões de rede" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12 msgid "System policy prevents control of network connections" msgstr "Políticas de sistema previnem o controle de conexões de rede" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13 msgid "Connection sharing via a protected WiFi network" msgstr "Compartilhamento de conexão via rede sem fio protegida" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14 msgid "System policy prevents sharing connections via a protected WiFi network" msgstr "" "Políticas de sistema previnem compartilhamento de conexões através de uma " "rede sem fio protegida" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15 msgid "Connection sharing via an open WiFi network" msgstr "Compartilhamento de conexão via rede sem fio aberta" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16 msgid "System policy prevents sharing connections via an open WiFi network" msgstr "" "Políticas de sistema previnem compartilhamento de conexões através de uma " "rede sem fio aberta" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17 msgid "Modify personal network connections" msgstr "Modificar conexões pessoais de rede" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18 msgid "System policy prevents modification of personal network settings" msgstr "" "Políticas de sistema previnem modificação das configurações pessoais de redes" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19 msgid "Modify network connections for all users" msgstr "Modificar conexões de rede para todos os usuários" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20 msgid "System policy prevents modification of network settings for all users" msgstr "" "Políticas de sistema previnem modificação das configurações de rede para " "todos os usuários" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21 msgid "Modify persistent system hostname" msgstr "Modificar máquina de sistema persistente" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22 msgid "System policy prevents modification of the persistent system hostname" msgstr "" "Políticas de sistema previnem modificação da máquina persistente do sistema" -#: ../src/main.c:143 +#: ../src/main.c:135 +#, c-format +msgid "Failed to set signal mask: %d" +msgstr "Falha ao definir máscara do sinal: %d" + +#: ../src/main.c:144 #, c-format -msgid "Failed to initialize SIGTERM pipe: %d" -msgstr "Falha ao inicializar \"pipe\" SIGTERM: %d." +msgid "Failed to create signal handling thread: %d" +msgstr "Ocorreu falha ao criar o segmento de manipulação de sinal: %d" -#: ../src/main.c:174 +#: ../src/main.c:159 #, c-format msgid "Opening %s failed: %s\n" msgstr "Falha ao abrir %s: %s\n" -#: ../src/main.c:180 +#: ../src/main.c:165 #, c-format msgid "Writing to %s failed: %s\n" msgstr "Falha ao escrever para %s: %s\n" -#: ../src/main.c:185 +#: ../src/main.c:170 #, c-format msgid "Closing %s failed: %s\n" msgstr "Falha ao fechar %s: %s\n" -#: ../src/main.c:228 +#: ../src/main.c:213 #, c-format msgid "NetworkManager is already running (pid %ld)\n" msgstr "O NetworkManager já está em execução (pid %ld)\n" -#: ../src/main.c:365 +#: ../src/main.c:340 msgid "Print NetworkManager version and exit" msgstr "Imprime a versão do NetworkManager e sai" -#: ../src/main.c:366 +#: ../src/main.c:341 msgid "Don't become a daemon" msgstr "Não se tornar um daemon" -#: ../src/main.c:367 +#: ../src/main.c:342 msgid "Make all warnings fatal" msgstr "Tornar todos os avisos fatais" -#: ../src/main.c:368 +#: ../src/main.c:343 msgid "Specify the location of a PID file" msgstr "Especificar a localização de um arquivo PID" -#: ../src/main.c:368 +#: ../src/main.c:343 msgid "filename" msgstr "nomedoarquivo" -#: ../src/main.c:369 +#: ../src/main.c:344 msgid "State file location" msgstr "Localização do arquivo de estado" -#: ../src/main.c:369 +#: ../src/main.c:344 msgid "/path/to/state.file" msgstr "/caminho/para/arquivo.de.estado" -#: ../src/main.c:370 +#: ../src/main.c:345 msgid "Config file location" msgstr "Localização do arquivo de configuração" -#: ../src/main.c:370 +#: ../src/main.c:345 msgid "/path/to/config.file" msgstr "/caminho/para/arquivo.de.configuração" -#: ../src/main.c:371 +#: ../src/main.c:346 msgid "List of plugins separated by ','" msgstr "Lista de plug-ins separada por \",\"" -#: ../src/main.c:371 +#: ../src/main.c:346 msgid "plugin1,plugin2" msgstr "plug-in1,plug-in2" #. Translators: Do not translate the values in the square brackets -#: ../src/main.c:373 +#: ../src/main.c:348 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]" -msgstr "Nível de Log: um dos [ERR, WARN, INFO, DEBUG]" +msgstr "Nível de registro: um dos [ERR, WARN, INFO, DEBUG]" #. Translators: Do not translate the values in the square brackets -#: ../src/main.c:376 +#: ../src/main.c:351 msgid "" "Log domains separated by ',': any combination of\n" -" [NONE,HW,RFKILL,ETHER,WIFI,BT,MB," -"DHCP4,DHCP6,PPP,\n" -" WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN," -"SHARING,SUPPLICANT,\n" -" AGENTS,SETTINGS,SUSPEND,CORE," -"DEVICE,OLPC,WIMAX,\n" -" INFINIBAND,FIREWALL]" +" [NONE,HW,RFKILL,ETHER,WIFI," +"BT,MB,DHCP4,DHCP6,PPP,\n" +" WIFI_SCAN,IP4,IP6,AUTOIP4," +"DNS,VPN,SHARING,SUPPLICANT,\n" +" AGENTS,SETTINGS,SUSPEND," +"CORE,DEVICE,OLPC,WIMAX,\n" +" INFINIBAND,FIREWALL,ADSL]" msgstr "" -"Domínios de Log separados por \",\": qualquer combinação de\n" -" [NONE,HW,RFKILL,ETHER,WIFI,BT,MB," -"DHCP4,DHCP6,PPP,\n" -" WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN," -"SHARING,SUPPLICANT,\n" -" AGENTS,SETTINGS,SUSPEND,CORE," -"DEVICE,OLPC,WIMAX,\n" -" INFINIBAND,FIREWALL]" +"Domínios de registro separados por ',': qualquer combinação de\n" +" [NONE,HW,RFKILL,ETHER,WIFI," +"BT,MB,DHCP4,DHCP6,PPP,\n" +" WIFI_SCAN,IP4,IP6,AUTOIP4," +"DNS,VPN,SHARING,SUPPLICANT,\n" +" AGENTS,SETTINGS,SUSPEND," +"CORE,DEVICE,OLPC,WIMAX,\n" +" INFINIBAND,FIREWALL,ADSL]" + +#: ../src/main.c:357 +msgid "An http(s) address for checking internet connectivity" +msgstr "Um endereço http(s) para verificar a conectividade com a internet" + +#: ../src/main.c:358 +msgid "The interval between connectivity checks (in seconds)" +msgstr "O intervalo de tempo entre verificações de conectividade (em segundos)" + +#: ../src/main.c:359 +msgid "The expected start of the response" +msgstr "O início esperado da resposta" -#: ../src/main.c:386 +#: ../src/main.c:359 +msgid "Bingo!" +msgstr "Bingo!" + +#: ../src/main.c:364 #, c-format msgid "GModules are not supported on your platform!\n" msgstr "Não há suporte para GModules em sua plataforma!\n" -#: ../src/main.c:405 +#: ../src/main.c:383 msgid "" "NetworkManager monitors all network connections and automatically\n" "chooses the best connection to use. It also allows the user to\n" @@ -2369,42 +2594,42 @@ msgstr "" "especifique pontos de acesso sem fio os quais cartões sem fio no\n" "computador podem ser associados." -#: ../src/main.c:411 +#: ../src/main.c:389 #, c-format msgid "Invalid option. Please use --help to see a list of valid options.\n" msgstr "" "Opção inválida. Por favor, use --help para ver uma lista de opções válidas.\n" -#: ../src/main.c:421 +#: ../src/main.c:399 #, c-format msgid "You must be root to run NetworkManager!\n" msgstr "Você precisa ser superusuário para executar o NetworkManager!\n" -#: ../src/main.c:441 +#: ../src/main.c:432 #, c-format msgid "Failed to read configuration: (%d) %s\n" msgstr "Falha ao ler configuração: (%d) %s\n" -#: ../src/main.c:452 +#: ../src/main.c:443 #, c-format msgid "%s. Please use --help to see a list of valid options.\n" msgstr "%s. Por favor, use --help para ver uma lista de opções válidas.\n" -#: ../src/main.c:459 +#: ../src/main.c:450 #, c-format msgid "State file %s parsing failed: (%d) %s\n" msgstr "Falha ao analisar o arquivo de estado %s: (%d) %s\n" -#: ../src/main.c:476 +#: ../src/main.c:467 #, c-format msgid "Could not daemonize: %s [error %u]\n" msgstr "Não pode ser daemonizado: %s [erro %u]\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:139 msgid "# Created by NetworkManager\n" msgstr "# Criado pelo NetworkManager\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:146 #, c-format msgid "" "# Merged from %s\n" @@ -2430,62 +2655,74 @@ msgstr "\"dhcpd\" não pôde ser encontrado." msgid "unsupported DHCP client '%s'" msgstr "cliente DHCP \"%s\" não suportado" -#: ../src/dns-manager/nm-dns-manager.c:376 +#: ../src/dns-manager/nm-dns-manager.c:368 msgid "NOTE: the libc resolver may not support more than 3 nameservers." msgstr "" "NOTA: o resolvedor da libc não tem suporte a mais do que 3 servidores de " "nomes." -#: ../src/dns-manager/nm-dns-manager.c:378 +#: ../src/dns-manager/nm-dns-manager.c:370 msgid "The nameservers listed below may not be recognized." msgstr "Os servidores de nomes listados abaixo podem não ser reconhecidos." -#: ../src/logging/nm-logging.c:130 +#: ../src/logging/nm-logging.c:142 #, c-format msgid "Unknown log level '%s'" msgstr "Nível de registro \"%s\" desconhecido" -#: ../src/logging/nm-logging.c:155 +#: ../src/logging/nm-logging.c:188 #, c-format msgid "Unknown log domain '%s'" msgstr "Domínio de registro \"%s\" desconhecido" -#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:325 +#: ../src/modem-manager/nm-modem-cdma.c:271 +#: ../src/modem-manager/nm-modem-broadband.c:553 ../src/nm-device-bt.c:338 #, c-format msgid "CDMA connection %d" msgstr "Conexão CDMA %d" -#: ../src/modem-manager/nm-modem-gsm.c:512 ../src/nm-device-bt.c:321 +#: ../src/modem-manager/nm-modem-gsm.c:549 +#: ../src/modem-manager/nm-modem-broadband.c:531 ../src/nm-device-bt.c:334 #, c-format msgid "GSM connection %d" msgstr "Conexão GSM %d" -#: ../src/nm-device-bond.c:189 +#: ../src/nm-device-bond.c:202 #, c-format msgid "Bond connection %d" msgstr "Conexão vinculada %d" -#: ../src/nm-device-bt.c:296 +#: ../src/nm-device-adsl.c:194 +#, c-format +msgid "ADSL connection %d" +msgstr "Conexão ADSL %d" + +#: ../src/nm-device-bridge.c:201 +#, c-format +msgid "Bridge connection %d" +msgstr "Conexão de Ponte %d" + +#: ../src/nm-device-bt.c:309 #, c-format msgid "PAN connection %d" msgstr "Conexão PAN %d" -#: ../src/nm-device-bt.c:329 +#: ../src/nm-device-bt.c:342 #, c-format msgid "DUN connection %d" msgstr "Conexão DUN %d" -#: ../src/nm-device-ethernet.c:1433 +#: ../src/nm-device-ethernet.c:1319 #, c-format msgid "PPPoE connection %d" msgstr "Conexão PPPoE %d" -#: ../src/nm-device-ethernet.c:1433 ../src/settings/nm-settings-utils.c:50 +#: ../src/nm-device-ethernet.c:1319 ../src/settings/nm-settings-utils.c:50 #, c-format msgid "Wired connection %d" msgstr "Conexão cabeada %d" -#: ../src/nm-device-infiniband.c:302 +#: ../src/nm-device-infiniband.c:299 #, c-format msgid "InfiniBand connection %d" msgstr "Conexão InfiniBand %d" @@ -2495,67 +2732,123 @@ msgstr "Conexão InfiniBand %d" msgid "Mesh %d" msgstr "Malha %d" -#: ../src/nm-manager.c:634 +#: ../src/nm-device-vlan.c:331 +#, c-format +msgid "VLAN connection %d" +msgstr "Conexão VLAN %d" + +#: ../src/nm-manager.c:750 #, c-format msgid "VPN connection %d" msgstr "Conexão VPN %d" -#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272 -#: ../src/nm-netlink-monitor.c:695 +#: ../src/nm-netlink-monitor.c:152 ../src/nm-netlink-monitor.c:276 +#: ../src/nm-netlink-monitor.c:717 #, c-format msgid "error processing netlink message: %s" msgstr "erro ao processar mensagem do netlink: %s" -#: ../src/nm-netlink-monitor.c:251 +#: ../src/nm-netlink-monitor.c:255 msgid "error occurred while waiting for data on socket" msgstr "ocorreu um erro ao esperar pelos dados da conexão" -#: ../src/nm-netlink-monitor.c:296 +#: ../src/nm-netlink-monitor.c:300 #, c-format msgid "unable to connect to netlink for monitoring link status: %s" msgstr "" "não foi possível conectar ao netlink para monitoração de status do link: %s" -#: ../src/nm-netlink-monitor.c:307 +#: ../src/nm-netlink-monitor.c:311 #, c-format msgid "unable to enable netlink handle credential passing: %s" msgstr "" "não foi possível habilitar o manipulador de credencial de passagem do " "netlink: %s" -#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390 +#: ../src/nm-netlink-monitor.c:334 ../src/nm-netlink-monitor.c:394 #, c-format msgid "unable to allocate netlink handle for monitoring link status: %s" msgstr "" "não foi possível alocar o manipulador do netlink para monitoração de status " "do link: %s" -#: ../src/nm-netlink-monitor.c:415 +#: ../src/nm-netlink-monitor.c:419 #, c-format msgid "unable to allocate netlink link cache for monitoring link status: %s" msgstr "" "não foi possível alocar o cache de link do netlink para monitoração de " "status do link: %s" -#: ../src/nm-netlink-monitor.c:542 +#: ../src/nm-netlink-monitor.c:546 #, c-format msgid "unable to join netlink group: %s" msgstr "não foi possível associar-se ao grupo do netlink: %s" -#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684 +#: ../src/nm-netlink-monitor.c:693 ../src/nm-netlink-monitor.c:706 #, c-format msgid "error updating link cache: %s" msgstr "erro ao atualizar o cache de link: %s" -#: ../src/settings/plugins/ifcfg-rh/reader.c:92 -#: ../src/settings/plugins/ifnet/connection_parser.c:51 +#: ../src/settings/plugins/ifcfg-rh/reader.c:110 msgid "System" msgstr "Sistema" -#: ../src/settings/plugins/ifcfg-rh/reader.c:3652 +#: ../src/settings/plugins/ifcfg-rh/reader.c:3702 msgid "Bond" msgstr "Vínculo" +#: ../src/settings/plugins/ifcfg-rh/reader.c:3887 +msgid "Bridge" +msgstr "Ponte" + +#: ../test/nm-online.c:111 +#, c-format +msgid "\rConnecting" +msgstr "\rConectando" + +#: ../test/nm-online.c:142 +msgid "Time to wait for a connection, in seconds (default is 30)" +msgstr "Tempo a esperar por uma conexão, em segundos (o padrão é 30)" + +#: ../test/nm-online.c:143 +msgid "Exit immediately if NetworkManager is not running or connecting" +msgstr "" +"Sair imediatamente caso o NetworkManager não esteja em execução ou conectado" + +#: ../test/nm-online.c:144 +msgid "Don't print anything" +msgstr "Não imprimir nada" + +#: ../test/nm-online.c:162 +msgid "Waits for a successful connection in NetworkManager." +msgstr "Espera por uma conexão com sucesso no NetworkManager." + +#: ../test/nm-online.c:168 ../test/nm-online.c:177 +msgid "Invalid option. Please use --help to see a list of valid options." +msgstr "" +"Opção inválida. Por favor, use --help para ver uma lista de opções válidas." + +#~ msgid "state: %s\n" +#~ msgstr "estado: %s\n" + +#~ msgid "Connection activated\n" +#~ msgstr "Conexão ativada\n" + +#~ msgid "state: %s (%d)\n" +#~ msgstr "estado: %s (%d)\n" + +#~ msgid "Active connection state: %s\n" +#~ msgstr "Estado da conexão ativa: %s\n" + +#~ msgid "Active connection path: %s\n" +#~ msgstr "Caminho da conexão ativa: %s\n" + +#~ msgid "Device state: %d (%s)\n" +#~ msgstr "Estado do dispositivo: %d (%s)\n" + +#~ msgid "Failed to initialize SIGTERM pipe: %d" +#~ msgstr "Falha ao inicializar \"pipe\" SIGTERM: %d." + #~ msgid "Type" #~ msgstr "Tipo" diff --git a/po/uk.po b/po/uk.po index f784ccc00..6449cd988 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,14 +1,14 @@ # Copyright (C) 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the NetworkManager package. # -# Yuri Chornoivan , 2011, 2012. +# Yuri Chornoivan , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=NetworkManager&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-07-18 15:25+0000\n" -"PO-Revision-Date: 2012-08-10 21:08+0300\n" +"POT-Creation-Date: 2013-01-30 15:25+0000\n" +"PO-Revision-Date: 2013-02-10 12:46+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -19,8 +19,8 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52 -#: ../cli/src/common.c:63 ../cli/src/connections.c:128 -#: ../cli/src/connections.c:162 +#: ../cli/src/common.c:63 ../cli/src/connections.c:133 +#: ../cli/src/connections.c:167 msgid "GROUP" msgstr "ГРУПА" @@ -94,7 +94,7 @@ msgstr "з’єднання (встановлення другорядних з msgid "connected" msgstr "з'єднано" -#: ../cli/src/common.c:386 ../cli/src/connections.c:633 +#: ../cli/src/common.c:386 ../cli/src/connections.c:466 msgid "deactivating" msgstr "деактивація" @@ -102,16 +102,16 @@ msgstr "деактивація" msgid "connection failed" msgstr "невдала спроба з’єднання" -#: ../cli/src/common.c:390 ../cli/src/connections.c:636 -#: ../cli/src/connections.c:659 ../cli/src/connections.c:1349 -#: ../cli/src/devices.c:622 ../cli/src/network-manager.c:123 +#: ../cli/src/common.c:390 ../cli/src/connections.c:469 +#: ../cli/src/connections.c:492 ../cli/src/connections.c:1184 +#: ../cli/src/devices.c:650 ../cli/src/network-manager.c:123 #: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188 #: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257 #: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431 #: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524 -#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:585 -#: ../cli/src/settings.c:613 ../cli/src/utils.c:531 ../src/main.c:462 -#: ../src/main.c:481 +#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:661 +#: ../cli/src/settings.c:689 ../cli/src/settings.c:751 ../cli/src/utils.c:533 +#: ../src/main.c:434 ../src/main.c:453 msgid "unknown" msgstr "невідомо" @@ -136,11 +136,14 @@ msgid "The device could not be readied for configuration" msgstr "Пристрій не може бути приготовано до налаштовування" #: ../cli/src/common.c:414 +#| msgid "" +#| "IP configuration could not be reserved (no available address, timeout, " +#| "etc)" msgid "" -"IP configuration could not be reserved (no available address, timeout, etc)" +"IP configuration could not be reserved (no available address, timeout, etc.)" msgstr "" -"Налаштування IP не можна резервувати (немає доступних адрес, часу очікування " -"тощо)" +"Не вдалося зарезервувати налаштування IP (немає доступної адреси, часу " +"очікування тощо)" #: ../cli/src/common.c:417 msgid "The IP configuration is no longer valid" @@ -323,7 +326,6 @@ msgid "InfiniBand device does not support connected mode" msgstr "У пристрої InfiniBand не передбачено режиму з’єднання" #: ../cli/src/common.c:549 -#| msgid "connection failed" msgid "A dependency of the connection failed" msgstr "Не вдалося використати залежність з’єднання" @@ -331,23 +333,37 @@ msgstr "Не вдалося використати залежність з’є msgid "A problem with the RFC 2684 Ethernet over ADSL bridge" msgstr "Проблема з містком Ethernet на основі ADSL відповідно до RFC 2684" -#: ../cli/src/common.c:555 ../cli/src/devices.c:274 ../cli/src/devices.c:290 -#: ../cli/src/devices.c:410 ../cli/src/devices.c:454 +#: ../cli/src/common.c:555 +msgid "ModemManager is unavailable" +msgstr "ModemManager недоступнийІ" + +#: ../cli/src/common.c:558 +#| msgid "The modem could not be found" +msgid "The Wi-Fi network could not be found" +msgstr "Не вдалося виявити мережу Wi-Fi" + +#: ../cli/src/common.c:561 +#| msgid "A dependency of the connection failed" +msgid "A secondary connection of the base connection failed" +msgstr "Не вдалося встановити вторинне щодо основного з’єднання" + +#: ../cli/src/common.c:564 ../cli/src/devices.c:296 ../cli/src/devices.c:314 +#: ../cli/src/devices.c:436 ../cli/src/devices.c:480 msgid "Unknown" msgstr "Невідомо" #. 0 #. used only for 'GENERAL' group listing -#: ../cli/src/connections.c:59 ../cli/src/connections.c:129 -#: ../cli/src/devices.c:105 ../cli/src/devices.c:129 ../cli/src/devices.c:139 -#: ../cli/src/devices.c:149 ../cli/src/devices.c:163 ../cli/src/devices.c:177 -#: ../cli/src/devices.c:199 +#: ../cli/src/connections.c:60 ../cli/src/connections.c:134 +#: ../cli/src/devices.c:108 ../cli/src/devices.c:132 ../cli/src/devices.c:142 +#: ../cli/src/devices.c:152 ../cli/src/devices.c:166 ../cli/src/devices.c:180 +#: ../cli/src/devices.c:202 ../cli/src/devices.c:218 ../cli/src/devices.c:227 msgid "NAME" msgstr "НАЗВА" #. 0 #. 1 -#: ../cli/src/connections.c:60 ../cli/src/connections.c:130 +#: ../cli/src/connections.c:61 ../cli/src/connections.c:135 msgid "UUID" msgstr "UUID" @@ -355,29 +371,29 @@ msgstr "UUID" #. 0 #. 1 #. 2 -#: ../cli/src/connections.c:61 ../cli/src/connections.c:163 -#: ../cli/src/devices.c:71 ../cli/src/devices.c:107 ../cli/src/devices.c:202 +#: ../cli/src/connections.c:62 ../cli/src/connections.c:168 +#: ../cli/src/devices.c:72 ../cli/src/devices.c:110 ../cli/src/devices.c:205 msgid "TYPE" msgstr "ТИП" #. 2 -#: ../cli/src/connections.c:62 +#: ../cli/src/connections.c:63 msgid "TIMESTAMP" msgstr "ЧАСОВА МІТКА" #. 3 -#: ../cli/src/connections.c:63 +#: ../cli/src/connections.c:64 msgid "TIMESTAMP-REAL" msgstr "ДІЙСНА ЧАСОВА МІТКА" #. 4 #. 13 -#: ../cli/src/connections.c:64 ../cli/src/devices.c:119 +#: ../cli/src/connections.c:65 ../cli/src/devices.c:122 msgid "AUTOCONNECT" msgstr "АВТОЗ’ЄДНАННЯ" #. 5 -#: ../cli/src/connections.c:65 +#: ../cli/src/connections.c:66 msgid "READONLY" msgstr "ЛИШЕ ЧИТАННЯ" @@ -386,13 +402,13 @@ msgstr "ЛИШЕ ЧИТАННЯ" #. 2 #. 11 #. 5 -#: ../cli/src/connections.c:66 ../cli/src/connections.c:137 -#: ../cli/src/devices.c:73 ../cli/src/devices.c:189 ../cli/src/devices.c:205 +#: ../cli/src/connections.c:67 ../cli/src/connections.c:142 +#: ../cli/src/devices.c:74 ../cli/src/devices.c:192 ../cli/src/devices.c:208 msgid "DBUS-PATH" msgstr "DBUS-PATH" #. 2 -#: ../cli/src/connections.c:131 +#: ../cli/src/connections.c:136 msgid "DEVICES" msgstr "ПРИСТРОЇ" @@ -400,85 +416,97 @@ msgstr "ПРИСТРОЇ" #. 1 #. 8 #. 1 -#: ../cli/src/connections.c:132 ../cli/src/devices.c:72 -#: ../cli/src/devices.c:114 ../cli/src/network-manager.c:39 +#: ../cli/src/connections.c:137 ../cli/src/devices.c:73 +#: ../cli/src/devices.c:117 ../cli/src/network-manager.c:39 msgid "STATE" msgstr "СТАН" #. 4 -#: ../cli/src/connections.c:133 +#: ../cli/src/connections.c:138 msgid "DEFAULT" msgstr "ТИПОВЕ" #. 5 -#: ../cli/src/connections.c:134 +#: ../cli/src/connections.c:139 msgid "DEFAULT6" msgstr "ТИПОВИЙ6" #. 6 -#: ../cli/src/connections.c:135 +#: ../cli/src/connections.c:140 msgid "SPEC-OBJECT" msgstr "SPEC-OBJECT" #. 7 #. 1 -#: ../cli/src/connections.c:136 ../cli/src/connections.c:150 +#: ../cli/src/connections.c:141 ../cli/src/connections.c:155 msgid "VPN" msgstr "VPN" #. 9 -#: ../cli/src/connections.c:138 +#: ../cli/src/connections.c:143 msgid "CON-PATH" msgstr "ШЛЯХ-ДО-CON" #. 10 -#: ../cli/src/connections.c:139 +#: ../cli/src/connections.c:144 msgid "ZONE" msgstr "ЗОНА" #. 11 -#: ../cli/src/connections.c:140 +#: ../cli/src/connections.c:145 msgid "MASTER-PATH" msgstr "ОСНОВНИЙ-ШЛЯХ" -#: ../cli/src/connections.c:148 ../cli/src/devices.c:82 +#: ../cli/src/connections.c:153 ../cli/src/devices.c:83 msgid "GENERAL" msgstr "ЗАГАЛЬНІ" #. 0 -#: ../cli/src/connections.c:149 +#: ../cli/src/connections.c:154 msgid "IP" msgstr "IP" #. 1 -#: ../cli/src/connections.c:164 +#: ../cli/src/connections.c:169 msgid "USERNAME" msgstr "КОРИСТУВАЧ" #. 2 -#: ../cli/src/connections.c:165 +#: ../cli/src/connections.c:170 msgid "GATEWAY" msgstr "ШЛЮЗ" #. 3 -#: ../cli/src/connections.c:166 +#: ../cli/src/connections.c:171 msgid "BANNER" msgstr "БАНЕР" #. 4 -#: ../cli/src/connections.c:167 +#: ../cli/src/connections.c:172 msgid "VPN-STATE" msgstr "СТАН-VPN" #. 5 -#: ../cli/src/connections.c:168 +#: ../cli/src/connections.c:173 msgid "CFG" msgstr "КОНФ" -#: ../cli/src/connections.c:190 +#: ../cli/src/connections.c:195 #, c-format +#| msgid "" +#| "Usage: nmcli con { COMMAND | help }\n" +#| " COMMAND := { list | status | up | down | delete }\n" +#| "\n" +#| " list [id | uuid ]\n" +#| " status [id | uuid | path ]\n" +#| " up id | uuid [iface ] [ap ] [nsp ] [--" +#| "nowait] [--timeout ]\n" +#| " up id | uuid [iface ] [ap ] [--nowait] [--" +#| "timeout ]\n" +#| " down id | uuid \n" +#| " delete id | uuid \n" msgid "" -"Usage: nmcli con { COMMAND | help }\n" +"Usage: nmcli connection { COMMAND | help }\n" " COMMAND := { list | status | up | down | delete }\n" "\n" " list [id | uuid ]\n" @@ -489,370 +517,364 @@ msgid "" "]\n" " down id | uuid \n" " delete id | uuid \n" -msgstr "" -"Використання: nmcli con { КОМАНДА | help }\n" -" КОМАНДА := { list | status | up | down | delete }\n" "\n" -" list [id | uuid ]\n" -" status [id | uuid | path <шлях>]\n" -" up id | uuid [iface ] [ap ] [nsp <назва>] [--" -"nowait] [--timeout <час очікування>]\n" -" up id | uuid [iface ] [ap ] [--nowait] [--timeout " -"<час очікування>]\n" -" down id | uuid \n" -" delete id | uuid \n" +msgstr "" -#: ../cli/src/connections.c:249 ../cli/src/connections.c:609 +#: ../cli/src/connections.c:256 ../cli/src/connections.c:442 #, c-format msgid "Error: 'con list': %s" msgstr "Помилка: «con list»: %s" -#: ../cli/src/connections.c:251 ../cli/src/connections.c:611 +#: ../cli/src/connections.c:258 ../cli/src/connections.c:444 #, c-format msgid "Error: 'con list': %s; allowed fields: %s" msgstr "Помилка: «con list»: %s; дозволені поля: %s" -#: ../cli/src/connections.c:259 +#: ../cli/src/connections.c:266 msgid "Connection details" msgstr "Параметри з’єднання" -#: ../cli/src/connections.c:484 +#: ../cli/src/connections.c:317 msgid "never" msgstr "ніколи" #. "CAPABILITIES" #. Print header #. "WIFI-PROPERTIES" -#: ../cli/src/connections.c:485 ../cli/src/connections.c:486 -#: ../cli/src/connections.c:714 ../cli/src/connections.c:715 -#: ../cli/src/connections.c:717 ../cli/src/devices.c:418 -#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588 -#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647 -#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650 -#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:267 -#: ../cli/src/settings.c:694 ../cli/src/settings.c:764 -#: ../cli/src/settings.c:884 ../cli/src/settings.c:1166 -#: ../cli/src/settings.c:1167 ../cli/src/settings.c:1169 -#: ../cli/src/settings.c:1171 ../cli/src/settings.c:1172 -#: ../cli/src/settings.c:1303 ../cli/src/settings.c:1304 -#: ../cli/src/settings.c:1305 ../cli/src/settings.c:1306 -#: ../cli/src/settings.c:1383 ../cli/src/settings.c:1384 -#: ../cli/src/settings.c:1385 ../cli/src/settings.c:1386 -#: ../cli/src/settings.c:1387 ../cli/src/settings.c:1388 -#: ../cli/src/settings.c:1389 ../cli/src/settings.c:1390 -#: ../cli/src/settings.c:1391 ../cli/src/settings.c:1392 -#: ../cli/src/settings.c:1393 ../cli/src/settings.c:1394 -#: ../cli/src/settings.c:1395 ../cli/src/settings.c:1466 +#: ../cli/src/connections.c:318 ../cli/src/connections.c:319 +#: ../cli/src/connections.c:547 ../cli/src/connections.c:548 +#: ../cli/src/connections.c:550 ../cli/src/devices.c:444 +#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616 +#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676 +#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679 +#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:267 +#: ../cli/src/settings.c:866 ../cli/src/settings.c:941 +#: ../cli/src/settings.c:1076 ../cli/src/settings.c:1166 +#: ../cli/src/settings.c:1376 ../cli/src/settings.c:1377 +#: ../cli/src/settings.c:1379 ../cli/src/settings.c:1381 +#: ../cli/src/settings.c:1382 ../cli/src/settings.c:1513 +#: ../cli/src/settings.c:1514 ../cli/src/settings.c:1515 +#: ../cli/src/settings.c:1516 ../cli/src/settings.c:1594 +#: ../cli/src/settings.c:1595 ../cli/src/settings.c:1596 +#: ../cli/src/settings.c:1597 ../cli/src/settings.c:1598 +#: ../cli/src/settings.c:1599 ../cli/src/settings.c:1600 +#: ../cli/src/settings.c:1601 ../cli/src/settings.c:1602 +#: ../cli/src/settings.c:1603 ../cli/src/settings.c:1604 +#: ../cli/src/settings.c:1605 ../cli/src/settings.c:1606 +#: ../cli/src/settings.c:1688 ../cli/src/settings.c:2044 +#: ../cli/src/settings.c:2081 msgid "yes" msgstr "так" -#: ../cli/src/connections.c:485 ../cli/src/connections.c:486 -#: ../cli/src/connections.c:714 ../cli/src/connections.c:715 -#: ../cli/src/connections.c:717 ../cli/src/devices.c:418 -#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588 -#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647 -#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650 -#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:269 -#: ../cli/src/settings.c:694 ../cli/src/settings.c:696 -#: ../cli/src/settings.c:764 ../cli/src/settings.c:884 -#: ../cli/src/settings.c:1166 ../cli/src/settings.c:1167 -#: ../cli/src/settings.c:1169 ../cli/src/settings.c:1171 -#: ../cli/src/settings.c:1172 ../cli/src/settings.c:1303 -#: ../cli/src/settings.c:1304 ../cli/src/settings.c:1305 -#: ../cli/src/settings.c:1306 ../cli/src/settings.c:1383 -#: ../cli/src/settings.c:1384 ../cli/src/settings.c:1385 -#: ../cli/src/settings.c:1386 ../cli/src/settings.c:1387 -#: ../cli/src/settings.c:1388 ../cli/src/settings.c:1389 -#: ../cli/src/settings.c:1390 ../cli/src/settings.c:1391 -#: ../cli/src/settings.c:1392 ../cli/src/settings.c:1393 -#: ../cli/src/settings.c:1394 ../cli/src/settings.c:1395 -#: ../cli/src/settings.c:1466 +#: ../cli/src/connections.c:318 ../cli/src/connections.c:319 +#: ../cli/src/connections.c:547 ../cli/src/connections.c:548 +#: ../cli/src/connections.c:550 ../cli/src/devices.c:444 +#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616 +#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676 +#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679 +#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:269 +#: ../cli/src/settings.c:866 ../cli/src/settings.c:868 +#: ../cli/src/settings.c:941 ../cli/src/settings.c:1076 +#: ../cli/src/settings.c:1166 ../cli/src/settings.c:1376 +#: ../cli/src/settings.c:1377 ../cli/src/settings.c:1379 +#: ../cli/src/settings.c:1381 ../cli/src/settings.c:1382 +#: ../cli/src/settings.c:1513 ../cli/src/settings.c:1514 +#: ../cli/src/settings.c:1515 ../cli/src/settings.c:1516 +#: ../cli/src/settings.c:1594 ../cli/src/settings.c:1595 +#: ../cli/src/settings.c:1596 ../cli/src/settings.c:1597 +#: ../cli/src/settings.c:1598 ../cli/src/settings.c:1599 +#: ../cli/src/settings.c:1600 ../cli/src/settings.c:1601 +#: ../cli/src/settings.c:1602 ../cli/src/settings.c:1603 +#: ../cli/src/settings.c:1604 ../cli/src/settings.c:1605 +#: ../cli/src/settings.c:1606 ../cli/src/settings.c:1688 +#: ../cli/src/settings.c:2044 ../cli/src/settings.c:2081 msgid "no" msgstr "ні" -#: ../cli/src/connections.c:560 +#: ../cli/src/connections.c:393 msgid "Connection list" msgstr "Список з’єднань" -#: ../cli/src/connections.c:573 ../cli/src/connections.c:1110 -#: ../cli/src/connections.c:1646 ../cli/src/connections.c:1661 -#: ../cli/src/connections.c:1670 ../cli/src/connections.c:1680 -#: ../cli/src/connections.c:1692 ../cli/src/connections.c:1800 -#: ../cli/src/connections.c:1902 ../cli/src/devices.c:1041 -#: ../cli/src/devices.c:1051 ../cli/src/devices.c:1169 -#: ../cli/src/devices.c:1177 ../cli/src/devices.c:1541 -#: ../cli/src/devices.c:1548 ../cli/src/devices.c:1562 -#: ../cli/src/devices.c:1569 ../cli/src/devices.c:1586 -#: ../cli/src/devices.c:1597 ../cli/src/devices.c:1818 -#: ../cli/src/devices.c:1825 +#: ../cli/src/connections.c:406 ../cli/src/connections.c:943 +#: ../cli/src/connections.c:1481 ../cli/src/connections.c:1496 +#: ../cli/src/connections.c:1505 ../cli/src/connections.c:1515 +#: ../cli/src/connections.c:1527 ../cli/src/connections.c:1636 +#: ../cli/src/connections.c:1738 ../cli/src/devices.c:1127 +#: ../cli/src/devices.c:1137 ../cli/src/devices.c:1255 +#: ../cli/src/devices.c:1263 ../cli/src/devices.c:1627 +#: ../cli/src/devices.c:1634 ../cli/src/devices.c:1648 +#: ../cli/src/devices.c:1655 ../cli/src/devices.c:1672 +#: ../cli/src/devices.c:1683 ../cli/src/devices.c:1904 +#: ../cli/src/devices.c:1911 #, c-format msgid "Error: %s argument is missing." msgstr "Помилка: пропущено аргумент %s." -#: ../cli/src/connections.c:586 +#: ../cli/src/connections.c:419 #, c-format msgid "Error: %s - no such connection." msgstr "Помилка: невідоме з’єднання %s." -#: ../cli/src/connections.c:592 ../cli/src/connections.c:1705 -#: ../cli/src/connections.c:1817 ../cli/src/connections.c:1909 -#: ../cli/src/devices.c:825 ../cli/src/devices.c:905 ../cli/src/devices.c:1065 -#: ../cli/src/devices.c:1183 ../cli/src/devices.c:1610 -#: ../cli/src/devices.c:1831 +#: ../cli/src/connections.c:425 ../cli/src/connections.c:1540 +#: ../cli/src/connections.c:1653 ../cli/src/connections.c:1745 +#: ../cli/src/devices.c:911 ../cli/src/devices.c:991 ../cli/src/devices.c:1151 +#: ../cli/src/devices.c:1269 ../cli/src/devices.c:1696 +#: ../cli/src/devices.c:1917 #, c-format msgid "Unknown parameter: %s\n" msgstr "Невідомий параметр: %s\n" -#: ../cli/src/connections.c:601 +#: ../cli/src/connections.c:434 #, c-format msgid "Error: no valid parameter specified." msgstr "Помилка: не вказано коректних параметрів." -#: ../cli/src/connections.c:616 ../cli/src/connections.c:2002 -#: ../cli/src/devices.c:2039 ../cli/src/network-manager.c:596 +#: ../cli/src/connections.c:449 ../cli/src/connections.c:1841 +#: ../cli/src/devices.c:2128 ../cli/src/network-manager.c:599 #, c-format msgid "Error: %s." msgstr "Помилка: %s." -#: ../cli/src/connections.c:629 +#: ../cli/src/connections.c:462 msgid "activating" msgstr "активація" -#: ../cli/src/connections.c:631 +#: ../cli/src/connections.c:464 msgid "activated" msgstr "активовано" -#: ../cli/src/connections.c:645 +#: ../cli/src/connections.c:478 msgid "VPN connecting (prepare)" msgstr "З’єднання VPN (приготування)" -#: ../cli/src/connections.c:647 +#: ../cli/src/connections.c:480 msgid "VPN connecting (need authentication)" msgstr "З’єднання VPN (потрібне розпізнавання)" -#: ../cli/src/connections.c:649 +#: ../cli/src/connections.c:482 msgid "VPN connecting" msgstr "З’єднання VPN" -#: ../cli/src/connections.c:651 +#: ../cli/src/connections.c:484 msgid "VPN connecting (getting IP configuration)" msgstr "З’єднання VPN (отримання налаштувань IP)" -#: ../cli/src/connections.c:653 +#: ../cli/src/connections.c:486 msgid "VPN connected" msgstr "VPN з’єднано" -#: ../cli/src/connections.c:655 +#: ../cli/src/connections.c:488 msgid "VPN connection failed" msgstr "Невдала спроба з’єднання VPN" -#: ../cli/src/connections.c:657 +#: ../cli/src/connections.c:490 msgid "VPN disconnected" msgstr "VPN роз’єднано" -#: ../cli/src/connections.c:710 ../cli/src/connections.c:720 +#: ../cli/src/connections.c:543 ../cli/src/connections.c:553 msgid "N/A" msgstr "н/д" -#: ../cli/src/connections.c:914 ../cli/src/connections.c:1138 +#: ../cli/src/connections.c:747 ../cli/src/connections.c:971 #, c-format msgid "Error: 'con status': %s" msgstr "Помилка: «con status»: %s" -#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140 +#: ../cli/src/connections.c:749 ../cli/src/connections.c:973 #, c-format msgid "Error: 'con status': %s; allowed fields: %s" msgstr "Помилка: «con status»: %s; дозволені поля: %s" -#: ../cli/src/connections.c:924 +#: ../cli/src/connections.c:757 msgid "Active connection details" msgstr "Параметри активного з’єднання" -#: ../cli/src/connections.c:1060 ../cli/src/connections.c:1720 -#: ../cli/src/connections.c:1832 ../cli/src/connections.c:1923 -#: ../cli/src/devices.c:852 ../cli/src/devices.c:914 ../cli/src/devices.c:1080 -#: ../cli/src/devices.c:1213 ../cli/src/devices.c:1632 -#: ../cli/src/devices.c:1860 ../cli/src/network-manager.c:311 +#: ../cli/src/connections.c:893 ../cli/src/connections.c:1555 +#: ../cli/src/connections.c:1668 ../cli/src/connections.c:1759 +#: ../cli/src/devices.c:938 ../cli/src/devices.c:1000 +#: ../cli/src/devices.c:1166 ../cli/src/devices.c:1299 +#: ../cli/src/devices.c:1718 ../cli/src/devices.c:1946 +#: ../cli/src/network-manager.c:311 #, c-format msgid "Error: Can't find out if NetworkManager is running: %s." msgstr "Помилка: не вдалося визначити, чи працює NetworkManager: %s." -#: ../cli/src/connections.c:1064 ../cli/src/connections.c:1724 -#: ../cli/src/connections.c:1836 ../cli/src/connections.c:1927 -#: ../cli/src/devices.c:856 ../cli/src/devices.c:918 ../cli/src/devices.c:1084 -#: ../cli/src/devices.c:1217 ../cli/src/devices.c:1636 -#: ../cli/src/devices.c:1864 ../cli/src/network-manager.c:315 +#: ../cli/src/connections.c:897 ../cli/src/connections.c:1559 +#: ../cli/src/connections.c:1672 ../cli/src/connections.c:1763 +#: ../cli/src/devices.c:942 ../cli/src/devices.c:1004 +#: ../cli/src/devices.c:1170 ../cli/src/devices.c:1303 +#: ../cli/src/devices.c:1722 ../cli/src/devices.c:1950 +#: ../cli/src/network-manager.c:315 #, c-format msgid "Error: NetworkManager is not running." msgstr "Помилка: NetworkManager не працює." -#: ../cli/src/connections.c:1096 +#: ../cli/src/connections.c:929 msgid "Active connections" msgstr "Активні з’єднання" -#: ../cli/src/connections.c:1121 +#: ../cli/src/connections.c:954 #, c-format msgid "Error: '%s' is not an active connection." msgstr "Помилка: «%s» не є активним з’єднанням." -#: ../cli/src/connections.c:1126 +#: ../cli/src/connections.c:959 #, c-format msgid "Error: unknown parameter: %s" msgstr "Помилка: невідомий параметр: %s" -#: ../cli/src/connections.c:1233 +#: ../cli/src/connections.c:1066 #, c-format msgid "no active connection on device '%s'" msgstr "на пристрої «%s» немає активних з’єднань" -#: ../cli/src/connections.c:1241 -#, c-format +#: ../cli/src/connections.c:1074 msgid "no active connection or device" msgstr "немає активних з’єднань або пристроїв" -#: ../cli/src/connections.c:1312 +#: ../cli/src/connections.c:1145 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "пристрій «%s» несумісний зі з’єднанням «%s»" -#: ../cli/src/connections.c:1314 +#: ../cli/src/connections.c:1148 #, c-format msgid "no device found for connection '%s'" msgstr "не виявлено пристрою для з’єднання «%s»" -#: ../cli/src/connections.c:1325 +#: ../cli/src/connections.c:1160 msgid "unknown reason" msgstr "невідома причина" -#: ../cli/src/connections.c:1327 +#: ../cli/src/connections.c:1162 msgid "none" msgstr "немає" -#: ../cli/src/connections.c:1329 +#: ../cli/src/connections.c:1164 msgid "the user was disconnected" msgstr "користувача від’єднано" -#: ../cli/src/connections.c:1331 +#: ../cli/src/connections.c:1166 msgid "the base network connection was interrupted" msgstr "основне з’єднання з мережею розірвано" -#: ../cli/src/connections.c:1333 +#: ../cli/src/connections.c:1168 msgid "the VPN service stopped unexpectedly" msgstr "служба VPN неочікувано завершила роботу" -#: ../cli/src/connections.c:1335 +#: ../cli/src/connections.c:1170 msgid "the VPN service returned invalid configuration" msgstr "службою VPN повернуто неприпустимі налаштування" -#: ../cli/src/connections.c:1337 +#: ../cli/src/connections.c:1172 msgid "the connection attempt timed out" msgstr "перевищено час очікування на встановлення з’єднання" -#: ../cli/src/connections.c:1339 +#: ../cli/src/connections.c:1174 msgid "the VPN service did not start in time" msgstr "службу VPN не було вчасно запущено" -#: ../cli/src/connections.c:1341 +#: ../cli/src/connections.c:1176 msgid "the VPN service failed to start" msgstr "не вдалося запустити службу VPN" -#: ../cli/src/connections.c:1343 +#: ../cli/src/connections.c:1178 msgid "no valid VPN secrets" msgstr "не виявлено коректних реєстраційних даних VPN" -#: ../cli/src/connections.c:1345 +#: ../cli/src/connections.c:1180 msgid "invalid VPN secrets" msgstr "некоректні реєстраційні дані VPN" -#: ../cli/src/connections.c:1347 +#: ../cli/src/connections.c:1182 msgid "the connection was removed" msgstr "з’єднання було вилучено" -#: ../cli/src/connections.c:1364 ../cli/src/connections.c:1569 +#: ../cli/src/connections.c:1199 ../cli/src/connections.c:1404 #, c-format msgid "Connection successfully activated (D-Bus active path: %s)\n" msgstr "З’єднання успішно задіяно (активний шлях D-Bus: %s)\n" #. Active connection failed and dissapeared, quit. -#: ../cli/src/connections.c:1369 ../cli/src/connections.c:1470 +#: ../cli/src/connections.c:1204 ../cli/src/connections.c:1305 #, c-format msgid "Error: Connection activation failed." msgstr "Помилка: невдала спроба активації з’єднання." -#: ../cli/src/connections.c:1394 +#: ../cli/src/connections.c:1229 #, c-format msgid "VPN connection successfully activated (D-Bus active path: %s)\n" msgstr "З’єднання VPN успішно задіяно (активний шлях D-Bus: %s)\n" -#: ../cli/src/connections.c:1402 +#: ../cli/src/connections.c:1237 #, c-format msgid "Error: Connection activation failed: %s." msgstr "Помилка: не вдалося активувати з’єднання: %s." -#: ../cli/src/connections.c:1499 ../cli/src/devices.c:974 +#: ../cli/src/connections.c:1334 ../cli/src/devices.c:1060 #, c-format msgid "Error: Timeout %d sec expired." msgstr "Помилка: перевищено час очікування у %d с." -#: ../cli/src/connections.c:1560 +#: ../cli/src/connections.c:1395 #, c-format msgid "Error: Connection activation failed: %s" msgstr "Помилка: не вдалося активувати з’єднання: %s" -#: ../cli/src/connections.c:1654 ../cli/src/connections.c:1808 -#: ../cli/src/connections.c:1936 +#: ../cli/src/connections.c:1489 ../cli/src/connections.c:1644 +#: ../cli/src/connections.c:1772 #, c-format msgid "Error: Unknown connection: %s." msgstr "Помилка: невідоме з’єднання: %s." -#: ../cli/src/connections.c:1700 ../cli/src/devices.c:1059 -#: ../cli/src/devices.c:1605 +#: ../cli/src/connections.c:1535 ../cli/src/devices.c:1145 +#: ../cli/src/devices.c:1691 #, c-format msgid "Error: timeout value '%s' is not valid." msgstr "Помилка: значення часу очікування «%s» є некоректним." -#: ../cli/src/connections.c:1713 ../cli/src/connections.c:1825 -#: ../cli/src/connections.c:1916 +#: ../cli/src/connections.c:1548 ../cli/src/connections.c:1661 +#: ../cli/src/connections.c:1752 #, c-format msgid "Error: id or uuid has to be specified." msgstr "Помилка: мало бути вказано id або uuid." -#: ../cli/src/connections.c:1745 +#: ../cli/src/connections.c:1581 #, c-format msgid "Error: No suitable device found: %s." msgstr "Помилка: не знайдено відповідних пристроїв: %s." -#: ../cli/src/connections.c:1747 +#: ../cli/src/connections.c:1583 #, c-format msgid "Error: No suitable device found." msgstr "Помилка: не знайдено відповідних пристроїв." -#: ../cli/src/connections.c:1861 +#: ../cli/src/connections.c:1697 #, c-format msgid "Warning: Connection not active\n" msgstr "Помилка: з’єднання не є активним\n" -#: ../cli/src/connections.c:1875 +#: ../cli/src/connections.c:1711 #, c-format msgid "Error: Connection deletion failed: %s" msgstr "Помилка: не вдалося вилучити з’єднання: %s" -#: ../cli/src/connections.c:1993 +#: ../cli/src/connections.c:1832 #, c-format msgid "Error: 'con' command '%s' is not valid." msgstr "Помилка: команда «con» «%s» є некоректною." -#: ../cli/src/connections.c:2061 +#: ../cli/src/connections.c:1900 #, c-format msgid "Error: could not connect to D-Bus." msgstr "Помилка: не вдалося встановити з’єднання з D-Bus." -#: ../cli/src/connections.c:2069 +#: ../cli/src/connections.c:1908 #, c-format msgid "Error: Could not get system settings." msgstr "Помилка: не вдалося отримати параметри системи." -#: ../cli/src/connections.c:2079 +#: ../cli/src/connections.c:1918 #, c-format msgid "Error: Can't obtain connections: settings service is not running." msgstr "" @@ -861,242 +883,261 @@ msgstr "" #. 0 #. 9 #. 3 -#: ../cli/src/devices.c:70 ../cli/src/devices.c:106 ../cli/src/devices.c:187 -#: ../cli/src/devices.c:203 +#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:190 +#: ../cli/src/devices.c:206 msgid "DEVICE" msgstr "ПРИСТРІЙ" #. 0 -#: ../cli/src/devices.c:83 +#: ../cli/src/devices.c:84 msgid "CAPABILITIES" msgstr "МОЖЛИВОСТІ" #. 1 -#: ../cli/src/devices.c:84 +#: ../cli/src/devices.c:85 msgid "WIFI-PROPERTIES" msgstr "ПАРАМЕТРИ WIFI" #. 2 -#: ../cli/src/devices.c:85 +#: ../cli/src/devices.c:86 msgid "AP" msgstr "ТД" #. 3 -#: ../cli/src/devices.c:86 +#: ../cli/src/devices.c:87 msgid "WIRED-PROPERTIES" msgstr "ПАРАМЕТРИ WIRED" #. 4 -#: ../cli/src/devices.c:87 +#: ../cli/src/devices.c:88 msgid "WIMAX-PROPERTIES" msgstr "ПАРАМЕТРИ WIMAX" #. 5 #. 0 -#: ../cli/src/devices.c:88 ../cli/src/devices.c:200 +#: ../cli/src/devices.c:89 ../cli/src/devices.c:203 msgid "NSP" msgstr "NSP" #. 6 -#: ../cli/src/devices.c:89 +#: ../cli/src/devices.c:90 msgid "IP4" msgstr "IP4" #. 7 -#: ../cli/src/devices.c:90 +#: ../cli/src/devices.c:91 msgid "DHCP4" msgstr "DHCP4" #. 8 -#: ../cli/src/devices.c:91 +#: ../cli/src/devices.c:92 msgid "IP6" msgstr "IP6" #. 9 -#: ../cli/src/devices.c:92 +#: ../cli/src/devices.c:93 msgid "DHCP6" msgstr "DHCP6" +#. 10 +#: ../cli/src/devices.c:94 +msgid "BOND" +msgstr "BOND" + +#. 11 +#: ../cli/src/devices.c:95 +msgid "VLAN" +msgstr "VLAN" + #. 2 -#: ../cli/src/devices.c:108 +#: ../cli/src/devices.c:111 msgid "VENDOR" msgstr "ВИРОБНИК" #. 3 -#: ../cli/src/devices.c:109 +#: ../cli/src/devices.c:112 msgid "PRODUCT" msgstr "ПРОДУКТ" #. 4 -#: ../cli/src/devices.c:110 +#: ../cli/src/devices.c:113 msgid "DRIVER" msgstr "ДРАЙВЕР" #. 5 -#: ../cli/src/devices.c:111 -#| msgid "VERSION" +#: ../cli/src/devices.c:114 msgid "DRIVER-VERSION" msgstr "ВЕРСІЯ-ДРАЙВЕРА" #. 6 -#: ../cli/src/devices.c:112 -#| msgid "FIRMWARE-MISSING" +#: ../cli/src/devices.c:115 msgid "FIRMWARE-VERSION" msgstr "ВЕРСІЯ-МІКРОПРОГРАМИ" #. 7 -#: ../cli/src/devices.c:113 +#: ../cli/src/devices.c:116 msgid "HWADDR" msgstr "АП.АДРЕСА" #. 9 -#: ../cli/src/devices.c:115 +#: ../cli/src/devices.c:118 msgid "REASON" msgstr "ПРИЧИНА" #. 10 -#: ../cli/src/devices.c:116 +#: ../cli/src/devices.c:119 msgid "UDI" msgstr "UDI" #. 11 -#: ../cli/src/devices.c:117 +#: ../cli/src/devices.c:120 msgid "IP-IFACE" msgstr "IP-IFACE" #. 12 -#: ../cli/src/devices.c:118 +#: ../cli/src/devices.c:121 msgid "NM-MANAGED" msgstr "КЕРОВАНЕ-NM" #. 14 -#: ../cli/src/devices.c:120 +#: ../cli/src/devices.c:123 msgid "FIRMWARE-MISSING" msgstr "ПОТРІБНИЙ-МІКРОКОД" #. 15 -#: ../cli/src/devices.c:121 +#: ../cli/src/devices.c:124 msgid "CONNECTION" msgstr "З’ЄДНАННЯ" #. 0 -#: ../cli/src/devices.c:130 +#: ../cli/src/devices.c:133 msgid "CARRIER-DETECT" msgstr "ВИЗН.НОСІЯ" #. 1 -#: ../cli/src/devices.c:131 +#: ../cli/src/devices.c:134 msgid "SPEED" msgstr "ШВИДКІСТЬ" #. 0 -#: ../cli/src/devices.c:140 +#: ../cli/src/devices.c:143 msgid "CARRIER" msgstr "НОСІЙ" #. 0 -#: ../cli/src/devices.c:150 +#: ../cli/src/devices.c:153 msgid "WEP" msgstr "WEP" #. 1 -#: ../cli/src/devices.c:151 +#: ../cli/src/devices.c:154 msgid "WPA" msgstr "WPA" #. 2 -#: ../cli/src/devices.c:152 +#: ../cli/src/devices.c:155 msgid "WPA2" msgstr "WPA2" #. 3 -#: ../cli/src/devices.c:153 +#: ../cli/src/devices.c:156 msgid "TKIP" msgstr "TKIP" #. 4 -#: ../cli/src/devices.c:154 +#: ../cli/src/devices.c:157 msgid "CCMP" msgstr "CCMP" #. 0 -#: ../cli/src/devices.c:164 +#: ../cli/src/devices.c:167 msgid "CTR-FREQ" msgstr "CTR-FREQ" #. 1 -#: ../cli/src/devices.c:165 +#: ../cli/src/devices.c:168 msgid "RSSI" msgstr "RSSI" #. 2 -#: ../cli/src/devices.c:166 +#: ../cli/src/devices.c:169 msgid "CINR" msgstr "CINR" #. 3 -#: ../cli/src/devices.c:167 +#: ../cli/src/devices.c:170 msgid "TX-POW" msgstr "TX-POW" #. 4 -#: ../cli/src/devices.c:168 +#: ../cli/src/devices.c:171 msgid "BSID" msgstr "BSID" #. 0 -#: ../cli/src/devices.c:178 +#: ../cli/src/devices.c:181 msgid "SSID" msgstr "SSID" #. 1 -#: ../cli/src/devices.c:179 +#: ../cli/src/devices.c:182 msgid "BSSID" msgstr "BSSID" #. 2 -#: ../cli/src/devices.c:180 +#: ../cli/src/devices.c:183 msgid "MODE" msgstr "РЕЖИМ" #. 3 -#: ../cli/src/devices.c:181 +#: ../cli/src/devices.c:184 msgid "FREQ" msgstr "ЧАСТОТА" #. 4 -#: ../cli/src/devices.c:182 +#: ../cli/src/devices.c:185 msgid "RATE" msgstr "ШВИДКІСТЬ" #. 5 #. 1 -#: ../cli/src/devices.c:183 ../cli/src/devices.c:201 +#: ../cli/src/devices.c:186 ../cli/src/devices.c:204 msgid "SIGNAL" msgstr "СИГНАЛ" #. 6 -#: ../cli/src/devices.c:184 +#: ../cli/src/devices.c:187 msgid "SECURITY" msgstr "ЗАХИСТ" #. 7 -#: ../cli/src/devices.c:185 +#: ../cli/src/devices.c:188 msgid "WPA-FLAGS" msgstr "ПРАПОРЦІ WPA" #. 8 -#: ../cli/src/devices.c:186 +#: ../cli/src/devices.c:189 msgid "RSN-FLAGS" msgstr "ПРАПОРЦІ RSN" #. 10 #. 4 -#: ../cli/src/devices.c:188 ../cli/src/devices.c:204 +#: ../cli/src/devices.c:191 ../cli/src/devices.c:207 msgid "ACTIVE" msgstr "АКТИВНИЙ" -#: ../cli/src/devices.c:223 +#. 0 +#: ../cli/src/devices.c:219 +msgid "SLAVES" +msgstr "SLAVES" + +#. 0 +#: ../cli/src/devices.c:228 +#| msgid "UUID" +msgid "ID" +msgstr "Ід" + +#: ../cli/src/devices.c:244 #, c-format #| msgid "" #| "Usage: nmcli dev { COMMAND | help }\n" @@ -1109,10 +1150,13 @@ msgstr "АКТИВНИЙ" #| " list [iface ]\n" #| " disconnect iface [--nowait] [--timeout ]\n" #| " wifi [list [iface ] [bssid ]]\n" +#| " wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] " +#| "[iface ] [bssid ] [name ]\n" +#| " [--private] [--nowait] [--timeout ]\n" #| " wimax [list [iface ] [nsp ]]\n" #| "\n" msgid "" -"Usage: nmcli dev { COMMAND | help }\n" +"Usage: nmcli device { COMMAND | help }\n" "\n" " COMMAND := { status | list | disconnect | wifi | wimax }\n" "\n" @@ -1128,7 +1172,7 @@ msgid "" " wimax [list [iface ] [nsp ]]\n" "\n" msgstr "" -"Використання: nmcli dev { КОМАНДА | help }\n" +"Використання: nmcli пристрій { КОМАНДА | help }\n" "\n" " КОМАНДА := { status | list | disconnect | wifi | wimax }\n" "\n" @@ -1144,204 +1188,199 @@ msgstr "" " wimax [list [iface <інтерфейс>] [nsp <назва>]]\n" "\n" -#: ../cli/src/devices.c:323 +#: ../cli/src/devices.c:347 msgid "(none)" msgstr "(немає)" -#: ../cli/src/devices.c:379 +#: ../cli/src/devices.c:403 #, c-format msgid "%u MHz" msgstr "%u МГц" -#: ../cli/src/devices.c:380 +#: ../cli/src/devices.c:404 #, c-format msgid "%u MB/s" msgstr "%u МБ/с" -#: ../cli/src/devices.c:389 +#: ../cli/src/devices.c:413 msgid "Encrypted: " msgstr "Зашифровано: " -#: ../cli/src/devices.c:394 +#: ../cli/src/devices.c:418 msgid "WEP " msgstr "WEP " -#: ../cli/src/devices.c:396 +#: ../cli/src/devices.c:420 msgid "WPA " msgstr "WPA " -#: ../cli/src/devices.c:398 +#: ../cli/src/devices.c:422 msgid "WPA2 " msgstr "WPA2 " -#: ../cli/src/devices.c:401 +#: ../cli/src/devices.c:425 msgid "Enterprise " msgstr "Enterprise " -#: ../cli/src/devices.c:410 +#: ../cli/src/devices.c:434 msgid "Ad-Hoc" msgstr "Ad-Hoc" -#: ../cli/src/devices.c:410 +#: ../cli/src/devices.c:435 msgid "Infrastructure" msgstr "Інфраструктура" -#: ../cli/src/devices.c:445 +#: ../cli/src/devices.c:471 msgid "Home" msgstr "Домівка" -#: ../cli/src/devices.c:448 +#: ../cli/src/devices.c:474 msgid "Partner" msgstr "Партнер" -#: ../cli/src/devices.c:451 +#: ../cli/src/devices.c:477 msgid "Roaming" msgstr "Роумінг" -#: ../cli/src/devices.c:523 +#: ../cli/src/devices.c:549 #, c-format msgid "Error: 'dev list': %s" msgstr "Помилка: «dev list»: %s" -#: ../cli/src/devices.c:525 +#: ../cli/src/devices.c:551 #, c-format msgid "Error: 'dev list': %s; allowed fields: %s" msgstr "Помилка: «dev list»: %s; дозволені поля: %s" -#: ../cli/src/devices.c:534 +#: ../cli/src/devices.c:560 msgid "Device details" msgstr "Дані щодо пристрою" -#: ../cli/src/devices.c:579 ../cli/src/devices.c:582 ../cli/src/devices.c:1000 -#: ../cli/src/utils.c:477 +#: ../cli/src/devices.c:607 ../cli/src/devices.c:610 ../cli/src/devices.c:1086 +#: ../cli/src/utils.c:479 msgid "(unknown)" msgstr "(невідомо)" -#: ../cli/src/devices.c:591 +#: ../cli/src/devices.c:619 msgid "not connected" msgstr "не з’єднано" -#: ../cli/src/devices.c:618 +#: ../cli/src/devices.c:646 #, c-format msgid "%u Mb/s" msgstr "%u Мб/с" #. Print header #. "WIRED-PROPERTIES" -#: ../cli/src/devices.c:691 +#: ../cli/src/devices.c:720 msgid "on" msgstr "увімкн." -#: ../cli/src/devices.c:691 +#: ../cli/src/devices.c:720 msgid "off" msgstr "вимкн." -#: ../cli/src/devices.c:842 +#: ../cli/src/devices.c:928 #, c-format msgid "Error: 'dev status': %s" msgstr "Помилка: «dev status»: %s" -#: ../cli/src/devices.c:844 +#: ../cli/src/devices.c:930 #, c-format msgid "Error: 'dev status': %s; allowed fields: %s" msgstr "Помилка: «dev status»: %s; дозволені поля: %s" -#: ../cli/src/devices.c:867 +#: ../cli/src/devices.c:953 msgid "Status of devices" msgstr "Стан пристрою" -#: ../cli/src/devices.c:898 +#: ../cli/src/devices.c:984 #, c-format msgid "Error: '%s' argument is missing." msgstr "Помилка: не вказано аргументу «%s»." -#: ../cli/src/devices.c:939 ../cli/src/devices.c:1104 -#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1892 +#: ../cli/src/devices.c:1025 ../cli/src/devices.c:1190 +#: ../cli/src/devices.c:1331 ../cli/src/devices.c:1978 #, c-format msgid "Error: Device '%s' not found." msgstr "Помилка: не знайдено пристрій «%s»." -#: ../cli/src/devices.c:962 +#: ../cli/src/devices.c:1048 #, c-format msgid "Success: Device '%s' successfully disconnected." msgstr "Виконано: пристрій «%s» успішно від’єднано." -#: ../cli/src/devices.c:997 +#: ../cli/src/devices.c:1083 #, c-format msgid "Error: Device '%s' (%s) disconnecting failed: %s" msgstr "Помилка: невдала спроба від’єднання «%s» (%s): %s" -#: ../cli/src/devices.c:1010 +#: ../cli/src/devices.c:1096 #, c-format -#| msgid "Success: Device '%s' successfully disconnected." msgid "Device '%s' has been disconnected.\n" msgstr "Пристрій «%s» було від’єднано.\n" -#: ../cli/src/devices.c:1073 +#: ../cli/src/devices.c:1159 #, c-format msgid "Error: iface has to be specified." msgstr "Помилка: мало бути вказано інтерфейс." -#: ../cli/src/devices.c:1203 +#: ../cli/src/devices.c:1289 #, c-format msgid "Error: 'dev wifi': %s" msgstr "Помилка: «dev wifi»: %s" -#: ../cli/src/devices.c:1205 +#: ../cli/src/devices.c:1291 #, c-format msgid "Error: 'dev wifi': %s; allowed fields: %s" msgstr "Помилка: «dev wifi»: %s; дозволені поля: %s" -#: ../cli/src/devices.c:1228 +#: ../cli/src/devices.c:1314 msgid "WiFi scan list" msgstr "Список сканування WiFi" -#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1319 +#: ../cli/src/devices.c:1351 ../cli/src/devices.c:1405 #, c-format msgid "Error: Access point with bssid '%s' not found." msgstr "Помилка: не знайдено точки доступу з bssid «%s»." -#: ../cli/src/devices.c:1282 +#: ../cli/src/devices.c:1368 #, c-format msgid "Error: Device '%s' is not a WiFi device." msgstr "Помилка: пристрій «%s» не є пристроєм WiFi." -#: ../cli/src/devices.c:1350 ../cli/src/devices.c:1396 +#: ../cli/src/devices.c:1436 ../cli/src/devices.c:1482 #, c-format msgid "Connection with UUID '%s' created and activated on device '%s'\n" msgstr "Створено і задіяно з’єднання з UUID «%s» на пристрої «%s»\n" -#: ../cli/src/devices.c:1355 +#: ../cli/src/devices.c:1441 #, c-format -#| msgid "Error: Connection activation failed: %s." msgid "Error: Connection activation failed: (%d) %s." msgstr "Помилка: не вдалося активувати з’єднання: (%d) %s." -#: ../cli/src/devices.c:1380 +#: ../cli/src/devices.c:1466 #, c-format -#| msgid "Failed to read configuration: (%d) %s\n" msgid "Error: Failed to add/activate new connection: (%d) %s" msgstr "Помилка: не вдалося додати або задіяти нове з’єднання: (%d) %s" -#: ../cli/src/devices.c:1388 +#: ../cli/src/devices.c:1474 #, c-format msgid "Error: Failed to add/activate new connection: Unknown error" msgstr "" "Помилка: не вдалося додати або задіяти нове з’єднання (невідома помилка)" -#: ../cli/src/devices.c:1532 +#: ../cli/src/devices.c:1618 #, c-format -#| msgid "Error: %s argument is missing." msgid "Error: SSID or BSSID are missing." msgstr "Помилка: не вистачає SSID або BSSID." -#: ../cli/src/devices.c:1555 +#: ../cli/src/devices.c:1641 #, c-format -#| msgid "Error: timeout value '%s' is not valid." msgid "Error: bssid argument value '%s' is not a valid BSSID." msgstr "Помилка: значення параметра bssid, «%s», не є коректним BSSID." -#: ../cli/src/devices.c:1579 +#: ../cli/src/devices.c:1665 #, c-format msgid "" "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'." @@ -1349,81 +1388,77 @@ msgstr "" "Помилка: значення параметра wep-key-type, «%s», є некоректним, слід " "використовувати «key» або «phrase»." -#: ../cli/src/devices.c:1619 +#: ../cli/src/devices.c:1705 #, c-format msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)." msgstr "" "Помилка: BSSID для з’єднання з (%s) відрізняється від параметра bssid (%s)." -#: ../cli/src/devices.c:1625 +#: ../cli/src/devices.c:1711 #, c-format msgid "Error: Parameter '%s' is neither SSID nor BSSID." msgstr "Помилка: параметр «%s» не дорівнює ні SSID, ні BSSID." -#: ../cli/src/devices.c:1654 +#: ../cli/src/devices.c:1740 #, c-format -#| msgid "Error: Device '%s' is not a WiFi device." msgid "Error: Device '%s' is not a Wi-Fi device." msgstr "Помилка: пристрій «%s» не є пристроєм Wi-Fi." -#: ../cli/src/devices.c:1656 +#: ../cli/src/devices.c:1742 #, c-format -#| msgid "Error: No suitable device found." msgid "Error: No Wi-Fi device found." msgstr "Помилка: не знайдено жодного пристрою Wi-Fi." -#: ../cli/src/devices.c:1674 +#: ../cli/src/devices.c:1760 #, c-format -#| msgid "Error: NSP with name '%s' not found." msgid "Error: No network with SSID '%s' found." msgstr "Помилка: не знайдено мережі з SSID «%s»." -#: ../cli/src/devices.c:1676 +#: ../cli/src/devices.c:1762 #, c-format -#| msgid "Error: Access point with nsp '%s' not found." msgid "Error: No access point with BSSID '%s' found." msgstr "Помилка: не знайдено точки доступу з BSSID «%s»." -#: ../cli/src/devices.c:1774 +#: ../cli/src/devices.c:1860 #, c-format msgid "Error: 'dev wifi' command '%s' is not valid." msgstr "Помилка: команда «dev wifi» «%s» є некоректною." -#: ../cli/src/devices.c:1850 +#: ../cli/src/devices.c:1936 #, c-format msgid "Error: 'dev wimax': %s" msgstr "Помилка: «dev wimax»: %s" -#: ../cli/src/devices.c:1852 +#: ../cli/src/devices.c:1938 #, c-format msgid "Error: 'dev wimax': %s; allowed fields: %s" msgstr "Помилка: «dev wimax»: %s; дозволені поля: %s" -#: ../cli/src/devices.c:1875 +#: ../cli/src/devices.c:1961 msgid "WiMAX NSP list" msgstr "Список WiMAX NSP" -#: ../cli/src/devices.c:1912 +#: ../cli/src/devices.c:1998 #, c-format msgid "Error: NSP with name '%s' not found." msgstr "Помилка: не знайдено NSP з назвою «%s»." -#: ../cli/src/devices.c:1923 +#: ../cli/src/devices.c:2009 #, c-format msgid "Error: Device '%s' is not a WiMAX device." msgstr "Помилка: пристрій «%s» не є пристроєм WiMAX." -#: ../cli/src/devices.c:1954 +#: ../cli/src/devices.c:2040 #, c-format msgid "Error: Access point with nsp '%s' not found." msgstr "Помилка: не знайдено точки доступу з nsp «%s»." -#: ../cli/src/devices.c:1981 +#: ../cli/src/devices.c:2067 #, c-format msgid "Error: 'dev wimax' command '%s' is not valid." msgstr "Помилка: команда «dev wimax» «%s» є некоректною." -#: ../cli/src/devices.c:2031 +#: ../cli/src/devices.c:2120 #, c-format msgid "Error: 'dev' command '%s' is not valid." msgstr "Помилка: команда «dev» «%s» є некоректною." @@ -1473,7 +1508,6 @@ msgid "WIMAX" msgstr "WIMAX" #: ../cli/src/network-manager.c:62 -#| msgid "VERSION" msgid "PERMISSION" msgstr "ДОСТУП" @@ -1484,20 +1518,6 @@ msgstr "ЗНАЧЕННЯ" #: ../cli/src/network-manager.c:77 #, c-format -#| msgid "" -#| "Usage: nmcli nm { COMMAND | help }\n" -#| "\n" -#| " COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n" -#| "\n" -#| " COMMAND := { status | enable | sleep | wifi | wwan }\n" -#| "\n" -#| " status\n" -#| " enable [true|false]\n" -#| " sleep [true|false]\n" -#| " wifi [on|off]\n" -#| " wwan [on|off]\n" -#| " wimax [on|off]\n" -#| "\n" msgid "" "Usage: nmcli nm { COMMAND | help }\n" "\n" @@ -1517,7 +1537,8 @@ msgid "" msgstr "" "Використання: nmcli nm { КОМАНДА | help }\n" "\n" -" КОМАНДА := { status | permissions | enable | sleep | wifi | wwan | wimax }\n" +" КОМАНДА := { status | permissions | enable | sleep | wifi | wwan | " +"wimax }\n" "\n" " КОМАНДА := { status | permissions | enable | sleep | wifi | wwan }\n" "\n" @@ -1598,22 +1619,19 @@ msgstr "розпізн" #: ../cli/src/network-manager.c:301 #, c-format -#| msgid "Error: 'nm status': %s" msgid "Error: 'nm permissions': %s" msgstr "Помилка: «nm permissions»: %s" #: ../cli/src/network-manager.c:303 #, c-format -#| msgid "Error: 'nm status': %s; allowed fields: %s" msgid "Error: 'nm permissions': %s; allowed fields: %s" msgstr "Помилка: «nm permissions»: %s; дозволені поля: %s" #: ../cli/src/network-manager.c:324 -#| msgid "NetworkManager status" msgid "NetworkManager permissions" msgstr "Права доступу NetworkManager" -#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457 +#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:459 #, c-format msgid "Error: Couldn't connect to system bus: %s" msgstr "" @@ -1686,13 +1704,33 @@ msgstr "WiMAX увімкнено" msgid "Error: invalid 'wimax' parameter: '%s'." msgstr "Помилка: некоректний параметр «wimax»: «%s»." -#: ../cli/src/network-manager.c:585 +#: ../cli/src/network-manager.c:588 #, c-format msgid "Error: 'nm' command '%s' is not valid." msgstr "Помилка: команда «nm» «%s» є некоректною." -#: ../cli/src/nmcli.c:64 +#: ../cli/src/nmcli.c:76 #, c-format +#| msgid "" +#| "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" +#| "\n" +#| "OPTIONS\n" +#| " -t[erse] terse output\n" +#| " -p[retty] pretty output\n" +#| " -m[ode] tabular|multiline output mode\n" +#| " -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" +#| "OBJECT\n" +#| " nm NetworkManager status\n" +#| " con NetworkManager connections\n" +#| " dev devices managed by NetworkManager\n" +#| "\n" msgid "" "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" "\n" @@ -1709,9 +1747,9 @@ msgid "" " -h[elp] print this help\n" "\n" "OBJECT\n" -" nm NetworkManager status\n" -" con NetworkManager connections\n" -" dev devices managed by NetworkManager\n" +" nm NetworkManager's status\n" +" c[onnection] NetworkManager's connections\n" +" d[evice] devices managed by NetworkManager\n" "\n" msgstr "" "Використання: %s [ПАРАМЕТРИ] ОБ’ЄКТ { КОМАНДА | help }\n" @@ -1729,232 +1767,248 @@ msgstr "" " -h[elp] вивести цю довідку\n" "\n" "ОБ’ЄКТ\n" -" nm стан NetworkManager\n" -" con з’єднання NetworkManager\n" -" dev пристрої, керовані NetworkManager\n" +" nm стан NetworkManager\n" +" c[onnection] з’єднання NetworkManager\n" +" dd[evice] пристрої, керовані NetworkManager\n" "\n" -#: ../cli/src/nmcli.c:109 +#: ../cli/src/nmcli.c:124 #, c-format msgid "Error: Object '%s' is unknown, try 'nmcli help'." msgstr "Помилка: невідомий об’єкт «%s», спробуйте «nmcli help»." -#: ../cli/src/nmcli.c:139 +#: ../cli/src/nmcli.c:154 #, c-format msgid "Error: Option '--terse' is specified the second time." msgstr "Помилка: параметр «--terse» вказано двічі." -#: ../cli/src/nmcli.c:144 +#: ../cli/src/nmcli.c:159 #, c-format msgid "Error: Option '--terse' is mutually exclusive with '--pretty'." msgstr "" "Помилка: параметр «--terse» і «--pretty» не можна використовувати одночасно." -#: ../cli/src/nmcli.c:152 +#: ../cli/src/nmcli.c:167 #, c-format msgid "Error: Option '--pretty' is specified the second time." msgstr "Помилка: параметр «--pretty» вказано двічі." -#: ../cli/src/nmcli.c:157 +#: ../cli/src/nmcli.c:172 #, c-format msgid "Error: Option '--pretty' is mutually exclusive with '--terse'." msgstr "" "Помилка: параметр «--pretty» і «--terse» не можна використовувати одночасно" -#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183 +#: ../cli/src/nmcli.c:182 ../cli/src/nmcli.c:198 #, c-format msgid "Error: missing argument for '%s' option." msgstr "Помилка: не вказано аргумент параметра «%s»." -#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192 +#: ../cli/src/nmcli.c:191 ../cli/src/nmcli.c:207 #, c-format msgid "Error: '%s' is not valid argument for '%s' option." msgstr "Помилка: «%s» не є коректним аргументом «%s»." -#: ../cli/src/nmcli.c:199 +#: ../cli/src/nmcli.c:214 #, c-format msgid "Error: fields for '%s' options are missing." msgstr "Помилка: не вказано полів для параметрів «%s»." -#: ../cli/src/nmcli.c:207 +#: ../cli/src/nmcli.c:222 #, c-format msgid "nmcli tool, version %s\n" msgstr "інструмент nmcli, версія %s\n" -#: ../cli/src/nmcli.c:213 +#: ../cli/src/nmcli.c:228 #, c-format msgid "Error: Option '%s' is unknown, try 'nmcli -help'." msgstr "Помилка: невідомий параметр «%s», спробуйте «nmcli -help»." -#: ../cli/src/nmcli.c:232 +#: ../cli/src/nmcli.c:247 #, c-format msgid "Caught signal %d, shutting down..." msgstr "Отримано сигнал %d, завершення роботи…" -#: ../cli/src/nmcli.c:257 +#: ../cli/src/nmcli.c:272 msgid "Error: Could not create NMClient object." msgstr "Помилка: не вдалося створити об’єкт NMClient." -#: ../cli/src/nmcli.c:273 +#: ../cli/src/nmcli.c:288 msgid "Success" msgstr "Виконано" -#: ../cli/src/settings.c:519 +#: ../cli/src/settings.c:595 #, c-format msgid "%d (hex-ascii-key)" msgstr "%d (16-ковий ASCII-ключ)" -#: ../cli/src/settings.c:521 +#: ../cli/src/settings.c:597 #, c-format msgid "%d (104/128-bit passphrase)" msgstr "%d (104/128-бітовий пароль)" -#: ../cli/src/settings.c:524 ../cli/src/settings.c:652 +#: ../cli/src/settings.c:600 ../cli/src/settings.c:728 #, c-format msgid "%d (unknown)" msgstr "%d (невідомо)" -#: ../cli/src/settings.c:550 +#: ../cli/src/settings.c:626 msgid "0 (unknown)" msgstr "0 (невідомо)" -#: ../cli/src/settings.c:556 +#: ../cli/src/settings.c:632 msgid "any, " msgstr "будь-який, " -#: ../cli/src/settings.c:558 +#: ../cli/src/settings.c:634 msgid "900 MHz, " msgstr "900 МГц, " -#: ../cli/src/settings.c:560 +#: ../cli/src/settings.c:636 msgid "1800 MHz, " msgstr "1800 МГц, " -#: ../cli/src/settings.c:562 +#: ../cli/src/settings.c:638 msgid "1900 MHz, " msgstr "1900 МГц, " -#: ../cli/src/settings.c:564 +#: ../cli/src/settings.c:640 msgid "850 MHz, " msgstr "800 МГц, " -#: ../cli/src/settings.c:566 +#: ../cli/src/settings.c:642 msgid "WCDMA 3GPP UMTS 2100 MHz, " msgstr "WCDMA 3GPP UMTS 2100 МГц, " -#: ../cli/src/settings.c:568 +#: ../cli/src/settings.c:644 msgid "WCDMA 3GPP UMTS 1800 MHz, " msgstr "WCDMA 3GPP UMTS 1800 МГц, " -#: ../cli/src/settings.c:570 +#: ../cli/src/settings.c:646 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, " msgstr "WCDMA 3GPP UMTS 1700/2100 МГц, " -#: ../cli/src/settings.c:572 +#: ../cli/src/settings.c:648 msgid "WCDMA 3GPP UMTS 800 MHz, " msgstr "WCDMA 3GPP UMTS 800 МГц, " -#: ../cli/src/settings.c:574 +#: ../cli/src/settings.c:650 msgid "WCDMA 3GPP UMTS 850 MHz, " msgstr "WCDMA 3GPP UMTS 850 МГц, " -#: ../cli/src/settings.c:576 +#: ../cli/src/settings.c:652 msgid "WCDMA 3GPP UMTS 900 MHz, " msgstr "WCDMA 3GPP UMTS 900 МГц, " -#: ../cli/src/settings.c:578 +#: ../cli/src/settings.c:654 msgid "WCDMA 3GPP UMTS 1700 MHz, " msgstr "WCDMA 3GPP UMTS 1700 МГц, " -#: ../cli/src/settings.c:580 +#: ../cli/src/settings.c:656 msgid "WCDMA 3GPP UMTS 1900 MHz, " msgstr "WCDMA 3GPP UMTS 1900 МГц, " -#: ../cli/src/settings.c:582 +#: ../cli/src/settings.c:658 msgid "WCDMA 3GPP UMTS 2600 MHz, " msgstr "WCDMA 3GPP UMTS 2600 МГц, " -#: ../cli/src/settings.c:600 +#: ../cli/src/settings.c:676 msgid "0 (NONE)" msgstr "0 (НЕМАЄ)" -#: ../cli/src/settings.c:606 +#: ../cli/src/settings.c:682 msgid "REORDER_HEADERS, " msgstr "ПЕРЕВПОРЯДКОВУВАННЯ_ЗАГОЛОВКІВ, " -#: ../cli/src/settings.c:608 +#: ../cli/src/settings.c:684 msgid "GVRP, " msgstr "GVRP, " -#: ../cli/src/settings.c:610 +#: ../cli/src/settings.c:686 msgid "LOOSE_BINDING, " msgstr "ШИРОКЕ_ПРИВ’ЯЗУВАННЯ, " -#: ../cli/src/settings.c:646 +#: ../cli/src/settings.c:722 #, c-format -#| msgid "disabled" msgid "%d (disabled)" msgstr "%d (вимкнено)" -#: ../cli/src/settings.c:648 +#: ../cli/src/settings.c:724 #, c-format msgid "%d (enabled, prefer public IP)" msgstr "%d (увімкнено, перевага відкритого IP)" -#: ../cli/src/settings.c:650 +#: ../cli/src/settings.c:726 #, c-format msgid "%d (enabled, prefer temporary IP)" msgstr "%d (увімкнено, перевага тимчасового IP)" -#: ../cli/src/settings.c:768 ../cli/src/settings.c:964 -#: ../cli/src/settings.c:1673 +#: ../cli/src/settings.c:738 +#| msgid "(none)" +msgid "0 (none)" +msgstr "0 (немає)" + +#: ../cli/src/settings.c:744 +msgid "agent-owned, " +msgstr ", власником є агент, " + +#: ../cli/src/settings.c:746 +#| msgid "not set" +msgid "not saved, " +msgstr "не збережено, " + +#: ../cli/src/settings.c:748 +msgid "not required, " +msgstr "не є обов’язковим, " + +#: ../cli/src/settings.c:945 ../cli/src/settings.c:1163 +#: ../cli/src/settings.c:1904 msgid "auto" msgstr "авто" -#: ../cli/src/utils.c:103 +#: ../cli/src/utils.c:105 #, c-format msgid "Error converting IP4 address '0x%X' to text form" msgstr "" "Помилка під час спроби перетворення адреси IP4 «0x%X» у текстовий формат" -#: ../cli/src/utils.c:131 +#: ../cli/src/utils.c:133 #, c-format msgid "Error converting IP6 address '%s' to text form" msgstr "Помилка під час спроби перетворення адреси IP6 «%s» у текстовий формат" -#: ../cli/src/utils.c:232 +#: ../cli/src/utils.c:234 #, c-format msgid "field '%s' has to be alone" msgstr "поле «%s» має бути єдиним" -#: ../cli/src/utils.c:235 +#: ../cli/src/utils.c:237 #, c-format msgid "invalid field '%s'" msgstr "некоректне поле «%s»" -#: ../cli/src/utils.c:254 -#, c-format +#: ../cli/src/utils.c:256 msgid "Option '--terse' requires specifying '--fields'" msgstr "Використання параметра «--terse» потребує визначення «--fields»" -#: ../cli/src/utils.c:258 +#: ../cli/src/utils.c:260 #, c-format msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" "Параметр «--terse» потребує певних значень параметра «--fields», а не «%s»" -#: ../cli/src/utils.c:468 +#: ../cli/src/utils.c:470 #, c-format msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus" msgstr "" "Помилка: не вдалося створити проксі-об’єкт D-Bus для org.freedesktop.DBus" -#: ../cli/src/utils.c:476 +#: ../cli/src/utils.c:478 #, c-format msgid "Error: NameHasOwner request failed: %s" msgstr "Помилка: невдала спроба запиту NameHasOwner: %s" -#: ../cli/src/utils.c:521 +#: ../cli/src/utils.c:523 #, c-format msgid "" "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" @@ -1963,7 +2017,7 @@ msgstr "" "Увага: версії nmcli (%s) і NetworkManager (%s) не збігаються. Скористайтеся " "параметром --nocheck для вимикання цього попередження.\n" -#: ../cli/src/utils.c:530 +#: ../cli/src/utils.c:532 #, c-format msgid "" "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " @@ -2319,43 +2373,43 @@ msgstr "Не вдалося перевірити файл PKCS#12: %d" msgid "Could not generate random data." msgstr "Не вдалося створити псевдовипадкові дані." -#: ../libnm-util/nm-utils.c:2040 +#: ../libnm-util/nm-utils.c:2078 #, c-format msgid "Not enough memory to make encryption key." msgstr "Недостатньо пам’яті для створення ключа шифрування." -#: ../libnm-util/nm-utils.c:2150 +#: ../libnm-util/nm-utils.c:2188 msgid "Could not allocate memory for PEM file creation." msgstr "Не вдалося отримати область пам’яті для створення файла PEM." -#: ../libnm-util/nm-utils.c:2162 +#: ../libnm-util/nm-utils.c:2200 #, c-format msgid "Could not allocate memory for writing IV to PEM file." msgstr "Не вдалося отримати область пам’яті для запису ВІ до файла PEM." -#: ../libnm-util/nm-utils.c:2174 +#: ../libnm-util/nm-utils.c:2212 #, c-format msgid "Could not allocate memory for writing encrypted key to PEM file." msgstr "" "Не вдалося отримати область пам’яті для запису зашифрованого ключа до файла " "PEM." -#: ../libnm-util/nm-utils.c:2193 +#: ../libnm-util/nm-utils.c:2231 #, c-format msgid "Could not allocate memory for PEM file data." msgstr "Не вдалося отримати область пам’яті для даних файла PEM." -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1 msgid "Enable or disable system networking" msgstr "Увімкнути або вимкнути системну роботу у мережі" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2 msgid "System policy prevents enabling or disabling system networking" msgstr "" "Правила системи забороняють вмикання або вимикання з’єднань з мережею на " "системному рівні" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3 msgid "" "Put NetworkManager to sleep or wake it up (should only be used by system " "power management)" @@ -2363,187 +2417,177 @@ msgstr "" "Призупинити або поновити роботу NetworkManager (має використовуватися лише " "інструментами керування живленням системи)" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4 msgid "System policy prevents putting NetworkManager to sleep or waking it up" msgstr "" "Правила системи забороняють присипляння та поновлення роботи NetworkManager" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5 msgid "Enable or disable WiFi devices" msgstr "Увімкнути або вимкнути пристрої WiFi" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6 msgid "System policy prevents enabling or disabling WiFi devices" msgstr "Правила системи забороняють вмикання або вимикання пристроїв WiFi" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7 msgid "Enable or disable mobile broadband devices" msgstr "Увімкнути або вимкнути пристрої широкосмугових мобільних мереж" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8 msgid "System policy prevents enabling or disabling mobile broadband devices" msgstr "" "Правила системи забороняють вмикання або вимикання пристроїв широкосмугових " "мобільних мереж" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9 msgid "Enable or disable WiMAX mobile broadband devices" msgstr "Увімкнути або вимкнути пристрої широкосмугових мобільних мереж WiMAX" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10 msgid "" "System policy prevents enabling or disabling WiMAX mobile broadband devices" msgstr "" "Правила системи забороняють вмикання або вимикання пристроїв широкосмугових " "мобільних мереж WiMAX" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11 msgid "Allow control of network connections" msgstr "Дозволити керування з’єднаннями мережею" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12 msgid "System policy prevents control of network connections" msgstr "Правила системи забороняють керування з’єднаннями" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13 msgid "Connection sharing via a protected WiFi network" msgstr "Спільне використання з’єднання на основі захищеної мережі WiFi" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14 msgid "System policy prevents sharing connections via a protected WiFi network" msgstr "" "Правила системи забороняють спільне використання з’єднань за допомогою " "захищеної мережі WiFi" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15 msgid "Connection sharing via an open WiFi network" msgstr "Спільне використання з’єднання на основі відкритої мережі WiFi" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16 msgid "System policy prevents sharing connections via an open WiFi network" msgstr "" "Правила системи забороняють спільне використання з’єднань за допомогою " "відкритої мережі WiFi" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17 msgid "Modify personal network connections" msgstr "Змінити параметри особистих з’єднань з мережею" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18 msgid "System policy prevents modification of personal network settings" msgstr "" "Правила системи забороняють внесення змін до особистих параметрів мережі" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19 msgid "Modify network connections for all users" msgstr "Внести зміни до мережевих з’єднань всіх користувачів" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20 msgid "System policy prevents modification of network settings for all users" msgstr "" "Правила системи забороняють внесення змін до параметрів мережі для всіх " "користувачів" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21 msgid "Modify persistent system hostname" msgstr "Змінити постійну назву вузла у мережі" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22 msgid "System policy prevents modification of the persistent system hostname" msgstr "" "Правила системи забороняють внесення змін до постійної назви вузла у мережі" -#: ../src/main.c:158 +#: ../src/main.c:135 #, c-format -#| msgid "Failed to encrypt: %d." msgid "Failed to set signal mask: %d" msgstr "Не вдалося встановити маску сигналу: %d" -#: ../src/main.c:167 +#: ../src/main.c:144 #, c-format msgid "Failed to create signal handling thread: %d" msgstr "Не вдалося створити потік обробки сигналів: %d" -#: ../src/main.c:182 +#: ../src/main.c:159 #, c-format msgid "Opening %s failed: %s\n" msgstr "Помилка під час спроби відкрити %s: %s\n" -#: ../src/main.c:188 +#: ../src/main.c:165 #, c-format msgid "Writing to %s failed: %s\n" msgstr "Помилка під час спроби запису даних до %s: %s\n" -#: ../src/main.c:193 +#: ../src/main.c:170 #, c-format msgid "Closing %s failed: %s\n" msgstr "Не вдалося завершити роботу %s: %s\n" -#: ../src/main.c:236 +#: ../src/main.c:213 #, c-format msgid "NetworkManager is already running (pid %ld)\n" msgstr "NetworkManager вже запущено (pid %ld)\n" -#: ../src/main.c:376 +#: ../src/main.c:340 msgid "Print NetworkManager version and exit" msgstr "Вивести дані щодо версії NetworkManager і завершити роботу" -#: ../src/main.c:377 +#: ../src/main.c:341 msgid "Don't become a daemon" msgstr "Не переходити у стан фонової служби" -#: ../src/main.c:378 +#: ../src/main.c:342 msgid "Make all warnings fatal" msgstr "Вважати всі попередження помилками" -#: ../src/main.c:379 +#: ../src/main.c:343 msgid "Specify the location of a PID file" msgstr "Вказати розташування файла ідентифікатора процесу (PID)" -#: ../src/main.c:379 +#: ../src/main.c:343 msgid "filename" msgstr "назва файла" -#: ../src/main.c:380 +#: ../src/main.c:344 msgid "State file location" msgstr "Розташування файла стану" -#: ../src/main.c:380 +#: ../src/main.c:344 msgid "/path/to/state.file" msgstr "/шлях/до/файла.стану" -#: ../src/main.c:381 +#: ../src/main.c:345 msgid "Config file location" msgstr "Розташування файла налаштувань" -#: ../src/main.c:381 +#: ../src/main.c:345 msgid "/path/to/config.file" msgstr "/шлях/до/файла.налаштувань" -#: ../src/main.c:382 +#: ../src/main.c:346 msgid "List of plugins separated by ','" msgstr "Список додатків, відокремлених комами («,»)" -#: ../src/main.c:382 +#: ../src/main.c:346 msgid "plugin1,plugin2" msgstr "додаток1,додаток2" #. Translators: Do not translate the values in the square brackets -#: ../src/main.c:384 +#: ../src/main.c:348 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]" msgstr "Рівень докладності журналу, одне зі значень: ERR, WARN, INFO, DEBUG" #. Translators: Do not translate the values in the square brackets -#: ../src/main.c:387 -#| msgid "" -#| "Log domains separated by ',': any combination of\n" -#| " [NONE,HW,RFKILL,ETHER,WIFI,BT," -#| "MB,DHCP4,DHCP6,PPP,\n" -#| " WIFI_SCAN,IP4,IP6,AUTOIP4,DNS," -#| "VPN,SHARING,SUPPLICANT,\n" -#| " AGENTS,SETTINGS,SUSPEND,CORE," -#| "DEVICE,OLPC,WIMAX,\n" -#| " INFINIBAND,FIREWALL]" +#: ../src/main.c:351 msgid "" "Log domains separated by ',': any combination of\n" " [NONE,HW,RFKILL,ETHER,WIFI," @@ -2556,36 +2600,36 @@ msgid "" msgstr "" "Області ведення журналу, відокремлені комами, довільна комбінація таких " "значень:\n" -" NONE,HW,RFKILL,ETHER,WIFI, " -"BT,MB,DHCP4,DHCP6,PPP,\n" +" NONE,HW,RFKILL,ETHER,WIFI, BT,MB," +"DHCP4,DHCP6,PPP,\n" " WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN," "SHARING,SUPPLICANT,\n" " AGENTS,SETTINGS,SUSPEND,CORE," "DEVICE,OLPC,WIMAX,\n" " INFINIBAND,FIREWALL,ADSL]" -#: ../src/main.c:393 +#: ../src/main.c:357 msgid "An http(s) address for checking internet connectivity" msgstr "Адреса http(s) для спроб перевірки можливості встановлення з’єднання" -#: ../src/main.c:394 +#: ../src/main.c:358 msgid "The interval between connectivity checks (in seconds)" msgstr "Інтервал між перевірками можливості з’єднання (у секундах)" -#: ../src/main.c:395 +#: ../src/main.c:359 msgid "The expected start of the response" msgstr "Очікуваний початок відповіді" -#: ../src/main.c:395 +#: ../src/main.c:359 msgid "Bingo!" msgstr "Влучно!" -#: ../src/main.c:400 +#: ../src/main.c:364 #, c-format msgid "GModules are not supported on your platform!\n" msgstr "Підтримки GModules на цій платформі не передбачено!\n" -#: ../src/main.c:423 +#: ../src/main.c:383 msgid "" "NetworkManager monitors all network connections and automatically\n" "chooses the best connection to use. It also allows the user to\n" @@ -2598,47 +2642,47 @@ msgstr "" "з якими слід пов’язувати картки бездротового доступу на вашому\n" "комп’ютері." -#: ../src/main.c:429 +#: ../src/main.c:389 #, c-format msgid "Invalid option. Please use --help to see a list of valid options.\n" msgstr "" "Некоректний параметр. Щоб ознайомитися зі списком параметрів, скористайтеся " "параметром --help.\n" -#: ../src/main.c:439 +#: ../src/main.c:399 #, c-format msgid "You must be root to run NetworkManager!\n" msgstr "" "Запуск NetworkManager слід здійснювати з облікового запису адміністратора " "(root)!\n" -#: ../src/main.c:460 +#: ../src/main.c:432 #, c-format msgid "Failed to read configuration: (%d) %s\n" msgstr "Не вдалося прочитати налаштування: (%d) %s\n" -#: ../src/main.c:471 +#: ../src/main.c:443 #, c-format msgid "%s. Please use --help to see a list of valid options.\n" msgstr "" "%s. Щоб ознайомитися зі списком параметрів, скористайтеся параметром --" "help.\n" -#: ../src/main.c:478 +#: ../src/main.c:450 #, c-format msgid "State file %s parsing failed: (%d) %s\n" msgstr "Помилка під час обробки файла стану %s: (%d) %s\n" -#: ../src/main.c:495 +#: ../src/main.c:467 #, c-format msgid "Could not daemonize: %s [error %u]\n" msgstr "Не вдалося створити фонову службу: %s [помилка %u]\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:139 msgid "# Created by NetworkManager\n" msgstr "# Створено за допомогою NetworkManager\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:146 #, c-format msgid "" "# Merged from %s\n" @@ -2664,209 +2708,179 @@ msgstr "не вдалося знайти «dhcpcd»." msgid "unsupported DHCP client '%s'" msgstr "підтримки клієнта DHCP «%s» не передбачено" -#: ../src/dns-manager/nm-dns-manager.c:381 +#: ../src/dns-manager/nm-dns-manager.c:375 msgid "NOTE: the libc resolver may not support more than 3 nameservers." msgstr "" "ЗАУВАЖЕННЯ: можливо, інструмент визначення адрес за назвами libc вашої " "системи не підтримує використання понад 3 серверів назв." -#: ../src/dns-manager/nm-dns-manager.c:383 +#: ../src/dns-manager/nm-dns-manager.c:377 msgid "The nameservers listed below may not be recognized." msgstr "Вказані у наведеному нижче списку сервери назв може бути пропущено." -#: ../src/logging/nm-logging.c:131 +#: ../src/logging/nm-logging.c:141 #, c-format msgid "Unknown log level '%s'" msgstr "Невідомий рівень журналювання «%s»" -#: ../src/logging/nm-logging.c:156 +#: ../src/logging/nm-logging.c:187 #, c-format msgid "Unknown log domain '%s'" msgstr "Невідомий домен журналювання «%s»" -#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:325 +#: ../src/modem-manager/nm-modem-cdma.c:271 +#: ../src/modem-manager/nm-modem-broadband.c:553 ../src/nm-device-bt.c:338 #, c-format msgid "CDMA connection %d" msgstr "З’єднання CDMA %d" -#: ../src/modem-manager/nm-modem-gsm.c:547 ../src/nm-device-bt.c:321 +#: ../src/modem-manager/nm-modem-gsm.c:549 +#: ../src/modem-manager/nm-modem-broadband.c:531 ../src/nm-device-bt.c:334 #, c-format msgid "GSM connection %d" msgstr "З’єднання GSM %d" -#: ../src/nm-device-bond.c:191 +#: ../src/nm-device-bond.c:198 #, c-format -#| msgid "Wired connection %d" msgid "Bond connection %d" msgstr "Прив’язане з’єднання %d" -#: ../src/nm-device-adsl.c:193 +#: ../src/nm-device-adsl.c:194 #, c-format -#| msgid "GSM connection %d" msgid "ADSL connection %d" msgstr "З’єднання ADSL %d" -#: ../src/nm-device-bt.c:296 +#: ../src/nm-device-bridge.c:208 +#, c-format +#| msgid "Bond connection %d" +msgid "Bridge connection %d" +msgstr "З’єднання містка %d" + +#: ../src/nm-device-bt.c:309 #, c-format msgid "PAN connection %d" msgstr "З’єднання PAN %d" -#: ../src/nm-device-bt.c:329 +#: ../src/nm-device-bt.c:342 #, c-format msgid "DUN connection %d" msgstr "З’єднання DUN %d" -#: ../src/nm-device-ethernet.c:1327 +#: ../src/nm-device-ethernet.c:1319 #, c-format msgid "PPPoE connection %d" msgstr "З’єднання PPPoE %d" -#: ../src/nm-device-ethernet.c:1327 ../src/settings/nm-settings-utils.c:50 +#: ../src/nm-device-ethernet.c:1319 ../src/settings/nm-settings-utils.c:50 #, c-format msgid "Wired connection %d" msgstr "Дротове з’єднання %d" -#: ../src/nm-device-infiniband.c:303 +#: ../src/nm-device-infiniband.c:299 #, c-format msgid "InfiniBand connection %d" msgstr "З’єднання InfiniBand %d" -#: ../src/nm-device-olpc-mesh.c:303 +#: ../src/nm-device-olpc-mesh.c:293 #, c-format msgid "Mesh %d" msgstr "Mesh %d" -#: ../src/nm-device-vlan.c:362 +#: ../src/nm-device-vlan.c:331 #, c-format -#| msgid "PAN connection %d" msgid "VLAN connection %d" msgstr "З’єднання VLAN %d" -#: ../src/nm-manager.c:661 +#: ../src/nm-manager.c:746 #, c-format msgid "VPN connection %d" msgstr "З’єднання VPN %d" -#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272 -#: ../src/nm-netlink-monitor.c:695 +#: ../src/nm-netlink-monitor.c:152 ../src/nm-netlink-monitor.c:276 +#: ../src/nm-netlink-monitor.c:699 #, c-format msgid "error processing netlink message: %s" msgstr "помилка під час обробки повідомлення netlink: %s" -#: ../src/nm-netlink-monitor.c:251 +#: ../src/nm-netlink-monitor.c:255 msgid "error occurred while waiting for data on socket" msgstr "під час очікування на дані з сокета сталася помилка" -#: ../src/nm-netlink-monitor.c:296 +#: ../src/nm-netlink-monitor.c:300 #, c-format msgid "unable to connect to netlink for monitoring link status: %s" msgstr "" "не вдалося встановити з’єднання з netlink для спостереження за станом " "з’єднання: %s" -#: ../src/nm-netlink-monitor.c:307 +#: ../src/nm-netlink-monitor.c:311 #, c-format msgid "unable to enable netlink handle credential passing: %s" msgstr "" "не вдалося увімкнути інструмент netlink передавання реєстраційних даних: %s" -#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390 +#: ../src/nm-netlink-monitor.c:334 ../src/nm-netlink-monitor.c:394 #, c-format msgid "unable to allocate netlink handle for monitoring link status: %s" msgstr "" "не вдалося розмістити у пам’яті інструмент netlink для спостереження за " "станом з’єднання: %s" -#: ../src/nm-netlink-monitor.c:415 +#: ../src/nm-netlink-monitor.c:419 #, c-format msgid "unable to allocate netlink link cache for monitoring link status: %s" msgstr "" "не вдалося розмістити у пам’яті кеш з’єднань netlink для спостереження за " "станом з’єднань: %s" -#: ../src/nm-netlink-monitor.c:542 +#: ../src/nm-netlink-monitor.c:546 #, c-format msgid "unable to join netlink group: %s" msgstr "не вдалося долучитися до групи netlink: %s" -#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684 +#: ../src/nm-netlink-monitor.c:675 ../src/nm-netlink-monitor.c:688 #, c-format msgid "error updating link cache: %s" msgstr "помилка під час спроби оновлення кешу з’єднання: %s" -#: ../src/settings/plugins/ifcfg-rh/reader.c:94 +#: ../src/settings/plugins/ifcfg-rh/reader.c:110 msgid "System" msgstr "Система" -#: ../src/settings/plugins/ifcfg-rh/reader.c:3641 +#: ../src/settings/plugins/ifcfg-rh/reader.c:3702 msgid "Bond" msgstr "Прив’язка" -#: ../test/nm-online.c:112 +#: ../src/settings/plugins/ifcfg-rh/reader.c:3887 +msgid "Bridge" +msgstr "Місток" + +#: ../test/nm-online.c:111 #, c-format -#| msgid "connecting" msgid "\rConnecting" msgstr "\rВстановлюється з’єднання" -#: ../test/nm-online.c:143 +#: ../test/nm-online.c:142 msgid "Time to wait for a connection, in seconds (default is 30)" msgstr "Час очікування на з’єднання, у секундах (типовим є 30)" -#: ../test/nm-online.c:144 -#| msgid "Error: NetworkManager is not running." +#: ../test/nm-online.c:143 msgid "Exit immediately if NetworkManager is not running or connecting" msgstr "" "Негайно завершити роботу, якщо NetworkManager не запущено або виконується " "спроба з’єднання" -#: ../test/nm-online.c:145 +#: ../test/nm-online.c:144 msgid "Don't print anything" msgstr "Нічого не виводити" -#: ../test/nm-online.c:163 +#: ../test/nm-online.c:162 msgid "Waits for a successful connection in NetworkManager." msgstr "Очікувати на успішне з’єднання у NetworkManager." -#: ../test/nm-online.c:169 ../test/nm-online.c:178 -#| msgid "Invalid option. Please use --help to see a list of valid options.\n" +#: ../test/nm-online.c:168 ../test/nm-online.c:177 msgid "Invalid option. Please use --help to see a list of valid options." msgstr "" "Некоректний параметр. Щоб ознайомитися зі списком параметрів, скористайтеся " "параметром --help." -#~ msgid "state: %s\n" -#~ msgstr "стан: %s\n" - -#~ msgid "Connection activated\n" -#~ msgstr "З’єднання активовано\n" - -#~ msgid "state: %s (%d)\n" -#~ msgstr "стан: %s (%d)\n" - -#~ msgid "Active connection state: %s\n" -#~ msgstr "Стан активного з’єднання: %s\n" - -#~ msgid "Active connection path: %s\n" -#~ msgstr "Адреса активного з’єднання: %s\n" - -#~ msgid "Device state: %d (%s)\n" -#~ msgstr "Стан пристрою: %d (%s)\n" - -#~ msgid "not set" -#~ msgstr "не встановлено" - -#~| msgid "Failed to initialize the crypto engine: %d." -#~ msgid "Failed to initialize SIGTERM pipe: %d" -#~ msgstr "Не вдалося ініціалізувати канал SIGTERM: %d" - -#~ msgid "IP4-SETTINGS" -#~ msgstr "ПАРАМЕТРИ IP4" - -#~ msgid "IP6-SETTINGS" -#~ msgstr "ПАРАМЕТРИ IP6" - -#~ msgid "PREFIX" -#~ msgstr "ПРЕФІКС" - -#~ msgid "unknown)" -#~ msgstr "невідомо)" diff --git a/src/Makefile.am b/src/Makefile.am index cd124f6b9..9d306a7e3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -355,9 +355,6 @@ endif NetworkManager_LDFLAGS = -rdynamic -NetworkManagerdir = $(datadir)/NetworkManager -NetworkManager_DATA = gdb-cmd - dbusservicedir = $(DBUS_SYS_DIR) dbusservice_DATA = org.freedesktop.NetworkManager.conf diff --git a/src/Makefile.in b/src/Makefile.in index 0a7e87f99..c577cccd9 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -113,8 +113,7 @@ am_libtest_wifi_ap_utils_la_OBJECTS = \ libtest_wifi_ap_utils_la-nm-wifi-ap-utils.lo libtest_wifi_ap_utils_la_OBJECTS = \ $(am_libtest_wifi_ap_utils_la_OBJECTS) -am__installdirs = "$(DESTDIR)$(sbindir)" \ - "$(DESTDIR)$(NetworkManagerdir)" "$(DESTDIR)$(dbusservicedir)" +am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(dbusservicedir)" PROGRAMS = $(sbin_PROGRAMS) am__NetworkManager_SOURCES_DIST = nm-types.h nm-call-store.c \ nm-call-store.h nm-device.c nm-device.h nm-device-private.h \ @@ -294,7 +293,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -DATA = $(NetworkManager_DATA) $(dbusservice_DATA) +DATA = $(dbusservice_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -735,8 +734,6 @@ NetworkManager_LDADD = ./generated/libnm-generated.la \ $(GLIB_LIBS) $(GUDEV_LIBS) $(LIBNL_LIBS) $(POLKIT_LIBS) \ $(SYSTEMD_LOGIN_LIBS) $(LIBM) $(LIBDL) $(am__append_10) NetworkManager_LDFLAGS = -rdynamic -NetworkManagerdir = $(datadir)/NetworkManager -NetworkManager_DATA = gdb-cmd dbusservicedir = $(DBUS_SYS_DIR) dbusservice_DATA = org.freedesktop.NetworkManager.conf EXTRA_DIST = \ @@ -1617,27 +1614,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-NetworkManagerDATA: $(NetworkManager_DATA) - @$(NORMAL_INSTALL) - @list='$(NetworkManager_DATA)'; test -n "$(NetworkManagerdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(NetworkManagerdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(NetworkManagerdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(NetworkManagerdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(NetworkManagerdir)" || exit $$?; \ - done - -uninstall-NetworkManagerDATA: - @$(NORMAL_UNINSTALL) - @list='$(NetworkManager_DATA)'; test -n "$(NetworkManagerdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(NetworkManagerdir)'; $(am__uninstall_files_from_dir) install-dbusserviceDATA: $(dbusservice_DATA) @$(NORMAL_INSTALL) @list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \ @@ -1856,7 +1832,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(NetworkManagerdir)" "$(DESTDIR)$(dbusservicedir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(dbusservicedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1915,7 +1891,7 @@ info: info-recursive info-am: -install-data-am: install-NetworkManagerDATA install-dbusserviceDATA +install-data-am: install-dbusserviceDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive @@ -1962,8 +1938,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-NetworkManagerDATA uninstall-dbusserviceDATA \ - uninstall-sbinPROGRAMS +uninstall-am: uninstall-dbusserviceDATA uninstall-sbinPROGRAMS .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ ctags-recursive install install-am install-data-am \ @@ -1974,17 +1949,16 @@ uninstall-am: uninstall-NetworkManagerDATA uninstall-dbusserviceDATA \ clean-noinstLTLIBRARIES clean-sbinPROGRAMS ctags \ ctags-recursive distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-NetworkManagerDATA \ - install-am install-data install-data-am install-data-hook \ - install-dbusserviceDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-NetworkManagerDATA uninstall-am \ + html-am info info-am install install-am install-data \ + install-data-am install-data-hook install-dbusserviceDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-sbinPROGRAMS install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ uninstall-dbusserviceDATA uninstall-sbinPROGRAMS diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index 2cdd304de..7bcf935b5 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -323,6 +323,32 @@ nm_dhcp_client_start_ip4 (NMDHCPClient *self, return priv->pid ? TRUE : FALSE; } +/* uuid_parse does not work for machine-id, so we use our own converter */ +static gboolean +machine_id_parse (const char *in, uuid_t uu) +{ + const char *cp; + int i; + char buf[3]; + + g_return_val_if_fail (in != NULL, FALSE); + g_return_val_if_fail (strlen (in) == 32, FALSE); + + for (i = 0; i < 32; i++, cp++) { + if (!g_ascii_isxdigit (in[i])) + return FALSE; + } + + buf[2] = 0; + cp = in; + for (i = 0; i < 16; i++) { + buf[0] = *cp++; + buf[1] = *cp++; + uu[i] = ((unsigned char) strtoul (buf, NULL, 16)) & 0xFF; + } + return TRUE; +} + static GByteArray * generate_duid_from_machine_id (void) { @@ -334,7 +360,7 @@ generate_duid_from_machine_id (void) gsize sumlen = sizeof (buffer); const guint16 duid_type = g_htons (4); uuid_t uuid; - int ret; + gboolean success; /* Get the machine ID from /etc/machine-id; it's always in /etc no matter * where our configured SYSCONFDIR is. @@ -348,10 +374,10 @@ generate_duid_from_machine_id (void) } contents = g_strstrip (contents); - ret = uuid_parse (contents, uuid); + success = machine_id_parse (contents, uuid); g_free (contents); - if (ret != 0) { + if (!success) { nm_log_warn (LOGD_DHCP6, "Failed to parse " SYSCONFDIR "/machine-id to generate DHCPv6 DUID."); return NULL; } @@ -379,23 +405,6 @@ generate_duid_from_machine_id (void) return duid; } -static GByteArray * -get_duid (NMDHCPClient *self) -{ - static GByteArray *duid = NULL; - GByteArray *copy = NULL; - - if (G_UNLIKELY (duid == NULL)) - duid = generate_duid_from_machine_id (); - - if (G_LIKELY (duid)) { - copy = g_byte_array_sized_new (duid->len); - g_byte_array_append (copy, duid->data, duid->len); - } - - return copy; -} - static char * escape_duid (const GByteArray *duid) { @@ -413,6 +422,31 @@ escape_duid (const GByteArray *duid) return g_string_free (s, FALSE); } +static GByteArray * +get_duid (NMDHCPClient *self) +{ + static GByteArray *duid = NULL; + GByteArray *copy = NULL; + char *escaped; + + if (G_UNLIKELY (duid == NULL)) { + duid = generate_duid_from_machine_id (); + + if (nm_logging_level_enabled (LOGL_DEBUG)) { + escaped = escape_duid (duid); + nm_log_dbg (LOGD_DHCP6, "Generated DUID from machine-id: %s", escaped); + g_free (escaped); + } + } + + if (G_LIKELY (duid)) { + copy = g_byte_array_sized_new (duid->len); + g_byte_array_append (copy, duid->data, duid->len); + } + + return copy; +} + gboolean nm_dhcp_client_start_ip6 (NMDHCPClient *self, NMSettingIP6Config *s_ip6, diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index d9f51352c..c43ecf50c 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -455,8 +455,9 @@ dhclient_start (NMDHCPClient *client, GError *error = NULL; const char *iface, *uuid, *system_bus_address; char *binary_name, *cmd_str, *pid_file = NULL, *system_bus_address_env = NULL; - gboolean ipv6; + gboolean ipv6, success; guint log_domain; + char *escaped; g_return_val_if_fail (priv->pid_file == NULL, -1); @@ -497,6 +498,20 @@ dhclient_start (NMDHCPClient *client, return -1; } + /* Save the DUID to the leasefile dhclient will actually use */ + if (ipv6) { + escaped = nm_dhcp_dhclient_escape_duid (duid); + success = nm_dhcp_dhclient_save_duid (priv->lease_file, escaped, &error); + g_free (escaped); + if (!success) { + nm_log_warn (log_domain, "(%s): failed to save DUID to %s: (%d) %s.", + iface, priv->lease_file, + error ? error->code : -1, + error && error->message ? error->message : "(unknown)"); + return -1; + } + } + argv = g_ptr_array_new (); g_ptr_array_add (argv, (gpointer) priv->path); diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index b838e9f03..707cbbbbe 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Copyright (C) 2004 - 2005 Colin Walters - * Copyright (C) 2004 - 2012 Red Hat, Inc. + * Copyright (C) 2004 - 2013 Red Hat, Inc. * Copyright (C) 2005 - 2008 Novell, Inc. * and others */ @@ -77,6 +77,14 @@ typedef struct { gboolean dns_touched; } NMDnsManagerPrivate; +enum { + CONFIG_CHANGED, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + typedef struct { GPtrArray *nameservers; @@ -746,6 +754,10 @@ update_dns (NMDnsManager *self, if (success == FALSE) success = update_resolv_conf (domain, searches, nameservers, error); + /* signal that resolv.conf was changed */ + if (success) + g_signal_emit (self, signals[CONFIG_CHANGED], 0); + if (searches) g_strfreev (searches); if (nameservers) @@ -1145,9 +1157,20 @@ nm_dns_manager_class_init (NMDnsManagerClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + g_type_class_add_private (object_class, sizeof (NMDnsManagerPrivate)); + + /* virtual methods */ object_class->dispose = dispose; object_class->finalize = finalize; - g_type_class_add_private (object_class, sizeof (NMDnsManagerPrivate)); + /* signals */ + signals[CONFIG_CHANGED] = + g_signal_new ("config-changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMDnsManagerClass, config_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); } diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h index 234920120..0fd4c198b 100644 --- a/src/dns-manager/nm-dns-manager.h +++ b/src/dns-manager/nm-dns-manager.h @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Copyright (C) 2004 - 2005 Colin Walters - * Copyright (C) 2004 - 2010 Red Hat, Inc. + * Copyright (C) 2004 - 2013 Red Hat, Inc. * Copyright (C) 2005 - 2008 Novell, Inc. * and others */ @@ -60,6 +60,9 @@ typedef struct { typedef struct { GObjectClass parent; + + /* Signals */ + void (*config_changed) (NMDnsManager *mgr); } NMDnsManagerClass; GType nm_dns_manager_get_type (void); diff --git a/src/gdb-cmd b/src/gdb-cmd deleted file mode 100644 index aea32eb04..000000000 --- a/src/gdb-cmd +++ /dev/null @@ -1,3 +0,0 @@ -bt -thread apply all bt full -q diff --git a/src/generated/nm-enum-types.c b/src/generated/nm-enum-types.c index c1eac45e0..4fe5792cd 100644 --- a/src/generated/nm-enum-types.c +++ b/src/generated/nm-enum-types.c @@ -5,52 +5,52 @@ #include "nm-enum-types.h" -#include "nm-sleep-monitor.h" -#include "nm-device.h" #include "nm-rfkill.h" #include "NetworkManagerUtils.h" -#include "nm-device-vlan.h" #include "nm-device-factory.h" #include "nm-active-connection.h" #include "nm-wifi-ap.h" +#include "nm-device-ethernet.h" #include "nm-device-bt.h" #include "nm-call-store.h" +#include "nm-device-infiniband.h" #include "nm-device-wifi.h" #include "nm-dbus-manager.h" -#include "nm-device-olpc-mesh.h" #include "nm-device-bridge.h" -#include "nm-dhcp4-config.h" +#include "nm-device-private.h" #include "nm-dhcp6-config.h" +#include "nm-session-utils.h" #include "nm-netlink-compat.h" #include "nm-session-monitor.h" -#include "nm-connection-provider.h" +#include "nm-ip4-config.h" #include "nm-device-bond.h" #include "nm-wifi-ap-utils.h" -#include "nm-hostname-provider.h" #include "nm-device-adsl.h" #include "nm-policy-hosts.h" #include "nm-dispatcher.h" +#include "nm-connection-provider.h" #include "nm-manager.h" #include "nm-device-modem.h" -#include "nm-device-wired.h" #include "nm-activation-request.h" -#include "nm-session-utils.h" #include "nm-policy-hostname.h" -#include "nm-device-infiniband.h" #include "nm-properties-changed-signal.h" #include "nm-types.h" #include "nm-ip6-config.h" -#include "nm-device-private.h" #include "nm-policy.h" #include "nm-manager-auth.h" #include "nm-config.h" #include "nm-netlink-utils.h" +#include "nm-dhcp4-config.h" #include "nm-netlink-monitor.h" #include "nm-udev-manager.h" #include "nm-system.h" #include "nm-connectivity.h" -#include "nm-device-ethernet.h" -#include "nm-ip4-config.h" +#include "nm-device-vlan.h" +#include "nm-device-wired.h" +#include "nm-device-olpc-mesh.h" +#include "nm-hostname-provider.h" +#include "nm-sleep-monitor.h" +#include "nm-device.h" #include "nm-logging.h" #include "nm-dns-utils.h" #include "nm-dns-plugin.h" @@ -100,26 +100,6 @@ #include "nm-wimax-util.h" #include "nm-wimax-nsp.h" -GType -nm_device_error_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - - if (g_once_init_enter (&g_define_type_id__volatile)) - { - static const GEnumValue values[] = { - { NM_DEVICE_ERROR_CONNECTION_ACTIVATING, "NM_DEVICE_ERROR_CONNECTION_ACTIVATING", "ConnectionActivating" }, - { NM_DEVICE_ERROR_CONNECTION_INVALID, "NM_DEVICE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_DEVICE_ERROR_NOT_ACTIVE, "NM_DEVICE_ERROR_NOT_ACTIVE", "NotActive" }, - { 0, NULL, NULL } - }; - GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMDeviceError"), values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - - return g_define_type_id__volatile; -} GType nm_rf_kill_state_get_type (void) { @@ -163,20 +143,20 @@ nm_rf_kill_type_get_type (void) return g_define_type_id__volatile; } GType -nm_vlan_error_get_type (void) +nm_ethernet_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_VLAN_ERROR_CONNECTION_NOT_VLAN, "NM_VLAN_ERROR_CONNECTION_NOT_VLAN", "ConnectionNotVlan" }, - { NM_VLAN_ERROR_CONNECTION_INVALID, "NM_VLAN_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, "NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED, "NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED", "ConnectionNotWired" }, + { NM_ETHERNET_ERROR_CONNECTION_INVALID, "NM_ETHERNET_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, "NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMVlanError"), values); + g_enum_register_static (g_intern_static_string ("NMEthernetError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } @@ -203,6 +183,26 @@ nm_bt_error_get_type (void) return g_define_type_id__volatile; } GType +nm_infiniband_error_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + + if (g_once_init_enter (&g_define_type_id__volatile)) + { + static const GEnumValue values[] = { + { NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND, "NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND", "ConnectionNotInfiniband" }, + { NM_INFINIBAND_ERROR_CONNECTION_INVALID, "NM_INFINIBAND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, "NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { 0, NULL, NULL } + }; + GType g_define_type_id = + g_enum_register_static (g_intern_static_string ("NMInfinibandError"), values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + + return g_define_type_id__volatile; +} +GType nm_wifi_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; @@ -216,6 +216,7 @@ nm_wifi_error_get_type (void) { NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND, "NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND", "AccessPointNotFound" }, { NM_WIFI_ERROR_SCAN_NOT_ALLOWED, "NM_WIFI_ERROR_SCAN_NOT_ALLOWED", "ScanNotAllowed" }, { NM_WIFI_ERROR_AP_MODE_UNSUPPORTED, "NM_WIFI_ERROR_AP_MODE_UNSUPPORTED", "ApModeUnsupported" }, + { NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED, "NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED", "AdhocModeUnsupported" }, { 0, NULL, NULL } }; GType g_define_type_id = @@ -226,40 +227,71 @@ nm_wifi_error_get_type (void) return g_define_type_id__volatile; } GType -nm_olpc_mesh_error_get_type (void) +nm_bridge_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH, "NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH", "ConnectionNotMesh" }, - { NM_OLPC_MESH_ERROR_CONNECTION_INVALID, "NM_OLPC_MESH_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, "NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE, "NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE", "ConnectionNotBridge" }, + { NM_BRIDGE_ERROR_CONNECTION_INVALID, "NM_BRIDGE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE, "NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMOlpcMeshError"), values); + g_enum_register_static (g_intern_static_string ("NMBridgeError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } return g_define_type_id__volatile; } GType -nm_bridge_error_get_type (void) +nm_session_monitor_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE, "NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE", "ConnectionNotBridge" }, - { NM_BRIDGE_ERROR_CONNECTION_INVALID, "NM_BRIDGE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE, "NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { NM_SESSION_MONITOR_ERROR_IO_ERROR, "NM_SESSION_MONITOR_ERROR_IO_ERROR", "IOError" }, + { NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, "NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE", "MalformedDatabase" }, + { NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, "NM_SESSION_MONITOR_ERROR_UNKNOWN_USER", "UnknownUser" }, + { NM_SESSION_MONITOR_ERROR_NO_DATABASE, "NM_SESSION_MONITOR_ERROR_NO_DATABASE", "NoDatabase" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMBridgeError"), values); + g_enum_register_static (g_intern_static_string ("NMSessionMonitorError"), values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + + return g_define_type_id__volatile; +} +GType +nm_ip4_config_compare_flags_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + + if (g_once_init_enter (&g_define_type_id__volatile)) + { + static const GEnumValue values[] = { + { NM_IP4_COMPARE_FLAG_NONE, "NM_IP4_COMPARE_FLAG_NONE", "none" }, + { NM_IP4_COMPARE_FLAG_ADDRESSES, "NM_IP4_COMPARE_FLAG_ADDRESSES", "addresses" }, + { NM_IP4_COMPARE_FLAG_PTP_ADDRESS, "NM_IP4_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" }, + { NM_IP4_COMPARE_FLAG_NAMESERVERS, "NM_IP4_COMPARE_FLAG_NAMESERVERS", "nameservers" }, + { NM_IP4_COMPARE_FLAG_ROUTES, "NM_IP4_COMPARE_FLAG_ROUTES", "routes" }, + { NM_IP4_COMPARE_FLAG_DOMAINS, "NM_IP4_COMPARE_FLAG_DOMAINS", "domains" }, + { NM_IP4_COMPARE_FLAG_SEARCHES, "NM_IP4_COMPARE_FLAG_SEARCHES", "searches" }, + { NM_IP4_COMPARE_FLAG_MTU, "NM_IP4_COMPARE_FLAG_MTU", "mtu" }, + { NM_IP4_COMPARE_FLAG_MSS, "NM_IP4_COMPARE_FLAG_MSS", "mss" }, + { NM_IP4_COMPARE_FLAG_WINS_SERVERS, "NM_IP4_COMPARE_FLAG_WINS_SERVERS", "wins-servers" }, + { NM_IP4_COMPARE_FLAG_NIS_SERVERS, "NM_IP4_COMPARE_FLAG_NIS_SERVERS", "nis-servers" }, + { NM_IP4_COMPARE_FLAG_NIS_DOMAIN, "NM_IP4_COMPARE_FLAG_NIS_DOMAIN", "nis-domain" }, + { NM_IP4_COMPARE_FLAG_ALL, "NM_IP4_COMPARE_FLAG_ALL", "all" }, + { 0, NULL, NULL } + }; + GType g_define_type_id = + g_enum_register_static (g_intern_static_string ("NMIP4ConfigCompareFlags"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } @@ -360,47 +392,6 @@ nm_manager_error_get_type (void) return g_define_type_id__volatile; } GType -nm_session_monitor_error_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - - if (g_once_init_enter (&g_define_type_id__volatile)) - { - static const GEnumValue values[] = { - { NM_SESSION_MONITOR_ERROR_IO_ERROR, "NM_SESSION_MONITOR_ERROR_IO_ERROR", "IOError" }, - { NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, "NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE", "MalformedDatabase" }, - { NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, "NM_SESSION_MONITOR_ERROR_UNKNOWN_USER", "UnknownUser" }, - { NM_SESSION_MONITOR_ERROR_NO_DATABASE, "NM_SESSION_MONITOR_ERROR_NO_DATABASE", "NoDatabase" }, - { 0, NULL, NULL } - }; - GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMSessionMonitorError"), values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - - return g_define_type_id__volatile; -} -GType -nm_infiniband_error_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - - if (g_once_init_enter (&g_define_type_id__volatile)) - { - static const GEnumValue values[] = { - { NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND, "NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND", "ConnectionNotInfiniband" }, - { NM_INFINIBAND_ERROR_CONNECTION_INVALID, "NM_INFINIBAND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, "NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, - { 0, NULL, NULL } - }; - GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMInfinibandError"), values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - - return g_define_type_id__volatile; -} -GType nm_ip6_config_compare_flags_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; @@ -514,50 +505,60 @@ nm_netlink_monitor_error_get_type (void) return g_define_type_id__volatile; } GType -nm_ethernet_error_get_type (void) +nm_vlan_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED, "NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED", "ConnectionNotWired" }, - { NM_ETHERNET_ERROR_CONNECTION_INVALID, "NM_ETHERNET_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, "NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { NM_VLAN_ERROR_CONNECTION_NOT_VLAN, "NM_VLAN_ERROR_CONNECTION_NOT_VLAN", "ConnectionNotVlan" }, + { NM_VLAN_ERROR_CONNECTION_INVALID, "NM_VLAN_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, "NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMEthernetError"), values); + g_enum_register_static (g_intern_static_string ("NMVlanError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } return g_define_type_id__volatile; } GType -nm_ip4_config_compare_flags_get_type (void) +nm_olpc_mesh_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_IP4_COMPARE_FLAG_NONE, "NM_IP4_COMPARE_FLAG_NONE", "none" }, - { NM_IP4_COMPARE_FLAG_ADDRESSES, "NM_IP4_COMPARE_FLAG_ADDRESSES", "addresses" }, - { NM_IP4_COMPARE_FLAG_PTP_ADDRESS, "NM_IP4_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" }, - { NM_IP4_COMPARE_FLAG_NAMESERVERS, "NM_IP4_COMPARE_FLAG_NAMESERVERS", "nameservers" }, - { NM_IP4_COMPARE_FLAG_ROUTES, "NM_IP4_COMPARE_FLAG_ROUTES", "routes" }, - { NM_IP4_COMPARE_FLAG_DOMAINS, "NM_IP4_COMPARE_FLAG_DOMAINS", "domains" }, - { NM_IP4_COMPARE_FLAG_SEARCHES, "NM_IP4_COMPARE_FLAG_SEARCHES", "searches" }, - { NM_IP4_COMPARE_FLAG_MTU, "NM_IP4_COMPARE_FLAG_MTU", "mtu" }, - { NM_IP4_COMPARE_FLAG_MSS, "NM_IP4_COMPARE_FLAG_MSS", "mss" }, - { NM_IP4_COMPARE_FLAG_WINS_SERVERS, "NM_IP4_COMPARE_FLAG_WINS_SERVERS", "wins-servers" }, - { NM_IP4_COMPARE_FLAG_NIS_SERVERS, "NM_IP4_COMPARE_FLAG_NIS_SERVERS", "nis-servers" }, - { NM_IP4_COMPARE_FLAG_NIS_DOMAIN, "NM_IP4_COMPARE_FLAG_NIS_DOMAIN", "nis-domain" }, - { NM_IP4_COMPARE_FLAG_ALL, "NM_IP4_COMPARE_FLAG_ALL", "all" }, + { NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH, "NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH", "ConnectionNotMesh" }, + { NM_OLPC_MESH_ERROR_CONNECTION_INVALID, "NM_OLPC_MESH_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, "NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMIP4ConfigCompareFlags"), values); + g_enum_register_static (g_intern_static_string ("NMOlpcMeshError"), values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + + return g_define_type_id__volatile; +} +GType +nm_device_error_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + + if (g_once_init_enter (&g_define_type_id__volatile)) + { + static const GEnumValue values[] = { + { NM_DEVICE_ERROR_CONNECTION_ACTIVATING, "NM_DEVICE_ERROR_CONNECTION_ACTIVATING", "ConnectionActivating" }, + { NM_DEVICE_ERROR_CONNECTION_INVALID, "NM_DEVICE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_DEVICE_ERROR_NOT_ACTIVE, "NM_DEVICE_ERROR_NOT_ACTIVE", "NotActive" }, + { 0, NULL, NULL } + }; + GType g_define_type_id = + g_enum_register_static (g_intern_static_string ("NMDeviceError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } diff --git a/src/generated/nm-enum-types.h b/src/generated/nm-enum-types.h index 36de65cc0..6dd250bbc 100644 --- a/src/generated/nm-enum-types.h +++ b/src/generated/nm-enum-types.h @@ -9,22 +9,24 @@ #include G_BEGIN_DECLS -GType nm_device_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_DEVICE_ERROR (nm_device_error_get_type ()) GType nm_rf_kill_state_get_type (void) G_GNUC_CONST; #define NM_TYPE_RF_KILL_STATE (nm_rf_kill_state_get_type ()) GType nm_rf_kill_type_get_type (void) G_GNUC_CONST; #define NM_TYPE_RF_KILL_TYPE (nm_rf_kill_type_get_type ()) -GType nm_vlan_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_VLAN_ERROR (nm_vlan_error_get_type ()) +GType nm_ethernet_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_ETHERNET_ERROR (nm_ethernet_error_get_type ()) GType nm_bt_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_BT_ERROR (nm_bt_error_get_type ()) +GType nm_infiniband_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_INFINIBAND_ERROR (nm_infiniband_error_get_type ()) GType nm_wifi_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_WIFI_ERROR (nm_wifi_error_get_type ()) -GType nm_olpc_mesh_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_OLPC_MESH_ERROR (nm_olpc_mesh_error_get_type ()) GType nm_bridge_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_BRIDGE_ERROR (nm_bridge_error_get_type ()) +GType nm_session_monitor_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_SESSION_MONITOR_ERROR (nm_session_monitor_error_get_type ()) +GType nm_ip4_config_compare_flags_get_type (void) G_GNUC_CONST; +#define NM_TYPE_IP4_CONFIG_COMPARE_FLAGS (nm_ip4_config_compare_flags_get_type ()) GType nm_bond_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_BOND_ERROR (nm_bond_error_get_type ()) GType nm_adsl_error_get_type (void) G_GNUC_CONST; @@ -33,10 +35,6 @@ GType nm_dispatcher_action_get_type (void) G_GNUC_CONST; #define NM_TYPE_DISPATCHER_ACTION (nm_dispatcher_action_get_type ()) GType nm_manager_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_MANAGER_ERROR (nm_manager_error_get_type ()) -GType nm_session_monitor_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_SESSION_MONITOR_ERROR (nm_session_monitor_error_get_type ()) -GType nm_infiniband_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_INFINIBAND_ERROR (nm_infiniband_error_get_type ()) GType nm_ip6_config_compare_flags_get_type (void) G_GNUC_CONST; #define NM_TYPE_IP6_CONFIG_COMPARE_FLAGS (nm_ip6_config_compare_flags_get_type ()) GType nm_auth_call_result_get_type (void) G_GNUC_CONST; @@ -47,10 +45,12 @@ GType nm_nm_nl_prop_get_type (void) G_GNUC_CONST; #define NM_TYPE_NM_NL_PROP (nm_nm_nl_prop_get_type ()) GType nm_netlink_monitor_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_NETLINK_MONITOR_ERROR (nm_netlink_monitor_error_get_type ()) -GType nm_ethernet_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_ETHERNET_ERROR (nm_ethernet_error_get_type ()) -GType nm_ip4_config_compare_flags_get_type (void) G_GNUC_CONST; -#define NM_TYPE_IP4_CONFIG_COMPARE_FLAGS (nm_ip4_config_compare_flags_get_type ()) +GType nm_vlan_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_VLAN_ERROR (nm_vlan_error_get_type ()) +GType nm_olpc_mesh_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_OLPC_MESH_ERROR (nm_olpc_mesh_error_get_type ()) +GType nm_device_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_DEVICE_ERROR (nm_device_error_get_type ()) GType nm_logging_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_LOGGING_ERROR (nm_logging_error_get_type ()) GType nm_dns_manager_error_get_type (void) G_GNUC_CONST; diff --git a/src/main.c b/src/main.c index 85bfc2725..feb8fa3f3 100644 --- a/src/main.c +++ b/src/main.c @@ -98,10 +98,6 @@ signal_handling_thread (void *arg) /* Reread config stuff like system config files, VPN service files, etc */ nm_log_info (LOGD_CORE, "caught signal %d, not supported yet.", signo); break; - case SIGUSR1: - /* Play with log levels or something */ - nm_log_info (LOGD_CORE, "caught signal %d, not supported yet.", signo); - break; default: nm_log_err (LOGD_CORE, "caught unexpected signal %d", signo); break; @@ -127,7 +123,6 @@ setup_signals (void) sigaddset (&signal_set, SIGHUP); sigaddset (&signal_set, SIGINT); sigaddset (&signal_set, SIGTERM); - sigaddset (&signal_set, SIGUSR1); /* Block all signals of interest. */ status = pthread_sigmask (SIG_BLOCK, &signal_set, &old_sig_mask); diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c index 2d24a3ea7..34aeccf43 100644 --- a/src/modem-manager/nm-modem.c +++ b/src/modem-manager/nm-modem.c @@ -55,6 +55,7 @@ typedef struct { char *path; char *control_port; char *data_port; + char *ppp_iface; guint32 ip_method; NMPPPManager *ppp_manager; @@ -146,8 +147,8 @@ ppp_ip4_config (NMPPPManager *ppp_manager, gboolean dns_workaround = FALSE; /* Notify about the new data port to use */ - g_free (priv->data_port); - priv->data_port = g_strdup (iface); + g_free (priv->ppp_iface); + priv->ppp_iface = g_strdup (iface); g_object_notify (G_OBJECT (self), NM_MODEM_DATA_PORT); /* Work around a PPP bug (#1732) which causes many mobile broadband @@ -561,6 +562,9 @@ deactivate (NMModem *self, NMDevice *device) nm_log_err (LOGD_MB, "unknown IP method %d", priv->ip_method); break; } + + g_free (priv->ppp_iface); + priv->ppp_iface = NULL; } /*****************************************************************************/ @@ -655,7 +659,12 @@ nm_modem_get_data_port (NMModem *self) g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_MODEM (self), NULL); - return NM_MODEM_GET_PRIVATE (self)->data_port; + /* The ppp_iface takes precedence over the data interface when PPP is used, + * since data_iface is the TTY over which PPP is run, and that TTY can't + * do IP. The caller really wants the thing that's doing IP. + */ + return NM_MODEM_GET_PRIVATE (self)->ppp_iface ? + NM_MODEM_GET_PRIVATE (self)->ppp_iface : NM_MODEM_GET_PRIVATE (self)->data_port; } /*****************************************************************************/ @@ -712,7 +721,7 @@ get_property (GObject *object, guint prop_id, g_value_set_string (value, priv->control_port); break; case PROP_DATA_PORT: - g_value_set_string (value, priv->data_port); + g_value_set_string (value, nm_modem_get_data_port (NM_MODEM (object))); break; case PROP_UID: g_value_set_string (value, priv->uid); diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 88504ce0d..76949cf27 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -297,6 +297,7 @@ nm_act_request_add_share_rule (NMActRequest *req, static void device_state_changed (NMDevice *device, GParamSpec *pspec, NMActRequest *self) { + NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (self); NMActiveConnectionState ac_state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN; /* Set NMActiveConnection state based on the device's state */ @@ -318,6 +319,13 @@ device_state_changed (NMDevice *device, GParamSpec *pspec, NMActRequest *self) case NM_DEVICE_STATE_FAILED: case NM_DEVICE_STATE_DISCONNECTED: ac_state = NM_ACTIVE_CONNECTION_STATE_DEACTIVATED; + + /* No longer need to pay attention to device state */ + if (priv->device && priv->device_state_id) { + g_signal_handler_disconnect (priv->device, priv->device_state_id); + priv->device_state_id = 0; + } + g_clear_object (&priv->device); break; default: break; diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 15b4b4855..6e3a5da63 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -101,6 +101,10 @@ nm_active_connection_set_state (NMActiveConnection *self, if (priv->state == new_state) return; + /* DEACTIVATED is a terminal state */ + if (priv->state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATED) + g_return_if_fail (new_state != NM_ACTIVE_CONNECTION_STATE_DEACTIVATED); + old_state = priv->state; priv->state = new_state; g_object_notify (G_OBJECT (self), NM_ACTIVE_CONNECTION_STATE); @@ -110,6 +114,12 @@ nm_active_connection_set_state (NMActiveConnection *self, nm_settings_connection_update_timestamp (NM_SETTINGS_CONNECTION (priv->connection), (guint64) time (NULL), TRUE); } + + if (priv->state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATED) { + /* Device is no longer relevant when deactivated */ + g_clear_object (&priv->device); + g_object_notify (G_OBJECT (self), NM_ACTIVE_CONNECTION_DEVICES); + } } const char * diff --git a/src/nm-device-bt.c b/src/nm-device-bt.c index 366e2683f..5766ab8e5 100644 --- a/src/nm-device-bt.c +++ b/src/nm-device-bt.c @@ -1150,13 +1150,12 @@ mm_name_owner_changed (NMDBusManager *dbus_mgr, gboolean new_owner_good; /* Can't handle the signal if its not from the modem service */ - if (strcmp (MM_OLD_DBUS_SERVICE, name) != 0) - return; - + if ( strcmp (MM_OLD_DBUS_SERVICE, name) != 0 #if WITH_MODEM_MANAGER_1 - if (strcmp (MM_NEW_DBUS_SERVICE, name) != 0) - return; + && strcmp (MM_NEW_DBUS_SERVICE, name) != 0 #endif + ) + return; old_owner_good = (old_owner && strlen (old_owner)); new_owner_good = (new_owner && strlen (new_owner)); diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index 67a10d43f..abbf7c441 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -1016,6 +1016,7 @@ check_connection_compatible (NMDevice *device, NMSettingWireless *s_wireless; const GByteArray *mac; const GSList *mac_blacklist, *mac_blacklist_iter; + const char *mode; s_con = nm_connection_get_setting_connection (connection); g_assert (s_con); @@ -1071,8 +1072,17 @@ check_connection_compatible (NMDevice *device, return FALSE; } - /* Early exit if supplicant or device don't support AP mode */ - if (g_strcmp0 (nm_setting_wireless_get_mode (s_wireless), NM_SETTING_WIRELESS_MODE_AP) == 0) { + /* Early exit if supplicant or device doesn't support requested mode */ + mode = nm_setting_wireless_get_mode (s_wireless); + if (g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_ADHOC) == 0) { + if (!(priv->capabilities & NM_WIFI_DEVICE_CAP_ADHOC)) { + g_set_error_literal (error, + NM_WIFI_ERROR, + NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED, + "Ad-Hoc mode is not supported by this device."); + return FALSE; + } + } else if (g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_AP) == 0) { if (!(priv->capabilities & NM_WIFI_DEVICE_CAP_AP)) { g_set_error_literal (error, NM_WIFI_ERROR, @@ -2448,7 +2458,15 @@ supplicant_iface_state_cb (NMSupplicantInterface *iface, break; case NM_SUPPLICANT_INTERFACE_STATE_DOWN: cleanup_association_attempt (self, FALSE); + + /* If the device is already in UNAVAILABLE state then the state change + * is a NOP and the interface won't be re-acquired in the device state + * change handler. So ensure we have a new one here so that we're + * ready if the supplicant comes back. + */ supplicant_interface_release (self); + supplicant_interface_acquire (self); + nm_device_state_changed (device, NM_DEVICE_STATE_UNAVAILABLE, NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED); diff --git a/src/nm-device-wifi.h b/src/nm-device-wifi.h index 425b85251..368d0b800 100644 --- a/src/nm-device-wifi.h +++ b/src/nm-device-wifi.h @@ -48,6 +48,7 @@ typedef enum { NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND, /*< nick=AccessPointNotFound >*/ NM_WIFI_ERROR_SCAN_NOT_ALLOWED, /*< nick=ScanNotAllowed >*/ NM_WIFI_ERROR_AP_MODE_UNSUPPORTED, /*< nick=ApModeUnsupported >*/ + NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED, /*< nick=AdhocModeUnsupported >*/ } NMWifiError; #define NM_DEVICE_WIFI_HW_ADDRESS "hw-address" diff --git a/src/nm-device.c b/src/nm-device.c index b08106800..9fe914f0f 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -339,7 +339,7 @@ update_accept_ra_save (NMDevice *self) if (!nm_utils_get_proc_sys_net_value_with_bounds (priv->ip6_accept_ra_path, ip_iface, &priv->ip6_accept_ra_save, - 0, 1)) { + 0, 2)) { g_free (priv->ip6_accept_ra_path); priv->ip6_accept_ra_path = NULL; } diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c index 111dffaa1..ba8053e93 100644 --- a/src/nm-netlink-monitor.c +++ b/src/nm-netlink-monitor.c @@ -38,10 +38,7 @@ #include #include #include -#include -#if LIBNL_VER_NUM == LIBNL_VER (3, 2) && LIBNL_VER_MIC < 20 -#include -#endif +#include #include #include #include diff --git a/src/nm-policy.c b/src/nm-policy.c index 752cf44eb..38a036134 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2004 - 2012 Red Hat, Inc. + * Copyright (C) 2004 - 2013 Red Hat, Inc. * Copyright (C) 2007 - 2008 Novell, Inc. */ @@ -62,6 +62,10 @@ struct NMPolicy { NMDevice *default_device6; HostnameThread *lookup; + guint32 lookup_ipv4_addr; /* IPv4 for reverse lookup */ + struct in6_addr *lookup_ipv6_addr; /* IPv6 for reverse lookup */ + NMDnsManager *dns_manager; + gulong config_changed_id; gint reset_retries_id; /* idle handler for resetting the retries count */ @@ -229,14 +233,21 @@ _set_hostname (NMPolicy *policy, const char *new_hostname, const char *msg) { - NMDnsManager *dns_mgr; - /* The incoming hostname *can* be NULL, which will get translated to * 'localhost.localdomain' or such in the hostname policy code, but we * keep cur_hostname = NULL in the case because we need to know that * there was no valid hostname to start with. */ + /* Clear lookup adresses if we have a hostname, so that we didn't + * restart reverse lookup thread later. + */ + if (new_hostname) { + policy->lookup_ipv4_addr = 0; + g_free (policy->lookup_ipv6_addr); + policy->lookup_ipv6_addr = NULL; + } + /* Don't change the hostname or update DNS this is the first time we're * trying to change the hostname, and it's not actually changing. */ @@ -255,9 +266,7 @@ _set_hostname (NMPolicy *policy, policy->cur_hostname = g_strdup (new_hostname); policy->hostname_changed = TRUE; - dns_mgr = nm_dns_manager_get (NULL); - nm_dns_manager_set_hostname (dns_mgr, policy->cur_hostname); - g_object_unref (dns_mgr); + nm_dns_manager_set_hostname (policy->dns_manager, policy->cur_hostname); if (nm_policy_set_system_hostname (policy->cur_hostname, msg)) nm_dispatcher_call (DISPATCHER_ACTION_HOSTNAME, NULL, NULL, NULL, NULL); @@ -398,7 +407,8 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) g_assert (addr4); /* checked for > 1 address above */ /* Start the hostname lookup thread */ - policy->lookup = hostname4_thread_new (nm_ip4_address_get_address (addr4), lookup_callback, policy); + policy->lookup_ipv4_addr = nm_ip4_address_get_address (addr4); + policy->lookup = hostname4_thread_new (policy->lookup_ipv4_addr, lookup_callback, policy); } else if (best6) { NMIP6Config *ip6_config; NMIP6Address *addr6; @@ -416,7 +426,9 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) g_assert (addr6); /* checked for > 1 address above */ /* Start the hostname lookup thread */ - policy->lookup = hostname6_thread_new (nm_ip6_address_get_address (addr6), lookup_callback, policy); + policy->lookup_ipv6_addr = g_malloc0 (sizeof (struct in6_addr)); + memcpy (policy->lookup_ipv6_addr, nm_ip6_address_get_address (addr6), sizeof (struct in6_addr)); + policy->lookup = hostname6_thread_new (policy->lookup_ipv6_addr, lookup_callback, policy); } if (!policy->lookup) { @@ -1264,7 +1276,6 @@ device_state_changed (NMDevice *device, NMIP4Config *ip4_config; NMIP6Config *ip6_config; NMSettingConnection *s_con; - NMDnsManager *dns_mgr; if (connection) g_object_set_data (G_OBJECT (connection), FAILURE_REASON_TAG, GUINT_TO_POINTER (0)); @@ -1322,20 +1333,18 @@ device_state_changed (NMDevice *device, /* Add device's new IPv4 and IPv6 configs to DNS */ - dns_mgr = nm_dns_manager_get (NULL); - nm_dns_manager_begin_updates (dns_mgr, __func__); + nm_dns_manager_begin_updates (policy->dns_manager, __func__); ip4_config = nm_device_get_ip4_config (device); if (ip4_config) - nm_dns_manager_add_ip4_config (dns_mgr, ip_iface, ip4_config, NM_DNS_IP_CONFIG_TYPE_DEFAULT); + nm_dns_manager_add_ip4_config (policy->dns_manager, ip_iface, ip4_config, NM_DNS_IP_CONFIG_TYPE_DEFAULT); ip6_config = nm_device_get_ip6_config (device); if (ip6_config) - nm_dns_manager_add_ip6_config (dns_mgr, ip_iface, ip6_config, NM_DNS_IP_CONFIG_TYPE_DEFAULT); + nm_dns_manager_add_ip6_config (policy->dns_manager, ip_iface, ip6_config, NM_DNS_IP_CONFIG_TYPE_DEFAULT); update_routing_and_dns (policy, FALSE); - nm_dns_manager_end_updates (dns_mgr, __func__); - g_object_unref (dns_mgr); + nm_dns_manager_end_updates (policy->dns_manager, __func__); break; case NM_DEVICE_STATE_UNMANAGED: case NM_DEVICE_STATE_UNAVAILABLE: @@ -1387,16 +1396,14 @@ device_ip4_config_changed (NMDevice *device, gpointer user_data) { NMPolicy *policy = user_data; - NMDnsManager *dns_mgr; const char *ip_iface = nm_device_get_ip_iface (device); NMIP4ConfigCompareFlags diff = NM_IP4_COMPARE_FLAG_ALL; - dns_mgr = nm_dns_manager_get (NULL); - nm_dns_manager_begin_updates (dns_mgr, __func__); + nm_dns_manager_begin_updates (policy->dns_manager, __func__); /* Old configs get removed immediately */ if (old_config) - nm_dns_manager_remove_ip4_config (dns_mgr, old_config); + nm_dns_manager_remove_ip4_config (policy->dns_manager, old_config); /* Ignore IP config changes while the device is activating, because we'll * catch all the changes when the device moves to ACTIVATED state. @@ -1404,8 +1411,8 @@ device_ip4_config_changed (NMDevice *device, */ if (!nm_device_is_activating (device)) { if (new_config) - nm_dns_manager_add_ip4_config (dns_mgr, ip_iface, new_config, NM_DNS_IP_CONFIG_TYPE_DEFAULT); - update_ip4_dns (policy, dns_mgr); + nm_dns_manager_add_ip4_config (policy->dns_manager, ip_iface, new_config, NM_DNS_IP_CONFIG_TYPE_DEFAULT); + update_ip4_dns (policy, policy->dns_manager); /* Only change routing if something actually changed */ diff = nm_ip4_config_diff (new_config, old_config); @@ -1413,8 +1420,7 @@ device_ip4_config_changed (NMDevice *device, update_ip4_routing (policy, TRUE); } - nm_dns_manager_end_updates (dns_mgr, __func__); - g_object_unref (dns_mgr); + nm_dns_manager_end_updates (policy->dns_manager, __func__); } static void @@ -1424,16 +1430,14 @@ device_ip6_config_changed (NMDevice *device, gpointer user_data) { NMPolicy *policy = user_data; - NMDnsManager *dns_mgr; const char *ip_iface = nm_device_get_ip_iface (device); NMIP4ConfigCompareFlags diff = NM_IP4_COMPARE_FLAG_ALL; - dns_mgr = nm_dns_manager_get (NULL); - nm_dns_manager_begin_updates (dns_mgr, __func__); + nm_dns_manager_begin_updates (policy->dns_manager, __func__); /* Old configs get removed immediately */ if (old_config) - nm_dns_manager_remove_ip6_config (dns_mgr, old_config); + nm_dns_manager_remove_ip6_config (policy->dns_manager, old_config); /* Ignore IP config changes while the device is activating, because we'll * catch all the changes when the device moves to ACTIVATED state. @@ -1441,8 +1445,8 @@ device_ip6_config_changed (NMDevice *device, */ if (!nm_device_is_activating (device)) { if (new_config) - nm_dns_manager_add_ip6_config (dns_mgr, ip_iface, new_config, NM_DNS_IP_CONFIG_TYPE_DEFAULT); - update_ip6_dns (policy, dns_mgr); + nm_dns_manager_add_ip6_config (policy->dns_manager, ip_iface, new_config, NM_DNS_IP_CONFIG_TYPE_DEFAULT); + update_ip6_dns (policy, policy->dns_manager); /* Only change routing if something actually changed */ diff = nm_ip6_config_diff (new_config, old_config); @@ -1450,8 +1454,7 @@ device_ip6_config_changed (NMDevice *device, update_ip6_routing (policy, TRUE); } - nm_dns_manager_end_updates (dns_mgr, __func__); - g_object_unref (dns_mgr); + nm_dns_manager_end_updates (policy->dns_manager, __func__); } static void @@ -1791,6 +1794,43 @@ firewall_started (NMFirewallManager *manager, } } +static void +dns_config_changed (NMDnsManager *dns_manager, gpointer user_data) +{ + NMPolicy *policy = (NMPolicy *) user_data; + + /* Restart a thread for reverse-DNS lookup after we are signalled that + * DNS changed. Because the result from a previous run may not be right + * (race in updating DNS and doing the reverse lookup). + */ + + /* Stop a lookup thread if any. */ + if (policy->lookup) { + hostname_thread_kill (policy->lookup); + policy->lookup = NULL; + } + + /* Re-start the hostname lookup thread if we don't have hostname yet. */ + if (policy->lookup_ipv4_addr) { + char buf[INET_ADDRSTRLEN]; + struct in_addr addr = { .s_addr = policy->lookup_ipv4_addr }; + + if (!inet_ntop (AF_INET, &addr, buf, sizeof (buf))) + strcpy (buf, "(unknown)"); + nm_log_dbg (LOGD_DNS, "restarting IPv4 reverse-lookup thread for address %s'", buf); + + policy->lookup = hostname4_thread_new (policy->lookup_ipv4_addr, lookup_callback, policy); + } else if (policy->lookup_ipv6_addr) { + char buf[INET6_ADDRSTRLEN]; + + if (!inet_ntop (AF_INET6, policy->lookup_ipv6_addr, buf, sizeof (buf))) + strcpy (buf, "(unknown)"); + nm_log_dbg (LOGD_DNS, "restarting IPv6 reverse-lookup thread for address %s'", buf); + + policy->lookup = hostname6_thread_new (policy->lookup_ipv6_addr, lookup_callback, policy); + } +} + static void connection_updated (NMSettings *settings, NMConnection *connection, @@ -1917,6 +1957,10 @@ nm_policy_new (NMManager *manager, NMSettings *settings) G_CALLBACK (firewall_started), policy); policy->fw_started_id = id; + policy->dns_manager = nm_dns_manager_get (NULL); + policy->config_changed_id = g_signal_connect (policy->dns_manager, "config-changed", + G_CALLBACK (dns_config_changed), policy); + _connect_manager_signal (policy, "state-changed", global_state_changed); _connect_manager_signal (policy, "notify::" NM_MANAGER_HOSTNAME, hostname_changed); _connect_manager_signal (policy, "notify::" NM_MANAGER_SLEEPING, sleeping_changed); @@ -1955,6 +1999,7 @@ nm_policy_destroy (NMPolicy *policy) hostname_thread_kill (policy->lookup); policy->lookup = NULL; } + g_free (policy->lookup_ipv6_addr); g_slist_foreach (policy->pending_activation_checks, (GFunc) activate_data_free, NULL); g_slist_free (policy->pending_activation_checks); @@ -1965,6 +2010,9 @@ nm_policy_destroy (NMPolicy *policy) g_signal_handler_disconnect (policy->fw_manager, policy->fw_started_id); g_object_unref (policy->fw_manager); + g_signal_handler_disconnect (policy->dns_manager, policy->config_changed_id); + g_object_unref (policy->dns_manager); + for (iter = policy->manager_ids; iter; iter = g_slist_next (iter)) g_signal_handler_disconnect (policy->manager, GPOINTER_TO_UINT (iter->data)); g_slist_free (policy->manager_ids); diff --git a/src/nm-system.c b/src/nm-system.c index 031daf8aa..1a2f93828 100644 --- a/src/nm-system.c +++ b/src/nm-system.c @@ -1167,7 +1167,7 @@ add_default_ip6_route (int ifindex, const struct in6_addr *gw, int mss) g_return_val_if_fail (route != NULL, -ENOMEM); /* Add the new default route */ - err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_CREATE); + err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_CREATE | NLM_F_REPLACE); if (err == -NLE_EXIST) err = 0; diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index f0cfc3fc9..d3415862d 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -1734,14 +1734,9 @@ static void nm_settings_connection_init (NMSettingsConnection *self) { NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self); - static guint32 dbus_counter = 0; - char *dbus_path; priv->dbus_mgr = nm_dbus_manager_get (); - dbus_path = g_strdup_printf ("%s/%u", NM_DBUS_PATH_SETTINGS, dbus_counter++); - nm_connection_set_path (NM_CONNECTION (self), dbus_path); - g_free (dbus_path); priv->visible = FALSE; priv->session_monitor = nm_session_monitor_get (); diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index fa474e09b..2cfda091f 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -587,7 +587,7 @@ load_plugins (NMSettings *self, const char **plugins, GError **error) gboolean keyfile_added = FALSE; gboolean success = TRUE; - for (iter = plugins; *iter; iter++) { + for (iter = plugins; iter && *iter; iter++) { GModule *plugin; char *full_name, *path; const char *pname = *iter; @@ -1768,12 +1768,10 @@ nm_settings_new (const char *config_file, priv->dbus_mgr = nm_dbus_manager_get (); priv->bus = nm_dbus_manager_get_connection (priv->dbus_mgr); - if (plugins) { - /* Load the plugins; fail if a plugin is not found. */ - if (!load_plugins (self, plugins, error)) { - g_object_unref (self); - return NULL; - } + /* Load the plugins; fail if a plugin is not found. */ + if (!load_plugins (self, plugins, error)) { + g_object_unref (self); + return NULL; } unmanaged_specs_changed (NULL, self); diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c index 8a646e1c3..f14e5cf71 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile.c @@ -603,7 +603,7 @@ test_write_wired_connection (void) owner_grp = getegid (); success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); ASSERT (success == TRUE, - "connection-write", "failed to allocate write keyfile: %s", + "connection-write", "failed to write keyfile: %s", error ? error->message : "(none)"); ASSERT (testfile != NULL, @@ -821,7 +821,7 @@ test_write_ip6_wired_connection (void) owner_grp = getegid (); success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); ASSERT (success == TRUE, - "connection-write", "failed to allocate write keyfile: %s", + "connection-write", "failed to write keyfile: %s", error ? error->message : "(none)"); ASSERT (testfile != NULL, @@ -1139,7 +1139,7 @@ test_write_wireless_connection (void) owner_grp = getegid (); success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); ASSERT (success == TRUE, - "connection-write", "failed to allocate write keyfile: %s", + "connection-write", "failed to write keyfile: %s", error ? error->message : "(none)"); ASSERT (testfile != NULL, @@ -1269,7 +1269,7 @@ test_write_string_ssid (void) owner_grp = getegid (); success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); ASSERT (success == TRUE, - "connection-write", "failed to allocate write keyfile: %s", + "connection-write", "failed to write keyfile: %s", error ? error->message : "(none)"); ASSERT (testfile != NULL, @@ -1916,7 +1916,7 @@ test_write_bt_dun_connection (void) owner_grp = getegid (); success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); ASSERT (success == TRUE, - "connection-write", "failed to allocate write keyfile: %s", + "connection-write", "failed to write keyfile: %s", error ? error->message : "(none)"); ASSERT (testfile != NULL, @@ -2162,7 +2162,7 @@ test_write_gsm_connection (void) owner_grp = getegid (); success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); ASSERT (success == TRUE, - "connection-write", "failed to allocate write keyfile: %s", + "connection-write", "failed to write keyfile: %s", error ? error->message : "(none)"); ASSERT (testfile != NULL, diff --git a/src/wifi/wifi-utils-nl80211.c b/src/wifi/wifi-utils-nl80211.c index 5a7103ee3..4a2dd9379 100644 --- a/src/wifi/wifi-utils-nl80211.c +++ b/src/wifi/wifi-utils-nl80211.c @@ -564,6 +564,15 @@ struct nl80211_device_info { gboolean success; }; +#define WLAN_CIPHER_SUITE_USE_GROUP 0x000FAC00 +#define WLAN_CIPHER_SUITE_WEP40 0x000FAC01 +#define WLAN_CIPHER_SUITE_TKIP 0x000FAC02 +#define WLAN_CIPHER_SUITE_CCMP 0x000FAC04 +#define WLAN_CIPHER_SUITE_WEP104 0x000FAC05 +#define WLAN_CIPHER_SUITE_AES_CMAC 0x000FAC06 +#define WLAN_CIPHER_SUITE_GCMP 0x000FAC08 +#define WLAN_CIPHER_SUITE_SMS4 0x00147201 + static int nl80211_wiphy_info_handler (struct nl_msg *msg, void *arg) { struct nlattr *tb[NL80211_ATTR_MAX + 1]; @@ -674,22 +683,26 @@ static int nl80211_wiphy_info_handler (struct nl_msg *msg, void *arg) num = nla_len (tb[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32); for (i = 0; i < num; i++) { switch (ciphers[i]) { - case 0x000fac01: + case WLAN_CIPHER_SUITE_WEP40: info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_WEP40; break; - case 0x000fac05: + case WLAN_CIPHER_SUITE_WEP104: info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_WEP104; break; - case 0x000fac02: + case WLAN_CIPHER_SUITE_TKIP: info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_TKIP | NM_WIFI_DEVICE_CAP_WPA; break; - case 0x000fac04: + case WLAN_CIPHER_SUITE_CCMP: info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_CCMP | NM_WIFI_DEVICE_CAP_RSN; break; + case WLAN_CIPHER_SUITE_AES_CMAC: + case WLAN_CIPHER_SUITE_GCMP: + case WLAN_CIPHER_SUITE_SMS4: + break; default: - nm_log_err (LOGD_HW | LOGD_WIFI, "Don't know the meaning of NL80211_ATTR_CIPHER_SUITES %#8.8x.", ciphers[i]); + nm_log_dbg (LOGD_HW | LOGD_WIFI, "Don't know the meaning of NL80211_ATTR_CIPHER_SUITE %#8.8x.", ciphers[i]); break; } } @@ -700,10 +713,10 @@ static int nl80211_wiphy_info_handler (struct nl_msg *msg, void *arg) int i; nla_for_each_nested (nl_mode, tb[NL80211_ATTR_SUPPORTED_IFTYPES], i) { - if (nla_type (nl_mode) == NL80211_IFTYPE_AP) { + if (nla_type (nl_mode) == NL80211_IFTYPE_AP) info->caps |= NM_WIFI_DEVICE_CAP_AP; - break; - } + else if (nla_type (nl_mode) == NL80211_IFTYPE_ADHOC) + info->caps |= NM_WIFI_DEVICE_CAP_ADHOC; } } diff --git a/src/wifi/wifi-utils-wext.c b/src/wifi/wifi-utils-wext.c index 37cd94e98..6e990aed7 100644 --- a/src/wifi/wifi-utils-wext.c +++ b/src/wifi/wifi-utils-wext.c @@ -556,6 +556,12 @@ wext_get_caps (WifiDataWext *wext, struct iw_range *range) caps &= ~WPA_CAPS; } + /* There's no way to detect Ad-Hoc/AP mode support with WEXT + * (other than actually trying to do it), so just assume that + * Ad-Hoc is supported and AP isn't. + */ + caps |= NM_WIFI_DEVICE_CAP_ADHOC; + return caps; } -- cgit v1.2.3