diff options
147 files changed, 3617 insertions, 2312 deletions
diff --git a/Makefile.am b/Makefile.am index 4a4ea616..833e8046 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5853,6 +5853,7 @@ EXTRA_DIST += \ tools/debug-helper.py \ tools/enums-to-docbook.pl \ tools/meson-post-install.sh \ + tools/meson-dist-data.sh \ tools/run-nm-test.sh \ tools/test-cloud-meta-mock.py \ tools/test-networkmanager-service.py \ diff --git a/Makefile.in b/Makefile.in index 6dc18a27..0ac8d211 100644 --- a/Makefile.in +++ b/Makefile.in @@ -387,6 +387,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ $(top_srcdir)/m4/ax_lib_readline.m4 \ $(top_srcdir)/m4/ax_pthread.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/git-sha-record.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ @@ -4186,6 +4187,8 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -5025,7 +5028,8 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux-generic.h \ tools/check-tree.sh tools/check-vapi.sh \ tools/create-exports-NetworkManager.sh tools/debug-helper.py \ tools/enums-to-docbook.pl tools/meson-post-install.sh \ - tools/run-nm-test.sh tools/test-cloud-meta-mock.py \ + tools/meson-dist-data.sh tools/run-nm-test.sh \ + tools/test-cloud-meta-mock.py \ tools/test-networkmanager-service.py \ tools/test-sudo-wrapper.sh \ src/core/settings/plugins/meson.build $(NULL) \ diff --git a/NEWS b/NEWS index 7fd1d5fe..01138b58 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,30 @@ Overview of changes since NetworkManager-1.44 performance cost. Also, D-Bus updates for addresses/routes are now rate limited to 3 per second. * cloud-setup: enable more sandboxing options in systemd service file. +* nmcli: show WiFi bandwidth. +* Internal improvements and bugfixes. +* Man page now show the format and accepted values of all properties. +* Added the 'dns-change' dispatcher event. +* Show WiFi devices capability to work on the 6GHz band. +* Allow to set dhcp-client-id to none. +* Support configuring ethtool channels property to configure NIC multiqueue. +* Don't attempt to use IPv6 if it's disabled in kernel. +* Fix handling of OVS interfaces with netdev datapath and cloned MAC. +* Support for old systemd has been droped, at least systemd v200 is required. +* Support Ethtool EEE (Energy Efficient Ethernet) settings. +* Add options to prevent edns0 and trust-ad being automatically added to DNS + configuration. +* Implement fwmark property for IP tunnels +* Add support to HSR/PRP interfaces +* Deprecated connection.* properties master, slave-type, autoconnect-slaves +* Allow configuring static routes also when addresses is empty. +* VPN: accept pref-src for IPv6 routes from VPN plugins. +* nmcli: show global metered state. +* Support modifying the DSCP header field for DHCP packets, and change the + default to CS0. +* Enable IPv4 DAD (Duplicate Address Detection) by default. +* Documentation improvements. +* Many internal improvements and bug fixes. ============================================= NetworkManager-1.44 diff --git a/aclocal.m4 b/aclocal.m4 index f467395d..09b5b636 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -20,8 +20,8 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 11 (pkg-config-0.29.1) +# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> @@ -63,7 +63,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -108,7 +108,7 @@ dnl Check to see whether a particular set of modules exists. Similar to dnl PKG_CHECK_MODULES(), but does not set variables or print errors. dnl dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place +dnl only at the first occurrence in configure.ac, so if the first place dnl it's called might be skipped (such as if it is within an "if", you dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,17 +174,17 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -195,8 +195,8 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -206,10 +206,10 @@ _PKG_TEXT To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl ]) else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + $3 fi[]dnl ])dnl PKG_CHECK_MODULES @@ -1875,6 +1875,7 @@ AC_SUBST([am__untar]) m4_include([m4/attributes.m4]) m4_include([m4/ax_lib_readline.m4]) m4_include([m4/ax_pthread.m4]) +m4_include([m4/build-to-host.m4]) m4_include([m4/compiler_options.m4]) m4_include([m4/gettext.m4]) m4_include([m4/git-sha-record.m4]) diff --git a/build-aux/config.guess b/build-aux/config.guess index c7f17e8f..e7a6fe3e 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,10 +1,10 @@ #!/usr/bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-05-25' +timestamp='2023-06-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] -Output the configuration name of the system \`$me' is run on. +Output the configuration name of the system '$me' is run on. Options: -h, --help print this help, then exit @@ -60,13 +60,13 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -102,8 +102,8 @@ GUESS= # temporary files to be created and, as you can see below, it is a # headache to deal with in a portable fashion. -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. +# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +# use 'HOST_CC' if defined, but it is deprecated. # Portable tmp directory creation inspired by the Autoconf team. @@ -459,7 +459,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in UNAME_RELEASE=`uname -v` ;; esac - # Japanese Language versions have a version number like `4.1.3-JL'. + # Japanese Language versions have a version number like '4.1.3-JL'. SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` GUESS=sparc-sun-sunos$SUN_REL ;; @@ -966,6 +966,12 @@ EOF GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) GUESS=$UNAME_MACHINE-unknown-minix ;; @@ -1036,7 +1042,7 @@ EOF k1om:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + loongarch32:Linux:*:* | loongarch64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; m32r*:Linux:*:*) @@ -1191,7 +1197,7 @@ EOF GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION ;; i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility + # If we were able to find 'uname', then EMX Unix compatibility # is probably installed. GUESS=$UNAME_MACHINE-pc-os2-emx ;; @@ -1332,7 +1338,7 @@ EOF GUESS=ns32k-sni-sysv fi ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel@ccMail.Census.GOV> GUESS=i586-unisys-sysv4 ;; diff --git a/build-aux/config.rpath b/build-aux/config.rpath index 1e1ab679..1e2595ff 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2022 Free Software Foundation, Inc. +# Copyright 1996-2023 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # diff --git a/build-aux/config.sub b/build-aux/config.sub index b41da55d..a6d99a0f 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,10 +1,10 @@ #!/usr/bin/sh # Configuration validation subroutine script. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-01-03' +timestamp='2023-06-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -76,13 +76,13 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -130,7 +130,7 @@ IFS=$saved_IFS # Separate into logical components for further validation case $1 in *-*-*-*-*) - echo Invalid configuration \`"$1"\': more than four components >&2 + echo "Invalid configuration '$1': more than four components" >&2 exit 1 ;; *-*-*-*) @@ -145,7 +145,7 @@ case $1 in nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*) basic_machine=$field1 basic_os=$maybe_os ;; @@ -943,7 +943,7 @@ $basic_machine EOF IFS=$saved_IFS ;; - # We use `pc' rather than `unknown' + # We use 'pc' rather than 'unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. i*86 | x86_64) @@ -1075,7 +1075,7 @@ case $cpu-$vendor in pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 ;; - pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) + pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) cpu=i686 ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) @@ -1207,7 +1207,7 @@ case $cpu-$vendor in | k1om \ | le32 | le64 \ | lm32 \ - | loongarch32 | loongarch64 | loongarchx32 \ + | loongarch32 | loongarch64 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ @@ -1285,7 +1285,7 @@ case $cpu-$vendor in ;; *) - echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2 exit 1 ;; esac @@ -1341,6 +1341,10 @@ EOF kernel=linux os=`echo "$basic_os" | sed -e 's|linux|gnu|'` ;; + managarm*) + kernel=managarm + os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'` + ;; *) kernel= os=$basic_os @@ -1754,7 +1758,7 @@ case $os in | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ - | fiwix* ) + | fiwix* | mlibc* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1762,8 +1766,11 @@ case $os in ;; none) ;; + kernel* ) + # Restricted further below + ;; *) - echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2 exit 1 ;; esac @@ -1772,14 +1779,24 @@ esac # (given a valid OS), if there is a kernel. case $kernel-$os in linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* ) + | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* ) ;; uclinux-uclibc* ) ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + managarm-mlibc* | managarm-kernel* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. - echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + -kernel* ) + echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel* ) + echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2 exit 1 ;; kfreebsd*-gnu* | kopensolaris*-gnu*) @@ -1796,7 +1813,7 @@ case $kernel-$os in # Blank kernel with real OS is always fine. ;; *-*) - echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2 exit 1 ;; esac diff --git a/configure b/configure index a368ca8f..f343607d 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for NetworkManager 1.45.90. +# Generated by GNU Autoconf 2.71 for NetworkManager 1.45.91. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>. # @@ -622,8 +622,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.45.90' -PACKAGE_STRING='NetworkManager 1.45.90' +PACKAGE_VERSION='1.45.91' +PACKAGE_STRING='NetworkManager 1.45.91' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -882,6 +882,8 @@ nmlibdir nmconfdir nmbinary GETTEXT_PACKAGE +localedir_c_make +localedir_c POSUB LTLIBINTL LIBINTL @@ -1742,7 +1744,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NetworkManager 1.45.90 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.45.91 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1814,7 +1816,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.45.90:";; + short | recursive ) echo "Configuration of NetworkManager 1.45.91:";; esac cat <<\_ACEOF @@ -2170,7 +2172,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.45.90 +NetworkManager configure 1.45.91 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2891,7 +2893,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 1.45.90, which was +It was created by NetworkManager $as_me 1.45.91, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4387,7 +4389,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.45.90' + VERSION='1.45.91' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -19296,8 +19298,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 NM_MINOR_VERSION=45 -NM_MICRO_VERSION=90 -NM_VERSION=1.45.90 +NM_MICRO_VERSION=91 +NM_VERSION=1.45.91 @@ -19305,7 +19307,7 @@ NM_VERSION=1.45.90 -NM_GIT_SHA=ee21ca8743e28f1c10933f3829f43a1d3b7ea2d8 +NM_GIT_SHA=87764094834398d7a3196e10a7bfb0441cdbd14b if test """" != "no-config-h" ; then @@ -21424,6 +21426,11 @@ fi + gl_sed_double_backslashes='s/\\/\\\\/g' + gl_sed_escape_doublequotes='s/"/\\"/g' + gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g" + gl_sed_escape_for_make_2='s,\$,\\$$,g' + @@ -22472,7 +22479,8 @@ printf "%s\n" "$ac_res" >&6; } if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then + && test "$PACKAGE" != gettext-tools \ + && test "$PACKAGE" != libintl; }; then gt_use_preinstalled_gnugettext=yes else LIBINTL= @@ -22566,12 +22574,50 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h - INTLLIBS="$LIBINTL" + INTLLIBS="$LIBINTL" + + + + + + + + gt_save_prefix="${prefix}" + gt_save_datarootdir="${datarootdir}" + gt_save_localedir="${localedir}" + if test "X$prefix" = "XNONE"; then + prefix="$ac_default_prefix" + fi + eval datarootdir="$datarootdir" + eval localedir="$localedir" + + + + + + gl_final_localedir="$localedir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;; + esac + ;; + esac + localedir_c=`echo "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + localedir_c='"'"$localedir_c"'"' + localedir_c_make=`echo "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then + localedir_c_make='\"$(localedir)\"' + fi + localedir="${gt_save_localedir}" + datarootdir="${gt_save_datarootdir}" + prefix="${gt_save_prefix}" # Remove AM_GNU_GETTEXT_VERSION once autoreconf supports REQUIRE_VERSION @@ -23225,8 +23271,8 @@ printf "%s\n" "no" >&6; } fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 -printf %s "checking for GLIB... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 >= 2.42 gmodule-2.0" >&5 +printf %s "checking for gio-unix-2.0 >= 2.42 gmodule-2.0... " >&6; } if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" @@ -23266,7 +23312,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -23275,14 +23321,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.42 gmodule-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.42 gmodule-2.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.42 gmodule-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.42 gmodule-2.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GLIB_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.42 gmodule-2.0) were not met: + as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.42 gmodule-2.0) were not met: $GLIB_PKG_ERRORS @@ -23293,9 +23339,9 @@ Alternatively, you may set the environment variables GLIB_CFLAGS and GLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -23308,8 +23354,8 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS - GLIB_LIBS=$pkg_cv_GLIB_LIBS + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -23406,8 +23452,8 @@ fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5 -printf %s "checking for LIBUDEV... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libudev >= 175" >&5 +printf %s "checking for libudev >= 175... " >&6; } if test -n "$LIBUDEV_CFLAGS"; then pkg_cv_LIBUDEV_CFLAGS="$LIBUDEV_CFLAGS" @@ -23447,7 +23493,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -23456,14 +23502,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 175" 2>&1` + LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 175" 2>&1` else - LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 175" 2>&1` + LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 175" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBUDEV_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBUDEV_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libudev >= 175) were not met: + as_fn_error $? "Package requirements (libudev >= 175) were not met: $LIBUDEV_PKG_ERRORS @@ -23474,9 +23520,9 @@ Alternatively, you may set the environment variables LIBUDEV_CFLAGS and LIBUDEV_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -23489,8 +23535,8 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - LIBUDEV_CFLAGS=$pkg_cv_LIBUDEV_CFLAGS - LIBUDEV_LIBS=$pkg_cv_LIBUDEV_LIBS + LIBUDEV_CFLAGS=$pkg_cv_LIBUDEV_CFLAGS + LIBUDEV_LIBS=$pkg_cv_LIBUDEV_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -23499,8 +23545,8 @@ fi # Qt4 pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QT" >&5 -printf %s "checking for QT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QtCore >= 4 QtDBus QtNetwork" >&5 +printf %s "checking for QtCore >= 4 QtDBus QtNetwork... " >&6; } if test -n "$QT_CFLAGS"; then pkg_cv_QT_CFLAGS="$QT_CFLAGS" @@ -23540,7 +23586,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -23549,24 +23595,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "QtCore >= 4 QtDBus QtNetwork" 2>&1` + QT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "QtCore >= 4 QtDBus QtNetwork" 2>&1` else - QT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "QtCore >= 4 QtDBus QtNetwork" 2>&1` + QT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "QtCore >= 4 QtDBus QtNetwork" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QT_PKG_ERRORS" >&5 - have_qt=no + have_qt=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_qt=no + have_qt=no else - QT_CFLAGS=$pkg_cv_QT_CFLAGS - QT_LIBS=$pkg_cv_QT_LIBS + QT_CFLAGS=$pkg_cv_QT_CFLAGS + QT_LIBS=$pkg_cv_QT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_qt=yes + have_qt=yes fi # Check whether --enable-qt was given. if test ${enable_qt+y} @@ -23759,8 +23805,8 @@ fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSYSTEMD" >&5 -printf %s "checking for LIBSYSTEMD... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd >= 209" >&5 +printf %s "checking for libsystemd >= 209... " >&6; } if test -n "$LIBSYSTEMD_CFLAGS"; then pkg_cv_LIBSYSTEMD_CFLAGS="$LIBSYSTEMD_CFLAGS" @@ -23800,7 +23846,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -23809,25 +23855,25 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` + LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` else - LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` + LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBSYSTEMD_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBSYSTEMD_PKG_ERRORS" >&5 printf "%s\n" "#define HAVE_LIBSYSTEMD 0" >>confdefs.h elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } printf "%s\n" "#define HAVE_LIBSYSTEMD 0" >>confdefs.h else - LIBSYSTEMD_CFLAGS=$pkg_cv_LIBSYSTEMD_CFLAGS - LIBSYSTEMD_LIBS=$pkg_cv_LIBSYSTEMD_LIBS + LIBSYSTEMD_CFLAGS=$pkg_cv_LIBSYSTEMD_CFLAGS + LIBSYSTEMD_LIBS=$pkg_cv_LIBSYSTEMD_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -23846,8 +23892,8 @@ have_systemd_journal=no if test "$with_systemd_journal" != "no"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5 -printf %s "checking for SYSTEMD_JOURNAL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd >= 209" >&5 +printf %s "checking for libsystemd >= 209... " >&6; } if test -n "$SYSTEMD_JOURNAL_CFLAGS"; then pkg_cv_SYSTEMD_JOURNAL_CFLAGS="$SYSTEMD_JOURNAL_CFLAGS" @@ -23887,7 +23933,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -23896,17 +23942,17 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` + SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` else - SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` + SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_JOURNAL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_JOURNAL_PKG_ERRORS" >&5 pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5 -printf %s "checking for SYSTEMD_JOURNAL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd-journal" >&5 +printf %s "checking for libsystemd-journal... " >&6; } if test -n "$SYSTEMD_JOURNAL_CFLAGS"; then pkg_cv_SYSTEMD_JOURNAL_CFLAGS="$SYSTEMD_JOURNAL_CFLAGS" @@ -23946,7 +23992,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -23955,32 +24001,32 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-journal" 2>&1` + SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-journal" 2>&1` else - SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-journal" 2>&1` + SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-journal" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_JOURNAL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_JOURNAL_PKG_ERRORS" >&5 - have_systemd_journal=no + have_systemd_journal=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_systemd_journal=no + have_systemd_journal=no else - SYSTEMD_JOURNAL_CFLAGS=$pkg_cv_SYSTEMD_JOURNAL_CFLAGS - SYSTEMD_JOURNAL_LIBS=$pkg_cv_SYSTEMD_JOURNAL_LIBS + SYSTEMD_JOURNAL_CFLAGS=$pkg_cv_SYSTEMD_JOURNAL_CFLAGS + SYSTEMD_JOURNAL_LIBS=$pkg_cv_SYSTEMD_JOURNAL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_systemd_journal=yes + have_systemd_journal=yes fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5 -printf %s "checking for SYSTEMD_JOURNAL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd-journal" >&5 +printf %s "checking for libsystemd-journal... " >&6; } if test -n "$SYSTEMD_JOURNAL_CFLAGS"; then pkg_cv_SYSTEMD_JOURNAL_CFLAGS="$SYSTEMD_JOURNAL_CFLAGS" @@ -24020,7 +24066,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -24029,31 +24075,31 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-journal" 2>&1` + SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-journal" 2>&1` else - SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-journal" 2>&1` + SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-journal" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_JOURNAL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_JOURNAL_PKG_ERRORS" >&5 - have_systemd_journal=no + have_systemd_journal=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_systemd_journal=no + have_systemd_journal=no else - SYSTEMD_JOURNAL_CFLAGS=$pkg_cv_SYSTEMD_JOURNAL_CFLAGS - SYSTEMD_JOURNAL_LIBS=$pkg_cv_SYSTEMD_JOURNAL_LIBS + SYSTEMD_JOURNAL_CFLAGS=$pkg_cv_SYSTEMD_JOURNAL_CFLAGS + SYSTEMD_JOURNAL_LIBS=$pkg_cv_SYSTEMD_JOURNAL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_systemd_journal=yes + have_systemd_journal=yes fi else - SYSTEMD_JOURNAL_CFLAGS=$pkg_cv_SYSTEMD_JOURNAL_CFLAGS - SYSTEMD_JOURNAL_LIBS=$pkg_cv_SYSTEMD_JOURNAL_LIBS + SYSTEMD_JOURNAL_CFLAGS=$pkg_cv_SYSTEMD_JOURNAL_CFLAGS + SYSTEMD_JOURNAL_LIBS=$pkg_cv_SYSTEMD_JOURNAL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_systemd_journal=yes + have_systemd_journal=yes fi if test "$have_systemd_journal" != "yes"; then if test "$with_systemd_journal" = "yes"; then @@ -24223,8 +24269,8 @@ session_tracking= if test "$use_systemd_logind" = "yes" -o "$use_systemd_logind" = "auto"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 -printf %s "checking for SYSTEMD_LOGIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5 +printf %s "checking for libsystemd... " >&6; } if test -n "$SYSTEMD_LOGIN_CFLAGS"; then pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" @@ -24264,7 +24310,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -24273,17 +24319,17 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1` else - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 -printf %s "checking for SYSTEMD_LOGIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd-login" >&5 +printf %s "checking for libsystemd-login... " >&6; } if test -n "$SYSTEMD_LOGIN_CFLAGS"; then pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" @@ -24323,7 +24369,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -24332,32 +24378,32 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login" 2>&1` else - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 - have_systemd_logind=no + have_systemd_logind=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_systemd_logind=no + have_systemd_logind=no else - SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS - SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS + SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS + SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_systemd_logind=yes + have_systemd_logind=yes fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 -printf %s "checking for SYSTEMD_LOGIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd-login" >&5 +printf %s "checking for libsystemd-login... " >&6; } if test -n "$SYSTEMD_LOGIN_CFLAGS"; then pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" @@ -24397,7 +24443,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -24406,31 +24452,31 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login" 2>&1` else - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 - have_systemd_logind=no + have_systemd_logind=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_systemd_logind=no + have_systemd_logind=no else - SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS - SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS + SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS + SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_systemd_logind=yes + have_systemd_logind=yes fi else - SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS - SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS + SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS + SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_systemd_logind=yes + have_systemd_logind=yes fi else have_systemd_logind=no @@ -24455,8 +24501,8 @@ fi if test "$use_elogind" = "yes"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 -printf %s "checking for SYSTEMD_LOGIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libelogind" >&5 +printf %s "checking for libelogind... " >&6; } if test -n "$SYSTEMD_LOGIN_CFLAGS"; then pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" @@ -24496,7 +24542,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -24505,17 +24551,17 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1` else - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 -printf %s "checking for SYSTEMD_LOGIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libelogind" >&5 +printf %s "checking for libelogind... " >&6; } if test -n "$SYSTEMD_LOGIN_CFLAGS"; then pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" @@ -24555,7 +24601,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -24564,32 +24610,32 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1` else - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 - have_elogind=no + have_elogind=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_elogind=no + have_elogind=no else - SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS - SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS + SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS + SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_elogind=yes + have_elogind=yes fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 -printf %s "checking for SYSTEMD_LOGIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libelogind" >&5 +printf %s "checking for libelogind... " >&6; } if test -n "$SYSTEMD_LOGIN_CFLAGS"; then pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" @@ -24629,7 +24675,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -24638,31 +24684,31 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1` else - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 - have_elogind=no + have_elogind=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_elogind=no + have_elogind=no else - SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS - SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS + SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS + SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_elogind=yes + have_elogind=yes fi else - SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS - SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS + SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS + SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_elogind=yes + have_elogind=yes fi else have_elogind=no @@ -24767,8 +24813,8 @@ printf "%s\n" "#define SUSPEND_RESUME_UPOWER 1" >>confdefs.h systemd) pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5 -printf %s "checking for SYSTEMD_INHIBIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd >= 209" >&5 +printf %s "checking for libsystemd >= 209... " >&6; } if test -n "$SYSTEMD_INHIBIT_CFLAGS"; then pkg_cv_SYSTEMD_INHIBIT_CFLAGS="$SYSTEMD_INHIBIT_CFLAGS" @@ -24808,7 +24854,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -24817,17 +24863,17 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` + SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` else - SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` + SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_INHIBIT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_INHIBIT_PKG_ERRORS" >&5 pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5 -printf %s "checking for SYSTEMD_INHIBIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd-login >= 183" >&5 +printf %s "checking for libsystemd-login >= 183... " >&6; } if test -n "$SYSTEMD_INHIBIT_CFLAGS"; then pkg_cv_SYSTEMD_INHIBIT_CFLAGS="$SYSTEMD_INHIBIT_CFLAGS" @@ -24867,7 +24913,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -24876,14 +24922,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login >= 183" 2>&1` + SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login >= 183" 2>&1` else - SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login >= 183" 2>&1` + SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login >= 183" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_INHIBIT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_INHIBIT_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libsystemd-login >= 183) were not met: + as_fn_error $? "Package requirements (libsystemd-login >= 183) were not met: $SYSTEMD_INHIBIT_PKG_ERRORS @@ -24894,9 +24940,9 @@ Alternatively, you may set the environment variables SYSTEMD_INHIBIT_CFLAGS and SYSTEMD_INHIBIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -24909,19 +24955,19 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS - SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS + SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS + SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5 -printf %s "checking for SYSTEMD_INHIBIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd-login >= 183" >&5 +printf %s "checking for libsystemd-login >= 183... " >&6; } if test -n "$SYSTEMD_INHIBIT_CFLAGS"; then pkg_cv_SYSTEMD_INHIBIT_CFLAGS="$SYSTEMD_INHIBIT_CFLAGS" @@ -24961,7 +25007,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -24970,14 +25016,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login >= 183" 2>&1` + SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login >= 183" 2>&1` else - SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login >= 183" 2>&1` + SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login >= 183" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_INHIBIT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_INHIBIT_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libsystemd-login >= 183) were not met: + as_fn_error $? "Package requirements (libsystemd-login >= 183) were not met: $SYSTEMD_INHIBIT_PKG_ERRORS @@ -24988,9 +25034,9 @@ Alternatively, you may set the environment variables SYSTEMD_INHIBIT_CFLAGS and SYSTEMD_INHIBIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -25003,15 +25049,15 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS - SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS + SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS + SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } fi else - SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS - SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS + SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS + SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -25023,8 +25069,8 @@ printf "%s\n" "#define SUSPEND_RESUME_SYSTEMD 1" >>confdefs.h elogind) pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 -printf %s "checking for ELOGIND_INHIBIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libelogind >= 219" >&5 +printf %s "checking for libelogind >= 219... " >&6; } if test -n "$ELOGIND_INHIBIT_CFLAGS"; then pkg_cv_ELOGIND_INHIBIT_CFLAGS="$ELOGIND_INHIBIT_CFLAGS" @@ -25064,7 +25110,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -25073,17 +25119,17 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind >= 219" 2>&1` + ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind >= 219" 2>&1` else - ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind >= 219" 2>&1` + ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind >= 219" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ELOGIND_INHIBIT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ELOGIND_INHIBIT_PKG_ERRORS" >&5 pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 -printf %s "checking for ELOGIND_INHIBIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libelogind >= 219" >&5 +printf %s "checking for libelogind >= 219... " >&6; } if test -n "$ELOGIND_INHIBIT_CFLAGS"; then pkg_cv_ELOGIND_INHIBIT_CFLAGS="$ELOGIND_INHIBIT_CFLAGS" @@ -25123,7 +25169,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -25132,14 +25178,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind >= 219" 2>&1` + ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind >= 219" 2>&1` else - ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind >= 219" 2>&1` + ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind >= 219" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ELOGIND_INHIBIT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ELOGIND_INHIBIT_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libelogind >= 219) were not met: + as_fn_error $? "Package requirements (libelogind >= 219) were not met: $ELOGIND_INHIBIT_PKG_ERRORS @@ -25150,9 +25196,9 @@ Alternatively, you may set the environment variables ELOGIND_INHIBIT_CFLAGS and ELOGIND_INHIBIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -25165,19 +25211,19 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS - ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS + ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS + ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 -printf %s "checking for ELOGIND_INHIBIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libelogind >= 219" >&5 +printf %s "checking for libelogind >= 219... " >&6; } if test -n "$ELOGIND_INHIBIT_CFLAGS"; then pkg_cv_ELOGIND_INHIBIT_CFLAGS="$ELOGIND_INHIBIT_CFLAGS" @@ -25217,7 +25263,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -25226,14 +25272,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind >= 219" 2>&1` + ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind >= 219" 2>&1` else - ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind >= 219" 2>&1` + ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind >= 219" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ELOGIND_INHIBIT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ELOGIND_INHIBIT_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libelogind >= 219) were not met: + as_fn_error $? "Package requirements (libelogind >= 219) were not met: $ELOGIND_INHIBIT_PKG_ERRORS @@ -25244,9 +25290,9 @@ Alternatively, you may set the environment variables ELOGIND_INHIBIT_CFLAGS and ELOGIND_INHIBIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -25259,15 +25305,15 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS - ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS + ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS + ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } fi else - ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS - ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS + ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS + ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -25334,8 +25380,8 @@ fi if test "$with_selinux" = "yes" -o "$with_selinux" = "auto"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5 -printf %s "checking for SELINUX... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libselinux" >&5 +printf %s "checking for libselinux... " >&6; } if test -n "$SELINUX_CFLAGS"; then pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS" @@ -25375,7 +25421,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -25384,24 +25430,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libselinux" 2>&1` + SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libselinux" 2>&1` else - SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libselinux" 2>&1` + SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libselinux" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SELINUX_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SELINUX_PKG_ERRORS" >&5 - have_selinux=no + have_selinux=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_selinux=no + have_selinux=no else - SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS - SELINUX_LIBS=$pkg_cv_SELINUX_LIBS + SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS + SELINUX_LIBS=$pkg_cv_SELINUX_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_selinux=yes + have_selinux=yes fi else have_selinux=no @@ -25432,8 +25478,8 @@ fi if test "$with_libaudit" = "yes" -o "$with_libaudit" = "yes-disabled-by-default" -o "$with_libaudit" = "auto"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBAUDIT" >&5 -printf %s "checking for LIBAUDIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for audit" >&5 +printf %s "checking for audit... " >&6; } if test -n "$LIBAUDIT_CFLAGS"; then pkg_cv_LIBAUDIT_CFLAGS="$LIBAUDIT_CFLAGS" @@ -25473,7 +25519,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -25482,24 +25528,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBAUDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audit" 2>&1` + LIBAUDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audit" 2>&1` else - LIBAUDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audit" 2>&1` + LIBAUDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audit" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBAUDIT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBAUDIT_PKG_ERRORS" >&5 - have_libaudit=no + have_libaudit=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_libaudit=no + have_libaudit=no else - LIBAUDIT_CFLAGS=$pkg_cv_LIBAUDIT_CFLAGS - LIBAUDIT_LIBS=$pkg_cv_LIBAUDIT_LIBS + LIBAUDIT_CFLAGS=$pkg_cv_LIBAUDIT_CFLAGS + LIBAUDIT_LIBS=$pkg_cv_LIBAUDIT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_libaudit=yes + have_libaudit=yes fi if test "$with_libaudit" != "auto" -a "$have_libaudit" = "no"; then as_fn_error $? "You must have libaudit installed to build --with-libaudit=$with_libaudit." "$LINENO" 5 @@ -25536,8 +25582,8 @@ fi # uuid library pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5 -printf %s "checking for UUID... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid" >&5 +printf %s "checking for uuid... " >&6; } if test -n "$UUID_CFLAGS"; then pkg_cv_UUID_CFLAGS="$UUID_CFLAGS" @@ -25577,7 +25623,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -25586,14 +25632,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "uuid" 2>&1` + UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "uuid" 2>&1` else - UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "uuid" 2>&1` + UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "uuid" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$UUID_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$UUID_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (uuid) were not met: + as_fn_error $? "Package requirements (uuid) were not met: $UUID_PKG_ERRORS @@ -25604,9 +25650,9 @@ Alternatively, you may set the environment variables UUID_CFLAGS and UUID_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -25619,8 +25665,8 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - UUID_CFLAGS=$pkg_cv_UUID_CFLAGS - UUID_LIBS=$pkg_cv_UUID_LIBS + UUID_CFLAGS=$pkg_cv_UUID_CFLAGS + UUID_LIBS=$pkg_cv_UUID_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -25630,8 +25676,8 @@ fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5 -printf %s "checking for JANSSON... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jansson >= 2.7" >&5 +printf %s "checking for jansson >= 2.7... " >&6; } if test -n "$JANSSON_CFLAGS"; then pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS" @@ -25671,7 +25717,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -25680,24 +25726,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson >= 2.7" 2>&1` + JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson >= 2.7" 2>&1` else - JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson >= 2.7" 2>&1` + JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson >= 2.7" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$JANSSON_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$JANSSON_PKG_ERRORS" >&5 - have_jansson=no + have_jansson=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_jansson=no + have_jansson=no else - JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS - JANSSON_LIBS=$pkg_cv_JANSSON_LIBS + JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS + JANSSON_LIBS=$pkg_cv_JANSSON_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_jansson=yes + have_jansson=yes fi if test "$have_jansson" = "yes"; then @@ -25841,8 +25887,8 @@ fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBTEAMDCTL" >&5 -printf %s "checking for LIBTEAMDCTL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libteamdctl >= 1.9" >&5 +printf %s "checking for libteamdctl >= 1.9... " >&6; } if test -n "$LIBTEAMDCTL_CFLAGS"; then pkg_cv_LIBTEAMDCTL_CFLAGS="$LIBTEAMDCTL_CFLAGS" @@ -25882,7 +25928,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -25891,24 +25937,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBTEAMDCTL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libteamdctl >= 1.9" 2>&1` + LIBTEAMDCTL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libteamdctl >= 1.9" 2>&1` else - LIBTEAMDCTL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libteamdctl >= 1.9" 2>&1` + LIBTEAMDCTL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libteamdctl >= 1.9" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBTEAMDCTL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBTEAMDCTL_PKG_ERRORS" >&5 - have_teamdctl=no + have_teamdctl=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_teamdctl=no + have_teamdctl=no else - LIBTEAMDCTL_CFLAGS=$pkg_cv_LIBTEAMDCTL_CFLAGS - LIBTEAMDCTL_LIBS=$pkg_cv_LIBTEAMDCTL_LIBS + LIBTEAMDCTL_CFLAGS=$pkg_cv_LIBTEAMDCTL_CFLAGS + LIBTEAMDCTL_LIBS=$pkg_cv_LIBTEAMDCTL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_teamdctl=yes + have_teamdctl=yes fi if test "$have_jansson" = "yes" -a "$have_teamdctl" = "yes"; then have_team_prereq=yes @@ -26036,8 +26082,8 @@ fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5 -printf %s "checking for GNUTLS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 2.12" >&5 +printf %s "checking for gnutls >= 2.12... " >&6; } if test -n "$GNUTLS_CFLAGS"; then pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS" @@ -26077,7 +26123,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -26086,29 +26132,29 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 2.12" 2>&1` + GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 2.12" 2>&1` else - GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 2.12" 2>&1` + GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 2.12" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GNUTLS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GNUTLS_PKG_ERRORS" >&5 - have_crypto_gnutls=no + have_crypto_gnutls=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_crypto_gnutls=no + have_crypto_gnutls=no else - GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS - GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS + GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS + GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_crypto_gnutls=yes + have_crypto_gnutls=yes fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5 -printf %s "checking for NSS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nss" >&5 +printf %s "checking for nss... " >&6; } if test -n "$NSS_CFLAGS"; then pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" @@ -26148,7 +26194,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -26157,24 +26203,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nss" 2>&1` + NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nss" 2>&1` else - NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nss" 2>&1` + NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nss" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$NSS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$NSS_PKG_ERRORS" >&5 - have_crypto_nss=yes + have_crypto_nss=yes elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_crypto_nss=yes + have_crypto_nss=yes else - NSS_CFLAGS=$pkg_cv_NSS_CFLAGS - NSS_LIBS=$pkg_cv_NSS_LIBS + NSS_CFLAGS=$pkg_cv_NSS_CFLAGS + NSS_LIBS=$pkg_cv_NSS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_crypto_nss=yes + have_crypto_nss=yes fi if test "${have_crypto_nss}" = "yes"; then # Work around a pkg-config bug (fdo #29801) where exists != usable @@ -26408,8 +26454,8 @@ fi if test "${with_modem_manager_1}" != "no"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MM_GLIB" >&5 -printf %s "checking for MM_GLIB... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mm-glib >= 0.7.991" >&5 +printf %s "checking for mm-glib >= 0.7.991... " >&6; } if test -n "$MM_GLIB_CFLAGS"; then pkg_cv_MM_GLIB_CFLAGS="$MM_GLIB_CFLAGS" @@ -26449,7 +26495,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -26458,24 +26504,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MM_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mm-glib >= 0.7.991" 2>&1` + MM_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mm-glib >= 0.7.991" 2>&1` else - MM_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mm-glib >= 0.7.991" 2>&1` + MM_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mm-glib >= 0.7.991" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MM_GLIB_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MM_GLIB_PKG_ERRORS" >&5 - have_libmm_glib=no + have_libmm_glib=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_libmm_glib=no + have_libmm_glib=no else - MM_GLIB_CFLAGS=$pkg_cv_MM_GLIB_CFLAGS - MM_GLIB_LIBS=$pkg_cv_MM_GLIB_LIBS + MM_GLIB_CFLAGS=$pkg_cv_MM_GLIB_CFLAGS + MM_GLIB_LIBS=$pkg_cv_MM_GLIB_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_libmm_glib=yes + have_libmm_glib=yes fi if test "${have_libmm_glib}" = "no"; then @@ -26489,8 +26535,8 @@ fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MOBILE_BROADBAND_PROVIDER_INFO" >&5 -printf %s "checking for MOBILE_BROADBAND_PROVIDER_INFO... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mobile-broadband-provider-info" >&5 +printf %s "checking for mobile-broadband-provider-info... " >&6; } if test -n "$MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS"; then pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS="$MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS" @@ -26530,7 +26576,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -26539,24 +26585,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MOBILE_BROADBAND_PROVIDER_INFO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mobile-broadband-provider-info" 2>&1` + MOBILE_BROADBAND_PROVIDER_INFO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mobile-broadband-provider-info" 2>&1` else - MOBILE_BROADBAND_PROVIDER_INFO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mobile-broadband-provider-info" 2>&1` + MOBILE_BROADBAND_PROVIDER_INFO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mobile-broadband-provider-info" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MOBILE_BROADBAND_PROVIDER_INFO_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MOBILE_BROADBAND_PROVIDER_INFO_PKG_ERRORS" >&5 - MOBILE_BROADBAND_PROVIDER_INFO_DATABASE="$prefix/share/mobile-broadband-provider-info/serviceproviders.xml" + MOBILE_BROADBAND_PROVIDER_INFO_DATABASE="$prefix/share/mobile-broadband-provider-info/serviceproviders.xml" elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - MOBILE_BROADBAND_PROVIDER_INFO_DATABASE="$prefix/share/mobile-broadband-provider-info/serviceproviders.xml" + MOBILE_BROADBAND_PROVIDER_INFO_DATABASE="$prefix/share/mobile-broadband-provider-info/serviceproviders.xml" else - MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS=$pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS - MOBILE_BROADBAND_PROVIDER_INFO_LIBS=$pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_LIBS + MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS=$pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS + MOBILE_BROADBAND_PROVIDER_INFO_LIBS=$pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - MOBILE_BROADBAND_PROVIDER_INFO_DATABASE=`$PKG_CONFIG --variable=database mobile-broadband-provider-info` + MOBILE_BROADBAND_PROVIDER_INFO_DATABASE=`$PKG_CONFIG --variable=database mobile-broadband-provider-info` fi printf "%s\n" "#define MOBILE_BROADBAND_PROVIDER_INFO_DATABASE \"$MOBILE_BROADBAND_PROVIDER_INFO_DATABASE\"" >>confdefs.h @@ -26578,8 +26624,8 @@ fi # Bluez5 DUN support pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BLUEZ5" >&5 -printf %s "checking for BLUEZ5... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bluez >= 5" >&5 +printf %s "checking for bluez >= 5... " >&6; } if test -n "$BLUEZ5_CFLAGS"; then pkg_cv_BLUEZ5_CFLAGS="$BLUEZ5_CFLAGS" @@ -26619,7 +26665,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -26628,24 +26674,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - BLUEZ5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "bluez >= 5" 2>&1` + BLUEZ5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "bluez >= 5" 2>&1` else - BLUEZ5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "bluez >= 5" 2>&1` + BLUEZ5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "bluez >= 5" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$BLUEZ5_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$BLUEZ5_PKG_ERRORS" >&5 - have_bluez5=no + have_bluez5=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_bluez5=no + have_bluez5=no else - BLUEZ5_CFLAGS=$pkg_cv_BLUEZ5_CFLAGS - BLUEZ5_LIBS=$pkg_cv_BLUEZ5_LIBS + BLUEZ5_CFLAGS=$pkg_cv_BLUEZ5_CFLAGS + BLUEZ5_LIBS=$pkg_cv_BLUEZ5_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_bluez5=yes + have_bluez5=yes fi # Check whether --enable-bluez5-dun was given. if test ${enable_bluez5_dun+y} @@ -27473,8 +27519,8 @@ printf "%s\n" "#define KERNEL_FIRMWARE_DIR \"$KERNEL_FIRMWARE_DIR\"" >>confdefs. pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBPSL" >&5 -printf %s "checking for LIBPSL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpsl >= 0.1" >&5 +printf %s "checking for libpsl >= 0.1... " >&6; } if test -n "$LIBPSL_CFLAGS"; then pkg_cv_LIBPSL_CFLAGS="$LIBPSL_CFLAGS" @@ -27514,7 +27560,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -27523,24 +27569,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBPSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpsl >= 0.1" 2>&1` + LIBPSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpsl >= 0.1" 2>&1` else - LIBPSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpsl >= 0.1" 2>&1` + LIBPSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpsl >= 0.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBPSL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBPSL_PKG_ERRORS" >&5 - have_libpsl=no + have_libpsl=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_libpsl=no + have_libpsl=no else - LIBPSL_CFLAGS=$pkg_cv_LIBPSL_CFLAGS - LIBPSL_LIBS=$pkg_cv_LIBPSL_LIBS + LIBPSL_CFLAGS=$pkg_cv_LIBPSL_CFLAGS + LIBPSL_LIBS=$pkg_cv_LIBPSL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_libpsl=yes + have_libpsl=yes fi # Check whether --with-libpsl was given. @@ -27586,8 +27632,8 @@ fi if test "${enable_concheck}" = "yes"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5 -printf %s "checking for LIBCURL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.24.0" >&5 +printf %s "checking for libcurl >= 7.24.0... " >&6; } if test -n "$LIBCURL_CFLAGS"; then pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS" @@ -27627,7 +27673,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -27636,24 +27682,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1` + LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1` else - LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1` + LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBCURL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBCURL_PKG_ERRORS" >&5 - have_libcurl=no + have_libcurl=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_libcurl=no + have_libcurl=no else - LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS - LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS + LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS + LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_libcurl=yes + have_libcurl=yes fi if test "$have_libcurl" != "yes"; then as_fn_error $? "--enable-concheck requires libcurl library." "$LINENO" 5 @@ -27670,8 +27716,8 @@ fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBNDP" >&5 -printf %s "checking for LIBNDP... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libndp" >&5 +printf %s "checking for libndp... " >&6; } if test -n "$LIBNDP_CFLAGS"; then pkg_cv_LIBNDP_CFLAGS="$LIBNDP_CFLAGS" @@ -27711,7 +27757,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -27720,14 +27766,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNDP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libndp" 2>&1` + LIBNDP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libndp" 2>&1` else - LIBNDP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libndp" 2>&1` + LIBNDP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libndp" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBNDP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBNDP_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libndp) were not met: + as_fn_error $? "Package requirements (libndp) were not met: $LIBNDP_PKG_ERRORS @@ -27738,9 +27784,9 @@ Alternatively, you may set the environment variables LIBNDP_CFLAGS and LIBNDP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -27753,8 +27799,8 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - LIBNDP_CFLAGS=$pkg_cv_LIBNDP_CFLAGS - LIBNDP_LIBS=$pkg_cv_LIBNDP_LIBS + LIBNDP_CFLAGS=$pkg_cv_LIBNDP_CFLAGS + LIBNDP_LIBS=$pkg_cv_LIBNDP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -27975,8 +28021,8 @@ if test "$with_nm_cloud_setup" != no; then if test "$have_libcurl" = ""; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5 -printf %s "checking for LIBCURL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.24.0" >&5 +printf %s "checking for libcurl >= 7.24.0... " >&6; } if test -n "$LIBCURL_CFLAGS"; then pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS" @@ -28016,7 +28062,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -28025,24 +28071,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1` + LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1` else - LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1` + LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBCURL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBCURL_PKG_ERRORS" >&5 - have_libcurl=no + have_libcurl=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_libcurl=no + have_libcurl=no else - LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS - LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS + LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS + LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_libcurl=yes + have_libcurl=yes fi fi if test "$have_libcurl" != "yes"; then @@ -28069,8 +28115,8 @@ fi if test "$with_nmtui" != no; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NEWT" >&5 -printf %s "checking for NEWT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnewt >= 0.52.15" >&5 +printf %s "checking for libnewt >= 0.52.15... " >&6; } if test -n "$NEWT_CFLAGS"; then pkg_cv_NEWT_CFLAGS="$NEWT_CFLAGS" @@ -28110,7 +28156,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -28119,24 +28165,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NEWT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnewt >= 0.52.15" 2>&1` + NEWT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnewt >= 0.52.15" 2>&1` else - NEWT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnewt >= 0.52.15" 2>&1` + NEWT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnewt >= 0.52.15" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$NEWT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$NEWT_PKG_ERRORS" >&5 - build_nmtui=no + build_nmtui=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - build_nmtui=no + build_nmtui=no else - NEWT_CFLAGS=$pkg_cv_NEWT_CFLAGS - NEWT_LIBS=$pkg_cv_NEWT_LIBS + NEWT_CFLAGS=$pkg_cv_NEWT_CFLAGS + NEWT_LIBS=$pkg_cv_NEWT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - build_nmtui=yes + build_nmtui=yes fi else build_nmtui=no @@ -31640,8 +31686,8 @@ printf "%s\n" "$enable_gtk_doc" >&6; } if test "x$PACKAGE_NAME" != "xglib"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 -printf %s "checking for GTKDOC_DEPS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" >&5 +printf %s "checking for glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0... " >&6; } if test -n "$GTKDOC_DEPS_CFLAGS"; then pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" @@ -31681,7 +31727,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -31690,21 +31736,21 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` else - GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 - : + : elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - : + : else - GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS - GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -32641,7 +32687,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NetworkManager $as_me 1.45.90, which was +This file was extended by NetworkManager $as_me 1.45.91, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32709,7 +32755,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -NetworkManager config.status 1.45.90 +NetworkManager config.status 1.45.91 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 275e87e1..9b594e41 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) m4_define([nm_minor_version], [45]) -m4_define([nm_micro_version], [90]) +m4_define([nm_micro_version], [91]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index 6475054c..9bc408e3 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -121,6 +121,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ $(top_srcdir)/m4/ax_lib_readline.m4 \ $(top_srcdir)/m4/ax_pthread.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/git-sha-record.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ @@ -415,6 +416,8 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml index 34d1badf..43ea30eb 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml @@ -28,9 +28,7 @@ HwAddress readable s </programlisting> <para> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</para><para> </para> </refsect2> <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Bond.Carrier"> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml index 18dd8e74..9bcabc1e 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml @@ -28,9 +28,7 @@ HwAddress readable s </programlisting> <para> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</para><para> </para> </refsect2> <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.Carrier"> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml index 05ca8ed9..ae4e4719 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml @@ -26,9 +26,7 @@ HwAddress readable s </programlisting> <para> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</para><para> </para> </refsect2> </refsect1> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml index f907a844..a14a7199 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml @@ -27,9 +27,7 @@ HwAddress readable s </programlisting> <para> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</para><para> </para> </refsect2> <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Generic.TypeDescription"> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Hsr.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Hsr.xml index 8376dcd6..7b2e75af 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Hsr.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Hsr.xml @@ -30,9 +30,8 @@ Port1 readable o </programlisting> <para> -The device's port1 device. +</para><para> </para> -<para role="since">Since 1.46</para> </refsect2> <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Hsr.Port2"> <title>The "Port2" property</title> @@ -41,9 +40,8 @@ The device's port1 device. Port2 readable o </programlisting> <para> -The device's port2 device. +</para><para> </para> -<para role="since">Since 1.46</para> </refsect2> <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Hsr.SupervisionAddress"> <title>The "SupervisionAddress" property</title> @@ -52,9 +50,8 @@ The device's port2 device. SupervisionAddress readable s </programlisting> <para> -The supervision MAC address. +</para><para> </para> -<para role="since">Since 1.46</para> </refsect2> <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Hsr.MulticastSpec"> <title>The "MulticastSpec" property</title> @@ -63,9 +60,8 @@ The supervision MAC address. MulticastSpec readable y </programlisting> <para> -The last byte of the supervision address. +</para><para> </para> -<para role="since">Since 1.46</para> </refsect2> <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Hsr.Prp"> <title>The "Prp" property</title> @@ -74,9 +70,8 @@ The last byte of the supervision address. Prp readable b </programlisting> <para> -Whether the PRP protocol is used or not. +</para><para> </para> -<para role="since">Since 1.46</para> </refsect2> </refsect1> </refentry> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml index ed6533ae..65fc978d 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml @@ -27,9 +27,7 @@ HwAddress readable s </programlisting> <para> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</para><para> </para> </refsect2> <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Infiniband.Carrier"> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml index d63bad6a..f8d0bd08 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml @@ -29,9 +29,7 @@ HwAddress readable s </programlisting> <para> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</para><para> </para> </refsect2> <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Team.Carrier"> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml index 0b5f198a..9e447e6d 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml @@ -95,9 +95,7 @@ device multiple times, for multiple send/receive queues. HwAddress readable s </programlisting> <para> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</para><para> </para> </refsect2> </refsect1> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml index 2752e5b6..964640e1 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml @@ -29,9 +29,7 @@ HwAddress readable s </programlisting> <para> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</para><para> </para> </refsect2> <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.Carrier"> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml index b4940213..9a00720c 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml @@ -53,9 +53,7 @@ to this host). HwAddress readable s </programlisting> <para> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</para><para> </para> </refsect2> <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Id"> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml index f34c309b..c0f30afd 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml @@ -48,9 +48,9 @@ The <constant>options</constant> argument accepts the following keys: </para><para> <variablelist> <varlistentry> -<term><literal>i timeout</literal>:</term> -<listitem><para>Timeout value in the range of 1-600 seconds.</para> -<para>The default is 30 seconds.</para></listitem> + <term><literal>i timeout</literal>:</term> + <listitem><para>Timeout value in the range of 1-600 seconds.</para> + <para>The default is 30 seconds.</para></listitem> </varlistentry> </variablelist> </para> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml index 7f01357e..a302a3d0 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml @@ -196,36 +196,36 @@ logically or-ed together: </para><para> <variablelist> <varlistentry> -<term><literal>0x1 (to-disk)</literal>:</term> -<listitem><para>The connection is persisted to disk.</para></listitem> + <term><literal>0x1 (to-disk)</literal>:</term> + <listitem><para>The connection is persisted to disk.</para></listitem> </varlistentry> <varlistentry> -<term><literal>0x2 (in-memory)</literal>:</term> -<listitem><para>The change is only made in memory (without touching an eventual -profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory -only, if the connection is already in memory only.</para></listitem> + <term><literal>0x2 (in-memory)</literal>:</term> + <listitem><para>The change is only made in memory (without touching an eventual + profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory + only, if the connection is already in memory only.</para></listitem> </varlistentry> <varlistentry> -<term><literal>0x4 (in-memory-detached)</literal>:</term> -<listitem><para>Like "in-memory", but behaves slightly different when migrating -the profile from disk to in-memory.</para></listitem> + <term><literal>0x4 (in-memory-detached)</literal>:</term> + <listitem><para>Like "in-memory", but behaves slightly different when migrating + the profile from disk to in-memory.</para></listitem> </varlistentry> <varlistentry> -<term><literal>0x8 (in-memory-only)</literal>:</term> -<listitem><para>Like "in-memory", but behaves slightly different when migrating -the profile from disk to in-memory.</para></listitem> + <term><literal>0x8 (in-memory-only)</literal>:</term> + <listitem><para>Like "in-memory", but behaves slightly different when migrating + the profile from disk to in-memory.</para></listitem> </varlistentry> <varlistentry> -<term><literal>0x10 (volatile)</literal>:</term> + <term><literal>0x10 (volatile)</literal>:</term> </varlistentry> <varlistentry> -<term><literal>0x20 (block-autoconnect)</literal>:</term> -<listitem><para>Blocks auto-connect on the updated profile</para></listitem> + <term><literal>0x20 (block-autoconnect)</literal>:</term> + <listitem><para>Blocks auto-connect on the updated profile</para></listitem> </varlistentry> <varlistentry> -<term><literal>0x40 (no-reapply)</literal>:</term> -<listitem><para>Prevents "connection.zone" and "connection.metered" properties -to take effect on currently active devices.</para></listitem> + <term><literal>0x40 (no-reapply)</literal>:</term> + <listitem><para>Prevents "connection.zone" and "connection.metered" properties + to take effect on currently active devices.</para></listitem> </varlistentry> </variablelist> </para><para> @@ -233,14 +233,14 @@ The <constant>args</constant> argument accepts the following keys: </para><para> <variablelist> <varlistentry> -<term><literal>plugin</literal>:</term> -<listitem><para>The settings plugin the connection will be migrated to -such as "keyfile" or "ifcfg-rh".</para> -<para role="since">Since 1.38</para></listitem> -<term><literal>version-id</literal>:</term> -<listitem><para>If specified, the update request is rejected if the -profile's version-id does not match. This can be used to catch concurrent -modifications. Zero means no version check.</para><para role="since">Since 1.44</para></listitem> + <term><literal>plugin</literal>:</term> + <listitem><para>The settings plugin the connection will be migrated to + such as "keyfile" or "ifcfg-rh".</para> + <para role="since">Since 1.38</para></listitem> + <term><literal>version-id</literal>:</term> + <listitem><para>If specified, the update request is rejected if the + profile's version-id does not match. This can be used to catch concurrent + modifications. Zero means no version check.</para><para role="since">Since 1.44</para></listitem> </varlistentry> </variablelist> </para><para> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml index 74ad0259..918bbc53 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml @@ -176,18 +176,18 @@ logically or-ed together: </para><para> <variablelist> <varlistentry> -<term><literal>0x1 (to-disk)</literal>:</term> -<listitem><para>The connection is persisted to disk.</para></listitem> + <term><literal>0x1 (to-disk)</literal>:</term> + <listitem><para>The connection is persisted to disk.</para></listitem> </varlistentry> <varlistentry> -<term><literal>0x2 (in-memory)</literal>:</term> -<listitem><para>The change is only made in memory (without touching an eventual -profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory -only, if the connection is already in memory only.</para></listitem> + <term><literal>0x2 (in-memory)</literal>:</term> + <listitem><para>The change is only made in memory (without touching an eventual + profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory + only, if the connection is already in memory only.</para></listitem> </varlistentry> <varlistentry> -<term><literal>0x20 (block-autoconnect)</literal>:</term> -<listitem><para>Blocks auto-connect on the new profile</para></listitem> + <term><literal>0x20 (block-autoconnect)</literal>:</term> + <listitem><para>Blocks auto-connect on the new profile</para></listitem> </varlistentry> </variablelist> </para><para> @@ -195,10 +195,10 @@ The <constant>args</constant> argument accepts the following keys: </para><para> <variablelist> <varlistentry> -<term><literal>plugin</literal>:</term> -<listitem><para>The settings plugin the newly added connection will -use, such as "keyfile" or "ifcfg-rh".</para> -<para role="since">Since 1.38</para></listitem> + <term><literal>plugin</literal>:</term> + <listitem><para>The settings plugin the newly added connection will + use, such as "keyfile" or "ifcfg-rh".</para> + <para role="since">Since 1.38</para></listitem> </varlistentry> </variablelist> </para><para> diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.xml b/docs/api/dbus-org.freedesktop.NetworkManager.xml index 3808e98c..c4832249 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.xml @@ -309,8 +309,8 @@ Cannot be used for VPN connections at this time. This method extends AddAndActivateConnection to allow passing further parameters. At this time the following options are supported: </para><para> -* persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected. -* bind-activation: Bind the activation lifetime. Set to "dbus-client" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally. + * persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected. + * bind-activation: Bind the activation lifetime. Set to "dbus-client" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally. </para> <variablelist role="params"> <varlistentry> diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index c8d8792f..67aa539e 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -893,6 +893,10 @@ ipv6.ip6-privacy=0 <td></td> </tr> <tr> +<td><p><span class="term"><code class="varname">ipv4.dhcp-dscp</code></span></p></td> +<td></td> +</tr> +<tr> <td><p><span class="term"><code class="varname">ipv4.dhcp-iaid</code></span></p></td> <td><p>If left unspecified, it defaults to "ifname".</p></td> </tr> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html index c66f8f9b..055e6313 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html @@ -55,9 +55,8 @@ HwAddress readable s </pre> <p> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</p> +<p> </p> </div> <hr> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html index 050a8d2d..06c60852 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html @@ -55,9 +55,8 @@ HwAddress readable s </pre> <p> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</p> +<p> </p> </div> <hr> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html index bfa69828..681f4f9a 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html @@ -53,9 +53,8 @@ HwAddress readable s </pre> <p> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</p> +<p> </p> </div> </div> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html index bc8f07b5..898e7e3d 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html @@ -54,9 +54,8 @@ HwAddress readable s </pre> <p> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</p> +<p> </p> </div> <hr> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Hsr.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Hsr.html index 6475f3a1..aa461cf1 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Hsr.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Hsr.html @@ -57,9 +57,9 @@ Port1 readable o </pre> <p> -The device's port1 device. </p> -<p class="since">Since 1.46</p> +<p> +</p> </div> <hr> <div class="refsect2"> @@ -68,9 +68,9 @@ The device's port1 device. Port2 readable o </pre> <p> -The device's port2 device. </p> -<p class="since">Since 1.46</p> +<p> +</p> </div> <hr> <div class="refsect2"> @@ -79,9 +79,9 @@ The device's port2 device. SupervisionAddress readable s </pre> <p> -The supervision MAC address. </p> -<p class="since">Since 1.46</p> +<p> +</p> </div> <hr> <div class="refsect2"> @@ -90,9 +90,9 @@ The supervision MAC address. MulticastSpec readable y </pre> <p> -The last byte of the supervision address. </p> -<p class="since">Since 1.46</p> +<p> +</p> </div> <hr> <div class="refsect2"> @@ -101,9 +101,9 @@ The last byte of the supervision address. Prp readable b </pre> <p> -Whether the PRP protocol is used or not. </p> -<p class="since">Since 1.46</p> +<p> +</p> </div> </div> </div> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html index 03a3be82..437ea92f 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html @@ -54,9 +54,8 @@ HwAddress readable s </pre> <p> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</p> +<p> </p> </div> <hr> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html index 56feac4c..9bdd33b4 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html @@ -56,9 +56,8 @@ HwAddress readable s </pre> <p> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</p> +<p> </p> </div> <hr> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html index 3ab9992c..b54c2da2 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html @@ -122,9 +122,8 @@ device multiple times, for multiple send/receive queues. HwAddress readable s </pre> <p> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</p> +<p> </p> </div> </div> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html index 835faa63..7259850f 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html @@ -56,9 +56,8 @@ HwAddress readable s </pre> <p> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</p> +<p> </p> </div> <hr> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html index 7b1b46a7..127de583 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html @@ -80,9 +80,8 @@ to this host). HwAddress readable s </pre> <p> -Hardware address of the device. -n -DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +</p> +<p> </p> </div> <hr> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html index fd20e593..b35a64f3 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html @@ -256,18 +256,18 @@ logically or-ed together: <tr> <td><p><span class="term"><code class="literal">0x2 (in-memory)</code>:</span></p></td> <td><p>The change is only made in memory (without touching an eventual -profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory -only, if the connection is already in memory only.</p></td> + profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory + only, if the connection is already in memory only.</p></td> </tr> <tr> <td><p><span class="term"><code class="literal">0x4 (in-memory-detached)</code>:</span></p></td> <td><p>Like "in-memory", but behaves slightly different when migrating -the profile from disk to in-memory.</p></td> + the profile from disk to in-memory.</p></td> </tr> <tr> <td><p><span class="term"><code class="literal">0x8 (in-memory-only)</code>:</span></p></td> <td><p>Like "in-memory", but behaves slightly different when migrating -the profile from disk to in-memory.</p></td> + the profile from disk to in-memory.</p></td> </tr> <tr> <td><p><span class="term"><code class="literal">0x10 (volatile)</code>:</span></p></td> @@ -280,7 +280,7 @@ the profile from disk to in-memory.</p></td> <tr> <td><p><span class="term"><code class="literal">0x40 (no-reapply)</code>:</span></p></td> <td><p>Prevents "connection.zone" and "connection.metered" properties -to take effect on currently active devices.</p></td> + to take effect on currently active devices.</p></td> </tr> </tbody> </table></div> @@ -300,11 +300,11 @@ The <code class="constant">args</code> argument accepts the following keys: <td><p><span class="term"><code class="literal">plugin</code>:, </span><span class="term"><code class="literal">version-id</code>:</span></p></td> <td> <p>The settings plugin the connection will be migrated to -such as "keyfile" or "ifcfg-rh".</p> + such as "keyfile" or "ifcfg-rh".</p> <p class="since">Since 1.38</p> <p>If specified, the update request is rejected if the -profile's version-id does not match. This can be used to catch concurrent -modifications. Zero means no version check.</p> + profile's version-id does not match. This can be used to catch concurrent + modifications. Zero means no version check.</p> <p class="since">Since 1.44</p> </td> </tr></tbody> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html index 4facbb7f..604b149e 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html @@ -240,8 +240,8 @@ logically or-ed together: <tr> <td><p><span class="term"><code class="literal">0x2 (in-memory)</code>:</span></p></td> <td><p>The change is only made in memory (without touching an eventual -profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory -only, if the connection is already in memory only.</p></td> + profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory + only, if the connection is already in memory only.</p></td> </tr> <tr> <td><p><span class="term"><code class="literal">0x20 (block-autoconnect)</code>:</span></p></td> @@ -265,7 +265,7 @@ The <code class="constant">args</code> argument accepts the following keys: <td><p><span class="term"><code class="literal">plugin</code>:</span></p></td> <td> <p>The settings plugin the newly added connection will -use, such as "keyfile" or "ifcfg-rh".</p> + use, such as "keyfile" or "ifcfg-rh".</p> <p class="since">Since 1.38</p> </td> </tr></tbody> diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html index 57560d60..38990a4c 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html @@ -371,8 +371,8 @@ This method extends AddAndActivateConnection to allow passing further parameters. At this time the following options are supported: </p> <p> -* persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected. -* bind-activation: Bind the activation lifetime. Set to "dbus-client" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally. + * persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected. + * bind-activation: Bind the activation lifetime. Set to "dbus-client" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally. </p> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 8a02ac76..e015aaca 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -16,7 +16,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for NetworkManager 1.45.90 + for NetworkManager 1.45.91 The latest version of this documentation can be found on-line at <a class="ulink" href="https://networkmanager.dev/docs/api/latest/" target="_top">https://networkmanager.dev/docs/api/latest/</a>. diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 48f7980f..04d94335 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -615,11 +615,13 @@ </dt> <dt id="ientry-id-1.3.3.2.2.2.1.1.2.2.1.1.1">autoconnect, <a class="indexterm" href="settings-connection.html">connection</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.3.1.1.1">autoconnect-priority, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.3.1.1.1">autoconnect-ports, <a class="indexterm" href="settings-connection.html">connection</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.4.1.1.1">autoconnect-retries, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.4.1.1.1">autoconnect-priority, <a class="indexterm" href="settings-connection.html">connection</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.5.1.1.1">autoconnect-slaves, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.5.1.1.1">autoconnect-retries, <a class="indexterm" href="settings-connection.html">connection</a> +</dt> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.6.1.1.1">autoconnect-slaves, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.33.2.2.1.1.2.1.1.1.1">autoprobe-drivers, <a class="indexterm" href="settings-sriov.html">sriov</a> </dt> @@ -679,7 +681,7 @@ </dt> <dt id="ientry-id-1.3.3.35.2.2.1.1.2.1.1.1.1">config, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-team-port.html">team-port</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.6.1.1.1">controller, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.7.1.1.1">controller, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.29.2.2.1.1.2.2.1.1.1">crtscts, <a class="indexterm" href="settings-ppp.html">ppp</a> </dt> @@ -758,25 +760,27 @@ </dt> <dt id="ientry-id-1.3.3.17.2.2.1.1.2.5.1.1.1">dhcp-client-id, <a class="indexterm" href="settings-ipv4.html">ipv4</a> </dt> -<dt id="ientry-id-1.3.3.18.2.2.1.1.2.6.1.1.1">dhcp-duid, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.6.1.1.1">dhcp-dscp, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +</dt> +<dt id="ientry-id-1.3.3.18.2.2.1.1.2.7.1.1.1">dhcp-duid, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.6.1.1.1">dhcp-fqdn, <a class="indexterm" href="settings-ipv4.html">ipv4</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.7.1.1.1">dhcp-fqdn, <a class="indexterm" href="settings-ipv4.html">ipv4</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.7.1.1.1">dhcp-hostname, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.8.1.1.1">dhcp-hostname, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.8.1.1.1">dhcp-hostname-flags, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.9.1.1.1">dhcp-hostname-flags, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.9.1.1.1">dhcp-iaid, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.10.1.1.1">dhcp-iaid, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.18.2.2.1.1.2.10.1.1.1">dhcp-pd-hint, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.18.2.2.1.1.2.11.1.1.1">dhcp-pd-hint, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.10.1.1.1">dhcp-reject-servers, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.11.1.1.1">dhcp-reject-servers, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.11.1.1.1">dhcp-send-hostname, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.12.1.1.1">dhcp-send-hostname, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.12.1.1.1">dhcp-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.13.1.1.1">dhcp-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.13.1.1.1">dhcp-vendor-class-identifier, <a class="indexterm" href="settings-ipv4.html">ipv4</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.14.1.1.1">dhcp-vendor-class-identifier, <a class="indexterm" href="settings-ipv4.html">ipv4</a> </dt> <dt id="ientry-id-1.4.12.2.1.2">org.freedesktop.NetworkManager.DHCP4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP4Config.html#gdbus-interface-org-freedesktop-NetworkManager-DHCP4Config.top_of_page">org.freedesktop.NetworkManager.DHCP4Config</a> </dt> @@ -786,17 +790,17 @@ </dt> <dt id="ientry-id-1.4.13.2.5.2.2">org.freedesktop.NetworkManager.DHCP6Config:Options, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP6Config.html#gdbus-property-org-freedesktop-NetworkManager-DHCP6Config.Options">The "Options" property</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.14.1.1.1">dns, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.15.1.1.1">dns, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.15.1.1.1">dns-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.16.1.1.1">dns-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.16.1.1.1">dns-options, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.17.1.1.1">dns-options, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.7.1.1.1">dns-over-tls, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.8.1.1.1">dns-over-tls, <a class="indexterm" href="settings-connection.html">connection</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.17.1.1.1">dns-priority, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.18.1.1.1">dns-priority, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.18.1.1.1">dns-search, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.19.1.1.1">dns-search, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> <dt id="ientry-id-1.3.3.4.2.2.1.1.2.11.1.1.1">domain-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a> </dt> @@ -847,9 +851,9 @@ <div class="indexdiv"> <h3>G</h3> <dl> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.19.1.1.1">gateway, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.20.1.1.1">gateway, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.8.1.1.1">gateway-ping-timeout, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.9.1.1.1">gateway-ping-timeout, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.45.2.2.1.1.2.6.1.1.1">generate-mac-address-mask, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a> </dt> @@ -883,13 +887,13 @@ <div class="indexdiv"> <h3>I</h3> <dl> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.9.1.1.1">id, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.10.1.1.1">id, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a> </dt> <dt id="ientry-id-1.3.3.4.2.2.1.1.2.14.1.1.1">identity, <a class="indexterm" href="settings-802-1x.html">802-1x</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.20.1.1.1">ignore-auto-dns, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.21.1.1.1">ignore-auto-dns, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.21.1.1.1">ignore-auto-routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.22.1.1.1">ignore-auto-routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> <dt id="ientry-id-1.3.3.39.2.2.1.1.2.4.1.1.1">ingress-priority-map, <a class="indexterm" href="settings-vlan.html">vlan</a> </dt> @@ -899,13 +903,13 @@ </dt> <dt id="ientry-id-1.3.3.19.2.2.1.1.2.5.1.1.1">input-key, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.10.1.1.1">interface-name, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-bond.html">bond</a>, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-match.html">match</a>, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-vlan.html">vlan</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.11.1.1.1">interface-name, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-bond.html">bond</a>, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-match.html">match</a>, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-vlan.html">vlan</a> </dt> <dt id="ientry-id-1.3.3.46.2.2.1.1.2.2.1.1.1">ip4-auto-default-route, <a class="indexterm" href="settings-wireguard.html">wireguard</a> </dt> <dt id="ientry-id-1.3.3.46.2.2.1.1.2.3.1.1.1">ip6-auto-default-route, <a class="indexterm" href="settings-wireguard.html">wireguard</a> </dt> -<dt id="ientry-id-1.3.3.18.2.2.1.1.2.22.1.1.1">ip6-privacy, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.18.2.2.1.1.2.23.1.1.1">ip6-privacy, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> </dl> </div> @@ -945,15 +949,15 @@ </dt> <dt id="ientry-id-1.3.3.42.2.2.1.1.2.7.1.1.1">limit, <a class="indexterm" href="settings-vxlan.html">vxlan</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.22.1.1.1">link-local, <a class="indexterm" href="settings-ipv4.html">ipv4</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.23.1.1.1">link-local, <a class="indexterm" href="settings-ipv4.html">ipv4</a> </dt> <dt id="ientry-id-1.3.3.35.2.2.1.1.2.3.1.1.1">link-watchers, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-team-port.html">team-port</a> </dt> <dt id="ientry-id-1.3.3.46.2.2.1.1.2.4.1.1.1">listen-port, <a class="indexterm" href="settings-wireguard.html">wireguard</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.11.1.1.1">lldp, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.12.1.1.1">lldp, <a class="indexterm" href="settings-connection.html">connection</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.12.1.1.1">llmnr, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.13.1.1.1">llmnr, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.19.2.2.1.1.2.6.1.1.1">local, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a> </dt> @@ -1068,11 +1072,11 @@ </dt> <dt id="ientry-id-1.4.3.2.9.9.2">org.freedesktop.NetworkManager:WwanHardwareEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WwanHardwareEnabled">The "WwanHardwareEnabled" property</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.13.1.1.1">master, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.14.1.1.1">master, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.8.2.2.1.1.2.8.1.1.1">max-age, <a class="indexterm" href="settings-bridge.html">bridge</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.23.1.1.1">may-fail, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.24.1.1.1">may-fail, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> <dt id="ientry-id-1.3.3.35.2.2.1.1.2.4.1.1.1">mcast-rejoin-count, <a class="indexterm" href="settings-team.html">team</a> </dt> @@ -1080,11 +1084,11 @@ </dt> <dt id="ientry-id-1.3.3.24.2.2.1.1.2.3.1.1.1">mcast-snooping-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.14.1.1.1">mdns, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.15.1.1.1">mdns, <a class="indexterm" href="settings-connection.html">connection</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.15.1.1.1">metered, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.16.1.1.1">metered, <a class="indexterm" href="settings-connection.html">connection</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.24.1.1.1">method, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>, <a class="indexterm" href="settings-proxy.html">proxy</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.25.1.1.1">method, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>, <a class="indexterm" href="settings-proxy.html">proxy</a> </dt> <dt id="ientry-id-1.3.3.20.2.2.1.1.2.2.1.1.1">mka-cak, <a class="indexterm" href="settings-macsec.html">macsec</a> </dt> @@ -1096,15 +1100,15 @@ </dt> <dt id="ientry-id-1.3.3.29.2.2.1.1.2.5.1.1.1">mppe-stateful, <a class="indexterm" href="settings-ppp.html">ppp</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.16.1.1.1">mptcp-flags, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.17.1.1.1">mptcp-flags, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.29.2.2.1.1.2.6.1.1.1">mru, <a class="indexterm" href="settings-ppp.html">ppp</a> </dt> <dt id="ientry-id-1.3.3.10.2.2.1.1.2.1.1.1.1">mtu, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>, <a class="indexterm" href="settings-infiniband.html">infiniband</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-ppp.html">ppp</a>, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-wireguard.html">wireguard</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>, <a class="indexterm" href="settings-loopback.html">loopback</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.17.1.1.1">mud-url, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.18.1.1.1">mud-url, <a class="indexterm" href="settings-connection.html">connection</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.18.1.1.1">multi-connect, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.19.1.1.1">multi-connect, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.37.2.2.1.1.2.3.1.1.1">multi-queue, <a class="indexterm" href="settings-tun.html">tun</a> </dt> @@ -1151,7 +1155,7 @@ </dt> <dt id="ientry-id-1.3.3.44.2.2.1.1.2.2.1.1.1">network-name, <a class="indexterm" href="settings-wimax.html">wimax</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.25.1.1.1">never-default, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.26.1.1.1">never-default, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> <dt id="ientry-id-1.4.17.2.10.2">NM80211ApFlags, <a class="indexterm" href="nm-dbus-types.html#NM80211ApFlags">enum NM80211ApFlags</a> </dt> @@ -1307,7 +1311,7 @@ </dt> <dt id="ientry-id-1.3.3.46.2.2.1.1.2.7.1.1.1">peers, <a class="indexterm" href="settings-wireguard.html">wireguard</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.19.1.1.1">permissions, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.20.1.1.1">permissions, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.40.2.2.1.1.2.2.1.1.1">persistent, <a class="indexterm" href="settings-vpn.html">vpn</a> </dt> @@ -1361,7 +1365,7 @@ </dt> <dt id="ientry-id-1.3.3.20.2.2.1.1.2.7.1.1.1">port, <a class="indexterm" href="settings-macsec.html">macsec</a>, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.20.1.1.1">port-type, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.21.1.1.1">port-type, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.52.2.2.1.1.2.2.1.1.1">port1, <a class="indexterm" href="settings-hsr.html">hsr</a> </dt> @@ -1437,11 +1441,11 @@ <div class="indexdiv"> <h3>R</h3> <dl> -<dt id="ientry-id-1.3.3.18.2.2.1.1.2.27.1.1.1">ra-timeout, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.18.2.2.1.1.2.28.1.1.1">ra-timeout, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> <dt id="ientry-id-1.3.3.47.2.2.1.1.2.15.1.1.1">rate, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.21.1.1.1">read-only, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.22.1.1.1">read-only, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.29.2.2.1.1.2.12.1.1.1">refuse-chap, <a class="indexterm" href="settings-ppp.html">ppp</a> </dt> @@ -1455,23 +1459,23 @@ </dt> <dt id="ientry-id-1.3.3.19.2.2.1.1.2.12.1.1.1">remote, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.26.1.1.1">replace-local-rule, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.27.1.1.1">replace-local-rule, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> <dt id="ientry-id-1.3.3.29.2.2.1.1.2.17.1.1.1">require-mppe, <a class="indexterm" href="settings-ppp.html">ppp</a> </dt> <dt id="ientry-id-1.3.3.29.2.2.1.1.2.18.1.1.1">require-mppe-128, <a class="indexterm" href="settings-ppp.html">ppp</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.27.1.1.1">required-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.28.1.1.1">required-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.28.1.1.1">route-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.29.1.1.1">route-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.29.1.1.1">route-metric, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.30.1.1.1">route-metric, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.30.1.1.1">route-table, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.31.1.1.1">route-table, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.31.1.1.1">routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.32.1.1.1">routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> -<dt id="ientry-id-1.3.3.17.2.2.1.1.2.32.1.1.1">routing-rules, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.17.2.2.1.1.2.33.1.1.1">routing-rules, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> <dt id="ientry-id-1.3.3.42.2.2.1.1.2.12.1.1.1">rsc, <a class="indexterm" href="settings-vxlan.html">vxlan</a> </dt> @@ -1508,7 +1512,7 @@ </dt> <dt id="ientry-id-1.3.3.45.2.2.1.1.2.13.1.1.1">s390-subchannels, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.22.1.1.1">secondaries, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.23.1.1.1">secondaries, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.40.2.2.1.1.2.3.1.1.1">secrets, <a class="indexterm" href="settings-vpn.html">vpn</a> </dt> @@ -1530,7 +1534,7 @@ </dt> <dt id="ientry-id-1.3.3.15.2.2.1.1.2.15.1.1.1">sim-operator-id, <a class="indexterm" href="settings-gsm.html">gsm</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.23.1.1.1">slave-type, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.24.1.1.1">slave-type, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.42.2.2.1.1.2.13.1.1.1">source-port-max, <a class="indexterm" href="settings-vxlan.html">vxlan</a> </dt> @@ -1540,7 +1544,7 @@ </dt> <dt id="ientry-id-1.3.3.23.2.2.1.1.2.3.1.1.1">ssid, <a class="indexterm" href="settings-802-11-olpc-mesh.html">802-11-olpc-mesh</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.24.1.1.1">stable-id, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.25.1.1.1">stable-id, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.36.2.2.1.1.2.7.1.1.1">sticky, <a class="indexterm" href="settings-team-port.html">team-port</a> </dt> @@ -1569,9 +1573,9 @@ </dt> <dt id="ientry-id-1.3.3.40.2.2.1.1.2.5.1.1.1">timeout, <a class="indexterm" href="settings-vpn.html">vpn</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.25.1.1.1">timestamp, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.26.1.1.1">timestamp, <a class="indexterm" href="settings-connection.html">connection</a> </dt> -<dt id="ientry-id-1.3.3.18.2.2.1.1.2.35.1.1.1">token, <a class="indexterm" href="settings-ipv6.html">ipv6</a> +<dt id="ientry-id-1.3.3.18.2.2.1.1.2.36.1.1.1">token, <a class="indexterm" href="settings-ipv6.html">ipv6</a> </dt> <dt id="ientry-id-1.3.3.19.2.2.1.1.2.13.1.1.1">tos, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a> </dt> @@ -1587,7 +1591,7 @@ </dt> <dt id="ientry-id-1.3.3.53.2.2.1.1.2.4.1.1.1">tx-queue-length, <a class="indexterm" href="settings-link.html">link</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.26.1.1.1">type, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-bluetooth.html">bluetooth</a>, <a class="indexterm" href="settings-ovs-interface.html">ovs-interface</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.27.1.1.1">type, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-bluetooth.html">bluetooth</a>, <a class="indexterm" href="settings-ovs-interface.html">ovs-interface</a> </dt> </dl> </div> @@ -1598,7 +1602,7 @@ </dt> <dt id="ientry-id-1.3.3.5.2.2.1.1.2.5.1.1.1">username, <a class="indexterm" href="settings-adsl.html">adsl</a>, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>, <a class="indexterm" href="settings-pppoe.html">pppoe</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.27.1.1.1">uuid, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.28.1.1.1">uuid, <a class="indexterm" href="settings-connection.html">connection</a> </dt> </dl> </div> @@ -1676,9 +1680,9 @@ <div class="indexdiv"> <h3>W</h3> <dl> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.28.1.1.1">wait-activation-delay, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.29.1.1.1">wait-activation-delay, <a class="indexterm" href="settings-connection.html">connection</a> </dt> -<dt id="ientry-id-1.3.3.2.2.2.1.1.2.29.1.1.1">wait-device-timeout, <a class="indexterm" href="settings-connection.html">connection</a> +<dt id="ientry-id-1.3.3.2.2.2.1.1.2.30.1.1.1">wait-device-timeout, <a class="indexterm" href="settings-connection.html">connection</a> </dt> <dt id="ientry-id-1.3.3.45.2.2.1.1.2.15.1.1.1">wake-on-lan, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a> </dt> @@ -1730,7 +1734,7 @@ </div> <div class="indexdiv"> <h3>Z</h3> -<dl><dt id="ientry-id-1.3.3.2.2.2.1.1.2.30.1.1.1">zone, <a class="indexterm" href="settings-connection.html">connection</a> +<dl><dt id="ientry-id-1.3.3.2.2.2.1.1.2.31.1.1.1">zone, <a class="indexterm" href="settings-connection.html">connection</a> </dt></dl> </div> </div> diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html index c494bce2..c59dfbb2 100644 --- a/docs/api/html/nm-dbus-types.html +++ b/docs/api/html/nm-dbus-types.html @@ -3136,7 +3136,7 @@ <hr> <div class="refsect2"> <a name="NMMetered"></a><h3>enum NMMetered</h3> -<p>The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the NMDevice at a given moment.</p> +<p>The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the <a href="/usr/share/gtk-doc/html/libnm/NMDevice.html#NMDevice-struct">NMDevice</a> at a given moment.</p> <p>For the connection profile only NM_METERED_UNKNOWN, NM_METERED_NO and NM_METERED_YES are allowed.</p> <p>The device's metered state at runtime is determined by the profile which is currently active. If the profile explicitly specifies NM_METERED_NO or NM_METERED_YES, then the device's metered state is as such. If the connection profile leaves it undecided at NM_METERED_UNKNOWN (the default), then NetworkManager tries to guess the metered state, for example based on the device type or on DHCP options (like Android devices exposing a "ANDROID_METERED" DHCP vendor option). This then leads to either NM_METERED_GUESS_NO or NM_METERED_GUESS_YES.</p> <p>Most applications probably should treat the runtime state NM_METERED_GUESS_YES like NM_METERED_YES, and all other states as not metered.</p> diff --git a/docs/api/html/nm-initrd-generator.html b/docs/api/html/nm-initrd-generator.html index eeba0c35..9c918049 100644 --- a/docs/api/html/nm-initrd-generator.html +++ b/docs/api/html/nm-initrd-generator.html @@ -111,6 +111,7 @@ <tr><td><code class="option">rd.net.timeout.dhcp</code></td></tr> <tr><td><code class="option">rd.net.dhcp.retry</code></td></tr> <tr><td><code class="option">rd.net.dhcp.vendor-class</code></td></tr> +<tr><td><code class="option">rd.net.dhcp.dscp</code></td></tr> <tr><td><code class="option">rd.net.timeout.carrier</code></td></tr> <tr><td><code class="option">rd.znet</code></td></tr> <tr><td><code class="option">rd.znet_ifname</code></td></tr> @@ -161,6 +162,11 @@ boolean values (true and false / on or off / 0 or 1), and <em class="replaceable"><code>SPEED</code></em> accepts positive integer values. </p></li> +<li class="listitem"><p>NetworkManager supports the + <code class="option">rd.net.dhcp.dscp</code>={<em class="replaceable"><code>CS0</code></em>|<em class="replaceable"><code>CS4</code></em>|<em class="replaceable"><code>CS6</code></em>} + kernel command line option to set a specific DSCP (TOS) value + in the IP header of DHCP messages. + </p></li> </ul></div> </div> <div class="refsect1"> diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html index 145b2ad0..9f5c9842 100644 --- a/docs/api/html/nm-settings-dbus.html +++ b/docs/api/html/nm-settings-dbus.html @@ -136,6 +136,13 @@ Depending on "connection.multi-connect", a profile can (auto)connect only once a </tr> <tr> <td align="left"> +<a name="nm-settings-dbus.property.connection.autoconnect-ports"></a>autoconnect-ports</td> +<td align="left">NMTernary (int32)</td> +<td align="left"> </td> +<td>Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-ports is read to determine the real value. If it is default as well, this fallbacks to 0.</td> +</tr> +<tr> +<td align="left"> <a name="nm-settings-dbus.property.connection.autoconnect-priority"></a>autoconnect-priority</td> <td align="left">int32</td> <td align="left">0</td> @@ -1740,6 +1747,15 @@ If unset, a globally configured default from NetworkManager.conf is used. If sti </tr> <tr> <td align="left"> +<a name="nm-settings-dbus.property.ipv4.dhcp-dscp"></a>dhcp-dscp</td> +<td align="left">string</td> +<td align="left"> </td> +<td>Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0". Allowed values are: "CS0", "CS4" and "CS6". + +The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin.</td> +</tr> +<tr> +<td align="left"> <a name="nm-settings-dbus.property.ipv4.dhcp-fqdn"></a>dhcp-fqdn</td> <td align="left">string</td> <td align="left"> </td> @@ -2073,6 +2089,15 @@ A zero value means that no duplicate address detection is performed, -1 means th </tr> <tr> <td align="left"> +<a name="nm-settings-dbus.property.ipv6.dhcp-dscp"></a>dhcp-dscp</td> +<td align="left">string</td> +<td align="left"> </td> +<td>Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0". Allowed values are: "CS0", "CS4" and "CS6". + +The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin.</td> +</tr> +<tr> +<td align="left"> <a name="nm-settings-dbus.property.ipv6.dhcp-duid"></a>dhcp-duid</td> <td align="left">string</td> <td align="left"> </td> diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html index 4c1c8914..84406d4a 100644 --- a/docs/api/html/nm-settings-nmcli.html +++ b/docs/api/html/nm-settings-nmcli.html @@ -106,6 +106,16 @@ </td> </tr> <tr> +<td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.connection.autoconnect-ports"></a>connection.autoconnect-ports</code></span></p></td> +<td> +<p>Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-ports is read to determine the real value. If it is default as well, this fallbacks to 0.</p> +<p> + Format: choice (NMTernary)</p> +<p> + Valid values: default (-1), false (0), true (1)</p> +</td> +</tr> +<tr> <td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.connection.autoconnect-priority"></a>connection.autoconnect-priority</code></span></p></td> <td> <p>The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.</p> @@ -2782,6 +2792,17 @@ </td> </tr> <tr> +<td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.ipv4.dhcp-dscp"></a>ipv4.dhcp-dscp</code></span></p></td> +<td> +<p>Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0". Allowed values are: "CS0", "CS4" and "CS6".</p> +<p>The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin.</p> +<p> + Format: string</p> +<p> + Valid values: CS0, CS4, CS6</p> +</td> +</tr> +<tr> <td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.ipv4.dhcp-fqdn"></a>ipv4.dhcp-fqdn</code></span></p></td> <td> <p>If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.</p> diff --git a/docs/api/html/settings-connection.html b/docs/api/html/settings-connection.html index d451fb79..f450a596 100644 --- a/docs/api/html/settings-connection.html +++ b/docs/api/html/settings-connection.html @@ -76,6 +76,12 @@ If multiple profiles are ready to autoconnect on the same device, the one with t Depending on "connection.multi-connect", a profile can (auto)connect only once at a time or multiple times.</td> </tr> <tr> +<td><pre class="screen">autoconnect-ports</pre></td> +<td><pre class="screen">NMTernary (int32)</pre></td> +<td><pre class="screen"></pre></td> +<td>Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-ports is read to determine the real value. If it is default as well, this fallbacks to 0.</td> +</tr> +<tr> <td><pre class="screen">autoconnect-priority</pre></td> <td><pre class="screen">int32</pre></td> <td><pre class="screen">0</pre></td> diff --git a/docs/api/html/settings-ipv4.html b/docs/api/html/settings-ipv4.html index 74379ebf..587db9c2 100644 --- a/docs/api/html/settings-ipv4.html +++ b/docs/api/html/settings-ipv4.html @@ -101,6 +101,14 @@ The special value "none" prevents any client identifier from being sent. Note th If unset, a globally configured default from NetworkManager.conf is used. If still unset, the default depends on the DHCP plugin. The internal dhcp client will default to "mac" and the dhclient plugin will try to use one from its config file if present, or won't sent any client-id otherwise.</td> </tr> <tr> +<td><pre class="screen">dhcp-dscp</pre></td> +<td><pre class="screen">string</pre></td> +<td><pre class="screen"></pre></td> +<td>Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0". Allowed values are: "CS0", "CS4" and "CS6". + +The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin.</td> +</tr> +<tr> <td><pre class="screen">dhcp-fqdn</pre></td> <td><pre class="screen">string</pre></td> <td><pre class="screen"></pre></td> diff --git a/docs/api/html/settings-ipv6.html b/docs/api/html/settings-ipv6.html index 70d0f5ed..54b78c27 100644 --- a/docs/api/html/settings-ipv6.html +++ b/docs/api/html/settings-ipv6.html @@ -101,6 +101,14 @@ For other connection types, adding such an automatic route is currently not supp A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms). A value greater than zero is a timeout in milliseconds. Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.</td> </tr> <tr> +<td><pre class="screen">dhcp-dscp</pre></td> +<td><pre class="screen">string</pre></td> +<td><pre class="screen"></pre></td> +<td>Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0". Allowed values are: "CS0", "CS4" and "CS6". + +The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin.</td> +</tr> +<tr> <td><pre class="screen">dhcp-duid</pre></td> <td><pre class="screen">string</pre></td> <td><pre class="screen"></pre></td> diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml index 111f90ae..bdff11c1 100644 --- a/docs/api/settings-spec.xml +++ b/docs/api/settings-spec.xml @@ -12,7 +12,7 @@ Note that autoconnect is not implemented for VPN profiles. See "secondaries" as If multiple profiles are ready to autoconnect on the same device, the one with the better "connection.autoconnect-priority" is chosen. If the priorities are equal, then the most recently connected profile is activated. If the profiles were not connected earlier or their "connection.timestamp" is identical, the choice is undefined. -Depending on "connection.multi-connect", a profile can (auto)connect only once at a time or multiple times.</entry></row><row><entry><screen>autoconnect-priority<indexterm zone="settings-connection"><primary sortas="autoconnect-priority">autoconnect-priority</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.</entry></row><row><entry><screen>autoconnect-retries<indexterm zone="settings-connection"><primary sortas="autoconnect-retries">autoconnect-retries</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry>The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again.</entry></row><row><entry><screen>autoconnect-slaves<indexterm zone="settings-connection"><primary sortas="autoconnect-slaves">autoconnect-slaves</primary></indexterm></screen></entry><entry><screen>NMSettingConnectionAutoconnectSlaves (int32)</screen></entry><entry><screen/></entry><entry>Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.</entry></row><row><entry><screen>controller<indexterm zone="settings-connection"><primary sortas="controller">controller</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>Interface name of the controller device or UUID of the controller connection.</entry></row><row><entry><screen>dns-over-tls<indexterm zone="settings-connection"><primary sortas="dns-over-tls">dns-over-tls</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry>Whether DNSOverTls (dns-over-tls) is enabled for the connection. DNSOverTls is a technology which uses TLS to encrypt dns traffic. +Depending on "connection.multi-connect", a profile can (auto)connect only once at a time or multiple times.</entry></row><row><entry><screen>autoconnect-ports<indexterm zone="settings-connection"><primary sortas="autoconnect-ports">autoconnect-ports</primary></indexterm></screen></entry><entry><screen>NMTernary (int32)</screen></entry><entry><screen/></entry><entry>Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-ports is read to determine the real value. If it is default as well, this fallbacks to 0.</entry></row><row><entry><screen>autoconnect-priority<indexterm zone="settings-connection"><primary sortas="autoconnect-priority">autoconnect-priority</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.</entry></row><row><entry><screen>autoconnect-retries<indexterm zone="settings-connection"><primary sortas="autoconnect-retries">autoconnect-retries</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry>The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again.</entry></row><row><entry><screen>autoconnect-slaves<indexterm zone="settings-connection"><primary sortas="autoconnect-slaves">autoconnect-slaves</primary></indexterm></screen></entry><entry><screen>NMSettingConnectionAutoconnectSlaves (int32)</screen></entry><entry><screen/></entry><entry>Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.</entry></row><row><entry><screen>controller<indexterm zone="settings-connection"><primary sortas="controller">controller</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>Interface name of the controller device or UUID of the controller connection.</entry></row><row><entry><screen>dns-over-tls<indexterm zone="settings-connection"><primary sortas="dns-over-tls">dns-over-tls</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry>Whether DNSOverTls (dns-over-tls) is enabled for the connection. DNSOverTls is a technology which uses TLS to encrypt dns traffic. The permitted values are: "yes" (2) use DNSOverTls and disabled fallback, "opportunistic" (1) use DNSOverTls but allow fallback to unencrypted resolution, "no" (0) don't ever use DNSOverTls. If unspecified "default" depends on the plugin used. Systemd-resolved uses global setting. @@ -171,7 +171,9 @@ The special value "stable" is supported to generate a type 0 client identifier b The special value "none" prevents any client identifier from being sent. Note that this is normally not recommended. -If unset, a globally configured default from NetworkManager.conf is used. If still unset, the default depends on the DHCP plugin. The internal dhcp client will default to "mac" and the dhclient plugin will try to use one from its config file if present, or won't sent any client-id otherwise.</entry></row><row><entry><screen>dhcp-fqdn<indexterm zone="settings-ipv4"><primary sortas="dhcp-fqdn">dhcp-fqdn</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.</entry></row><row><entry><screen>dhcp-hostname<indexterm zone="settings-ipv4"><primary sortas="dhcp-hostname">dhcp-hostname</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.</entry></row><row><entry><screen>dhcp-hostname-flags<indexterm zone="settings-ipv4"><primary sortas="dhcp-hostname-flags">dhcp-hostname-flags</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry>Flags for the DHCP hostname and FQDN. +If unset, a globally configured default from NetworkManager.conf is used. If still unset, the default depends on the DHCP plugin. The internal dhcp client will default to "mac" and the dhclient plugin will try to use one from its config file if present, or won't sent any client-id otherwise.</entry></row><row><entry><screen>dhcp-dscp<indexterm zone="settings-ipv4"><primary sortas="dhcp-dscp">dhcp-dscp</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0". Allowed values are: "CS0", "CS4" and "CS6". + +The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin.</entry></row><row><entry><screen>dhcp-fqdn<indexterm zone="settings-ipv4"><primary sortas="dhcp-fqdn">dhcp-fqdn</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.</entry></row><row><entry><screen>dhcp-hostname<indexterm zone="settings-ipv4"><primary sortas="dhcp-hostname">dhcp-hostname</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.</entry></row><row><entry><screen>dhcp-hostname-flags<indexterm zone="settings-ipv4"><primary sortas="dhcp-hostname-flags">dhcp-hostname-flags</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry>Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are 0x1 (fqdn-serv-update), 0x2 (fqdn-encoded) and 0x4 (fqdn-no-update). When no FQDN flag is set and 0x8 (fqdn-clear-flags) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and 0x8 (fqdn-clear-flags) is not set, the standard FQDN flags are set in the request: 0x1 (fqdn-serv-update), 0x2 (fqdn-encoded) for IPv4 and 0x1 (fqdn-serv-update) for IPv6. @@ -261,7 +263,9 @@ Array of IPv6 address structures. Each IPv6 address structure is composed of an For other connection types, adding such an automatic route is currently not supported and setting this to TRUE has no effect.</entry></row><row><entry><screen>dad-timeout<indexterm zone="settings-ipv6"><primary sortas="dad-timeout">dad-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry>Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. -A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms). A value greater than zero is a timeout in milliseconds. Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.</entry></row><row><entry><screen>dhcp-duid<indexterm zone="settings-ipv6"><primary sortas="dhcp-duid">dhcp-duid</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. +A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms). A value greater than zero is a timeout in milliseconds. Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.</entry></row><row><entry><screen>dhcp-dscp<indexterm zone="settings-ipv6"><primary sortas="dhcp-dscp">dhcp-dscp</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0". Allowed values are: "CS0", "CS4" and "CS6". + +The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin.</entry></row><row><entry><screen>dhcp-duid<indexterm zone="settings-ipv6"><primary sortas="dhcp-duid">dhcp-duid</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value "lease" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and "dhclient" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. diff --git a/docs/api/version.xml b/docs/api/version.xml index 8ce2f7ea..24a58e09 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -1.45.90 +1.45.91 diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in index 218d8393..50e41442 100644 --- a/docs/libnm/Makefile.in +++ b/docs/libnm/Makefile.in @@ -118,6 +118,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ $(top_srcdir)/m4/ax_lib_readline.m4 \ $(top_srcdir)/m4/ax_pthread.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ $(top_srcdir)/m4/compiler_options.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/git-sha-record.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ @@ -412,6 +413,8 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html index 03ea59e7..05979d17 100644 --- a/docs/libnm/html/NMSettingConnection.html +++ b/docs/libnm/html/NMSettingConnection.html @@ -232,6 +232,14 @@ </tr> <tr> <td class="function_type"> +<a class="link" href="libnm-nm-dbus-interface.html#NMTernary" title="enum NMTernary"><span class="returnvalue">NMTernary</span></a> +</td> +<td class="function_name"> +<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-autoconnect-ports" title="nm_setting_connection_get_autoconnect_ports ()">nm_setting_connection_get_autoconnect_ports</a> <span class="c_punctuation">()</span> +</td> +</tr> +<tr> +<td class="function_type"> <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> </td> <td class="function_name"> @@ -457,6 +465,10 @@ </tr> <tr> <td class="define_keyword">#define</td> +<td class="function_name"><a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-PORTS:CAPS" title="NM_SETTING_CONNECTION_AUTOCONNECT_PORTS">NM_SETTING_CONNECTION_AUTOCONNECT_PORTS</a></td> +</tr> +<tr> +<td class="define_keyword">#define</td> <td class="function_name"><a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-SECONDARIES:CAPS" title="NM_SETTING_CONNECTION_SECONDARIES">NM_SETTING_CONNECTION_SECONDARIES</a></td> </tr> <tr> @@ -1301,6 +1313,11 @@ nm_setting_connection_get_port_type (<em class="parameter"><code><a class="link" <pre class="programlisting"><a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves"><span class="returnvalue">NMSettingConnectionAutoconnectSlaves</span></a> nm_setting_connection_get_autoconnect_slaves (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre> +<div class="warning"> +<p><code class="literal">nm_setting_connection_get_autoconnect_slaves</code> has been deprecated since version 1.46. and should not be used in newly-written code.</p> +<p>Use <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-autoconnect-ports" title="nm_setting_connection_get_autoconnect_ports ()"><code class="function">nm_setting_connection_get_autoconnect_ports()</code></a> instead, this +is just an alias.</p> +</div> <p>Returns the <span class="type">“autoconnect-slaves”</span> property of the connection.</p> <div class="refsect3"> <a name="nm-setting-connection-get-autoconnect-slaves.parameters"></a><h4>Parameters</h4> @@ -1326,6 +1343,35 @@ with the connection.</p> </div> <hr> <div class="refsect2"> +<a name="nm-setting-connection-get-autoconnect-ports"></a><h3>nm_setting_connection_get_autoconnect_ports ()</h3> +<pre class="programlisting"><a class="link" href="libnm-nm-dbus-interface.html#NMTernary" title="enum NMTernary"><span class="returnvalue">NMTernary</span></a> +nm_setting_connection_get_autoconnect_ports + (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre> +<p>Returns the <span class="type">“autoconnect-ports”</span> property of the connection.</p> +<div class="refsect3"> +<a name="nm-setting-connection-get-autoconnect-ports.parameters"></a><h4>Parameters</h4> +<div class="informaltable"><table class="informaltable" width="100%" border="0"> +<colgroup> +<col width="150px" class="parameters_name"> +<col class="parameters_description"> +<col width="200px" class="parameters_annotations"> +</colgroup> +<tbody><tr> +<td class="parameter_name"><p>setting</p></td> +<td class="parameter_description"><p>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a></p></td> +<td class="parameter_annotations"> </td> +</tr></tbody> +</table></div> +</div> +<div class="refsect3"> +<a name="nm-setting-connection-get-autoconnect-ports.returns"></a><h4>Returns</h4> +<p> whether ports of the connection should be activated together +with the connection.</p> +</div> +<p class="since">Since: 1.46</p> +</div> +<hr> +<div class="refsect2"> <a name="nm-setting-connection-get-num-secondaries"></a><h3>nm_setting_connection_get_num_secondaries ()</h3> <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> nm_setting_connection_get_num_secondaries @@ -1922,6 +1968,12 @@ property.</p> </div> <hr> <div class="refsect2"> +<a name="NM-SETTING-CONNECTION-AUTOCONNECT-PORTS:CAPS"></a><h3>NM_SETTING_CONNECTION_AUTOCONNECT_PORTS</h3> +<pre class="programlisting">#define NM_SETTING_CONNECTION_AUTOCONNECT_PORTS "autoconnect-ports" +</pre> +</div> +<hr> +<div class="refsect2"> <a name="NM-SETTING-CONNECTION-SECONDARIES:CAPS"></a><h3>NM_SETTING_CONNECTION_SECONDARIES</h3> <pre class="programlisting">#define NM_SETTING_CONNECTION_SECONDARIES "secondaries" </pre> @@ -1995,6 +2047,7 @@ property.</p> <hr> <div class="refsect2"> <a name="NMSettingConnectionAutoconnectSlaves"></a><h3>enum NMSettingConnectionAutoconnectSlaves</h3> +<div class="warning"><p><code class="literal">NMSettingConnectionAutoconnectSlaves</code> has been deprecated since version 1.46 and should not be used in newly-written code.</p></div> <p><a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves"><span class="type">NMSettingConnectionAutoconnectSlaves</span></a> values indicate whether slave connections should be activated when master is activated.</p> <div class="refsect3"> diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html index 332cf285..b9eb2cb7 100644 --- a/docs/libnm/html/NMSettingIPConfig.html +++ b/docs/libnm/html/NMSettingIPConfig.html @@ -1092,6 +1092,13 @@ addressing, routing, and name service properties</p> </td> </tr> <tr> +<td class="function_type">const <span class="returnvalue">char</span> * +</td> +<td class="function_name"> +<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-dscp" title="nm_setting_ip_config_get_dhcp_dscp ()">nm_setting_ip_config_get_dhcp_dscp</a> <span class="c_punctuation">()</span> +</td> +</tr> +<tr> <td class="function_type"> <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> </td> @@ -1370,6 +1377,10 @@ addressing, routing, and name service properties</p> </tr> <tr> <td class="define_keyword">#define</td> +<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DHCP-DSCP:CAPS" title="NM_SETTING_IP_CONFIG_DHCP_DSCP">NM_SETTING_IP_CONFIG_DHCP_DSCP</a></td> +</tr> +<tr> +<td class="define_keyword">#define</td> <td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-NEVER-DEFAULT:CAPS" title="NM_SETTING_IP_CONFIG_NEVER_DEFAULT">NM_SETTING_IP_CONFIG_NEVER_DEFAULT</a></td> </tr> <tr> @@ -5780,6 +5791,34 @@ update DNS information for this machine.</p> </div> <hr> <div class="refsect2"> +<a name="nm-setting-ip-config-get-dhcp-dscp"></a><h3>nm_setting_ip_config_get_dhcp_dscp ()</h3> +<pre class="programlisting">const <span class="returnvalue">char</span> * +nm_setting_ip_config_get_dhcp_dscp (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a> *setting</code></em>);</pre> +<p>Returns the value contained in the <span class="type">“dhcp-dscp”</span> +property.</p> +<div class="refsect3"> +<a name="nm-setting-ip-config-get-dhcp-dscp.parameters"></a><h4>Parameters</h4> +<div class="informaltable"><table class="informaltable" width="100%" border="0"> +<colgroup> +<col width="150px" class="parameters_name"> +<col class="parameters_description"> +<col width="200px" class="parameters_annotations"> +</colgroup> +<tbody><tr> +<td class="parameter_name"><p>setting</p></td> +<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a></p></td> +<td class="parameter_annotations"> </td> +</tr></tbody> +</table></div> +</div> +<div class="refsect3"> +<a name="nm-setting-ip-config-get-dhcp-dscp.returns"></a><h4>Returns</h4> +<p> the value for the DSCP field for DHCP</p> +</div> +<p class="since">Since: 1.46</p> +</div> +<hr> +<div class="refsect2"> <a name="nm-setting-ip-config-get-never-default"></a><h3>nm_setting_ip_config_get_never_default ()</h3> <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_ip_config_get_never_default @@ -6482,6 +6521,12 @@ rule verfies or fail.</p> </div> <hr> <div class="refsect2"> +<a name="NM-SETTING-IP-CONFIG-DHCP-DSCP:CAPS"></a><h3>NM_SETTING_IP_CONFIG_DHCP_DSCP</h3> +<pre class="programlisting">#define NM_SETTING_IP_CONFIG_DHCP_DSCP "dhcp-dscp" +</pre> +</div> +<hr> +<div class="refsect2"> <a name="NM-SETTING-IP-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_SETTING_IP_CONFIG_NEVER_DEFAULT</h3> <pre class="programlisting">#define NM_SETTING_IP_CONFIG_NEVER_DEFAULT "never-default" </pre> diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html index bec94dd6..19fac919 100644 --- a/docs/libnm/html/api-index-full.html +++ b/docs/libnm/html/api-index-full.html @@ -6520,6 +6520,10 @@ NMSettingConnection:autoconnect, object property in NMSettingOvs </dt> <dd></dd> <dt> +NMSettingConnection:autoconnect-ports, object property in NMSettingOvs +</dt> +<dd></dd> +<dt> NMSettingConnection:autoconnect-priority, object property in NMSettingOvs </dt> <dd></dd> @@ -6948,6 +6952,10 @@ NMSettingIPConfig:dad-timeout, object property in NMSettingOvs </dt> <dd></dd> <dt> +NMSettingIPConfig:dhcp-dscp, object property in NMSettingOvs +</dt> +<dd></dd> +<dt> NMSettingIPConfig:dhcp-hostname, object property in NMSettingOvs </dt> <dd></dd> @@ -9440,6 +9448,10 @@ NMSettingWpan:short-address, object property in NMSettingOvs </dt> <dd></dd> <dt> +<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-PORTS:CAPS" title="NM_SETTING_CONNECTION_AUTOCONNECT_PORTS">NM_SETTING_CONNECTION_AUTOCONNECT_PORTS</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a> +</dt> +<dd></dd> +<dt> <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-PRIORITY:CAPS" title="NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY">NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a> </dt> <dd></dd> @@ -9484,6 +9496,10 @@ NMSettingWpan:short-address, object property in NMSettingOvs </dt> <dd></dd> <dt> +<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-autoconnect-ports" title="nm_setting_connection_get_autoconnect_ports ()">nm_setting_connection_get_autoconnect_ports</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a> +</dt> +<dd></dd> +<dt> <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-autoconnect-priority" title="nm_setting_connection_get_autoconnect_priority ()">nm_setting_connection_get_autoconnect_priority</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a> </dt> <dd></dd> @@ -10520,6 +10536,10 @@ NMSettingWpan:short-address, object property in NMSettingOvs </dt> <dd></dd> <dt> +<a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DHCP-DSCP:CAPS" title="NM_SETTING_IP_CONFIG_DHCP_DSCP">NM_SETTING_IP_CONFIG_DHCP_DSCP</a>, macro in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a> +</dt> +<dd></dd> +<dt> <a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DHCP-HOSTNAME:CAPS" title="NM_SETTING_IP_CONFIG_DHCP_HOSTNAME">NM_SETTING_IP_CONFIG_DHCP_HOSTNAME</a>, macro in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a> </dt> <dd></dd> @@ -10576,6 +10596,10 @@ NMSettingWpan:short-address, object property in NMSettingOvs </dt> <dd></dd> <dt> +<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-dscp" title="nm_setting_ip_config_get_dhcp_dscp ()">nm_setting_ip_config_get_dhcp_dscp</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a> +</dt> +<dd></dd> +<dt> <a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-hostname" title="nm_setting_ip_config_get_dhcp_hostname ()">nm_setting_ip_config_get_dhcp_hostname</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a> </dt> <dd></dd> diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index 41acbafb..5cbf323e 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libnm 1.45.90 + for libnm 1.45.91 The latest version of this documentation can be found on-line at <a class="ulink" href="https://networkmanager.dev/docs/libnm/latest/" target="_top">https://networkmanager.dev/docs/libnm/latest/</a>. diff --git a/docs/libnm/html/libnm-nm-version-macros.html b/docs/libnm/html/libnm-nm-version-macros.html index 2055eb48..e0b0311e 100644 --- a/docs/libnm/html/libnm-nm-version-macros.html +++ b/docs/libnm/html/libnm-nm-version-macros.html @@ -265,7 +265,7 @@ is compiled against.</p> <hr> <div class="refsect2"> <a name="NM-MICRO-VERSION:CAPS"></a><h3>NM_MICRO_VERSION</h3> -<pre class="programlisting">#define NM_MICRO_VERSION (90) +<pre class="programlisting">#define NM_MICRO_VERSION (91) </pre> <p>Evaluates to the micro version number of NetworkManager which this source compiled against.</p> diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2 index 05f39c05..4f12cb2b 100644 --- a/docs/libnm/html/libnm.devhelp2 +++ b/docs/libnm/html/libnm.devhelp2 @@ -757,7 +757,8 @@ <keyword type="function" name="nm_setting_connection_is_slave_type ()" link="NMSettingConnection.html#nm-setting-connection-is-slave-type" deprecated="1.46."/> <keyword type="function" name="nm_setting_connection_get_slave_type ()" link="NMSettingConnection.html#nm-setting-connection-get-slave-type" deprecated=""/> <keyword type="function" name="nm_setting_connection_get_port_type ()" link="NMSettingConnection.html#nm-setting-connection-get-port-type" since="1.46"/> - <keyword type="function" name="nm_setting_connection_get_autoconnect_slaves ()" link="NMSettingConnection.html#nm-setting-connection-get-autoconnect-slaves" since="1.2"/> + <keyword type="function" name="nm_setting_connection_get_autoconnect_slaves ()" link="NMSettingConnection.html#nm-setting-connection-get-autoconnect-slaves" deprecated="" since="1.2"/> + <keyword type="function" name="nm_setting_connection_get_autoconnect_ports ()" link="NMSettingConnection.html#nm-setting-connection-get-autoconnect-ports" since="1.46"/> <keyword type="function" name="nm_setting_connection_get_num_secondaries ()" link="NMSettingConnection.html#nm-setting-connection-get-num-secondaries"/> <keyword type="function" name="nm_setting_connection_get_secondary ()" link="NMSettingConnection.html#nm-setting-connection-get-secondary"/> <keyword type="function" name="nm_setting_connection_add_secondary ()" link="NMSettingConnection.html#nm-setting-connection-add-secondary"/> @@ -796,6 +797,7 @@ <keyword type="macro" name="NM_SETTING_CONNECTION_SLAVE_TYPE" link="NMSettingConnection.html#NM-SETTING-CONNECTION-SLAVE-TYPE:CAPS"/> <keyword type="macro" name="NM_SETTING_CONNECTION_PORT_TYPE" link="NMSettingConnection.html#NM-SETTING-CONNECTION-PORT-TYPE:CAPS"/> <keyword type="macro" name="NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES:CAPS"/> + <keyword type="macro" name="NM_SETTING_CONNECTION_AUTOCONNECT_PORTS" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-PORTS:CAPS"/> <keyword type="macro" name="NM_SETTING_CONNECTION_SECONDARIES" link="NMSettingConnection.html#NM-SETTING-CONNECTION-SECONDARIES:CAPS"/> <keyword type="macro" name="NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT" link="NMSettingConnection.html#NM-SETTING-CONNECTION-GATEWAY-PING-TIMEOUT:CAPS"/> <keyword type="macro" name="NM_SETTING_CONNECTION_METERED" link="NMSettingConnection.html#NM-SETTING-CONNECTION-METERED:CAPS"/> @@ -808,7 +810,7 @@ <keyword type="macro" name="NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT" link="NMSettingConnection.html#NM-SETTING-CONNECTION-WAIT-DEVICE-TIMEOUT:CAPS"/> <keyword type="macro" name="NM_SETTING_CONNECTION_MUD_URL" link="NMSettingConnection.html#NM-SETTING-CONNECTION-MUD-URL:CAPS"/> <keyword type="macro" name="NM_SETTING_CONNECTION_WAIT_ACTIVATION_DELAY" link="NMSettingConnection.html#NM-SETTING-CONNECTION-WAIT-ACTIVATION-DELAY:CAPS"/> - <keyword type="enum" name="enum NMSettingConnectionAutoconnectSlaves" link="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" since="1.2"/> + <keyword type="enum" name="enum NMSettingConnectionAutoconnectSlaves" link="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" deprecated="1.46" since="1.2"/> <keyword type="enum" name="enum NMSettingConnectionLldp" link="NMSettingConnection.html#NMSettingConnectionLldp" since="1.2"/> <keyword type="enum" name="enum NMSettingConnectionMdns" link="NMSettingConnection.html#NMSettingConnectionMdns" since="1.12"/> <keyword type="enum" name="enum NMSettingConnectionLlmnr" link="NMSettingConnection.html#NMSettingConnectionLlmnr" since="1.14"/> @@ -1401,6 +1403,7 @@ <keyword type="function" name="nm_setting_ip_config_get_ignore_auto_dns ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-ignore-auto-dns"/> <keyword type="function" name="nm_setting_ip_config_get_dhcp_hostname ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-hostname"/> <keyword type="function" name="nm_setting_ip_config_get_dhcp_send_hostname ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-send-hostname"/> + <keyword type="function" name="nm_setting_ip_config_get_dhcp_dscp ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-dscp" since="1.46"/> <keyword type="function" name="nm_setting_ip_config_get_never_default ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-never-default"/> <keyword type="function" name="nm_setting_ip_config_get_may_fail ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-may-fail"/> <keyword type="function" name="nm_setting_ip_config_get_dad_timeout ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-dad-timeout" since="1.2"/> @@ -1455,6 +1458,7 @@ <keyword type="macro" name="NM_SETTING_IP_CONFIG_DHCP_HOSTNAME" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DHCP-HOSTNAME:CAPS"/> <keyword type="macro" name="NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DHCP-SEND-HOSTNAME:CAPS"/> <keyword type="macro" name="NM_SETTING_IP_CONFIG_DHCP_HOSTNAME_FLAGS" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DHCP-HOSTNAME-FLAGS:CAPS"/> + <keyword type="macro" name="NM_SETTING_IP_CONFIG_DHCP_DSCP" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DHCP-DSCP:CAPS"/> <keyword type="macro" name="NM_SETTING_IP_CONFIG_NEVER_DEFAULT" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-NEVER-DEFAULT:CAPS"/> <keyword type="macro" name="NM_SETTING_IP_CONFIG_MAY_FAIL" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-MAY-FAIL:CAPS"/> <keyword type="macro" name="NM_SETTING_IP_CONFIG_DAD_TIMEOUT" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DAD-TIMEOUT:CAPS"/> diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html index 52d131d3..56b9df61 100644 --- a/docs/libnm/html/usage.html +++ b/docs/libnm/html/usage.html @@ -96,7 +96,7 @@ </p> <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c</code></strong> <code class="prompt">$ </code><strong class="userinput"><code>./hello-nm</code></strong> - NetworkManager version: 1.45.90 + NetworkManager version: 1.45.91 <code class="prompt">$ </code></pre> <p> diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt index b54bc9c3..492f35f6 100644 --- a/docs/libnm/libnm-sections.txt +++ b/docs/libnm/libnm-sections.txt @@ -2419,6 +2419,7 @@ NM_SETTING_CONNECTION_CONTROLLER NM_SETTING_CONNECTION_SLAVE_TYPE NM_SETTING_CONNECTION_PORT_TYPE NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES +NM_SETTING_CONNECTION_AUTOCONNECT_PORTS NM_SETTING_CONNECTION_SECONDARIES NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT NM_SETTING_CONNECTION_METERED @@ -2461,6 +2462,7 @@ nm_setting_connection_is_slave_type nm_setting_connection_get_slave_type nm_setting_connection_get_port_type nm_setting_connection_get_autoconnect_slaves +nm_setting_connection_get_autoconnect_ports nm_setting_connection_get_num_secondaries nm_setting_connection_get_secondary nm_setting_connection_add_secondary @@ -2855,6 +2857,7 @@ NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS NM_SETTING_IP_CONFIG_DHCP_HOSTNAME NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME NM_SETTING_IP_CONFIG_DHCP_HOSTNAME_FLAGS +NM_SETTING_IP_CONFIG_DHCP_DSCP NM_SETTING_IP_CONFIG_NEVER_DEFAULT NM_SETTING_IP_CONFIG_MAY_FAIL NM_SETTING_IP_CONFIG_DAD_TIMEOUT @@ -2931,6 +2934,7 @@ nm_setting_ip_config_get_ignore_auto_routes nm_setting_ip_config_get_ignore_auto_dns nm_setting_ip_config_get_dhcp_hostname nm_setting_ip_config_get_dhcp_send_hostname +nm_setting_ip_config_get_dhcp_dscp nm_setting_ip_config_get_never_default nm_setting_ip_config_get_may_fail nm_setting_ip_config_get_dad_timeout diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml index 8ce2f7ea..24a58e09 100644 --- a/docs/libnm/version.xml +++ b/docs/libnm/version.xml @@ -1 +1 @@ -1.45.90 +1.45.91 diff --git a/m4/build-to-host.m4 b/m4/build-to-host.m4 new file mode 100644 index 00000000..e3c72877 --- /dev/null +++ b/m4/build-to-host.m4 @@ -0,0 +1,73 @@ +# build-to-host.m4 serial 1 +dnl Copyright (C) 2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl Written by Bruno Haible. + +dnl When the build environment ($build_os) is different from the target runtime +dnl environment ($host_os), file names may need to be converted from the build +dnl environment syntax to the target runtime environment syntax. This is +dnl because the Makefiles are executed (mostly) by build environment tools and +dnl therefore expect file names in build environment syntax, whereas the runtime +dnl expects file names in target runtime environment syntax. +dnl +dnl For example, if $build_os = cygwin and $host_os = mingw32, filenames need +dnl be converted from Cygwin syntax to native Windows syntax: +dnl /cygdrive/c/foo/bar -> C:\foo\bar +dnl /usr/local/share -> C:\cygwin64\usr\local\share +dnl +dnl gl_BUILD_TO_HOST([somedir]) +dnl This macro takes as input an AC_SUBSTed variable 'somedir', which must +dnl already have its final value assigned, and produces two additional +dnl AC_SUBSTed variables 'somedir_c' and 'somedir_c_make', that designate the +dnl same file name value, just in different syntax: +dnl - somedir_c is the file name in target runtime environment syntax, +dnl as a C string (starting and ending with a double-quote, +dnl and with escaped backslashes and double-quotes in +dnl between). +dnl - somedir_c_make is the same thing, escaped for use in a Makefile. + +AC_DEFUN([gl_BUILD_TO_HOST], +[ + AC_REQUIRE([AC_CANONICAL_BUILD]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_BUILD_TO_HOST_INIT]) + + dnl Define somedir_c. + gl_final_[$1]="$[$1]" + dnl Translate it from build syntax to host syntax. + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;; + esac + ;; + esac + dnl Convert it to C string syntax. + [$1]_c=`echo "$gl_final_[$1]" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + [$1]_c='"'"$[$1]_c"'"' + AC_SUBST([$1_c]) + + dnl Define somedir_c_make. + [$1]_c_make=`echo "$[$1]_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + dnl Use the substituted somedir variable, when possible, so that the user + dnl may adjust somedir a posteriori when there are no special characters. + if test "$[$1]_c_make" = '\"'"${gl_final_[$1]}"'\"'; then + [$1]_c_make='\"$([$1])\"' + fi + AC_SUBST([$1_c_make]) +]) + +dnl Some initializations for gl_BUILD_TO_HOST. +AC_DEFUN([gl_BUILD_TO_HOST_INIT], +[ + gl_sed_double_backslashes='s/\\/\\\\/g' + gl_sed_escape_doublequotes='s/"/\\"/g' +changequote(,)dnl + gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g" +changequote([,])dnl + gl_sed_escape_for_make_2='s,\$,\\$$,g' +]) diff --git a/m4/gettext.m4 b/m4/gettext.m4 index f4492405..019d1adb 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 72 (gettext-0.21.1) -dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc. +# gettext.m4 serial 77 (gettext-0.22) +dnl Copyright (C) 1995-2014, 2016, 2018-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -20,11 +20,13 @@ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -dnl INTLSYMBOL must be one of 'external', 'use-libtool'. -dnl INTLSYMBOL should be 'external' for packages other than GNU gettext, and -dnl 'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'. -dnl If INTLSYMBOL is 'use-libtool', then a libtool library -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, +dnl INTLSYMBOL must be one of 'external', 'use-libtool', 'here'. +dnl INTLSYMBOL should be 'external' for packages other than GNU gettext. +dnl It should be 'use-libtool' for the packages 'gettext-runtime' and +dnl 'gettext-tools'. +dnl It should be 'here' for the package 'gettext-runtime/intl'. +dnl If INTLSYMBOL is 'here', then a libtool library +dnl $(top_builddir)/libintl.la will be created (shared and/or static, dnl depending on --{enable,disable}-{shared,static} and on the presence of dnl AM-DISABLE-SHARED). dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext @@ -55,24 +57,21 @@ dnl AC_DEFUN([AM_GNU_GETTEXT], [ dnl Argument checking. - m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], , + m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], , [m4_if([$1], [here], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])]) +])])])])]) m4_if(m4_if([$1], [], [old])[]m4_if([$1], [no-libtool], [old]), [old], [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported. ])]) m4_if([$2], [], , [m4_if([$2], [need-ngettext], , [m4_if([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) - define([gt_included_intl], - m4_if([$1], [external], [no], [yes])) + define([gt_building_libintl_in_same_build_tree], + m4_if([$1], [use-libtool], [yes], [m4_if([$1], [here], [yes], [no])])) gt_NEEDS_INIT AM_GNU_GETTEXT_NEED([$2]) AC_REQUIRE([AM_PO_SUBDIRS])dnl - m4_if(gt_included_intl, yes, [ - AC_REQUIRE([AM_INTL_SUBDIR])dnl - ]) dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) @@ -82,13 +81,13 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl Ideally we would do this search only after the dnl if test "$USE_NLS" = "yes"; then dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT + dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT dnl the configure script would need to contain the same shell code dnl again, outside any 'if'. There are two solutions: dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it. - m4_if(gt_included_intl, yes, , [ + m4_if(gt_building_libintl_in_same_build_tree, yes, , [ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) @@ -98,8 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl Set USE_NLS. AC_REQUIRE([AM_NLS]) - m4_if(gt_included_intl, yes, [ - BUILD_INCLUDED_LIBINTL=no + m4_if(gt_building_libintl_in_same_build_tree, yes, [ USE_INCLUDED_LIBINTL=no ]) LIBINTL= @@ -118,7 +116,7 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no - m4_if(gt_included_intl, yes, [ + m4_if(gt_building_libintl_in_same_build_tree, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], @@ -174,7 +172,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then dnl Sometimes libintl requires libiconv, so first search for libiconv. - m4_if(gt_included_intl, yes, , [ + m4_if(gt_building_libintl_in_same_build_tree, yes, , [ AM_ICONV_LINK ]) dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL @@ -252,7 +250,8 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then + && test "$PACKAGE" != gettext-tools \ + && test "$PACKAGE" != libintl; }; then gt_use_preinstalled_gnugettext=yes else dnl Reset the values set by searching for libintl. @@ -261,7 +260,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION INCINTL= fi - m4_if(gt_included_intl, yes, [ + m4_if(gt_building_libintl_in_same_build_tree, yes, [ if test "$gt_use_preinstalled_gnugettext" != "yes"; then dnl GNU gettext is not found in the C library. dnl Fall back on included GNU gettext library. @@ -271,7 +270,6 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. - BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD" LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD" @@ -341,25 +339,39 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION POSUB=po fi - m4_if(gt_included_intl, yes, [ - dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes' - dnl because some of the testsuite requires it. - BUILD_INCLUDED_LIBINTL=yes - + m4_if(gt_building_libintl_in_same_build_tree, yes, [ dnl Make all variables we use known to autoconf. - AC_SUBST([BUILD_INCLUDED_LIBINTL]) AC_SUBST([USE_INCLUDED_LIBINTL]) AC_SUBST([CATOBJEXT]) ]) - dnl For backward compatibility. Some Makefiles may be using this. - INTLLIBS="$LIBINTL" - AC_SUBST([INTLLIBS]) + m4_if(gt_building_libintl_in_same_build_tree, yes, [], [ + dnl For backward compatibility. Some Makefiles may be using this. + INTLLIBS="$LIBINTL" + AC_SUBST([INTLLIBS]) + ]) dnl Make all documented variables known to autoconf. AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) AC_SUBST([POSUB]) + + dnl Define localedir_c and localedir_c_make. + dnl Find the final value of localedir. + gt_save_prefix="${prefix}" + gt_save_datarootdir="${datarootdir}" + gt_save_localedir="${localedir}" + dnl Unfortunately, prefix gets only finally determined at the end of + dnl configure. + if test "X$prefix" = "XNONE"; then + prefix="$ac_default_prefix" + fi + eval datarootdir="$datarootdir" + eval localedir="$localedir" + gl_BUILD_TO_HOST([localedir]) + localedir="${gt_save_localedir}" + datarootdir="${gt_save_datarootdir}" + prefix="${gt_save_prefix}" ]) diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4 index b9223241..134f2283 100644 --- a/m4/host-cpu-c-abi.m4 +++ b/m4/host-cpu-c-abi.m4 @@ -1,5 +1,5 @@ # host-cpu-c-abi.m4 serial 15 -dnl Copyright (C) 2002-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/iconv.m4 b/m4/iconv.m4 index 00057953..ff5d5261 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,5 +1,5 @@ -# iconv.m4 serial 24 -dnl Copyright (C) 2000-2002, 2007-2014, 2016-2022 Free Software Foundation, +# iconv.m4 serial 26 +dnl Copyright (C) 2000-2002, 2007-2014, 2016-2023 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -234,12 +234,6 @@ AC_DEFUN([AM_ICONV_LINK], dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". -dnl This is tricky because of the way 'aclocal' is implemented: -dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. -dnl Otherwise aclocal's initial scan pass would miss the macro definition. -dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. -dnl Otherwise aclocal would emit many "Use of uninitialized value $1" -dnl warnings. AC_DEFUN_ONCE([AM_ICONV], [ AM_ICONV_LINK @@ -280,4 +274,20 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si ICONV_CONST="const" fi ]) + + dnl A summary result, for those packages which want to print a summary at the + dnl end of the configuration. + if test "$am_func_iconv" = yes; then + if test -n "$LIBICONV"; then + am_cv_func_iconv_summary='yes, in libiconv' + else + am_cv_func_iconv_summary='yes, in libc' + fi + else + if test "$am_cv_func_iconv" = yes; then + am_cv_func_iconv_summary='not working, consider installing GNU libiconv' + else + am_cv_func_iconv_summary='no, consider installing GNU libiconv' + fi + fi ]) diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index ecc88d6e..81eefd75 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ # intlmacosx.m4 serial 8 (gettext-0.20.2) -dnl Copyright (C) 2004-2014, 2016, 2019-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014, 2016, 2019-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index 934207a7..acc61274 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 10 -dnl Copyright (C) 1996-2003, 2009-2022 Free Software Foundation, Inc. +# lib-ld.m4 serial 11 +dnl Copyright (C) 1996-2003, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -29,7 +29,7 @@ AC_DEFUN([AC_LIB_PROG_LD], AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], + [AS_HELP_STRING([[--with-gnu-ld]], [assume the C compiler uses GNU ld [default=no]])], [test "$withval" = no || with_gnu_ld=yes], [with_gnu_ld=no])dnl diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index 3b75bcd0..5f8afae6 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,5 +1,5 @@ # lib-link.m4 serial 33 -dnl Copyright (C) 2001-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -224,7 +224,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], additional_libdir3= fi dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. + dnl $LDFLAGS. Use breadth-first search. LIB[]NAME= LTLIB[]NAME= INC[]NAME= diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index 999f712f..aefe7f71 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ # lib-prefix.m4 serial 20 -dnl Copyright (C) 2001-2005, 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nls.m4 b/m4/nls.m4 index 7c11c90f..65724481 100644 --- a/m4/nls.m4 +++ b/m4/nls.m4 @@ -1,5 +1,5 @@ # nls.m4 serial 6 (gettext-0.20.2) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2022 Free +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2023 Free dnl Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/progtest.m4 b/m4/progtest.m4 index 4a5b0b4c..906567bb 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ # progtest.m4 serial 9 (gettext-0.21.1) -dnl Copyright (C) 1996-2003, 2005, 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2005, 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/man/NetworkManager-dispatcher.8 b/man/NetworkManager-dispatcher.8 index ad442441..803f807b 100644 --- a/man/NetworkManager-dispatcher.8 +++ b/man/NetworkManager-dispatcher.8 @@ -2,9 +2,9 @@ .\" Title: NetworkManager-dispatcher .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: Network management daemons -.\" Source: NetworkManager-dispatcher 1.45.90 +.\" Source: NetworkManager-dispatcher 1.45.91 .\" Language: English .\" .TH "NETWORKMANAGER\-DISPATCHER" "8" "" "NetworkManager\-dispatcher 1\&" "Network management daemons" diff --git a/man/NetworkManager-wait-online.service.8 b/man/NetworkManager-wait-online.service.8 index 37077e93..971644cb 100644 --- a/man/NetworkManager-wait-online.service.8 +++ b/man/NetworkManager-wait-online.service.8 @@ -2,9 +2,9 @@ .\" Title: NetworkManager-wait-online.service .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: Network management daemons -.\" Source: NetworkManager-wait-online.service 1.45.90 +.\" Source: NetworkManager-wait-online.service 1.45.91 .\" Language: English .\" .TH "NETWORKMANAGER\-WAIT\-ONLINE\&" "8" "" "NetworkManager\-wait\-online\&" "Network management daemons" diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index eb5ec2c8..829e88c9 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,12 +2,12 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: Network management daemons -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.45\&.90" "Network management daemons" +.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.45\&.91" "Network management daemons" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index f321598d..357da0c0 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,12 +2,12 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: Configuration -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.45\&.90" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.45\&.91" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -878,6 +878,10 @@ If configured explicitly to 0, the MTU is not reconfigured during device activat .RS 4 .RE .PP +\fIipv4\&.dhcp\-dscp\fR +.RS 4 +.RE +.PP \fIipv4\&.dhcp\-iaid\fR .RS 4 If left unspecified, it defaults to "ifname"\&. diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 5a7f0d83..442c7140 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -925,6 +925,9 @@ ipv6.ip6-privacy=0 <term><varname>ipv4.dhcp-client-id</varname></term> </varlistentry> <varlistentry> + <term><varname>ipv4.dhcp-dscp</varname></term> + </varlistentry> + <varlistentry> <term><varname>ipv4.dhcp-iaid</varname></term> <listitem><para>If left unspecified, it defaults to "ifname".</para></listitem> </varlistentry> diff --git a/man/nm-cloud-setup.8 b/man/nm-cloud-setup.8 index 3f10803c..decfcc4b 100644 --- a/man/nm-cloud-setup.8 +++ b/man/nm-cloud-setup.8 @@ -2,12 +2,12 @@ .\" Title: nm-cloud-setup .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: Automatic Network Configuration in Cloud with NetworkManager -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.45\&.90" "Automatic Network Configuratio" +.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.45\&.91" "Automatic Network Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-initrd-generator.8 b/man/nm-initrd-generator.8 index 8684c7cc..aafa7992 100644 --- a/man/nm-initrd-generator.8 +++ b/man/nm-initrd-generator.8 @@ -2,12 +2,12 @@ .\" Title: nm-initrd-generator .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: System Administration -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.45\&.90" "System Administration" +.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.45\&.91" "System Administration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -126,6 +126,9 @@ The options that appear on the kernel command line\&. The following options are \fBrd\&.net\&.dhcp\&.vendor\-class\fR .RE .RS 4 +\fBrd\&.net\&.dhcp\&.dscp\fR +.RE +.RS 4 \fBrd\&.net\&.timeout\&.carrier\fR .RE .RS 4 @@ -209,6 +212,18 @@ accepts boolean values (true and false / on or off / 0 or 1), and \fISPEED\fR accepts positive integer values\&. .RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +NetworkManager supports the +\fBrd\&.net\&.dhcp\&.dscp\fR={\fICS0\fR|\fICS4\fR|\fICS6\fR} kernel command line option to set a specific DSCP (TOS) value in the IP header of DHCP messages\&. +.RE .SH "EXIT STATUS" .PP \fBnm\-initrd\-generator\fR diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml index 336d7f03..27219fda 100644 --- a/man/nm-initrd-generator.xml +++ b/man/nm-initrd-generator.xml @@ -160,6 +160,7 @@ <member><option>rd.net.timeout.dhcp</option></member> <member><option>rd.net.dhcp.retry</option></member> <member><option>rd.net.dhcp.vendor-class</option></member> + <member><option>rd.net.dhcp.dscp</option></member> <member><option>rd.net.timeout.carrier</option></member> <member><option>rd.znet</option></member> <member><option>rd.znet_ifname</option></member> @@ -223,6 +224,15 @@ <replaceable>SPEED</replaceable> accepts positive integer values. </para> </listitem> + + <listitem> + <para>NetworkManager supports the + <option>rd.net.dhcp.dscp</option>={<replaceable>CS0</replaceable>|<replaceable>CS4</replaceable>|<replaceable>CS6</replaceable>} + kernel command line option to set a specific DSCP (TOS) value + in the IP header of DHCP messages. + </para> + </listitem> + </itemizedlist> </refsect1> diff --git a/man/nm-online.1 b/man/nm-online.1 index 1525bc66..54ec05b8 100644 --- a/man/nm-online.1 +++ b/man/nm-online.1 @@ -2,12 +2,12 @@ .\" Title: nm-online .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.45\&.90" "General Commands Manual" +.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.45\&.91" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7 index 0078cf7d..fda3ef9d 100644 --- a/man/nm-openvswitch.7 +++ b/man/nm-openvswitch.7 @@ -2,12 +2,12 @@ .\" Title: nm-openvswitch .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: Open vSwitch support overview -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.45\&.90" "Open vSwitch support overview" +.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.45\&.91" "Open vSwitch support overview" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-dbus.5 b/man/nm-settings-dbus.5 index d8c4087a..480ccc0e 100644 --- a/man/nm-settings-dbus.5 +++ b/man/nm-settings-dbus.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-dbus .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: Configuration -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.45\&.90" "Configuration" +.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.45\&.91" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -103,6 +103,7 @@ 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{ auth\-retries @@ -133,6 +134,15 @@ If multiple profiles are ready to autoconnect on the same device, the one with t Depending on "connection\&.multi\-connect", a profile can (auto)connect only once at a time or multiple times\&. T} T{ +autoconnect\-ports +T}:T{ +NMTernary (int32) +T}:T{ +\ \& +T}:T{ +Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection\&. This only has a real effect for controller connections\&. The properties "autoconnect", "autoconnect\-priority" and "autoconnect\-retries" are unrelated to this setting\&. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, \-1: default\&. If \-1 (default) is set, global connection\&.autoconnect\-ports is read to determine the real value\&. If it is default as well, this fallbacks to 0\&. +T} +T{ autoconnect\-priority T}:T{ int32 @@ -2130,6 +2140,7 @@ 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{ address\-data @@ -2194,6 +2205,17 @@ The special value "none" prevents any client identifier from being sent\&. Note If unset, a globally configured default from NetworkManager\&.conf is used\&. If still unset, the default depends on the DHCP plugin\&. The internal dhcp client will default to "mac" and the dhclient plugin will try to use one from its config file if present, or won\*(Aqt sent any client\-id otherwise\&. T} T{ +dhcp\-dscp +T}:T{ +string +T}:T{ +\ \& +T}:T{ +Specifies the value for the DSCP field (traffic class) of the IP header\&. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0"\&. Allowed values are: "CS0", "CS4" and "CS6"\&. + +The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin\&. +T} +T{ dhcp\-fqdn T}:T{ string @@ -2559,6 +2581,7 @@ 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{ addr\-gen\-mode @@ -2623,6 +2646,17 @@ Maximum timeout in milliseconds used to check for the presence of duplicate IP a A zero value means that no duplicate address detection is performed, \-1 means the default value (either the value configured globally in NetworkManger\&.conf or 200ms)\&. A value greater than zero is a timeout in milliseconds\&. Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property\&. T} T{ +dhcp\-dscp +T}:T{ +string +T}:T{ +\ \& +T}:T{ +Specifies the value for the DSCP field (traffic class) of the IP header\&. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0"\&. Allowed values are: "CS0", "CS4" and "CS6"\&. + +The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin\&. +T} +T{ dhcp\-duid T}:T{ string diff --git a/man/nm-settings-dbus.xml b/man/nm-settings-dbus.xml index d7184d26..11001e71 100644 --- a/man/nm-settings-dbus.xml +++ b/man/nm-settings-dbus.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> -<refentry id="nm-settings-dbus"><refentryinfo><title>nm-settings-dbus</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-dbus</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.45.90</refmiscinfo></refmeta><refnamediv><refname>nm-settings-dbus</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles on the D-Bus API</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> +<refentry id="nm-settings-dbus"><refentryinfo><title>nm-settings-dbus</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-dbus</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.45.91</refmiscinfo></refmeta><refnamediv><refname>nm-settings-dbus</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles on the D-Bus API</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will @@ -42,7 +42,7 @@ Note that autoconnect is not implemented for VPN profiles. See "secondaries" as If multiple profiles are ready to autoconnect on the same device, the one with the better "connection.autoconnect-priority" is chosen. If the priorities are equal, then the most recently connected profile is activated. If the profiles were not connected earlier or their "connection.timestamp" is identical, the choice is undefined. -Depending on "connection.multi-connect", a profile can (auto)connect only once at a time or multiple times.</entry></row><row><entry align="left" id="nm-settings-dbus.property.connection.autoconnect-priority">autoconnect-priority</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.</entry></row><row><entry align="left" id="nm-settings-dbus.property.connection.autoconnect-retries">autoconnect-retries</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again.</entry></row><row><entry align="left" id="nm-settings-dbus.property.connection.autoconnect-slaves">autoconnect-slaves</entry><entry align="left">NMSettingConnectionAutoconnectSlaves (int32)</entry><entry align="left"/><entry>Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.</entry></row><row><entry align="left" id="nm-settings-dbus.property.connection.controller">controller</entry><entry align="left">string</entry><entry align="left"/><entry>Interface name of the controller device or UUID of the controller connection.</entry></row><row><entry align="left" id="nm-settings-dbus.property.connection.dns-over-tls">dns-over-tls</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>Whether DNSOverTls (dns-over-tls) is enabled for the connection. DNSOverTls is a technology which uses TLS to encrypt dns traffic. +Depending on "connection.multi-connect", a profile can (auto)connect only once at a time or multiple times.</entry></row><row><entry align="left" id="nm-settings-dbus.property.connection.autoconnect-ports">autoconnect-ports</entry><entry align="left">NMTernary (int32)</entry><entry align="left"/><entry>Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-ports is read to determine the real value. If it is default as well, this fallbacks to 0.</entry></row><row><entry align="left" id="nm-settings-dbus.property.connection.autoconnect-priority">autoconnect-priority</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.</entry></row><row><entry align="left" id="nm-settings-dbus.property.connection.autoconnect-retries">autoconnect-retries</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again.</entry></row><row><entry align="left" id="nm-settings-dbus.property.connection.autoconnect-slaves">autoconnect-slaves</entry><entry align="left">NMSettingConnectionAutoconnectSlaves (int32)</entry><entry align="left"/><entry>Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.</entry></row><row><entry align="left" id="nm-settings-dbus.property.connection.controller">controller</entry><entry align="left">string</entry><entry align="left"/><entry>Interface name of the controller device or UUID of the controller connection.</entry></row><row><entry align="left" id="nm-settings-dbus.property.connection.dns-over-tls">dns-over-tls</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>Whether DNSOverTls (dns-over-tls) is enabled for the connection. DNSOverTls is a technology which uses TLS to encrypt dns traffic. The permitted values are: "yes" (2) use DNSOverTls and disabled fallback, "opportunistic" (1) use DNSOverTls but allow fallback to unencrypted resolution, "no" (0) don't ever use DNSOverTls. If unspecified "default" depends on the plugin used. Systemd-resolved uses global setting. @@ -181,7 +181,9 @@ The special value "stable" is supported to generate a type 0 client identifier b The special value "none" prevents any client identifier from being sent. Note that this is normally not recommended. -If unset, a globally configured default from NetworkManager.conf is used. If still unset, the default depends on the DHCP plugin. The internal dhcp client will default to "mac" and the dhclient plugin will try to use one from its config file if present, or won't sent any client-id otherwise.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv4.dhcp-fqdn">dhcp-fqdn</entry><entry align="left">string</entry><entry align="left"/><entry>If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv4.dhcp-hostname">dhcp-hostname</entry><entry align="left">string</entry><entry align="left"/><entry>If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv4.dhcp-hostname-flags">dhcp-hostname-flags</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>Flags for the DHCP hostname and FQDN. +If unset, a globally configured default from NetworkManager.conf is used. If still unset, the default depends on the DHCP plugin. The internal dhcp client will default to "mac" and the dhclient plugin will try to use one from its config file if present, or won't sent any client-id otherwise.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv4.dhcp-dscp">dhcp-dscp</entry><entry align="left">string</entry><entry align="left"/><entry>Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0". Allowed values are: "CS0", "CS4" and "CS6". + +The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv4.dhcp-fqdn">dhcp-fqdn</entry><entry align="left">string</entry><entry align="left"/><entry>If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv4.dhcp-hostname">dhcp-hostname</entry><entry align="left">string</entry><entry align="left"/><entry>If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv4.dhcp-hostname-flags">dhcp-hostname-flags</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are 0x1 (fqdn-serv-update), 0x2 (fqdn-encoded) and 0x4 (fqdn-no-update). When no FQDN flag is set and 0x8 (fqdn-clear-flags) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and 0x8 (fqdn-clear-flags) is not set, the standard FQDN flags are set in the request: 0x1 (fqdn-serv-update), 0x2 (fqdn-encoded) for IPv4 and 0x1 (fqdn-serv-update) for IPv6. @@ -269,7 +271,9 @@ Array of IPv6 address structures. Each IPv6 address structure is composed of an For other connection types, adding such an automatic route is currently not supported and setting this to TRUE has no effect.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv6.dad-timeout">dad-timeout</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. -A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms). A value greater than zero is a timeout in milliseconds. Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv6.dhcp-duid">dhcp-duid</entry><entry align="left">string</entry><entry align="left"/><entry>A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. +A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms). A value greater than zero is a timeout in milliseconds. Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv6.dhcp-dscp">dhcp-dscp</entry><entry align="left">string</entry><entry align="left"/><entry>Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0". Allowed values are: "CS0", "CS4" and "CS6". + +The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv6.dhcp-duid">dhcp-duid</entry><entry align="left">string</entry><entry align="left"/><entry>A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value "lease" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and "dhclient" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index 8f94a60f..40af6afb 100644 --- a/man/nm-settings-ifcfg-rh.5 +++ b/man/nm-settings-ifcfg-rh.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-ifcfg-rh .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: Configuration -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.45\&.90" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.45\&.91" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index 46b6d9cf..2d583774 100644 --- a/man/nm-settings-ifcfg-rh.xml +++ b/man/nm-settings-ifcfg-rh.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> -<refentry id="nm-settings-ifcfg-rh"><refentryinfo><title>nm-settings-ifcfg-rh</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.45.90</refmiscinfo></refmeta><refnamediv><refname>nm-settings-ifcfg-rh</refname><refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> +<refentry id="nm-settings-ifcfg-rh"><refentryinfo><title>nm-settings-ifcfg-rh</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.45.91</refmiscinfo></refmeta><refnamediv><refname>nm-settings-ifcfg-rh</refname><refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> NetworkManager is based on the concept of connection profiles that contain network configuration (see <citerefentry><refentrytitle>nm-settings-nmcli</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index 17fc8fd6..40ec1a65 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: Configuration -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.45\&.90" "Configuration" +.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.45\&.91" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index 3f61aef1..2eb8d48c 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> -<refentry id="nm-settings-keyfile"><refentryinfo><title>nm-settings-keyfile</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.45.90</refmiscinfo></refmeta><refnamediv><refname>nm-settings-keyfile</refname><refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> +<refentry id="nm-settings-keyfile"><refentryinfo><title>nm-settings-keyfile</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.45.91</refmiscinfo></refmeta><refnamediv><refname>nm-settings-keyfile</refname><refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> NetworkManager is based on the concept of connection profiles that contain network configuration (see <citerefentry><refentrytitle>nm-settings-nmcli</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings-nmcli.5 b/man/nm-settings-nmcli.5 index 174cf43a..8285c2df 100644 --- a/man/nm-settings-nmcli.5 +++ b/man/nm-settings-nmcli.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: Configuration -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.45\&.90" "Configuration" +.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.45\&.91" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -98,6 +98,15 @@ Format: boolean Valid values: true/yes/on, false/no/off .RE .PP +\fBconnection\&.autoconnect\-ports\fR +.RS 4 +Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection\&. This only has a real effect for controller connections\&. The properties "autoconnect", "autoconnect\-priority" and "autoconnect\-retries" are unrelated to this setting\&. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, \-1: default\&. If \-1 (default) is set, global connection\&.autoconnect\-ports is read to determine the real value\&. If it is default as well, this fallbacks to 0\&. +.sp +Format: choice (NMTernary) +.sp +Valid values: default (\-1), false (0), true (1) +.RE +.PP \fBconnection\&.autoconnect\-priority\fR .RS 4 The autoconnect priority in range \-999 to 999\&. If the connection is set to autoconnect, connections with higher priority will be preferred\&. The higher number means higher priority\&. Defaults to 0\&. Note that this property only matters if there are more than one candidate profile to select for autoconnect\&. In case of equal priority, the profile used most recently is chosen\&. @@ -2350,6 +2359,17 @@ Format: string Special values: mac, perm\-mac, duid, ipv6\-duid, stable, none .RE .PP +\fBipv4\&.dhcp\-dscp\fR +.RS 4 +Specifies the value for the DSCP field (traffic class) of the IP header\&. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0"\&. Allowed values are: "CS0", "CS4" and "CS6"\&. +.sp +The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin\&. +.sp +Format: string +.sp +Valid values: CS0, CS4, CS6 +.RE +.PP \fBipv4\&.dhcp\-fqdn\fR .RS 4 If the "dhcp\-send\-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease\&. This property and "dhcp\-hostname" are mutually exclusive and cannot be set at the same time\&. diff --git a/man/nm-settings-nmcli.xml b/man/nm-settings-nmcli.xml index a5475e71..1a18a20c 100644 --- a/man/nm-settings-nmcli.xml +++ b/man/nm-settings-nmcli.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> -<refentry id="nm-settings-nmcli"><refentryinfo><title>nm-settings-nmcli</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-nmcli</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.45.90</refmiscinfo></refmeta><refnamediv><refname>nm-settings-nmcli</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles for nmcli</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> +<refentry id="nm-settings-nmcli"><refentryinfo><title>nm-settings-nmcli</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-nmcli</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.45.91</refmiscinfo></refmeta><refnamediv><refname>nm-settings-nmcli</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles for nmcli</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will @@ -38,7 +38,9 @@ Valid values: -1 - 2147483647</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.connection.autoconnect">connection.autoconnect</option></term><listitem><para> Alias: autoconnect</para><para>Whether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.</para><para>Autoconnect happens when the circumstances are suitable. That means for example that the device is currently managed and not active. Autoconnect thus never replaces or competes with an already active profile.</para><para>Note that autoconnect is not implemented for VPN profiles. See "secondaries" as an alternative to automatically connect VPN profiles.</para><para>If multiple profiles are ready to autoconnect on the same device, the one with the better "connection.autoconnect-priority" is chosen. If the priorities are equal, then the most recently connected profile is activated. If the profiles were not connected earlier or their "connection.timestamp" is identical, the choice is undefined.</para><para>Depending on "connection.multi-connect", a profile can (auto)connect only once at a time or multiple times.</para><para> Format: boolean</para><para> - Valid values: true/yes/on, false/no/off</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.connection.autoconnect-priority">connection.autoconnect-priority</option></term><listitem><para>The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.</para><para> + Valid values: true/yes/on, false/no/off</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.connection.autoconnect-ports">connection.autoconnect-ports</option></term><listitem><para>Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-ports is read to determine the real value. If it is default as well, this fallbacks to 0.</para><para> + Format: choice (NMTernary)</para><para> + Valid values: default (-1), false (0), true (1)</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.connection.autoconnect-priority">connection.autoconnect-priority</option></term><listitem><para>The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.</para><para> Format: integer</para><para> Valid values: -999 - 999</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.connection.autoconnect-retries">connection.autoconnect-retries</option></term><listitem><para>The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again.</para><para> Format: integer</para><para> @@ -557,7 +559,9 @@ Valid values: -1 - 30000</para><para> Special values: default (-1), off (0)</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.ipv4.dhcp-client-id">ipv4.dhcp-client-id</option></term><listitem><para>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0.</para><para>The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links.</para><para>The special value "ipv6-duid" uses the DUID from "ipv6.dhcp-duid" property as an RFC4361-compliant client identifier. As IAID it uses "ipv4.dhcp-iaid" and falls back to "ipv6.dhcp-iaid" if unset.</para><para>The special value "duid" generates a RFC4361-compliant client identifier based on "ipv4.dhcp-iaid" and uses a DUID generated by hashing /etc/machine-id.</para><para>The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a per-device key.</para><para>The special value "none" prevents any client identifier from being sent. Note that this is normally not recommended.</para><para>If unset, a globally configured default from NetworkManager.conf is used. If still unset, the default depends on the DHCP plugin. The internal dhcp client will default to "mac" and the dhclient plugin will try to use one from its config file if present, or won't sent any client-id otherwise.</para><para> Format: string</para><para> - Special values: mac, perm-mac, duid, ipv6-duid, stable, none</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.ipv4.dhcp-fqdn">ipv4.dhcp-fqdn</option></term><listitem><para>If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.</para><para> + Special values: mac, perm-mac, duid, ipv6-duid, stable, none</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.ipv4.dhcp-dscp">ipv4.dhcp-dscp</option></term><listitem><para>Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0". Allowed values are: "CS0", "CS4" and "CS6".</para><para>The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin.</para><para> + Format: string</para><para> + Valid values: CS0, CS4, CS6</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.ipv4.dhcp-fqdn">ipv4.dhcp-fqdn</option></term><listitem><para>If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.</para><para> Format: string</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.ipv4.dhcp-hostname">ipv4.dhcp-hostname</option></term><listitem><para>If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.</para><para> Format: string</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.ipv4.dhcp-hostname-flags">ipv4.dhcp-hostname-flags</option></term><listitem><para>Flags for the DHCP hostname and FQDN.</para><para>Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are "fqdn-serv-update" (0x1), "fqdn-encoded" (0x2) and "fqdn-no-update" (0x4). When no FQDN flag is set and "fqdn-clear-flags" (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and "fqdn-clear-flags" (0x8) is not set, the standard FQDN flags are set in the request: "fqdn-serv-update" (0x1), "fqdn-encoded" (0x2) for IPv4 and "fqdn-serv-update" (0x1) for IPv6.</para><para>When this property is set to the default value "none" (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also "none" (0x0), then the standard FQDN flags described above are sent in the DHCP requests.</para><para> Format: flags (NMDhcpHostnameFlags)</para><para> diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7 index 76b64fe4..783c0166 100644 --- a/man/nmcli-examples.7 +++ b/man/nmcli-examples.7 @@ -2,12 +2,12 @@ .\" Title: nmcli-examples .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: Examples -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.45\&.90" "Examples" +.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.45\&.91" "Examples" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmcli.1 b/man/nmcli.1 index 10775351..12793187 100644 --- a/man/nmcli.1 +++ b/man/nmcli.1 @@ -2,12 +2,12 @@ .\" Title: nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NMCLI" "1" "" "NetworkManager 1\&.45\&.90" "General Commands Manual" +.TH "NMCLI" "1" "" "NetworkManager 1\&.45\&.91" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmtui.1 b/man/nmtui.1 index d6e89157..f7c479dc 100644 --- a/man/nmtui.1 +++ b/man/nmtui.1 @@ -2,12 +2,12 @@ .\" Title: nmtui .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/25/2024 +.\" Date: 02/09/2024 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.45.90 +.\" Source: NetworkManager 1.45.91 .\" Language: English .\" -.TH "NMTUI" "1" "" "NetworkManager 1\&.45\&.90" "General Commands Manual" +.TH "NMTUI" "1" "" "NetworkManager 1\&.45\&.91" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/meson.build b/meson.build index 86c983b8..61c025b9 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project( # - add corresponding NM_VERSION_x_y_z macros in # "src/libnm-core-public/nm-version-macros.h.in" # - update number in configure.ac - version: '1.45.90', + version: '1.45.91', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 6b25f0d9..2b36b111 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,13 +1,13 @@ # Makefile for PO directory in any package using GNU gettext. # Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu> -# Copyright (C) 2000-2020 Free Software Foundation, Inc. +# Copyright (C) 2000-2023 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. This file is offered as-is, # without any warranty. # -# Origin: gettext-0.21 +# Origin: gettext-0.22 GETTEXT_MACRO_VERSION = 0.20 PACKAGE = @PACKAGE@ @@ -248,15 +248,17 @@ $(POFILES): $(POFILESDEPS) @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.10 | 0.10.*) \ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + 0.1[1-5] | 0.1[1-5].*) \ + $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ esac; \ }; \ else \ @@ -464,15 +466,17 @@ update-po: Makefile tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.10 | 0.10.*) \ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + 0.1[1-5] | 0.1[1-5].*) \ + $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ esac; \ }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ diff --git a/po/NetworkManager.pot b/po/NetworkManager.pot index 8c75c02d..150fdb74 100644 --- a/po/NetworkManager.pot +++ b/po/NetworkManager.pot @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: NetworkManager 1.45.90\n" +"Project-Id-Version: NetworkManager 1.45.91\n" "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/" "NetworkManager/issues\n" -"POT-Creation-Date: 2024-01-25 01:18+0100\n" +"POT-Creation-Date: 2024-02-09 15:43+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -172,7 +172,7 @@ msgid "%s %u" msgstr "" #: src/core/devices/adsl/nm-device-adsl.c:118 -#: src/libnmc-setting/nm-meta-setting-desc.c:8647 +#: src/libnmc-setting/nm-meta-setting-desc.c:8656 msgid "ADSL connection" msgstr "" @@ -249,7 +249,7 @@ msgid "Wired connection %d" msgstr "" #: src/core/devices/nm-device-ethernet.c:1641 -#: src/libnmc-setting/nm-meta-setting-desc.c:8689 +#: src/libnmc-setting/nm-meta-setting-desc.c:8698 msgid "Veth connection" msgstr "" @@ -262,7 +262,7 @@ msgid "Wired connection" msgstr "" #: src/core/devices/nm-device-infiniband.c:160 -#: src/libnmc-setting/nm-meta-setting-desc.c:8662 +#: src/libnmc-setting/nm-meta-setting-desc.c:8671 msgid "InfiniBand connection" msgstr "" @@ -283,17 +283,17 @@ msgid "TUN connection" msgstr "" #: src/core/devices/nm-device-vlan.c:380 -#: src/libnmc-setting/nm-meta-setting-desc.c:8690 +#: src/libnmc-setting/nm-meta-setting-desc.c:8699 msgid "VLAN connection" msgstr "" #: src/core/devices/nm-device-vrf.c:185 -#: src/libnmc-setting/nm-meta-setting-desc.c:8692 +#: src/libnmc-setting/nm-meta-setting-desc.c:8701 msgid "VRF connection" msgstr "" #: src/core/devices/nm-device-vxlan.c:385 -#: src/libnmc-setting/nm-meta-setting-desc.c:8693 +#: src/libnmc-setting/nm-meta-setting-desc.c:8702 msgid "VXLAN connection" msgstr "" @@ -598,7 +598,7 @@ msgstr "" msgid "Show NetworkManager options" msgstr "" -#: src/core/nm-manager.c:6886 src/libnmc-setting/nm-meta-setting-desc.c:8691 +#: src/core/nm-manager.c:6886 src/libnmc-setting/nm-meta-setting-desc.c:8700 msgid "VPN connection" msgstr "" @@ -1078,43 +1078,47 @@ msgstr "" msgid "property cannot contain any nul bytes" msgstr "" -#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:674 +#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:474 +msgid "invalid DSCP value; allowed values are: 'CS0', 'CS4', 'CS6'" +msgstr "" + +#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:691 #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:82 #: src/libnm-core-impl/nm-setting-user.c:93 msgid "missing key" msgstr "" -#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:682 +#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:699 #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:90 #: src/libnm-core-impl/nm-setting-user.c:101 msgid "key is too long" msgstr "" -#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:689 +#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:706 #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:97 #: src/libnm-core-impl/nm-setting-user.c:108 msgid "key must be UTF8" msgstr "" -#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:698 +#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:715 #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:106 #: src/libnm-core-impl/nm-setting-user.c:155 msgid "key contains invalid characters" msgstr "" -#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:726 +#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:743 #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:195 #: src/libnm-core-impl/nm-setting-user.c:182 msgid "value is missing" msgstr "" -#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:735 +#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:752 #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:204 #: src/libnm-core-impl/nm-setting-user.c:191 msgid "value is too large" msgstr "" -#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:743 +#: src/libnm-core-aux-intern/nm-libnm-core-utils.c:760 #: src/libnm-core-impl/nm-setting-ovs-external-ids.c:212 #: src/libnm-core-impl/nm-setting-user.c:199 msgid "value is not valid UTF8" @@ -1183,10 +1187,10 @@ msgstr "" #: src/libnm-core-impl/nm-setting-bluetooth.c:190 #: src/libnm-core-impl/nm-setting-bluetooth.c:207 #: src/libnm-core-impl/nm-setting-cdma.c:142 -#: src/libnm-core-impl/nm-setting-connection.c:1210 -#: src/libnm-core-impl/nm-setting-connection.c:1248 -#: src/libnm-core-impl/nm-setting-connection.c:1577 -#: src/libnm-core-impl/nm-setting-ip-config.c:5480 +#: src/libnm-core-impl/nm-setting-connection.c:1231 +#: src/libnm-core-impl/nm-setting-connection.c:1269 +#: src/libnm-core-impl/nm-setting-connection.c:1598 +#: src/libnm-core-impl/nm-setting-ip-config.c:5500 #: src/libnm-core-impl/nm-setting-ip-tunnel.c:405 #: src/libnm-core-impl/nm-setting-olpc-mesh.c:97 #: src/libnm-core-impl/nm-setting-ovs-patch.c:75 @@ -1522,14 +1526,14 @@ msgstr "" #: src/libnm-core-impl/nm-setting-adsl.c:179 #: src/libnm-core-impl/nm-setting-cdma.c:147 #: src/libnm-core-impl/nm-setting-cdma.c:157 -#: src/libnm-core-impl/nm-setting-connection.c:1220 -#: src/libnm-core-impl/nm-setting-connection.c:1263 -#: src/libnm-core-impl/nm-setting-connection.c:1515 +#: src/libnm-core-impl/nm-setting-connection.c:1241 +#: src/libnm-core-impl/nm-setting-connection.c:1284 +#: src/libnm-core-impl/nm-setting-connection.c:1536 #: src/libnm-core-impl/nm-setting-gsm.c:396 #: src/libnm-core-impl/nm-setting-gsm.c:411 #: src/libnm-core-impl/nm-setting-gsm.c:454 #: src/libnm-core-impl/nm-setting-gsm.c:463 -#: src/libnm-core-impl/nm-setting-ip-config.c:5489 +#: src/libnm-core-impl/nm-setting-ip-config.c:5509 #: src/libnm-core-impl/nm-setting-ip4-config.c:284 #: src/libnm-core-impl/nm-setting-ip4-config.c:296 #: src/libnm-core-impl/nm-setting-pppoe.c:149 @@ -1780,106 +1784,106 @@ msgstr "" msgid "bridge connection should have a ethernet setting as well" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1103 +#: src/libnm-core-impl/nm-setting-connection.c:1124 #, c-format msgid "setting required for connection of type '%s'" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1134 +#: src/libnm-core-impl/nm-setting-connection.c:1155 #, c-format msgid "Unknown slave type '%s'" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1149 +#: src/libnm-core-impl/nm-setting-connection.c:1170 #, c-format msgid "Slave connections need a valid '%s' property" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1173 +#: src/libnm-core-impl/nm-setting-connection.c:1194 #, c-format msgid "Cannot set '%s' without '%s'" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1232 +#: src/libnm-core-impl/nm-setting-connection.c:1253 #, c-format msgid "'%s' is not a valid UUID" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1277 +#: src/libnm-core-impl/nm-setting-connection.c:1298 #, c-format msgid "connection type '%s' is not valid" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1383 +#: src/libnm-core-impl/nm-setting-connection.c:1404 #, c-format msgid "'%s' connections must be enslaved to '%s', not '%s'" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1398 +#: src/libnm-core-impl/nm-setting-connection.c:1419 #, c-format msgid "metered value %d is not valid" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1412 -#: src/libnm-core-impl/nm-setting-connection.c:1426 -#: src/libnm-core-impl/nm-setting-connection.c:1440 -#: src/libnm-core-impl/nm-setting-connection.c:1501 +#: src/libnm-core-impl/nm-setting-connection.c:1433 +#: src/libnm-core-impl/nm-setting-connection.c:1447 +#: src/libnm-core-impl/nm-setting-connection.c:1461 +#: src/libnm-core-impl/nm-setting-connection.c:1522 #, c-format msgid "value %d is not valid" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1456 +#: src/libnm-core-impl/nm-setting-connection.c:1477 msgid "\"disabled\" flag cannot be combined with other MPTCP flags" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1470 +#: src/libnm-core-impl/nm-setting-connection.c:1491 msgid "cannot set both \"signal\" and \"fullmesh\" MPTCP flags" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1482 +#: src/libnm-core-impl/nm-setting-connection.c:1503 #, c-format msgid "value %u is not a valid combination of MPTCP flags" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1529 +#: src/libnm-core-impl/nm-setting-connection.c:1550 msgid "DHCP option cannot be longer than 255 characters" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1540 +#: src/libnm-core-impl/nm-setting-connection.c:1561 msgid "MUD URL is not a valid URL" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1560 +#: src/libnm-core-impl/nm-setting-connection.c:1581 msgid "invalid permissions not in format \"user:$UNAME[:]\"" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1589 +#: src/libnm-core-impl/nm-setting-connection.c:1610 #, c-format msgid "property type should be set to '%s'" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1607 +#: src/libnm-core-impl/nm-setting-connection.c:1628 #, c-format msgid "port-type '%s' requires a '%s' setting in the connection" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1618 +#: src/libnm-core-impl/nm-setting-connection.c:1639 #, c-format msgid "" "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be " "set to '%s'" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1644 +#: src/libnm-core-impl/nm-setting-connection.c:1665 #, c-format msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1661 +#: src/libnm-core-impl/nm-setting-connection.c:1682 msgid "UUID needs normalization" msgstr "" -#: src/libnm-core-impl/nm-setting-connection.c:1676 +#: src/libnm-core-impl/nm-setting-connection.c:1697 msgid "read-only is deprecated and not settable for the user" msgstr "" @@ -2244,79 +2248,79 @@ msgstr "" msgid "invalid address family" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5108 +#: src/libnm-core-impl/nm-setting-ip-config.c:5109 #, c-format msgid "rule #%u is invalid: %s" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5510 +#: src/libnm-core-impl/nm-setting-ip-config.c:5530 #, c-format msgid "%u. DNS server address is invalid" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5530 +#: src/libnm-core-impl/nm-setting-ip-config.c:5550 #, c-format msgid "%d. IP address is invalid" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5545 +#: src/libnm-core-impl/nm-setting-ip-config.c:5565 #, c-format msgid "%d. IP address has 'label' property with invalid type" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5557 +#: src/libnm-core-impl/nm-setting-ip-config.c:5577 #, c-format msgid "%d. IP address has invalid label '%s'" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5575 +#: src/libnm-core-impl/nm-setting-ip-config.c:5595 msgid "gateway cannot be set if there are no addresses configured" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5587 +#: src/libnm-core-impl/nm-setting-ip-config.c:5607 msgid "gateway is invalid" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5605 +#: src/libnm-core-impl/nm-setting-ip-config.c:5625 #, c-format msgid "%d. route is invalid" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5618 +#: src/libnm-core-impl/nm-setting-ip-config.c:5638 #, c-format msgid "invalid attribute: %s" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5638 +#: src/libnm-core-impl/nm-setting-ip-config.c:5658 #, c-format msgid "%u. rule has wrong address-family" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5650 +#: src/libnm-core-impl/nm-setting-ip-config.c:5670 #, c-format msgid "%u. rule is invalid: %s" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5666 +#: src/libnm-core-impl/nm-setting-ip-config.c:5686 #, c-format msgid "'%s' is not a valid IAID" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5680 +#: src/libnm-core-impl/nm-setting-ip-config.c:5700 #, c-format msgid "the property cannot be set when '%s' is disabled" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5706 +#: src/libnm-core-impl/nm-setting-ip-config.c:5726 msgid "the property is currently supported only for DHCPv4" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5723 +#: src/libnm-core-impl/nm-setting-ip-config.c:5743 #, c-format msgid "'%s' is not a valid IP or subnet" msgstr "" -#: src/libnm-core-impl/nm-setting-ip-config.c:5739 +#: src/libnm-core-impl/nm-setting-ip-config.c:5767 #, c-format msgid "a gateway is incompatible with '%s'" msgstr "" @@ -2422,11 +2426,15 @@ msgstr "" msgid "must be a valid IPv6 address with prefix" msgstr "" -#: src/libnm-core-impl/nm-setting-ip6-config.c:395 +#: src/libnm-core-impl/nm-setting-ip6-config.c:393 +msgid "DHCP DSCP is not supported for IPv6" +msgstr "" + +#: src/libnm-core-impl/nm-setting-ip6-config.c:407 msgid "token is not in canonical form" msgstr "" -#: src/libnm-core-impl/nm-setting-ip6-config.c:412 +#: src/libnm-core-impl/nm-setting-ip6-config.c:424 msgid "property should be TRUE when method is set to ignore or disabled" msgstr "" @@ -2738,33 +2746,33 @@ msgid "there are duplicate TC filters" msgstr "" #: src/libnm-core-impl/nm-setting-team.c:119 -#: src/libnm-core-impl/nm-setting-team.c:193 -#: src/libnm-core-impl/nm-setting-team.c:325 +#: src/libnm-core-impl/nm-setting-team.c:195 +#: src/libnm-core-impl/nm-setting-team.c:327 #, c-format msgid "%s is out of range [0, %d]" msgstr "" -#: src/libnm-core-impl/nm-setting-team.c:170 +#: src/libnm-core-impl/nm-setting-team.c:172 msgid "Missing target-host in nsna_ping link watcher" msgstr "" -#: src/libnm-core-impl/nm-setting-team.c:178 -#: src/libnm-core-impl/nm-setting-team.c:301 +#: src/libnm-core-impl/nm-setting-team.c:180 +#: src/libnm-core-impl/nm-setting-team.c:303 #, c-format msgid "target-host '%s' contains invalid characters" msgstr "" -#: src/libnm-core-impl/nm-setting-team.c:292 +#: src/libnm-core-impl/nm-setting-team.c:294 #, c-format msgid "Missing %s in arp_ping link watcher" msgstr "" -#: src/libnm-core-impl/nm-setting-team.c:310 +#: src/libnm-core-impl/nm-setting-team.c:312 #, c-format msgid "source-host '%s' contains invalid characters" msgstr "" -#: src/libnm-core-impl/nm-setting-team.c:335 +#: src/libnm-core-impl/nm-setting-team.c:337 msgid "vlanid is out of range [-1, 4094]" msgstr "" @@ -2827,7 +2835,7 @@ msgid "setting contained a secret with an empty name" msgstr "" #: src/libnm-core-impl/nm-setting-vpn.c:651 -#: src/libnm-core-impl/nm-setting.c:3481 +#: src/libnm-core-impl/nm-setting.c:3482 msgid "not a secret property" msgstr "" @@ -2895,76 +2903,76 @@ msgstr "" msgid "both speed and duplex are required for static link configuration" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:748 +#: src/libnm-core-impl/nm-setting-wireguard.c:747 msgid "missing public-key for peer" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:754 +#: src/libnm-core-impl/nm-setting-wireguard.c:753 msgid "invalid public-key for peer" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:764 +#: src/libnm-core-impl/nm-setting-wireguard.c:763 msgid "invalid preshared-key for peer" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:783 +#: src/libnm-core-impl/nm-setting-wireguard.c:782 msgid "invalid endpoint for peer" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:795 +#: src/libnm-core-impl/nm-setting-wireguard.c:794 #, c-format msgid "invalid IP address \"%s\" for allowed-ip of peer" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:806 +#: src/libnm-core-impl/nm-setting-wireguard.c:805 msgid "invalid preshared-key-flags for peer" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:1588 +#: src/libnm-core-impl/nm-setting-wireguard.c:1587 #, c-format msgid "peer #%u has no public-key" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:1601 +#: src/libnm-core-impl/nm-setting-wireguard.c:1600 #, c-format msgid "peer #%u has invalid public-key" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:1617 +#: src/libnm-core-impl/nm-setting-wireguard.c:1616 #, c-format msgid "peer #%u has invalid endpoint" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:1649 +#: src/libnm-core-impl/nm-setting-wireguard.c:1648 #, c-format msgid "peer #%u has invalid allowed-ips setting" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:1663 +#: src/libnm-core-impl/nm-setting-wireguard.c:1662 #, c-format msgid "peer #%u is invalid: %s" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:1735 -#: src/libnm-core-impl/nm-setting-wireguard.c:1754 +#: src/libnm-core-impl/nm-setting-wireguard.c:1734 +#: src/libnm-core-impl/nm-setting-wireguard.c:1753 #, c-format msgid "method \"%s\" is not supported for WireGuard" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:1778 +#: src/libnm-core-impl/nm-setting-wireguard.c:1777 msgid "key must be 32 bytes base64 encoded" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:1909 +#: src/libnm-core-impl/nm-setting-wireguard.c:1908 msgid "invalid peer secrets" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:1935 +#: src/libnm-core-impl/nm-setting-wireguard.c:1934 #, c-format msgid "peer #%u lacks public-key" msgstr "" -#: src/libnm-core-impl/nm-setting-wireguard.c:1952 +#: src/libnm-core-impl/nm-setting-wireguard.c:1951 #, c-format msgid "non-existing peer '%s'" msgstr "" @@ -3094,7 +3102,7 @@ msgstr "" msgid "cannot be empty" msgstr "" -#: src/libnm-core-impl/nm-setting.c:3378 +#: src/libnm-core-impl/nm-setting.c:3379 msgid "secret not found" msgstr "" @@ -4561,7 +4569,7 @@ msgid "MACsec PSK authentication" msgstr "" #: src/libnmc-base/nm-secret-agent-simple.c:931 -#: src/libnmc-setting/nm-meta-setting-desc.c:6896 +#: src/libnmc-setting/nm-meta-setting-desc.c:6905 msgid "MKA CAK" msgstr "" @@ -5164,8 +5172,8 @@ msgstr "" #: src/libnmc-setting/nm-meta-setting-desc.c:5206 #: src/libnmc-setting/nm-meta-setting-desc.c:5509 -#: src/libnmc-setting/nm-meta-setting-desc.c:6033 -#: src/libnmc-setting/nm-meta-setting-desc.c:7257 +#: src/libnmc-setting/nm-meta-setting-desc.c:6036 +#: src/libnmc-setting/nm-meta-setting-desc.c:7266 msgid "Password [none]" msgstr "" @@ -5183,11 +5191,11 @@ msgid "Port Priority" msgstr "" #: src/libnmc-setting/nm-meta-setting-desc.c:5319 -#: src/libnmc-setting/nm-meta-setting-desc.c:6144 -#: src/libnmc-setting/nm-meta-setting-desc.c:7990 -#: src/libnmc-setting/nm-meta-setting-desc.c:8028 -#: src/libnmc-setting/nm-meta-setting-desc.c:8210 -#: src/libnmc-setting/nm-meta-setting-desc.c:8457 +#: src/libnmc-setting/nm-meta-setting-desc.c:6147 +#: src/libnmc-setting/nm-meta-setting-desc.c:7999 +#: src/libnmc-setting/nm-meta-setting-desc.c:8037 +#: src/libnmc-setting/nm-meta-setting-desc.c:8219 +#: src/libnmc-setting/nm-meta-setting-desc.c:8466 msgid "MAC [none]" msgstr "" @@ -5241,8 +5249,8 @@ msgid "Hairpin" msgstr "" #: src/libnmc-setting/nm-meta-setting-desc.c:5503 -#: src/libnmc-setting/nm-meta-setting-desc.c:6027 -#: src/libnmc-setting/nm-meta-setting-desc.c:7835 +#: src/libnmc-setting/nm-meta-setting-desc.c:6030 +#: src/libnmc-setting/nm-meta-setting-desc.c:7844 msgid "Username [none]" msgstr "" @@ -5260,7 +5268,7 @@ msgstr "" msgid "Controller" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:5690 +#: src/libnmc-setting/nm-meta-setting-desc.c:5693 msgid "" "Enter secondary connections that should be activated when this connection " "is\n" @@ -5273,7 +5281,7 @@ msgid "" "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:5714 +#: src/libnmc-setting/nm-meta-setting-desc.c:5717 msgid "" "Enter a value which indicates whether the connection is subject to a data\n" "quota, usage costs or other limitations. Accepted options are:\n" @@ -5282,52 +5290,52 @@ msgid "" "'unknown' to let NetworkManager choose a value using some heuristics\n" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6043 +#: src/libnmc-setting/nm-meta-setting-desc.c:6046 msgid "APN" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6097 +#: src/libnmc-setting/nm-meta-setting-desc.c:6100 msgid "hsr port1" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6104 +#: src/libnmc-setting/nm-meta-setting-desc.c:6107 msgid "hsr port2" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6110 +#: src/libnmc-setting/nm-meta-setting-desc.c:6113 msgid "hsr multicast spec" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6153 -#: src/libnmc-setting/nm-meta-setting-desc.c:6803 -#: src/libnmc-setting/nm-meta-setting-desc.c:8060 -#: src/libnmc-setting/nm-meta-setting-desc.c:8257 +#: src/libnmc-setting/nm-meta-setting-desc.c:6156 +#: src/libnmc-setting/nm-meta-setting-desc.c:6812 +#: src/libnmc-setting/nm-meta-setting-desc.c:8069 +#: src/libnmc-setting/nm-meta-setting-desc.c:8266 #: src/nmtui/nmt-page-ethernet.c:124 src/nmtui/nmt-page-infiniband.c:81 #: src/nmtui/nmt-page-ip-tunnel.c:178 src/nmtui/nmt-page-vlan.c:100 #: src/nmtui/nmt-page-wifi.c:395 src/nmtui/nmt-page-wireguard.c:85 msgid "MTU" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6172 +#: src/libnmc-setting/nm-meta-setting-desc.c:6175 msgid "P_KEY [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6190 +#: src/libnmc-setting/nm-meta-setting-desc.c:6193 msgid "Parent interface [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6219 +#: src/libnmc-setting/nm-meta-setting-desc.c:6222 msgid "" "Enter a list of IPv4 addresses of DNS servers.\n" "\n" "Example: 8.8.8.8, 8.8.4.4\n" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6269 +#: src/libnmc-setting/nm-meta-setting-desc.c:6272 msgid "IPv4 address (IP[/plen]) [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6271 +#: src/libnmc-setting/nm-meta-setting-desc.c:6274 msgid "" "Enter a list of IPv4 addresses formatted as:\n" " ip[/prefix], ip[/prefix],...\n" @@ -5336,11 +5344,11 @@ msgid "" "Example: 192.168.1.5/24, 10.0.0.11/24\n" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6290 +#: src/libnmc-setting/nm-meta-setting-desc.c:6293 msgid "IPv4 gateway [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6299 +#: src/libnmc-setting/nm-meta-setting-desc.c:6302 msgid "" "Enter a list of IPv4 routes formatted as:\n" " ip[/prefix] [next-hop] [metric],...\n" @@ -5353,14 +5361,14 @@ msgid "" " 10.1.2.0/24\n" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6339 +#: src/libnmc-setting/nm-meta-setting-desc.c:6342 msgid "" "Enter a list of IPv4 routing rules formatted as:\n" " priority [prio] [from [src]] [to [dst]], ,...\n" "\n" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6477 +#: src/libnmc-setting/nm-meta-setting-desc.c:6486 msgid "" "Enter a list of IPv6 addresses of DNS servers. If the IPv6 configuration " "method is 'auto' these DNS servers are appended to those (if any) returned " @@ -5372,11 +5380,11 @@ msgid "" "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6533 +#: src/libnmc-setting/nm-meta-setting-desc.c:6542 msgid "IPv6 address (IP[/plen]) [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6535 +#: src/libnmc-setting/nm-meta-setting-desc.c:6544 msgid "" "Enter a list of IPv6 addresses formatted as:\n" " ip[/prefix], ip[/prefix],...\n" @@ -5385,11 +5393,11 @@ msgid "" "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6554 +#: src/libnmc-setting/nm-meta-setting-desc.c:6563 msgid "IPv6 gateway [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6563 +#: src/libnmc-setting/nm-meta-setting-desc.c:6572 msgid "" "Enter a list of IPv6 routes formatted as:\n" " ip[/prefix] [next-hop] [metric],...\n" @@ -5403,403 +5411,403 @@ msgid "" " abbe::/64 55\n" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6603 +#: src/libnmc-setting/nm-meta-setting-desc.c:6612 msgid "" "Enter a list of IPv6 routing rules formatted as:\n" " priority [prio] [from [src]] [to [dst]], ,...\n" "\n" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6740 -#: src/libnmc-setting/nm-meta-setting-desc.c:7890 +#: src/libnmc-setting/nm-meta-setting-desc.c:6749 +#: src/libnmc-setting/nm-meta-setting-desc.c:7899 msgid "Parent device [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6746 +#: src/libnmc-setting/nm-meta-setting-desc.c:6755 msgid "Local endpoint [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6753 -#: src/libnmc-setting/nm-meta-setting-desc.c:7909 +#: src/libnmc-setting/nm-meta-setting-desc.c:6762 +#: src/libnmc-setting/nm-meta-setting-desc.c:7918 msgid "Remote" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6869 +#: src/libnmc-setting/nm-meta-setting-desc.c:6878 msgid "MACsec parent device or connection UUID" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6890 +#: src/libnmc-setting/nm-meta-setting-desc.c:6899 msgid "Enable encryption" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6906 +#: src/libnmc-setting/nm-meta-setting-desc.c:6915 msgid "MKA_CKN" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6912 +#: src/libnmc-setting/nm-meta-setting-desc.c:6921 #: src/nmtui/nmt-page-macsec.c:170 msgid "SCI port" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6938 +#: src/libnmc-setting/nm-meta-setting-desc.c:6947 msgid "MACVLAN parent device or connection UUID" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:6959 +#: src/libnmc-setting/nm-meta-setting-desc.c:6968 msgid "Tap" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7030 -#: src/libnmc-setting/nm-meta-setting-desc.c:8170 src/nmtui/nmt-page-wifi.c:216 +#: src/libnmc-setting/nm-meta-setting-desc.c:7039 +#: src/libnmc-setting/nm-meta-setting-desc.c:8179 src/nmtui/nmt-page-wifi.c:216 msgid "SSID" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7040 +#: src/libnmc-setting/nm-meta-setting-desc.c:7049 msgid "OLPC Mesh channel" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7050 +#: src/libnmc-setting/nm-meta-setting-desc.c:7059 msgid "DHCP anycast MAC address [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7238 +#: src/libnmc-setting/nm-meta-setting-desc.c:7247 msgid "PPPoE parent device" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7244 +#: src/libnmc-setting/nm-meta-setting-desc.c:7253 msgid "Service [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7251 +#: src/libnmc-setting/nm-meta-setting-desc.c:7260 msgid "PPPoE username" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7287 +#: src/libnmc-setting/nm-meta-setting-desc.c:7296 msgid "Browser only" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7293 +#: src/libnmc-setting/nm-meta-setting-desc.c:7302 msgid "PAC URL" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7299 +#: src/libnmc-setting/nm-meta-setting-desc.c:7308 msgid "PAC script" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7423 -#: src/libnmc-setting/nm-meta-setting-desc.c:7612 +#: src/libnmc-setting/nm-meta-setting-desc.c:7432 +#: src/libnmc-setting/nm-meta-setting-desc.c:7621 msgid "Team JSON configuration [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7715 +#: src/libnmc-setting/nm-meta-setting-desc.c:7724 msgid "User ID [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7721 +#: src/libnmc-setting/nm-meta-setting-desc.c:7730 msgid "Group ID [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7727 +#: src/libnmc-setting/nm-meta-setting-desc.c:7736 msgid "Enable PI" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7733 +#: src/libnmc-setting/nm-meta-setting-desc.c:7742 msgid "Enable VNET header" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7739 +#: src/libnmc-setting/nm-meta-setting-desc.c:7748 msgid "Enable multi queue" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7752 +#: src/libnmc-setting/nm-meta-setting-desc.c:7761 msgid "veth peer" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7765 +#: src/libnmc-setting/nm-meta-setting-desc.c:7774 msgid "VLAN parent device or connection UUID" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7772 +#: src/libnmc-setting/nm-meta-setting-desc.c:7781 msgid "VLAN ID (<0-4094>)" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7778 +#: src/libnmc-setting/nm-meta-setting-desc.c:7787 msgid "VLAN flags (<0-7>) [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7794 +#: src/libnmc-setting/nm-meta-setting-desc.c:7803 msgid "Ingress priority maps [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7805 +#: src/libnmc-setting/nm-meta-setting-desc.c:7814 msgid "Egress priority maps [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7877 +#: src/libnmc-setting/nm-meta-setting-desc.c:7886 msgid "Table" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7897 +#: src/libnmc-setting/nm-meta-setting-desc.c:7906 msgid "VXLAN ID" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7903 +#: src/libnmc-setting/nm-meta-setting-desc.c:7912 msgid "Local address [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7915 +#: src/libnmc-setting/nm-meta-setting-desc.c:7924 msgid "Minimum source port" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7921 +#: src/libnmc-setting/nm-meta-setting-desc.c:7930 msgid "Maximum source port" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7927 +#: src/libnmc-setting/nm-meta-setting-desc.c:7936 msgid "Destination port" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7967 +#: src/libnmc-setting/nm-meta-setting-desc.c:7976 #: src/nmtui/nmt-wireguard-peer-editor.c:78 msgid "Peer" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:7997 +#: src/libnmc-setting/nm-meta-setting-desc.c:8006 msgid "WiMAX NSP name" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8034 -#: src/libnmc-setting/nm-meta-setting-desc.c:8215 +#: src/libnmc-setting/nm-meta-setting-desc.c:8043 +#: src/libnmc-setting/nm-meta-setting-desc.c:8224 msgid "Cloned MAC [none]" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8068 +#: src/libnmc-setting/nm-meta-setting-desc.c:8077 msgid "" "Enter a list of subchannels (comma or space separated).\n" "\n" "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8406 +#: src/libnmc-setting/nm-meta-setting-desc.c:8415 msgid "" "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, " "and 2 or passphrase.\n" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8465 +#: src/libnmc-setting/nm-meta-setting-desc.c:8474 msgid "Short address (<0x0000-0xffff>)" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8481 +#: src/libnmc-setting/nm-meta-setting-desc.c:8490 msgid "PAN Identifier (<0x0000-0xffff>)" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8496 +#: src/libnmc-setting/nm-meta-setting-desc.c:8505 msgid "Page (<default|0-31>)" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8510 +#: src/libnmc-setting/nm-meta-setting-desc.c:8519 msgid "Channel (<default|0-26>)" msgstr "" #. *************************************************************************** -#: src/libnmc-setting/nm-meta-setting-desc.c:8645 +#: src/libnmc-setting/nm-meta-setting-desc.c:8654 msgid "6LOWPAN settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8646 +#: src/libnmc-setting/nm-meta-setting-desc.c:8655 msgid "802-1x settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8648 +#: src/libnmc-setting/nm-meta-setting-desc.c:8657 msgid "bluetooth connection" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8649 +#: src/libnmc-setting/nm-meta-setting-desc.c:8658 msgid "Bond device" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8650 +#: src/libnmc-setting/nm-meta-setting-desc.c:8659 msgid "Bond port" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8651 +#: src/libnmc-setting/nm-meta-setting-desc.c:8660 msgid "Bridge device" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8652 +#: src/libnmc-setting/nm-meta-setting-desc.c:8661 msgid "Bridge port" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8653 +#: src/libnmc-setting/nm-meta-setting-desc.c:8662 msgid "CDMA mobile broadband connection" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8654 +#: src/libnmc-setting/nm-meta-setting-desc.c:8663 msgid "General settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8655 +#: src/libnmc-setting/nm-meta-setting-desc.c:8664 msgid "DCB settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8656 +#: src/libnmc-setting/nm-meta-setting-desc.c:8665 msgid "Dummy settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8657 +#: src/libnmc-setting/nm-meta-setting-desc.c:8666 msgid "Ethtool settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8658 +#: src/libnmc-setting/nm-meta-setting-desc.c:8667 msgid "Generic settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8659 +#: src/libnmc-setting/nm-meta-setting-desc.c:8668 msgid "GSM mobile broadband connection" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8660 +#: src/libnmc-setting/nm-meta-setting-desc.c:8669 msgid "Hostname settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8661 +#: src/libnmc-setting/nm-meta-setting-desc.c:8670 msgid "HSR settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8663 +#: src/libnmc-setting/nm-meta-setting-desc.c:8672 msgid "IPv4 protocol" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8664 +#: src/libnmc-setting/nm-meta-setting-desc.c:8673 msgid "IPv6 protocol" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8665 +#: src/libnmc-setting/nm-meta-setting-desc.c:8674 msgid "IP-tunnel settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8666 +#: src/libnmc-setting/nm-meta-setting-desc.c:8675 msgid "Link settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8667 +#: src/libnmc-setting/nm-meta-setting-desc.c:8676 msgid "Loopback settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8668 +#: src/libnmc-setting/nm-meta-setting-desc.c:8677 msgid "MACsec connection" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8669 +#: src/libnmc-setting/nm-meta-setting-desc.c:8678 msgid "macvlan connection" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8670 +#: src/libnmc-setting/nm-meta-setting-desc.c:8679 msgid "Match" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8671 +#: src/libnmc-setting/nm-meta-setting-desc.c:8680 msgid "OLPC Mesh connection" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8672 +#: src/libnmc-setting/nm-meta-setting-desc.c:8681 msgid "Open vSwitch bridge settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8673 +#: src/libnmc-setting/nm-meta-setting-desc.c:8682 msgid "Open vSwitch DPDK interface settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8674 +#: src/libnmc-setting/nm-meta-setting-desc.c:8683 msgid "OVS Other Config" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8675 +#: src/libnmc-setting/nm-meta-setting-desc.c:8684 msgid "OVS External IDs" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8676 +#: src/libnmc-setting/nm-meta-setting-desc.c:8685 msgid "Open vSwitch interface settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8677 +#: src/libnmc-setting/nm-meta-setting-desc.c:8686 msgid "Open vSwitch patch interface settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8678 +#: src/libnmc-setting/nm-meta-setting-desc.c:8687 msgid "Open vSwitch port settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8679 +#: src/libnmc-setting/nm-meta-setting-desc.c:8688 msgid "PPP settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8680 +#: src/libnmc-setting/nm-meta-setting-desc.c:8689 msgid "PPPoE" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8681 +#: src/libnmc-setting/nm-meta-setting-desc.c:8690 msgid "Proxy" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8682 +#: src/libnmc-setting/nm-meta-setting-desc.c:8691 msgid "Serial settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8683 +#: src/libnmc-setting/nm-meta-setting-desc.c:8692 msgid "SR-IOV settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8684 +#: src/libnmc-setting/nm-meta-setting-desc.c:8693 msgid "Traffic controls" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8685 +#: src/libnmc-setting/nm-meta-setting-desc.c:8694 msgid "Team device" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8686 +#: src/libnmc-setting/nm-meta-setting-desc.c:8695 msgid "Team port" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8687 +#: src/libnmc-setting/nm-meta-setting-desc.c:8696 msgid "Tun device" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8688 +#: src/libnmc-setting/nm-meta-setting-desc.c:8697 msgid "User settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8694 +#: src/libnmc-setting/nm-meta-setting-desc.c:8703 msgid "Wi-Fi P2P connection" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8695 +#: src/libnmc-setting/nm-meta-setting-desc.c:8704 msgid "WiMAX connection" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8696 +#: src/libnmc-setting/nm-meta-setting-desc.c:8705 msgid "Wired Ethernet" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8697 +#: src/libnmc-setting/nm-meta-setting-desc.c:8706 msgid "WireGuard VPN settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8698 +#: src/libnmc-setting/nm-meta-setting-desc.c:8707 msgid "Wi-Fi connection" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8699 +#: src/libnmc-setting/nm-meta-setting-desc.c:8708 msgid "Wi-Fi security settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:8700 +#: src/libnmc-setting/nm-meta-setting-desc.c:8709 msgid "WPAN settings" msgstr "" -#: src/libnmc-setting/nm-meta-setting-desc.c:9129 +#: src/libnmc-setting/nm-meta-setting-desc.c:9138 msgid "name" msgstr "" @@ -5832,6 +5840,18 @@ msgstr "" #: src/libnmc-setting/settings-docs.h.in:5 msgid "" +"Whether or not ports of this connection should be automatically brought up " +"when NetworkManager activates this connection. This only has a real effect " +"for controller connections. The properties \"autoconnect\", \"autoconnect-" +"priority\" and \"autoconnect-retries\" are unrelated to this setting. The " +"permitted values are: 0: leave port connections untouched, 1: activate all " +"the port connections with this connection, -1: default. If -1 (default) is " +"set, global connection.autoconnect-ports is read to determine the real " +"value. If it is default as well, this fallbacks to 0." +msgstr "" + +#: src/libnmc-setting/settings-docs.h.in:6 +msgid "" "The autoconnect priority in range -999 to 999. If the connection is set to " "autoconnect, connections with higher priority will be preferred. The higher " "number means higher priority. Defaults to 0. Note that this property only " @@ -5840,7 +5860,7 @@ msgid "" "chosen." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:6 +#: src/libnmc-setting/settings-docs.h.in:7 msgid "" "The number of times a connection should be tried when autoactivating before " "giving up. Zero means forever, -1 means the global default (4 times if not " @@ -5849,7 +5869,7 @@ msgid "" "autoconnect again." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:7 +#: src/libnmc-setting/settings-docs.h.in:8 msgid "" "Whether or not slaves of this connection should be automatically brought up " "when NetworkManager activates this connection. This only has a real effect " @@ -5861,12 +5881,12 @@ msgid "" "value. If it is default as well, this fallbacks to 0." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:8 +#: src/libnmc-setting/settings-docs.h.in:9 msgid "" "Interface name of the controller device or UUID of the controller connection." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:9 +#: src/libnmc-setting/settings-docs.h.in:10 msgid "" "Whether DNSOverTls (dns-over-tls) is enabled for the connection. DNSOverTls " "is a technology which uses TLS to encrypt dns traffic. The permitted values " @@ -5878,19 +5898,19 @@ msgid "" "plugin is dns-systemd-resolved." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:10 +#: src/libnmc-setting/settings-docs.h.in:11 msgid "" "If greater than zero, delay success of IP addressing until either the " "timeout is reached, or an IP gateway replies to a ping." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:11 +#: src/libnmc-setting/settings-docs.h.in:12 msgid "" "A human readable unique identifier for the connection, like \"Work Wi-Fi\" " "or \"T-Mobile 3G\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:12 +#: src/libnmc-setting/settings-docs.h.in:13 msgid "" "The name of the network interface this connection is bound to. If not set, " "then the connection can be attached to any interface of the appropriate type " @@ -5903,11 +5923,11 @@ msgid "" "interface." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:13 +#: src/libnmc-setting/settings-docs.h.in:14 msgid "Whether LLDP is enabled for the connection." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:14 +#: src/libnmc-setting/settings-docs.h.in:15 msgid "" "Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the " "connection. LLMNR is a protocol based on the Domain Name System (DNS) packet " @@ -5921,13 +5941,13 @@ msgid "" "effect. One such plugin is dns-systemd-resolved." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:15 +#: src/libnmc-setting/settings-docs.h.in:16 msgid "" "Interface name of the master device or UUID of the master connection. " "Deprecated 1.46. Use \"controller\" instead, this is just an alias." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:16 +#: src/libnmc-setting/settings-docs.h.in:17 msgid "" "Whether mDNS is enabled for the connection. The permitted values are: " "\"yes\" (2) register hostname and resolving for the connection, \"no\" (0) " @@ -5940,13 +5960,13 @@ msgid "" "resolved." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:17 +#: src/libnmc-setting/settings-docs.h.in:18 msgid "" "Whether the connection is metered. When updating this property on a " "currently activated connection, the change takes effect immediately." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:18 +#: src/libnmc-setting/settings-docs.h.in:19 msgid "" "Whether to configure MPTCP endpoints and the address flags. If MPTCP is " "enabled in NetworkManager, it will configure the addresses of the interface " @@ -5981,7 +6001,7 @@ msgid "" "the strict reverse path filtering (1) to the loose setting (2)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:19 +#: src/libnmc-setting/settings-docs.h.in:20 msgid "" "If configured, set to a Manufacturer Usage Description (MUD) URL that points " "to manufacturer-recommended network policies for IoT devices. It is " @@ -5992,13 +6012,13 @@ msgid "" "unspecified, the ultimate default is \"none\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:20 +#: src/libnmc-setting/settings-docs.h.in:21 msgid "" "Specifies whether the profile can be active multiple times at a particular " "moment. The value is of type NMConnectionMultiConnect." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:21 +#: src/libnmc-setting/settings-docs.h.in:22 msgid "" "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 " @@ -6013,30 +6033,30 @@ msgid "" "[id], and [reserved] must be valid UTF-8." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:22 +#: src/libnmc-setting/settings-docs.h.in:23 msgid "" "Setting name of the device type of this port's controller connection (eg, " "\"bond\"), or NULL if this connection is not a port." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:23 +#: src/libnmc-setting/settings-docs.h.in:24 msgid "This property is deprecated and has no meaning." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:24 +#: src/libnmc-setting/settings-docs.h.in:25 msgid "" "List of connection UUIDs that should be activated when the base connection " "itself is activated. Currently, only VPN connections are supported." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:25 +#: src/libnmc-setting/settings-docs.h.in:26 msgid "" "Setting name of the device type of this slave's master connection (eg, " "\"bond\"), or NULL if this connection is not a slave. Deprecated 1.46. Use " "\"port-type\" instead, this is just an alias." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:26 +#: src/libnmc-setting/settings-docs.h.in:27 msgid "" "This represents the identity of the connection used for various purposes. It " "allows to configure multiple profiles to share the identity. Also, the " @@ -6073,7 +6093,7 @@ msgid "" "connection profile." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:27 +#: src/libnmc-setting/settings-docs.h.in:28 msgid "" "The time, in seconds since the Unix Epoch, that the connection was last " "_successfully_ fully activated. NetworkManager updates the connection " @@ -6082,7 +6102,7 @@ msgid "" "reading (changes to this property will not be preserved)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:28 +#: src/libnmc-setting/settings-docs.h.in:29 msgid "" "Base type of the connection. For hardware-dependent connections, should " "contain the setting name of the hardware-type specific setting (ie, \"802-3-" @@ -6091,7 +6111,7 @@ msgid "" "setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:29 +#: src/libnmc-setting/settings-docs.h.in:30 msgid "" "The connection.uuid is the real identifier of a profile. It cannot change " "and it must be unique. It is therefore often best to refer to a profile by " @@ -6100,7 +6120,7 @@ msgid "" "\"generate\" and \"\" are allowed to generate a new random UUID." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:30 +#: src/libnmc-setting/settings-docs.h.in:31 msgid "" "Time in milliseconds to wait for connection to be considered activated. The " "wait will start after the pre-up dispatcher event. The value 0 means no wait " @@ -6108,7 +6128,7 @@ msgid "" "wait time." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:31 +#: src/libnmc-setting/settings-docs.h.in:32 msgid "" "Timeout in milliseconds to wait for device at startup. During boot, devices " "may take a while to be detected by the driver. This property will cause to " @@ -6119,7 +6139,7 @@ msgid "" "meaning as no wait time." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:32 +#: src/libnmc-setting/settings-docs.h.in:33 msgid "" "The trust level of a the connection. Free form case-insensitive string (for " "example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the " @@ -6128,33 +6148,33 @@ msgid "" "takes effect immediately." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:33 +#: src/libnmc-setting/settings-docs.h.in:34 msgid "" "If given, specifies the parent interface name or parent connection UUID from " "which this 6LowPAN interface should be created." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:34 +#: src/libnmc-setting/settings-docs.h.in:35 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:35 +#: src/libnmc-setting/settings-docs.h.in:36 msgid "" "Anonymous identity string for EAP authentication methods. Used as the " "unencrypted identity with EAP types that support different tunneled identity " "like EAP-TTLS." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:36 +#: src/libnmc-setting/settings-docs.h.in:37 msgid "" "A timeout for the authentication. Zero means the global default; if the " "global default is not set, the authentication timeout is 25 seconds." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:37 +#: src/libnmc-setting/settings-docs.h.in:38 msgid "" "Contains the CA certificate if used by the EAP method specified in the " "\"eap\" property. Certificate data is specified using a \"scheme\"; three " @@ -6169,18 +6189,18 @@ msgid "" "path is not a directory." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:38 +#: src/libnmc-setting/settings-docs.h.in:39 msgid "" "The password used to access the CA certificate stored in \"ca-cert\" " "property. Only makes sense if the certificate is stored on a PKCS#11 token " "that requires a login." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:39 +#: src/libnmc-setting/settings-docs.h.in:40 msgid "Flags indicating how to handle the \"ca-cert-password\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:40 +#: src/libnmc-setting/settings-docs.h.in:41 msgid "" "UTF-8 encoded path to a directory containing PEM or DER formatted " "certificates to be added to the verification chain in addition to the " @@ -6189,7 +6209,7 @@ msgid "" "this setting is ignored." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:41 +#: src/libnmc-setting/settings-docs.h.in:42 msgid "" "Contains the client certificate if used by the EAP method specified in the " "\"eap\" property. Certificate data is specified using a \"scheme\"; two are " @@ -6200,18 +6220,18 @@ msgid "" "with the string \"file://\" and ending with a terminating NUL byte." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:42 +#: src/libnmc-setting/settings-docs.h.in:43 msgid "" "The password used to access the client certificate stored in \"client-cert\" " "property. Only makes sense if the certificate is stored on a PKCS#11 token " "that requires a login." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:43 +#: src/libnmc-setting/settings-docs.h.in:44 msgid "Flags indicating how to handle the \"client-cert-password\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:44 +#: src/libnmc-setting/settings-docs.h.in:45 msgid "" "Constraint for server domain name. If set, this list of FQDNs is used as a " "match requirement for dNSName element(s) of the certificate presented by the " @@ -6221,7 +6241,7 @@ msgid "" "as a \";\" delimited list." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:45 +#: src/libnmc-setting/settings-docs.h.in:46 msgid "" "Constraint for server domain name. If set, this FQDN is used as a suffix " "match requirement for dNSName element(s) of the certificate presented by the " @@ -6231,7 +6251,7 @@ msgid "" "multiple valid FQDNs can be passed as a \";\" delimited list." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:46 +#: src/libnmc-setting/settings-docs.h.in:47 msgid "" "The allowed EAP method to be used when authenticating to the network with " "802.1x. Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", " @@ -6240,13 +6260,13 @@ msgid "" "the allowed combinations." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:47 +#: src/libnmc-setting/settings-docs.h.in:48 msgid "" "Identity string for EAP authentication methods. Often the user's user or " "login name." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:48 +#: src/libnmc-setting/settings-docs.h.in:49 msgid "" "Whether the 802.1X authentication is optional. If TRUE, the activation will " "continue even after a timeout or an authentication failure. Setting the " @@ -6254,26 +6274,26 @@ msgid "" "to FALSE, the activation can continue only after a successful authentication." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:49 +#: src/libnmc-setting/settings-docs.h.in:50 msgid "UTF-8 encoded file path containing PAC for EAP-FAST." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:50 +#: src/libnmc-setting/settings-docs.h.in:51 msgid "" "UTF-8 encoded password used for EAP authentication methods. If both the " "\"password\" property and the \"password-raw\" property are specified, " "\"password\" is preferred." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:51 -#: src/libnmc-setting/settings-docs.h.in:83 -#: src/libnmc-setting/settings-docs.h.in:125 -#: src/libnmc-setting/settings-docs.h.in:152 -#: src/libnmc-setting/settings-docs.h.in:297 +#: src/libnmc-setting/settings-docs.h.in:52 +#: src/libnmc-setting/settings-docs.h.in:84 +#: src/libnmc-setting/settings-docs.h.in:126 +#: src/libnmc-setting/settings-docs.h.in:153 +#: src/libnmc-setting/settings-docs.h.in:300 msgid "Flags indicating how to handle the \"password\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:52 +#: src/libnmc-setting/settings-docs.h.in:53 msgid "" "Password used for EAP authentication methods, given as a byte array to allow " "passwords in other encodings than UTF-8 to be used. If both the \"password\" " @@ -6281,11 +6301,11 @@ msgid "" "preferred." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:53 +#: src/libnmc-setting/settings-docs.h.in:54 msgid "Flags indicating how to handle the \"password-raw\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:54 +#: src/libnmc-setting/settings-docs.h.in:55 msgid "" "Specifies authentication flags to use in \"phase 1\" outer authentication " "using NMSetting8021xAuthFlags options. The individual TLS versions can be " @@ -6295,7 +6315,7 @@ msgid "" "settings. See the wpa_supplicant documentation for more details." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:55 +#: src/libnmc-setting/settings-docs.h.in:56 msgid "" "Enables or disables in-line provisioning of EAP-FAST credentials when FAST " "is specified as the EAP method in the \"eap\" property. Recognized values " @@ -6305,7 +6325,7 @@ msgid "" "documentation for more details." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:56 +#: src/libnmc-setting/settings-docs.h.in:57 msgid "" "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 " @@ -6313,7 +6333,7 @@ msgid "" "documentation for more details." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:57 +#: src/libnmc-setting/settings-docs.h.in:58 msgid "" "Forces which PEAP version is used when PEAP is set as the EAP method in the " "\"eap\" property. When unset, the version reported by the server will be " @@ -6322,7 +6342,7 @@ msgid "" "set to \"0\" or \"1\" to force that specific PEAP version." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:58 +#: src/libnmc-setting/settings-docs.h.in:59 msgid "" "List of strings to be matched against the altSubjectName of the certificate " "presented by the authentication server during the inner \"phase 2\" " @@ -6330,7 +6350,7 @@ msgid "" "certificate's altSubjectName is performed." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:59 +#: src/libnmc-setting/settings-docs.h.in:60 msgid "" "Specifies the allowed \"phase 2\" inner authentication method when an EAP " "method that uses an inner TLS tunnel is specified in the \"eap\" property. " @@ -6343,7 +6363,7 @@ msgid "" "\"phase2-autheap\" cannot be specified." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:60 +#: src/libnmc-setting/settings-docs.h.in:61 msgid "" "Specifies the allowed \"phase 2\" inner EAP-based authentication method when " "TTLS is specified in the \"eap\" property. Recognized EAP-based \"phase 2\" " @@ -6352,7 +6372,7 @@ msgid "" "authentication; see the wpa_supplicant documentation for more details." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:61 +#: src/libnmc-setting/settings-docs.h.in:62 msgid "" "Contains the \"phase 2\" CA certificate if used by the EAP method specified " "in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is " @@ -6367,19 +6387,19 @@ msgid "" "the built-in path, if the built-in path is not a directory." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:62 +#: src/libnmc-setting/settings-docs.h.in:63 msgid "" "The password used to access the \"phase2\" CA certificate stored in \"phase2-" "ca-cert\" property. Only makes sense if the certificate is stored on a " "PKCS#11 token that requires a login." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:63 +#: src/libnmc-setting/settings-docs.h.in:64 msgid "" "Flags indicating how to handle the \"phase2-ca-cert-password\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:64 +#: src/libnmc-setting/settings-docs.h.in:65 msgid "" "UTF-8 encoded path to a directory containing PEM or DER formatted " "certificates to be added to the verification chain in addition to the " @@ -6388,7 +6408,7 @@ msgid "" "directory, then this setting is ignored." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:65 +#: src/libnmc-setting/settings-docs.h.in:66 msgid "" "Contains the \"phase 2\" client certificate if used by the EAP method " "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. " @@ -6402,19 +6422,19 @@ msgid "" "in-the-middle attacks and is NOT recommended." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:66 +#: src/libnmc-setting/settings-docs.h.in:67 msgid "" "The password used to access the \"phase2\" client certificate stored in " "\"phase2-client-cert\" property. Only makes sense if the certificate is " "stored on a PKCS#11 token that requires a login." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:67 +#: src/libnmc-setting/settings-docs.h.in:68 msgid "" "Flags indicating how to handle the \"phase2-client-cert-password\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:68 +#: src/libnmc-setting/settings-docs.h.in:69 msgid "" "Constraint for server domain name. If set, this list of FQDNs is used as a " "match requirement for dNSName element(s) of the certificate presented by the " @@ -6424,7 +6444,7 @@ msgid "" "comparison. Multiple valid FQDNs can be passed as a \";\" delimited list." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:69 +#: src/libnmc-setting/settings-docs.h.in:70 msgid "" "Constraint for server domain name. If set, this FQDN is used as a suffix " "match requirement for dNSName element(s) of the certificate presented by the " @@ -6435,7 +6455,7 @@ msgid "" "a \";\" delimited list." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:70 +#: src/libnmc-setting/settings-docs.h.in:71 msgid "" "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 " @@ -6454,19 +6474,19 @@ msgid "" "decode the PKCS#12 private key and certificate." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:71 +#: src/libnmc-setting/settings-docs.h.in:72 msgid "" "The password used to decrypt the \"phase 2\" private key specified in the " "\"phase2-private-key\" property when the private key either uses the path " "scheme, or is a PKCS#12 format key." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:72 +#: src/libnmc-setting/settings-docs.h.in:73 msgid "" "Flags indicating how to handle the \"phase2-private-key-password\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:73 +#: src/libnmc-setting/settings-docs.h.in:74 msgid "" "Substring to be matched against the subject of the certificate presented by " "the authentication server during the inner \"phase 2\" authentication. When " @@ -6475,16 +6495,16 @@ msgid "" "used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:74 +#: src/libnmc-setting/settings-docs.h.in:75 msgid "PIN used for EAP authentication methods." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:75 -#: src/libnmc-setting/settings-docs.h.in:154 +#: src/libnmc-setting/settings-docs.h.in:76 +#: src/libnmc-setting/settings-docs.h.in:155 msgid "Flags indicating how to handle the \"pin\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:76 +#: src/libnmc-setting/settings-docs.h.in:77 msgid "" "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 " @@ -6506,18 +6526,18 @@ msgid "" "to prevent unauthorized access to unencrypted private key data." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:77 +#: src/libnmc-setting/settings-docs.h.in:78 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:78 +#: src/libnmc-setting/settings-docs.h.in:79 msgid "Flags indicating how to handle the \"private-key-password\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:79 +#: src/libnmc-setting/settings-docs.h.in:80 msgid "" "Substring to be matched against the subject of the certificate presented by " "the authentication server. When unset, no verification of the authentication " @@ -6525,7 +6545,7 @@ msgid "" "security, if any, and should not be used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:80 +#: src/libnmc-setting/settings-docs.h.in:81 msgid "" "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using " "the system CA directory specified at configure time with the --system-ca-" @@ -6537,56 +6557,56 @@ msgid "" "ca_cert/ca_cert2 options for wpa_supplicant)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:81 +#: src/libnmc-setting/settings-docs.h.in:82 msgid "Encapsulation of ADSL connection. Can be \"vcmux\" or \"llc\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:82 +#: src/libnmc-setting/settings-docs.h.in:83 msgid "Password used to authenticate with the ADSL service." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:84 +#: src/libnmc-setting/settings-docs.h.in:85 msgid "ADSL connection protocol. Can be \"pppoa\", \"pppoe\" or \"ipoatm\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:85 +#: src/libnmc-setting/settings-docs.h.in:86 msgid "Username used to authenticate with the ADSL service." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:86 +#: src/libnmc-setting/settings-docs.h.in:87 msgid "VCI of ADSL connection" msgstr "" -#: src/libnmc-setting/settings-docs.h.in:87 +#: src/libnmc-setting/settings-docs.h.in:88 msgid "VPI of ADSL connection" msgstr "" -#: src/libnmc-setting/settings-docs.h.in:88 +#: src/libnmc-setting/settings-docs.h.in:89 msgid "The Bluetooth address of the device." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:89 +#: src/libnmc-setting/settings-docs.h.in:90 msgid "" "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal " "Area Networking connections to devices supporting the NAP profile." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:90 +#: src/libnmc-setting/settings-docs.h.in:91 msgid "" "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])." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:91 +#: src/libnmc-setting/settings-docs.h.in:92 msgid "The Ethernet MAC address aging time, in seconds." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:92 +#: src/libnmc-setting/settings-docs.h.in:93 msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:93 +#: src/libnmc-setting/settings-docs.h.in:94 msgid "" "If specified, The MAC address of the multicast group this bridge uses for " "STP. The address must be a link-local address in standard Ethernet MAC " @@ -6594,7 +6614,7 @@ msgid "" "4..F]. If not specified the default value is 01:80:C2:00:00:00." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:94 +#: src/libnmc-setting/settings-docs.h.in:95 msgid "" "A mask of group addresses to forward. Usually, group addresses in the range " "from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to " @@ -6603,11 +6623,11 @@ msgid "" "or 2 set because they are used for STP, MAC pause frames and LACP." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:95 +#: src/libnmc-setting/settings-docs.h.in:96 msgid "The Spanning Tree Protocol (STP) hello time, in seconds." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:96 +#: src/libnmc-setting/settings-docs.h.in:97 msgid "" "If specified, the MAC address of bridge. When creating a new bridge, this " "MAC address will be set. If this field is left unspecified, the \"ethernet." @@ -6616,63 +6636,63 @@ msgid "" "the MAC address of the bridge later while activating the bridge." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:97 +#: src/libnmc-setting/settings-docs.h.in:98 msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:98 +#: src/libnmc-setting/settings-docs.h.in:99 msgid "Set maximum size of multicast hash table (value must be a power of 2)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:99 +#: src/libnmc-setting/settings-docs.h.in:100 msgid "" "Set the number of queries the bridge will send before stopping forwarding a " "multicast group after a \"leave\" message has been received." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:100 +#: src/libnmc-setting/settings-docs.h.in:101 msgid "" "Set interval (in deciseconds) between queries to find remaining members of a " "group, after a \"leave\" message is received." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:101 +#: src/libnmc-setting/settings-docs.h.in:102 msgid "" "Set delay (in deciseconds) after which the bridge will leave a group, if no " "membership reports for this group are received." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:102 +#: src/libnmc-setting/settings-docs.h.in:103 msgid "" "Enable or disable sending of multicast queries by the bridge. If not " "specified the option is disabled." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:103 +#: src/libnmc-setting/settings-docs.h.in:104 msgid "" "If no queries are seen after this delay (in deciseconds) has passed, the " "bridge will start to send its own queries." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:104 +#: src/libnmc-setting/settings-docs.h.in:105 msgid "" "Interval (in deciseconds) between queries sent by the bridge after the end " "of the startup phase." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:105 +#: src/libnmc-setting/settings-docs.h.in:106 msgid "" "Set the Max Response Time/Max Response Delay (in deciseconds) for IGMP/MLD " "queries sent by the bridge." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:106 +#: src/libnmc-setting/settings-docs.h.in:107 msgid "" "If enabled the bridge's own IP address is used as the source address for " "IGMP queries otherwise the default of 0.0.0.0 is used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:107 +#: src/libnmc-setting/settings-docs.h.in:108 msgid "" "Sets bridge's multicast router. Multicast-snooping must be enabled for this " "option to work. Supported values are: 'auto', 'disabled', 'enabled' to which " @@ -6680,56 +6700,56 @@ msgid "" "default value is 'auto' (1)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:108 +#: src/libnmc-setting/settings-docs.h.in:109 msgid "" "Controls whether IGMP snooping is enabled for this bridge. Note that if " "snooping was automatically disabled due to hash collisions, the system may " "refuse to enable the feature until the collisions are resolved." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:109 +#: src/libnmc-setting/settings-docs.h.in:110 msgid "Set the number of IGMP queries to send during startup phase." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:110 +#: src/libnmc-setting/settings-docs.h.in:111 msgid "" "Sets the time (in deciseconds) between queries sent out at startup to " "determine membership information." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:111 +#: src/libnmc-setting/settings-docs.h.in:112 msgid "" "Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower " "values are \"better\"; the lowest priority bridge will be elected the root " "bridge." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:112 +#: src/libnmc-setting/settings-docs.h.in:113 msgid "" "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:113 +#: src/libnmc-setting/settings-docs.h.in:114 msgid "" "The default PVID for the ports of the bridge, that is the VLAN id assigned " "to incoming untagged frames." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:114 +#: src/libnmc-setting/settings-docs.h.in:115 msgid "Control whether VLAN filtering is enabled on the bridge." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:115 +#: src/libnmc-setting/settings-docs.h.in:116 msgid "" "If specified, the protocol used for VLAN filtering. Supported values are: " "'802.1Q', '802.1ad'. If not specified the default value is '802.1Q'." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:116 +#: src/libnmc-setting/settings-docs.h.in:117 msgid "Controls whether per-VLAN stats accounting is enabled." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:117 +#: src/libnmc-setting/settings-docs.h.in:118 msgid "" "Array of bridge VLAN objects. In addition to the VLANs specified here, the " "bridge will also have the default-pvid VLAN configured by the bridge.vlan-" @@ -6739,22 +6759,22 @@ msgid "" "couple of ids separated by a dash." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:118 +#: src/libnmc-setting/settings-docs.h.in:119 msgid "" "Enables or disables \"hairpin mode\" for the port, which allows frames to be " "sent back out through the port the frame was received on." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:119 +#: src/libnmc-setting/settings-docs.h.in:120 msgid "" "The Spanning Tree Protocol (STP) port cost for destinations via this port." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:120 +#: src/libnmc-setting/settings-docs.h.in:121 msgid "The Spanning Tree Protocol (STP) priority of this bridge port." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:121 +#: src/libnmc-setting/settings-docs.h.in:122 msgid "" "Array of bridge VLAN objects. In addition to the VLANs specified here, the " "port will also have the default-pvid VLAN configured on the bridge by the " @@ -6764,87 +6784,87 @@ msgid "" "range, represented as a couple of ids separated by a dash." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:122 -#: src/libnmc-setting/settings-docs.h.in:148 -#: src/libnmc-setting/settings-docs.h.in:159 +#: src/libnmc-setting/settings-docs.h.in:123 +#: src/libnmc-setting/settings-docs.h.in:149 +#: src/libnmc-setting/settings-docs.h.in:160 msgid "" "If non-zero, only transmit packets of the specified size or smaller, " "breaking larger packets up into multiple frames." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:123 +#: src/libnmc-setting/settings-docs.h.in:124 msgid "" "The number to dial to establish the connection to the CDMA-based mobile " "broadband network, if any. If not specified, the default number (#777) is " "used when required." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:124 -#: src/libnmc-setting/settings-docs.h.in:151 +#: src/libnmc-setting/settings-docs.h.in:125 +#: src/libnmc-setting/settings-docs.h.in:152 msgid "" "The password used to authenticate with the network, if required. Many " "providers do not require a password, or accept any password. But if a " "password is required, it is specified here." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:126 -#: src/libnmc-setting/settings-docs.h.in:157 +#: src/libnmc-setting/settings-docs.h.in:127 +#: src/libnmc-setting/settings-docs.h.in:158 msgid "" "The username used to authenticate with the network, if required. Many " "providers do not require a username, or accept any username. But if a " "username is required, it is specified here." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:127 +#: src/libnmc-setting/settings-docs.h.in:128 msgid "" "Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be " "any combination of \"enable\" (0x1), \"advertise\" (0x2), and " "\"willing\" (0x4)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:128 +#: src/libnmc-setting/settings-docs.h.in:129 msgid "" "The FCoE controller mode; either \"fabric\" or \"vn2vn\". Since 1.34, NULL " "is the default and means \"fabric\". Before 1.34, NULL was rejected as " "invalid and the default was \"fabric\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:129 +#: src/libnmc-setting/settings-docs.h.in:130 msgid "" "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for " "default priority. Only used when the \"app-fcoe-flags\" property includes " "the \"enable\" (0x1) flag." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:130 +#: src/libnmc-setting/settings-docs.h.in:131 msgid "" "Specifies the NMSettingDcbFlags for the DCB FIP application. Flags may be " "any combination of \"enable\" (0x1), \"advertise\" (0x2), and " "\"willing\" (0x4)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:131 +#: src/libnmc-setting/settings-docs.h.in:132 msgid "" "The highest User Priority (0 - 7) which FIP frames should use, or -1 for " "default priority. Only used when the \"app-fip-flags\" property includes " "the \"enable\" (0x1) flag." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:132 +#: src/libnmc-setting/settings-docs.h.in:133 msgid "" "Specifies the NMSettingDcbFlags for the DCB iSCSI application. Flags may be " "any combination of \"enable\" (0x1), \"advertise\" (0x2), and " "\"willing\" (0x4)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:133 +#: src/libnmc-setting/settings-docs.h.in:134 msgid "" "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for " "default priority. Only used when the \"app-iscsi-flags\" property includes " "the \"enable\" (0x1) flag." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:134 +#: src/libnmc-setting/settings-docs.h.in:135 msgid "" "An array of 8 uint values, where the array index corresponds to the User " "Priority (0 - 7) and the value indicates the percentage of bandwidth of the " @@ -6853,21 +6873,21 @@ msgid "" "percents." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:135 +#: src/libnmc-setting/settings-docs.h.in:136 msgid "" "An array of 8 boolean values, where the array index corresponds to the User " "Priority (0 - 7) and the value indicates whether or not the corresponding " "priority should transmit priority pause." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:136 +#: src/libnmc-setting/settings-docs.h.in:137 msgid "" "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags " "may be any combination of \"enable\" (0x1), \"advertise\" (0x2), and " "\"willing\" (0x4)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:137 +#: src/libnmc-setting/settings-docs.h.in:138 msgid "" "An array of 8 uint values, where the array index corresponds to the Priority " "Group ID (0 - 7) and the value indicates the percentage of link bandwidth " @@ -6875,34 +6895,34 @@ msgid "" "values must total 100 percents." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:138 +#: src/libnmc-setting/settings-docs.h.in:139 msgid "" "Specifies the NMSettingDcbFlags for DCB Priority Groups. Flags may be any " "combination of \"enable\" (0x1), \"advertise\" (0x2), and \"willing\" (0x4)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:139 +#: src/libnmc-setting/settings-docs.h.in:140 msgid "" "An array of 8 uint values, where the array index corresponds to the User " "Priority (0 - 7) and the value indicates the Priority Group ID. Allowed " "Priority Group ID values are 0 - 7 or 15 for the unrestricted group." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:140 +#: src/libnmc-setting/settings-docs.h.in:141 msgid "" "An array of 8 boolean values, where the array index corresponds to the User " "Priority (0 - 7) and the value indicates whether or not the priority may use " "all of the bandwidth allocated to its assigned group." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:141 +#: src/libnmc-setting/settings-docs.h.in:142 msgid "" "An array of 8 uint values, where the array index corresponds to the User " "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which " "the priority is mapped." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:142 +#: src/libnmc-setting/settings-docs.h.in:143 msgid "" "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 " @@ -6915,41 +6935,41 @@ msgid "" "string to prevent that and use no APN." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:143 +#: src/libnmc-setting/settings-docs.h.in:144 msgid "" "When TRUE, the settings such as APN, username, or password will default to " "values that match the network the modem will register to in the Mobile " "Broadband Provider database." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:144 +#: src/libnmc-setting/settings-docs.h.in:145 msgid "" "The device unique identifier (as given by the WWAN management service) which " "this connection applies to. If given, the connection will only apply to the " "specified device." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:145 +#: src/libnmc-setting/settings-docs.h.in:146 msgid "" "When TRUE, only connections to the home network will be allowed. Connections " "to roaming networks will not be made." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:146 +#: src/libnmc-setting/settings-docs.h.in:147 msgid "" "For LTE modems, this sets the APN for the initial EPS bearer that is set up " "when attaching to the network. Setting this parameter implies initial-eps-" "bearer-configure to be TRUE." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:147 +#: src/libnmc-setting/settings-docs.h.in:148 msgid "" "For LTE modems, this setting determines whether the initial EPS bearer shall " "be configured when bringing up the connection. It is inferred TRUE if " "initial-eps-bearer-apn is set." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:149 +#: src/libnmc-setting/settings-docs.h.in:150 msgid "" "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network " "registration. If the Network ID is specified, NetworkManager will attempt " @@ -6958,20 +6978,20 @@ msgid "" "the device is not otherwise possible." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:150 +#: src/libnmc-setting/settings-docs.h.in:151 msgid "" "Legacy setting that used to help establishing PPP data sessions for GSM-" "based modems." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:153 +#: src/libnmc-setting/settings-docs.h.in:154 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:155 +#: src/libnmc-setting/settings-docs.h.in:156 msgid "" "The SIM card unique identifier (as given by the WWAN management service) " "which this connection applies to. If given, the connection will apply to " @@ -6979,7 +6999,7 @@ msgid "" "the given identifier." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:156 +#: src/libnmc-setting/settings-docs.h.in:157 msgid "" "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific " "mobile network operator which this connection applies to. If given, the " @@ -6987,14 +7007,14 @@ msgid "" "id\" which contains a SIM card provisioned by the given operator." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:158 +#: src/libnmc-setting/settings-docs.h.in:159 msgid "" "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)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:160 +#: src/libnmc-setting/settings-docs.h.in:161 msgid "" "The InfiniBand p-key to use for this device. A value of -1 means to use the " "default p-key (aka \"the p-key at index 0\"). Otherwise, it is a 16-bit " @@ -7007,19 +7027,19 @@ msgid "" "membership p-key with 0x8000 flag set." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:161 +#: src/libnmc-setting/settings-docs.h.in:162 msgid "" "The interface name of the parent device of this device. Normally NULL, but " "if the \"p_key\" property is set, then you must specify the base device by " "setting either this property or \"mac-address\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:162 +#: src/libnmc-setting/settings-docs.h.in:163 msgid "" "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:163 +#: src/libnmc-setting/settings-docs.h.in:164 msgid "" "A list of IPv4 addresses and their prefix length. Multiple addresses can be " "separated by comma. For example \"192.168.1.5/24, 10.1.0.5/24\". The " @@ -7027,8 +7047,8 @@ msgid "" "be the primary address." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:164 -#: src/libnmc-setting/settings-docs.h.in:194 +#: src/libnmc-setting/settings-docs.h.in:165 +#: src/libnmc-setting/settings-docs.h.in:196 msgid "" "VPN connections will default to add the route automatically unless this " "setting is set to FALSE. For other connection types, adding such an " @@ -7036,8 +7056,8 @@ msgid "" "effect." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:165 -#: src/libnmc-setting/settings-docs.h.in:195 +#: src/libnmc-setting/settings-docs.h.in:166 +#: src/libnmc-setting/settings-docs.h.in:197 msgid "" "Maximum timeout in milliseconds used to check for the presence of duplicate " "IP addresses on the network. If an address conflict is detected, the " @@ -7050,7 +7070,7 @@ msgid "" "in this property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:166 +#: src/libnmc-setting/settings-docs.h.in:167 msgid "" "A string sent to the DHCP server to identify the local machine which the " "DHCP server may use to customize the DHCP lease and options. When the " @@ -7080,23 +7100,33 @@ msgid "" "otherwise." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:167 +#: src/libnmc-setting/settings-docs.h.in:168 +#: src/libnmc-setting/settings-docs.h.in:198 +msgid "" +"Specifies the value for the DSCP field (traffic class) of the IP header. " +"When empty, the global default value is used; if no global default is " +"specified, it is assumed to be \"CS0\". Allowed values are: \"CS0\", \"CS4\" " +"and \"CS6\". The property is currently valid only for IPv4, and it is " +"supported only by the \"internal\" DHCP plugin." +msgstr "" + +#: src/libnmc-setting/settings-docs.h.in:169 msgid "" "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will " "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-" "hostname\" are mutually exclusive and cannot be set at the same time." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:168 -#: src/libnmc-setting/settings-docs.h.in:197 +#: src/libnmc-setting/settings-docs.h.in:170 +#: src/libnmc-setting/settings-docs.h.in:200 msgid "" "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will " "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-" "fqdn\" are mutually exclusive and cannot be set at the same time." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:169 -#: src/libnmc-setting/settings-docs.h.in:198 +#: src/libnmc-setting/settings-docs.h.in:171 +#: src/libnmc-setting/settings-docs.h.in:201 msgid "" "Flags for the DHCP hostname and FQDN. Currently, this property only includes " "flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN " @@ -7111,8 +7141,8 @@ msgid "" "then the standard FQDN flags described above are sent in the DHCP requests." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:170 -#: src/libnmc-setting/settings-docs.h.in:199 +#: src/libnmc-setting/settings-docs.h.in:172 +#: src/libnmc-setting/settings-docs.h.in:202 msgid "" "A string containing the \"Identity Association Identifier\" (IAID) used by " "the DHCP client. The string can be a 32-bit number (either decimal, " @@ -7133,8 +7163,8 @@ msgid "" "the lease information of the device." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:171 -#: src/libnmc-setting/settings-docs.h.in:201 +#: src/libnmc-setting/settings-docs.h.in:173 +#: src/libnmc-setting/settings-docs.h.in:204 msgid "" "Array of servers from which DHCP offers must be rejected. This property is " "useful to avoid getting a lease from misconfigured or rogue servers. For " @@ -7143,8 +7173,8 @@ msgid "" "not implemented for DHCPv6." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:172 -#: src/libnmc-setting/settings-docs.h.in:202 +#: src/libnmc-setting/settings-docs.h.in:174 +#: src/libnmc-setting/settings-docs.h.in:205 msgid "" "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 " @@ -7153,8 +7183,8 @@ msgid "" "of the computer is sent." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:173 -#: src/libnmc-setting/settings-docs.h.in:203 +#: src/libnmc-setting/settings-docs.h.in:175 +#: src/libnmc-setting/settings-docs.h.in:206 msgid "" "A timeout for a DHCP transaction in seconds. If zero (the default), a " "globally configured default is used. If still unspecified, a device specific " @@ -7162,7 +7192,7 @@ msgid "" "infinity." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:174 +#: src/libnmc-setting/settings-docs.h.in:176 msgid "" "The Vendor Class Identifier DHCP option (60). Special characters in the data " "string may be escaped using C-style escapes, nevertheless this property " @@ -7171,15 +7201,15 @@ msgid "" "the DHCP option is not sent to the server." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:175 -#: src/libnmc-setting/settings-docs.h.in:204 +#: src/libnmc-setting/settings-docs.h.in:177 +#: src/libnmc-setting/settings-docs.h.in:207 msgid "" "Array of IP addresses of DNS servers. For DoT (DNS over TLS), the SNI server " "name can be specified by appending \"#example.com\" to the IP address of the " "DNS server. This currently only has effect when using systemd-resolved." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:176 +#: src/libnmc-setting/settings-docs.h.in:178 msgid "" "DNS options for /etc/resolv.conf as described in resolv.conf(5) manual. The " "currently supported options are \"attempts\", \"debug\", \"edns0\", " @@ -7197,8 +7227,8 @@ msgid "" "options\" get merged together." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:177 -#: src/libnmc-setting/settings-docs.h.in:206 +#: src/libnmc-setting/settings-docs.h.in:179 +#: src/libnmc-setting/settings-docs.h.in:209 msgid "" "DNS servers priority. The relative priority for DNS servers specified by " "this setting. A lower numerical value is better (higher priority). Negative " @@ -7238,8 +7268,8 @@ msgid "" "of the desired interface are configured." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:178 -#: src/libnmc-setting/settings-docs.h.in:207 +#: src/libnmc-setting/settings-docs.h.in:180 +#: src/libnmc-setting/settings-docs.h.in:210 msgid "" "List of DNS search domains. Domains starting with a tilde ('~') are " "considered 'routing' domains and are used only to decide the interface over " @@ -7255,8 +7285,8 @@ msgid "" "DHCP (option 15)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:179 -#: src/libnmc-setting/settings-docs.h.in:208 +#: src/libnmc-setting/settings-docs.h.in:181 +#: src/libnmc-setting/settings-docs.h.in:211 msgid "" "The gateway associated with this configuration. This is only meaningful if " "\"addresses\" is also set. Setting the gateway causes NetworkManager to " @@ -7268,8 +7298,8 @@ msgid "" "case. See \"ip4-auto-default-route\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:180 -#: src/libnmc-setting/settings-docs.h.in:209 +#: src/libnmc-setting/settings-docs.h.in:182 +#: src/libnmc-setting/settings-docs.h.in:212 msgid "" "When \"method\" is set to \"auto\" and this property to TRUE, automatically " "configured name servers and search domains are ignored and only name servers " @@ -7277,15 +7307,15 @@ msgid "" "if any, are used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:181 -#: src/libnmc-setting/settings-docs.h.in:210 +#: src/libnmc-setting/settings-docs.h.in:183 +#: src/libnmc-setting/settings-docs.h.in:213 msgid "" "When \"method\" is set to \"auto\" and this property to TRUE, automatically " "configured routes are ignored and only routes specified in the \"routes\" " "property, if any, are used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:182 +#: src/libnmc-setting/settings-docs.h.in:184 msgid "" "Enable and disable the IPv4 link-local configuration independently of the " "ipv4.method configuration. This allows a link-local address (169.254.x.y/16) " @@ -7297,8 +7327,8 @@ msgid "" "disabled too. The default is \"default\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:183 -#: src/libnmc-setting/settings-docs.h.in:212 +#: src/libnmc-setting/settings-docs.h.in:185 +#: src/libnmc-setting/settings-docs.h.in:215 msgid "" "If TRUE, allow overall network configuration to proceed even if the " "configuration specified by this property times out. Note that at least one " @@ -7308,26 +7338,26 @@ msgid "" "if IPv4 configuration fails but IPv6 configuration completes successfully." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:184 +#: src/libnmc-setting/settings-docs.h.in:186 msgid "The IPv4 connection method." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:185 -#: src/libnmc-setting/settings-docs.h.in:215 +#: src/libnmc-setting/settings-docs.h.in:187 +#: src/libnmc-setting/settings-docs.h.in:218 msgid "" "If TRUE, this connection will never be the default connection for this IP " "type, meaning it will never be assigned the default route by NetworkManager." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:186 -#: src/libnmc-setting/settings-docs.h.in:217 +#: src/libnmc-setting/settings-docs.h.in:188 +#: src/libnmc-setting/settings-docs.h.in:220 msgid "" "Connections will default to keep the autogenerated priority 0 local rule " "unless this setting is set to TRUE." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:187 -#: src/libnmc-setting/settings-docs.h.in:218 +#: src/libnmc-setting/settings-docs.h.in:189 +#: src/libnmc-setting/settings-docs.h.in:221 msgid "" "The minimum time interval in milliseconds for which dynamic IP configuration " "should be tried before the connection succeeds. This property is useful for " @@ -7342,8 +7372,8 @@ msgid "" "configuration ipvx.required-timeout override or zero)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:188 -#: src/libnmc-setting/settings-docs.h.in:219 +#: src/libnmc-setting/settings-docs.h.in:190 +#: src/libnmc-setting/settings-docs.h.in:222 msgid "" "The default metric for routes that don't explicitly specify a metric. The " "default value -1 means that the metric is chosen automatically based on the " @@ -7354,8 +7384,8 @@ msgid "" "mean setting it to 1024. For IPv4, zero is a regular value for the metric." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:189 -#: src/libnmc-setting/settings-docs.h.in:220 +#: src/libnmc-setting/settings-docs.h.in:191 +#: src/libnmc-setting/settings-docs.h.in:223 msgid "" "Enable policy routing (source routing) and set the routing table used when " "adding routes. This affects all routes, including device-routes, IPv4LL, " @@ -7372,7 +7402,7 @@ msgid "" "tables outside of NetworkManager." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:190 +#: src/libnmc-setting/settings-docs.h.in:192 msgid "" "A list of IPv4 destination addresses, prefix length, optional IPv4 next hop " "addresses, optional route metric, optional attribute. The valid syntax is: " @@ -7380,12 +7410,12 @@ msgid "" "example \"192.0.2.0/24 10.1.1.1 77, 198.51.100.0/24\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:191 -#: src/libnmc-setting/settings-docs.h.in:222 +#: src/libnmc-setting/settings-docs.h.in:193 +#: src/libnmc-setting/settings-docs.h.in:225 msgid "A comma separated list of routing rules for policy routing." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:192 +#: src/libnmc-setting/settings-docs.h.in:194 msgid "" "Configure method for creating the IPv6 interface identifer of addresses with " "RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. " @@ -7414,7 +7444,7 @@ msgid "" "option." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:193 +#: src/libnmc-setting/settings-docs.h.in:195 msgid "" "A list of IPv6 addresses and their prefix length. Multiple addresses can be " "separated by comma. For example \"2001:db8:85a3::8a2e:370:7334/64, 2001:" @@ -7423,7 +7453,7 @@ msgid "" "with IPv6 source address selection (RFC 6724, section 5)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:196 +#: src/libnmc-setting/settings-docs.h.in:199 msgid "" "A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp " "client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried " @@ -7452,7 +7482,7 @@ msgid "" "assumed." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:200 +#: src/libnmc-setting/settings-docs.h.in:203 msgid "" "A IPv6 address followed by a slash and a prefix length. If set, the value is " "sent to the DHCPv6 server as hint indicating the prefix delegation (IA_PD) " @@ -7460,7 +7490,7 @@ msgid "" "address part to the zero address (for example \"::/60\")." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:205 +#: src/libnmc-setting/settings-docs.h.in:208 msgid "" "DNS options for /etc/resolv.conf as described in resolv.conf(5) manual. The " "currently supported options are \"attempts\", \"debug\", \"edns0\", " @@ -7479,7 +7509,7 @@ msgid "" "options\" get merged together." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:211 +#: src/libnmc-setting/settings-docs.h.in:214 msgid "" "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If " "enabled, it makes the kernel generate a temporary IPv6 address in addition " @@ -7496,11 +7526,11 @@ msgid "" "IPv6 addresses." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:213 +#: src/libnmc-setting/settings-docs.h.in:216 msgid "The IPv6 connection method." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:214 +#: src/libnmc-setting/settings-docs.h.in:217 msgid "" "Maximum transmission unit size, in bytes. If zero (the default), the MTU is " "set automatically from router advertisements or is left equal to the link-" @@ -7508,7 +7538,7 @@ msgid "" "than the minimum IPv6 MTU of 1280, this value has no effect." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:216 +#: src/libnmc-setting/settings-docs.h.in:219 msgid "" "A timeout for waiting Router Advertisements in seconds. If zero (the " "default), a globally configured default is used. If still unspecified, the " @@ -7516,11 +7546,11 @@ msgid "" "(MAXINT32) for infinity." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:221 +#: src/libnmc-setting/settings-docs.h.in:224 msgid "Array of IP routes." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:223 +#: src/libnmc-setting/settings-docs.h.in:226 msgid "" "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 " "tokenized interface identifiers. Useful with eui64 addr-gen-mode. When set, " @@ -7529,14 +7559,14 @@ msgid "" "not to IPv6 link local addresses." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:224 +#: src/libnmc-setting/settings-docs.h.in:227 msgid "" "How many additional levels of encapsulation are permitted to be prepended to " "packets. This property applies only to IPv6 tunnels. To disable this option, " "add 0x1 (ip6-ign-encap-limit) to ip-tunnel flags." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:225 +#: src/libnmc-setting/settings-docs.h.in:228 msgid "" "Tunnel flags. Currently, the following values are supported: 0x1 (ip6-ign-" "encap-limit), 0x2 (ip6-use-orig-tclass), 0x4 (ip6-use-orig-flowlabel), 0x8 " @@ -7544,106 +7574,106 @@ msgid "" "They are valid only for IPv6 tunnels." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:226 +#: src/libnmc-setting/settings-docs.h.in:229 msgid "" "The flow label to assign to tunnel packets. This property applies only to " "IPv6 tunnels." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:227 +#: src/libnmc-setting/settings-docs.h.in:230 msgid "" "The fwmark value to assign to tunnel packets. This property can be set to a " "non zero value only on VTI and VTI6 tunnels." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:228 +#: src/libnmc-setting/settings-docs.h.in:231 msgid "" "The key used for tunnel input packets; the property is valid only for " "certain tunnel modes (GRE, IP6GRE). If empty, no key is used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:229 +#: src/libnmc-setting/settings-docs.h.in:232 msgid "" "The local endpoint of the tunnel; the value can be empty, otherwise it must " "contain an IPv4 or IPv6 address." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:230 +#: src/libnmc-setting/settings-docs.h.in:233 msgid "" "The tunneling mode. Valid values: ipip (1), gre (2), sit (3), isatap (4), " "vti (5), ip6ip6 (6), ipip6 (7), ip6gre (8), vti6 (9), gretap (10) and " "ip6gretap (11)" msgstr "" -#: src/libnmc-setting/settings-docs.h.in:231 +#: src/libnmc-setting/settings-docs.h.in:234 msgid "" "If non-zero, only transmit packets of the specified size or smaller, " "breaking larger packets up into multiple fragments." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:232 +#: src/libnmc-setting/settings-docs.h.in:235 msgid "" "The key used for tunnel output packets; the property is valid only for " "certain tunnel modes (GRE, IP6GRE). If empty, no key is used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:233 +#: src/libnmc-setting/settings-docs.h.in:236 msgid "" "If given, specifies the parent interface name or parent connection UUID the " "new device will be bound to so that tunneled packets will only be routed via " "that interface." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:234 +#: src/libnmc-setting/settings-docs.h.in:237 msgid "Whether to enable Path MTU Discovery on this tunnel." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:235 +#: src/libnmc-setting/settings-docs.h.in:238 msgid "" "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 " "address." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:236 +#: src/libnmc-setting/settings-docs.h.in:239 msgid "" "The type of service (IPv4) or traffic class (IPv6) field to be set on " "tunneled packets." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:237 +#: src/libnmc-setting/settings-docs.h.in:240 msgid "" "The TTL to assign to tunneled packets. 0 is a special value meaning that " "packets inherit the TTL value." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:238 +#: src/libnmc-setting/settings-docs.h.in:241 msgid "Whether the transmitted traffic must be encrypted." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:239 +#: src/libnmc-setting/settings-docs.h.in:242 msgid "" "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. " "Must be a string of 32 hexadecimal characters." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:240 +#: src/libnmc-setting/settings-docs.h.in:243 msgid "Flags indicating how to handle the \"mka-cak\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:241 +#: src/libnmc-setting/settings-docs.h.in:244 msgid "" "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key " "Agreement. Must be a string of hexadecimal characters with a even length " "between 2 and 64." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:242 +#: src/libnmc-setting/settings-docs.h.in:245 msgid "" "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key " "Agreement) is obtained." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:243 +#: src/libnmc-setting/settings-docs.h.in:246 msgid "" "If given, specifies the parent interface name or parent connection UUID from " "which this MACSEC interface should be created. If this property is not " @@ -7651,29 +7681,29 @@ msgid "" "\"mac-address\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:244 +#: src/libnmc-setting/settings-docs.h.in:247 msgid "" "The port component of the SCI (Secure Channel Identifier), between 1 and " "65534." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:245 +#: src/libnmc-setting/settings-docs.h.in:248 msgid "" "Specifies whether the SCI (Secure Channel Identifier) is included in every " "packet." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:246 +#: src/libnmc-setting/settings-docs.h.in:249 msgid "Specifies the validation mode for incoming frames." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:247 +#: src/libnmc-setting/settings-docs.h.in:250 msgid "" "The macvlan mode, which specifies the communication mechanism between " "multiple macvlans on the same lower device." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:248 +#: src/libnmc-setting/settings-docs.h.in:251 msgid "" "If given, specifies the parent interface name or parent connection UUID from " "which this MAC-VLAN interface should be created. If this property is not " @@ -7681,15 +7711,15 @@ msgid "" "\"mac-address\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:249 +#: src/libnmc-setting/settings-docs.h.in:252 msgid "Whether the interface should be put in promiscuous mode." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:250 +#: src/libnmc-setting/settings-docs.h.in:253 msgid "Whether the interface should be a MACVTAP." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:251 +#: src/libnmc-setting/settings-docs.h.in:254 msgid "" "A list of driver names to match. Each element is a shell wildcard pattern. " "See NMSettingMatch:interface-name for how special characters '|', '&', '!' " @@ -7697,7 +7727,7 @@ msgid "" "pattern." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:252 +#: src/libnmc-setting/settings-docs.h.in:255 msgid "" "A list of interface names to match. Each element is a shell wildcard " "pattern. An element can be prefixed with a pipe symbol (|) or an ampersand " @@ -7714,7 +7744,7 @@ msgid "" "For example, \"&\\!a\" is an mandatory match for literally \"!a\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:253 +#: src/libnmc-setting/settings-docs.h.in:256 msgid "" "A list of kernel command line arguments to match. This may be used to check " "whether a specific kernel command line option is set (or unset, if prefixed " @@ -7727,7 +7757,7 @@ msgid "" "and '\\' are used for optional and mandatory matches and inverting the match." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:254 +#: src/libnmc-setting/settings-docs.h.in:257 msgid "" "A list of paths to match against the ID_PATH udev property of devices. " "ID_PATH represents the topological persistent path of a device. It typically " @@ -7742,52 +7772,52 @@ msgid "" "'\\' are used for optional and mandatory matches and inverting the pattern." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:255 +#: src/libnmc-setting/settings-docs.h.in:258 msgid "Channel on which the mesh network to join is located." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:256 +#: src/libnmc-setting/settings-docs.h.in:259 msgid "" "Anycast DHCP MAC address used when requesting an IP address via DHCP. The " "specific anycast address used determines which DHCP server class answers the " "request. This is currently only implemented by dhclient DHCP plugin." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:257 +#: src/libnmc-setting/settings-docs.h.in:260 msgid "SSID of the mesh network to join." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:258 +#: src/libnmc-setting/settings-docs.h.in:261 msgid "The data path type. One of \"system\", \"netdev\" or empty." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:259 +#: src/libnmc-setting/settings-docs.h.in:262 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:260 +#: src/libnmc-setting/settings-docs.h.in:263 msgid "Enable or disable multicast snooping." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:261 +#: src/libnmc-setting/settings-docs.h.in:264 msgid "Enable or disable RSTP." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:262 +#: src/libnmc-setting/settings-docs.h.in:265 msgid "Enable or disable STP." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:263 +#: src/libnmc-setting/settings-docs.h.in:266 msgid "Open vSwitch DPDK device arguments." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:264 +#: src/libnmc-setting/settings-docs.h.in:267 msgid "" "Open vSwitch DPDK number of rx queues. Defaults to zero which means to leave " "the parameter in OVS unspecified and effectively configures one queue." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:265 +#: src/libnmc-setting/settings-docs.h.in:268 msgid "" "The rx queue size (number of rx descriptors) for DPDK ports. Must be zero or " "a power of 2 between 1 and 4096, and supported by the hardware. Defaults to " @@ -7795,7 +7825,7 @@ msgid "" "configures 2048 descriptors." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:266 +#: src/libnmc-setting/settings-docs.h.in:269 msgid "" "The tx queue size (number of tx descriptors) for DPDK ports. Must be zero or " "a power of 2 between 1 and 4096, and supported by the hardware. Defaults to " @@ -7803,7 +7833,7 @@ msgid "" "configures 2048 descriptors." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:267 +#: src/libnmc-setting/settings-docs.h.in:270 msgid "" "Open vSwitch openflow port number. Defaults to zero which means that port " "number will not be specified and it will be chosen randomly by ovs. OpenFlow " @@ -7812,67 +7842,67 @@ msgid "" "to each other via their OpenFlow ports." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:268 +#: src/libnmc-setting/settings-docs.h.in:271 msgid "" "The interface type. Either \"internal\", \"system\", \"patch\", \"dpdk\", or " "empty." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:269 +#: src/libnmc-setting/settings-docs.h.in:272 msgid "" "Specifies the name of the interface for the other side of the patch. The " "patch on the other side must also set this interface as peer." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:270 +#: src/libnmc-setting/settings-docs.h.in:273 msgid "The time port must be inactive in order to be considered down." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:271 +#: src/libnmc-setting/settings-docs.h.in:274 msgid "" "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:272 +#: src/libnmc-setting/settings-docs.h.in:275 msgid "The time port must be active before it starts forwarding traffic." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:273 +#: src/libnmc-setting/settings-docs.h.in:276 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:274 +#: src/libnmc-setting/settings-docs.h.in:277 msgid "The VLAN tag in the range 0-4095." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:275 +#: src/libnmc-setting/settings-docs.h.in:278 msgid "" "A list of VLAN ranges that this port trunks. The property is valid only for " "ports with mode \"trunk\", \"native-tagged\", or \"native-untagged port\". " "If it is empty, the port trunks all VLANs." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:276 +#: src/libnmc-setting/settings-docs.h.in:279 msgid "" "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", " "\"trunk\", \"dot1q-tunnel\" or unset." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:277 +#: src/libnmc-setting/settings-docs.h.in:280 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:278 +#: src/libnmc-setting/settings-docs.h.in:281 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:279 +#: src/libnmc-setting/settings-docs.h.in:282 msgid "" "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 " @@ -7880,7 +7910,7 @@ msgid "" "property is used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:280 +#: src/libnmc-setting/settings-docs.h.in:283 msgid "" "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 " @@ -7888,78 +7918,78 @@ msgid "" "autodetect this." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:281 +#: src/libnmc-setting/settings-docs.h.in:284 msgid "" "If TRUE, stateful MPPE is used. See pppd documentation for more information " "on stateful MPPE." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:282 +#: src/libnmc-setting/settings-docs.h.in:285 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:283 +#: src/libnmc-setting/settings-docs.h.in:286 msgid "" "If non-zero, instruct pppd to send packets no larger than the specified size." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:284 +#: src/libnmc-setting/settings-docs.h.in:287 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:285 +#: src/libnmc-setting/settings-docs.h.in:288 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:286 +#: src/libnmc-setting/settings-docs.h.in:289 msgid "If TRUE, BSD compression will not be requested." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:287 +#: src/libnmc-setting/settings-docs.h.in:290 msgid "If TRUE, \"deflate\" compression will not be requested." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:288 +#: src/libnmc-setting/settings-docs.h.in:291 msgid "If TRUE, the CHAP authentication method will not be used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:289 +#: src/libnmc-setting/settings-docs.h.in:292 msgid "If TRUE, the EAP authentication method will not be used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:290 +#: src/libnmc-setting/settings-docs.h.in:293 msgid "If TRUE, the MSCHAP authentication method will not be used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:291 +#: src/libnmc-setting/settings-docs.h.in:294 msgid "If TRUE, the MSCHAPv2 authentication method will not be used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:292 +#: src/libnmc-setting/settings-docs.h.in:295 msgid "If TRUE, the PAP authentication method will not be used." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:293 +#: src/libnmc-setting/settings-docs.h.in:296 msgid "" "If TRUE, MPPE (Microsoft Point-to-Point Encryption) 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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:294 +#: src/libnmc-setting/settings-docs.h.in:297 msgid "" "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) 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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:295 +#: src/libnmc-setting/settings-docs.h.in:298 msgid "" "If given, specifies the parent interface name on which this PPPoE connection " "should be created. If this property is not specified, the connection is " @@ -7967,11 +7997,11 @@ msgid "" "NMSettingConnection." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:296 +#: src/libnmc-setting/settings-docs.h.in:299 msgid "Password used to authenticate with the PPPoE service." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:298 +#: src/libnmc-setting/settings-docs.h.in:301 msgid "" "If specified, instruct PPPoE to only initiate sessions with access " "concentrators that provide the specified service. For most providers, this " @@ -7979,19 +8009,19 @@ msgid "" "concentrators or a specific service is known to be required." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:299 +#: src/libnmc-setting/settings-docs.h.in:302 msgid "Username used to authenticate with the PPPoE service." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:300 +#: src/libnmc-setting/settings-docs.h.in:303 msgid "Whether the proxy configuration is for browser only." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:301 +#: src/libnmc-setting/settings-docs.h.in:304 msgid "Method for proxy configuration, Default is \"none\" (0)" msgstr "" -#: src/libnmc-setting/settings-docs.h.in:302 +#: src/libnmc-setting/settings-docs.h.in:305 msgid "" "The PAC script. In the profile this must be an UTF-8 encoded javascript code " "that defines a FindProxyForURL() function. When setting the property in " @@ -8000,36 +8030,36 @@ msgid "" "supported to explicitly differentiate between the two." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:303 +#: src/libnmc-setting/settings-docs.h.in:306 msgid "PAC URL for obtaining PAC file." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:304 +#: src/libnmc-setting/settings-docs.h.in:307 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:305 +#: src/libnmc-setting/settings-docs.h.in:308 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:306 +#: src/libnmc-setting/settings-docs.h.in:309 msgid "Parity setting of the serial port." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:307 +#: src/libnmc-setting/settings-docs.h.in:310 msgid "Time to delay between each byte sent to the modem, in microseconds." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:308 +#: src/libnmc-setting/settings-docs.h.in:311 msgid "" "Number of stop bits for communication on the serial port. Either 1 or 2. " "The 1 in \"8n1\" for example." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:309 +#: src/libnmc-setting/settings-docs.h.in:312 msgid "" "Whether to autoprobe virtual functions by a compatible driver. If set to " "\"true\" (1), the kernel will try to bind VFs to a compatible driver and if " @@ -8040,7 +8070,7 @@ msgid "" "\"true\" (1)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:310 +#: src/libnmc-setting/settings-docs.h.in:313 msgid "" "The total number of virtual functions to create. Note that when the sriov " "setting is present NetworkManager enforces the number of virtual functions " @@ -8049,7 +8079,7 @@ msgid "" "setting to the connection." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:311 +#: src/libnmc-setting/settings-docs.h.in:314 msgid "" "Array of virtual function descriptors. Each VF descriptor is a dictionary " "mapping attribute names to GVariant values. The 'index' entry is mandatory " @@ -8063,7 +8093,7 @@ msgid "" "default) or 'ad' for 802.1ad." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:312 +#: src/libnmc-setting/settings-docs.h.in:315 msgid "" "Array of TC queueing disciplines. When the \"tc\" setting is present, qdiscs " "from this property are applied upon activation. If the property is empty, " @@ -8073,7 +8103,7 @@ msgid "" "present on the interface." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:313 +#: src/libnmc-setting/settings-docs.h.in:316 msgid "" "Array of TC traffic filters. When the \"tc\" setting is present, filters " "from this property are applied upon activation. If the property is empty, " @@ -8081,7 +8111,7 @@ msgid "" "present, NetworkManager doesn't touch the filters present on the interface." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:314 +#: src/libnmc-setting/settings-docs.h.in:317 msgid "" "The JSON configuration for the team network interface. The property should " "contain raw JSON configuration data suitable for teamd, because the value is " @@ -8089,8 +8119,8 @@ msgid "" "used. See man teamd.conf for the format details." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:315 -#: src/libnmc-setting/settings-docs.h.in:333 +#: src/libnmc-setting/settings-docs.h.in:318 +#: src/libnmc-setting/settings-docs.h.in:336 msgid "" "Link watchers configuration for the connection: each link watcher is defined " "by a dictionary, whose keys depend upon the selected link watcher. Available " @@ -8102,65 +8132,65 @@ msgid "" "for more details." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:316 +#: src/libnmc-setting/settings-docs.h.in:319 msgid "Corresponds to the teamd mcast_rejoin.count." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:317 +#: src/libnmc-setting/settings-docs.h.in:320 msgid "Corresponds to the teamd mcast_rejoin.interval." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:318 +#: src/libnmc-setting/settings-docs.h.in:321 msgid "Corresponds to the teamd notify_peers.count." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:319 +#: src/libnmc-setting/settings-docs.h.in:322 msgid "Corresponds to the teamd notify_peers.interval." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:320 +#: src/libnmc-setting/settings-docs.h.in:323 msgid "" "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", " "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:321 +#: src/libnmc-setting/settings-docs.h.in:324 msgid "Corresponds to the teamd runner.active." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:322 +#: src/libnmc-setting/settings-docs.h.in:325 msgid "Corresponds to the teamd runner.agg_select_policy." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:323 +#: src/libnmc-setting/settings-docs.h.in:326 msgid "Corresponds to the teamd runner.fast_rate." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:324 +#: src/libnmc-setting/settings-docs.h.in:327 msgid "Corresponds to the teamd runner.hwaddr_policy." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:325 +#: src/libnmc-setting/settings-docs.h.in:328 msgid "Corresponds to the teamd runner.min_ports." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:326 +#: src/libnmc-setting/settings-docs.h.in:329 msgid "Corresponds to the teamd runner.sys_prio." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:327 +#: src/libnmc-setting/settings-docs.h.in:330 msgid "Corresponds to the teamd runner.tx_balancer.name." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:328 +#: src/libnmc-setting/settings-docs.h.in:331 msgid "Corresponds to the teamd runner.tx_balancer.interval." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:329 +#: src/libnmc-setting/settings-docs.h.in:332 msgid "Corresponds to the teamd runner.tx_hash." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:330 +#: src/libnmc-setting/settings-docs.h.in:333 msgid "" "The JSON configuration for the team port. The property should contain raw " "JSON configuration data suitable for teamd, because the value is passed " @@ -8168,67 +8198,67 @@ msgid "" "man teamd.conf for the format details." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:331 +#: src/libnmc-setting/settings-docs.h.in:334 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:332 +#: src/libnmc-setting/settings-docs.h.in:335 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:334 +#: src/libnmc-setting/settings-docs.h.in:337 msgid "Corresponds to the teamd ports.PORTIFNAME.prio." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:335 +#: src/libnmc-setting/settings-docs.h.in:338 msgid "" "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the " "parameter is skipped from the json config." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:336 +#: src/libnmc-setting/settings-docs.h.in:339 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:337 +#: src/libnmc-setting/settings-docs.h.in:340 msgid "" "The group ID which will own the device. If set to NULL everyone will be able " "to use the device." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:338 +#: src/libnmc-setting/settings-docs.h.in:341 msgid "" "The operating mode of the virtual device. Allowed values are \"tun\" (1) to " "create a layer 3 device and \"tap\" (2) to create an Ethernet-like layer 2 " "one." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:339 +#: src/libnmc-setting/settings-docs.h.in:342 msgid "" "If the property is set to TRUE, the interface will support multiple file " "descriptors (queues) to parallelize packet sending or receiving. Otherwise, " "the interface will only support a single queue." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:340 +#: src/libnmc-setting/settings-docs.h.in:343 msgid "" "The user ID which will own the device. If set to NULL everyone will be able " "to use the device." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:341 +#: src/libnmc-setting/settings-docs.h.in:344 msgid "" "If TRUE the interface will prepend a 4 byte header describing the physical " "interface to the packets." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:342 +#: src/libnmc-setting/settings-docs.h.in:345 msgid "" "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network " "header." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:343 +#: src/libnmc-setting/settings-docs.h.in:346 msgid "" "A dictionary of key/value pairs with user data. This data is ignored by " "NetworkManager and can be used at the users discretion. The keys only " @@ -8236,14 +8266,14 @@ msgid "" "up to a certain length." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:344 +#: src/libnmc-setting/settings-docs.h.in:347 msgid "" "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\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:345 +#: src/libnmc-setting/settings-docs.h.in:348 msgid "" "One or more flags which control the behavior and features of the VLAN " "interface. Flags include \"reorder-headers\" (0x1) (reordering of output " @@ -8255,20 +8285,20 @@ msgid "" "continues to be 0 and a missing property on D-Bus is still considered as 0." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:346 +#: src/libnmc-setting/settings-docs.h.in:349 msgid "" "The VLAN identifier that the interface created by this connection should be " "assigned. The valid range is from 0 to 4094, without the reserved id 4095." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:347 +#: src/libnmc-setting/settings-docs.h.in:350 msgid "" "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\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:348 +#: src/libnmc-setting/settings-docs.h.in:351 msgid "" "If given, specifies the parent interface name or parent connection UUID from " "which this VLAN interface should be created. If this property is not " @@ -8276,38 +8306,38 @@ msgid "" "\"mac-address\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:349 +#: src/libnmc-setting/settings-docs.h.in:352 msgid "" "Specifies the VLAN protocol to use for encapsulation. Supported values are: " "'802.1Q', '802.1ad'. If not specified the default value is '802.1Q'." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:350 +#: src/libnmc-setting/settings-docs.h.in:353 msgid "" "Dictionary of key/value pairs of VPN plugin specific data. Both keys and " "values must be strings." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:351 +#: src/libnmc-setting/settings-docs.h.in:354 msgid "" "If the VPN service supports persistence, and this property is TRUE, the VPN " "will attempt to stay connected across link changes and outages, until " "explicitly disconnected." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:352 +#: src/libnmc-setting/settings-docs.h.in:355 msgid "" "Dictionary of key/value pairs of VPN plugin specific secrets like passwords " "or private keys. Both keys and values must be strings." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:353 +#: src/libnmc-setting/settings-docs.h.in:356 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:354 +#: src/libnmc-setting/settings-docs.h.in:357 msgid "" "Timeout for the VPN service to establish the connection. Some services may " "take quite a long time to connect. Value of 0 means a default timeout, which " @@ -8315,7 +8345,7 @@ msgid "" "Values greater than zero mean timeout in seconds." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:355 +#: src/libnmc-setting/settings-docs.h.in:358 msgid "" "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 " @@ -8325,96 +8355,96 @@ msgid "" "connection." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:356 +#: src/libnmc-setting/settings-docs.h.in:359 msgid "The routing table for this VRF." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:357 +#: src/libnmc-setting/settings-docs.h.in:360 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:358 +#: src/libnmc-setting/settings-docs.h.in:361 msgid "" "Specifies the UDP destination port to communicate to the remote VXLAN tunnel " "endpoint." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:359 +#: src/libnmc-setting/settings-docs.h.in:362 msgid "" "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:360 +#: src/libnmc-setting/settings-docs.h.in:363 msgid "Specifies whether netlink LL ADDR miss notifications are generated." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:361 +#: src/libnmc-setting/settings-docs.h.in:364 msgid "Specifies whether netlink IP ADDR miss notifications are generated." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:362 +#: src/libnmc-setting/settings-docs.h.in:365 msgid "" "Specifies whether unknown source link layer addresses and IP addresses are " "entered into the VXLAN device forwarding database." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:363 +#: src/libnmc-setting/settings-docs.h.in:366 msgid "" "Specifies the maximum number of FDB entries. A value of zero means that the " "kernel will store unlimited entries." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:364 +#: src/libnmc-setting/settings-docs.h.in:367 msgid "If given, specifies the source IP address to use in outgoing packets." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:365 +#: src/libnmc-setting/settings-docs.h.in:368 msgid "" "If given, specifies the parent interface name or parent connection UUID." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:366 +#: src/libnmc-setting/settings-docs.h.in:369 msgid "Specifies whether ARP proxy is turned on." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:367 +#: src/libnmc-setting/settings-docs.h.in:370 msgid "" "Specifies the unicast destination IP address to use in outgoing packets when " "the destination link layer address is not known in the VXLAN device " "forwarding database, or the multicast IP address to join." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:368 +#: src/libnmc-setting/settings-docs.h.in:371 msgid "Specifies whether route short circuit is turned on." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:369 +#: src/libnmc-setting/settings-docs.h.in:372 msgid "" "Specifies the maximum UDP source port to communicate to the remote VXLAN " "tunnel endpoint." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:370 +#: src/libnmc-setting/settings-docs.h.in:373 msgid "" "Specifies the minimum UDP source port to communicate to the remote VXLAN " "tunnel endpoint." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:371 +#: src/libnmc-setting/settings-docs.h.in:374 msgid "Specifies the TOS value to use in outgoing packets." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:372 +#: src/libnmc-setting/settings-docs.h.in:375 msgid "Specifies the time-to-live value to use in outgoing packets." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:373 +#: src/libnmc-setting/settings-docs.h.in:376 msgid "" "The P2P device that should be connected to. Currently, this is the only way " "to create or join a group." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:374 +#: src/libnmc-setting/settings-docs.h.in:377 msgid "" "The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display " "requires a protocol specific information element to be set in certain Wi-Fi " @@ -8423,27 +8453,27 @@ msgid "" "client." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:375 +#: src/libnmc-setting/settings-docs.h.in:378 msgid "" "Flags indicating which mode of WPS is to be used. There's little point in " "changing the default setting as NetworkManager will automatically determine " "the best method to use." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:376 +#: src/libnmc-setting/settings-docs.h.in:379 msgid "" "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)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:377 +#: src/libnmc-setting/settings-docs.h.in:380 msgid "" "Network Service Provider (NSP) name of the WiMAX network this connection " "should use." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:378 +#: src/libnmc-setting/settings-docs.h.in:381 msgid "" "When TRUE, setup the interface to accept packets for all MAC addresses. This " "is enabling the kernel interface flag IFF_PROMISC. When FALSE, the interface " @@ -8451,7 +8481,7 @@ msgid "" "broadcast." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:379 +#: src/libnmc-setting/settings-docs.h.in:382 msgid "" "When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" " "and \"duplex\" properties are both specified, only that single mode will be " @@ -8462,7 +8492,7 @@ msgid "" "will be skipped." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:380 +#: src/libnmc-setting/settings-docs.h.in:383 msgid "" "If specified, request that the device use this MAC address instead. This is " "known as MAC cloning or spoofing. Beside explicitly specifying a MAC " @@ -8479,7 +8509,7 @@ msgid "" "deprecated \"cloned-mac-address\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:381 +#: src/libnmc-setting/settings-docs.h.in:384 msgid "" "When a value is set, either \"half\" or \"full\", configures the device to " "use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the " @@ -8494,8 +8524,8 @@ msgid "" "your device supports it." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:382 -#: src/libnmc-setting/settings-docs.h.in:406 +#: src/libnmc-setting/settings-docs.h.in:385 +#: src/libnmc-setting/settings-docs.h.in:409 msgid "" "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all " "bits of the MAC address are scrambled and a locally-administered, unicast " @@ -8522,29 +8552,29 @@ msgid "" "administered." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:383 +#: src/libnmc-setting/settings-docs.h.in:386 msgid "" "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)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:384 +#: src/libnmc-setting/settings-docs.h.in:387 msgid "" "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)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:385 -#: src/libnmc-setting/settings-docs.h.in:412 -#: src/libnmc-setting/settings-docs.h.in:458 +#: src/libnmc-setting/settings-docs.h.in:388 +#: src/libnmc-setting/settings-docs.h.in:415 +#: src/libnmc-setting/settings-docs.h.in:461 msgid "" "If non-zero, only transmit packets of the specified size or smaller, " "breaking larger packets up into multiple Ethernet frames." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:386 +#: src/libnmc-setting/settings-docs.h.in:389 msgid "" "Specific port type to use if the device supports multiple attachment " "methods. One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), " @@ -8552,13 +8582,13 @@ msgid "" "device supports only one port type, this setting is ignored." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:387 +#: src/libnmc-setting/settings-docs.h.in:390 msgid "" "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing " "the different types of virtual network devices available on s390 systems." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:388 +#: src/libnmc-setting/settings-docs.h.in:391 msgid "" "Dictionary of key/value pairs of s390-specific device options. Both keys " "and values must be strings. Allowed keys include \"portno\", \"layer2\", " @@ -8568,7 +8598,7 @@ msgid "" "which parses this information and applies it to the interface." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:389 +#: src/libnmc-setting/settings-docs.h.in:392 msgid "" "Identifies specific subchannels that this network device uses for " "communication with z/VM or s390 host. Like the \"mac-address\" property for " @@ -8578,7 +8608,7 @@ msgid "" "hexadecimal characters and the period (.) character." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:390 +#: src/libnmc-setting/settings-docs.h.in:393 msgid "" "When a value greater than 0 is set, configures the device to use the " "specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will " @@ -8593,7 +8623,7 @@ msgid "" "sure your device supports it." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:391 +#: src/libnmc-setting/settings-docs.h.in:394 msgid "" "The NMSettingWiredWakeOnLan options to enable. Not all devices support all " "options. May be any combination of \"phy\" (0x2), \"unicast\" (0x4), " @@ -8602,14 +8632,14 @@ msgid "" "\"ignore\" (0x8000) (to disable management of Wake-on-LAN in NetworkManager)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:392 +#: src/libnmc-setting/settings-docs.h.in:395 msgid "" "If specified, the password used with magic-packet-based Wake-on-LAN, " "represented as an Ethernet MAC address. If NULL, no password will be " "required." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:393 +#: src/libnmc-setting/settings-docs.h.in:396 msgid "" "The use of fwmark is optional and is by default off. Setting it to 0 " "disables it. Otherwise, it is a 32-bit fwmark for outgoing packets. Note " @@ -8617,7 +8647,7 @@ msgid "" "implies to automatically choose a fwmark." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:394 +#: src/libnmc-setting/settings-docs.h.in:397 msgid "" "Whether to enable special handling of the IPv4 default route. If enabled, " "the IPv4 default route from wireguard.peer-routes will be placed to a " @@ -8635,17 +8665,17 @@ msgid "" "want to configure your own routing and rules." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:395 +#: src/libnmc-setting/settings-docs.h.in:398 msgid "Like ip4-auto-default-route, but for the IPv6 default route." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:396 +#: src/libnmc-setting/settings-docs.h.in:399 msgid "" "The listen-port. If listen-port is not specified, the port will be chosen " "randomly when the interface comes up." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:397 +#: src/libnmc-setting/settings-docs.h.in:400 msgid "" "If non-zero, only transmit packets of the specified size or smaller, " "breaking larger packets up into multiple fragments. If zero a default MTU is " @@ -8653,7 +8683,7 @@ msgid "" "account the current routes at the time of activation." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:398 +#: src/libnmc-setting/settings-docs.h.in:401 msgid "" "Whether to automatically add routes for the AllowedIPs ranges of the peers. " "If TRUE (the default), NetworkManager will automatically add routes in the " @@ -8666,15 +8696,15 @@ msgid "" "be added automatically." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:399 +#: src/libnmc-setting/settings-docs.h.in:402 msgid "The 256 bit private-key in base64 encoding." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:400 +#: src/libnmc-setting/settings-docs.h.in:403 msgid "Flags indicating how to handle the \"private-key\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:401 +#: src/libnmc-setting/settings-docs.h.in:404 msgid "" "Configures AP isolation, which prevents communication between wireless " "devices connected to this AP. This property can be set to a value different " @@ -8688,7 +8718,7 @@ msgid "" "unspecified it is assumed to be \"false\" (0)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:402 +#: src/libnmc-setting/settings-docs.h.in:405 msgid "" "802.11 frequency band of the network. One of \"a\" for 5GHz 802.11a or " "\"bg\" for 2.4GHz 802.11. This will lock associations to the Wi-Fi network " @@ -8698,7 +8728,7 @@ msgid "" "and may not work with all drivers." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:403 +#: src/libnmc-setting/settings-docs.h.in:406 msgid "" "If specified, directs the device to only associate with the given access " "point. This capability is highly driver dependent and not supported by all " @@ -8708,7 +8738,7 @@ msgid "" "scanning. That can be useful, if there is only one access point for the SSID." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:404 +#: src/libnmc-setting/settings-docs.h.in:407 msgid "" "Wireless channel to use for the Wi-Fi connection. The device will only join " "(or create for Ad-Hoc networks) a Wi-Fi network on the specified channel. " @@ -8716,7 +8746,7 @@ msgid "" "the \"band\" property to be set." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:405 +#: src/libnmc-setting/settings-docs.h.in:408 msgid "" "If specified, request that the device use this MAC address instead. This is " "known as MAC cloning or spoofing. Beside explicitly specifying a MAC " @@ -8734,7 +8764,7 @@ msgid "" "mac-address\" or the deprecated \"cloned-mac-address\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:407 +#: src/libnmc-setting/settings-docs.h.in:410 msgid "" "If TRUE, indicates that the network is a non-broadcasting network that hides " "its SSID. This works both in infrastructure and AP mode. In infrastructure " @@ -8747,21 +8777,21 @@ msgid "" "mode), as the explicit probe-scans are distinctly recognizable on the air." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:408 +#: src/libnmc-setting/settings-docs.h.in:411 msgid "" "If specified, this connection will only apply to the Wi-Fi device whose " "permanent MAC address matches. This property does not change the MAC address " "of the device (i.e. MAC spoofing)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:409 +#: src/libnmc-setting/settings-docs.h.in:412 msgid "" "A list of permanent MAC addresses of Wi-Fi devices to which this connection " "should never apply. Each MAC address should be given in the standard hex-" "digits-and-colons notation (eg \"00:11:22:33:44:55\")." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:410 +#: src/libnmc-setting/settings-docs.h.in:413 msgid "" "One of \"default\" (0) (never randomize unless the user has set a global " "default to randomize and the supplicant supports randomization), " @@ -8769,13 +8799,13 @@ msgid "" "randomize the MAC address)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:411 +#: src/libnmc-setting/settings-docs.h.in:414 msgid "" "Wi-Fi network mode; one of \"infrastructure\", \"mesh\", \"adhoc\" or " "\"ap\". If blank, infrastructure is assumed." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:413 +#: src/libnmc-setting/settings-docs.h.in:416 msgid "" "One of \"disable\" (2) (disable Wi-Fi power saving), \"enable\" (3) (enable " "Wi-Fi power saving), \"ignore\" (1) (don't touch currently configure " @@ -8783,12 +8813,12 @@ msgid "" "values are reserved." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:414 #: src/libnmc-setting/settings-docs.h.in:417 +#: src/libnmc-setting/settings-docs.h.in:420 msgid "This property is not implemented and has no effect." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:415 +#: src/libnmc-setting/settings-docs.h.in:418 msgid "" "A list of BSSIDs (each BSSID formatted as a MAC address like " "\"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi " @@ -8800,11 +8830,11 @@ msgid "" "in \"/var/lib/NetworkManager/seen-bssids\" file." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:416 +#: src/libnmc-setting/settings-docs.h.in:419 msgid "SSID of the Wi-Fi network. Must be specified." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:418 +#: src/libnmc-setting/settings-docs.h.in:421 msgid "" "The NMSettingWirelessWakeOnWLan options to enable. Not all devices support " "all options. May be any combination of \"any\" (0x2), \"disconnect\" (0x4), " @@ -8815,7 +8845,7 @@ msgid "" "NetworkManager)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:419 +#: src/libnmc-setting/settings-docs.h.in:422 msgid "" "When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the " "802.11 authentication algorithm required by the AP here. One of \"open\" " @@ -8824,7 +8854,7 @@ msgid "" "the \"leap-username\" and \"leap-password\" properties must be specified." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:420 +#: src/libnmc-setting/settings-docs.h.in:423 msgid "" "Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the " "connection. One of \"default\" (0) (use global default value), " @@ -8834,7 +8864,7 @@ msgid "" "default is set, FILS will be optionally enabled." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:421 +#: src/libnmc-setting/settings-docs.h.in:424 msgid "" "A list of group/broadcast encryption algorithms which prevents connections " "to Wi-Fi networks that do not utilize one of the algorithms in the list. " @@ -8842,7 +8872,7 @@ msgid "" "be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:422 +#: src/libnmc-setting/settings-docs.h.in:425 msgid "" "Key management used for the connection. One of \"none\" (WEP or no password " "protection), \"ieee8021x\" (Dynamic WEP), \"owe\" (Opportunistic Wireless " @@ -8852,23 +8882,23 @@ msgid "" "uses security." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:423 +#: src/libnmc-setting/settings-docs.h.in:426 msgid "" "The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" " "and auth-alg = \"leap\")." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:424 +#: src/libnmc-setting/settings-docs.h.in:427 msgid "Flags indicating how to handle the \"leap-password\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:425 +#: src/libnmc-setting/settings-docs.h.in:428 msgid "" "The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" " "and auth-alg = \"leap\")." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:426 +#: src/libnmc-setting/settings-docs.h.in:429 msgid "" "A list of pairwise encryption algorithms which prevents connections to Wi-Fi " "networks that do not utilize one of the algorithms in the list. For maximum " @@ -8876,7 +8906,7 @@ msgid "" "\"tkip\" or \"ccmp\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:427 +#: src/libnmc-setting/settings-docs.h.in:430 msgid "" "Indicates whether Protected Management Frames (802.11w) must be enabled for " "the connection. One of \"default\" (0) (use global default value), " @@ -8886,14 +8916,14 @@ msgid "" "default is set, PMF will be optionally enabled." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:428 +#: src/libnmc-setting/settings-docs.h.in:431 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:429 +#: src/libnmc-setting/settings-docs.h.in:432 msgid "" "Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII " "passphrase of 8 to 63 characters that is (as specified in the 802.11i " @@ -8902,17 +8932,17 @@ msgid "" "length for SAE authentication." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:430 +#: src/libnmc-setting/settings-docs.h.in:433 msgid "Flags indicating how to handle the \"psk\" property." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:431 +#: src/libnmc-setting/settings-docs.h.in:434 msgid "" "Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", " "and \"wep-key3\" properties." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:432 +#: src/libnmc-setting/settings-docs.h.in:435 msgid "" "Controls the interpretation of WEP keys. Allowed values are \"key\" (1), in " "which case the key is either a 10- or 26-character hexadecimal string, or a " @@ -8921,31 +8951,31 @@ msgid "" "method to derive the actual WEP key." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:433 +#: src/libnmc-setting/settings-docs.h.in:436 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:434 +#: src/libnmc-setting/settings-docs.h.in:437 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:435 +#: src/libnmc-setting/settings-docs.h.in:438 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:436 +#: src/libnmc-setting/settings-docs.h.in:439 msgid "" "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." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:437 +#: src/libnmc-setting/settings-docs.h.in:440 msgid "" "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 " @@ -8953,7 +8983,7 @@ msgid "" "Linksys WRT54G) number the keys 1 - 4." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:438 +#: src/libnmc-setting/settings-docs.h.in:441 msgid "" "Flags indicating which mode of WPS is to be used if any. There's little " "point in changing the default setting as NetworkManager will automatically " @@ -8962,33 +8992,33 @@ msgid "" "of 1." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:439 +#: src/libnmc-setting/settings-docs.h.in:442 msgid "" "IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use " "whatever the device is already set to\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:440 +#: src/libnmc-setting/settings-docs.h.in:443 msgid "" "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) " "MAC layer device whose permanent MAC address matches." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:441 +#: src/libnmc-setting/settings-docs.h.in:444 msgid "" "IEEE 802.15.4 channel page. A positive integer or -1, meaning \"do not set, " "use whatever the device is already set to\"." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:442 +#: src/libnmc-setting/settings-docs.h.in:445 msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:443 +#: src/libnmc-setting/settings-docs.h.in:446 msgid "Short IEEE 802.15.4 address to be used within a restricted environment." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:444 +#: src/libnmc-setting/settings-docs.h.in:447 msgid "" "The port priority for bond active port re-selection during failover. A " "higher number means a higher priority in selection. The primary port has the " @@ -8996,13 +9026,13 @@ msgid "" "tlb and balance-alb modes." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:445 +#: src/libnmc-setting/settings-docs.h.in:448 msgid "" "The queue ID of this bond port. The maximum value of queue ID is the number " "of TX queues currently active in device." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:446 +#: src/libnmc-setting/settings-docs.h.in:449 msgid "" "Whether the system hostname can be determined from DHCP on this connection. " "When set to \"default\" (-1), the value from global configuration is used. " @@ -9010,7 +9040,7 @@ msgid "" "NetworkManager assumes the value to be \"true\" (1)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:447 +#: src/libnmc-setting/settings-docs.h.in:450 msgid "" "Whether the system hostname can be determined from reverse DNS lookup of " "addresses on this device. When set to \"default\" (-1), the value from " @@ -9018,7 +9048,7 @@ msgid "" "global configuration, NetworkManager assumes the value to be \"true\" (1)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:448 +#: src/libnmc-setting/settings-docs.h.in:451 msgid "" "If set to \"true\" (1), NetworkManager attempts to get the hostname via " "DHCPv4/DHCPv6 or reverse DNS lookup on this device only when the device has " @@ -9029,7 +9059,7 @@ msgid "" "configuration, NetworkManager assumes the value to be \"false\" (0)." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:449 +#: src/libnmc-setting/settings-docs.h.in:452 msgid "" "The relative priority of this connection to determine the system hostname. A " "lower numerical value is better (higher priority). A connection with higher " @@ -9043,62 +9073,62 @@ msgid "" "hostname." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:450 +#: src/libnmc-setting/settings-docs.h.in:453 msgid "The last byte of supervision address." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:451 +#: src/libnmc-setting/settings-docs.h.in:454 msgid "The port1 interface name of the HSR. This property is mandatory." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:452 +#: src/libnmc-setting/settings-docs.h.in:455 msgid "The port2 interface name of the HSR. This property is mandatory." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:453 +#: src/libnmc-setting/settings-docs.h.in:456 msgid "The protocol used by the interface, whether it is PRP or HSR." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:454 +#: src/libnmc-setting/settings-docs.h.in:457 msgid "" "The maximum size of a packet built by the Generic Receive Offload stack for " "this device. The value must be between 0 and 4294967295. When set to -1, the " "existing value is preserved." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:455 +#: src/libnmc-setting/settings-docs.h.in:458 msgid "" "The maximum segments of a Generic Segment Offload packet the device should " "accept. The value must be between 0 and 4294967295. When set to -1, the " "existing value is preserved." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:456 +#: src/libnmc-setting/settings-docs.h.in:459 msgid "" "The maximum size of a Generic Segment Offload packet the device should " "accept. The value must be between 0 and 4294967295. When set to -1, the " "existing value is preserved." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:457 +#: src/libnmc-setting/settings-docs.h.in:460 msgid "" "The size of the transmit queue for the device, in number of packets. The " "value must be between 0 and 4294967295. When set to -1, the existing value " "is preserved." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:459 +#: src/libnmc-setting/settings-docs.h.in:462 msgid "A dictionary of key/value pairs with external-ids for OVS." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:460 +#: src/libnmc-setting/settings-docs.h.in:463 msgid "" "A dictionary of key/value pairs with other_config settings for OVS. See also " "\"other_config\" in the \"ovs-vswitchd.conf.db\" manual for the keys that " "OVS supports." msgstr "" -#: src/libnmc-setting/settings-docs.h.in:461 +#: src/libnmc-setting/settings-docs.h.in:464 msgid "" "This property specifies the peer interface name of the veth. This property " "is mandatory." diff --git a/po/be@latin.gmo b/po/be@latin.gmo index 4d0411c0..b94da1aa 100644 --- a/po/be@latin.gmo +++ b/po/be@latin.gmo Binary files differdiff --git a/po/dz.gmo b/po/dz.gmo index 756a59d2..9a040aa0 100644 --- a/po/dz.gmo +++ b/po/dz.gmo Binary files differdiff --git a/src/core/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c index 193b655c..ab3a6be9 100644 --- a/src/core/devices/nm-device-bridge.c +++ b/src/core/devices/nm-device-bridge.c @@ -619,7 +619,27 @@ master_update_slave_connection(NMDevice *device, } static gboolean -bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge) +is_bridge_pvid_changed(NMDevice *device, NMSettingBridge *s_bridge) +{ + int ifindex = nm_device_get_ifindex(device); + const NMPlatformLnkBridge *nmp_link_br; + NMPlatform *platform = nm_device_get_platform(device); + bool desired_vlan_filtering = nm_setting_bridge_get_vlan_filtering(s_bridge); + guint16 desired_pvid = nm_setting_bridge_get_vlan_default_pvid(s_bridge); + + nm_platform_link_refresh(platform, ifindex); + nmp_link_br = nm_platform_link_get_lnk_bridge(platform, ifindex, NULL); + + if (nmp_link_br) { + return desired_vlan_filtering != nmp_link_br->vlan_filtering + || desired_pvid != nmp_link_br->default_pvid; + } else { + return TRUE; + } +} + +static gboolean +bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge, gboolean is_reapply) { NMDeviceBridge *self = NM_DEVICE_BRIDGE(device); gconstpointer hwaddr; @@ -660,31 +680,37 @@ bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge) self->vlan_configured = TRUE; - /* Filtering must be disabled to change the default PVID. - * Clear the default PVID so that we later can force the re-creation of - * default PVID VLANs by writing the option again. */ + if (!is_reapply || is_bridge_pvid_changed(device, s_bridge)) { + /* Filtering must be disabled to change the default PVID. + * Clear the default PVID so that we later can force the re-creation of + * default PVID VLANs by writing the option again. */ - nm_platform_link_set_bridge_info( - plat, - ifindex, - &((NMPlatformLinkSetBridgeInfoData){.vlan_filtering_has = TRUE, - .vlan_filtering_val = FALSE, - .vlan_default_pvid_has = TRUE, - .vlan_default_pvid_val = 0})); - - /* Clear all existing VLANs */ - if (!nm_platform_link_set_bridge_vlans(plat, ifindex, FALSE, NULL)) - return FALSE; + if (is_reapply) { + _LOGD(LOGD_BRIDGE, "default_pvid is changed, resetting bridge VLAN filtering"); + } - /* Now set the default PVID. After this point the kernel creates - * a PVID VLAN on each port, including the bridge itself. */ - pvid = nm_setting_bridge_get_vlan_default_pvid(s_bridge); - if (pvid) { nm_platform_link_set_bridge_info( plat, ifindex, - &((NMPlatformLinkSetBridgeInfoData){.vlan_default_pvid_has = TRUE, - .vlan_default_pvid_val = pvid})); + &((NMPlatformLinkSetBridgeInfoData){.vlan_filtering_has = TRUE, + .vlan_filtering_val = FALSE, + .vlan_default_pvid_has = TRUE, + .vlan_default_pvid_val = 0})); + + /* Clear all existing VLANs */ + if (!nm_platform_link_set_bridge_vlans(plat, ifindex, FALSE, NULL)) + return FALSE; + + /* Now set the default PVID. After this point the kernel creates + * a PVID VLAN on each port, including the bridge itself. */ + pvid = nm_setting_bridge_get_vlan_default_pvid(s_bridge); + if (pvid) { + nm_platform_link_set_bridge_info( + plat, + ifindex, + &((NMPlatformLinkSetBridgeInfoData){.vlan_default_pvid_has = TRUE, + .vlan_default_pvid_val = pvid})); + } } /* Create VLANs only after setting the default PVID, so that @@ -743,7 +769,7 @@ _platform_lnk_bridge_init_from_setting(NMSettingBridge *s_bridge, NMPlatformLnkB } static gboolean -link_config(NMDevice *device, NMConnection *connection) +link_config(NMDevice *device, NMConnection *connection, gboolean is_reapply) { int ifindex = nm_device_get_ifindex(device); NMSettingBridge *s_bridge; @@ -757,7 +783,7 @@ link_config(NMDevice *device, NMConnection *connection) if (nm_platform_link_bridge_change(nm_device_get_platform(device), ifindex, &props) < 0) return FALSE; - return bridge_set_vlan_options(device, s_bridge); + return bridge_set_vlan_options(device, s_bridge, is_reapply); } static NMActStageReturn @@ -768,7 +794,7 @@ act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason) connection = nm_device_get_applied_connection(device); g_return_val_if_fail(connection, NM_ACT_STAGE_RETURN_FAILURE); - if (!link_config(device, connection)) { + if (!link_config(device, connection, FALSE)) { NM_SET_OUT(out_failure_reason, NM_DEVICE_STATE_REASON_CONFIG_FAILED); return NM_ACT_STAGE_RETURN_FAILURE; } @@ -910,7 +936,7 @@ attach_port(NMDevice *device, s_port = nm_connection_get_setting_bridge_port(connection); if (!nm_device_sys_iface_state_is_external(device)) - bridge_set_vlan_options(device, s_bridge); + bridge_set_vlan_options(device, s_bridge, FALSE); if (nm_setting_bridge_get_vlan_filtering(s_bridge)) { gs_free const NMPlatformBridgeVlan **plat_vlans = NULL; @@ -1125,8 +1151,7 @@ reapply_connection(NMDevice *device, NMConnection *con_old, NMConnection *con_ne /* Make sure bridge_set_vlan_options() called by link_config() * sets vlan_filtering and default_pvid anew. */ self->vlan_configured = FALSE; - - link_config(device, con_new); + link_config(device, con_new, TRUE); } /*****************************************************************************/ diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 16f8e1f2..a9e8c085 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -2185,6 +2185,52 @@ out_good: return result; } +static guint8 +_prop_get_ipv4_dhcp_dscp(NMDevice *self, gboolean *out_dscp_explicit) +{ + gs_free_error GError *error = NULL; + NMConnection *connection; + NMSettingIPConfig *s_ip; + const char *str; + + connection = nm_device_get_applied_connection(self); + s_ip = nm_connection_get_setting_ip_config(connection, AF_INET); + g_return_val_if_fail(s_ip, 0); + + NM_SET_OUT(out_dscp_explicit, TRUE); + + str = nm_setting_ip_config_get_dhcp_dscp(s_ip); + if (str) { + nm_assert(nm_utils_validate_dhcp_dscp(str, NULL)); + } else { + str = nm_config_data_get_connection_default(NM_CONFIG_GET_DATA, + NM_CON_DEFAULT("ipv4.dhcp-dscp"), + self); + if (!str || !str[0]) { + str = "CS0"; + NM_SET_OUT(out_dscp_explicit, FALSE); + } else if (!nm_utils_validate_dhcp_dscp(str, &error)) { + _LOGW(LOGD_DEVICE, + "invalid global default value '%s' for ipv4.%s: %s", + str, + NM_SETTING_IP_CONFIG_DHCP_DSCP, + error->message); + str = "CS0"; + NM_SET_OUT(out_dscp_explicit, FALSE); + } + } + + if (nm_streq(str, "CS0")) { + return 0; + } else if (nm_streq(str, "CS6")) { + return 0x30; + } else if (nm_streq(str, "CS4")) { + return 0x20; + }; + + return nm_assert_unreachable_val(0); +} + static GBytes * _prop_get_ipv4_dhcp_vendor_class_identifier(NMDevice *self, NMSettingIP4Config *s_ip4) { @@ -10970,8 +11016,11 @@ _dev_ipdhcpx_start(NMDevice *self, int addr_family) const char *hostname; gboolean hostname_is_fqdn; gboolean send_client_id; + guint8 dscp; + gboolean dscp_explicit = FALSE; client_id = _prop_get_ipv4_dhcp_client_id(self, connection, hwaddr, &send_client_id); + dscp = _prop_get_ipv4_dhcp_dscp(self, &dscp_explicit); vendor_class_identifier = _prop_get_ipv4_dhcp_vendor_class_identifier(self, NM_SETTING_IP4_CONFIG(s_ip)); @@ -11010,6 +11059,8 @@ _dev_ipdhcpx_start(NMDevice *self, int addr_family) .request_broadcast = request_broadcast, .acd_timeout_msec = _prop_get_ipv4_dad_timeout(self), .send_client_id = send_client_id, + .dscp = dscp, + .dscp_explicit = dscp_explicit, }, .previous_lease = priv->l3cds[L3_CONFIG_DATA_TYPE_DHCP_X(IS_IPv4)].d, }; @@ -13369,6 +13420,7 @@ can_reapply_change(NMDevice *self, NM_SETTING_CONNECTION_STABLE_ID, NM_SETTING_CONNECTION_AUTOCONNECT, NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, + NM_SETTING_CONNECTION_AUTOCONNECT_PORTS, NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY, NM_SETTING_CONNECTION_ZONE, NM_SETTING_CONNECTION_METERED, diff --git a/src/core/dhcp/nm-dhcp-client.h b/src/core/dhcp/nm-dhcp-client.h index 4dd2c4fd..2b262f76 100644 --- a/src/core/dhcp/nm-dhcp-client.h +++ b/src/core/dhcp/nm-dhcp-client.h @@ -158,6 +158,13 @@ typedef struct { * is disabled. */ guint acd_timeout_msec; + /* The DSCP value to use */ + guint8 dscp; + + /* Whether the DSCP value is explicitly set (or it is the default + * one) */ + bool dscp_explicit : 1; + /* Set BOOTP broadcast flag in request packets, so that servers * will always broadcast replies. */ bool request_broadcast : 1; diff --git a/src/core/dhcp/nm-dhcp-dhclient.c b/src/core/dhcp/nm-dhcp-dhclient.c index 2a3af10a..043c2264 100644 --- a/src/core/dhcp/nm-dhcp-dhclient.c +++ b/src/core/dhcp/nm-dhcp-dhclient.c @@ -457,6 +457,11 @@ dhclient_start(NMDhcpClient *client, g_ptr_array_add(argv, (gpointer) priv->conf_file); } + if (client_config->v4.dscp_explicit) { + _LOGW("dhclient does not support specifying a custom DSCP value; the TOS field will be set " + "to LOWDELAY (0x10)."); + } + /* Usually the system bus address is well-known; but if it's supposed * to be something else, we need to push it to dhclient, since dhclient * sanitizes the environment it gives the action scripts. diff --git a/src/core/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c index fc468d4c..ce1e9a45 100644 --- a/src/core/dhcp/nm-dhcp-nettools.c +++ b/src/core/dhcp/nm-dhcp-nettools.c @@ -1388,6 +1388,8 @@ ip4_start(NMDhcpClient *client, GError **error) } } + n_dhcp4_client_probe_config_set_dscp(config, client_config->v4.dscp); + if (client_config->hostname) { if (client_config->use_fqdn) { uint8_t buffer[255]; diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index 9c58a47d..2cf9cb1d 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -5333,14 +5333,14 @@ find_slaves(NMManager *manager, static gboolean should_connect_slaves(NMConnection *connection, NMDevice *device) { - NMSettingConnection *s_con; - NMSettingConnectionAutoconnectSlaves val; + NMSettingConnection *s_con; + NMTernary val; s_con = nm_connection_get_setting_connection(connection); g_assert(s_con); - val = nm_setting_connection_get_autoconnect_slaves(s_con); - if (val != NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT) + val = nm_setting_connection_get_autoconnect_ports(s_con); + if (val != NM_TERNARY_DEFAULT) goto out; val = @@ -5352,9 +5352,9 @@ should_connect_slaves(NMConnection *connection, NMDevice *device) -1); out: - if (val == NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO) + if (val == NM_TERNARY_FALSE) return FALSE; - if (val == NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES) + if (val == NM_TERNARY_TRUE) return TRUE; return FALSE; } diff --git a/src/core/platform/tests/test-link.c b/src/core/platform/tests/test-link.c index c931605b..205559ce 100644 --- a/src/core/platform/tests/test-link.c +++ b/src/core/platform/tests/test-link.c @@ -1424,6 +1424,8 @@ test_software_detect(gconstpointer user_data) lnk_bridge.mcast_query_interval = 12000; lnk_bridge.mcast_query_response_interval = 5200; lnk_bridge.mcast_startup_query_interval = 3000; + lnk_bridge.vlan_filtering = FALSE; + lnk_bridge.default_pvid = 1; if (!nmtstp_link_bridge_add(NULL, ext, DEVICE_NAME, &lnk_bridge)) g_error("Failed adding Bridge interface"); diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index e703bb73..07e5e64d 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -3360,6 +3360,8 @@ do_write_construct(NMConnection *connection, GError **error) { NMSettingConnection *s_con; + NMSettingIPConfig *s_ip4; + NMSettingIPConfig *s_ip6; nm_auto_shvar_file_close shvarFile *ifcfg = NULL; const char *ifcfg_name; gs_free char *ifcfg_name_free = NULL; @@ -3546,8 +3548,6 @@ do_write_construct(NMConnection *connection, has_complex_routes_v6 = utils_has_complex_routes(ifcfg_name, AF_INET6); if (has_complex_routes_v4 || has_complex_routes_v6) { - NMSettingIPConfig *s_ip4, *s_ip6; - s_ip4 = nm_connection_get_setting_ip4_config(connection); s_ip6 = nm_connection_get_setting_ip6_config(connection); if ((s_ip4 && nm_setting_ip_config_get_num_routes(s_ip4) > 0) @@ -3584,6 +3584,15 @@ do_write_construct(NMConnection *connection, } else route_ignore = FALSE; + if ((s_ip4 = nm_connection_get_setting_ip4_config(connection)) + && nm_setting_ip_config_get_dhcp_dscp(s_ip4)) { + set_error_unsupported(error, + connection, + NM_SETTING_IP4_CONFIG_SETTING_NAME "." NM_SETTING_IP_CONFIG_DHCP_DSCP, + FALSE); + return FALSE; + } + write_ip4_setting(connection, ifcfg, !route_ignore && route_path_is_svformat ? &route_content_svformat : NULL, diff --git a/src/libnm-base/nm-base.c b/src/libnm-base/nm-base.c index 6e164908..54d89e1f 100644 --- a/src/libnm-base/nm-base.c +++ b/src/libnm-base/nm-base.c @@ -54,7 +54,8 @@ nm_dhcp_iaid_from_hexstr(const char *str, guint32 *out_value) const char * nm_net_devname_infiniband(char name[static NM_IFNAMSIZ], const char *parent_name, int p_key) { - g_return_val_if_fail(name, NULL); + nm_assert(name); + g_return_val_if_fail(parent_name && parent_name[0], NULL); g_return_val_if_fail(strlen(parent_name) < NM_IFNAMSIZ, NULL); diff --git a/src/libnm-client-impl/libnm.ver b/src/libnm-client-impl/libnm.ver index 3b603b81..f4c92401 100644 --- a/src/libnm-client-impl/libnm.ver +++ b/src/libnm-client-impl/libnm.ver @@ -1956,6 +1956,7 @@ global: nm_device_ip_tunnel_get_fwmark; nm_ethtool_optname_is_channels; nm_ethtool_optname_is_eee; + nm_setting_connection_get_autoconnect_ports; nm_setting_connection_get_controller; nm_setting_connection_get_port_type; nm_setting_hsr_get_multicast_spec; @@ -1964,4 +1965,5 @@ global: nm_setting_hsr_get_prp; nm_setting_hsr_get_type; nm_setting_hsr_new; + nm_setting_ip_config_get_dhcp_dscp; } libnm_1_44_0; diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.c b/src/libnm-core-aux-intern/nm-libnm-core-utils.c index 3e317e5b..b38accb2 100644 --- a/src/libnm-core-aux-intern/nm-libnm-core-utils.c +++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.c @@ -462,6 +462,23 @@ nm_utils_validate_dhcp4_vendor_class_id(const char *vci, GError **error) } gboolean +nm_utils_validate_dhcp_dscp(const char *dscp, GError **error) +{ + g_return_val_if_fail(!error || !(*error), FALSE); + g_return_val_if_fail(dscp, FALSE); + + if (!NM_IN_STRSET(dscp, "CS0", "CS4", "CS6")) { + g_set_error_literal(error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("invalid DSCP value; allowed values are: 'CS0', 'CS4', 'CS6'")); + return FALSE; + } + + return TRUE; +} + +gboolean nm_settings_connection_validate_permission_user(const char *item, gssize len) { gsize l; diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.h b/src/libnm-core-aux-intern/nm-libnm-core-utils.h index b1336731..454fe4b3 100644 --- a/src/libnm-core-aux-intern/nm-libnm-core-utils.h +++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.h @@ -273,6 +273,7 @@ NMClientPermissionResult nm_client_permission_result_from_string(const char *nm) const char *nm_client_permission_result_to_string(NMClientPermissionResult permission); gboolean nm_utils_validate_dhcp4_vendor_class_id(const char *vci, GError **error); +gboolean nm_utils_validate_dhcp_dscp(const char *dscp, GError **error); /*****************************************************************************/ diff --git a/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in b/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in index e008b135..84220043 100644 --- a/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in +++ b/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in @@ -767,6 +767,10 @@ dbus-type="b" gprop-type="gboolean" /> + <property name="autoconnect-ports" + dbus-type="i" + gprop-type="NMTernary" + /> <property name="autoconnect-priority" dbus-type="i" gprop-type="gint" @@ -776,6 +780,7 @@ gprop-type="gint" /> <property name="autoconnect-slaves" + is-deprecated="1" dbus-type="i" gprop-type="NMSettingConnectionAutoconnectSlaves" /> @@ -1559,6 +1564,10 @@ dbus-type="s" gprop-type="gchararray" /> + <property name="dhcp-dscp" + dbus-type="s" + gprop-type="gchararray" + /> <property name="dhcp-fqdn" dbus-type="s" gprop-type="gchararray" @@ -1690,6 +1699,10 @@ dbus-type="i" gprop-type="gint" /> + <property name="dhcp-dscp" + dbus-type="s" + gprop-type="gchararray" + /> <property name="dhcp-duid" dbus-type="s" gprop-type="gchararray" diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c index 892e7d31..616a3e5e 100644 --- a/src/libnm-core-impl/nm-setting-connection.c +++ b/src/libnm-core-impl/nm-setting-connection.c @@ -60,6 +60,7 @@ NM_GOBJECT_PROPERTIES_DEFINE(NMSettingConnection, PROP_SLAVE_TYPE, PROP_PORT_TYPE, PROP_AUTOCONNECT_SLAVES, + PROP_AUTOCONNECT_PORTS, PROP_SECONDARIES, PROP_GATEWAY_PING_TIMEOUT, PROP_METERED, @@ -87,7 +88,7 @@ typedef struct { char *zone; char *mud_url; guint64 timestamp; - int autoconnect_slaves; + int autoconnect_ports; int metered; gint32 autoconnect_priority; gint32 autoconnect_retries; @@ -828,6 +829,25 @@ nm_setting_connection_get_wait_activation_delay(NMSettingConnection *setting) } /** + * nm_setting_connection_get_autoconnect_ports: + * @setting: the #NMSettingConnection + * + * Returns the #NMSettingConnection:autoconnect-ports property of the connection. + * + * Returns: whether ports of the connection should be activated together + * with the connection. + * + * Since: 1.46 + **/ +NMTernary +nm_setting_connection_get_autoconnect_ports(NMSettingConnection *setting) +{ + g_return_val_if_fail(NM_IS_SETTING_CONNECTION(setting), NM_TERNARY_DEFAULT); + + return NM_SETTING_CONNECTION_GET_PRIVATE(setting)->autoconnect_ports; +} + +/** * nm_setting_connection_get_autoconnect_slaves: * @setting: the #NMSettingConnection * @@ -837,14 +857,15 @@ nm_setting_connection_get_wait_activation_delay(NMSettingConnection *setting) * with the connection. * * Since: 1.2 + * + * Deprecated: 1.46. Use nm_setting_connection_get_autoconnect_ports() instead, this + * is just an alias. **/ NMSettingConnectionAutoconnectSlaves nm_setting_connection_get_autoconnect_slaves(NMSettingConnection *setting) { - g_return_val_if_fail(NM_IS_SETTING_CONNECTION(setting), - NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT); - - return NM_SETTING_CONNECTION_GET_PRIVATE(setting)->autoconnect_slaves; + return (NMSettingConnectionAutoconnectSlaves) nm_setting_connection_get_autoconnect_ports( + setting); } GArray * @@ -1911,6 +1932,24 @@ _nm_setting_connection_slave_type_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARG return TRUE; } +gboolean +_nm_setting_connection_autoconnect_slaves_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil) +{ + gint32 autoconnect; + + if (!_nm_setting_use_legacy_property(setting, + connection_dict, + NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, + NM_SETTING_CONNECTION_AUTOCONNECT_PORTS)) { + *out_is_modified = FALSE; + return TRUE; + } + autoconnect = g_variant_get_int32(value); + + g_object_set(setting, NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, autoconnect, NULL); + return TRUE; +} + GVariant * _nm_setting_connection_port_type_to_dbus(_NM_SETT_INFO_PROP_TO_DBUS_FCN_ARGS _nm_nil) { @@ -1952,6 +1991,45 @@ _nm_setting_connection_port_type_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS return TRUE; } +GVariant * +_nm_setting_connection_autoconnect_ports_to_dbus(_NM_SETT_INFO_PROP_TO_DBUS_FCN_ARGS _nm_nil) +{ + NMTernary autoconnect; + + /* FIXME: `autoconnect-ports` is an alias of `autoconnect-slaves` property. + * Serializing the property to the clients would break them as they won't + * be able to drop it if they are not aware of the existance of + * `autoconnect-ports`. In order to give them time to adapt their code, + * NetworkManager is not serializing `autoconnect-ports` on DBus. + */ + if (_nm_utils_is_manager_process) { + return NULL; + } + + autoconnect = nm_setting_connection_get_autoconnect_ports(NM_SETTING_CONNECTION(setting)); + + return g_variant_new_int32(autoconnect); +} + +gboolean +_nm_setting_connection_autoconnect_ports_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil) +{ + NMTernary autoconnect; + + /* Ignore 'autoconnect-ports' if we're going to process 'autoconnect-slaves' */ + if (_nm_setting_use_legacy_property(setting, + connection_dict, + NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, + NM_SETTING_CONNECTION_AUTOCONNECT_PORTS)) { + *out_is_modified = FALSE; + return TRUE; + } + autoconnect = g_variant_get_int32(value); + + g_object_set(setting, NM_SETTING_CONNECTION_AUTOCONNECT_PORTS, autoconnect, NULL); + return TRUE; +} + /*****************************************************************************/ static void @@ -2458,7 +2536,8 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) NMSettingConnectionPrivate, controller, .direct_string_allow_empty = TRUE, - .is_deprecated = TRUE); + .is_deprecated = TRUE, + .direct_is_aliased_field = TRUE, ); /** * NMSettingConnection:controller: @@ -2518,8 +2597,9 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) _nm_setting_connection_slave_type_from_dbus, ), NMSettingConnectionPrivate, port_type, - .is_deprecated = 1, - .direct_string_allow_empty = TRUE); + .is_deprecated = TRUE, + .direct_string_allow_empty = TRUE, + .direct_is_aliased_field = TRUE, ); /** * NMSettingConnection:port-type: @@ -2564,6 +2644,8 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) * determine the real value. If it is default as well, this fallbacks to 0. * * Since: 1.2 + * + * Deprecated 1.46. Use #NMSettingConnection:autoconnect-ports instead, this is just an alias. **/ /* ---ifcfg-rh--- * property: autoconnect-slaves @@ -2573,15 +2655,60 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) * when this connection is activated. * ---end--- */ - _nm_setting_property_define_direct_enum(properties_override, - obj_properties, - NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, - PROP_AUTOCONNECT_SLAVES, - NM_TYPE_SETTING_CONNECTION_AUTOCONNECT_SLAVES, - NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT, - NM_SETTING_PARAM_FUZZY_IGNORE, - NMSettingConnectionPrivate, - autoconnect_slaves); + prop_idx = _nm_setting_property_define_direct_enum( + properties_override, + obj_properties, + NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, + PROP_AUTOCONNECT_SLAVES, + NM_TYPE_SETTING_CONNECTION_AUTOCONNECT_SLAVES, + NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT, + NM_SETTING_PARAM_FUZZY_IGNORE, + NM_SETT_INFO_PROPERT_TYPE_DBUS(G_VARIANT_TYPE_INT32, + .direct_type = NM_VALUE_TYPE_ENUM, + .compare_fcn = _nm_setting_property_compare_fcn_direct, + .to_dbus_fcn = _nm_setting_property_to_dbus_fcn_direct, + .from_dbus_fcn = + _nm_setting_connection_autoconnect_slaves_from_dbus, ), + NMSettingConnectionPrivate, + autoconnect_ports, + .is_deprecated = 1, + .direct_is_aliased_field = TRUE, ); + + /** + * NMSettingConnection:autoconnect-ports: + * + * Whether or not ports of this connection should be automatically brought up + * when NetworkManager activates this connection. This only has a real effect + * for controller connections. The properties #NMSettingConnection:autoconnect, + * #NMSettingConnection:autoconnect-priority and #NMSettingConnection:autoconnect-retries + * are unrelated to this setting. + * The permitted values are: 0: leave port connections untouched, + * 1: activate all the port connections with this connection, -1: default. + * If -1 (default) is set, global connection.autoconnect-ports is read to + * determine the real value. If it is default as well, this fallbacks to 0. + * + * Since: 1.46 + **/ + _nm_setting_property_define_direct_enum( + properties_override, + obj_properties, + NM_SETTING_CONNECTION_AUTOCONNECT_PORTS, + PROP_AUTOCONNECT_PORTS, + NM_TYPE_TERNARY, + NM_TERNARY_DEFAULT, + NM_SETTING_PARAM_FUZZY_IGNORE, + NM_SETT_INFO_PROPERT_TYPE_DBUS( + G_VARIANT_TYPE_INT32, + .direct_type = NM_VALUE_TYPE_ENUM, + .compare_fcn = _nm_setting_property_compare_fcn_direct, + .to_dbus_fcn = _nm_setting_connection_autoconnect_ports_to_dbus, + .from_dbus_fcn = _nm_setting_connection_autoconnect_ports_from_dbus, ), + NMSettingConnectionPrivate, + autoconnect_ports, + .direct_also_notify = obj_properties[PROP_AUTOCONNECT_SLAVES]); + + nm_g_array_index(properties_override, NMSettInfoProperty, prop_idx).direct_also_notify = + obj_properties[PROP_AUTOCONNECT_PORTS]; /** * NMSettingConnection:secondaries: @@ -2656,6 +2783,7 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) NM_TYPE_METERED, NM_METERED_UNKNOWN, NM_SETTING_PARAM_REAPPLY_IMMEDIATELY, + NULL, NMSettingConnectionPrivate, metered); diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c index bfebe7d1..8165cb2f 100644 --- a/src/libnm-core-impl/nm-setting-ip-config.c +++ b/src/libnm-core-impl/nm-setting-ip-config.c @@ -3993,6 +3993,7 @@ NM_GOBJECT_PROPERTIES_DEFINE(NMSettingIPConfig, PROP_IGNORE_AUTO_ROUTES, PROP_IGNORE_AUTO_DNS, PROP_DHCP_HOSTNAME, + PROP_DHCP_DSCP, PROP_DHCP_HOSTNAME_FLAGS, PROP_DHCP_SEND_HOSTNAME, PROP_NEVER_DEFAULT, @@ -5201,6 +5202,25 @@ nm_setting_ip_config_get_dhcp_send_hostname(NMSettingIPConfig *setting) } /** + * nm_setting_ip_config_get_dhcp_dscp: + * @setting: the #NMSettingIPConfig + * + * Returns the value contained in the #NMSettingIPConfig:dhcp-dscp + * property. + * + * Returns: the value for the DSCP field for DHCP + * + * Since: 1.46 + **/ +const char * +nm_setting_ip_config_get_dhcp_dscp(NMSettingIPConfig *setting) +{ + g_return_val_if_fail(NM_IS_SETTING_IP_CONFIG(setting), NULL); + + return NM_SETTING_IP_CONFIG_GET_PRIVATE(setting)->dhcp_dscp; +} + +/** * nm_setting_ip_config_get_never_default: * @setting: the #NMSettingIPConfig * @@ -5731,6 +5751,14 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } } + if (priv->dhcp_dscp && !nm_utils_validate_dhcp_dscp(priv->dhcp_dscp, error)) { + g_prefix_error(error, + "%s.%s: ", + nm_setting_get_name(setting), + NM_SETTING_IP_CONFIG_DHCP_DSCP); + return FALSE; + } + /* Normalizable errors */ if (priv->gateway && priv->never_default) { g_set_error(error, @@ -5983,6 +6011,12 @@ _nm_sett_info_property_override_create_array_ip_config(int addr_family) .direct_offset = NM_STRUCT_OFFSET_ENSURE_TYPE(char *, NMSettingIPConfigPrivate, dhcp_iaid), .direct_string_allow_empty = TRUE); + _nm_properties_override_gobj( + properties_override, + obj_properties[PROP_DHCP_DSCP], + &nm_sett_info_propert_type_direct_string, + .direct_offset = NM_STRUCT_OFFSET_ENSURE_TYPE(char *, NMSettingIPConfigPrivate, dhcp_dscp)); + /* ---dbus--- * property: routing-rules * format: array of 'a{sv}' @@ -6615,6 +6649,25 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** + * NMSettingIPConfig:dhcp-dscp: + * + * Specifies the value for the DSCP field (traffic class) of the IP header. When + * empty, the global default value is used; if no global default is specified, it is + * assumed to be "CS0". Allowed values are: "CS0", "CS4" and "CS6". + * + * The property is currently valid only for IPv4, and it is supported only by the + * "internal" DHCP plugin. + * + * Since: 1.46 + **/ + obj_properties[PROP_DHCP_DSCP] = + g_param_spec_string(NM_SETTING_IP_CONFIG_DHCP_DSCP, + "", + "", + NULL, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); + + /** * NMSettingIPConfig:never-default: * * If %TRUE, this connection will never be the default connection for this diff --git a/src/libnm-core-impl/nm-setting-ip6-config.c b/src/libnm-core-impl/nm-setting-ip6-config.c index 4ad09932..fc0744ad 100644 --- a/src/libnm-core-impl/nm-setting-ip6-config.c +++ b/src/libnm-core-impl/nm-setting-ip6-config.c @@ -386,6 +386,18 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } } + if (nm_setting_ip_config_get_dhcp_dscp(s_ip)) { + g_set_error_literal(error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("DHCP DSCP is not supported for IPv6")); + g_prefix_error(error, + "%s.%s: ", + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP_CONFIG_DHCP_DSCP); + return FALSE; + } + /* Failures from here on, are NORMALIZABLE_ERROR... */ if (token_needs_normalization) { @@ -936,6 +948,7 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) NM_TYPE_SETTING_IP6_CONFIG_PRIVACY, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, NM_SETTING_PARAM_NONE, + NULL, NMSettingIP6ConfigPrivate, ip6_privacy); diff --git a/src/libnm-core-impl/nm-setting-private.h b/src/libnm-core-impl/nm-setting-private.h index 9fe49de4..6bad516e 100644 --- a/src/libnm-core-impl/nm-setting-private.h +++ b/src/libnm-core-impl/nm-setting-private.h @@ -185,6 +185,7 @@ typedef struct { char *gateway; char *dhcp_hostname; char *dhcp_iaid; + char *dhcp_dscp; gint64 route_metric; int auto_route_ext_gw; int replace_local_rule; @@ -411,6 +412,15 @@ GVariant *_nm_setting_connection_port_type_to_dbus(_NM_SETT_INFO_PROP_TO_DBUS_FC gboolean _nm_setting_connection_slave_type_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); +gboolean +_nm_setting_connection_autoconnect_ports_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); + +GVariant * +_nm_setting_connection_autoconnect_ports_to_dbus(_NM_SETT_INFO_PROP_TO_DBUS_FCN_ARGS _nm_nil); + +gboolean +_nm_setting_connection_autoconnect_slaves_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); + GVariant *_nm_setting_to_dbus(NMSetting *setting, NMConnection *connection, NMConnectionSerializationFlags flags, @@ -901,12 +911,13 @@ _nm_properties_override(GArray *properties_override, const NMSettInfoProperty *p gtype_enum, \ default_value, \ param_flags, \ + property_type, \ private_struct_type, \ private_struct_field, \ ... /* extra NMSettInfoProperty fields */) \ - G_STMT_START \ - { \ - GParamSpec *_param_spec; \ + ({ \ + GParamSpec *_param_spec; \ + const NMSettInfoPropertType *_property_type; \ \ G_STATIC_ASSERT( \ !NM_FLAGS_ANY((param_flags), \ @@ -922,16 +933,16 @@ _nm_properties_override(GArray *properties_override, const NMSettInfoProperty *p | G_PARAM_STATIC_STRINGS | (param_flags)); \ \ (obj_properties)[(prop_id)] = _param_spec; \ + _property_type = (property_type) ?: &nm_sett_info_propert_type_direct_enum; \ \ _nm_properties_override_gobj( \ (properties_override), \ _param_spec, \ - &nm_sett_info_propert_type_direct_enum, \ + _property_type, \ .direct_offset = \ NM_STRUCT_OFFSET_ENSURE_TYPE(int, private_struct_type, private_struct_field), \ __VA_ARGS__); \ - } \ - G_STMT_END + }) /*****************************************************************************/ @@ -950,6 +961,7 @@ _nm_properties_override(GArray *properties_override, const NMSettInfoProperty *p NM_TYPE_TERNARY, \ NM_TERNARY_DEFAULT, \ (param_flags), \ + NULL, \ private_struct_type, \ private_struct_field, \ __VA_ARGS__) diff --git a/src/libnm-core-impl/nm-setting-team.c b/src/libnm-core-impl/nm-setting-team.c index 2195757f..191ed9ae 100644 --- a/src/libnm-core-impl/nm-setting-team.c +++ b/src/libnm-core-impl/nm-setting-team.c @@ -123,6 +123,7 @@ nm_team_link_watcher_new_ethtool(int delay_up, int delay_down, GError **error) } NM_PRAGMA_WARNING_DISABLE("-Warray-bounds") + NM_PRAGMA_WARNING_DISABLE("-Walloc-size") watcher = g_malloc(nm_offsetofend(NMTeamLinkWatcher, ethtool)); @@ -132,6 +133,7 @@ nm_team_link_watcher_new_ethtool(int delay_up, int delay_down, GError **error) watcher->ethtool.delay_down = delay_down; NM_PRAGMA_WARNING_REENABLE + NM_PRAGMA_WARNING_REENABLE return watcher; } diff --git a/src/libnm-core-impl/nm-setting-wireguard.c b/src/libnm-core-impl/nm-setting-wireguard.c index 1e7ed05b..c313d22c 100644 --- a/src/libnm-core-impl/nm-setting-wireguard.c +++ b/src/libnm-core-impl/nm-setting-wireguard.c @@ -311,10 +311,9 @@ _nm_wireguard_peer_set_public_key_bin(NMWireGuardPeer *self, { g_return_if_fail(NM_IS_WIREGUARD_PEER(self, FALSE)); - nm_clear_g_free(&self->public_key); + nm_assert(public_key); - if (!public_key) - return; + nm_clear_g_free(&self->public_key); self->public_key = g_base64_encode(public_key, NM_WIREGUARD_PUBLIC_KEY_LEN); self->public_key_valid = TRUE; diff --git a/src/libnm-core-impl/nm-setting-wireless.c b/src/libnm-core-impl/nm-setting-wireless.c index 152bbde3..244dcdcc 100644 --- a/src/libnm-core-impl/nm-setting-wireless.c +++ b/src/libnm-core-impl/nm-setting-wireless.c @@ -600,7 +600,7 @@ nm_setting_wireless_remove_mac_blacklist_item_by_value(NMSettingWireless *settin priv = NM_SETTING_WIRELESS_GET_PRIVATE(setting); for (i = 0; i < priv->mac_address_blacklist->len; i++) { candidate = nm_g_array_index(priv->mac_address_blacklist, char *, i); - if (!nm_utils_hwaddr_matches(mac, -1, candidate, -1)) { + if (nm_utils_hwaddr_matches(mac, -1, candidate, -1)) { g_array_remove_index(priv->mac_address_blacklist, i); _notify(setting, PROP_MAC_ADDRESS_BLACKLIST); return TRUE; diff --git a/src/libnm-core-impl/nm-setting.c b/src/libnm-core-impl/nm-setting.c index 758338e5..e6e4d23b 100644 --- a/src/libnm-core-impl/nm-setting.c +++ b/src/libnm-core-impl/nm-setting.c @@ -1077,7 +1077,7 @@ _init_direct(NMSetting *setting) int def_val; def_val = NM_G_PARAM_SPEC_GET_DEFAULT_ENUM(property_info->param_spec); - nm_assert(*p_val == 0); + nm_assert(NM_IN_SET(*p_val, 0, property_info->direct_is_aliased_field ? def_val : 0)); *p_val = def_val; break; } @@ -2638,7 +2638,8 @@ _nm_setting_property_compare_fcn_direct(_NM_SETT_INFO_PROP_COMPARE_FCN_ARGS _nm_ _nm_setting_property_to_dbus_fcn_direct, _nm_setting_property_to_dbus_fcn_direct_mac_address, _nm_setting_connection_controller_to_dbus, - _nm_setting_connection_port_type_to_dbus)); + _nm_setting_connection_port_type_to_dbus, + _nm_setting_connection_autoconnect_ports_to_dbus)); if (!property_info->param_spec) return nm_assert_unreachable_val(NM_TERNARY_DEFAULT); diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index 88df3291..761f74bd 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -5008,7 +5008,7 @@ nm_utils_bond_mode_string_to_int(const char *mode) struct _NMUtilsStrStrDictKey { char type; - char data[1]; + char data[]; }; guint diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c index 4acf33e0..bf0f272c 100644 --- a/src/libnm-core-impl/tests/test-general.c +++ b/src/libnm-core-impl/tests/test-general.c @@ -3962,7 +3962,7 @@ typedef struct { typedef struct { const char *name; - DiffKey keys[31]; + DiffKey keys[32]; } DiffSetting; #define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0])) @@ -4023,6 +4023,7 @@ test_connection_diff_a_only(void) {NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_DIFF_RESULT_IN_A}, {NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_DIFF_RESULT_IN_A}, {NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, NM_SETTING_DIFF_RESULT_IN_A}, + {NM_SETTING_CONNECTION_AUTOCONNECT_PORTS, NM_SETTING_DIFF_RESULT_IN_A}, {NM_SETTING_CONNECTION_SECONDARIES, NM_SETTING_DIFF_RESULT_IN_A}, {NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A}, {NM_SETTING_CONNECTION_METERED, NM_SETTING_DIFF_RESULT_IN_A}, @@ -4081,6 +4082,7 @@ test_connection_diff_a_only(void) {NM_SETTING_IP_CONFIG_REQUIRED_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A}, {NM_SETTING_IP_CONFIG_DNS_PRIORITY, NM_SETTING_DIFF_RESULT_IN_A}, {NM_SETTING_IP_CONFIG_DHCP_IAID, NM_SETTING_DIFF_RESULT_IN_A}, + {NM_SETTING_IP_CONFIG_DHCP_DSCP, NM_SETTING_DIFF_RESULT_IN_A}, {NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, NM_SETTING_DIFF_RESULT_IN_A}, {NM_SETTING_IP_CONFIG_DHCP_REJECT_SERVERS, NM_SETTING_DIFF_RESULT_IN_A}, {NM_SETTING_IP4_CONFIG_LINK_LOCAL, NM_SETTING_DIFF_RESULT_IN_A}, diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c index 4b1aa2c1..72b855a5 100644 --- a/src/libnm-core-impl/tests/test-setting.c +++ b/src/libnm-core-impl/tests/test-setting.c @@ -4664,10 +4664,7 @@ test_setting_metadata(void) } else if (sip->property_type->direct_type == NM_VALUE_TYPE_ENUM) { const GParamSpecEnum *pspec; - g_assert(sip->property_type == &nm_sett_info_propert_type_direct_enum); g_assert(g_variant_type_equal(sip->property_type->dbus_type, "i")); - g_assert(sip->property_type->to_dbus_fcn - == _nm_setting_property_to_dbus_fcn_direct); g_assert(sip->param_spec); g_assert(g_type_is_a(sip->param_spec->value_type, G_TYPE_ENUM)); g_assert(sip->param_spec->value_type != G_TYPE_ENUM); @@ -4706,10 +4703,6 @@ test_setting_metadata(void) INFINIBAND_ALEN)); } else { g_assert(g_variant_type_equal(sip->property_type->dbus_type, "s")); - g_assert(NM_IN_SET(sip->property_type->to_dbus_fcn, - _nm_setting_property_to_dbus_fcn_direct, - _nm_setting_connection_controller_to_dbus, - _nm_setting_connection_port_type_to_dbus)); can_have_direct_set_fcn = TRUE; } g_assert(sip->param_spec); @@ -4847,18 +4840,6 @@ check_done:; if (sip->property_type->from_dbus_fcn == _nm_setting_property_from_dbus_fcn_gprop) g_assert(sip->param_spec); - if (sip->property_type->from_dbus_fcn) { - if (sip->property_type->direct_type != NM_VALUE_TYPE_NONE) { - g_assert(NM_IN_SET(sip->property_type->from_dbus_fcn, - _nm_setting_property_from_dbus_fcn_direct_ip_config_gateway, - _nm_setting_property_from_dbus_fcn_direct_mac_address, - _nm_setting_connection_controller_from_dbus, - _nm_setting_connection_master_from_dbus, - _nm_setting_connection_slave_type_from_dbus, - _nm_setting_connection_port_type_from_dbus, - _nm_setting_property_from_dbus_fcn_direct)); - } - } g_assert(sip->property_type->from_dbus_is_full == NM_IN_SET(sip->property_type->from_dbus_fcn, @@ -4875,11 +4856,6 @@ check_done:; } else if (sip->property_type->compare_fcn == _nm_setting_property_compare_fcn_direct) { g_assert(sip->param_spec); g_assert(sip->property_type->direct_type != NM_VALUE_TYPE_NONE); - g_assert(NM_IN_SET(sip->property_type->to_dbus_fcn, - _nm_setting_property_to_dbus_fcn_direct, - _nm_setting_property_to_dbus_fcn_direct_mac_address, - _nm_setting_connection_controller_to_dbus, - _nm_setting_connection_port_type_to_dbus)); } else if (sip->property_type->compare_fcn == _nm_setting_property_compare_fcn_ignore) { if (NM_IN_SET(sip->property_type, &nm_sett_info_propert_type_deprecated_ignore_i, diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h index 8e257337..dedc90b2 100644 --- a/src/libnm-core-intern/nm-core-internal.h +++ b/src/libnm-core-intern/nm-core-internal.h @@ -907,6 +907,14 @@ struct _NMSettInfoProperty { * is not deprecated. This flag is about the deprecation of the D-Bus representation * of a property. */ bool dbus_deprecated : 1; + + /* Whether the property is an alias. + * + * This flag indicates whether a property is an alias of another. This is used + * during _init_direct() to allow two or more properties to set the value of + * the same field. + */ + bool direct_is_aliased_field : 1; }; typedef struct { diff --git a/src/libnm-core-public/nm-setting-connection.h b/src/libnm-core-public/nm-setting-connection.h index e21fd3e5..c7ac1659 100644 --- a/src/libnm-core-public/nm-setting-connection.h +++ b/src/libnm-core-public/nm-setting-connection.h @@ -51,6 +51,7 @@ G_BEGIN_DECLS #define NM_SETTING_CONNECTION_SLAVE_TYPE "slave-type" #define NM_SETTING_CONNECTION_PORT_TYPE "port-type" #define NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES "autoconnect-slaves" +#define NM_SETTING_CONNECTION_AUTOCONNECT_PORTS "autoconnect-ports" #define NM_SETTING_CONNECTION_SECONDARIES "secondaries" #define NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT "gateway-ping-timeout" #define NM_SETTING_CONNECTION_METERED "metered" @@ -77,7 +78,10 @@ G_BEGIN_DECLS * should be activated when master is activated. * * Since: 1.2 + * + * Deprecated: 1.46 */ +NM_DEPRECATED_IN_1_46 typedef enum { NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT = -1, NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO = 0, @@ -211,9 +215,13 @@ NM_AVAILABLE_IN_1_46 const char *nm_setting_connection_get_port_type(NMSettingConnection *setting); NM_AVAILABLE_IN_1_2 +NM_DEPRECATED_IN_1_46 NMSettingConnectionAutoconnectSlaves nm_setting_connection_get_autoconnect_slaves(NMSettingConnection *setting); +NM_AVAILABLE_IN_1_46 +NMTernary nm_setting_connection_get_autoconnect_ports(NMSettingConnection *setting); + guint32 nm_setting_connection_get_num_secondaries(NMSettingConnection *setting); const char *nm_setting_connection_get_secondary(NMSettingConnection *setting, guint32 idx); gboolean nm_setting_connection_add_secondary(NMSettingConnection *setting, const char *sec_uuid); diff --git a/src/libnm-core-public/nm-setting-ip-config.h b/src/libnm-core-public/nm-setting-ip-config.h index aa0d6d71..40609f44 100644 --- a/src/libnm-core-public/nm-setting-ip-config.h +++ b/src/libnm-core-public/nm-setting-ip-config.h @@ -332,6 +332,7 @@ char *nm_ip_routing_rule_to_string(const NMIPRoutingRule *self, #define NM_SETTING_IP_CONFIG_DHCP_HOSTNAME "dhcp-hostname" #define NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname" #define NM_SETTING_IP_CONFIG_DHCP_HOSTNAME_FLAGS "dhcp-hostname-flags" +#define NM_SETTING_IP_CONFIG_DHCP_DSCP "dhcp-dscp" #define NM_SETTING_IP_CONFIG_NEVER_DEFAULT "never-default" #define NM_SETTING_IP_CONFIG_MAY_FAIL "may-fail" #define NM_SETTING_IP_CONFIG_DAD_TIMEOUT "dad-timeout" @@ -478,6 +479,8 @@ gboolean nm_setting_ip_config_get_ignore_auto_dns(NMSettingIPConfig *setting); const char *nm_setting_ip_config_get_dhcp_hostname(NMSettingIPConfig *setting); gboolean nm_setting_ip_config_get_dhcp_send_hostname(NMSettingIPConfig *setting); +NM_AVAILABLE_IN_1_46 +const char *nm_setting_ip_config_get_dhcp_dscp(NMSettingIPConfig *setting); gboolean nm_setting_ip_config_get_never_default(NMSettingIPConfig *setting); gboolean nm_setting_ip_config_get_may_fail(NMSettingIPConfig *setting); diff --git a/src/libnm-core-public/nm-version-macros.h b/src/libnm-core-public/nm-version-macros.h index f7880755..4582e9b7 100644 --- a/src/libnm-core-public/nm-version-macros.h +++ b/src/libnm-core-public/nm-version-macros.h @@ -30,7 +30,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (90) +#define NM_MICRO_VERSION (91) /** * NM_CHECK_VERSION: diff --git a/src/libnm-glib-aux/nm-macros-internal.h b/src/libnm-glib-aux/nm-macros-internal.h index a9253ed4..1c8c85e6 100644 --- a/src/libnm-glib-aux/nm-macros-internal.h +++ b/src/libnm-glib-aux/nm-macros-internal.h @@ -195,48 +195,6 @@ _nm_auto_freev(gpointer ptr) /*****************************************************************************/ -#if defined(__GNUC__) -#define _NM_PRAGMA_WARNING_DO(warning) G_STRINGIFY(GCC diagnostic ignored warning) -#elif defined(__clang__) -#define _NM_PRAGMA_WARNING_DO(warning) G_STRINGIFY(clang diagnostic ignored warning) -#endif - -/* you can only suppress a specific warning that the compiler - * understands. Otherwise you will get another compiler warning - * about invalid pragma option. - * It's not that bad however, because gcc and clang often have the - * same name for the same warning. */ - -#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) -#define NM_PRAGMA_DIAGNOSTICS_PUSH _Pragma("GCC diagnostic push") -#define NM_PRAGMA_WARNING_DISABLE(warning) \ - NM_PRAGMA_DIAGNOSTICS_PUSH _Pragma(_NM_PRAGMA_WARNING_DO(warning)) -#define NM_PRAGMA_WARNING_REENABLE _Pragma("GCC diagnostic pop") -#elif defined(__clang__) -#define NM_PRAGMA_DIAGNOSTICS_PUSH _Pragma("clang diagnostic push") -#define NM_PRAGMA_WARNING_DISABLE(warning) \ - NM_PRAGMA_DIAGNOSTICS_PUSH _Pragma(_NM_PRAGMA_WARNING_DO("-Wunknown-warning-option")) \ - _Pragma(_NM_PRAGMA_WARNING_DO(warning)) -#define NM_PRAGMA_WARNING_REENABLE _Pragma("clang diagnostic pop") -#else -#define NM_PRAGMA_DIAGNOSTICS_PUSH -#define NM_PRAGMA_WARNING_DISABLE(warning) -#define NM_PRAGMA_WARNING_REENABLE -#endif - -/*****************************************************************************/ - -/* Seems gcc-12 has a tendency for false-positive -Wdangling-pointer warnings with - * g_error()'s `for(;;);`. See https://bugzilla.redhat.com/show_bug.cgi?id=2056613 . - * Work around, but only for the affected gcc 12.0.1. */ -#if defined(__GNUC__) && __GNUC__ == 12 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ <= 1 -#define NM_PRAGMA_WARNING_DISABLE_DANGLING_POINTER NM_PRAGMA_WARNING_DISABLE("-Wdangling-pointer") -#else -#define NM_PRAGMA_WARNING_DISABLE_DANGLING_POINTER NM_PRAGMA_DIAGNOSTICS_PUSH -#endif - -/*****************************************************************************/ - /** * NM_G_ERROR_MSG: * @error: (nullable): the #GError instance diff --git a/src/libnm-glib-aux/nm-ref-string.h b/src/libnm-glib-aux/nm-ref-string.h index c7cfe87f..45313b39 100644 --- a/src/libnm-glib-aux/nm-ref-string.h +++ b/src/libnm-glib-aux/nm-ref-string.h @@ -83,7 +83,8 @@ nm_ref_string_unref(NMRefString *rstr) /* fast-path: first try to decrement the ref-count without bringing it * to zero. */ - r = rstr->_ref_count; + r = g_atomic_int_get(&rstr->_ref_count); + if (G_LIKELY(r > 1 && g_atomic_int_compare_and_exchange(&rstr->_ref_count, r, r - 1))) return; diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c index 22cd5784..a7078280 100644 --- a/src/libnm-platform/nm-linux-platform.c +++ b/src/libnm-platform/nm-linux-platform.c @@ -1530,6 +1530,8 @@ _parse_lnk_bridge(const char *kind, struct nlattr *info_data) [IFLA_BR_MCAST_QUERY_INTVL] = {.type = NLA_U64}, [IFLA_BR_MCAST_QUERY_RESPONSE_INTVL] = {.type = NLA_U64}, [IFLA_BR_MCAST_STARTUP_QUERY_INTVL] = {.type = NLA_U64}, + [IFLA_BR_VLAN_FILTERING] = {.type = NLA_U8}, + [IFLA_BR_VLAN_DEFAULT_PVID] = {.type = NLA_U16}, }; NMPlatformLnkBridge *props; struct nlattr *tb[G_N_ELEMENTS(policy)]; @@ -1600,6 +1602,10 @@ _parse_lnk_bridge(const char *kind, struct nlattr *info_data) props->mcast_query_response_interval = nla_get_u64(tb[IFLA_BR_MCAST_QUERY_RESPONSE_INTVL]); if (tb[IFLA_BR_MCAST_STARTUP_QUERY_INTVL]) props->mcast_startup_query_interval = nla_get_u64(tb[IFLA_BR_MCAST_STARTUP_QUERY_INTVL]); + if (tb[IFLA_BR_VLAN_FILTERING]) + props->vlan_filtering = !!nla_get_u8(tb[IFLA_BR_VLAN_FILTERING]); + if (tb[IFLA_BR_VLAN_DEFAULT_PVID]) + props->default_pvid = nla_get_u16(tb[IFLA_BR_VLAN_DEFAULT_PVID]); return obj; } diff --git a/src/libnm-platform/nm-platform.c b/src/libnm-platform/nm-platform.c index 531c98e8..1411fe9e 100644 --- a/src/libnm-platform/nm-platform.c +++ b/src/libnm-platform/nm-platform.c @@ -6221,7 +6221,8 @@ nm_platform_lnk_bridge_to_string(const NMPlatformLnkBridge *lnk, char *buf, gsiz " mcast_querier_interval %" G_GUINT64_FORMAT " mcast_query_interval %" G_GUINT64_FORMAT " mcast_query_response_interval %" G_GUINT64_FORMAT - " mcast_startup_query_interval %" G_GUINT64_FORMAT "", + " mcast_startup_query_interval %" G_GUINT64_FORMAT " vlan_filtering %d" + " default_pvid %" G_GUINT16_FORMAT "", lnk->forward_delay, lnk->hello_time, lnk->max_age, @@ -6244,7 +6245,9 @@ nm_platform_lnk_bridge_to_string(const NMPlatformLnkBridge *lnk, char *buf, gsiz lnk->mcast_querier_interval, lnk->mcast_query_interval, lnk->mcast_query_response_interval, - lnk->mcast_startup_query_interval); + lnk->mcast_startup_query_interval, + lnk->vlan_filtering, + lnk->default_pvid); return buf; } @@ -8146,12 +8149,14 @@ nm_platform_lnk_bridge_hash_update(const NMPlatformLnkBridge *obj, NMHashState * obj->mcast_router, obj->mcast_query_response_interval, obj->mcast_startup_query_interval, + obj->default_pvid, NM_HASH_COMBINE_BOOLS(guint8, obj->stp_state, obj->mcast_querier, obj->mcast_query_use_ifaddr, obj->mcast_snooping, - obj->vlan_stats_enabled)); + obj->vlan_stats_enabled, + obj->vlan_filtering)); } void @@ -8304,6 +8309,8 @@ nm_platform_lnk_bridge_cmp(const NMPlatformLnkBridge *a, const NMPlatformLnkBrid NM_CMP_FIELD(a, b, mcast_query_interval); NM_CMP_FIELD(a, b, mcast_query_response_interval); NM_CMP_FIELD(a, b, mcast_startup_query_interval); + NM_CMP_FIELD_BOOL(a, b, vlan_filtering); + NM_CMP_FIELD(a, b, default_pvid); return 0; } diff --git a/src/libnm-platform/nm-platform.h b/src/libnm-platform/nm-platform.h index 996f84b8..a6e60bd4 100644 --- a/src/libnm-platform/nm-platform.h +++ b/src/libnm-platform/nm-platform.h @@ -779,6 +779,8 @@ typedef struct { bool mcast_snooping : 1; bool stp_state : 1; bool vlan_stats_enabled : 1; + bool vlan_filtering; + guint16 default_pvid; } _nm_alignas(NMPlatformObject) NMPlatformLnkBridge; extern const NMPlatformLnkBridge nm_platform_lnk_bridge_default; diff --git a/src/libnm-std-aux/nm-std-aux.h b/src/libnm-std-aux/nm-std-aux.h index 3b39a019..bbd08dd7 100644 --- a/src/libnm-std-aux/nm-std-aux.h +++ b/src/libnm-std-aux/nm-std-aux.h @@ -83,6 +83,11 @@ /*****************************************************************************/ +#define NM_STRINGIFY_ARG(contents) #contents +#define NM_STRINGIFY(macro_or_string) NM_STRINGIFY_ARG(macro_or_string) + +/*****************************************************************************/ + #ifndef _NM_CC_SUPPORT_AUTO_TYPE #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9))) #define _NM_CC_SUPPORT_AUTO_TYPE 1 @@ -209,6 +214,48 @@ typedef uint64_t _nm_bitwise nm_be64_t; /*****************************************************************************/ +#if defined(__GNUC__) +#define _NM_PRAGMA_WARNING_DO(warning) NM_STRINGIFY(GCC diagnostic ignored warning) +#elif defined(__clang__) +#define _NM_PRAGMA_WARNING_DO(warning) NM_STRINGIFY(clang diagnostic ignored warning) +#endif + +/* you can only suppress a specific warning that the compiler + * understands. Otherwise you will get another compiler warning + * about invalid pragma option. + * It's not that bad however, because gcc and clang often have the + * same name for the same warning. */ + +#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) +#define NM_PRAGMA_DIAGNOSTICS_PUSH _Pragma("GCC diagnostic push") +#define NM_PRAGMA_WARNING_DISABLE(warning) \ + NM_PRAGMA_DIAGNOSTICS_PUSH _Pragma(_NM_PRAGMA_WARNING_DO(warning)) +#define NM_PRAGMA_WARNING_REENABLE _Pragma("GCC diagnostic pop") +#elif defined(__clang__) +#define NM_PRAGMA_DIAGNOSTICS_PUSH _Pragma("clang diagnostic push") +#define NM_PRAGMA_WARNING_DISABLE(warning) \ + NM_PRAGMA_DIAGNOSTICS_PUSH _Pragma(_NM_PRAGMA_WARNING_DO("-Wunknown-warning-option")) \ + _Pragma(_NM_PRAGMA_WARNING_DO(warning)) +#define NM_PRAGMA_WARNING_REENABLE _Pragma("clang diagnostic pop") +#else +#define NM_PRAGMA_DIAGNOSTICS_PUSH +#define NM_PRAGMA_WARNING_DISABLE(warning) +#define NM_PRAGMA_WARNING_REENABLE +#endif + +/*****************************************************************************/ + +/* Seems gcc-12 has a tendency for false-positive -Wdangling-pointer warnings with + * g_error()'s `for(;;);`. See https://bugzilla.redhat.com/show_bug.cgi?id=2056613 . + * Work around, but only for the affected gcc 12.0.1. */ +#if defined(__GNUC__) && __GNUC__ == 12 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ <= 1 +#define NM_PRAGMA_WARNING_DISABLE_DANGLING_POINTER NM_PRAGMA_WARNING_DISABLE("-Wdangling-pointer") +#else +#define NM_PRAGMA_WARNING_DISABLE_DANGLING_POINTER NM_PRAGMA_DIAGNOSTICS_PUSH +#endif + +/*****************************************************************************/ + /* glib/C provides the following kind of assertions: * - assert() -- disable with NDEBUG * - g_return_if_fail() -- disable with G_DISABLE_CHECKS @@ -239,8 +286,18 @@ typedef uint64_t _nm_bitwise nm_be64_t; #define NM_MORE_ASSERTS_EFFECTIVE (_NM_ASSERT_FAIL_ENABLED ? NM_MORE_ASSERTS : 0) +#if defined(__GNUC__) && __GNUC__ >= 12 +#define _nm_assert_pragma_enter NM_PRAGMA_WARNING_DISABLE("-Wnonnull-compare") +#define _nm_assert_pragma_leave NM_PRAGMA_WARNING_REENABLE +#else +#define _nm_assert_pragma_enter +#define _nm_assert_pragma_leave +#endif + #define nm_assert(cond) \ ({ \ + _nm_assert_pragma_enter; \ + \ /* nm_assert() must do *nothing* of effect, except evaluating * @cond (0 or 1 times). * @@ -258,6 +315,9 @@ typedef uint64_t _nm_bitwise nm_be64_t; } else { \ _nm_assert_fail(#cond); \ } \ + \ + _nm_assert_pragma_leave; \ + \ 1; \ }) diff --git a/src/libnmc-setting/nm-meta-setting-desc.c b/src/libnmc-setting/nm-meta-setting-desc.c index 075d03dc..103b844e 100644 --- a/src/libnmc-setting/nm-meta-setting-desc.c +++ b/src/libnmc-setting/nm-meta-setting-desc.c @@ -5685,6 +5685,9 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = { PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, .property_type = &_pt_gobject_enum, ), + PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_AUTOCONNECT_PORTS, + .property_type = &_pt_gobject_enum, + ), PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_SECONDARIES, .describe_message = N_("Enter secondary connections that should be activated when this connection is\n" @@ -6365,6 +6368,12 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = { PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_IAID, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IAID, .property_type = &_pt_gobject_string, ), + PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_DSCP, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_DSCP, + .property_type = &_pt_gobject_string, + .property_typ_data = DEFINE_PROPERTY_TYP_DATA ( + .values_static = NM_MAKE_STRV ("CS0", "CS4", "CS6"), + ), + ), PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT, .property_type = &_pt_gobject_int, .property_typ_data = &_ptd_gobject_int_timeout, diff --git a/src/libnmc-setting/settings-docs.h b/src/libnmc-setting/settings-docs.h index 77cde662..854e925a 100644 --- a/src/libnmc-setting/settings-docs.h +++ b/src/libnmc-setting/settings-docs.h @@ -2,6 +2,7 @@ #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTH_RETRIES N_("The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Currently, this only applies to 802-1x authentication.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT N_("Whether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection. Autoconnect happens when the circumstances are suitable. That means for example that the device is currently managed and not active. Autoconnect thus never replaces or competes with an already active profile. Note that autoconnect is not implemented for VPN profiles. See \"secondaries\" as an alternative to automatically connect VPN profiles. If multiple profiles are ready to autoconnect on the same device, the one with the better \"connection.autoconnect-priority\" is chosen. If the priorities are equal, then the most recently connected profile is activated. If the profiles were not connected earlier or their \"connection.timestamp\" is identical, the choice is undefined. Depending on \"connection.multi-connect\", a profile can (auto)connect only once at a time or multiple times.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_PORTS N_("Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties \"autoconnect\", \"autoconnect-priority\" and \"autoconnect-retries\" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-ports is read to determine the real value. If it is default as well, this fallbacks to 0.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY N_("The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES N_("The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES N_("Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties \"autoconnect\", \"autoconnect-priority\" and \"autoconnect-retries\" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.") @@ -164,6 +165,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_AUTO_ROUTE_EXT_GW N_("VPN connections will default to add the route automatically unless this setting is set to FALSE. For other connection types, adding such an automatic route is currently not supported and setting this to TRUE has no effect.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DAD_TIMEOUT N_("Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms). A value greater than zero is a timeout in milliseconds. Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"ipv6-duid\" uses the DUID from \"ipv6.dhcp-duid\" property as an RFC4361-compliant client identifier. As IAID it uses \"ipv4.dhcp-iaid\" and falls back to \"ipv6.dhcp-iaid\" if unset. The special value \"duid\" generates a RFC4361-compliant client identifier based on \"ipv4.dhcp-iaid\" and uses a DUID generated by hashing /etc/machine-id. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the \"${DEVICE}\" or \"${MAC}\" specifier to get a per-device key. The special value \"none\" prevents any client identifier from being sent. Note that this is normally not recommended. If unset, a globally configured default from NetworkManager.conf is used. If still unset, the default depends on the DHCP plugin. The internal dhcp client will default to \"mac\" and the dhclient plugin will try to use one from its config file if present, or won't sent any client-id otherwise.") +#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_DSCP N_("Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be \"CS0\". Allowed values are: \"CS0\", \"CS4\" and \"CS6\". The property is currently valid only for IPv4, and it is supported only by the \"internal\" DHCP plugin.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are \"fqdn-serv-update\" (0x1), \"fqdn-encoded\" (0x2) and \"fqdn-no-update\" (0x4). When no FQDN flag is set and \"fqdn-clear-flags\" (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and \"fqdn-clear-flags\" (0x8) is not set, the standard FQDN flags are set in the request: \"fqdn-serv-update\" (0x1), \"fqdn-encoded\" (0x2) for IPv4 and \"fqdn-serv-update\" (0x1) for IPv6. When this property is set to the default value \"none\" (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also \"none\" (0x0), then the standard FQDN flags described above are sent in the DHCP requests.") @@ -193,6 +195,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDRESSES N_("A list of IPv6 addresses and their prefix length. Multiple addresses can be separated by comma. For example \"2001:db8:85a3::8a2e:370:7334/64, 2001:db8:85a3::5/64\". The addresses are listed in decreasing priority, meaning the first address will be the primary address. This can make a difference with IPv6 source address selection (RFC 6724, section 5).") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_AUTO_ROUTE_EXT_GW N_("VPN connections will default to add the route automatically unless this setting is set to FALSE. For other connection types, adding such an automatic route is currently not supported and setting this to TRUE has no effect.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms). A value greater than zero is a timeout in milliseconds. Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.") +#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DSCP N_("Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be \"CS0\". Allowed values are: \"CS0\", \"CS4\" and \"CS6\". The property is currently valid only for IPv4, and it is supported only by the \"internal\" DHCP plugin.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the \"${DEVICE}\" or \"${MAC}\" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are \"fqdn-serv-update\" (0x1), \"fqdn-encoded\" (0x2) and \"fqdn-no-update\" (0x4). When no FQDN flag is set and \"fqdn-clear-flags\" (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and \"fqdn-clear-flags\" (0x8) is not set, the standard FQDN flags are set in the request: \"fqdn-serv-update\" (0x1), \"fqdn-encoded\" (0x2) for IPv4 and \"fqdn-serv-update\" (0x1) for IPv6. When this property is set to the default value \"none\" (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also \"none\" (0x0), then the standard FQDN flags described above are sent in the DHCP requests.") diff --git a/src/libnmc-setting/settings-docs.h.in b/src/libnmc-setting/settings-docs.h.in index 77cde662..854e925a 100644 --- a/src/libnmc-setting/settings-docs.h.in +++ b/src/libnmc-setting/settings-docs.h.in @@ -2,6 +2,7 @@ #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTH_RETRIES N_("The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Currently, this only applies to 802-1x authentication.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT N_("Whether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection. Autoconnect happens when the circumstances are suitable. That means for example that the device is currently managed and not active. Autoconnect thus never replaces or competes with an already active profile. Note that autoconnect is not implemented for VPN profiles. See \"secondaries\" as an alternative to automatically connect VPN profiles. If multiple profiles are ready to autoconnect on the same device, the one with the better \"connection.autoconnect-priority\" is chosen. If the priorities are equal, then the most recently connected profile is activated. If the profiles were not connected earlier or their \"connection.timestamp\" is identical, the choice is undefined. Depending on \"connection.multi-connect\", a profile can (auto)connect only once at a time or multiple times.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_PORTS N_("Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties \"autoconnect\", \"autoconnect-priority\" and \"autoconnect-retries\" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-ports is read to determine the real value. If it is default as well, this fallbacks to 0.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY N_("The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES N_("The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES N_("Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties \"autoconnect\", \"autoconnect-priority\" and \"autoconnect-retries\" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.") @@ -164,6 +165,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_AUTO_ROUTE_EXT_GW N_("VPN connections will default to add the route automatically unless this setting is set to FALSE. For other connection types, adding such an automatic route is currently not supported and setting this to TRUE has no effect.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DAD_TIMEOUT N_("Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms). A value greater than zero is a timeout in milliseconds. Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"ipv6-duid\" uses the DUID from \"ipv6.dhcp-duid\" property as an RFC4361-compliant client identifier. As IAID it uses \"ipv4.dhcp-iaid\" and falls back to \"ipv6.dhcp-iaid\" if unset. The special value \"duid\" generates a RFC4361-compliant client identifier based on \"ipv4.dhcp-iaid\" and uses a DUID generated by hashing /etc/machine-id. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the \"${DEVICE}\" or \"${MAC}\" specifier to get a per-device key. The special value \"none\" prevents any client identifier from being sent. Note that this is normally not recommended. If unset, a globally configured default from NetworkManager.conf is used. If still unset, the default depends on the DHCP plugin. The internal dhcp client will default to \"mac\" and the dhclient plugin will try to use one from its config file if present, or won't sent any client-id otherwise.") +#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_DSCP N_("Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be \"CS0\". Allowed values are: \"CS0\", \"CS4\" and \"CS6\". The property is currently valid only for IPv4, and it is supported only by the \"internal\" DHCP plugin.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are \"fqdn-serv-update\" (0x1), \"fqdn-encoded\" (0x2) and \"fqdn-no-update\" (0x4). When no FQDN flag is set and \"fqdn-clear-flags\" (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and \"fqdn-clear-flags\" (0x8) is not set, the standard FQDN flags are set in the request: \"fqdn-serv-update\" (0x1), \"fqdn-encoded\" (0x2) for IPv4 and \"fqdn-serv-update\" (0x1) for IPv6. When this property is set to the default value \"none\" (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also \"none\" (0x0), then the standard FQDN flags described above are sent in the DHCP requests.") @@ -193,6 +195,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDRESSES N_("A list of IPv6 addresses and their prefix length. Multiple addresses can be separated by comma. For example \"2001:db8:85a3::8a2e:370:7334/64, 2001:db8:85a3::5/64\". The addresses are listed in decreasing priority, meaning the first address will be the primary address. This can make a difference with IPv6 source address selection (RFC 6724, section 5).") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_AUTO_ROUTE_EXT_GW N_("VPN connections will default to add the route automatically unless this setting is set to FALSE. For other connection types, adding such an automatic route is currently not supported and setting this to TRUE has no effect.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms). A value greater than zero is a timeout in milliseconds. Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.") +#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DSCP N_("Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be \"CS0\". Allowed values are: \"CS0\", \"CS4\" and \"CS6\". The property is currently valid only for IPv4, and it is supported only by the \"internal\" DHCP plugin.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the \"${DEVICE}\" or \"${MAC}\" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are \"fqdn-serv-update\" (0x1), \"fqdn-encoded\" (0x2) and \"fqdn-no-update\" (0x4). When no FQDN flag is set and \"fqdn-clear-flags\" (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and \"fqdn-clear-flags\" (0x8) is not set, the standard FQDN flags are set in the request: \"fqdn-serv-update\" (0x1), \"fqdn-encoded\" (0x2) for IPv4 and \"fqdn-serv-update\" (0x1) for IPv6. When this property is set to the default value \"none\" (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also \"none\" (0x0), then the standard FQDN flags described above are sent in the DHCP requests.") diff --git a/src/n-dhcp4/src/n-dhcp4-c-connection.c b/src/n-dhcp4/src/n-dhcp4-c-connection.c index dd1a573a..7cb4f23f 100644 --- a/src/n-dhcp4/src/n-dhcp4-c-connection.c +++ b/src/n-dhcp4/src/n-dhcp4-c-connection.c @@ -191,7 +191,8 @@ int n_dhcp4_c_connection_connect(NDhcp4CConnection *connection, r = n_dhcp4_c_socket_udp_new(&fd_udp, connection->client_config->ifindex, client, - server); + server, + connection->probe_config->dscp); if (r) return r; @@ -388,6 +389,7 @@ static int n_dhcp4_c_connection_packet_broadcast(NDhcp4CConnection *connection, connection->client_config->ifindex, connection->client_config->broadcast_mac, connection->client_config->n_broadcast_mac, + connection->probe_config->dscp, message); if (r) return r; diff --git a/src/n-dhcp4/src/n-dhcp4-c-probe.c b/src/n-dhcp4/src/n-dhcp4-c-probe.c index 284aa428..a5b38bcd 100644 --- a/src/n-dhcp4/src/n-dhcp4-c-probe.c +++ b/src/n-dhcp4/src/n-dhcp4-c-probe.c @@ -118,6 +118,7 @@ int n_dhcp4_client_probe_config_dup(NDhcp4ClientProbeConfig *config, dup->init_reboot = config->init_reboot; dup->requested_ip = config->requested_ip; dup->ms_start_delay = config->ms_start_delay; + dup->dscp = config->dscp; for (unsigned int i = 0; i < config->n_request_parameters; ++i) dup->request_parameters[dup->n_request_parameters++] = config->request_parameters[i]; @@ -191,6 +192,19 @@ _c_public_ void n_dhcp4_client_probe_config_set_init_reboot(NDhcp4ClientProbeCon } /** + * n_dhcp4_client_probe_config_set_dscp() - set the IP DSCP value + * @config: configuration to operate on + * @dscp: value to set + * + * This sets the DSCP property of the configuration object, which specifies + * the DSCP value to set in the first six bits of the DS field in the IPv4 + * header. If this function is not called, the DSCP will be set to CS0. + */ +_c_public_ void n_dhcp4_client_probe_config_set_dscp(NDhcp4ClientProbeConfig *config, uint8_t dscp) { + config->dscp = dscp & 0x3F; +} + +/** * n_dhcp4_client_probe_config_set_requested_ip() - set requested-ip property * @config: configuration to operate on * @ip: value to set diff --git a/src/n-dhcp4/src/n-dhcp4-private.h b/src/n-dhcp4/src/n-dhcp4-private.h index 8b17a1a2..40404001 100644 --- a/src/n-dhcp4/src/n-dhcp4-private.h +++ b/src/n-dhcp4/src/n-dhcp4-private.h @@ -7,6 +7,7 @@ #include <endian.h> #include <inttypes.h> #include <limits.h> +#include <netinet/ip.h> #include <stdbool.h> #include <stdlib.h> #include <time.h> @@ -34,6 +35,7 @@ typedef struct NDhcp4LogQueue NDhcp4LogQueue; #define N_DHCP4_NETWORK_CLIENT_PORT (68) #define N_DHCP4_MESSAGE_MAGIC ((uint32_t)(0x63825363)) #define N_DHCP4_MESSAGE_FLAG_BROADCAST (htons(0x8000)) +#define N_DHCP4_DSCP_DEFAULT (IPTOS_CLASS_CS0 >> 2) enum { N_DHCP4_OP_BOOTREQUEST = 1, @@ -263,6 +265,7 @@ struct NDhcp4ClientProbeOption { struct NDhcp4ClientProbeConfig { bool inform_only; bool init_reboot; + uint8_t dscp; struct in_addr requested_ip; unsigned short int entropy[3]; uint64_t ms_start_delay; /* max ms to wait before starting probe */ @@ -273,6 +276,7 @@ struct NDhcp4ClientProbeConfig { #define N_DHCP4_CLIENT_PROBE_CONFIG_NULL(_x) { \ .ms_start_delay = N_DHCP4_CLIENT_START_DELAY_RFC2131, \ + .dscp = N_DHCP4_DSCP_DEFAULT, \ } struct NDhcp4CEventNode { @@ -536,7 +540,8 @@ int n_dhcp4_c_socket_packet_new(int *sockfdp, int ifindex); int n_dhcp4_c_socket_udp_new(int *sockfdp, int ifindex, const struct in_addr *client_addr, - const struct in_addr *server_addr); + const struct in_addr *server_addr, + uint8_t dscp); int n_dhcp4_s_socket_packet_new(int *sockfdp); int n_dhcp4_s_socket_udp_new(int *sockfdp, int ifindex); @@ -544,6 +549,7 @@ int n_dhcp4_c_socket_packet_send(int sockfd, int ifindex, const unsigned char *dest_haddr, unsigned char halen, + uint8_t dscp, NDhcp4Outgoing *message); int n_dhcp4_c_socket_udp_send(int sockfd, NDhcp4Outgoing *message); int n_dhcp4_c_socket_udp_broadcast(int sockfd, NDhcp4Outgoing *message); @@ -553,6 +559,7 @@ int n_dhcp4_s_socket_packet_send(int sockfd, const unsigned char *dest_haddr, unsigned char halen, const struct in_addr *dest_inaddr, + uint8_t dscp, NDhcp4Outgoing *message); int n_dhcp4_s_socket_udp_send(int sockfd, const struct in_addr *inaddr_src, diff --git a/src/n-dhcp4/src/n-dhcp4-socket.c b/src/n-dhcp4/src/n-dhcp4-socket.c index 3e703b4f..ec2a48e3 100644 --- a/src/n-dhcp4/src/n-dhcp4-socket.c +++ b/src/n-dhcp4/src/n-dhcp4-socket.c @@ -133,6 +133,7 @@ int n_dhcp4_c_socket_packet_new(int *sockfdp, int ifindex) { * @ifindex: interface index to bind to * @client_addr: client address to bind to * @server_addr: server address to connect to + * @dscp: the DSCP value * * Create a new AF_INET/SOCK_DGRAM socket usable to listen to and send DHCP client * packets. @@ -145,7 +146,8 @@ int n_dhcp4_c_socket_packet_new(int *sockfdp, int ifindex) { int n_dhcp4_c_socket_udp_new(int *sockfdp, int ifindex, const struct in_addr *client_addr, - const struct in_addr *server_addr) { + const struct in_addr *server_addr, + uint8_t dscp) { _c_cleanup_(c_closep) int sockfd = -1; struct sock_filter filter[] = { /* @@ -189,7 +191,8 @@ int n_dhcp4_c_socket_udp_new(int *sockfdp, .sin_addr = *server_addr, .sin_port = htons(N_DHCP4_NETWORK_SERVER_PORT), }; - int r, tos = IPTOS_CLASS_CS6, on = 1; + int r, on = 1; + int tos = dscp << 2; sockfd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0); if (sockfd < 0) @@ -340,6 +343,7 @@ static int n_dhcp4_socket_packet_send(int sockfd, const unsigned char *dest_haddr, unsigned char halen, const struct sockaddr_in *dest_paddr, + uint8_t dscp, NDhcp4Outgoing *message) { struct packet_sockaddr_ll haddr = { .sll_family = AF_PACKET, @@ -357,7 +361,7 @@ static int n_dhcp4_socket_packet_send(int sockfd, n_buf = n_dhcp4_outgoing_get_raw(message, &buf); - r = packet_sendto_udp(sockfd, buf, n_buf, &len, src_paddr, &haddr, dest_paddr); + r = packet_sendto_udp(sockfd, buf, n_buf, &len, src_paddr, &haddr, dest_paddr, dscp); if (r < 0) { if (r == -EAGAIN || r == -ENOBUFS) return N_DHCP4_E_DROPPED; @@ -379,6 +383,7 @@ int n_dhcp4_c_socket_packet_send(int sockfd, int ifindex, const unsigned char *dest_haddr, unsigned char halen, + uint8_t dscp, NDhcp4Outgoing *message) { struct sockaddr_in src_paddr = { .sin_family = AF_INET, @@ -397,6 +402,7 @@ int n_dhcp4_c_socket_packet_send(int sockfd, dest_haddr, halen, &dest_paddr, + dscp, message); } @@ -468,6 +474,7 @@ int n_dhcp4_s_socket_packet_send(int sockfd, const unsigned char *dest_haddr, unsigned char halen, const struct in_addr *dest_inaddr, + uint8_t dscp, NDhcp4Outgoing *message) { struct sockaddr_in src_paddr = { .sin_family = AF_INET, @@ -486,6 +493,7 @@ int n_dhcp4_s_socket_packet_send(int sockfd, dest_haddr, halen, &dest_paddr, + dscp, message); } diff --git a/src/n-dhcp4/src/n-dhcp4.h b/src/n-dhcp4/src/n-dhcp4.h index 8493a487..f6c87a8d 100644 --- a/src/n-dhcp4/src/n-dhcp4.h +++ b/src/n-dhcp4/src/n-dhcp4.h @@ -128,6 +128,7 @@ NDhcp4ClientProbeConfig *n_dhcp4_client_probe_config_free(NDhcp4ClientProbeConfi void n_dhcp4_client_probe_config_set_inform_only(NDhcp4ClientProbeConfig *config, bool inform_only); void n_dhcp4_client_probe_config_set_init_reboot(NDhcp4ClientProbeConfig *config, bool init_reboot); +void n_dhcp4_client_probe_config_set_dscp(NDhcp4ClientProbeConfig *config, uint8_t dscp); void n_dhcp4_client_probe_config_set_requested_ip(NDhcp4ClientProbeConfig *config, struct in_addr ip); void n_dhcp4_client_probe_config_set_start_delay(NDhcp4ClientProbeConfig *config, uint64_t msecs); void n_dhcp4_client_probe_config_request_option(NDhcp4ClientProbeConfig *config, uint8_t option); diff --git a/src/n-dhcp4/src/util/packet.c b/src/n-dhcp4/src/util/packet.c index 48f2c85e..cbf09c06 100644 --- a/src/n-dhcp4/src/util/packet.c +++ b/src/n-dhcp4/src/util/packet.c @@ -150,6 +150,7 @@ uint16_t packet_internet_checksum_udp(const struct in_addr *src_addr, * @src_paddr: source protocol address, see ip(7) * @dest_haddr: destination hardware address, see packet(7) * @dest_paddr: destination protocol address, see ip(7) + * @dscp: the DSCP value * * Sends an UDP packet on a AF_PACKET socket directly to a hardware * address. The difference between this and sendto() on an AF_INET @@ -165,11 +166,12 @@ int packet_sendto_udp(int sockfd, size_t *n_transmittedp, const struct sockaddr_in *src_paddr, const struct packet_sockaddr_ll *dest_haddr, - const struct sockaddr_in *dest_paddr) { + const struct sockaddr_in *dest_paddr, + uint8_t dscp) { struct iphdr ip_hdr = { .version = IPVERSION, .ihl = sizeof(ip_hdr) / 4, /* Length of header in multiples of four bytes */ - .tos = IPTOS_CLASS_CS6, /* Class Selector for network control */ + .tos = dscp << 2, .tot_len = htons(sizeof(struct iphdr) + sizeof(struct udphdr) + n_buf), .frag_off = htons(IP_DF), /* Do not fragment */ .ttl = IPDEFTTL, diff --git a/src/n-dhcp4/src/util/packet.h b/src/n-dhcp4/src/util/packet.h index 98dabf7f..ec06a213 100644 --- a/src/n-dhcp4/src/util/packet.h +++ b/src/n-dhcp4/src/util/packet.h @@ -42,7 +42,8 @@ int packet_sendto_udp(int sockfd, size_t *n_transmittedp, const struct sockaddr_in *src_paddr, const struct packet_sockaddr_ll *dest_haddr, - const struct sockaddr_in *dest_paddr); + const struct sockaddr_in *dest_paddr, + uint8_t dscp); int packet_recvfrom_udp(int sockfd, void *buf, size_t n_buf, diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c index 7bb7e43e..1c35a905 100644 --- a/src/nm-initrd-generator/nmi-cmdline-reader.c +++ b/src/nm-initrd-generator/nmi-cmdline-reader.c @@ -39,6 +39,7 @@ typedef struct { gboolean ignore_auto_dns; int dhcp_timeout; char *dhcp4_vci; + char *dhcp_dscp; gint64 carrier_timeout_sec; } Reader; @@ -73,6 +74,7 @@ reader_destroy(Reader *reader, gboolean free_hash) nm_clear_g_free(&reader->hostname); g_hash_table_unref(reader->znet_ifnames); nm_clear_g_free(&reader->dhcp4_vci); + nm_clear_g_free(&reader->dhcp_dscp); nm_g_slice_free(reader); if (!free_hash) return g_steal_pointer(&hash); @@ -122,6 +124,8 @@ reader_create_connection(Reader *reader, reader->dhcp_timeout, NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, reader->dhcp4_vci, + NM_SETTING_IP_CONFIG_DHCP_DSCP, + reader->dhcp_dscp, NM_SETTING_IP_CONFIG_REQUIRED_TIMEOUT, NMI_IP_REQUIRED_TIMEOUT_MSEC, NULL); @@ -1289,6 +1293,8 @@ _normalize_conn(gpointer key, gpointer value, gpointer user_data) NULL, NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, NULL, + NM_SETTING_IP_CONFIG_DHCP_DSCP, + NULL, NULL); } } @@ -1429,6 +1435,13 @@ nmi_cmdline_reader_parse(const char *etc_connections_dir, } else if (nm_streq(tag, "rd.net.dhcp.vendor-class")) { if (nm_utils_validate_dhcp4_vendor_class_id(argument, NULL)) nm_strdup_reset(&reader->dhcp4_vci, argument); + } else if (nm_streq(tag, "rd.net.dhcp.dscp")) { + gs_free_error GError *error = NULL; + + if (nm_utils_validate_dhcp_dscp(argument, &error)) + nm_strdup_reset(&reader->dhcp_dscp, argument); + else + _LOGW(LOGD_CORE, "Ignoring 'rd.net.dhcp.dscp=%s': %s", argument, error->message); } else if (nm_streq(tag, "rd.net.timeout.carrier")) { reader->carrier_timeout_sec = _nm_utils_ascii_str_to_int64(argument, 10, 0, G_MAXINT32, 0); @@ -1491,8 +1504,9 @@ nmi_cmdline_reader_parse(const char *etc_connections_dir, } else if (g_ascii_strcasecmp(tag, "BOOTIF") == 0) { nm_clear_g_free(&bootif_val); bootif_val = g_strdup(argument); - } else if (nm_streq(tag, "rd.ethtool")) + } else if (nm_streq(tag, "rd.ethtool")) { reader_parse_ethtool(reader, argument); + } } for (i = 0; i < reader->vlan_parents->len; i++) { diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c index 3dbbd4d5..fd663b6d 100644 --- a/src/nm-initrd-generator/tests/test-cmdline-reader.c +++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c @@ -2355,6 +2355,33 @@ test_dhcp_vendor_class_id(void) } static void +test_dhcp_dscp(void) +{ + const char *const *ARGV; + gs_unref_object NMConnection *connection = NULL; + NMSettingIPConfig *s_ip4; + + ARGV = NM_MAKE_STRV("rd.net.dhcp.dscp=CS4", "ip=eno1:dhcp"); + connection = _parse_con(ARGV, "eno1"); + s_ip4 = NM_SETTING_IP_CONFIG(nm_connection_get_setting_ip4_config(connection)); + g_assert_cmpstr(nm_setting_ip_config_get_dhcp_dscp(s_ip4), ==, "CS4"); + + g_clear_object(&connection); + + ARGV = NM_MAKE_STRV("rd.net.dhcp.dscp=CS0", "ip=eno1:dhcp"); + connection = _parse_con(ARGV, "eno1"); + s_ip4 = NM_SETTING_IP_CONFIG(nm_connection_get_setting_ip4_config(connection)); + g_assert_cmpstr(nm_setting_ip_config_get_dhcp_dscp(s_ip4), ==, "CS0"); + + g_clear_object(&connection); + + ARGV = NM_MAKE_STRV("ip=eno1:dhcp"); + connection = _parse_con(ARGV, "eno1"); + s_ip4 = NM_SETTING_IP_CONFIG(nm_connection_get_setting_ip4_config(connection)); + g_assert_cmpstr(nm_setting_ip_config_get_dhcp_dscp(s_ip4), ==, NULL); +} + +static void test_infiniband_iface(void) { const char *const *ARGV = NM_MAKE_STRV("ip=ib1:dhcp"); @@ -2652,6 +2679,7 @@ main(int argc, char **argv) g_test_add_func("/initrd/cmdline/neednet/no_args", test_neednet_no_args); g_test_add_func("/initrd/cmdline/neednet/args", test_neednet_args); g_test_add_func("/initrd/cmdline/dhcp/vendor_class_id", test_dhcp_vendor_class_id); + g_test_add_func("/initrd/cmdline/dhcp/dscp", test_dhcp_dscp); g_test_add_func("/initrd/cmdline/infiniband/iface", test_infiniband_iface); g_test_add_func("/initrd/cmdline/infiniband/mac", test_infiniband_mac); g_test_add_func("/initrd/cmdline/infiniband/pkey", test_infiniband_pkey); diff --git a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in index 8806bf25..40ef214f 100644 --- a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in +++ b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in @@ -674,6 +674,10 @@ nmcli-description="Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0." format="choice (NMSettingConnectionAutoconnectSlaves)" values="default (-1), no (0), yes (1)" /> + <property name="autoconnect-ports" + nmcli-description="Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-ports is read to determine the real value. If it is default as well, this fallbacks to 0." + format="choice (NMTernary)" + values="default (-1), false (0), true (1)" /> <property name="secondaries" nmcli-description="List of connection UUIDs that should be activated when the base connection itself is activated. Currently, only VPN connections are supported." format="list of strings" /> @@ -1304,6 +1308,10 @@ <property name="dhcp-iaid" nmcli-description="A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or as colon separated hexadecimal numbers). Alternatively it can be set to the special values "mac", "perm-mac", "ifname" or "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". For DHCPv4, the IAID is only used with "ipv4.dhcp-client-id" values "duid" and "ipv6-duid" to generate the client-id. For DHCPv6, note that at the moment this property is only supported by the "internal" DHCPv6 plugin. The "dhclient" DHCPv6 plugin always derives the IAID from the MAC address. The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device." format="string" /> + <property name="dhcp-dscp" + nmcli-description="Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be "CS0". Allowed values are: "CS0", "CS4" and "CS6". The property is currently valid only for IPv4, and it is supported only by the "internal" DHCP plugin." + format="string" + values="CS0, CS4, CS6" /> <property name="dhcp-timeout" nmcli-description="A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity." format="integer" diff --git a/src/nmtui/nmt-wireguard-peer-editor.c b/src/nmtui/nmt-wireguard-peer-editor.c index a78cfdf0..092a4ed7 100644 --- a/src/nmtui/nmt-wireguard-peer-editor.c +++ b/src/nmtui/nmt-wireguard-peer-editor.c @@ -237,11 +237,12 @@ nmt_wireguard_peer_editor_class_init(NmtWireguardPeerEditorClass *peer_class) * * The page's #NMWireGuardPeer. */ - g_object_class_install_property(object_class, - PROP_PEER, - g_param_spec_boxed("peer", - "", - "", - nm_wireguard_peer_get_type(), - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property( + object_class, + PROP_PEER, + g_param_spec_boxed("peer", + "", + "", + nm_wireguard_peer_get_type(), + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); } diff --git a/src/tests/client/test-client.check-on-disk/test_002.expected b/src/tests/client/test-client.check-on-disk/test_002.expected index ec2943a5..680de9a1 100644 --- a/src/tests/client/test-client.check-on-disk/test_002.expected +++ b/src/tests/client/test-client.check-on-disk/test_002.expected @@ -502,12 +502,12 @@ NAME UUID TYPE DEVICE con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- <<< -size: 1459 +size: 1512 location: src/tests/client/test-client.py:test_002()/23 cmd: $NMCLI c s con-1 lang: C returncode: 0 -stdout: 1331 bytes +stdout: 1384 bytes >>> connection.id: con-1 connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d @@ -527,6 +527,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -539,12 +540,12 @@ connection.wait-device-timeout: -1 connection.wait-activation-delay: -1 <<< -size: 1470 +size: 1523 location: src/tests/client/test-client.py:test_002()/24 cmd: $NMCLI c s con-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1332 bytes +stdout: 1385 bytes >>> connection.id: con-1 connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d @@ -564,6 +565,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane diff --git a/src/tests/client/test-client.check-on-disk/test_003.expected b/src/tests/client/test-client.check-on-disk/test_003.expected index a78ace9d..d55142d7 100644 --- a/src/tests/client/test-client.check-on-disk/test_003.expected +++ b/src/tests/client/test-client.check-on-disk/test_003.expected @@ -182,12 +182,12 @@ id path uuid <<< -size: 5268 +size: 5364 location: src/tests/client/test-client.py:test_003()/14 cmd: $NMCLI con s con-gsm1 lang: C returncode: 0 -stdout: 5135 bytes +stdout: 5231 bytes >>> connection.id: con-gsm1 connection.uuid: UUID-con-gsm1-REPLACED-REPLACED-REPL @@ -207,6 +207,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -233,6 +234,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -303,12 +305,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 5306 +size: 5402 location: src/tests/client/test-client.py:test_003()/15 cmd: $NMCLI con s con-gsm1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5163 bytes +stdout: 5259 bytes >>> connection.id: con-gsm1 connection.uuid: UUID-con-gsm1-REPLACED-REPLACED-REPL @@ -328,6 +330,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -354,6 +357,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -424,42 +428,42 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 509 +size: 513 location: src/tests/client/test-client.py:test_003()/16 cmd: $NMCLI -g all con s con-gsm1 lang: C returncode: 0 -stdout: 370 bytes +stdout: 374 bytes >>> -connection:con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::: :0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::: :0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: serial:5:8:even:1:100 gsm:no:::<hidden>:0:xyz.con-gsm1::<hidden>:0:no::::auto:no: proxy:none:no:: <<< -size: 519 +size: 523 location: src/tests/client/test-client.py:test_003()/17 cmd: $NMCLI -g all con s con-gsm1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 370 bytes +stdout: 374 bytes >>> -connection:con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::: :0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::: :0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: serial:5:8:even:1:100 gsm:no:::<hidden>:0:xyz.con-gsm1::<hidden>:0:no::::auto:no: proxy:none:no:: <<< -size: 5256 +size: 5352 location: src/tests/client/test-client.py:test_003()/18 cmd: $NMCLI con s con-gsm2 lang: C returncode: 0 -stdout: 5123 bytes +stdout: 5219 bytes >>> connection.id: con-gsm2 connection.uuid: UUID-con-gsm2-REPLACED-REPLACED-REPL @@ -479,6 +483,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -505,6 +510,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -575,12 +581,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 5294 +size: 5390 location: src/tests/client/test-client.py:test_003()/19 cmd: $NMCLI con s con-gsm2 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5151 bytes +stdout: 5247 bytes >>> connection.id: con-gsm2 connection.uuid: UUID-con-gsm2-REPLACED-REPLACED-REPL @@ -600,6 +606,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -626,6 +633,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -696,42 +704,42 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 497 +size: 501 location: src/tests/client/test-client.py:test_003()/20 cmd: $NMCLI -g all con s con-gsm2 lang: C returncode: 0 -stdout: 358 bytes +stdout: 362 bytes >>> -connection:con-gsm2:UUID-con-gsm2-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::: :0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-gsm2:UUID-con-gsm2-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::: :0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: serial:5:8:even:1:100 gsm:no:::<hidden>:0:::<hidden>:0:no::::auto:no: proxy:none:no:: <<< -size: 507 +size: 511 location: src/tests/client/test-client.py:test_003()/21 cmd: $NMCLI -g all con s con-gsm2 lang: pl_PL.UTF-8 returncode: 0 -stdout: 358 bytes +stdout: 362 bytes >>> -connection:con-gsm2:UUID-con-gsm2-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::: :0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-gsm2:UUID-con-gsm2-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::: :0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: serial:5:8:even:1:100 gsm:no:::<hidden>:0:::<hidden>:0:no::::auto:no: proxy:none:no:: <<< -size: 5256 +size: 5352 location: src/tests/client/test-client.py:test_003()/22 cmd: $NMCLI con s con-gsm3 lang: C returncode: 0 -stdout: 5123 bytes +stdout: 5219 bytes >>> connection.id: con-gsm3 connection.uuid: UUID-con-gsm3-REPLACED-REPLACED-REPL @@ -751,6 +759,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -777,6 +786,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -847,12 +857,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 5294 +size: 5390 location: src/tests/client/test-client.py:test_003()/23 cmd: $NMCLI con s con-gsm3 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5151 bytes +stdout: 5247 bytes >>> connection.id: con-gsm3 connection.uuid: UUID-con-gsm3-REPLACED-REPLACED-REPL @@ -872,6 +882,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -898,6 +909,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -968,30 +980,30 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 498 +size: 502 location: src/tests/client/test-client.py:test_003()/24 cmd: $NMCLI -g all con s con-gsm3 lang: C returncode: 0 -stdout: 359 bytes +stdout: 363 bytes >>> -connection:con-gsm3:UUID-con-gsm3-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::: :0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-gsm3:UUID-con-gsm3-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::: :0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: serial:5:8:even:1:100 gsm:no:::<hidden>:0: ::<hidden>:0:no::::auto:no: proxy:none:no:: <<< -size: 508 +size: 512 location: src/tests/client/test-client.py:test_003()/25 cmd: $NMCLI -g all con s con-gsm3 lang: pl_PL.UTF-8 returncode: 0 -stdout: 359 bytes +stdout: 363 bytes >>> -connection:con-gsm3:UUID-con-gsm3-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::: :0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-gsm3:UUID-con-gsm3-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::: :0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: serial:5:8:even:1:100 gsm:no:::<hidden>:0: ::<hidden>:0:no::::auto:no: @@ -1138,12 +1150,12 @@ UUID NAME UUID-ethernet-REPLACED-REPLACED-REPL ethernet <<< -size: 5008 +size: 5104 location: src/tests/client/test-client.py:test_003()/37 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 -stdout: 4868 bytes +stdout: 4964 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1163,6 +1175,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -1204,6 +1217,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -1253,12 +1267,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 5043 +size: 5139 location: src/tests/client/test-client.py:test_003()/38 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4893 bytes +stdout: 4989 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1278,6 +1292,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -1319,6 +1334,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -1388,12 +1404,12 @@ stdout: 51 bytes GENERAL.STATE: aktywowano <<< -size: 5710 +size: 5806 location: src/tests/client/test-client.py:test_003()/41 cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 5577 bytes +stdout: 5673 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1413,6 +1429,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -1454,6 +1471,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -1516,12 +1534,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5749 +size: 5845 location: src/tests/client/test-client.py:test_003()/42 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 5606 bytes +stdout: 5702 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1541,6 +1559,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -1582,6 +1601,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -2130,12 +2150,12 @@ UUID NAME UUID-ethernet-REPLACED-REPLACED-REPL ethernet <<< -size: 5008 +size: 5104 location: src/tests/client/test-client.py:test_003()/62 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 -stdout: 4868 bytes +stdout: 4964 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2155,6 +2175,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -2196,6 +2217,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -2245,12 +2267,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 5043 +size: 5139 location: src/tests/client/test-client.py:test_003()/63 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4893 bytes +stdout: 4989 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2270,6 +2292,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -2311,6 +2334,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -2384,12 +2408,12 @@ GENERAL.STATE: aktywowano GENERAL.STATE: aktywowano <<< -size: 6420 +size: 6516 location: src/tests/client/test-client.py:test_003()/66 cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 6287 bytes +stdout: 6383 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2409,6 +2433,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -2450,6 +2475,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -2526,12 +2552,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 6463 +size: 6559 location: src/tests/client/test-client.py:test_003()/67 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6320 bytes +stdout: 6416 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2551,6 +2577,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -2592,6 +2619,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -3176,12 +3204,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 6423 +size: 6519 location: src/tests/client/test-client.py:test_003()/84 cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 6290 bytes +stdout: 6386 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -3201,6 +3229,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -3242,6 +3271,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -3318,12 +3348,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 6467 +size: 6563 location: src/tests/client/test-client.py:test_003()/85 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6324 bytes +stdout: 6420 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -3343,6 +3373,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -3384,6 +3415,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -3460,12 +3492,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5753 +size: 5849 location: src/tests/client/test-client.py:test_003()/86 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5580 bytes +stdout: 5676 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -3485,6 +3517,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -3526,6 +3559,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -3588,12 +3622,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5793 +size: 5889 location: src/tests/client/test-client.py:test_003()/87 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5610 bytes +stdout: 5706 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -3613,6 +3647,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -3654,6 +3689,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -3926,12 +3962,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 6435 +size: 6531 location: src/tests/client/test-client.py:test_003()/94 cmd: $NMCLI --color yes con s ethernet lang: C returncode: 0 -stdout: 6290 bytes +stdout: 6386 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -3951,6 +3987,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -3992,6 +4029,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -4068,12 +4106,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 6479 +size: 6575 location: src/tests/client/test-client.py:test_003()/95 cmd: $NMCLI --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6324 bytes +stdout: 6420 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -4093,6 +4131,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -4134,6 +4173,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -4210,12 +4250,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5765 +size: 5861 location: src/tests/client/test-client.py:test_003()/96 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5580 bytes +stdout: 5676 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -4235,6 +4275,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -4276,6 +4317,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -4338,12 +4380,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5805 +size: 5901 location: src/tests/client/test-client.py:test_003()/97 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5610 bytes +stdout: 5706 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -4363,6 +4405,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -4404,6 +4447,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -4692,12 +4736,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 7676 +size: 7772 location: src/tests/client/test-client.py:test_003()/104 cmd: $NMCLI --pretty con s ethernet lang: C returncode: 0 -stdout: 7533 bytes +stdout: 7629 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -4720,6 +4764,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -4763,6 +4808,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -4850,12 +4896,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 7741 +size: 7837 location: src/tests/client/test-client.py:test_003()/105 cmd: $NMCLI --pretty con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 7588 bytes +stdout: 7684 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -4878,6 +4924,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -4921,6 +4968,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -5008,12 +5056,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6694 +size: 6790 location: src/tests/client/test-client.py:test_003()/106 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 6511 bytes +stdout: 6607 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -5036,6 +5084,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -5079,6 +5128,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -5148,12 +5198,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6747 +size: 6843 location: src/tests/client/test-client.py:test_003()/107 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6554 bytes +stdout: 6650 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -5176,6 +5226,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -5219,6 +5270,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -5538,12 +5590,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 7688 +size: 7784 location: src/tests/client/test-client.py:test_003()/114 cmd: $NMCLI --pretty --color yes con s ethernet lang: C returncode: 0 -stdout: 7533 bytes +stdout: 7629 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -5566,6 +5618,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -5609,6 +5662,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -5696,12 +5750,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 7753 +size: 7849 location: src/tests/client/test-client.py:test_003()/115 cmd: $NMCLI --pretty --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 7588 bytes +stdout: 7684 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -5724,6 +5778,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -5767,6 +5822,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -5854,12 +5910,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6706 +size: 6802 location: src/tests/client/test-client.py:test_003()/116 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 6511 bytes +stdout: 6607 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -5882,6 +5938,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -5925,6 +5982,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -5994,12 +6052,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6759 +size: 6855 location: src/tests/client/test-client.py:test_003()/117 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6554 bytes +stdout: 6650 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -6022,6 +6080,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -6065,6 +6124,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -6364,12 +6424,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL:gsm UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -size: 3427 +size: 3475 location: src/tests/client/test-client.py:test_003()/124 cmd: $NMCLI --terse con s ethernet lang: C returncode: 0 -stdout: 3285 bytes +stdout: 3333 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -6389,6 +6449,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -6430,6 +6491,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -6506,12 +6568,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3437 +size: 3485 location: src/tests/client/test-client.py:test_003()/125 cmd: $NMCLI --terse con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 3285 bytes +stdout: 3333 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -6531,6 +6593,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -6572,6 +6635,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -6648,12 +6712,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3077 +size: 3125 location: src/tests/client/test-client.py:test_003()/126 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2895 bytes +stdout: 2943 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -6673,6 +6737,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -6714,6 +6779,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -6776,12 +6842,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3087 +size: 3135 location: src/tests/client/test-client.py:test_003()/127 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2895 bytes +stdout: 2943 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -6801,6 +6867,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -6842,6 +6909,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -7110,12 +7178,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL:gsm UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -size: 3439 +size: 3487 location: src/tests/client/test-client.py:test_003()/134 cmd: $NMCLI --terse --color yes con s ethernet lang: C returncode: 0 -stdout: 3285 bytes +stdout: 3333 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -7135,6 +7203,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -7176,6 +7245,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -7252,12 +7322,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3449 +size: 3497 location: src/tests/client/test-client.py:test_003()/135 cmd: $NMCLI --terse --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 3285 bytes +stdout: 3333 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -7277,6 +7347,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -7318,6 +7389,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -7394,12 +7466,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3089 +size: 3137 location: src/tests/client/test-client.py:test_003()/136 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2895 bytes +stdout: 2943 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -7419,6 +7491,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -7460,6 +7533,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -7522,12 +7596,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3099 +size: 3147 location: src/tests/client/test-client.py:test_003()/137 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2895 bytes +stdout: 2943 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -7547,6 +7621,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -7588,6 +7663,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -7860,21 +7936,21 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 4313 +size: 4373 location: src/tests/client/test-client.py:test_003()/144 cmd: $NMCLI --mode tabular con s ethernet lang: C returncode: 0 -stdout: 4164 bytes +stdout: 4224 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no no yes -1 (default) -1 (unknown) default 0 (default) auto -- -- -- 0 (default) yes -- 0x0 (none) -1 (default) -- @@ -7891,21 +7967,21 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 eth0 deac <<< -size: 4363 +size: 4423 location: src/tests/client/test-client.py:test_003()/145 cmd: $NMCLI --mode tabular con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4204 bytes +stdout: 4264 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie nie tak -1 (default) -1 (unknown) default 0 (default) automatyczne -- -- -- 0 (default) tak -- 0x0 (none) -1 (default) -- @@ -7922,21 +7998,21 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 eth0 deza <<< -size: 3851 +size: 3911 location: src/tests/client/test-client.py:test_003()/146 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 3662 bytes +stdout: 3722 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no no yes -1 (default) -1 (unknown) default 0 (default) auto -- -- -- 0 (default) yes -- 0x0 (none) -1 (default) -- @@ -7949,21 +8025,21 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 eth0 deac <<< -size: 3899 +size: 3959 location: src/tests/client/test-client.py:test_003()/147 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3700 bytes +stdout: 3760 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie nie tak -1 (default) -1 (unknown) default 0 (default) automatyczne -- -- -- 0 (default) tak -- 0x0 (none) -1 (default) -- @@ -8112,21 +8188,21 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 4325 +size: 4385 location: src/tests/client/test-client.py:test_003()/154 cmd: $NMCLI --mode tabular --color yes con s ethernet lang: C returncode: 0 -stdout: 4164 bytes +stdout: 4224 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no no yes -1 (default) -1 (unknown) default 0 (default) auto -- -- -- 0 (default) yes -- 0x0 (none) -1 (default) -- @@ -8143,21 +8219,21 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 eth0 deac <<< -size: 4375 +size: 4435 location: src/tests/client/test-client.py:test_003()/155 cmd: $NMCLI --mode tabular --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4204 bytes +stdout: 4264 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie nie tak -1 (default) -1 (unknown) default 0 (default) automatyczne -- -- -- 0 (default) tak -- 0x0 (none) -1 (default) -- @@ -8174,21 +8250,21 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 eth0 deza <<< -size: 3863 +size: 3923 location: src/tests/client/test-client.py:test_003()/156 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 3662 bytes +stdout: 3722 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no no yes -1 (default) -1 (unknown) default 0 (default) auto -- -- -- 0 (default) yes -- 0x0 (none) -1 (default) -- @@ -8201,21 +8277,21 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 eth0 deac <<< -size: 3911 +size: 3971 location: src/tests/client/test-client.py:test_003()/157 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3700 bytes +stdout: 3760 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie nie tak -1 (default) -1 (unknown) default 0 (default) automatyczne -- -- -- 0 (default) tak -- 0x0 (none) -1 (default) -- @@ -8380,27 +8456,27 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 6941 +size: 7031 location: src/tests/client/test-client.py:test_003()/164 cmd: $NMCLI --mode tabular --pretty con s ethernet lang: C returncode: 0 -stdout: 6783 bytes +stdout: 6873 bytes >>> ========================================= Connection profile details (ethernet) ========================================= -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -8427,27 +8503,27 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 eth0 deac <<< -size: 7071 +size: 7161 location: src/tests/client/test-client.py:test_003()/165 cmd: $NMCLI --mode tabular --pretty con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6903 bytes +stdout: 6993 bytes >>> =========================================== Szczegóły profilu połączenia (ethernet) =========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -8474,27 +8550,27 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 eth0 deza <<< -size: 6023 +size: 6113 location: src/tests/client/test-client.py:test_003()/166 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5825 bytes +stdout: 5915 bytes >>> ========================================= Connection profile details (ethernet) ========================================= -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -8513,27 +8589,27 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 eth0 deac <<< -size: 6125 +size: 6215 location: src/tests/client/test-client.py:test_003()/167 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5917 bytes +stdout: 6007 bytes >>> =========================================== Szczegóły profilu połączenia (ethernet) =========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -8728,27 +8804,27 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 6953 +size: 7043 location: src/tests/client/test-client.py:test_003()/174 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet lang: C returncode: 0 -stdout: 6783 bytes +stdout: 6873 bytes >>> ========================================= Connection profile details (ethernet) ========================================= -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -8775,27 +8851,27 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 eth0 deac <<< -size: 7083 +size: 7173 location: src/tests/client/test-client.py:test_003()/175 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6903 bytes +stdout: 6993 bytes >>> =========================================== Szczegóły profilu połączenia (ethernet) =========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -8822,27 +8898,27 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 eth0 deza <<< -size: 6035 +size: 6125 location: src/tests/client/test-client.py:test_003()/176 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5825 bytes +stdout: 5915 bytes >>> ========================================= Connection profile details (ethernet) ========================================= -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -8861,27 +8937,27 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 eth0 deac <<< -size: 6137 +size: 6227 location: src/tests/client/test-client.py:test_003()/177 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5917 bytes +stdout: 6007 bytes >>> =========================================== Szczegóły profilu połączenia (ethernet) =========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password accept-all-mac-addresses ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- -1 (default) -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -9056,16 +9132,16 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL:gsm UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -size: 887 +size: 891 location: src/tests/client/test-client.py:test_003()/184 cmd: $NMCLI --mode tabular --terse con s ethernet lang: C returncode: 0 -stdout: 731 bytes +stdout: 735 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 802-3-ethernet::0::no:::::auto::::default::-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: proxy:none:no:: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/6:: @@ -9073,16 +9149,16 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:: <<< -size: 897 +size: 901 location: src/tests/client/test-client.py:test_003()/185 cmd: $NMCLI --mode tabular --terse con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 731 bytes +stdout: 735 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 802-3-ethernet::0::no:::::auto::::default::-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: proxy:none:no:: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/6:: @@ -9090,31 +9166,31 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:: <<< -size: 735 +size: 739 location: src/tests/client/test-client.py:test_003()/186 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 539 bytes +stdout: 543 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 802-3-ethernet::0::no:::::auto::::default::-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: proxy:none:no:: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:: <<< -size: 745 +size: 749 location: src/tests/client/test-client.py:test_003()/187 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 539 bytes +stdout: 543 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 802-3-ethernet::0::no:::::auto::::default::-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: proxy:none:no:: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:: @@ -9218,16 +9294,16 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL:gsm UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -size: 899 +size: 903 location: src/tests/client/test-client.py:test_003()/194 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet lang: C returncode: 0 -stdout: 731 bytes +stdout: 735 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 802-3-ethernet::0::no:::::auto::::default::-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: proxy:none:no:: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/6:: @@ -9235,16 +9311,16 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:: <<< -size: 909 +size: 913 location: src/tests/client/test-client.py:test_003()/195 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 731 bytes +stdout: 735 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 802-3-ethernet::0::no:::::auto::::default::-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: proxy:none:no:: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/6:: @@ -9252,31 +9328,31 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:: <<< -size: 747 +size: 751 location: src/tests/client/test-client.py:test_003()/196 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 539 bytes +stdout: 543 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 802-3-ethernet::0::no:::::auto::::default::-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: proxy:none:no:: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:: <<< -size: 757 +size: 761 location: src/tests/client/test-client.py:test_003()/197 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 539 bytes +stdout: 543 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 802-3-ethernet::0::no:::::auto::::default::-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: proxy:none:no:: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:: @@ -9588,12 +9664,12 @@ UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE: ethernet <<< -size: 6441 +size: 6537 location: src/tests/client/test-client.py:test_003()/204 cmd: $NMCLI --mode multiline con s ethernet lang: C returncode: 0 -stdout: 6290 bytes +stdout: 6386 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -9613,6 +9689,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -9654,6 +9731,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -9730,12 +9808,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 6485 +size: 6581 location: src/tests/client/test-client.py:test_003()/205 cmd: $NMCLI --mode multiline con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6324 bytes +stdout: 6420 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -9755,6 +9833,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -9796,6 +9875,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -9872,12 +9952,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5771 +size: 5867 location: src/tests/client/test-client.py:test_003()/206 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5580 bytes +stdout: 5676 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -9897,6 +9977,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -9938,6 +10019,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -10000,12 +10082,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5811 +size: 5907 location: src/tests/client/test-client.py:test_003()/207 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5610 bytes +stdout: 5706 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -10025,6 +10107,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -10066,6 +10149,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -10542,12 +10626,12 @@ UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE: ethernet <<< -size: 6453 +size: 6549 location: src/tests/client/test-client.py:test_003()/214 cmd: $NMCLI --mode multiline --color yes con s ethernet lang: C returncode: 0 -stdout: 6290 bytes +stdout: 6386 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -10567,6 +10651,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -10608,6 +10693,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -10684,12 +10770,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 6497 +size: 6593 location: src/tests/client/test-client.py:test_003()/215 cmd: $NMCLI --mode multiline --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6324 bytes +stdout: 6420 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -10709,6 +10795,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -10750,6 +10837,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -10826,12 +10914,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5783 +size: 5879 location: src/tests/client/test-client.py:test_003()/216 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5580 bytes +stdout: 5676 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -10851,6 +10939,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -10892,6 +10981,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -10954,12 +11044,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5823 +size: 5919 location: src/tests/client/test-client.py:test_003()/217 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5610 bytes +stdout: 5706 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -10979,6 +11069,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -11020,6 +11111,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -11534,12 +11626,12 @@ TYPE: ethernet ------------------------------------------------------------------------------- <<< -size: 7693 +size: 7789 location: src/tests/client/test-client.py:test_003()/224 cmd: $NMCLI --mode multiline --pretty con s ethernet lang: C returncode: 0 -stdout: 7533 bytes +stdout: 7629 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -11562,6 +11654,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -11605,6 +11698,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -11692,12 +11786,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 7758 +size: 7854 location: src/tests/client/test-client.py:test_003()/225 cmd: $NMCLI --mode multiline --pretty con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 7588 bytes +stdout: 7684 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -11720,6 +11814,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -11763,6 +11858,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -11850,12 +11946,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6711 +size: 6807 location: src/tests/client/test-client.py:test_003()/226 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 6511 bytes +stdout: 6607 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -11878,6 +11974,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -11921,6 +12018,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -11990,12 +12088,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6764 +size: 6860 location: src/tests/client/test-client.py:test_003()/227 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6554 bytes +stdout: 6650 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -12018,6 +12116,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -12061,6 +12160,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -12606,12 +12706,12 @@ TYPE: ethernet ------------------------------------------------------------------------------- <<< -size: 7705 +size: 7801 location: src/tests/client/test-client.py:test_003()/234 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet lang: C returncode: 0 -stdout: 7533 bytes +stdout: 7629 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -12634,6 +12734,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -12677,6 +12778,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -12764,12 +12866,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 7770 +size: 7866 location: src/tests/client/test-client.py:test_003()/235 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 7588 bytes +stdout: 7684 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -12792,6 +12894,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -12835,6 +12938,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -12922,12 +13026,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6723 +size: 6819 location: src/tests/client/test-client.py:test_003()/236 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 6511 bytes +stdout: 6607 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -12950,6 +13054,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -12993,6 +13098,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -13062,12 +13168,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6776 +size: 6872 location: src/tests/client/test-client.py:test_003()/237 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6554 bytes +stdout: 6650 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -13090,6 +13196,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -13133,6 +13240,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -13640,12 +13748,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE:802-3-ethernet <<< -size: 3444 +size: 3492 location: src/tests/client/test-client.py:test_003()/244 cmd: $NMCLI --mode multiline --terse con s ethernet lang: C returncode: 0 -stdout: 3285 bytes +stdout: 3333 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -13665,6 +13773,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -13706,6 +13815,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -13782,12 +13892,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3454 +size: 3502 location: src/tests/client/test-client.py:test_003()/245 cmd: $NMCLI --mode multiline --terse con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 3285 bytes +stdout: 3333 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -13807,6 +13917,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -13848,6 +13959,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -13924,12 +14036,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3094 +size: 3142 location: src/tests/client/test-client.py:test_003()/246 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2895 bytes +stdout: 2943 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -13949,6 +14061,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -13990,6 +14103,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -14052,12 +14166,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3104 +size: 3152 location: src/tests/client/test-client.py:test_003()/247 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2895 bytes +stdout: 2943 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -14077,6 +14191,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -14118,6 +14233,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -14594,12 +14710,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE:802-3-ethernet <<< -size: 3456 +size: 3504 location: src/tests/client/test-client.py:test_003()/254 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet lang: C returncode: 0 -stdout: 3285 bytes +stdout: 3333 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -14619,6 +14735,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -14660,6 +14777,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -14736,12 +14854,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3466 +size: 3514 location: src/tests/client/test-client.py:test_003()/255 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 3285 bytes +stdout: 3333 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -14761,6 +14879,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -14802,6 +14921,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -14878,12 +14998,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3106 +size: 3154 location: src/tests/client/test-client.py:test_003()/256 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2895 bytes +stdout: 2943 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -14903,6 +15023,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -14944,6 +15065,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -15006,12 +15128,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3116 +size: 3164 location: src/tests/client/test-client.py:test_003()/257 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2895 bytes +stdout: 2943 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -15031,6 +15153,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -15072,6 +15195,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: diff --git a/src/tests/client/test-client.check-on-disk/test_004.expected b/src/tests/client/test-client.check-on-disk/test_004.expected index 6486a8a2..7e1e14b1 100644 --- a/src/tests/client/test-client.check-on-disk/test_004.expected +++ b/src/tests/client/test-client.check-on-disk/test_004.expected @@ -58,12 +58,12 @@ location: src/tests/client/test-client.py:test_004()/7 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128 lang: C returncode: 0 -size: 5166 +size: 5262 location: src/tests/client/test-client.py:test_004()/8 cmd: $NMCLI con s con-xx1 lang: C returncode: 0 -stdout: 5035 bytes +stdout: 5131 bytes >>> connection.id: con-xx1 connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA @@ -83,6 +83,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -125,6 +126,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -174,12 +176,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 5201 +size: 5297 location: src/tests/client/test-client.py:test_004()/9 cmd: $NMCLI con s con-xx1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5060 bytes +stdout: 5156 bytes >>> connection.id: con-xx1 connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA @@ -199,6 +201,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -241,6 +244,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -326,12 +330,12 @@ con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP vpn -- con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi -- <<< -size: 4664 +size: 4760 location: src/tests/client/test-client.py:test_004()/13 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 4530 bytes +stdout: 4626 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -351,6 +355,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -377,6 +382,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -432,12 +438,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 4691 +size: 4787 location: src/tests/client/test-client.py:test_004()/14 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4547 bytes +stdout: 4643 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -457,6 +463,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -483,6 +490,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -610,12 +618,12 @@ con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi wlan0 con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- <<< -size: 5792 +size: 5888 location: src/tests/client/test-client.py:test_004()/21 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 5658 bytes +stdout: 5754 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -635,6 +643,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -661,6 +670,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -737,12 +747,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5825 +size: 5921 location: src/tests/client/test-client.py:test_004()/22 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5681 bytes +stdout: 5777 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -762,6 +772,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -788,6 +799,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -972,12 +984,12 @@ con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi 0 never con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1 <<< -size: 5798 +size: 5894 location: src/tests/client/test-client.py:test_004()/27 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 5664 bytes +stdout: 5760 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -997,6 +1009,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -1023,6 +1036,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -1099,12 +1113,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5835 +size: 5931 location: src/tests/client/test-client.py:test_004()/28 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5691 bytes +stdout: 5787 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -1124,6 +1138,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -1150,6 +1165,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -1226,12 +1242,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5798 +size: 5894 location: src/tests/client/test-client.py:test_004()/29 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 5664 bytes +stdout: 5760 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -1251,6 +1267,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -1277,6 +1294,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -1353,12 +1371,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5835 +size: 5931 location: src/tests/client/test-client.py:test_004()/30 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5691 bytes +stdout: 5787 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -1378,6 +1396,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -1404,6 +1423,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -1480,12 +1500,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4671 +size: 4767 location: src/tests/client/test-client.py:test_004()/31 cmd: $NMCLI -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 4530 bytes +stdout: 4626 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -1505,6 +1525,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -1531,6 +1552,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -1586,12 +1608,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 4698 +size: 4794 location: src/tests/client/test-client.py:test_004()/32 cmd: $NMCLI -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4547 bytes +stdout: 4643 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -1611,6 +1633,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -1637,6 +1660,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -4302,12 +4326,12 @@ connection.type: 802-11-wireless connection.interface-name: -- <<< -size: 5810 +size: 5906 location: src/tests/client/test-client.py:test_004()/77 cmd: $NMCLI --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 5664 bytes +stdout: 5760 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -4327,6 +4351,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -4353,6 +4378,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -4429,12 +4455,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5847 +size: 5943 location: src/tests/client/test-client.py:test_004()/78 cmd: $NMCLI --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5691 bytes +stdout: 5787 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -4454,6 +4480,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -4480,6 +4507,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -4556,12 +4584,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5810 +size: 5906 location: src/tests/client/test-client.py:test_004()/79 cmd: $NMCLI --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 5664 bytes +stdout: 5760 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -4581,6 +4609,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -4607,6 +4636,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -4683,12 +4713,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5847 +size: 5943 location: src/tests/client/test-client.py:test_004()/80 cmd: $NMCLI --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5691 bytes +stdout: 5787 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -4708,6 +4738,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -4734,6 +4765,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -4810,12 +4842,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4683 +size: 4779 location: src/tests/client/test-client.py:test_004()/81 cmd: $NMCLI --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 4530 bytes +stdout: 4626 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -4835,6 +4867,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -4861,6 +4894,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -4916,12 +4950,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 4710 +size: 4806 location: src/tests/client/test-client.py:test_004()/82 cmd: $NMCLI --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4547 bytes +stdout: 4643 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -4941,6 +4975,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -4967,6 +5002,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -7632,12 +7668,12 @@ connection.type: 802-11-wireless connection.interface-name: -- <<< -size: 6819 +size: 6915 location: src/tests/client/test-client.py:test_004()/127 cmd: $NMCLI --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 6675 bytes +stdout: 6771 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -7660,6 +7696,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -7687,6 +7724,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -7772,12 +7810,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6869 +size: 6965 location: src/tests/client/test-client.py:test_004()/128 cmd: $NMCLI --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6715 bytes +stdout: 6811 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -7800,6 +7838,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -7827,6 +7866,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -7912,12 +7952,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6819 +size: 6915 location: src/tests/client/test-client.py:test_004()/129 cmd: $NMCLI --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 6675 bytes +stdout: 6771 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -7940,6 +7980,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -7967,6 +8008,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -8052,12 +8094,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6869 +size: 6965 location: src/tests/client/test-client.py:test_004()/130 cmd: $NMCLI --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6715 bytes +stdout: 6811 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -8080,6 +8122,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -8107,6 +8150,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -8192,12 +8236,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5300 +size: 5396 location: src/tests/client/test-client.py:test_004()/131 cmd: $NMCLI --pretty -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 5149 bytes +stdout: 5245 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -8220,6 +8264,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -8247,6 +8292,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -8306,12 +8352,12 @@ proxy.pac-script: -- ------------------------------------------------------------------------------- <<< -size: 5332 +size: 5428 location: src/tests/client/test-client.py:test_004()/132 cmd: $NMCLI --pretty -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5171 bytes +stdout: 5267 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -8334,6 +8380,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -8361,6 +8408,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -11634,12 +11682,12 @@ connection.interface-name: -- ------------------------------------------------------------------------------- <<< -size: 6831 +size: 6927 location: src/tests/client/test-client.py:test_004()/177 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 6675 bytes +stdout: 6771 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -11662,6 +11710,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -11689,6 +11738,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -11774,12 +11824,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6881 +size: 6977 location: src/tests/client/test-client.py:test_004()/178 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6715 bytes +stdout: 6811 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -11802,6 +11852,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -11829,6 +11880,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -11914,12 +11966,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6831 +size: 6927 location: src/tests/client/test-client.py:test_004()/179 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 6675 bytes +stdout: 6771 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -11942,6 +11994,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -11969,6 +12022,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -12054,12 +12108,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6881 +size: 6977 location: src/tests/client/test-client.py:test_004()/180 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6715 bytes +stdout: 6811 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -12082,6 +12136,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -12109,6 +12164,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -12194,12 +12250,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5312 +size: 5408 location: src/tests/client/test-client.py:test_004()/181 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 5149 bytes +stdout: 5245 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -12222,6 +12278,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -12249,6 +12306,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -12308,12 +12366,12 @@ proxy.pac-script: -- ------------------------------------------------------------------------------- <<< -size: 5344 +size: 5440 location: src/tests/client/test-client.py:test_004()/182 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5171 bytes +stdout: 5267 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -12336,6 +12394,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -12363,6 +12422,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -15636,12 +15696,12 @@ connection.interface-name: -- ------------------------------------------------------------------------------- <<< -size: 2916 +size: 2964 location: src/tests/client/test-client.py:test_004()/227 cmd: $NMCLI --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -15661,6 +15721,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -15687,6 +15748,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -15763,12 +15825,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2926 +size: 2974 location: src/tests/client/test-client.py:test_004()/228 cmd: $NMCLI --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -15788,6 +15850,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -15814,6 +15877,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -15890,12 +15954,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2916 +size: 2964 location: src/tests/client/test-client.py:test_004()/229 cmd: $NMCLI --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -15915,6 +15979,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -15941,6 +16006,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -16017,12 +16083,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2926 +size: 2974 location: src/tests/client/test-client.py:test_004()/230 cmd: $NMCLI --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -16042,6 +16108,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -16068,6 +16135,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -16144,12 +16212,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2341 +size: 2389 location: src/tests/client/test-client.py:test_004()/231 cmd: $NMCLI --terse -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 2191 bytes +stdout: 2239 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -16169,6 +16237,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -16195,6 +16264,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -16250,12 +16320,12 @@ proxy.pac-url: proxy.pac-script: <<< -size: 2351 +size: 2399 location: src/tests/client/test-client.py:test_004()/232 cmd: $NMCLI --terse -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2191 bytes +stdout: 2239 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -16275,6 +16345,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -16301,6 +16372,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -18936,12 +19008,12 @@ connection.type:802-11-wireless connection.interface-name: <<< -size: 2928 +size: 2976 location: src/tests/client/test-client.py:test_004()/277 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -18961,6 +19033,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -18987,6 +19060,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -19063,12 +19137,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2938 +size: 2986 location: src/tests/client/test-client.py:test_004()/278 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -19088,6 +19162,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -19114,6 +19189,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -19190,12 +19266,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2928 +size: 2976 location: src/tests/client/test-client.py:test_004()/279 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -19215,6 +19291,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -19241,6 +19318,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -19317,12 +19395,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2938 +size: 2986 location: src/tests/client/test-client.py:test_004()/280 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -19342,6 +19420,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -19368,6 +19447,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -19444,12 +19524,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2353 +size: 2401 location: src/tests/client/test-client.py:test_004()/281 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 2191 bytes +stdout: 2239 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -19469,6 +19549,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -19495,6 +19576,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -19550,12 +19632,12 @@ proxy.pac-url: proxy.pac-script: <<< -size: 2363 +size: 2411 location: src/tests/client/test-client.py:test_004()/282 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2191 bytes +stdout: 2239 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -19575,6 +19657,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -19601,6 +19684,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -22236,18 +22320,18 @@ connection.type:802-11-wireless connection.interface-name: <<< -size: 3802 +size: 3862 location: src/tests/client/test-client.py:test_004()/327 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: C returncode: 0 -stdout: 3652 bytes +stdout: 3712 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no no yes -1 (default) -1 (unknown) default 0 (default) auto -- -- -- 0 (default) yes -- 0x0 (none) -1 (default) -- @@ -22265,18 +22349,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3841 +size: 3901 location: src/tests/client/test-client.py:test_004()/328 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3681 bytes +stdout: 3741 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie nie tak -1 (default) -1 (unknown) default 0 (default) automatyczne -- -- -- 0 (default) tak -- 0x0 (none) -1 (default) -- @@ -22294,18 +22378,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3802 +size: 3862 location: src/tests/client/test-client.py:test_004()/329 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: C returncode: 0 -stdout: 3652 bytes +stdout: 3712 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no no yes -1 (default) -1 (unknown) default 0 (default) auto -- -- -- 0 (default) yes -- 0x0 (none) -1 (default) -- @@ -22323,18 +22407,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3841 +size: 3901 location: src/tests/client/test-client.py:test_004()/330 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3681 bytes +stdout: 3741 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie nie tak -1 (default) -1 (unknown) default 0 (default) automatyczne -- -- -- 0 (default) tak -- 0x0 (none) -1 (default) -- @@ -22352,18 +22436,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3050 +size: 3110 location: src/tests/client/test-client.py:test_004()/331 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 2893 bytes +stdout: 2953 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no no yes -1 (default) -1 (unknown) default 0 (default) auto -- -- -- 0 (default) yes -- 0x0 (none) -1 (default) -- @@ -22376,18 +22460,18 @@ proxy none no -- -- <<< -size: 3078 +size: 3138 location: src/tests/client/test-client.py:test_004()/332 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2911 bytes +stdout: 2971 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie nie tak -1 (default) -1 (unknown) default 0 (default) automatyczne -- -- -- 0 (default) tak -- 0x0 (none) -1 (default) -- @@ -23890,18 +23974,18 @@ interface-name <<< -size: 3814 +size: 3874 location: src/tests/client/test-client.py:test_004()/377 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 3652 bytes +stdout: 3712 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no no yes -1 (default) -1 (unknown) default 0 (default) auto -- -- -- 0 (default) yes -- 0x0 (none) -1 (default) -- @@ -23919,18 +24003,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3853 +size: 3913 location: src/tests/client/test-client.py:test_004()/378 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3681 bytes +stdout: 3741 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie nie tak -1 (default) -1 (unknown) default 0 (default) automatyczne -- -- -- 0 (default) tak -- 0x0 (none) -1 (default) -- @@ -23948,18 +24032,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3814 +size: 3874 location: src/tests/client/test-client.py:test_004()/379 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 3652 bytes +stdout: 3712 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no no yes -1 (default) -1 (unknown) default 0 (default) auto -- -- -- 0 (default) yes -- 0x0 (none) -1 (default) -- @@ -23977,18 +24061,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3853 +size: 3913 location: src/tests/client/test-client.py:test_004()/380 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3681 bytes +stdout: 3741 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie nie tak -1 (default) -1 (unknown) default 0 (default) automatyczne -- -- -- 0 (default) tak -- 0x0 (none) -1 (default) -- @@ -24006,18 +24090,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3062 +size: 3122 location: src/tests/client/test-client.py:test_004()/381 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 2893 bytes +stdout: 2953 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no no yes -1 (default) -1 (unknown) default 0 (default) auto -- -- -- 0 (default) yes -- 0x0 (none) -1 (default) -- @@ -24030,18 +24114,18 @@ proxy none no -- -- <<< -size: 3090 +size: 3150 location: src/tests/client/test-client.py:test_004()/382 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2911 bytes +stdout: 2971 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie nie tak -1 (default) -1 (unknown) default 0 (default) automatyczne -- -- -- 0 (default) tak -- 0x0 (none) -1 (default) -- @@ -25544,23 +25628,23 @@ interface-name <<< -size: 5973 +size: 6063 location: src/tests/client/test-client.py:test_004()/427 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 5814 bytes +stdout: 5904 bytes >>> ========================================== Connection profile details (con-vpn-1) ========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -25586,23 +25670,23 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 6059 +size: 6149 location: src/tests/client/test-client.py:test_004()/428 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5890 bytes +stdout: 5980 bytes >>> ============================================ Szczegóły profilu połączenia (con-vpn-1) ============================================ -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -25628,23 +25712,23 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 5973 +size: 6063 location: src/tests/client/test-client.py:test_004()/429 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 5814 bytes +stdout: 5904 bytes >>> ========================================== Connection profile details (con-vpn-1) ========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -25670,23 +25754,23 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 6059 +size: 6149 location: src/tests/client/test-client.py:test_004()/430 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5890 bytes +stdout: 5980 bytes >>> ============================================ Szczegóły profilu połączenia (con-vpn-1) ============================================ -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -25712,23 +25796,23 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 4635 +size: 4725 location: src/tests/client/test-client.py:test_004()/431 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 4469 bytes +stdout: 4559 bytes >>> ========================================== Connection profile details (con-vpn-1) ========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -25744,23 +25828,23 @@ proxy none no -- -- <<< -size: 4682 +size: 4772 location: src/tests/client/test-client.py:test_004()/432 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4506 bytes +stdout: 4596 bytes >>> ============================================ Szczegóły profilu połączenia (con-vpn-1) ============================================ -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -27852,23 +27936,23 @@ interface-name <<< -size: 5985 +size: 6075 location: src/tests/client/test-client.py:test_004()/477 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 5814 bytes +stdout: 5904 bytes >>> ========================================== Connection profile details (con-vpn-1) ========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -27894,23 +27978,23 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 6071 +size: 6161 location: src/tests/client/test-client.py:test_004()/478 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5890 bytes +stdout: 5980 bytes >>> ============================================ Szczegóły profilu połączenia (con-vpn-1) ============================================ -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -27936,23 +28020,23 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 5985 +size: 6075 location: src/tests/client/test-client.py:test_004()/479 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 5814 bytes +stdout: 5904 bytes >>> ========================================== Connection profile details (con-vpn-1) ========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -27978,23 +28062,23 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 6071 +size: 6161 location: src/tests/client/test-client.py:test_004()/480 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5890 bytes +stdout: 5980 bytes >>> ============================================ Szczegóły profilu połączenia (con-vpn-1) ============================================ -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -28020,23 +28104,23 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 4647 +size: 4737 location: src/tests/client/test-client.py:test_004()/481 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 4469 bytes +stdout: 4559 bytes >>> ========================================== Connection profile details (con-vpn-1) ========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) no no -- -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -28052,23 +28136,23 @@ proxy none no -- -- <<< -size: 4694 +size: 4784 location: src/tests/client/test-client.py:test_004()/482 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4506 bytes +stdout: 4596 bytes >>> ============================================ Szczegóły profilu połączenia (con-vpn-1) ============================================ -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp permissions zone controller master slave-type port-type autoconnect-slaves autoconnect-ports secondaries gateway-ping-timeout metered lldp mdns llmnr dns-over-tls mptcp-flags wait-device-timeout wait-activation-delay +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 -- -- -- -- -- -- -1 (default) -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 (default) 0x0 (default) -1 -1 -name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-dscp dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail required-timeout dad-timeout dhcp-vendor-class-identifier link-local dhcp-reject-servers auto-route-ext-gw +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- -1 (default) nie nie -- -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -1 (default) -- 0 (default) -- -1 (default) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules replace-local-rule ignore-auto-routes ignore-auto-dns never-default may-fail required-timeout ip6-privacy addr-gen-mode ra-timeout mtu dhcp-pd-hint dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags auto-route-ext-gw token -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -30160,15 +30244,15 @@ interface-name <<< -size: 842 +size: 846 location: src/tests/client/test-client.py:test_004()/527 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 685 bytes +stdout: 689 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0 proxy:none:no:: @@ -30176,15 +30260,15 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no: VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 852 +size: 856 location: src/tests/client/test-client.py:test_004()/528 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 685 bytes +stdout: 689 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0 proxy:none:no:: @@ -30192,15 +30276,15 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no: VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 842 +size: 846 location: src/tests/client/test-client.py:test_004()/529 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 685 bytes +stdout: 689 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0 proxy:none:no:: @@ -30208,15 +30292,15 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no: VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 852 +size: 856 location: src/tests/client/test-client.py:test_004()/530 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 685 bytes +stdout: 689 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0 proxy:none:no:: @@ -30224,29 +30308,29 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no: VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 549 +size: 553 location: src/tests/client/test-client.py:test_004()/531 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 385 bytes +stdout: 389 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0 proxy:none:no:: <<< -size: 559 +size: 563 location: src/tests/client/test-client.py:test_004()/532 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 385 bytes +stdout: 389 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0 proxy:none:no:: @@ -31098,15 +31182,15 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA <<< -size: 854 +size: 858 location: src/tests/client/test-client.py:test_004()/577 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 685 bytes +stdout: 689 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0 proxy:none:no:: @@ -31114,15 +31198,15 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no: VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 864 +size: 868 location: src/tests/client/test-client.py:test_004()/578 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 685 bytes +stdout: 689 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0 proxy:none:no:: @@ -31130,15 +31214,15 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no: VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 854 +size: 858 location: src/tests/client/test-client.py:test_004()/579 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 685 bytes +stdout: 689 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0 proxy:none:no:: @@ -31146,15 +31230,15 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no: VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 864 +size: 868 location: src/tests/client/test-client.py:test_004()/580 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 685 bytes +stdout: 689 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0 proxy:none:no:: @@ -31162,29 +31246,29 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no: VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 561 +size: 565 location: src/tests/client/test-client.py:test_004()/581 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 385 bytes +stdout: 389 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0 proxy:none:no:: <<< -size: 571 +size: 575 location: src/tests/client/test-client.py:test_004()/582 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 385 bytes +stdout: 389 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 -ipv4:auto::::0::::-1:0::-1:no:no:::0:yes:::0x0:no:yes:-1:-1::0::-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1::0:unknown:default:-1:-1:-1:0x0:-1:-1 +ipv4:auto::::0::::-1:0::-1:no:no::::0:yes:::0x0:no:yes:-1:-1::0::-1 ipv6:auto::::0::::-1:0::-1:no:no:no:yes:-1:-1:default:0:auto::::0:yes::0x0:-1: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0 proxy:none:no:: @@ -32036,12 +32120,12 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA <<< -size: 5816 +size: 5912 location: src/tests/client/test-client.py:test_004()/627 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: C returncode: 0 -stdout: 5664 bytes +stdout: 5760 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -32061,6 +32145,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -32087,6 +32172,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -32163,12 +32249,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5853 +size: 5949 location: src/tests/client/test-client.py:test_004()/628 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5691 bytes +stdout: 5787 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -32188,6 +32274,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -32214,6 +32301,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -32290,12 +32378,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5816 +size: 5912 location: src/tests/client/test-client.py:test_004()/629 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: C returncode: 0 -stdout: 5664 bytes +stdout: 5760 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -32315,6 +32403,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -32341,6 +32430,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -32417,12 +32507,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5853 +size: 5949 location: src/tests/client/test-client.py:test_004()/630 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5691 bytes +stdout: 5787 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -32442,6 +32532,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -32468,6 +32559,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -32544,12 +32636,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4689 +size: 4785 location: src/tests/client/test-client.py:test_004()/631 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 4530 bytes +stdout: 4626 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -32569,6 +32661,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -32595,6 +32688,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -32650,12 +32744,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 4716 +size: 4812 location: src/tests/client/test-client.py:test_004()/632 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4547 bytes +stdout: 4643 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -32675,6 +32769,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -32701,6 +32796,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -35876,12 +35972,12 @@ connection.type: 802-11-wireless connection.interface-name: -- <<< -size: 5828 +size: 5924 location: src/tests/client/test-client.py:test_004()/677 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 5664 bytes +stdout: 5760 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -35901,6 +35997,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -35927,6 +36024,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -36003,12 +36101,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5865 +size: 5961 location: src/tests/client/test-client.py:test_004()/678 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5691 bytes +stdout: 5787 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -36028,6 +36126,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -36054,6 +36153,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -36130,12 +36230,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5828 +size: 5924 location: src/tests/client/test-client.py:test_004()/679 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 5664 bytes +stdout: 5760 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -36155,6 +36255,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -36181,6 +36282,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -36257,12 +36359,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5865 +size: 5961 location: src/tests/client/test-client.py:test_004()/680 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5691 bytes +stdout: 5787 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -36282,6 +36384,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -36308,6 +36411,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -36384,12 +36488,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4701 +size: 4797 location: src/tests/client/test-client.py:test_004()/681 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 4530 bytes +stdout: 4626 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -36409,6 +36513,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -36435,6 +36540,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -36490,12 +36596,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 4728 +size: 4824 location: src/tests/client/test-client.py:test_004()/682 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4547 bytes +stdout: 4643 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -36515,6 +36621,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -36541,6 +36648,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -39716,12 +39824,12 @@ connection.type: 802-11-wireless connection.interface-name: -- <<< -size: 6836 +size: 6932 location: src/tests/client/test-client.py:test_004()/727 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 6675 bytes +stdout: 6771 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -39744,6 +39852,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -39771,6 +39880,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -39856,12 +39966,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6886 +size: 6982 location: src/tests/client/test-client.py:test_004()/728 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6715 bytes +stdout: 6811 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -39884,6 +39994,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -39911,6 +40022,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -39996,12 +40108,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6836 +size: 6932 location: src/tests/client/test-client.py:test_004()/729 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 6675 bytes +stdout: 6771 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -40024,6 +40136,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -40051,6 +40164,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -40136,12 +40250,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6886 +size: 6982 location: src/tests/client/test-client.py:test_004()/730 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6715 bytes +stdout: 6811 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -40164,6 +40278,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -40191,6 +40306,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -40276,12 +40392,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5317 +size: 5413 location: src/tests/client/test-client.py:test_004()/731 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 5149 bytes +stdout: 5245 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -40304,6 +40420,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -40331,6 +40448,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -40390,12 +40508,12 @@ proxy.pac-script: -- ------------------------------------------------------------------------------- <<< -size: 5349 +size: 5445 location: src/tests/client/test-client.py:test_004()/732 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5171 bytes +stdout: 5267 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -40418,6 +40536,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -40445,6 +40564,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -44258,12 +44378,12 @@ connection.interface-name: -- ------------------------------------------------------------------------------- <<< -size: 6848 +size: 6944 location: src/tests/client/test-client.py:test_004()/777 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 6675 bytes +stdout: 6771 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -44286,6 +44406,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -44313,6 +44434,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -44398,12 +44520,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6898 +size: 6994 location: src/tests/client/test-client.py:test_004()/778 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6715 bytes +stdout: 6811 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -44426,6 +44548,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -44453,6 +44576,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -44538,12 +44662,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6848 +size: 6944 location: src/tests/client/test-client.py:test_004()/779 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 6675 bytes +stdout: 6771 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -44566,6 +44690,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -44593,6 +44718,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -44678,12 +44804,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6898 +size: 6994 location: src/tests/client/test-client.py:test_004()/780 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6715 bytes +stdout: 6811 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -44706,6 +44832,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -44733,6 +44860,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -44818,12 +44946,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5329 +size: 5425 location: src/tests/client/test-client.py:test_004()/781 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 5149 bytes +stdout: 5245 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -44846,6 +44974,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: unknown @@ -44873,6 +45002,7 @@ ipv4.ignore-auto-routes: no ipv4.ignore-auto-dns: no ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: yes ipv4.dhcp-hostname: -- @@ -44932,12 +45062,12 @@ proxy.pac-script: -- ------------------------------------------------------------------------------- <<< -size: 5361 +size: 5457 location: src/tests/client/test-client.py:test_004()/782 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5171 bytes +stdout: 5267 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -44960,6 +45090,7 @@ connection.master: -- connection.slave-type: -- connection.port-type: -- connection.autoconnect-slaves: -1 (default) +connection.autoconnect-ports: -1 (default) connection.secondaries: -- connection.gateway-ping-timeout: 0 connection.metered: nieznane @@ -44987,6 +45118,7 @@ ipv4.ignore-auto-routes: nie ipv4.ignore-auto-dns: nie ipv4.dhcp-client-id: -- ipv4.dhcp-iaid: -- +ipv4.dhcp-dscp: -- ipv4.dhcp-timeout: 0 (default) ipv4.dhcp-send-hostname: tak ipv4.dhcp-hostname: -- @@ -48800,12 +48932,12 @@ connection.interface-name: -- ------------------------------------------------------------------------------- <<< -size: 2933 +size: 2981 location: src/tests/client/test-client.py:test_004()/827 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -48825,6 +48957,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -48851,6 +48984,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -48927,12 +49061,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2943 +size: 2991 location: src/tests/client/test-client.py:test_004()/828 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -48952,6 +49086,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -48978,6 +49113,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -49054,12 +49190,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2933 +size: 2981 location: src/tests/client/test-client.py:test_004()/829 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -49079,6 +49215,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -49105,6 +49242,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -49181,12 +49319,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2943 +size: 2991 location: src/tests/client/test-client.py:test_004()/830 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -49206,6 +49344,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -49232,6 +49371,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -49308,12 +49448,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2358 +size: 2406 location: src/tests/client/test-client.py:test_004()/831 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 2191 bytes +stdout: 2239 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -49333,6 +49473,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -49359,6 +49500,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -49414,12 +49556,12 @@ proxy.pac-url: proxy.pac-script: <<< -size: 2368 +size: 2416 location: src/tests/client/test-client.py:test_004()/832 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2191 bytes +stdout: 2239 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -49439,6 +49581,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -49465,6 +49608,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -52640,12 +52784,12 @@ connection.type:802-11-wireless connection.interface-name: <<< -size: 2945 +size: 2993 location: src/tests/client/test-client.py:test_004()/877 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -52665,6 +52809,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -52691,6 +52836,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -52767,12 +52913,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2955 +size: 3003 location: src/tests/client/test-client.py:test_004()/878 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -52792,6 +52938,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -52818,6 +52965,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -52894,12 +53042,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2945 +size: 2993 location: src/tests/client/test-client.py:test_004()/879 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -52919,6 +53067,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -52945,6 +53094,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -53021,12 +53171,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2955 +size: 3003 location: src/tests/client/test-client.py:test_004()/880 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2773 bytes +stdout: 2821 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -53046,6 +53196,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -53072,6 +53223,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -53148,12 +53300,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2370 +size: 2418 location: src/tests/client/test-client.py:test_004()/881 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 2191 bytes +stdout: 2239 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -53173,6 +53325,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -53199,6 +53352,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: @@ -53254,12 +53408,12 @@ proxy.pac-url: proxy.pac-script: <<< -size: 2380 +size: 2428 location: src/tests/client/test-client.py:test_004()/882 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2191 bytes +stdout: 2239 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -53279,6 +53433,7 @@ connection.master: connection.slave-type: connection.port-type: connection.autoconnect-slaves:-1 +connection.autoconnect-ports:-1 connection.secondaries: connection.gateway-ping-timeout:0 connection.metered:unknown @@ -53305,6 +53460,7 @@ ipv4.ignore-auto-routes:no ipv4.ignore-auto-dns:no ipv4.dhcp-client-id: ipv4.dhcp-iaid: +ipv4.dhcp-dscp: ipv4.dhcp-timeout:0 ipv4.dhcp-send-hostname:yes ipv4.dhcp-hostname: diff --git a/tools/meson-dist-data.sh b/tools/meson-dist-data.sh new file mode 100755 index 00000000..1b5d3b03 --- /dev/null +++ b/tools/meson-dist-data.sh @@ -0,0 +1,35 @@ +#!/bin/bash +set -e + +ensure_var_path() { + if [ "${!1}" = "" ]; then + echo "$0: Required variable $1 is not set, aborting" >&2 + exit 1 + fi + + if [ ! -d "${!1}" ]; then + echo "$0: Path '${!1}' in $1 does not exist or is not directory, aborting" >&2 + exit 1 + fi +} + +copy_from_build() { + cp -Tr "$MESON_BUILD_ROOT/$1" "$MESON_DIST_ROOT/$1" +} + +if [ "$MESON_BUILD_ROOT" = "" ]; then + if [ "$1" = "--build-root" ]; then + MESON_BUILD_ROOT="$2" + fi +fi + +ensure_var_path "MESON_DIST_ROOT" +ensure_var_path "MESON_BUILD_ROOT" +ensure_var_path "MESON_SOURCE_ROOT" + +ninja -C "$MESON_BUILD_ROOT" all libnm-doc NetworkManager-doc + +mkdir -p "$MESON_DIST_ROOT/docs/" +copy_from_build /docs/api/ +copy_from_build /docs/libnm/ +copy_from_build /man/ |